Changeset 90471 in webkit
- Timestamp:
- Jul 6, 2011 10:59:59 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r90470 r90471 1 2011-07-06 Nate Chapin <japhet@chromium.org> 2 3 Test updates for https://bugs.webkit.org/show_bug.cgi?id=62066. 4 5 Reviewed by Adam Barth. 6 7 * http/tests/loading/cross-origin-XHR-willLoadRequest-expected.txt: 8 * http/tests/misc/favicon-loads-with-icon-loading-override-expected.txt: 9 * http/tests/misc/link-rel-icon-beforeload-expected.txt: 10 1 11 2011-07-06 Mihai Parparita <mihaip@chromium.org> 2 12 -
trunk/LayoutTests/http/tests/loading/cross-origin-XHR-willLoadRequest-expected.txt
r89598 r90471 3 3 main frame - didFinishDocumentLoadForFrame 4 4 main frame - didHandleOnloadEventsForFrame 5 main frame - didFinishLoadForFrame 5 6 CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://localhost:8000/loading/resources/foo.txt. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin. 6 main frame - didFinishLoadForFrame7 7 The console message above should report failure to load foo.txt due to cross-origin access, not a network error. -
trunk/LayoutTests/http/tests/misc/favicon-loads-with-icon-loading-override-expected.txt
r89598 r90471 3 3 http://127.0.0.1:8000/misc/favicon-loads-with-icon-loading-override.html - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/misc/favicon-loads-with-icon-loading-override.html, http status code 200> 4 4 http://127.0.0.1:8000/misc/resources/favicon.ico - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/misc/resources/favicon.ico, main document URL http://127.0.0.1:8000/misc/favicon-loads-with-icon-loading-override.html, http method GET> redirectResponse (null) 5 http://127.0.0.1:8000/misc/favicon-loads-with-icon-loading-override.html - didFinishLoading6 http://127.0.0.1:8000/misc/resources/favicon.ico - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/misc/resources/favicon.ico, http status code 200>7 5 https://bugs.webkit.org/show_bug.cgi?id=58292 - Provide new setting to allow site icon loading despite disabling automatic image loading in general. 8 6 Resource load callbacks will reveal if the favicon still gets loaded if automatic image loading is disabled, but site icon image loading override is enabled. -
trunk/LayoutTests/http/tests/misc/link-rel-icon-beforeload-expected.txt
r89598 r90471 3 3 http://127.0.0.1:8000/misc/link-rel-icon-beforeload.html - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/misc/link-rel-icon-beforeload.html, http status code 200> 4 4 http://127.0.0.1:8000/favicon.ico - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/favicon.ico, main document URL http://127.0.0.1:8000/misc/link-rel-icon-beforeload.html, http method GET> redirectResponse (null) 5 http://127.0.0.1:8000/misc/link-rel-icon-beforeload.html - didFinishLoading6 http://127.0.0.1:8000/favicon.ico - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/favicon.ico, http status code 200>7 5 This test should not show a request for the favicon dont-load-this.ico, since the beforeload handler on the favicon link returns false. Therefore, if the resource request list below shows a request for dont-load-this.ico, then this test has failed. -
trunk/Source/WebCore/ChangeLog
r90460 r90471 1 2011-07-06 Nate Chapin <japhet@chromium.org> 2 3 Don't let all subresources keep isLoadingInAPISense() from 4 returning false, only requests that affect 5 CachedResourceRequest::requestCount(). 6 https://bugs.webkit.org/show_bug.cgi?id=62066 7 8 Reviewed by Adam Barth. 9 10 * dom/Document.cpp: 11 (WebCore::Document::Document): 12 (WebCore::Document::dispatchWindowLoadEvent): 13 * dom/Document.h: 14 (WebCore::Document::loadEventFinished): 15 * loader/DocumentLoader.cpp: 16 (WebCore::DocumentLoader::isLoadingInAPISense): 17 1 18 2011-07-06 Pavel Feldman <pfeldman@google.com> 2 19 -
trunk/Source/WebCore/dom/Document.cpp
r89598 r90471 388 388 , m_titleSetExplicitly(false) 389 389 , m_updateFocusAppearanceTimer(this, &Document::updateFocusAppearanceTimerFired) 390 , m_loadEventFinished(false) 390 391 , m_startTime(currentTime()) 391 392 , m_overMinimumLayoutThreshold(false) … … 3401 3402 return; 3402 3403 domWindow->dispatchLoadEvent(); 3404 m_loadEventFinished = true; 3403 3405 } 3404 3406 -
trunk/Source/WebCore/dom/Document.h
r89780 r90471 1000 1000 1001 1001 bool processingLoadEvent() const { return m_processingLoadEvent; } 1002 bool loadEventFinished() const { return m_loadEventFinished; } 1002 1003 1003 1004 #if ENABLE(DATABASE) … … 1281 1282 1282 1283 Element* m_cssTarget; 1283 1284 1285 // FIXME: Merge these 2 variables into an enum. Also, FrameLoader::m_didCallImplicitClose 1286 // is almost a duplication of this data, so that should probably get merged in too. 1284 1287 bool m_processingLoadEvent; 1288 bool m_loadEventFinished; 1289 1285 1290 RefPtr<SerializedScriptValue> m_pendingStateObject; 1286 1291 double m_startTime; -
trunk/Source/WebCore/loader/DocumentLoader.cpp
r89715 r90471 438 438 // but we still need to consider subframes. 439 439 if (frameLoader()->state() != FrameStateComplete) { 440 if (!m_primaryLoadComplete && isLoading()) 440 Document* doc = m_frame->document(); 441 if ((!m_primaryLoadComplete || !m_frame->document()->loadEventFinished()) && isLoading()) 441 442 return true; 442 if (!m_subresourceLoaders.isEmpty())443 return true;444 Document* doc = m_frame->document();445 443 if (doc->cachedResourceLoader()->requestCount()) 446 444 return true;
Note: See TracChangeset
for help on using the changeset viewer.