Title: [174061] trunk/Source/WebKit2
- Revision
- 174061
- Author
- [email protected]
- Date
- 2014-09-29 08:30:50 -0700 (Mon, 29 Sep 2014)
Log Message
Fix !ENABLE(INSPECTOR) build after r173929
https://bugs.webkit.org/show_bug.cgi?id=137210
Patch by Tibor Meszaros <[email protected]> on 2014-09-29
Reviewed by Timothy Hatcher.
* UIProcess/WebProcessProxy.cpp:
(WebKit::WebProcessProxy::getLaunchOptions):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (174060 => 174061)
--- trunk/Source/WebKit2/ChangeLog 2014-09-29 15:16:22 UTC (rev 174060)
+++ trunk/Source/WebKit2/ChangeLog 2014-09-29 15:30:50 UTC (rev 174061)
@@ -1,3 +1,13 @@
+2014-09-29 Tibor Meszaros <[email protected]>
+
+ Fix !ENABLE(INSPECTOR) build after r173929
+ https://bugs.webkit.org/show_bug.cgi?id=137210
+
+ Reviewed by Timothy Hatcher.
+
+ * UIProcess/WebProcessProxy.cpp:
+ (WebKit::WebProcessProxy::getLaunchOptions):
+
2014-09-29 Carlos Garcia Campos <[email protected]>
REGRESSION(r172919): WebKitPluginProcess fails to scan GTK+2 plugins after r172919.
Modified: trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp (174060 => 174061)
--- trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-09-29 15:16:22 UTC (rev 174060)
+++ trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp 2014-09-29 15:30:50 UTC (rev 174061)
@@ -116,8 +116,10 @@
void WebProcessProxy::getLaunchOptions(ProcessLauncher::LaunchOptions& launchOptions)
{
launchOptions.processType = ProcessLauncher::WebProcess;
+#if ENABLE(INSPECTOR)
if (&m_context.get() == &WebInspectorProxy::inspectorContext())
launchOptions.extraInitializationData.add(ASCIILiteral("inspector-process"), ASCIILiteral("1"));
+#endif
platformGetLaunchOptions(launchOptions);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
