Changeset 160368 in webkit

Timestamp:

Dec 10, 2013 8:43:25 AM (10 years ago)

Author:

Martin Robinson

Message:

[GTK] [CMake] Add support for building the WebKit injected bundle
​https://bugs.webkit.org/show_bug.cgi?id=116373

Reviewed by Gustavo Noronha Silva.

• PlatformGTK.cmake: Add support for building the InjectedBundle and link the WebKit2

shared library against the GObject DOM bindings.

• WebProcess/gtk/WebGtkExtensionManager.h: Properly export symbols used by the InjectedBundle.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• PlatformGTK.cmake (modified) (6 diffs)
• WebProcess/gtk/WebGtkExtensionManager.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-12-10  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] [CMake] Add support for building the WebKit injected bundle
+        https://bugs.webkit.org/show_bug.cgi?id=116373
+
+        Reviewed by Gustavo Noronha Silva.
+
+        * PlatformGTK.cmake: Add support for building the InjectedBundle and link the WebKit2
+        shared library against the GObject DOM bindings.
+        * WebProcess/gtk/WebGtkExtensionManager.h: Properly export symbols used by the InjectedBundle.
+
 2013-12-10  Kwang Yul Seo  <skyul@company100.net>
 

trunk/Source/WebKit2/PlatformGTK.cmake

@@ +1 @@
+set(DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR ${DERIVED_SOURCES_DIR}/webkitdom)
 set(DERIVED_SOURCES_WEBKIT2GTK_DIR ${DERIVED_SOURCES_DIR}/webkit2gtk)
 set(WEBKIT2_BUILT_API_DIR ${DERIVED_SOURCES_WEBKIT2GTK_DIR}/webkit2)
@@ -364 +365 @@
 list(INSERT WebKit2_INCLUDE_DIRECTORIES 0
     "${WEBKIT2_FORWARDING_HEADERS_DIR}"
+    "${WEBKIT2_FORWARDING_HEADERS_DIR}/webkit2extension"
     "${WEBKIT2_BUILT_API_DIR}"
     "${DERIVED_SOURCES_WEBKIT2GTK_DIR}"
@@ -386 +388 @@
     "${WEBKIT2_DIR}/UIProcess/gtk"
     "${WEBKIT2_DIR}/UIProcess/soup"
+    "${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk"
     "${WEBKIT2_DIR}/WebProcess/gtk"
     "${WEBKIT2_DIR}/WebProcess/soup"
@@ -435 +438 @@
 )
 
+add_custom_target(fake-installed-webextension-headers
+    mkdir -p ${WEBKIT2_FORWARDING_HEADERS_DIR}/webkit2extension
+    COMMAND ln -n -s -f ${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/gtk ${WEBKIT2_FORWARDING_HEADERS_DIR}/webkit2extension/webkit2
+)
+
 add_custom_target(gtk-forwarding-headers
     COMMAND ${PERL_EXECUTABLE} ${WEBKIT2_DIR}/Scripts/generate-forwarding-headers.pl ${WEBKIT2_DIR} ${DERIVED_SOURCES_WEBKIT2_DIR}/include gtk
@@ -447 +455 @@
      gtk-forwarding-headers
      soup-forwarding-headers
+     fake-installed-webextension-headers
 )
 
@@ -471 +480 @@
     install(TARGETS ${PluginProcess_EXECUTABLE_NAME} DESTINATION "${EXEC_INSTALL_DIR}")
 endif () # ENABLE_PLUGIN_PROCESS
+
+# Commands for building the built-in injected bundle.
+include_directories(
+    "${WEBKIT2_DIR}/Platform"
+    "${WEBKIT2_DIR}/Shared"
+    "${WEBKIT2_DIR}/Shared/API/c"
+    "${WEBKIT2_DIR}/UIProcess/API/C"
+    "${WEBKIT2_DIR}/WebProcess/InjectedBundle"
+    "${WEBKIT2_DIR}/WebProcess/InjectedBundle/API/c"
+    "${DERIVED_SOURCES_DIR}"
+    "${DERIVED_SOURCES_DIR}/InjectedBundle"
+    "${DERIVED_SOURCES_GOBJECT_DOM_BINDINGS_DIR}"
+    "${DERIVED_SOURCES_WEBKIT2_DIR}/include"
+)
+
+add_library(webkit2gtkinjectedbundle MODULE
+    "${WEBKIT2_DIR}/WebProcess/gtk/WebGtkInjectedBundleMain.cpp"
+)
+add_dependencies(webkit2gtkinjectedbundle GObjectDOMBindings)
+list(APPEND WebKit2_LIBRARIES GObjectDOMBindings)

trunk/Source/WebKit2/WebProcess/gtk/WebGtkExtensionManager.h

@@ -39 +39 @@
 
 public:
-    static WebGtkExtensionManager& shared();
+    WK_EXPORT static WebGtkExtensionManager& shared();
 
-    void initialize(WKBundleRef, WKTypeRef);
+    WK_EXPORT void initialize(WKBundleRef, WKTypeRef);
 
 private: