summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-08 17:41:27 +0000
committerbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-08 17:41:27 +0000
commit3ddc371345a7a6c1a3cb1c570b145aa3df064ddb (patch)
tree6d4536654479c5c217fd42c135ca46a84a087319 /ui
parent318bf580e9dd0669904abc42cb2958376e4a43f5 (diff)
downloadchromium_src-3ddc371345a7a6c1a3cb1c570b145aa3df064ddb.zip
chromium_src-3ddc371345a7a6c1a3cb1c570b145aa3df064ddb.tar.gz
chromium_src-3ddc371345a7a6c1a3cb1c570b145aa3df064ddb.tar.bz2
Ensure that blending is disabled for layers with no alpha
BUG=5110667 TEST=None Review URL: http://codereview.chromium.org/7597001 Patch from Ian Vollick <vollick@chromium.org>. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95834 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/gfx/compositor/layer.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/gfx/compositor/layer.cc b/ui/gfx/compositor/layer.cc
index 53097bd..214b07e 100644
--- a/ui/gfx/compositor/layer.cc
+++ b/ui/gfx/compositor/layer.cc
@@ -89,8 +89,9 @@ void Layer::Draw() {
static_cast<float>(layer->bounds_.y()));
}
- // Only blend for child layers. The root layer will clobber the cleared bg.
- texture_draw_params.blend = parent_ != NULL;
+ // Only blend for transparent child layers.
+ // The root layer will clobber the cleared bg.
+ texture_draw_params.blend = parent_ != NULL && !fills_bounds_opaquely_;
#if defined(OS_WIN)
texture_->Draw(texture_draw_params);