Changeset 30762 in webkit

Timestamp:

Mar 4, 2008, 1:12:31 PM (17 years ago)

Author:

mitz@apple.com

Message:

WebCore:

Reviewed by Oliver Hunt and Geoffrey Garen.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=17667 <rdar://problem/5779658> REGRESSION (r30587): Document::implicitClose() not called when done loading page (Image does not get scaled to fit)

• loader/loader.cpp: (WebCore::Loader::didFinishLoading): Changed to call setLoadInProgress(false) even for 4xx errors, because that triggers load completion check.

LayoutTests:

Reviewed by Oliver Hunt and Geoffrey Garen.

• extended test to cover ​http://bugs.webkit.org/show_bug.cgi?id=17667 <rdar://problem/5779658> REGRESSION (r30587): Document::implicitClose() not called when done loading page (Image does not get scaled to fit)

• http/tests/misc/missing-style-sheet-expected.txt:
• http/tests/misc/missing-style-sheet.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/misc/missing-style-sheet-expected.txt (modified) (1 diff)
• LayoutTests/http/tests/misc/missing-style-sheet.html (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/loader.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2008-03-04  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Oliver Hunt and Geoffrey Garen.
+
+        - extended test to cover http://bugs.webkit.org/show_bug.cgi?id=17667
+          <rdar://problem/5779658> REGRESSION (r30587): Document::implicitClose() not called when done loading page (Image does not get scaled to fit)
+
+        * http/tests/misc/missing-style-sheet-expected.txt:
+        * http/tests/misc/missing-style-sheet.html:
+
 2008-03-04  Adele Peterson  <adele@apple.com>
 

trunk/LayoutTests/http/tests/misc/missing-style-sheet-expected.txt

@@ -1 @@
-This test passes if it does not ASSERT that the document's pending style sheet count is less than 0.
+This test passes if it does not ASSERT that the document's pending style sheet count is less than 0, and the load event fires.
+PASS: Load event fired.

trunk/LayoutTests/http/tests/misc/missing-style-sheet.html

@@ -2 +2 @@
     if (window.layoutTestController)
         layoutTestController.dumpAsText();
+    function didLoad()
+    {
+        document.getElementById("loadStatus").innerText = "PASS: Load event fired.";
+    }
+    window.addEventListener("load", didLoad);
 </script>
 
 <link href="/adeleandbethrock.css" rel="stylesheet" type="text/css">
 
-This test passes if it does not ASSERT that the document's pending style sheet count is less than 0.  
- 
+This test passes if it does not ASSERT that the document's pending style sheet count is less than 0, and the load event fires.
+<p id="loadStatus">
+FAIL: Load event did not fire.
+</p>

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-04  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Oliver Hunt and Geoffrey Garen.
+
+        - fix http://bugs.webkit.org/show_bug.cgi?id=17667
+          <rdar://problem/5779658> REGRESSION (r30587): Document::implicitClose() not called when done loading page (Image does not get scaled to fit)
+
+        * loader/loader.cpp:
+        (WebCore::Loader::didFinishLoading): Changed to call
+        setLoadInProgress(false) even for 4xx errors, because that triggers
+        load completion check.
+
 2008-03-04  Adele Peterson  <adele@apple.com>
 

trunk/WebCore/loader/loader.cpp

@@ -115 +115 @@
         docLoader->setLoadInProgress(true);
         object->data(loader->resourceData(), true);
-        docLoader->setLoadInProgress(false);
         object->finish();
     }
+
+    docLoader->setLoadInProgress(false);
 
     delete req;