Changeset 79925 in webkit

Timestamp:

Feb 28, 2011 2:48:29 PM (13 years ago)

Author:

kbalazs@webkit.org

Message:

2011-02-28 Balazs Kelemen <​kbalazs@webkit.org>

Reviewed by Anders Carlsson.

[Qt][WK2] Plugin initialization
​https://bugs.webkit.org/show_bug.cgi?id=48127

• Source/WebKit.pri: Lift the definition of the XP_UNIX macro from WebCore.pri to WebKit.pri to apply it to WebKit2 as well.

2011-02-28 Balazs Kelemen <​kbalazs@webkit.org>

Reviewed by Anders Carlsson.

[Qt][WK2] Plugin initialization
​https://bugs.webkit.org/show_bug.cgi?id=48127

No function change so no new tests.

• WebCore.pri: Lift the definition of the XP_UNIX macro from WebCore.pri to WebKit.pri to apply it to WebKit2 as well.

2011-02-28 Balazs Kelemen <​kbalazs@webkit.org>

Reviewed by Anders Carlsson.

[Qt][WK2] Plugin initialization
​https://bugs.webkit.org/show_bug.cgi?id=48127

Specialize the way of initializing the plugin for X11.
Introduce PLUGIN_ARCHITECTURE macros to allow code sharing
across platforms.

• Shared/Plugins/Netscape/NetscapePluginModule.cpp: (WebKit::NetscapePluginModule::tryLoad):
• config.h:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/WebCore.pri (modified) (1 diff)
• Source/WebKit.pri (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp (modified) (2 diffs)
• Source/WebKit2/config.h (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2011-02-28  Balazs Kelemen  <kbalazs@webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        [Qt][WK2] Plugin initialization
+        https://bugs.webkit.org/show_bug.cgi?id=48127
+
+        * Source/WebKit.pri: Lift the definition of the XP_UNIX macro
+        from WebCore.pri to WebKit.pri to apply it to WebKit2 as well.
+
 2011-02-28  Kristian Amlie  <kristian.amlie@nokia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-02-28  Balazs Kelemen  <kbalazs@webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        [Qt][WK2] Plugin initialization
+        https://bugs.webkit.org/show_bug.cgi?id=48127
+
+        No function change so no new tests.
+
+        * WebCore.pri: Lift the definition of the XP_UNIX macro
+        from WebCore.pri to WebKit.pri to apply it to WebKit2 as well.
+
 2011-02-28  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/WebCore.pri

@@ -211 +211 @@
                 DEFINES += MOZ_PLATFORM_MAEMO=6
             }
-            DEFINES += XP_UNIX
             DEFINES += ENABLE_NETSCAPE_PLUGIN_METADATA_CACHE=1
         }

trunk/Source/WebKit.pri

@@ -147 +147 @@
 
 contains(DEFINES, QT_NO_UITOOLS): CONFIG -= uitools
+
+# Needed by npapi.h.
+unix:!mac:!symbian: DEFINES += XP_UNIX

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-02-28  Balazs Kelemen  <kbalazs@webkit.org>
+
+        Reviewed by Anders Carlsson.
+
+        [Qt][WK2] Plugin initialization
+        https://bugs.webkit.org/show_bug.cgi?id=48127
+
+        Specialize the way of initializing the plugin for X11.
+        Introduce PLUGIN_ARCHITECTURE macros to allow code sharing
+        across platforms.
+
+        * Shared/Plugins/Netscape/NetscapePluginModule.cpp:
+        (WebKit::NetscapePluginModule::tryLoad):
+        * config.h:
+
 2011-02-28  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit2/Shared/Plugins/Netscape/NetscapePluginModule.cpp

@@ -219 +219 @@
         return false;
 
+#if !PLUGIN_ARCHITECTURE(X11)
     NP_GetEntryPointsFuncPtr getEntryPointsFuncPtr = m_module->functionPointer<NP_GetEntryPointsFuncPtr>("NP_GetEntryPoints");
     if (!getEntryPointsFuncPtr)
         return false;
+#endif
 
     m_shutdownProcPtr = m_module->functionPointer<NPP_ShutdownProcPtr>("NP_Shutdown");
@@ -233 +235 @@
     // reversed. Failing to follow this order results in crashes (e.g., in Silverlight on Mac and
     // in Flash and QuickTime on Windows).
-#if PLATFORM(MAC)
+#if PLUGIN_ARCHITECTURE(MAC)
     if (initializeFuncPtr(netscapeBrowserFuncs()) != NPERR_NO_ERROR || getEntryPointsFuncPtr(&m_pluginFuncs) != NPERR_NO_ERROR)
         return false;
-#elif PLATFORM(WIN)
+#elif PLUGIN_ARCHITECTURE(WIN)
     if (getEntryPointsFuncPtr(&m_pluginFuncs) != NPERR_NO_ERROR || initializeFuncPtr(netscapeBrowserFuncs()) != NPERR_NO_ERROR)
         return false;
+#elif PLUGIN_ARCHITECTURE(X11)
+    if (initializeFuncPtr(netscapeBrowserFuncs(), &m_pluginFuncs) != NPERR_NO_ERROR)
+        return false;
 #endif
 

trunk/Source/WebKit2/config.h

@@ -137 +137 @@
 #endif /* defined(WIN32) || defined(_WIN32) */
 
+#if PLATFORM(MAC) || (OS(MAC_OS_X) && PLATFORM(QT))
+#define PLUGIN_ARCHITECTURE_MAC 1
+#elif PLATFORM(WIN) || (OS(WIN) && PLATFORM(QT))
+#define PLUGIN_ARCHITECTURE_WIN 1
+#elif (PLATFORM(QT) && defined(Q_WS_X11)) || (PLATFORM(GTK) && OS(UNIX) && !OS(MAC_OS_X))
+#define PLUGIN_ARCHITECTURE_X11 1
+#endif
+
+#define PLUGIN_ARCHITECTURE(ARCH) (defined(PLUGIN_ARCHITECTURE_##ARCH) && PLUGIN_ARCHITECTURE_##ARCH)