Commits

Laurent Jouanneau  committed b669478

updated patch for the last gecko 1.9.2

  • Participants
  • Parent commits 1824fb0

Comments (0)

Files changed (3)

File config/patches/build.patch

 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -5469,16 +5469,28 @@ MOZ_ARG_ENABLE_BOOL(plaintext-editor-onl
+@@ -5473,16 +5473,28 @@ MOZ_ARG_ENABLE_BOOL(plaintext-editor-onl
  [  --enable-plaintext-editor-only
                            Allow only plaintext editing],
      MOZ_PLAINTEXT_EDITOR_ONLY=1,
 diff --git a/toolkit/toolkit-tiers.mk b/toolkit/toolkit-tiers.mk
 --- a/toolkit/toolkit-tiers.mk
 +++ b/toolkit/toolkit-tiers.mk
-@@ -149,16 +149,26 @@ tier_gecko_dirs	+= \
+@@ -150,16 +150,26 @@ tier_gecko_dirs	+= \
  		parser \
  		gfx \
  		modules/libpr0n \
  		xpfe/appshell \
  		$(NULL)
  
-@@ -264,16 +274,20 @@ endif
+@@ -265,16 +275,20 @@ endif
  
  ifndef MOZ_ENABLE_LIBCONIC
  # if libconic is present, it will do its own network monitoring

File config/patches/editor.patch

      SetEditorOnControllers(aWindow, nsnull);
    }
  
-@@ -1041,32 +1146,40 @@ nsEditingSession::EndDocumentLoad(nsIWeb
+@@ -1041,16 +1146,21 @@ nsEditingSession::EndDocumentLoad(nsIWeb
        }
  
        if (needsSetup)
              mLoadBlankDocTimer = NULL;
            }
    
-           mLoadBlankDocTimer = do_CreateInstance("@mozilla.org/timer;1", &rv);
+@@ -1058,16 +1168,19 @@ nsEditingSession::EndDocumentLoad(nsIWeb
            if (NS_FAILED(rv)) return rv;
  
            mEditorStatus = eEditorCreationInProgress;
+           mDocShell = do_GetWeakReference(docShell);
            mLoadBlankDocTimer->InitWithFuncCallback(
                                            nsEditingSession::TimerCallback,
-                                           (void*)docShell,
+                                           static_cast<void*> (mDocShell.get()),
                                            10, nsITimer::TYPE_ONE_SHOT);
 +#ifdef MOZ_XML_EDITOR
 +          }
 diff --git a/editor/composer/src/nsEditingSession.h b/editor/composer/src/nsEditingSession.h
 --- a/editor/composer/src/nsEditingSession.h
 +++ b/editor/composer/src/nsEditingSession.h
-@@ -156,17 +156,18 @@ protected:
- 
+@@ -157,16 +157,17 @@ protected:
    // THE REMAINING MEMBER VARIABLES WILL BECOME A SET WHEN WE EDIT
    // MORE THAN ONE EDITOR PER EDITING SESSION
    nsRefPtr<nsComposerCommandsUpdater> mStateMaintainer;
    nsWeakPtr       mWindowToBeEdited;
  
    // Save the editor type so we can create the editor after loading uri
--  nsCString       mEditorType; 
-+  nsCString       mEditorType;
+   nsCString       mEditorType; 
 +  nsCString       mEditorExtraType;
    PRUint32        mEditorFlags;
    PRUint32        mEditorStatus;
    PRUint32        mBaseCommandControllerId;
    PRUint32        mDocStateControllerId;
    PRUint32        mHTMLCommandControllerId;
- };
  
- 
+   // Make sure the docshell we use is safe
+   nsWeakPtr       mDocShell;
 diff --git a/editor/idl/Makefile.in b/editor/idl/Makefile.in
 --- a/editor/idl/Makefile.in
 +++ b/editor/idl/Makefile.in

File config/patches/processing_instruction.patch

 diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp
 --- a/dom/base/nsDOMClassInfo.cpp
 +++ b/dom/base/nsDOMClassInfo.cpp
-@@ -212,16 +212,19 @@
+@@ -218,16 +218,19 @@
  #include "nsIDOMDocumentFragment.h"
  #include "nsIDOMDocumentEvent.h"
  #include "nsIDOMAttr.h"
  #include "nsIDOMMouseScrollEvent.h"
  #include "nsIDOMDragEvent.h"
  #include "nsIDOMCommandEvent.h"
-@@ -2110,16 +2113,19 @@ nsDOMClassInfo::Init()
+@@ -2165,16 +2168,19 @@ nsDOMClassInfo::Init()
      DOM_CLASSINFO_MAP_ENTRY(nsIDOMCDATASection)
      DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget)
      DOM_CLASSINFO_MAP_ENTRY(nsIDOM3Node)
      DOM_CLASSINFO_MAP_ENTRY(nsIDOMNotation)
    DOM_CLASSINFO_MAP_END
  
-@@ -2665,16 +2671,19 @@ nsDOMClassInfo::Init()
+@@ -2721,16 +2727,19 @@ nsDOMClassInfo::Init()
    DOM_CLASSINFO_MAP_END
  
    DOM_CLASSINFO_MAP_BEGIN(CRMFObject, nsIDOMCRMFObject)