diff options
| author | arv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-06 22:14:53 +0000 |
|---|---|---|
| committer | arv@chromium.org <arv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-06 22:14:53 +0000 |
| commit | f1002ee286ad56e2b80736661e89989b650aad6e (patch) | |
| tree | e7f82831f9bccd51fa10ba0c6b28501a5ad83aaa /chrome | |
| parent | 3ccfe535658c8852c1cc1df01372ecc602f376cd (diff) | |
| download | chromium_src-f1002ee286ad56e2b80736661e89989b650aad6e.zip chromium_src-f1002ee286ad56e2b80736661e89989b650aad6e.tar.gz chromium_src-f1002ee286ad56e2b80736661e89989b650aad6e.tar.bz2 | |
Revert 35649 - Make Pepper plugins work on Linux.
fix pepper_test_plugin so that it is loaded on Linux
remove skia & base dependency in test plugin so that it can be compiled with fPIC
remove ifdef WIN in pepper code
Patch by neb@chromium.org
Original review: http://codereview.chromium.org/501124/show
BUG=none
TEST=none
TBR=brettw@chromium.org
Review URL: http://codereview.chromium.org/524051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35653 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/renderer/render_view.cc | 10 | ||||
| -rw-r--r-- | chrome/renderer/webplugin_delegate_pepper.cc | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc index 8d4f1d2..418bf4c 100644 --- a/chrome/renderer/render_view.cc +++ b/chrome/renderer/render_view.cc @@ -2674,21 +2674,21 @@ webkit_glue::WebPluginDelegate* RenderView::CreatePluginDelegate( } } if (in_process_plugin) { +#if defined(OS_WIN) // In-proc plugins aren't supported on Linux or Mac. if (use_pepper_host) { return WebPluginDelegatePepper::Create( path, *mime_type_to_use, AsWeakPtr(), - 0); + gfx::NativeViewFromId(host_window_)); } else { -#if defined(OS_WIN) // In-proc plugins aren't supported on Linux or Mac. return WebPluginDelegateImpl::Create( path, *mime_type_to_use, gfx::NativeViewFromId(host_window_)); + } #else - NOTIMPLEMENTED(); - return NULL; + NOTIMPLEMENTED(); + return NULL; #endif - } } return new WebPluginDelegateProxy(*mime_type_to_use, AsWeakPtr()); diff --git a/chrome/renderer/webplugin_delegate_pepper.cc b/chrome/renderer/webplugin_delegate_pepper.cc index 77dcc1b..4c32b7b 100644 --- a/chrome/renderer/webplugin_delegate_pepper.cc +++ b/chrome/renderer/webplugin_delegate_pepper.cc @@ -588,7 +588,7 @@ void WebPluginDelegatePepper::PluginDestroyed() { void WebPluginDelegatePepper::Paint(WebKit::WebCanvas* canvas, const gfx::Rect& rect) { -#if defined(OS_WIN) || defined(OS_LINUX) +#if defined(OS_WIN) if (nested_delegate_) { // TODO(apatrick): The GPU plugin will render to an offscreen render target. // Need to copy it to the screen here. |