2011-06-28 Balazs Kelemen <kbalazs@webkit.org>
authorkbalazs@webkit.org <kbalazs@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 28 Jun 2011 09:12:14 +0000 (09:12 +0000)
committerkbalazs@webkit.org <kbalazs@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 28 Jun 2011 09:12:14 +0000 (09:12 +0000)
        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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@89908 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/platform/qt-wk2/Skipped
Source/WebKit2/ChangeLog
Source/WebKit2/Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp

index 10d8089..2acb60f 100644 (file)
@@ -1,3 +1,12 @@
+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>
 
         [Qt] http/tests/misc/link-rel-icon-beforeload.html is flakey
index 78c0211..5077447 100644 (file)
@@ -1495,7 +1495,6 @@ plugins/embed-prefers-plugins-for-images.html
 plugins/mouse-events-fixedpos.html
 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
 plugins/object-embed-plugin-scripting.html
index a615367..d208111 100644 (file)
@@ -1,3 +1,14 @@
+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>
 
         Reviewed by Alexey Proskuryakov.
index bb42d01..b60a536 100644 (file)
@@ -148,9 +148,13 @@ bool NetscapePluginModule::getPluginInfo(const String& pluginPath, PluginModuleI
         return false;
     }
 
-    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;
 
     const char* mimeDescription = NP_GetMIMEDescription();