Title: [292628] trunk/Source/WebKit
- Revision
- 292628
- Author
- commit-qu...@webkit.org
- Date
- 2022-04-08 12:54:37 -0700 (Fri, 08 Apr 2022)
Log Message
[WPE][2.36] Build with a11y disabled fails
https://bugs.webkit.org/show_bug.cgi?id=239004
Patch by Philippe Normand <pnorm...@igalia.com> on 2022-04-08
Reviewed by Michael Catanzaro.
Add accessibility build guards.
* UIProcess/Launcher/glib/XDGDBusProxy.cpp:
(WebKit::XDGDBusProxy::XDGDBusProxy):
(WebKit::XDGDBusProxy::launch const):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (292627 => 292628)
--- trunk/Source/WebKit/ChangeLog 2022-04-08 18:41:53 UTC (rev 292627)
+++ trunk/Source/WebKit/ChangeLog 2022-04-08 19:54:37 UTC (rev 292628)
@@ -1,3 +1,16 @@
+2022-04-08 Philippe Normand <pnorm...@igalia.com>
+
+ [WPE][2.36] Build with a11y disabled fails
+ https://bugs.webkit.org/show_bug.cgi?id=239004
+
+ Reviewed by Michael Catanzaro.
+
+ Add accessibility build guards.
+
+ * UIProcess/Launcher/glib/XDGDBusProxy.cpp:
+ (WebKit::XDGDBusProxy::XDGDBusProxy):
+ (WebKit::XDGDBusProxy::launch const):
+
2022-04-08 Elliott Williams <e...@apple.com>
Unreviewed, reverting r292591.
Modified: trunk/Source/WebKit/UIProcess/Launcher/glib/XDGDBusProxy.cpp (292627 => 292628)
--- trunk/Source/WebKit/UIProcess/Launcher/glib/XDGDBusProxy.cpp 2022-04-08 18:41:53 UTC (rev 292627)
+++ trunk/Source/WebKit/UIProcess/Launcher/glib/XDGDBusProxy.cpp 2022-04-08 19:54:37 UTC (rev 292628)
@@ -49,7 +49,9 @@
m_dbusAddress = g_getenv("DBUS_SESSION_BUS_ADDRESS");
break;
case Type::AccessibilityBus:
+#if ENABLE(ACCESSIBILITY)
m_dbusAddress = WebCore::PlatformDisplay::sharedDisplay().accessibilityBusAddress().utf8();
+#endif
break;
}
@@ -156,6 +158,7 @@
break;
}
case Type::AccessibilityBus:
+#if ENABLE(ACCESSIBILITY)
proxyArgs.appendVector(Vector<CString> {
"--sloppy-names",
"--call=org.a11y.atspi.Registry=org.a11y.atspi.Socket.Embed@/org/a11y/atspi/accessible/root",
@@ -166,6 +169,7 @@
"--call=org.a11y.atspi.Registry=org.a11y.atspi.DeviceEventController.NotifyListenersSync@/org/a11y/atspi/registry/deviceeventcontroller",
"--call=org.a11y.atspi.Registry=org.a11y.atspi.DeviceEventController.NotifyListenersAsync@/org/a11y/atspi/registry/deviceeventcontroller",
});
+#endif
break;
}
@@ -197,8 +201,10 @@
ProcessLauncher::LaunchOptions launchOptions;
launchOptions.processType = ProcessLauncher::ProcessType::DBusProxy;
+#if ENABLE(ACCESSIBILITY)
if (m_type == Type::AccessibilityBus && !m_path.isNull())
launchOptions.extraSandboxPaths.add(m_path, SandboxPermission::ReadOnly);
+#endif
GUniqueOutPtr<GError> error;
GRefPtr<GSubprocess> process = bubblewrapSpawn(launcher.get(), launchOptions, argv, &error.outPtr());
if (!process)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
