Back out bug 459443 for now, until the patch in bug 474389 gets reviewed
authorBoris Zbarsky <bzbarsky@mit.edu>
Tue, 20 Jan 2009 22:54:52 -0500
changeset 23988 4ff2e2cf9459b5b214b4762bca5e51254acb21f6
parent 23987 44d8c5d92a441697092e7712194cacbc8ee97c9d
child 23989 71a49097a2fd50b6f6559fe6b26e75aeaaa477a3
push id4829
push userbzbarsky@mozilla.com
push dateWed, 21 Jan 2009 03:55:15 +0000
treeherdermozilla-central@4ff2e2cf9459 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs459443, 474389
milestone1.9.2a1pre
Back out bug 459443 for now, until the patch in bug 474389 gets reviewed
docshell/base/nsDocShell.cpp
layout/reftests/bugs/reftest.list
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -5529,17 +5529,18 @@ nsDocShell::DetachEditorFromWindow(nsISH
     }
 #endif // DEBUG
 
 }
 
 void
 nsDocShell::DetachEditorFromWindow()
 {
-    DetachEditorFromWindow(mOSHE);
+    if (mOSHE)
+        DetachEditorFromWindow(mOSHE);
 }
 
 nsresult
 nsDocShell::CaptureState()
 {
     if (!mOSHE || mOSHE == mLSHE) {
         // No entry to save into, or we're replacing the existing entry.
         return NS_ERROR_FAILURE;
--- a/layout/reftests/bugs/reftest.list
+++ b/layout/reftests/bugs/reftest.list
@@ -1001,17 +1001,17 @@ fails-if(MOZ_WIDGET_TOOLKIT=="cocoa") ==
 == 458487-1h.html 458487-1-ref.html
 == 458487-2.html 458487-2-ref.html
 == 458487-3.html 458487-3-ref.html
 == 458487-4a.html 458487-4-ref.html
 == 458487-4b.html 458487-4-ref.html
 == 458487-4c.html 458487-4-ref.html
 == 458487-5a.html 458487-5-ref.html
 == 458487-5b.html 458487-5-ref.html
-== 459443-1.html 459443-1-ref.html
+fails == 459443-1.html 459443-1-ref.html
 == 459613-1.html 459613-1-ref.html
 == 460012-1.html 460012-1-ref.html
 == 461266-1.html 461266-1-ref.html
 fails == 461512-1.html 461512-1-ref.html # Bug 461512
 == 462844-1.html 462844-ref.html
 == 462844-2.html 462844-ref.html
 == 462844-3.html 462844-ref.html
 == 462844-4.html 462844-ref.html