Changeset 118949 in webkit

Timestamp:

May 30, 2012 12:08:22 PM (12 years ago)

Author:

Martin Robinson

Message:

Check for GTK2/GTK3 symbol mismatch earlier
​https://bugs.webkit.org/show_bug.cgi?id=87687

Patch by Daniel Drake <​dsd@laptop.org> on 2012-05-30
Reviewed by Martin Robinson.

No new tests. Regressions in core behavior are covered by existing
plugin tests and the fix deals with particular aspects of the system
environment that are difficult to test.

Detect plugins that would mix GTK+ symbols earlier, so that the
WebKit can skip them and choose a more appropriate plugin module.

• plugins/gtk/PluginPackageGtk.cpp: Move this code from PluginViewGtk.

(WebCore::moduleMixesGtkSymbols):
(WebCore::PluginPackage::load):

• plugins/gtk/PluginViewGtk.cpp: Move this code to PluginPackageGtk.

(WebCore::PluginView::platformStart):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• plugins/gtk/PluginPackageGtk.cpp (modified) (2 diffs)
• plugins/gtk/PluginViewGtk.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-30  Daniel Drake  <dsd@laptop.org>
+
+        Check for GTK2/GTK3 symbol mismatch earlier
+        https://bugs.webkit.org/show_bug.cgi?id=87687
+
+        Reviewed by Martin Robinson.
+
+        No new tests. Regressions in core behavior are covered by existing
+        plugin tests and the fix deals with particular aspects of the system
+        environment that are difficult to test.
+
+        Detect plugins that would mix GTK+ symbols earlier, so that the
+        WebKit can skip them and choose a more appropriate plugin module.
+
+        * plugins/gtk/PluginPackageGtk.cpp: Move this code from PluginViewGtk.
+        (WebCore::moduleMixesGtkSymbols):
+        (WebCore::PluginPackage::load):
+        * plugins/gtk/PluginViewGtk.cpp: Move this code to PluginPackageGtk.
+        (WebCore::PluginView::platformStart):
+
 2012-05-30  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
 

trunk/Source/WebCore/plugins/gtk/PluginPackageGtk.cpp

@@ -120 +120 @@
 #endif
 
+static bool moduleMixesGtkSymbols(GModule* module)
+{
+    void* symbol;
+#ifdef GTK_API_VERSION_2
+    return g_module_symbol(module, "gtk_application_get_type", &symbol);
+#else
+    return g_module_symbol(module, "gtk_object_get_type", &symbol);
+#endif
+}
+
 bool PluginPackage::load()
 {
@@ -151 +161 @@
     }
 
+    if (moduleMixesGtkSymbols(m_module)) {
+        LOG(Plugins, "Ignoring module '%s' to avoid mixing GTK+ 2 and GTK+ 3 symbols.\n", m_path.utf8().data());
+        return false;
+    }
+
     m_isLoaded = true;
 

trunk/Source/WebCore/plugins/gtk/PluginViewGtk.cpp

@@ -835 +835 @@
 }
 
-static bool moduleMixesGtkSymbols(GModule* module)
-{
-    gpointer symbol;
-#ifdef GTK_API_VERSION_2
-    return g_module_symbol(module, "gtk_application_get_type", &symbol);
-#else
-    return g_module_symbol(module, "gtk_object_get_type", &symbol);
-#endif
-}
-
 bool PluginView::platformStart()
 {
     ASSERT(m_isStarted);
     ASSERT(m_status == PluginStatusLoadedSuccessfully);
-
-    if (moduleMixesGtkSymbols(m_plugin->module())) {
-        LOG(Plugins, "Module '%s' mixes GTK+ 2 and GTK+ 3 symbols, ignoring plugin.\n", m_plugin->path().utf8().data());
-        return false;
-    }
 
 #if defined(XP_UNIX)