Title: [294103] trunk/Source/WebKit
- Revision
- 294103
- Author
- [email protected]
- Date
- 2022-05-12 07:27:48 -0700 (Thu, 12 May 2022)
Log Message
REGRESSION(r291038) [GTK][WPE] Fix build without remote inspector
https://bugs.webkit.org/show_bug.cgi?id=240305
Patch by Olivier Blin <[email protected]> on 2022-05-12
Reviewed by Michael Catanzaro.
* Shared/WebProcessCreationParameters.cpp:
(WebKit::WebProcessCreationParameters::encode const):
(WebKit::WebProcessCreationParameters::decode):
* Shared/WebProcessCreationParameters.h:
* UIProcess/glib/WebProcessPoolGLib.cpp:
(WebKit::WebProcessPool::platformInitializeWebProcess):
* WebProcess/glib/WebProcessGLib.cpp:
(WebKit::WebProcess::platformInitializeWebProcess):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (294102 => 294103)
--- trunk/Source/WebKit/ChangeLog 2022-05-12 13:56:19 UTC (rev 294102)
+++ trunk/Source/WebKit/ChangeLog 2022-05-12 14:27:48 UTC (rev 294103)
@@ -1,3 +1,19 @@
+2022-05-12 Olivier Blin <[email protected]>
+
+ REGRESSION(r291038) [GTK][WPE] Fix build without remote inspector
+ https://bugs.webkit.org/show_bug.cgi?id=240305
+
+ Reviewed by Michael Catanzaro.
+
+ * Shared/WebProcessCreationParameters.cpp:
+ (WebKit::WebProcessCreationParameters::encode const):
+ (WebKit::WebProcessCreationParameters::decode):
+ * Shared/WebProcessCreationParameters.h:
+ * UIProcess/glib/WebProcessPoolGLib.cpp:
+ (WebKit::WebProcessPool::platformInitializeWebProcess):
+ * WebProcess/glib/WebProcessGLib.cpp:
+ (WebKit::WebProcess::platformInitializeWebProcess):
+
2022-05-12 Yousuke Kimoto <[email protected]>
[WinCairo] Fix a compile error due to InspectorResourceURLSchemeHandler
Modified: trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp (294102 => 294103)
--- trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp 2022-05-12 13:56:19 UTC (rev 294102)
+++ trunk/Source/WebKit/Shared/WebProcessCreationParameters.cpp 2022-05-12 14:27:48 UTC (rev 294103)
@@ -208,8 +208,10 @@
#if USE(GLIB)
encoder << applicationID;
encoder << applicationName;
+#if ENABLE(REMOTE_INSPECTOR)
encoder << inspectorServerAddress;
#endif
+#endif
#if USE(ATSPI)
encoder << accessibilityBusAddress;
@@ -558,6 +560,7 @@
if (!decoder.decode(parameters.applicationName))
return false;
+#if ENABLE(REMOTE_INSPECTOR)
std::optional<CString> inspectorServerAddress;
decoder >> inspectorServerAddress;
if (!inspectorServerAddress)
@@ -564,6 +567,7 @@
return false;
parameters.inspectorServerAddress = WTFMove(*inspectorServerAddress);
#endif
+#endif
#if USE(ATSPI)
std::optional<String> accessibilityBusAddress;
Modified: trunk/Source/WebKit/Shared/WebProcessCreationParameters.h (294102 => 294103)
--- trunk/Source/WebKit/Shared/WebProcessCreationParameters.h 2022-05-12 13:56:19 UTC (rev 294102)
+++ trunk/Source/WebKit/Shared/WebProcessCreationParameters.h 2022-05-12 14:27:48 UTC (rev 294103)
@@ -249,8 +249,10 @@
#if USE(GLIB)
String applicationID;
String applicationName;
+#if ENABLE(REMOTE_INSPECTOR)
CString inspectorServerAddress;
#endif
+#endif
#if USE(ATSPI)
String accessibilityBusAddress;
Modified: trunk/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp (294102 => 294103)
--- trunk/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp 2022-05-12 13:56:19 UTC (rev 294102)
+++ trunk/Source/WebKit/UIProcess/glib/WebProcessPoolGLib.cpp 2022-05-12 14:27:48 UTC (rev 294103)
@@ -32,10 +32,13 @@
#include "MemoryPressureMonitor.h"
#include "WebMemoryPressureHandler.h"
#include "WebProcessCreationParameters.h"
-#include <_javascript_Core/RemoteInspector.h>
#include <WebCore/PlatformDisplay.h>
#include <wtf/FileSystem.h>
+#if ENABLE(REMOTE_INSPECTOR)
+#include <_javascript_Core/RemoteInspector.h>
+#endif
+
#if USE(GSTREAMER)
#include <WebCore/GStreamerCommon.h>
#endif
@@ -119,7 +122,9 @@
parameters.applicationID = String::fromLatin1(g_application_get_application_id(app));
parameters.applicationName = String::fromLatin1(g_get_application_name());
+#if ENABLE(REMOTE_INSPECTOR)
parameters.inspectorServerAddress = Inspector::RemoteInspector::inspectorServerAddress();
+#endif
#if USE(ATSPI)
static const char* accessibilityBusAddress = getenv("WEBKIT_A11Y_BUS_ADDRESS");
Modified: trunk/Source/WebKit/WebProcess/glib/WebProcessGLib.cpp (294102 => 294103)
--- trunk/Source/WebKit/WebProcess/glib/WebProcessGLib.cpp 2022-05-12 13:56:19 UTC (rev 294102)
+++ trunk/Source/WebKit/WebProcess/glib/WebProcessGLib.cpp 2022-05-12 14:27:48 UTC (rev 294103)
@@ -31,7 +31,10 @@
#include "WebKitWebExtensionPrivate.h"
#include "WebPage.h"
#include "WebProcessCreationParameters.h"
+
+#if ENABLE(REMOTE_INSPECTOR)
#include <_javascript_Core/RemoteInspector.h>
+#endif
#if USE(GSTREAMER)
#include <WebCore/GStreamerCommon.h>
@@ -153,8 +156,10 @@
if (!parameters.applicationName.isEmpty())
WebCore::setApplicationName(parameters.applicationName);
+#if ENABLE(REMOTE_INSPECTOR)
if (!parameters.inspectorServerAddress.isNull())
Inspector::RemoteInspector::setInspectorServerAddress(WTFMove(parameters.inspectorServerAddress));
+#endif
#if USE(ATSPI)
AccessibilityAtspi::singleton().connect(parameters.accessibilityBusAddress);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
