summaryrefslogtreecommitdiffstats
path: root/WebCore
diff options
context:
space:
mode:
Diffstat (limited to 'WebCore')
-rw-r--r--WebCore/WebCorePrefixAndroid.h3
-rw-r--r--WebCore/plugins/PluginInfoStore.cpp7
2 files changed, 7 insertions, 3 deletions
diff --git a/WebCore/WebCorePrefixAndroid.h b/WebCore/WebCorePrefixAndroid.h
index c4782b6..96fa376 100644
--- a/WebCore/WebCorePrefixAndroid.h
+++ b/WebCore/WebCorePrefixAndroid.h
@@ -81,9 +81,6 @@ typedef unsigned char flex_uint8_t;
#define ANDROID_SELECT_TEXT_AREAS
#define ANDROID_FIX
-// note: if uncomment ANDROID_INSTRUMENT here, you must also
-// uncomment it on line 31 of JavaScriptCore/kjs/config.h
-// #define ANDROID_INSTRUMENT
// Fix for issue 878095. Only call onBlur on an element if it has an
// onBlur event.
diff --git a/WebCore/plugins/PluginInfoStore.cpp b/WebCore/plugins/PluginInfoStore.cpp
index 732a1e1..bd2f2d0 100644
--- a/WebCore/plugins/PluginInfoStore.cpp
+++ b/WebCore/plugins/PluginInfoStore.cpp
@@ -27,6 +27,9 @@
#include "PluginInfoStore.h"
#include "KURL.h"
+#if PLATFORM(ANDROID)
+#include "Page.h"
+#endif
#include "PluginData.h"
#include "PluginDatabase.h"
#include "PluginPackage.h"
@@ -93,11 +96,15 @@ bool PluginInfoStore::supportsMIMEType(const WebCore::String& mimeType)
void refreshPlugins(bool reloadOpenPages)
{
+#if PLATFORM(ANDROID)
+ Page::refreshPlugins(reloadOpenPages);
+#else
PluginDatabase::installedPlugins()->refresh();
if (reloadOpenPages) {
// FIXME: reload open pages
}
+#endif
}
}