summaryrefslogtreecommitdiffstats
path: root/webkit/plugins
diff options
context:
space:
mode:
authorsenorblanco@google.com <senorblanco@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-01 23:45:14 +0000
committersenorblanco@google.com <senorblanco@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-01 23:45:14 +0000
commitc7ed73a1e9ca29d01b6cd6a873b144d64528ac03 (patch)
tree9c2ccf5c736afaa9c5588138ab2c51b85916fed4 /webkit/plugins
parentd96eb51e126de85e4d01b0719d64208d10cddf87 (diff)
downloadchromium_src-c7ed73a1e9ca29d01b6cd6a873b144d64528ac03.zip
chromium_src-c7ed73a1e9ca29d01b6cd6a873b144d64528ac03.tar.gz
chromium_src-c7ed73a1e9ca29d01b6cd6a873b144d64528ac03.tar.bz2
Revert "Don't attempt optimized scaled updates on GTK and Windows".
Broke test_shell_tests on Win and Linux. TBR=jbauman Review URL: https://codereview.chromium.org/11366053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@165552 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/plugins')
-rw-r--r--webkit/plugins/ppapi/ppapi_plugin_instance.cc6
1 files changed, 0 insertions, 6 deletions
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
index af4e370..6ee1621 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
@@ -1175,12 +1175,6 @@ 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 = gfx::ToEnclosedRect(
gfx::ScaleRect(pixel_plugin_backing_store_rect, scale));