Changeset 120993 in webkit

Timestamp:

Jun 21, 2012 7:05:25 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Use the empty plugin support on non-X11 and non-Windows platforms
​https://bugs.webkit.org/show_bug.cgi?id=89501

Patch by Kalev Lember <​kalevlember@gmail.com> on 2012-06-21
Reviewed by Martin Robinson.

The GTK+ port doesn't currently support NPAPI plugins on platforms other
than X11 or Windows. Using PluginPackageNone and PluginViewNone makes it
easier to build it on other platforms and also allows us to drop some
ifdefs from PluginPackageGtk and PluginViewGtk.

• GNUmakefile.list.am:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.list.am (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-06-21  Kalev Lember  <kalevlember@gmail.com>
+
+        [GTK] Use the empty plugin support on non-X11 and non-Windows platforms
+        https://bugs.webkit.org/show_bug.cgi?id=89501
+
+        Reviewed by Martin Robinson.
+
+        The GTK+ port doesn't currently support NPAPI plugins on platforms other
+        than X11 or Windows. Using PluginPackageNone and PluginViewNone makes it
+        easier to build it on other platforms and also allows us to drop some
+        ifdefs from PluginPackageGtk and PluginViewGtk.
+
+        * GNUmakefile.list.am:
+
 2012-06-21  Shinya Kawanaka  <shinyak@chromium.org>
 

trunk/Source/WebCore/GNUmakefile.list.am

@@ -4835 +4835 @@
         Source/WebCore/plugins/gtk/gtk2xtbin.c \
         Source/WebCore/plugins/gtk/gtk2xtbin.h \
+        Source/WebCore/plugins/gtk/PluginPackageGtk.cpp \
+        Source/WebCore/plugins/gtk/PluginViewGtk.cpp \
         Source/WebCore/plugins/gtk/xembed.h
-endif
-
+else
 if TARGET_WIN32
 webcore_sources += \
@@ -4859 +4860 @@
         Source/WebCore/plugins/win/PluginViewWin.cpp
 else
-webcoregtk_sources += \
-        Source/WebCore/plugins/gtk/PluginPackageGtk.cpp \
-        Source/WebCore/plugins/gtk/PluginViewGtk.cpp
-endif
+webcore_sources += \
+        Source/WebCore/plugins/PluginPackageNone.cpp \
+        Source/WebCore/plugins/PluginViewNone.cpp
+endif # END TARGET_WIN32
+endif # END TARGET_X11
 
 # ----