diff options
| author | sehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-11 19:46:41 +0000 |
|---|---|---|
| committer | sehr@google.com <sehr@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-01-11 19:46:41 +0000 |
| commit | 8bc8c9bd128aa1af7df2c5a2c04e1f2eb8eb1fd5 (patch) | |
| tree | 3b10c9c5586b24d2b402fffbd477e37d2ec94bd9 /chrome | |
| parent | 0f60411a22f77f49d4782829aa68ed4c19cb5b53 (diff) | |
| download | chromium_src-8bc8c9bd128aa1af7df2c5a2c04e1f2eb8eb1fd5.zip chromium_src-8bc8c9bd128aa1af7df2c5a2c04e1f2eb8eb1fd5.tar.gz chromium_src-8bc8c9bd128aa1af7df2c5a2c04e1f2eb8eb1fd5.tar.bz2 | |
This CL is for Neb. It contains his change 501124, with conflicts merged.
Review URL: http://codereview.chromium.org/547005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35928 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 f04a110..da24728 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(), - gfx::NativeViewFromId(host_window_)); + 0); } 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 0686a56..3680804 100644 --- a/chrome/renderer/webplugin_delegate_pepper.cc +++ b/chrome/renderer/webplugin_delegate_pepper.cc @@ -593,7 +593,7 @@ void WebPluginDelegatePepper::PluginDestroyed() { void WebPluginDelegatePepper::Paint(WebKit::WebCanvas* canvas, const gfx::Rect& rect) { -#if defined(OS_WIN) +#if defined(OS_WIN) || defined(OS_LINUX) if (nested_delegate_) { // TODO(apatrick): The GPU plugin will render to an offscreen render target. // Need to copy it to the screen here. |