1 files changed, 28 insertions, 0 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index 0b7e63b..c6034aa 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -88,6 +88,7 @@
 #include "Settings.h"
 #include "SkANP.h"
 #include "SkTemplates.h"
+#include "SkTDArray.h"
 #include "SkTypes.h"
 #include "SkCanvas.h"
 #include "SkPicture.h"
@@ -139,6 +140,24 @@ FILE* gRenderTreeFile = 0;
 
 namespace android {
 
+static SkTDArray<WebViewCore*> gInstanceList;
+
+void WebViewCore::addInstance(WebViewCore* inst) {
+    *gInstanceList.append() = inst;
+}
+
+void WebViewCore::removeInstance(WebViewCore* inst) {
+    int index = gInstanceList.find(inst);
+    LOG_ASSERT(index >= 0, "RemoveInstance inst not found");
+    if (index >= 0) {
+        gInstanceList.removeShuffle(index);
+    }
+}
+
+bool WebViewCore::isInstance(WebViewCore* inst) {
+    return gInstanceList.find(inst) >= 0;
+}
+
 // ----------------------------------------------------------------------------
 
 #define GET_NATIVE_VIEW(env, obj) ((WebViewCore*)env->GetIntField(obj, gWebViewCoreFields.m_nativeClass))
@@ -286,10 +305,14 @@ WebViewCore::WebViewCore(JNIEnv* env, jobject javaWebViewCore, WebCore::Frame* m
     PageGroup::setShouldTrackVisitedLinks(true);
 
     reset(true);
+
+    WebViewCore::addInstance(this);
 }
 
 WebViewCore::~WebViewCore()
 {
+    WebViewCore::removeInstance(this);
+
     // Release the focused view
     Release(m_popupReply);
 
@@ -1316,6 +1339,11 @@ void WebViewCore::removePlugin(PluginWidgetAndroid* w)
     }
 }
 
+bool WebViewCore::isPlugin(PluginWidgetAndroid* w) const
+{
+    return m_plugins.find(w) >= 0;
+}
+
 void WebViewCore::invalPlugin(PluginWidgetAndroid* w)
 {
     const double PLUGIN_INVAL_DELAY = 1.0 / 60;