Changeset 89908 in webkit

Timestamp:

Jun 28, 2011 2:12:14 AM (13 years ago)

Author:

kbalazs@webkit.org

Message:

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

Reviewed by Kenneth Rohde Christiansen.

[X11][WK2] plugins/plugin-javascript-access fails
​https://bugs.webkit.org/show_bug.cgi?id=63464

• platform/qt-wk2/Skipped:

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

Reviewed by Kenneth Rohde Christiansen.

[X11][WK2] plugins/plugin-javascript-access fails
​https://bugs.webkit.org/show_bug.cgi?id=63464

• Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp: (WebKit::NetscapePluginModule::getPluginInfo): Determine the name of the plugin.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt-wk2/Skipped (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-28  Balazs Kelemen  <kbalazs@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [X11][WK2] plugins/plugin-javascript-access fails
+        https://bugs.webkit.org/show_bug.cgi?id=63464
+
+        * platform/qt-wk2/Skipped:
+
 2011-06-28  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/LayoutTests/platform/qt-wk2/Skipped

@@ -1496 +1496 @@
 plugins/netscape-dom-access.html
 plugins/npp-set-window-called-during-destruction.html
-plugins/plugin-javascript-access.html
 plugins/reloadplugins-and-pages.html
 plugins/destroy-stream-twice.html

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-06-28  Balazs Kelemen  <kbalazs@webkit.org>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [X11][WK2] plugins/plugin-javascript-access fails
+        https://bugs.webkit.org/show_bug.cgi?id=63464
+
+        * Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp:
+        (WebKit::NetscapePluginModule::getPluginInfo):
+        Determine the name of the plugin.
+
 2011-06-27  Yuta Kitamura  <yutak@chromium.org>
 

trunk/Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp

@@ -149 +149 @@
     }
 
-    char* buffer = 0;
-    NPError err = NPP_GetValue(0, NPPVpluginDescriptionString, &buffer);
-    if (err == NPERR_NO_ERROR)
+    char* buffer;
+    NPError error = NPP_GetValue(0, NPPVpluginNameString, &buffer);
+    if (error == NPERR_NO_ERROR)
+        plugin.info.name = buffer;
+
+    error = NPP_GetValue(0, NPPVpluginDescriptionString, &buffer);
+    if (error == NPERR_NO_ERROR)
         plugin.info.desc = buffer;