Commit 67db46a6 authored by commit-queue@webkit.org's avatar commit-queue@webkit.org
Browse files

[GTK] [WK2] Unused variable in webkitWebViewLoadChanged

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

Patch by Alberto Garcia <agarcia@igalia.com> on 2012-10-03
Reviewed by Martin Robinson.

Use the priv variable to directly access private attributes
instead of dereferencing webView->priv all the time.
Fixes -Wunused-variable.

* UIProcess/API/gtk/WebKitWebView.cpp:
(webkitWebViewLoadChanged):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@130295 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent f2df59ed
2012-10-03 Alberto Garcia <agarcia@igalia.com>
[GTK] [WK2] Unused variable in webkitWebViewLoadChanged
https://bugs.webkit.org/show_bug.cgi?id=98271
Reviewed by Martin Robinson.
Use the priv variable to directly access private attributes
instead of dereferencing webView->priv all the time.
Fixes -Wunused-variable.
* UIProcess/API/gtk/WebKitWebView.cpp:
(webkitWebViewLoadChanged):
2012-10-03 Christophe Dumez <christophe.dumez@intel.com>
[EFL][WK2] Implement focus/unfocus in UIClient
......
......@@ -1288,25 +1288,25 @@ void webkitWebViewLoadChanged(WebKitWebView* webView, WebKitLoadEvent loadEvent)
webkitWebViewEmitDelayedLoadEvents(webView);
webkitWebViewCancelFaviconRequest(webView);
webView->priv->loadingResourcesMap.clear();
webView->priv->mainResource = 0;
webView->priv->waitingForMainResource = false;
priv->loadingResourcesMap.clear();
priv->mainResource = 0;
priv->waitingForMainResource = false;
} else if (loadEvent == WEBKIT_LOAD_COMMITTED) {
webkitWebViewRequestFavicon(webView);
webView->priv->subresourcesMap.clear();
if (!webView->priv->mainResource) {
priv->subresourcesMap.clear();
if (!priv->mainResource) {
// When a page is loaded from the history cache, the main resource load callbacks
// are called when the main frame load is finished. We want to make sure there's a
// main resource available when load has been committed, so we delay the emission of
// load-changed signal until main resource object has been created.
webView->priv->waitingForMainResource = true;
priv->waitingForMainResource = true;
} else
setCertificateToMainResource(webView);
}
if (webView->priv->waitingForMainResource)
webView->priv->lastDelayedEvent = loadEvent;
if (priv->waitingForMainResource)
priv->lastDelayedEvent = loadEvent;
else
webkitWebViewEmitLoadChanged(webView, loadEvent);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment