diff options
| author | Derek Sollenberger <djsollen@google.com> | 2010-01-11 16:54:05 -0500 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2010-01-11 16:54:05 -0500 |
| commit | 1fe57b16853c551da4f81d73073b98f0ef8baa1e (patch) | |
| tree | 890237abad83f37af2dc548f1bfea0e0e7853983 /WebCore | |
| parent | c74d807c018da5b7a0f8c89e0e735361c59092ac (diff) | |
| parent | ab89d1aa666d00b6334b44c4300a23683617e402 (diff) | |
| download | external_webkit-1fe57b16853c551da4f81d73073b98f0ef8baa1e.zip external_webkit-1fe57b16853c551da4f81d73073b98f0ef8baa1e.tar.gz external_webkit-1fe57b16853c551da4f81d73073b98f0ef8baa1e.tar.bz2 | |
resolved conflicts for merge of ab89d1aa to master
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; } |