Title: [147927] trunk
- Revision
- 147927
- Author
- [email protected]
- Date
- 2013-04-08 10:24:50 -0700 (Mon, 08 Apr 2013)
Log Message
[GTK] Build Platform as a separate static library
https://bugs.webkit.org/show_bug.cgi?id=114164
Reviewed by Martin Robinson.
.:
* GNUmakefile.am: Add webkit2platform_sources definition.
Source/WebKit2:
This way we reduce a bit the amount of files compiled twice
because of the plugin process.
* GNUmakefile.am:
* GNUmakefile.list.am:
* Platform/gtk/WorkQueueGtk.cpp: Remove unused header.
* Platform/unix/SharedMemoryUnix.cpp: Ditto.
Modified Paths
Diff
Modified: trunk/ChangeLog (147926 => 147927)
--- trunk/ChangeLog 2013-04-08 17:23:37 UTC (rev 147926)
+++ trunk/ChangeLog 2013-04-08 17:24:50 UTC (rev 147927)
@@ -1,3 +1,12 @@
+2013-04-08 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Build Platform as a separate static library
+ https://bugs.webkit.org/show_bug.cgi?id=114164
+
+ Reviewed by Martin Robinson.
+
+ * GNUmakefile.am: Add webkit2platform_sources definition.
+
2013-04-08 Zan Dobersek <[email protected]>
Unreviewed GTK build fix.
Modified: trunk/GNUmakefile.am (147926 => 147927)
--- trunk/GNUmakefile.am 2013-04-08 17:23:37 UTC (rev 147926)
+++ trunk/GNUmakefile.am 2013-04-08 17:24:50 UTC (rev 147927)
@@ -96,6 +96,7 @@
webkit2_h_api :=
webkit2_sources :=
webkit2_built_sources :=
+webkit2platform_sources :=
webkit2gtk_h_api :=
webkit2gtk_built_sources :=
webkit2_web_extension_h_api :=
Modified: trunk/Source/WebKit2/ChangeLog (147926 => 147927)
--- trunk/Source/WebKit2/ChangeLog 2013-04-08 17:23:37 UTC (rev 147926)
+++ trunk/Source/WebKit2/ChangeLog 2013-04-08 17:24:50 UTC (rev 147927)
@@ -1,3 +1,18 @@
+2013-04-08 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Build Platform as a separate static library
+ https://bugs.webkit.org/show_bug.cgi?id=114164
+
+ Reviewed by Martin Robinson.
+
+ This way we reduce a bit the amount of files compiled twice
+ because of the plugin process.
+
+ * GNUmakefile.am:
+ * GNUmakefile.list.am:
+ * Platform/gtk/WorkQueueGtk.cpp: Remove unused header.
+ * Platform/unix/SharedMemoryUnix.cpp: Ditto.
+
2013-04-08 Mikhail Pozdnyakov <[email protected]>
[WK2][EFL] WebView: Add callbacks to the WKViewClient to remove direct access to page viewport controller
Modified: trunk/Source/WebKit2/GNUmakefile.am (147926 => 147927)
--- trunk/Source/WebKit2/GNUmakefile.am 2013-04-08 17:23:37 UTC (rev 147926)
+++ trunk/Source/WebKit2/GNUmakefile.am 2013-04-08 17:24:50 UTC (rev 147927)
@@ -5,6 +5,10 @@
lib_LTLIBRARIES += \
libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@[email protected]
+# Static libraries
+noinst_LTLIBRARIES += \
+ libWebKit2Platform.la
+
# We need to make sure plugin process is always built with gtk2, because plugins like flash
# still use gtk2. Since webcore was built with gtk3, we need to build webcoregtk sources again with gtk2
noinst_LTLIBRARIES += \
@@ -15,6 +19,34 @@
Programs/WebKitPluginProcess
endif
+# Platform
+libWebKit2Platform_la_SOURCES = \
+ $(webkit2platform_sources)
+
+libWebKit2Platform_la_CXXFLAGS = \
+ -fvisibility-inlines-hidden \
+ $(global_cxxflags)
+
+libWebKit2Platform_la_CFLAGS = \
+ -fvisibility=hidden \
+ $(global_cflags)
+
+libWebKit2Platform_la_CPPFLAGS = \
+ -DBUILDING_WEBKIT \
+ $(global_cppflags) \
+ -fno-strict-aliasing \
+ -std=c++11 \
+ -I$(srcdir)/Source \
+ -I$(srcdir)/Source/WTF \
+ -I$(srcdir)/Source/WebKit2/Platform \
+ -I$(srcdir)/Source/WebKit2/Platform/CoreIPC \
+ -I$(srcdir)/Source/WebKit2/Platform/CoreIPC/gtk \
+ -I$(srcdir)/Source/WebKit2/Platform/gtk \
+ -I$(top_builddir)/DerivedSources/WebKit2/include \
+ $(COVERAGE_CFLAGS) \
+ $(GLIB_CFLAGS)
+
+
libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = \
$(webkit2_h_api)
@@ -193,6 +225,7 @@
libPlatformGtk.la \
libWebCoreDOM.la \
libWebCoreGtk.la \
+ libWebKit2Platform.la \
$(CAIRO_LIBS) \
$(CLUTTER_LIBS) \
$(COVERAGE_LDFLAGS) \
@@ -627,6 +660,7 @@
libWebCoreModules.la \
libWebCoreGtk2.la \
libWebCorePlatform.la \
+ libWebKit2Platform.la \
$(CAIRO_LIBS) \
$(COVERAGE_LDFLAGS) \
$(GEOCLUE_LIBS) \
Modified: trunk/Source/WebKit2/GNUmakefile.list.am (147926 => 147927)
--- trunk/Source/WebKit2/GNUmakefile.list.am 2013-04-08 17:23:37 UTC (rev 147926)
+++ trunk/Source/WebKit2/GNUmakefile.list.am 2013-04-08 17:24:50 UTC (rev 147927)
@@ -248,8 +248,7 @@
DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitMarshal.h \
DerivedSources/WebKit2/webkit2gtk/webkit2/WebKitVersion.h
-webkit2_sources += \
- Source/WebKit2/config.h \
+webkit2platform_sources += \
Source/WebKit2/Platform/CoreIPC/ArgumentCoder.h \
Source/WebKit2/Platform/CoreIPC/ArgumentCoders.cpp \
Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h \
@@ -291,7 +290,10 @@
Source/WebKit2/Platform/SharedMemory.h \
Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp \
Source/WebKit2/Platform/WorkQueue.cpp \
- Source/WebKit2/Platform/WorkQueue.h \
+ Source/WebKit2/Platform/WorkQueue.h
+
+webkit2_sources += \
+ Source/WebKit2/config.h \
Source/WebKit2/PluginProcess/PluginControllerProxy.cpp \
Source/WebKit2/PluginProcess/PluginControllerProxy.h \
Source/WebKit2/PluginProcess/PluginCreationParameters.cpp \
@@ -1242,43 +1244,6 @@
DerivedSources/WebKit2/WebProcessConnectionMessages.h
webkit2_plugin_process_sources += \
- Source/WebKit2/Platform/CoreIPC/ArgumentCoder.h \
- Source/WebKit2/Platform/CoreIPC/ArgumentCoders.h \
- Source/WebKit2/Platform/CoreIPC/ArgumentCoders.cpp \
- Source/WebKit2/Platform/CoreIPC/ArgumentDecoder.cpp \
- Source/WebKit2/Platform/CoreIPC/ArgumentDecoder.h \
- Source/WebKit2/Platform/CoreIPC/ArgumentEncoder.cpp \
- Source/WebKit2/Platform/CoreIPC/ArgumentEncoder.h \
- Source/WebKit2/Platform/CoreIPC/Arguments.h \
- Source/WebKit2/Platform/CoreIPC/Attachment.cpp \
- Source/WebKit2/Platform/CoreIPC/Attachment.h \
- Source/WebKit2/Platform/CoreIPC/BinarySemaphore.cpp \
- Source/WebKit2/Platform/CoreIPC/BinarySemaphore.h \
- Source/WebKit2/Platform/CoreIPC/Connection.cpp \
- Source/WebKit2/Platform/CoreIPC/Connection.h \
- Source/WebKit2/Platform/CoreIPC/DataReference.cpp \
- Source/WebKit2/Platform/CoreIPC/DataReference.h \
- Source/WebKit2/Platform/CoreIPC/HandleMessage.h \
- Source/WebKit2/Platform/CoreIPC/MessageDecoder.cpp \
- Source/WebKit2/Platform/CoreIPC/MessageDecoder.h \
- Source/WebKit2/Platform/CoreIPC/MessageEncoder.cpp \
- Source/WebKit2/Platform/CoreIPC/MessageEncoder.h \
- Source/WebKit2/Platform/CoreIPC/MessageReceiver.h \
- Source/WebKit2/Platform/CoreIPC/MessageReceiverMap.cpp \
- Source/WebKit2/Platform/CoreIPC/MessageReceiverMap.h \
- Source/WebKit2/Platform/CoreIPC/MessageSender.h \
- Source/WebKit2/Platform/CoreIPC/StringReference.cpp \
- Source/WebKit2/Platform/CoreIPC/StringReference.h \
- Source/WebKit2/Platform/CoreIPC/unix/AttachmentUnix.cpp \
- Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp \
- Source/WebKit2/Platform/Module.cpp \
- Source/WebKit2/Platform/Module.h \
- Source/WebKit2/Platform/WorkQueue.cpp \
- Source/WebKit2/Platform/WorkQueue.h \
- Source/WebKit2/Platform/SharedMemory.h \
- Source/WebKit2/Platform/gtk/ModuleGtk.cpp \
- Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp \
- Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp \
Source/WebKit2/PluginProcess/PluginControllerProxy.cpp \
Source/WebKit2/PluginProcess/PluginControllerProxy.h \
Source/WebKit2/PluginProcess/PluginCreationParameters.cpp \
Modified: trunk/Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp (147926 => 147927)
--- trunk/Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp 2013-04-08 17:23:37 UTC (rev 147926)
+++ trunk/Source/WebKit2/Platform/gtk/WorkQueueGtk.cpp 2013-04-08 17:24:50 UTC (rev 147927)
@@ -28,7 +28,6 @@
#include "config.h"
#include "WorkQueue.h"
-#include "WKBase.h"
#include <gio/gio.h>
#include <glib.h>
#include <wtf/gobject/GRefPtr.h>
Modified: trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp (147926 => 147927)
--- trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp 2013-04-08 17:23:37 UTC (rev 147926)
+++ trunk/Source/WebKit2/Platform/unix/SharedMemoryUnix.cpp 2013-04-08 17:24:50 UTC (rev 147927)
@@ -31,7 +31,6 @@
#include "ArgumentDecoder.h"
#include "ArgumentEncoder.h"
-#include "WebCoreArgumentCoders.h"
#include <errno.h>
#include <fcntl.h>
#include <stdlib.h>
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
