summaryrefslogtreecommitdiffstats
path: root/WebCore/plugins/npapi.cpp
diff options
context:
space:
mode:
authorLeon Clarke <leonclarke@google.com>2010-06-03 14:33:32 +0100
committerLeon Clarke <leonclarke@google.com>2010-06-08 12:24:51 +0100
commit5af96e2c7b73ebc627c6894727826a7576d31758 (patch)
treef9d5e6f6175ccd7e3d14de9b290f08937a0d17ba /WebCore/plugins/npapi.cpp
parent8cc4fcf4f6adcbc0e0aebfc24fbad9a4cddf2cfb (diff)
downloadexternal_webkit-5af96e2c7b73ebc627c6894727826a7576d31758.zip
external_webkit-5af96e2c7b73ebc627c6894727826a7576d31758.tar.gz
external_webkit-5af96e2c7b73ebc627c6894727826a7576d31758.tar.bz2
Merge webkit.org at r60469 : Initial merge by git.
Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
Diffstat (limited to 'WebCore/plugins/npapi.cpp')
-rw-r--r--WebCore/plugins/npapi.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/plugins/npapi.cpp b/WebCore/plugins/npapi.cpp
index 99eea32..070c3ce 100644
--- a/WebCore/plugins/npapi.cpp
+++ b/WebCore/plugins/npapi.cpp
@@ -25,7 +25,7 @@
#include "config.h"
-#include "PluginInfoStore.h"
+#include "Page.h"
#include "PluginMainThreadScheduler.h"
#include "PluginView.h"
#include "npruntime_internal.h"
@@ -61,7 +61,7 @@ uint32_t NPN_MemFlush(uint32_t size)
void NPN_ReloadPlugins(NPBool reloadPages)
{
- refreshPlugins(reloadPages);
+ Page::refreshPlugins(reloadPages);
}
NPError NPN_RequestRead(NPStream* stream, NPByteRange* rangeList)