am 838afd1b: consolidating to only use one surface per plugin. give plugin access to java context.

Merge commit '838afd1be683057ebaf5cf85359bf9a567602b7b' into eclair-mr2-plus-aosp

* commit '838afd1be683057ebaf5cf85359bf9a567602b7b':
  consolidating to only use one surface per plugin. give plugin access to java context.

1 files changed, 7 insertions, 1 deletions

diff --git a/WebCore/plugins/android/PluginViewAndroid.cpp b/WebCore/plugins/android/PluginViewAndroid.cpp
index 65d3385..e10641d 100644
--- a/WebCore/plugins/android/PluginViewAndroid.cpp
+++ b/WebCore/plugins/android/PluginViewAndroid.cpp
@@ -483,7 +483,13 @@ NPError PluginView::getValue(NPNVariable variable, void* value)
 
         case kSupportedDrawingModel_ANPGetValue: {
             uint32_t* bits = reinterpret_cast<uint32_t*>(value);
-            *bits = (1 << kBitmap_ANPDrawingModel);
+            *bits = kBitmap_ANPDrawingModel & kSurface_ANPDrawingModel;
+            return NPERR_NO_ERROR;
+        }
+
+        case kJavaContext_ANPGetValue: {
+            jobject* retObject = static_cast<jobject*>(value);
+            *retObject = android::WebViewCore::getWebViewCore(parent())->getContext();
             return NPERR_NO_ERROR;
         }