diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 01:50:47 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-10 01:50:47 +0000 |
| commit | e08255671738c597992f5067bc52eccf75f1afa1 (patch) | |
| tree | 53e9a332ca7a1b619dfce059a131361746339414 /content/plugin | |
| parent | 6465bc3aea8a62f0598d5ea16e5efe8272f24dbf (diff) | |
| download | chromium_src-e08255671738c597992f5067bc52eccf75f1afa1.zip chromium_src-e08255671738c597992f5067bc52eccf75f1afa1.tar.gz chromium_src-e08255671738c597992f5067bc52eccf75f1afa1.tar.bz2 | |
Android content shell bringup.
Build media java files (we weren't).
Fix adb_install_content_shell for cases where the app was stuck.
Add upstream staging gyp var / #define.
Be more consistent about jar output files (all in lib.java).
Upstream a bunch of random files (e.g. ppapi).
Upstream a bunch of java and native code hit as part of shlib init.
Properly package jar files in content shell.
BUG=
TEST=
Review URL: https://chromiumcodereview.appspot.com/10377059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@136219 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/plugin')
| -rw-r--r-- | content/plugin/webplugin_proxy.cc | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/content/plugin/webplugin_proxy.cc b/content/plugin/webplugin_proxy.cc index ee1c721..5a60afc9 100644 --- a/content/plugin/webplugin_proxy.cc +++ b/content/plugin/webplugin_proxy.cc @@ -636,6 +636,16 @@ void WebPluginProxy::SetWindowlessBuffers( } } +#elif defined(OS_ANDROID) + +void WebPluginProxy::SetWindowlessBuffers( + const TransportDIB::Handle& windowless_buffer0, + const TransportDIB::Handle& windowless_buffer1, + const TransportDIB::Handle& background_buffer, + const gfx::Rect& window_rect) { + NOTIMPLEMENTED(); +} + #endif void WebPluginProxy::CancelDocumentLoad() { |