[GTK] Use the empty plugin support on non-X11 and non-Windows platforms
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 22 Jun 2012 02:05:25 +0000 (02:05 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 22 Jun 2012 02:05:25 +0000 (02:05 +0000)
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:

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

Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.list.am

index 36013e5..2f35277 100644 (file)
@@ -1,3 +1,17 @@
+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>
 
         [Shadow][Editing] Assertion in VisibleSelection::adjuseSelectionToAvoidCrossingBoundaries() is triggered.
index 4f50a29..78ab91c 100644 (file)
@@ -4834,9 +4834,10 @@ webcoregtk_sources += \
        Source/WebCore/platform/gtk/GtkWidgetBackingStoreX11.cpp \
        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 += \
        Source/WebCore/platform/graphics/win/DIBPixelData.cpp \
@@ -4858,10 +4859,11 @@ webcoregtk_sources += \
        Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp \
        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
 
 # ----
 # icu unicode backend