Changeset 167016 in webkit

Timestamp:

Apr 9, 2014 9:53:26 AM (10 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] Plugin process crashes when loading totem plugin
​https://bugs.webkit.org/show_bug.cgi?id=131357

Reviewed by Martin Robinson.

Remove netscape plugin implementation from WebCore that was only
used by WebKit1. This removes the conflict between the WebCore NPN
symbols and the ones used by the plugins.

• CMakeLists.txt:
• PlatformEfl.cmake:
• PlatformGTK.cmake:
• PlatformWin.cmake:
• plugins/PluginViewNone.cpp:
• plugins/gtk/PluginPackageGtk.cpp: Removed.
• plugins/gtk/PluginViewGtk.cpp: Removed.
• plugins/gtk/gtk2xtbin.c: Removed.
• plugins/gtk/gtk2xtbin.h: Removed.
• plugins/gtk/xembed.h: Removed.

Location:

trunk/Source/WebCore

Files:

• CMakeLists.txt (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• PlatformEfl.cmake (modified) (1 diff)
• PlatformGTK.cmake (modified) (3 diffs)
• PlatformWin.cmake (modified) (1 diff)
• plugins/PluginViewNone.cpp (modified) (1 diff)
• plugins/gtk (deleted)

trunk/Source/WebCore/CMakeLists.txt

@@ -2082 +2082 @@
     plugins/PluginMainThreadScheduler.cpp
     plugins/PluginStream.cpp
-    plugins/PluginView.cpp
 
     rendering/AutoTableLayout.cpp
@@ -2609 +2608 @@
 endif ()
 
-if (ENABLE_NETSCAPE_PLUGIN_API)
-    list(APPEND WebCore_SOURCES
-        plugins/PluginPackage.cpp
-        plugins/npapi.cpp
-    )
-else ()
+if (NOT ENABLE_NETSCAPE_PLUGIN_API)
     list(APPEND WebCore_SOURCES
         plugins/PluginPackageNone.cpp

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-09  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Plugin process crashes when loading totem plugin
+        https://bugs.webkit.org/show_bug.cgi?id=131357
+
+        Reviewed by Martin Robinson.
+
+        Remove netscape plugin implementation from WebCore that was only
+        used by WebKit1. This removes the conflict between the WebCore NPN
+        symbols and the ones used by the plugins.
+
+        * CMakeLists.txt:
+        * PlatformEfl.cmake:
+        * PlatformGTK.cmake:
+        * PlatformWin.cmake:
+        * plugins/PluginViewNone.cpp:
+        * plugins/gtk/PluginPackageGtk.cpp: Removed.
+        * plugins/gtk/PluginViewGtk.cpp: Removed.
+        * plugins/gtk/gtk2xtbin.c: Removed.
+        * plugins/gtk/gtk2xtbin.h: Removed.
+        * plugins/gtk/xembed.h: Removed.
+
 2014-04-09  Jeremy Jones  <jeremyj@apple.com>
 

trunk/Source/WebCore/PlatformEfl.cmake

@@ -194 +194 @@
 if (ENABLE_NETSCAPE_PLUGIN_API)
     list(APPEND WebCore_SOURCES
+        plugins/PluginPackage.cpp
+        plugins/PluginView.cpp
+        plugins/npapi.cpp
+
         plugins/efl/PluginPackageEfl.cpp
         plugins/efl/PluginViewEfl.cpp

trunk/Source/WebCore/PlatformGTK.cmake

@@ -22 +22 @@
     "${WEBCORE_DIR}/platform/text/gtk"
     "${WEBCORE_DIR}/platform/text/icu"
-    "${WEBCORE_DIR}/plugins/gtk"
 )
 
@@ -141 +140 @@
 
     platform/network/gtk/CredentialBackingStore.cpp
+
+    plugins/PluginPackageNone.cpp
+    plugins/PluginViewNone.cpp
 )
 
@@ -250 +252 @@
          OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface.c ${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface.h
          COMMAND gdbus-codegen --interface-prefix org.freedesktop.GeoClue2. --c-namespace Geoclue --generate-c-code ${DERIVED_SOURCES_WEBCORE_DIR}/Geoclue2Interface ${GEOCLUE_DBUS_INTERFACE}
-    )
-endif ()
-
-if (ENABLE_NETSCAPE_PLUGIN_API)
-    list(APPEND WebCore_SOURCES
-        plugins/PluginDatabase.cpp
-        plugins/PluginDebug.cpp
-        plugins/PluginPackage.cpp
-        plugins/PluginStream.cpp
-        plugins/PluginView.cpp
-    )
-
-    list(APPEND WebCorePlatformGTK_SOURCES
-        plugins/gtk/PluginPackageGtk.cpp
-        plugins/gtk/PluginViewGtk.cpp
-        plugins/gtk/gtk2xtbin.c
-
-        plugins/x11/PluginViewX11.cpp
-    )
-else ()
-    list(APPEND WebCore_SOURCES
-        plugins/PluginPackageNone.cpp
-        plugins/PluginViewNone.cpp
     )
 endif ()

trunk/Source/WebCore/PlatformWin.cmake

@@ -74 +74 @@
     list(APPEND WebCore_SOURCES
         plugins/PluginView.cpp
+        plugins/npapi.cpp
 
         plugins/win/PluginMessageThrottlerWin.cpp

trunk/Source/WebCore/plugins/PluginViewNone.cpp

@@ -133 +133 @@
 // added, please make sure they have the proper platform #ifs so that changes
 // do not break ports who compile both this file and PluginView.cpp.   
-#if PLATFORM(COCOA) || PLATFORM(EFL) || OS(WINCE)
+#if PLATFORM(COCOA) || PLATFORM(EFL) || PLATFORM(GTK) || OS(WINCE)
 #if ENABLE(NETSCAPE_PLUGIN_API)
 void PluginView::keepAlive(NPP)