diff options
author | Derek Sollenberger <djsollen@google.com> | 2010-01-11 12:49:19 -0500 |
---|---|---|
committer | Derek Sollenberger <djsollen@google.com> | 2010-01-11 13:57:29 -0500 |
commit | 838afd1be683057ebaf5cf85359bf9a567602b7b (patch) | |
tree | 1f87502af2f433c59e68998fee9f45f08811a486 /WebCore | |
parent | d485d47cbb03ae8cbe9d96bc54a5cb83ee80570e (diff) | |
download | external_webkit-838afd1be683057ebaf5cf85359bf9a567602b7b.zip external_webkit-838afd1be683057ebaf5cf85359bf9a567602b7b.tar.gz external_webkit-838afd1be683057ebaf5cf85359bf9a567602b7b.tar.bz2 |
consolidating to only use one surface per plugin. give plugin access to java context.
There is a companion commit in frameworks/base.
Diffstat (limited to 'WebCore')
-rw-r--r-- | WebCore/plugins/android/PluginViewAndroid.cpp | 8 |
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; } |