Allowing native code access to the application context as long as

there is at least one valid instance of the webviewcore class.

This change allows plugins access to the application context when
the plugin package is loaded, prior to any instances of the plugin
being created.

Change-Id: I74a58cf76cc3c2d0ef7bca19346f13f58f616830

1 files changed, 15 insertions, 4 deletions

diff --git a/WebCore/plugins/android/PluginViewAndroid.cpp b/WebCore/plugins/android/PluginViewAndroid.cpp
index 5b7aea9..452c9fb 100644
--- a/WebCore/plugins/android/PluginViewAndroid.cpp
+++ b/WebCore/plugins/android/PluginViewAndroid.cpp
@@ -369,11 +369,22 @@ NPError PluginView::getValueStatic(NPNVariable variable, void* value)
 {
     // our interface query is valid with no NPP instance
     NPError error = NPERR_GENERIC_ERROR;
-    if ((value != NULL) && (variable == NPNVisOfflineBool)) {
-      bool* retValue = static_cast<bool*>(value);
-      *retValue = !networkStateNotifier().onLine();
-      return NPERR_NO_ERROR;
+
+    switch (variable) {
+        case NPNVisOfflineBool: {
+            if (value != NULL) {
+                bool* retValue = static_cast<bool*>(value);
+                *retValue = !networkStateNotifier().onLine();
+                return NPERR_NO_ERROR;
+            }
+        }
+        case kJavaContext_ANPGetValue: {
+            jobject* retObject = static_cast<jobject*>(value);
+            *retObject = android::WebViewCore::getApplicationContext();
+            return NPERR_NO_ERROR;
+        }
     }
+
     (void)anp_getInterface(variable, value, &error);
     return error;
 }