Changeset 51548 in webkit
- Timestamp:
- Dec 1, 2009 10:41:36 AM (14 years ago)
- Location:
- trunk/WebKit/chromium
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit/chromium/ChangeLog
r51456 r51548 1 2009-12-01 Xiyuan Xia <xiyuan@chromium.org> 2 3 Reviewed by Darin Fisher. 4 5 Only fire start/stop events when main frame is not loading. 6 7 https://bugs.webkit.org/show_bug.cgi?id=31838 8 9 * src/FrameLoaderClientImpl.cpp: 10 (WebKit::FrameLoaderClientImpl::dispatchDidChangeLocationWithinPage): 11 1 12 2009-11-27 Yury Semikhatsky <yurys@chromium.org> 2 13 -
trunk/WebKit/chromium/src/FrameLoaderClientImpl.cpp
r51350 r51548 540 540 // some events for our delegate. 541 541 WebViewImpl* webView = m_webFrame->viewImpl(); 542 if (webView->client()) 542 543 // Flag of whether frame loader is completed. Generate didStartLoading and 544 // didStopLoading only when loader is completed so that we don't fire 545 // them for fragment redirection that happens in window.onload handler. 546 // See https://bugs.webkit.org/show_bug.cgi?id=31838 547 bool loaderCompleted = 548 !m_webFrame->frame()->page()->mainFrame()->loader()->isLoading(); 549 550 // Generate didStartLoading if loader is completed. 551 if (webView->client() && loaderCompleted) 543 552 webView->client()->didStartLoading(); 544 553 … … 586 595 m_webFrame->client()->didChangeLocationWithinPage(m_webFrame, isNewNavigation); 587 596 588 if (webView->client()) 597 // Generate didStopLoading if loader is completed. 598 if (webView->client() && loaderCompleted) 589 599 webView->client()->didStopLoading(); 590 600 }
Note: See TracChangeset
for help on using the changeset viewer.