From 3749d61e1f7a59f5ec5067e560af1eb610c82015 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Sun, 12 Aug 2012 09:27:39 +0200 Subject: Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365) New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream --- Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp') diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp index 8cd149c5b..6c3bf920a 100644 --- a/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp +++ b/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp @@ -65,16 +65,7 @@ static void didCommitLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef us if (!WKFrameIsMainFrame(frame)) return; - WebKitWebView* webView = WEBKIT_WEB_VIEW(clientInfo); - WebKitWebResource* resource = webkit_web_view_get_main_resource(webView); - if (resource) { - // We might not have a resource if this load is a content replacement. - // FIXME: For some reason, when going back/forward this callback is emitted even before - // didInitiateLoadForResource(), so we don't have a main resource at this point either. - webkitURIResponseSetCertificateInfo(webkit_web_resource_get_response(resource), WKFrameGetCertificateInfo(frame)); - } - - webkitWebViewLoadChanged(webView, WEBKIT_LOAD_COMMITTED); + webkitWebViewLoadChanged(WEBKIT_WEB_VIEW(clientInfo), WEBKIT_LOAD_COMMITTED); } static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, WKTypeRef userData, const void* clientInfo) -- cgit v1.2.1