Not reviewed, emergency test fix.

        - avoid crash on layout tests.

        Patched up my last change so that  widgets don't crash.

        * loader/FrameLoader.cpp:
        (WebCore::FrameLoader::mainReceivedCompleteError):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@21543 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index bb30e97..31d3a3d 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2007-05-17  Maciej Stachowiak  <mjs@apple.com>
+
+        Not reviewed, emergency test fix.
+
+        - avoid crash on layout tests.
+        
+        Patched up my last change so that  widgets don't crash.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::mainReceivedCompleteError):
+
 2007-05-17  Antti Koivisto  <antti@apple.com>
 
         Reviewed by Darin.

diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 26d4df9..90ee04f 100644 (file)
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -4200,7 +4200,8 @@ void FrameLoader::mainReceivedCompleteError(DocumentLoader* loader, const Resour
     loader->setPrimaryLoadComplete(true);
     m_client->dispatchDidLoadMainResource(activeDocumentLoader());
     checkCompleted();
-    checkLoadComplete();
+    if (m_frame->page())
+        checkLoadComplete();
 }
 
 void FrameLoader::mainReceivedError(const ResourceError& error, bool isComplete)