[GTK] Remove plugin process configuration option
authormrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 23 Dec 2012 20:22:16 +0000 (20:22 +0000)
committermrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 23 Dec 2012 20:22:16 +0000 (20:22 +0000)
https://bugs.webkit.org/show_bug.cgi?id=105564

Reviewed by Carlos Garcia Campos.

Remove the --enable-plugin-process configuration option, opting instead to
always build the plugin process when building WebKit2. It isn't very interesting
for downstream to enable or disable the plugin process. It should always be
enabled for WebKit2 and it's better for us not to have to keep a disabled plugin
process building. Additionally, the in-process plugin isn't functional, since
plugins depend on GTK+ 2 and WebKit2 depends on GTK+ 3.

.:

* configure.ac: Remove the configuration option.

Source/WebKit2:

* GNUmakefile.am: Remove the option.
* GNUmakefile.list.am: Remote the option.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@138425 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/WebKit2/ChangeLog
Source/WebKit2/GNUmakefile.am
Source/WebKit2/GNUmakefile.list.am
configure.ac

index df9ec14..32196e0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2012-12-20  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] Remove plugin process configuration option
+        https://bugs.webkit.org/show_bug.cgi?id=105564
+
+        Reviewed by Carlos Garcia Campos.
+
+        Remove the --enable-plugin-process configuration option, opting instead to
+        always build the plugin process when building WebKit2. It isn't very interesting
+        for downstream to enable or disable the plugin process. It should always be
+        enabled for WebKit2 and it's better for us not to have to keep a disabled plugin
+        process building. Additionally, the in-process plugin isn't functional, since
+        plugins depend on GTK+ 2 and WebKit2 depends on GTK+ 3.
+
+        * configure.ac: Remove the configuration option.
+
 2012-12-21  Elliott Sprehn  <esprehn@chromium.org>
 
         Replace documentFragmentIsShadowRoot with isTreeScope
index 526f3a1..775bbbc 100644 (file)
@@ -1,3 +1,20 @@
+2012-12-20  Martin Robinson  <mrobinson@igalia.com>
+
+        [GTK] Remove plugin process configuration option
+        https://bugs.webkit.org/show_bug.cgi?id=105564
+
+        Reviewed by Carlos Garcia Campos.
+
+        Remove the --enable-plugin-process configuration option, opting instead to
+        always build the plugin process when building WebKit2. It isn't very interesting
+        for downstream to enable or disable the plugin process. It should always be
+        enabled for WebKit2 and it's better for us not to have to keep a disabled plugin
+        process building. Additionally, the in-process plugin isn't functional, since
+        plugins depend on GTK+ 2 and WebKit2 depends on GTK+ 3.
+
+        * GNUmakefile.am: Remove the option.
+        * GNUmakefile.list.am: Remote the option.
+
 2012-12-22  Sam Weinig  <sam@webkit.org>
 
         Give the ChildProcess a MessageReceiverMap
index fa42c79..132d2f2 100644 (file)
@@ -1,5 +1,19 @@
 include $(srcdir)/Source/WebKit2/GNUmakefile.list.am
 
+if ENABLE_WEBKIT2
+# Shared libraries
+lib_LTLIBRARIES += \
+       libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.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 += \
+       libWebCoreGtk2.la
+
+libexec_PROGRAMS += \
+       Programs/WebKitPluginProcess
+endif
+
 libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_HEADERS = \
        $(webkit2_h_api)
 
@@ -100,6 +114,7 @@ libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPP
        -I$(top_builddir)/DerivedSources/WebKit2/include/WebKit2 \
        -DLIBEXECDIR=\""$(libexecdir)"\" \
        -DWEBKIT2_COMPILATION \
+       -DENABLE_PLUGIN_PROCESS=1 \
        $(webcore_cppflags) \
        $(webcoregtk_cppflags) \
        $(javascriptcore_cppflags) \
@@ -122,12 +137,6 @@ libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CXX
 libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CFLAGS = \
        $(global_cflags)
 
-if ENABLE_WEBKIT2
-# Shared libraries
-lib_LTLIBRARIES += \
-       libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
-endif
-
 # Artificial dependency to make sure libwebkit2gtk and libwebkitgtk are not linked at the same time
 # The variable creation is to avoid having automake override the entire rule instead of adding the
 # dependency.
