Magellan Linux

Annotation of /trunk/mozilla-firefox/patches/mozilla-firefox-1.0.7-objectframefix.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 153 - (hide annotations) (download)
Tue May 8 20:52:56 2007 UTC (17 years, 1 month ago) by niro
File size: 884 byte(s)
-import

1 niro 153 Mozilla Bug 292257, https://bugzilla.mozilla.org/show_bug.cgi?id=292257
2     Mozilla crashes under some rare cases when plugin.default_plugin_disabled
3     is true. This patch fixes that. Backported by hansmi@gentoo.org.
4    
5     --- 1/layout/html/base/src/nsObjectFrame.cpp 2005-05-15 00:40:19.000000000 +0200
6     +++ 2/layout/html/base/src/nsObjectFrame.cpp 2005-05-15 00:43:44.000000000 +0200
7     @@ -1720,7 +1720,7 @@
8     break;
9    
10     nsHTMLContainerFrame::CreateViewForFrame(divFrame, this, PR_FALSE);
11     - mFrames.AppendFrame(this, divFrame);
12     + // mFrames.AppendFrame(this, divFrame);
13    
14     rv = NS_NewImageFrame(shell, &imgFrame);
15     if (NS_FAILED(rv))
16     @@ -1756,6 +1756,9 @@
17    
18     if (textFrame)
19     textFrame->Destroy(aPresContext);
20     + } else {
21     + // Creation of all our anonymous content succeeded.
22     + mFrames.AppendFrame(this, divFrame);
23     }
24    
25     nsCOMPtr<nsISupportsArray> array;