Title: [237512] releases/WebKitGTK/webkit-2.22/Source/WebKit
- Revision
- 237512
- Author
- [email protected]
- Date
- 2018-10-28 06:43:11 -0700 (Sun, 28 Oct 2018)
Log Message
Merged r237191 - [GLib] Build error with RemoteInspector disabled
https://bugs.webkit.org/show_bug.cgi?id=190623
Reviewed by Michael Catanzaro.
Compilation guards added to ensure the build still works when the
Remote WebInspector has been disabled.
* UIProcess/API/glib/WebKitAutomationSession.cpp:
* UIProcess/API/glib/WebKitAutomationSessionPrivate.h:
* UIProcess/RemoteWebInspectorProxy.cpp:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog (237511 => 237512)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog 2018-10-28 13:43:05 UTC (rev 237511)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/ChangeLog 2018-10-28 13:43:11 UTC (rev 237512)
@@ -1,3 +1,17 @@
+2018-10-16 Philippe Normand <[email protected]>
+
+ [GLib] Build error with RemoteInspector disabled
+ https://bugs.webkit.org/show_bug.cgi?id=190623
+
+ Reviewed by Michael Catanzaro.
+
+ Compilation guards added to ensure the build still works when the
+ Remote WebInspector has been disabled.
+
+ * UIProcess/API/glib/WebKitAutomationSession.cpp:
+ * UIProcess/API/glib/WebKitAutomationSessionPrivate.h:
+ * UIProcess/RemoteWebInspectorProxy.cpp:
+
2018-10-09 Claudio Saavedra <[email protected]>
[WPE] Explicitly link against gmodule where used
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/glib/WebKitAutomationSession.cpp (237511 => 237512)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/glib/WebKitAutomationSession.cpp 2018-10-28 13:43:05 UTC (rev 237511)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/glib/WebKitAutomationSession.cpp 2018-10-28 13:43:11 UTC (rev 237512)
@@ -84,7 +84,9 @@
void didDisconnectFromRemote(WebAutomationSession&) override
{
+#if ENABLE(REMOTE_INSPECTOR)
webkitWebContextWillCloseAutomationSession(m_session->priv->webContext);
+#endif
}
void requestNewPageWithOptions(WebAutomationSession&, API::AutomationSessionBrowsingContextOptions, CompletionHandler<void(WebPageProxy*)>&& completionHandler) override
@@ -288,6 +290,7 @@
G_TYPE_NONE);
}
+#if ENABLE(REMOTE_INSPECTOR)
WebKitAutomationSession* webkitAutomationSessionCreate(WebKitWebContext* webContext, const char* sessionID, const Inspector::RemoteInspector::Client::SessionCapabilities& capabilities)
{
auto* session = WEBKIT_AUTOMATION_SESSION(g_object_new(WEBKIT_TYPE_AUTOMATION_SESSION, "id", sessionID, nullptr));
@@ -301,6 +304,7 @@
}
return session;
}
+#endif
WebAutomationSession& webkitAutomationSessionGetSession(WebKitAutomationSession* session)
{
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/glib/WebKitAutomationSessionPrivate.h (237511 => 237512)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/glib/WebKitAutomationSessionPrivate.h 2018-10-28 13:43:05 UTC (rev 237511)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/API/glib/WebKitAutomationSessionPrivate.h 2018-10-28 13:43:11 UTC (rev 237512)
@@ -24,7 +24,10 @@
#include "WebKitWebContext.h"
#include <_javascript_Core/RemoteInspector.h>
+#if ENABLE(REMOTE_INSPECTOR)
WebKitAutomationSession* webkitAutomationSessionCreate(WebKitWebContext*, const char* sessionID, const Inspector::RemoteInspector::Client::SessionCapabilities&);
+#endif
+
WebKit::WebAutomationSession& webkitAutomationSessionGetSession(WebKitAutomationSession*);
String webkitAutomationSessionGetBrowserName(WebKitAutomationSession*);
String webkitAutomationSessionGetBrowserVersion(WebKitAutomationSession*);
Modified: releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/RemoteWebInspectorProxy.cpp (237511 => 237512)
--- releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/RemoteWebInspectorProxy.cpp 2018-10-28 13:43:05 UTC (rev 237511)
+++ releases/WebKitGTK/webkit-2.22/Source/WebKit/UIProcess/RemoteWebInspectorProxy.cpp 2018-10-28 13:43:11 UTC (rev 237512)
@@ -148,7 +148,7 @@
platformCloseFrontendPageAndWindow();
}
-#if !PLATFORM(MAC) && !PLATFORM(GTK)
+#if !ENABLE(REMOTE_INSPECTOR) || (!PLATFORM(MAC) && !PLATFORM(GTK))
WebPageProxy* RemoteWebInspectorProxy::platformCreateFrontendPageAndWindow()
{
notImplemented();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
