Changeset 51548 in webkit

Timestamp:

Dec 1, 2009 10:41:36 AM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-01 Xiyuan Xia <​xiyuan@chromium.org>

Reviewed by Darin Fisher.

Only fire start/stop events when main frame is not loading.

​https://bugs.webkit.org/show_bug.cgi?id=31838

• src/FrameLoaderClientImpl.cpp: (WebKit::FrameLoaderClientImpl::dispatchDidChangeLocationWithinPage):

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/FrameLoaderClientImpl.cpp (modified) (2 diffs)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2009-12-01  Xiyuan Xia  <xiyuan@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        Only fire start/stop events when main frame is not loading.
+
+        https://bugs.webkit.org/show_bug.cgi?id=31838
+
+        * src/FrameLoaderClientImpl.cpp:
+        (WebKit::FrameLoaderClientImpl::dispatchDidChangeLocationWithinPage):
+
 2009-11-27  Yury Semikhatsky  <yurys@chromium.org>
 

trunk/WebKit/chromium/src/FrameLoaderClientImpl.cpp

@@ -540 +540 @@
     // some events for our delegate.
     WebViewImpl* webView = m_webFrame->viewImpl();
-    if (webView->client())
+
+    // Flag of whether frame loader is completed. Generate didStartLoading and
+    // didStopLoading only when loader is completed so that we don't fire
+    // them for fragment redirection that happens in window.onload handler.
+    // See https://bugs.webkit.org/show_bug.cgi?id=31838
+    bool loaderCompleted =
+        !m_webFrame->frame()->page()->mainFrame()->loader()->isLoading();
+
+    // Generate didStartLoading if loader is completed.
+    if (webView->client() && loaderCompleted)
         webView->client()->didStartLoading();
 
@@ -586 +595 @@
         m_webFrame->client()->didChangeLocationWithinPage(m_webFrame, isNewNavigation);
 
-    if (webView->client())
+    // Generate didStopLoading if loader is completed.
+    if (webView->client() && loaderCompleted)
         webView->client()->didStopLoading();
 }