@@ -149,12 +158,6 @@ libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPP
        -DMOZ_X11
 endif
 
-# Plugin process
-if ENABLE_PLUGIN_PROCESS
-libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_CPPFLAGS += \
-       -DENABLE_PLUGIN_PROCESS=1
-endif
-
 libwebkit2gtk_@WEBKITGTK_API_MAJOR_VERSION@_@WEBKITGTK_API_MINOR_VERSION@_la_LDFLAGS = \
        -version-info @LIBWEBKIT2GTK_VERSION@ \
        $(version_script) \
@@ -437,14 +440,6 @@ Programs_WebKitWebProcess_LDADD = \
        $(GTK_UNIX_PRINTING_LIBS) \
        $(LIBSOUP_LIBS)
 
-# PluginProcess
-if ENABLE_PLUGIN_PROCESS
-
-# 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 += \
-       libWebCoreGtk2.la
-
 libWebCoreGtk2_la_SOURCES = \
        $(webcoregtk_sources)
 
@@ -481,9 +476,6 @@ libWebCoreGtk2_la_CPPFLAGS = \
        $(XRENDER_CFLAGS) \
        $(XT_CFLAGS)
 
-libexec_PROGRAMS += \
-       Programs/WebKitPluginProcess
-
 # Serialize linking of the plugin process with both webkit libraries.
 plugin_process_for_dep = Programs/WebKitPluginProcess
 $(plugin_process_for_dep): libwebkitgtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la libwebkit2gtk-@WEBKITGTK_API_MAJOR_VERSION@.@WEBKITGTK_API_MINOR_VERSION@.la
@@ -589,8 +581,6 @@ Programs_WebKitPluginProcess_CXXFLAGS = \
        $(SYMBOL_VISIBILITY_INLINES) \
        $(global_cxxflags)
 
-endif # ENABLE_PLUGIN_PROCESS
-
 EXTRA_DIST += \
        $(WebKit2)/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml \
        $(WebKit2)/UIProcess/API/gtk/docs/webkit2gtk-sections.txt \
index 1734bc8..96c1b16 100644 (file)
@@ -1216,8 +1216,6 @@ webkit2_sources += \
    Source/WebKit2/WebProcess/WebPage/gtk/LayerTreeHostGtk.h
 endif # END USE_TEXTURE_MAPPER_GL
 
-if ENABLE_PLUGIN_PROCESS
-
 webkit2_plugin_process_built_sources += \
        DerivedSources/WebKit2/NPObjectMessageReceiverMessageReceiver.cpp \
        DerivedSources/WebKit2/NPObjectMessageReceiverMessages.h \
@@ -1332,5 +1330,3 @@ webkit2_plugin_process_sources += \
        Source/WebKit2/WebProcess/Plugins/Netscape/NetscapePluginStream.h \
        Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp \
        Source/WebKit2/unix/PluginMainUnix.cpp
-
-endif # ENABLE_PLUGIN_PROCESS
index aa420ba..42333e1 100644 (file)
@@ -1062,46 +1062,32 @@ AC_ARG_ENABLE(webkit2,
     [], [enable_webkit2="yes"])
 AC_MSG_RESULT([$enable_webkit2])
 if test "$enable_webkit2" = "yes"; then
-   if test "$GTK_API_VERSION" = "2.0"; then
-      AC_MSG_ERROR([WebKit2 requires GTK+ 3.x, use --with-gtk=3.0])
-   fi
+    if test "$GTK_API_VERSION" = "2.0"; then
+        AC_MSG_ERROR([WebKit2 requires GTK+ 3.x, use --with-gtk=3.0])
+    fi
 
-   # Check Unix printing
-   PKG_CHECK_MODULES(GTK_UNIX_PRINTING, gtk+-unix-print-3.0,
+    # Make sure we have GTK+ 2.x to build the plugin process.
+    PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= $GTK2_REQUIRED_VERSION gail >= $GAIL2_REQUIRED_VERSION)
+    AC_SUBST(GTK2_CFLAGS)
+    AC_SUBST(GTK2_LIBS)
+
+    # Check Unix printing
+    PKG_CHECK_MODULES(GTK_UNIX_PRINTING, gtk+-unix-print-3.0,
                      [have_gtk_unix_printing=yes],
                      [have_gtk_unix_printing=no])
