Title: [120993] trunk/Source/WebCore
- Revision
- 120993
- Author
- [email protected]
- Date
- 2012-06-21 19:05:25 -0700 (Thu, 21 Jun 2012)
Log 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 <[email protected]> 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (120992 => 120993)
--- trunk/Source/WebCore/ChangeLog 2012-06-22 02:05:13 UTC (rev 120992)
+++ trunk/Source/WebCore/ChangeLog 2012-06-22 02:05:25 UTC (rev 120993)
@@ -1,3 +1,17 @@
+2012-06-21 Kalev Lember <[email protected]>
+
+ [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 <[email protected]>
[Shadow][Editing] Assertion in VisibleSelection::adjuseSelectionToAvoidCrossingBoundaries() is triggered.
Modified: trunk/Source/WebCore/GNUmakefile.list.am (120992 => 120993)
--- trunk/Source/WebCore/GNUmakefile.list.am 2012-06-22 02:05:13 UTC (rev 120992)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2012-06-22 02:05:25 UTC (rev 120993)
@@ -4834,9 +4834,10 @@
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 @@
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
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
