diff options
| author | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-09 19:41:27 +0000 |
|---|---|---|
| committer | jbauman@chromium.org <jbauman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-09 19:41:27 +0000 |
| commit | 09fb639ce695b602cdb1b4374ee0e0ecae76264d (patch) | |
| tree | 7b437c8162dbeb76f9eba8e7999cdff0f2bd1aca | |
| parent | b8f0867169a2e21ebf8172c8d0e82ea46783ca76 (diff) | |
| download | chromium_src-09fb639ce695b602cdb1b4374ee0e0ecae76264d.zip chromium_src-09fb639ce695b602cdb1b4374ee0e0ecae76264d.tar.gz chromium_src-09fb639ce695b602cdb1b4374ee0e0ecae76264d.tar.bz2 | |
Merge 165581 - Don't attempt optimized scaled updates on GTK and Windows
They haven't been implemented yet.
BUG=154417
Review URL: https://chromiumcodereview.appspot.com/11269056
TBR=jbauman@chromium.org
BUG=160107
Review URL: https://codereview.chromium.org/11369162
git-svn-id: svn://svn.chromium.org/chrome/branches/1271/src@166959 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | webkit/plugins/ppapi/ppapi_plugin_instance.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc index 48b7be0..8fd9aa6 100644 --- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc +++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc @@ -1014,6 +1014,12 @@ bool PluginInstance::GetBitmapForOptimizedPluginPaint( gfx::Rect pixel_plugin_backing_store_rect( 0, 0, image_data->width(), image_data->height()); float scale = GetBoundGraphics2D()->GetScale(); +#if !defined(USE_AURA) && (defined(OS_WIN) || defined(OS_LINUX)) + // Linux and Windows don't yet support scaled UpdateRects + // TODO(jbauman): Add support and remove this. + if (scale != 1.0f) + return false; +#endif gfx::Rect plugin_backing_store_rect = pixel_plugin_backing_store_rect.Scale(scale); |