Diff
Modified: trunk/Source/WebKit2/ChangeLog (140336 => 140337)
--- trunk/Source/WebKit2/ChangeLog 2013-01-21 16:14:34 UTC (rev 140336)
+++ trunk/Source/WebKit2/ChangeLog 2013-01-21 16:17:26 UTC (rev 140337)
@@ -1,3 +1,16 @@
+2013-01-21 Gustavo Noronha Silva <[email protected]>
+
+ REGRESSION (r140285): GTK uses WKPageResourceLoadClient which was removed
+ https://bugs.webkit.org/show_bug.cgi?id=107421
+
+ Unreviewed buildfix.
+
+ * GNUmakefile.list.am:
+ * UIProcess/API/gtk/WebKitResourceLoadClient.cpp: Removed.
+ * UIProcess/API/gtk/WebKitResourceLoadClient.h: Removed.
+ * UIProcess/API/gtk/WebKitWebView.cpp: No longer attach unexisting ResourceLoadClient.
+ (webkitWebViewConstructed):
+
2013-01-21 Sheriff Bot <[email protected]>
Unreviewed, rolling out r139781.
Modified: trunk/Source/WebKit2/GNUmakefile.list.am (140336 => 140337)
--- trunk/Source/WebKit2/GNUmakefile.list.am 2013-01-21 16:14:34 UTC (rev 140336)
+++ trunk/Source/WebKit2/GNUmakefile.list.am 2013-01-21 16:17:26 UTC (rev 140337)
@@ -723,8 +723,6 @@
Source/WebKit2/UIProcess/API/gtk/WebKitPrivate.cpp \
Source/WebKit2/UIProcess/API/gtk/WebKitRequestManagerClient.cpp \
Source/WebKit2/UIProcess/API/gtk/WebKitRequestManagerClient.h \
- Source/WebKit2/UIProcess/API/gtk/WebKitResourceLoadClient.cpp \
- Source/WebKit2/UIProcess/API/gtk/WebKitResourceLoadClient.h \
Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecision.cpp \
Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecision.h \
Source/WebKit2/UIProcess/API/gtk/WebKitResponsePolicyDecisionPrivate.h \
Deleted: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResourceLoadClient.cpp (140336 => 140337)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResourceLoadClient.cpp 2013-01-21 16:14:34 UTC (rev 140336)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResourceLoadClient.cpp 2013-01-21 16:17:26 UTC (rev 140337)
@@ -1,112 +0,0 @@
-/*
- * Copyright (C) 2012 Igalia S.L.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "config.h"
-#include "WebKitResourceLoadClient.h"
-
-#include "WebContext.h"
-#include "WebKitURIRequestPrivate.h"
-#include "WebKitURIResponsePrivate.h"
-#include "WebKitWebResourcePrivate.h"
-#include "WebKitWebViewBasePrivate.h"
-#include "WebKitWebViewPrivate.h"
-#include "WebURLResponse.h"
-#include <WebKit2/WKString.h>
-#include <wtf/gobject/GOwnPtr.h>
-#include <wtf/gobject/GRefPtr.h>
-#include <wtf/text/CString.h>
-
-using namespace WebCore;
-using namespace WebKit;
-
-static void didInitiateLoadForResource(WKPageRef, WKFrameRef wkFrame, uint64_t resourceIdentifier, WKURLRequestRef wkRequest, bool pageIsProvisionallyLoading, const void* clientInfo)
-{
- GRefPtr<WebKitURIRequest> request = adoptGRef(webkitURIRequestCreateForResourceRequest(toImpl(wkRequest)->resourceRequest()));
- webkitWebViewResourceLoadStarted(WEBKIT_WEB_VIEW(clientInfo), toImpl(wkFrame), resourceIdentifier, request.get());
-}
-
-static void didSendRequestForResource(WKPageRef, WKFrameRef, uint64_t resourceIdentifier, WKURLRequestRef wkRequest, WKURLResponseRef wkRedirectResponse, const void* clientInfo)
-{
- GRefPtr<WebKitWebResource> resource = webkitWebViewGetLoadingWebResource(WEBKIT_WEB_VIEW(clientInfo), resourceIdentifier);
- if (!resource)
- return;
-
- GRefPtr<WebKitURIRequest> request = adoptGRef(webkitURIRequestCreateForResourceRequest(toImpl(wkRequest)->resourceRequest()));
- GRefPtr<WebKitURIResponse> redirectResponse = wkRedirectResponse ? adoptGRef(webkitURIResponseCreateForResourceResponse(toImpl(wkRedirectResponse)->resourceResponse())) : 0;
- webkitWebResourceSentRequest(resource.get(), request.get(), redirectResponse.get());
-}
-
-static void didReceiveResponseForResource(WKPageRef, WKFrameRef, uint64_t resourceIdentifier, WKURLResponseRef wkResponse, const void* clientInfo)
-{
- GRefPtr<WebKitWebResource> resource = webkitWebViewGetLoadingWebResource(WEBKIT_WEB_VIEW(clientInfo), resourceIdentifier);
- if (!resource)
- return;
-
- GRefPtr<WebKitURIResponse> response = adoptGRef(webkitURIResponseCreateForResourceResponse(toImpl(wkResponse)->resourceResponse()));
- webkitWebResourceSetResponse(resource.get(), response.get());
-}
-
-static void didReceiveContentLengthForResource(WKPageRef, WKFrameRef, uint64_t resourceIdentifier, uint64_t contentLength, const void* clientInfo)
-{
- GRefPtr<WebKitWebResource> resource = webkitWebViewGetLoadingWebResource(WEBKIT_WEB_VIEW(clientInfo), resourceIdentifier);
- if (!resource)
- return;
-
- webkitWebResourceNotifyProgress(resource.get(), contentLength);
-}
-
-static void didFinishLoadForResource(WKPageRef, WKFrameRef, uint64_t resourceIdentifier, const void* clientInfo)
-{
- GRefPtr<WebKitWebResource> resource = webkitWebViewResourceLoadFinished(WEBKIT_WEB_VIEW(clientInfo), resourceIdentifier);
- if (!resource)
- return;
-
- webkitWebResourceFinished(resource.get());
-}
-
-static void didFailLoadForResource(WKPageRef, WKFrameRef, uint64_t resourceIdentifier, WKErrorRef wkError, const void* clientInfo)
-{
- WebKitWebView* webView = WEBKIT_WEB_VIEW(clientInfo);
- GRefPtr<WebKitWebResource> resource = webkitWebViewGetLoadingWebResource(webView, resourceIdentifier);
- if (!resource)
- return;
-
- const ResourceError& resourceError = toImpl(wkError)->platformError();
- GOwnPtr<GError> webError(g_error_new_literal(g_quark_from_string(resourceError.domain().utf8().data()),
- resourceError.errorCode(),
- resourceError.localizedDescription().utf8().data()));
- webkitWebResourceFailed(resource.get(), webError.get());
- webkitWebViewRemoveLoadingWebResource(webView, resourceIdentifier);
-}
-
-void attachResourceLoadClientToView(WebKitWebView* webView)
-{
- WKPageResourceLoadClient wkResourceLoadClient = {
- kWKPageResourceLoadClientCurrentVersion,
- webView, // ClientInfo
- didInitiateLoadForResource,
- didSendRequestForResource,
- didReceiveResponseForResource,
- didReceiveContentLengthForResource,
- didFinishLoadForResource,
- didFailLoadForResource,
- };
- WKPageRef wkPage = toAPI(webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(webView)));
- WKPageSetPageResourceLoadClient(wkPage, &wkResourceLoadClient);
-}
Deleted: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResourceLoadClient.h (140336 => 140337)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResourceLoadClient.h 2013-01-21 16:14:34 UTC (rev 140336)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitResourceLoadClient.h 2013-01-21 16:17:26 UTC (rev 140337)
@@ -1,27 +0,0 @@
-/*
- * Copyright (C) 2012 Igalia S.L.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public License
- * along with this library; see the file COPYING.LIB. If not, write to
- * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#ifndef WebKitResourceLoadClient_h
-#define WebKitResourceLoadClient_h
-
-#include "WebKitWebView.h"
-
-void attachResourceLoadClientToView(WebKitWebView*);
-
-#endif
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (140336 => 140337)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2013-01-21 16:14:34 UTC (rev 140336)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2013-01-21 16:17:26 UTC (rev 140337)
@@ -41,7 +41,6 @@
#include "WebKitPolicyClient.h"
#include "WebKitPrintOperationPrivate.h"
#include "WebKitPrivate.h"
-#include "WebKitResourceLoadClient.h"
#include "WebKitResponsePolicyDecision.h"
#include "WebKitScriptDialogPrivate.h"
#include "WebKitSettingsPrivate.h"
@@ -464,7 +463,6 @@
attachLoaderClientToView(webView);
attachUIClientToView(webView);
attachPolicyClientToView(webView);
- attachResourceLoadClientToView(webView);
attachFullScreenClientToView(webView);
attachContextMenuClientToView(webView);
attachFormClientToView(webView);
Modified: trunk/Tools/ChangeLog (140336 => 140337)
--- trunk/Tools/ChangeLog 2013-01-21 16:14:34 UTC (rev 140336)
+++ trunk/Tools/ChangeLog 2013-01-21 16:17:26 UTC (rev 140337)
@@ -1,3 +1,13 @@
+2013-01-21 Gustavo Noronha Silva <[email protected]>
+
+ REGRESSION (r140285): GTK uses WKPageResourceLoadClient which was removed
+ https://bugs.webkit.org/show_bug.cgi?id=107421
+
+ Unreviewed build fix.
+
+ * Scripts/run-gtk-tests:
+ (TestRunner): skip Resource tests.
+
2013-01-21 Christophe Dumez <[email protected]>
[EFL][WKTR] platformRunUntil() should keep the main loop running
Modified: trunk/Tools/Scripts/run-gtk-tests (140336 => 140337)
--- trunk/Tools/Scripts/run-gtk-tests 2013-01-21 16:14:34 UTC (rev 140336)
+++ trunk/Tools/Scripts/run-gtk-tests 2013-01-21 16:17:26 UTC (rev 140337)
@@ -68,7 +68,7 @@
SkippedTest("unittests/testwebview", "/webkit/webview/icon-uri", "Test times out in GTK Linux 64-bit Release bot", 82328),
SkippedTest("unittests/testatk", "/webkit/atk/getTextInParagraphAndBodyModerate", "Test fails", 105538),
SkippedTest("WebKit2APITests/TestInspectorServer", SkippedTest.ENTIRE_SUITE, "Test times out", 105866),
- SkippedTest("WebKit2APITests/TestResources", "/webkit2/WebKitWebView/resources", "Test is flaky in GTK Linux 32-bit Release bot", 82868),
+ SkippedTest("WebKit2APITests/TestResources", SkippedTest.ENTIRE_SUITE, "Need to be reimplemented using injected bundle", 107421),
SkippedTest("WebKit2APITests/TestWebKitAccessibility", "/webkit2/WebKitAccessibility/atspi-basic-hierarchy", "Test fails", 100408),
SkippedTest("WebKit2APITests/TestWebKitFindController", "/webkit2/WebKitFindController/hide", "Test always fails in Xvfb", 89810),
SkippedTest("WebKit2APITests/TestWebKitWebContext", "/webkit2/WebKitWebContext/uri-scheme", "Test fails", 104779),
