Changeset 141615 in webkit


Ignore:
Timestamp:
Feb 1, 2013 11:25:38 AM (11 years ago)
Author:
Nate Chapin
Message:

Cached main resources report a zero identifer on 304s
​https://bugs.webkit.org/show_bug.cgi?id=108402

Reviewed by Adam Barth.

Source/WebCore:

Test: http/tests/cache/iframe-304-crash.html

  • loader/MainResourceLoader.cpp:

(WebCore::MainResourceLoader::responseReceived): Throughout, check m_identifierForLoadWithoutResourceLoader

instead of !loader() to determine whether MainResourceLoader needs to synthesize resource load callbacks.

(WebCore::MainResourceLoader::dataReceived):
(WebCore::MainResourceLoader::didFinishLoading):

LayoutTests:

  • http/tests/cache/iframe-304-crash-expected.txt: Added.
  • http/tests/cache/iframe-304-crash.html: Added.
  • http/tests/cache/resources/iframe304.php: Added.
  • platform/chromium/TestExpectations: New test requires main resource caching, which isn't supported on chromium at the moment.
  • platform/mac/TestExpectations: New test requires main resource caching, which isn't supported on mac at the moment.
Location:
trunk
Files:
3 added
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r141612 r141615  
     12013-02-01  Nate Chapin  <japhet@chromium.org>
     2
     3        Cached main resources report a zero identifer on 304s
     4        https://bugs.webkit.org/show_bug.cgi?id=108402
     5
     6        Reviewed by Adam Barth.
     7
     8        * http/tests/cache/iframe-304-crash-expected.txt: Added.
     9        * http/tests/cache/iframe-304-crash.html: Added.
     10        * http/tests/cache/resources/iframe304.php: Added.
     11        * platform/chromium/TestExpectations: New test requires main resource caching, which isn't supported on chromium at the moment.
     12        * platform/mac/TestExpectations: New test requires main resource caching, which isn't supported on mac at the moment.
     13
    1142013-02-01  Rashmi Shyamasundar  <rashmi.s2@samsung.com>
    215

  • trunk/LayoutTests/platform/chromium/TestExpectations

    r141608 r141615  
    43244324webkit.org/b/107962 http/tests/loading/redirect-methods.html [ Failure ]
    43254325webkit.org/b/107962 http/tests/cache/cached-main-resource.html [ Failure ]
     4326webkit.org/b/107962 http/tests/cache/iframe-304-crash.html [ Failure ]
    43264327
    43274328webkit.org/b/107893 [ MountainLion ] fast/exclusions/shape-inside/shape-inside-first-fit-001.html [ ImageOnlyFailure ]

  • trunk/LayoutTests/platform/mac/TestExpectations

    r141559 r141615  
    13211321
    13221322webkit.org/b/108380 http/tests/cache/cached-main-resource.html [ Failure ]
     1323webkit.org/b/108380 http/tests/cache/iframe-304-crash.html [ Failure ]
    13231324webkit.org/b/108380 http/tests/inspector/resource-har-pages.html [ Failure ]
    13241325webkit.org/b/108380 http/tests/loading/redirect-methods.html [ Failure ]

  • trunk/Source/WebCore/ChangeLog

    r141614 r141615  
     12013-02-01  Nate Chapin  <japhet@chromium.org>
     2
     3        Cached main resources report a zero identifer on 304s
     4        https://bugs.webkit.org/show_bug.cgi?id=108402
     5
     6        Reviewed by Adam Barth.
     7
     8        Test: http/tests/cache/iframe-304-crash.html
     9
     10        * loader/MainResourceLoader.cpp:
     11        (WebCore::MainResourceLoader::responseReceived): Throughout, check m_identifierForLoadWithoutResourceLoader
     12            instead of !loader() to determine whether MainResourceLoader needs to synthesize resource load callbacks.
     13        (WebCore::MainResourceLoader::dataReceived):
     14        (WebCore::MainResourceLoader::didFinishLoading):
     15
    1162013-02-01  Nico Weber  <thakis@chromium.org>
    217

  • trunk/Source/WebCore/loader/MainResourceLoader.cpp

    r141570 r141615  
    434434    m_response = r;
    435435
    436     if (!loader())
     436    if (m_identifierForLoadWithoutResourceLoader)
    437437        frameLoader()->notifier()->dispatchDidReceiveResponse(documentLoader(), identifier(), m_response, 0);
    438438
    … …  
    504504#endif
    505505
    506     if (!loader())
     506    if (m_identifierForLoadWithoutResourceLoader)
    507507        frameLoader()->notifier()->dispatchDidReceiveData(documentLoader(), identifier(), data, length, -1);
    508508
    … …  
    536536    RefPtr<DocumentLoader> dl = documentLoader();
    537537
    538     if (!loader()) {
     538    if (m_identifierForLoadWithoutResourceLoader) {
    539539        frameLoader()->notifier()->dispatchDidFinishLoading(documentLoader(), identifier(), finishTime);
    540540        m_identifierForLoadWithoutResourceLoader = 0;
Note: See TracChangeset for help on using the changeset viewer.