Changeset 100185 in webkit

Timestamp:

Nov 14, 2011, 1:48:23 PM (15 years ago)

Author:

andersca@apple.com

Message:

Only send progress notifications for the main frame
​https://bugs.webkit.org/show_bug.cgi?id=72302

Reviewed by Sam Weinig.

Since it's impossible in the API to tell which frame the progress notifications are for, just send them to the main frame for now.

• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::postProgressStartedNotification):
(WebKit::WebFrameLoaderClient::postProgressEstimateChangedNotification):
(WebKit::WebFrameLoaderClient::postProgressFinishedNotification):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (3 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-11-14  Anders Carlsson  <andersca@apple.com>
+
+        Only send progress notifications for the main frame
+        https://bugs.webkit.org/show_bug.cgi?id=72302
+
+        Reviewed by Sam Weinig.
+
+        Since it's impossible in the API to tell which frame the progress notifications are for, just send them to the main frame for now.
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::postProgressStartedNotification):
+        (WebKit::WebFrameLoaderClient::postProgressEstimateChangedNotification):
+        (WebKit::WebFrameLoaderClient::postProgressFinishedNotification):
+
 2011-11-14  Alexis Menard  <alexis.menard@openbossa.org>
 

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -762 +762 @@
 void WebFrameLoaderClient::postProgressStartedNotification()
 {
-    if (WebPage* webPage = m_frame->page())
-        webPage->send(Messages::WebPageProxy::DidStartProgress());
+    if (WebPage* webPage = m_frame->page()) {
+        if (m_frame->isMainFrame())
+            webPage->send(Messages::WebPageProxy::DidStartProgress());
+    }
 }
 
@@ -769 +771 @@
 {
     if (WebPage* webPage = m_frame->page()) {
-        double progress = webPage->corePage()->progress()->estimatedProgress();
-        webPage->send(Messages::WebPageProxy::DidChangeProgress(progress));
-
+        if (m_frame->isMainFrame()) {
+            double progress = webPage->corePage()->progress()->estimatedProgress();
+            webPage->send(Messages::WebPageProxy::DidChangeProgress(progress));
+        }
     }
 }
@@ -777 +780 @@
 void WebFrameLoaderClient::postProgressFinishedNotification()
 {
-    if (WebPage* webPage = m_frame->page())
-        webPage->send(Messages::WebPageProxy::DidFinishProgress());
+    if (WebPage* webPage = m_frame->page()) {
+        if (m_frame->isMainFrame())
+            webPage->send(Messages::WebPageProxy::DidFinishProgress());
+    }
 }