Modified: trunk/Source/WebKit2/ChangeLog (129379 => 129380)
--- trunk/Source/WebKit2/ChangeLog 2012-09-24 16:25:16 UTC (rev 129379)
+++ trunk/Source/WebKit2/ChangeLog 2012-09-24 16:32:05 UTC (rev 129380)
@@ -1,3 +1,31 @@
+2012-09-24 Carlos Garcia Campos <[email protected]>
+
+ [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 <[email protected]>
[EFL][WK2] Change the install path for libewk2UnitTestInjectedBundleSample.so.
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (129379 => 129380)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2012-09-24 16:25:16 UTC (rev 129379)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2012-09-24 16:32:05 UTC (rev 129380)
@@ -1155,7 +1155,9 @@
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;
webkitWebViewDisconnectMainResourceResponseChangedSignalHandler(webView);
@@ -1561,7 +1563,6 @@
WKRetainPtr<WKURLRef> url(AdoptWK, WKURLCreateWithUTF8CString(uri));
WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
WKPageLoadURL(toAPI(page), url.get());
- webkitWebViewSetIsLoading(webView, true);
}
/**
@@ -1589,7 +1590,6 @@
WKRetainPtr<WKStringRef> contentRef(AdoptWK, WKStringCreateWithUTF8CString(content));
WKRetainPtr<WKURLRef> baseURIRef = baseURI ? adoptWK(WKURLCreateWithUTF8CString(baseURI)) : 0;
WKPageLoadHTMLString(toAPI(page), contentRef.get(), baseURIRef.get());
- webkitWebViewSetIsLoading(webView, true);
}
/**
@@ -1616,7 +1616,6 @@
WKRetainPtr<WKURLRef> baseURL = baseURI ? adoptWK(WKURLCreateWithUTF8CString(baseURI)) : 0;
WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
WKPageLoadAlternateHTMLString(toAPI(page), htmlString.get(), baseURL.get(), contentURL.get());
- webkitWebViewSetIsLoading(webView, true);
}
/**
@@ -1636,7 +1635,6 @@
WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
WKRetainPtr<WKStringRef> plainTextRef(AdoptWK, WKStringCreateWithUTF8CString(plainText));
WKPageLoadPlainTextString(toAPI(page), plainTextRef.get());
- webkitWebViewSetIsLoading(webView, true);
}
/**
@@ -1657,7 +1655,6 @@
WKRetainPtr<WKURLRequestRef> wkRequest(AdoptWK, WKURLRequestCreateWithWKURL(wkURL.get()));
WebPageProxy* page = webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView));
WKPageLoadURLRequest(toAPI(page), wkRequest.get());
- webkitWebViewSetIsLoading(webView, true);
}
/**
@@ -1689,7 +1686,6 @@
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
WKPageReload(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))));
- webkitWebViewSetIsLoading(webView, true);
}
/**
@@ -1704,7 +1700,6 @@
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
WKPageReloadFromOrigin(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))));
- webkitWebViewSetIsLoading(webView, true);
}
/**
@@ -1757,7 +1752,6 @@
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
WKPageGoBack(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))));
- webkitWebViewSetIsLoading(webView, true);
}
/**
@@ -1788,7 +1782,6 @@
g_return_if_fail(WEBKIT_IS_WEB_VIEW(webView));
WKPageGoForward(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))));
- webkitWebViewSetIsLoading(webView, true);
}
/**
@@ -1962,7 +1955,6 @@
WKPageGoToBackForwardListItem(toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView))),
webkitBackForwardListItemGetWKItem(listItem));
- webkitWebViewSetIsLoading(webView, true);
}
/**
