Title: [131843] trunk
- Revision
- 131843
- Author
- [email protected]
- Date
- 2012-10-18 19:35:51 -0700 (Thu, 18 Oct 2012)
Log Message
[EFL] Buildfix if Netscape plugin support is disabled
https://bugs.webkit.org/show_bug.cgi?id=99757
Patch by Laszlo Gombos <[email protected]> on 2012-10-18
Reviewed by Gyuyoung Kim.
.:
Set ENABLE_PLUGIN_PROCESS only if ENABLE_NETSCAPE_PLUGIN_API is set.
* Source/cmake/OptionsEfl.cmake:
Source/WebKit2:
Guard PluginProcessMainUnix.cpp with ENABLE(PLUGIN_PROCESS).
* PluginProcess/unix/PluginProcessMainUnix.cpp:
Modified Paths
Diff
Modified: trunk/ChangeLog (131842 => 131843)
--- trunk/ChangeLog 2012-10-19 02:33:29 UTC (rev 131842)
+++ trunk/ChangeLog 2012-10-19 02:35:51 UTC (rev 131843)
@@ -1,3 +1,14 @@
+2012-10-18 Laszlo Gombos <[email protected]>
+
+ [EFL] Buildfix if Netscape plugin support is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=99757
+
+ Reviewed by Gyuyoung Kim.
+
+ Set ENABLE_PLUGIN_PROCESS only if ENABLE_NETSCAPE_PLUGIN_API is set.
+
+ * Source/cmake/OptionsEfl.cmake:
+
2012-10-18 Pablo Flouret <[email protected]>
Implement css3-conditional's @supports rule
Modified: trunk/Source/WebKit2/ChangeLog (131842 => 131843)
--- trunk/Source/WebKit2/ChangeLog 2012-10-19 02:33:29 UTC (rev 131842)
+++ trunk/Source/WebKit2/ChangeLog 2012-10-19 02:35:51 UTC (rev 131843)
@@ -1,3 +1,14 @@
+2012-10-18 Laszlo Gombos <[email protected]>
+
+ [EFL] Buildfix if Netscape plugin support is disabled
+ https://bugs.webkit.org/show_bug.cgi?id=99757
+
+ Reviewed by Gyuyoung Kim.
+
+ Guard PluginProcessMainUnix.cpp with ENABLE(PLUGIN_PROCESS).
+
+ * PluginProcess/unix/PluginProcessMainUnix.cpp:
+
2012-10-18 Anders Carlsson <[email protected]>
Deprecate the current version of MessageReceiverMap::addMessageReceiver
Modified: trunk/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp (131842 => 131843)
--- trunk/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp 2012-10-19 02:33:29 UTC (rev 131842)
+++ trunk/Source/WebKit2/PluginProcess/unix/PluginProcessMainUnix.cpp 2012-10-19 02:35:51 UTC (rev 131843)
@@ -28,6 +28,8 @@
#include "config.h"
#include "PluginProcessMainUnix.h"
+#if ENABLE(PLUGIN_PROCESS)
+
#include "Logging.h"
#include "NetscapePlugin.h"
#include "PluginProcess.h"
@@ -111,3 +113,5 @@
}
} // namespace WebKit
+
+#endif
Modified: trunk/Source/cmake/OptionsEfl.cmake (131842 => 131843)
--- trunk/Source/cmake/OptionsEfl.cmake 2012-10-19 02:33:29 UTC (rev 131842)
+++ trunk/Source/cmake/OptionsEfl.cmake 2012-10-19 02:35:51 UTC (rev 131843)
@@ -125,7 +125,7 @@
ADD_DEFINITIONS(-DWTF_USE_FREETYPE=1)
ADD_DEFINITIONS(-DWTF_USE_HARFBUZZ_NG=1)
-IF (ENABLE_WEBKIT2)
+IF (ENABLE_WEBKIT2 AND ENABLE_NETSCAPE_PLUGIN_API)
SET(ENABLE_PLUGIN_PROCESS 1)
ENDIF ()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
