Diff
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog (145050 => 145051)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog 2013-03-07 08:52:51 UTC (rev 145050)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/ChangeLog 2013-03-07 09:03:53 UTC (rev 145051)
@@ -1,28 +1,3 @@
-2013-03-06 Xan Lopez <x...@igalia.com>
-
- [GTK] When the WebProcess crashes, a signal should be emitted
- https://bugs.webkit.org/show_bug.cgi?id=105180
-
- Reviewed by Carlos Garcia Campos.
-
- Emit a "web-process-crashed" signal when the WebProcess crashes. This
- is useful, for example, to show an error page in a web browser
- like Chrome does.
-
- * UIProcess/API/gtk/WebKitLoaderClient.cpp:
- (processDidCrash):
- (attachLoaderClientToView):
- * UIProcess/API/gtk/WebKitWebContext.cpp:
- (webkitWebContextWebProcessCrashed):
- * UIProcess/API/gtk/WebKitWebContextPrivate.h:
- * UIProcess/API/gtk/tests/TestWebExtensions.cpp:
- (testWebExtensionGetTitle):
- (webProcessCrashedCallback):
- (testWebExtensionAbortProcess):
- (beforeAll):
- * UIProcess/API/gtk/tests/WebExtensionTest.cpp:
- (methodCallCallback):
-
2013-03-06 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Add WebKitWebViewGroup to WebKit2 GTK+ API
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp (145050 => 145051)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp 2013-03-07 08:52:51 UTC (rev 145050)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp 2013-03-07 09:03:53 UTC (rev 145051)
@@ -24,7 +24,6 @@
#include "WebKit2GtkAuthenticationDialog.h"
#include "WebKitBackForwardListPrivate.h"
#include "WebKitURIResponsePrivate.h"
-#include "WebKitWebContextPrivate.h"
#include "WebKitWebViewBasePrivate.h"
#include "WebKitWebViewPrivate.h"
#include <wtf/gobject/GOwnPtr.h>
@@ -135,11 +134,6 @@
webkitWebViewHandleAuthenticationChallenge(WEBKIT_WEB_VIEW(clientInfo), toImpl(authenticationChallenge));
}
-static void processDidCrash(WKPageRef page, const void* clientInfo)
-{
- webkitWebContextWebProcessCrashed(webkit_web_view_get_context(WEBKIT_WEB_VIEW(clientInfo)));
-}
-
void attachLoaderClientToView(WebKitWebView* webView)
{
WKPageLoaderClient wkLoaderClient = {
@@ -166,7 +160,7 @@
didChangeProgress, // didFinishProgress
0, // didBecomeUnresponsive
0, // didBecomeResponsive
- processDidCrash,
+ 0, // processDidCrash
didChangeBackForwardList,
0, // shouldGoToBackForwardListItem
0, // didFailToInitializePlugin
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp (145050 => 145051)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2013-03-07 08:52:51 UTC (rev 145050)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/WebKitWebContext.cpp 2013-03-07 09:03:53 UTC (rev 145051)
@@ -79,7 +79,6 @@
enum {
DOWNLOAD_STARTED,
- WEB_PROCESS_CRASHED,
LAST_SIGNAL
};
@@ -171,19 +170,6 @@
g_cclosure_marshal_VOID__OBJECT,
G_TYPE_NONE, 1,
WEBKIT_TYPE_DOWNLOAD);
-
- /**
- * WebKitWebContext::web-process-crashed:
- * @context: the #WebKitWebContext
- *
- * This signal is emitted when the web process crashes.
- */
- signals[WEB_PROCESS_CRASHED] = g_signal_new("web-process-crashed",
- G_TYPE_FROM_CLASS(gObjectClass),
- G_SIGNAL_RUN_LAST,
- 0, 0, 0,
- g_cclosure_marshal_VOID__VOID,
- G_TYPE_NONE, 0);
}
static CString injectedBundleDirectory()
@@ -834,11 +820,6 @@
g_signal_emit(context, signals[DOWNLOAD_STARTED], 0, download);
}
-void webkitWebContextWebProcessCrashed(WebKitWebContext* context)
-{
- g_signal_emit(context, signals[WEB_PROCESS_CRASHED], 0);
-}
-
WebContext* webkitWebContextGetContext(WebKitWebContext* context)
{
g_assert(WEBKIT_IS_WEB_CONTEXT(context));
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/WebKitWebContextPrivate.h (145050 => 145051)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/WebKitWebContextPrivate.h 2013-03-07 08:52:51 UTC (rev 145050)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/WebKitWebContextPrivate.h 2013-03-07 09:03:53 UTC (rev 145051)
@@ -47,6 +47,5 @@
void webkitWebContextWebViewDestroyed(WebKitWebContext*, WebKitWebView*);
WebKitWebView* webkitWebContextGetWebViewForPage(WebKitWebContext*, WebKit::WebPageProxy*);
WebKitWebViewGroup* webkitWebContextGetDefaultWebViewGroup(WebKitWebContext*);
-void webkitWebContextWebProcessCrashed(WebKitWebContext*);
#endif // WebKitWebContextPrivate_h
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/TestWebExtensions.cpp (145050 => 145051)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/TestWebExtensions.cpp 2013-03-07 08:52:51 UTC (rev 145050)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/TestWebExtensions.cpp 2013-03-07 09:03:53 UTC (rev 145051)
@@ -25,7 +25,7 @@
static WebKitTestBus* bus;
-static void testWebExtensionGetTitle(WebViewTest* test, gconstpointer)
+static void testWebExtension(WebViewTest* test, gconstpointer)
{
test->loadHtml("<html><head><title>WebKitGTK+ Web Extensions Test</title></head><body></body></html>", 0);
test->waitUntilLoadFinished();
@@ -72,32 +72,6 @@
g_dbus_connection_signal_unsubscribe(connection, id);
}
-static void webProcessCrashedCallback(WebKitWebContext* context, WebViewTest* test)
-{
- test->quitMainLoop();
-}
-
-static void testWebKitWebContextProcessCrashed(WebViewTest* test, gconstpointer)
-{
- test->loadHtml("<html></html>", 0);
- test->waitUntilLoadFinished();
-
- g_signal_connect(webkit_web_context_get_default(), "web-process-crashed",
- G_CALLBACK(webProcessCrashedCallback), test);
-
- GRefPtr<GDBusProxy> proxy = adoptGRef(bus->createProxy("org.webkit.gtk.WebExtensionTest",
- "/org/webkit/gtk/WebExtensionTest", "org.webkit.gtk.WebExtensionTest", test->m_mainLoop));
-
- GRefPtr<GVariant> result = adoptGRef(g_dbus_proxy_call_sync(
- proxy.get(),
- "AbortProcess",
- 0,
- G_DBUS_CALL_FLAGS_NONE,
- -1, 0, 0));
- g_assert(!result);
- g_main_loop_run(test->m_mainLoop);
-}
-
void beforeAll()
{
webkit_web_context_set_web_extensions_directory(webkit_web_context_get_default(), WEBKIT_TEST_WEB_EXTENSIONS_DIR);
@@ -105,9 +79,8 @@
if (!bus->run())
return;
- WebViewTest::add("WebKitWebExtension", "dom-document-title", testWebExtensionGetTitle);
+ WebViewTest::add("WebKitWebExtension", "dom-document-title", testWebExtension);
WebViewTest::add("WebKitWebExtension", "document-loaded-signal", testDocumentLoadedSignal);
- WebViewTest::add("WebKitWebContext", "web-process-crashed", testWebKitWebContextProcessCrashed);
}
void afterAll()
Modified: releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/WebExtensionTest.cpp (145050 => 145051)
--- releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/WebExtensionTest.cpp 2013-03-07 08:52:51 UTC (rev 145050)
+++ releases/WebKitGTK/webkit-2.0/Source/WebKit2/UIProcess/API/gtk/tests/WebExtensionTest.cpp 2013-03-07 09:03:53 UTC (rev 145051)
@@ -20,7 +20,6 @@
#include "config.h"
#include <gio/gio.h>
-#include <stdlib.h>
#include <string.h>
#include <webkit2/webkit-web-extension.h>
#include <wtf/gobject/GOwnPtr.h>
@@ -36,8 +35,6 @@
" <signal name='URIChanged'>"
" <arg type='s' name='uri' direction='out'/>"
" </signal>"
- " <method name='AbortProcess'>"
- " </method>"
" </interface>"
"</node>";
@@ -109,8 +106,6 @@
WebKitDOMDocument* document = webkit_web_page_get_dom_document(page);
GOwnPtr<char> title(webkit_dom_document_get_title(document));
g_dbus_method_invocation_return_value(invocation, g_variant_new("(s)", title.get()));
- } else if (!g_strcmp0(methodName, "AbortProcess")) {
- abort();
}
}
