Changeset 30762 in webkit


Ignore:
Timestamp:
Mar 4, 2008 1:12:31 PM (16 years ago)
Author:
mitz@apple.com
Message:

WebCore:

Reviewed by Oliver Hunt and Geoffrey Garen.

  • 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.

  • http/tests/misc/missing-style-sheet-expected.txt:
  • http/tests/misc/missing-style-sheet.html:
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/LayoutTests/ChangeLog

    r30761 r30762  
     12008-03-04  Dan Bernstein  <mitz@apple.com>
     2
     3        Reviewed by Oliver Hunt and Geoffrey Garen.
     4
     5        - extended test to cover http://bugs.webkit.org/show_bug.cgi?id=17667
     6          <rdar://problem/5779658> REGRESSION (r30587): Document::implicitClose() not called when done loading page (Image does not get scaled to fit)
     7
     8        * http/tests/misc/missing-style-sheet-expected.txt:
     9        * http/tests/misc/missing-style-sheet.html:
     10
    1112008-03-04  Adele Peterson  <adele@apple.com>
    212
  • trunk/LayoutTests/http/tests/misc/missing-style-sheet-expected.txt

    r30587 r30762  
    1 This test passes if it does not ASSERT that the document's pending style sheet count is less than 0.
     1This test passes if it does not ASSERT that the document's pending style sheet count is less than 0, and the load event fires.
     2PASS: Load event fired.
  • trunk/LayoutTests/http/tests/misc/missing-style-sheet.html

    r30587 r30762  
    22    if (window.layoutTestController)
    33        layoutTestController.dumpAsText();
     4    function didLoad()
     5    {
     6        document.getElementById("loadStatus").innerText = "PASS: Load event fired.";
     7    }
     8    window.addEventListener("load", didLoad);
    49</script>
    510
    611<link href="/adeleandbethrock.css" rel="stylesheet" type="text/css">
    712
    8 This test passes if it does not ASSERT that the document's pending style sheet count is less than 0. 
    9  
     13This test passes if it does not ASSERT that the document's pending style sheet count is less than 0, and the load event fires.
     14<p id="loadStatus">
     15FAIL: Load event did not fire.
     16</p>
  • trunk/WebCore/ChangeLog

    r30761 r30762  
     12008-03-04  Dan Bernstein  <mitz@apple.com>
     2
     3        Reviewed by Oliver Hunt and Geoffrey Garen.
     4
     5        - fix http://bugs.webkit.org/show_bug.cgi?id=17667
     6          <rdar://problem/5779658> REGRESSION (r30587): Document::implicitClose() not called when done loading page (Image does not get scaled to fit)
     7
     8        * loader/loader.cpp:
     9        (WebCore::Loader::didFinishLoading): Changed to call
     10        setLoadInProgress(false) even for 4xx errors, because that triggers
     11        load completion check.
     12
    1132008-03-04  Adele Peterson  <adele@apple.com>
    214
  • trunk/WebCore/loader/loader.cpp

    r30587 r30762  
    115115        docLoader->setLoadInProgress(true);
    116116        object->data(loader->resourceData(), true);
    117         docLoader->setLoadInProgress(false);
    118117        object->finish();
    119118    }
     119
     120    docLoader->setLoadInProgress(false);
    120121
    121122    delete req;
Note: See TracChangeset for help on using the changeset viewer.