summaryrefslogtreecommitdiffstats
path: root/chrome/browser/renderer_host
diff options
context:
space:
mode:
authorbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-22 18:09:31 +0000
committerbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-22 18:09:31 +0000
commit638b1808f8c609dbf58c319837a78f1c316f82cd (patch)
treea14609c3e7ac594c104feb46a131b5c82c0f4843 /chrome/browser/renderer_host
parent4ac107e6d3aec2a6cf51834b80bd2c98747cd72f (diff)
downloadchromium_src-638b1808f8c609dbf58c319837a78f1c316f82cd.zip
chromium_src-638b1808f8c609dbf58c319837a78f1c316f82cd.tar.gz
chromium_src-638b1808f8c609dbf58c319837a78f1c316f82cd.tar.bz2
Always write alpha. Turn of blending for root layers. Also, don't clear the background before drawing.
BUG=5001880 TEST=none Review URL: http://codereview.chromium.org/7473007 Patch from Ian Vollick <vollick@chromium.org>. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93675 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/renderer_host')
-rw-r--r--chrome/browser/renderer_host/accelerated_surface_container_touch.cc11
-rw-r--r--chrome/browser/renderer_host/accelerated_surface_container_touch.h2
2 files changed, 9 insertions, 4 deletions
diff --git a/chrome/browser/renderer_host/accelerated_surface_container_touch.cc b/chrome/browser/renderer_host/accelerated_surface_container_touch.cc
index c4a4dd9..47d23b8 100644
--- a/chrome/browser/renderer_host/accelerated_surface_container_touch.cc
+++ b/chrome/browser/renderer_host/accelerated_surface_container_touch.cc
@@ -44,14 +44,19 @@ void AcceleratedSurfaceContainerTouch::SetBitmap(
NOTIMPLEMENTED();
}
-void AcceleratedSurfaceContainerTouch::Draw(const ui::Transform& transform) {
+void AcceleratedSurfaceContainerTouch::Draw(
+ const ui::TextureDrawParams& params) {
DCHECK(compositor_->program_no_swizzle());
+ ui::TextureDrawParams modified_params = params;
+
// Texture from GPU is flipped horizontally.
ui::Transform flipped;
flipped.SetScaleY(-1.0);
flipped.SetTranslateY(size_.height());
- flipped.ConcatTransform(transform);
+ flipped.ConcatTransform(params.transform);
+
+ modified_params.transform = flipped;
- DrawInternal(*compositor_->program_no_swizzle(), flipped);
+ DrawInternal(*compositor_->program_no_swizzle(), modified_params);
}
diff --git a/chrome/browser/renderer_host/accelerated_surface_container_touch.h b/chrome/browser/renderer_host/accelerated_surface_container_touch.h
index ee5bf68..c30fdc7 100644
--- a/chrome/browser/renderer_host/accelerated_surface_container_touch.h
+++ b/chrome/browser/renderer_host/accelerated_surface_container_touch.h
@@ -24,7 +24,7 @@ class AcceleratedSurfaceContainerTouch : public ui::TextureGL {
const gfx::Point& origin,
const gfx::Size& overall_size) OVERRIDE;
- virtual void Draw(const ui::Transform& transform) OVERRIDE;
+ virtual void Draw(const ui::TextureDrawParams& params) OVERRIDE;
protected:
~AcceleratedSurfaceContainerTouch();