Attachment 193470 Details for Bug 303725

[patch] fix assertions and other problems

forward-container2.diff (text/plain), 1.52 KB, created by Brian Ryner (not reading)

(hide)

Description:

Filename:

MIME Type:

Creator: Brian Ryner (not reading)

Size: 1.52 KB

patch

obsolete

>Index: nsIPresShell.h
>===================================================================
>RCS file: /cvsroot/mozilla/layout/base/nsIPresShell.h,v
>retrieving revision 3.159
>diff -u -p -r3.159 nsIPresShell.h
>--- nsIPresShell.h	22 Aug 2005 01:55:34 -0000	3.159
>+++ nsIPresShell.h	22 Aug 2005 18:56:27 -0000
>@@ -693,15 +693,16 @@ public:
>    */
>   virtual void Thaw() = 0;
> 
>-#ifdef _IMPL_NS_LAYOUT
>   /**
>    * When this shell is disconnected from its containing docshell, we
>    * lose our container pointer.  However, we'd still like to be able to target
>    * user events at the docshell's parent.  This pointer allows us to do that.
>    * It should not be used for any other purpose.
>    */
>-  void SetForwardingContainer(nsISupports *aContainer);
>-#endif
>+  void SetForwardingContainer(nsWeakPtr aContainer)
>+  {
>+    mForwardingContainer = aContainer;
>+  }
> 
> protected:
>   // IMPORTANT: The ownership implicit in the following member variables
>Index: nsPresShell.cpp
>===================================================================
>RCS file: /cvsroot/mozilla/layout/base/nsPresShell.cpp,v
>retrieving revision 3.855
>diff -u -p -r3.855 nsPresShell.cpp
>--- nsPresShell.cpp	22 Aug 2005 01:55:34 -0000	3.855
>+++ nsPresShell.cpp	22 Aug 2005 18:56:27 -0000
>@@ -1630,12 +1630,6 @@ nsIPresShell::GetVerifyReflowFlags()
> #endif
> }
> 
>-void
>-nsIPresShell::SetForwardingContainer(nsISupports *aContainer)
>-{
>-  mForwardingContainer = do_GetWeakReference(aContainer);
>-}
>-
> //----------------------------------------------------------------------
> 
> nsresult

Flags:

dbaron: review+
dbaron: superreview+
asa: approval1.8b4+

Actions: View | Diff | Review

Attachments on bug 303725: 193004 | 193470