Title: [131340] trunk/Source/WebKit2
- Revision
- 131340
- Author
- roger_f...@apple.com
- Date
- 2012-10-15 12:59:51 -0700 (Mon, 15 Oct 2012)
Log Message
Unreviewed. Partial build fix for Windows after r131308.
* WebKit2Prefix.h:
* WebProcess/WebKitMain.cpp:
(WebKitMain):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (131339 => 131340)
--- trunk/Source/WebKit2/ChangeLog 2012-10-15 19:53:00 UTC (rev 131339)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-15 19:59:51 UTC (rev 131340)
@@ -1,3 +1,11 @@
+2012-10-15 Roger Fong <roger_f...@apple.com>
+
+ Unreviewed. Partial build fix for Windows after r131308.
+
+ * WebKit2Prefix.h:
+ * WebProcess/WebKitMain.cpp:
+ (WebKitMain):
+
2012-10-15 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed, rolling out r131306 and r131307.
Modified: trunk/Source/WebKit2/WebKit2Prefix.h (131339 => 131340)
--- trunk/Source/WebKit2/WebKit2Prefix.h 2012-10-15 19:53:00 UTC (rev 131339)
+++ trunk/Source/WebKit2/WebKit2Prefix.h 2012-10-15 19:59:51 UTC (rev 131340)
@@ -57,6 +57,10 @@
#endif // PLATFORM(MAC)
+#if !PLATFORM(WIN)
+#define ENABLE_SHARED_WORKER_PROCESS 1
+#endif
+
/* When C++ exceptions are disabled, the C++ library defines |try| and |catch|
* to allow C++ code that expects exceptions to build. These definitions
* interfere with Objective-C++ uses of Objective-C exception handlers, which
Modified: trunk/Source/WebKit2/WebProcess/WebKitMain.cpp (131339 => 131340)
--- trunk/Source/WebKit2/WebProcess/WebKitMain.cpp 2012-10-15 19:53:00 UTC (rev 131339)
+++ trunk/Source/WebKit2/WebProcess/WebKitMain.cpp 2012-10-15 19:59:51 UTC (rev 131340)
@@ -28,7 +28,6 @@
#include "PluginProcessMain.h"
#include "ProcessLauncher.h"
-#include "SharedWorkerProcessMain.h"
#include "WebProcessMain.h"
#include <wtf/text/CString.h>
@@ -36,6 +35,10 @@
#include "NetworkProcessMain.h"
#endif
+#if ENABLE(SHARED_WORKER_PROCESS)
+#include "SharedWorkerProcessMain.h"
+#endif
+
#if PLATFORM(MAC)
#include <objc/objc-auto.h>
#elif PLATFORM(WIN)
@@ -65,8 +68,10 @@
#else
break;
#endif
+#if ENABLE(SHARED_WORKER_PROCESS)
case ProcessLauncher::SharedWorkerProcess:
return SharedWorkerProcessMain(commandLine);
+#endif
}
return EXIT_FAILURE;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
