Changeset 129380 in webkit

Timestamp:

Sep 24, 2012 9:32:05 AM (12 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] WebKitWebView:is-loading is not updated when the is loaded is started by link clicked navigation action
​https://bugs.webkit.org/show_bug.cgi?id=97458

Reviewed by Xan Lopez.

WebKitWebView:is-loading is set to TRUE when the load is started
by using the API. We want to make sure that both URI and
is-loading are updated before load-started is emitted, so we can
update both right before emitting load-started.

• UIProcess/API/gtk/WebKitWebView.cpp:

(webkitWebViewEmitLoadChanged): Update both uri and is-loading
properties before emitting load-changed signal with
WEBKIT_LOAD_STARTED.
(webkit_web_view_load_uri): Don't call
webkitWebViewSetIsLoading().
(webkit_web_view_load_html): Ditto.
(webkit_web_view_load_alternate_html): Ditto.
(webkit_web_view_load_plain_text): Ditto.
(webkit_web_view_load_request): Ditto.
(webkit_web_view_reload): Ditto.
(webkit_web_view_reload_bypass_cache): Ditto.
(webkit_web_view_go_back): Ditto.
(webkit_web_view_go_forward): Ditto.
(webkit_web_view_go_to_back_forward_list_item): Ditto.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/WebKitWebView.cpp (modified) (11 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-09-24  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] WebKitWebView:is-loading is not updated when the is loaded is started by link clicked navigation action
+        https://bugs.webkit.org/show_bug.cgi?id=97458
+
+        Reviewed by Xan Lopez.
+
+        WebKitWebView:is-loading is set to TRUE when the load is started
+        by using the API. We want to make sure that both URI and
+        is-loading are updated before load-started is emitted, so we can
+        update both right before emitting load-started.
+
+        * UIProcess/API/gtk/WebKitWebView.cpp:
+        (webkitWebViewEmitLoadChanged): Update both uri and is-loading
+        properties before emitting load-changed signal with
+        WEBKIT_LOAD_STARTED.
+        (webkit_web_view_load_uri): Don't call
+        webkitWebViewSetIsLoading().
+        (webkit_web_view_load_html): Ditto.
+        (webkit_web_view_load_alternate_html): Ditto.
+        (webkit_web_view_load_plain_text): Ditto.
+        (webkit_web_view_load_request): Ditto.
+        (webkit_web_view_reload): Ditto.
+        (webkit_web_view_reload_bypass_cache): Ditto.
+        (webkit_web_view_go_back): Ditto.
+        (webkit_web_view_go_forward): Ditto.
+        (webkit_web_view_go_to_back_forward_list_item): Ditto.
+
 2012-09-24  Byungwoo Lee  <bw80.lee@samsung.com>
 

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp

@@ -1156 +1156 @@
 static void webkitWebViewEmitLoadChanged(WebKitWebView* webView, WebKitLoadEvent loadEvent)
 {
-    if (loadEvent == WEBKIT_LOAD_FINISHED) {
+    if (loadEvent == WEBKIT_LOAD_STARTED)
+        webkitWebViewSetIsLoading(webView, true);
+    else if (loadEvent == WEBKIT_LOAD_FINISHED) {
         webkitWebViewSetIsLoading(webView, false);
         webView->priv->waitingForMainResource = false;
@@ -1562 +1564 @@
     WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
     WKPageLoadURL(toAPI(page), url.get());
-    webkitWebViewSetIsLoading(webView, true);
 }
 
@@ -1590 +1591 @@
     WKRetainPtr<WKURLRef> baseURIRef = baseURI ? adoptWK(WKURLCreateWithUTF8CString(baseURI)) : 0;
     WKPageLoadHTMLString(toAPI(page), contentRef.get(), baseURIRef.get());
-    webkitWebViewSetIsLoading(webView, true);
 }
 
@@ -1617 +1617 @@
     WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
     WKPageLoadAlternateHTMLString(toAPI(page), htmlString.get(), baseURL.get(), contentURL.get());
-    webkitWebViewSetIsLoading(webView, true);
 }
 
@@ -1637 +1636 @@
     WKRetainPtr<WKStringRef> plainTextRef(AdoptWK, WKStringCreateWithUTF8CString(plainText));
     WKPageLoadPlainTextString(toAPI(page), plainTextRef.get());
-    webkitWebViewSetIsLoading(webView, true);
 }
 
@@ -1658 +1656 @@
     WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
     WKPageLoadURLRequest(toAPI(page), wkRequest.get());
-    webkitWebViewSetIsLoading(webView, true);
 }
 
@@ -1690 +1687 @@
 
     WKPageReload(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))));
-    webkitWebViewSetIsLoading(webView, true);
 }
 
@@ -1705 +1701 @@
 
     WKPageReloadFromOrigin(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))));
-    webkitWebViewSetIsLoading(webView, true);
 }
 
@@ -1758 +1753 @@
 
     WKPageGoBack(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))));
-    webkitWebViewSetIsLoading(webView, true);
 }
 
@@ -1789 +1783 @@
 
     WKPageGoForward(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))));
-    webkitWebViewSetIsLoading(webView, true);
 }
 
@@ -1963 +1956 @@
     WKPageGoToBackForwardListItem(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))),
                                   webkitBackForwardListItemGetWKItem(listItem));
-    webkitWebViewSetIsLoading(webView, true);
 }