summaryrefslogtreecommitdiffstats
path: root/webkit/port/bridge
diff options
context:
space:
mode:
authorojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-20 18:24:03 +0000
committerojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-20 18:24:03 +0000
commit07b46427420baf9709fb6302ce4c53d76c6d29a2 (patch)
tree7741f660bc77b11e7a3ce70c13dcce8c41de74c4 /webkit/port/bridge
parent836fc7063dbc85a98ab902ae768bd21d81d8f7ba (diff)
downloadchromium_src-07b46427420baf9709fb6302ce4c53d76c6d29a2.zip
chromium_src-07b46427420baf9709fb6302ce4c53d76c6d29a2.tar.gz
chromium_src-07b46427420baf9709fb6302ce4c53d76c6d29a2.tar.bz2
what Use third_party/WebKit plugin, pluginarray, mimetype and
mimetypearray. In order to get this working, I had to change the v8 templates to allow for both void* and RefPtr<> types. This has a short-term hack for using namedItem instead of nameGetter, which I will be able to undo once I fix https://bugs.webkit.org/show_bug.cgi?id=21606 Also, unforks Navigator.h, which will need some love from scons/mac folk for updating build files since Navigator.h/cpp have moved. Review URL: http://codereview.chromium.org/7373 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3612 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port/bridge')
-rw-r--r--webkit/port/bridge/chromium/PluginsChromium.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/webkit/port/bridge/chromium/PluginsChromium.cpp b/webkit/port/bridge/chromium/PluginsChromium.cpp
index ef7572a..eb6188d 100644
--- a/webkit/port/bridge/chromium/PluginsChromium.cpp
+++ b/webkit/port/bridge/chromium/PluginsChromium.cpp
@@ -35,6 +35,7 @@
#include "config.h"
+#include "PluginData.h"
#pragma warning(push, 0)
#include "PluginInfoStore.h"
#pragma warning(pop)
@@ -68,6 +69,8 @@ void LoadPlugins(bool refresh)
// deleting contents of the PluginInfo.
PluginInfo* PluginInfoStore::createPluginInfoForPluginAtIndex(unsigned int index)
{
+ LoadPlugins(false);
+
WebCore::PluginInfo* rv = new WebCore::PluginInfo();
const WebPluginInfo& plugin = g_plugins[index];
rv->name = webkit_glue::StdWStringToString(plugin.name);