-   AC_SUBST(GTK_UNIX_PRINTING_CFLAGS)
-   AC_SUBST(GTK_UNIX_PRINTING_LIBS)
-   if test "$have_gtk_unix_printing" = "yes"; then
-       AC_DEFINE([HAVE_GTK_UNIX_PRINTING], [1], [Define if GTK+ UNIX Printing is available])
-   fi
-
-   # On some Linux/Unix platforms, shm_* may only be available if linking
-   # against librt
-   if test "$os_win32" = "no"; then
-       AC_SEARCH_LIBS([shm_open], [rt], [SHM_LIBS="-lrt"])
-       AC_SUBST(SHM_LIBS)
-   fi
-fi
-
-# Plugin Process
-AC_MSG_CHECKING([whether to build plugin process for WebKit2])
-AC_ARG_ENABLE(plugin_process,
-            AC_HELP_STRING([--enable-plugin-process], [build plugin process for WebKit2 [default=yes]]),
-                           [], [enable_plugin_process="yes"])
-AC_MSG_RESULT([$enable_plugin_process])
-
-# Build the plugin process only when building Webkit2.
-if test "$enable_webkit2" = "no"; then
-    enable_plugin_process=no
-fi
+    AC_SUBST(GTK_UNIX_PRINTING_CFLAGS)
+    AC_SUBST(GTK_UNIX_PRINTING_LIBS)
+    if test "$have_gtk_unix_printing" = "yes"; then
+        AC_DEFINE([HAVE_GTK_UNIX_PRINTING], [1], [Define if GTK+ UNIX Printing is available])
+    fi
 
-# Make sure we have GTK+ 2.x to build the plugin process.
-if test "$enable_plugin_process" = "yes"; then
-   PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= $GTK2_REQUIRED_VERSION gail >= $GAIL2_REQUIRED_VERSION)
+    # On some Linux/Unix platforms, shm_* may only be available if linking
+    # against librt
+    if test "$os_win32" = "no"; then
+        AC_SEARCH_LIBS([shm_open], [rt], [SHM_LIBS="-lrt"])
+        AC_SUBST(SHM_LIBS)
+    fi
 fi
-AC_SUBST(GTK2_CFLAGS)
-AC_SUBST(GTK2_LIBS)
 
 GTK_DOC_CHECK([1.10])
 
@@ -1169,7 +1155,6 @@ AM_CONDITIONAL([ENABLE_FAST_MALLOC],[test "$enable_fast_malloc" = "yes"])
 AM_CONDITIONAL([ENABLE_WEB_AUDIO],[test "$enable_web_audio" = "yes"])
 AM_CONDITIONAL([ENABLE_OPCODE_STATS],[test "$enable_opcode_stats" = "yes"])
 AM_CONDITIONAL([ENABLE_WEBKIT2],[test "$enable_webkit2" = "yes"])
-AM_CONDITIONAL([ENABLE_PLUGIN_PROCESS],[test "$enable_plugin_process" = "yes"])
 AM_CONDITIONAL([ENABLE_SPELLCHECK],[test "$enable_spellcheck" = "yes"])
 AM_CONDITIONAL([ENABLE_CSS_FILTERS],[test "$enable_css_filters" = "yes"])
 AM_CONDITIONAL([ENABLE_CSS_SHADERS],[test "$enable_css_shaders" = "yes"])
@@ -1227,6 +1212,7 @@ Build configuration:
 
 Features:
 =======
+ WebKit2 support                                          : $enable_webkit2
  Accelerated Compositing                                  : $enable_accelerated_compositing
  Gamepad support                                          : $enable_gamepad
  Geolocation support                                      : $enable_geolocation
@@ -1242,9 +1228,6 @@ Features:
  WebGL                                                    : $enable_webgl
  XSLT support                                             : $enable_xslt
 
-WebKit2 support:
- WebKit2 support                                          : $enable_webkit2
- WebKit2 plugin process                                   : $enable_plugin_process
 
 GTK+ configuration:
  GTK+ version                                             : $with_gtk