diff options
| author | powei@chromium.org <powei@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-26 01:43:51 +0000 |
|---|---|---|
| committer | powei@chromium.org <powei@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-26 01:43:51 +0000 |
| commit | 709c9543eec6ef6a9139daa6b34b03613c79fcc5 (patch) | |
| tree | 1b85858a614f1cd9c9a418b43f0c8cc3d43e3999 /cc/layers/ui_resource_layer_impl.cc | |
| parent | a948d427c9f184ec463d931490d4e1ccbc9c4b0e (diff) | |
| download | chromium_src-709c9543eec6ef6a9139daa6b34b03613c79fcc5.zip chromium_src-709c9543eec6ef6a9139daa6b34b03613c79fcc5.tar.gz chromium_src-709c9543eec6ef6a9139daa6b34b03613c79fcc5.tar.bz2 | |
cc: Add opacity to UIResourceBitmap and UIResourceLayer
Store opacity information with UIResourceBitmap and on the LayerTreeHostImpl.
This allows us to provide a valid opaque rect when append quads in the
UIResourceLayer.
BUG=300027
Review URL: https://codereview.chromium.org/42073003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@231178 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/layers/ui_resource_layer_impl.cc')
| -rw-r--r-- | cc/layers/ui_resource_layer_impl.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cc/layers/ui_resource_layer_impl.cc b/cc/layers/ui_resource_layer_impl.cc index 23e33f90..2c9a286 100644 --- a/cc/layers/ui_resource_layer_impl.cc +++ b/cc/layers/ui_resource_layer_impl.cc @@ -113,8 +113,9 @@ void UIResourceLayerImpl::AppendQuads(QuadSink* quad_sink, gfx::Rect quad_rect(bounds()); - // TODO(clholgat): Properly calculate opacity: crbug.com/300027 - gfx::Rect opaque_rect(contents_opaque() ? quad_rect : gfx::Rect()); + bool opaque = layer_tree_impl()->IsUIResourceOpaque(ui_resource_id_) || + contents_opaque(); + gfx::Rect opaque_rect(opaque ? quad_rect : gfx::Rect()); scoped_ptr<TextureDrawQuad> quad; quad = TextureDrawQuad::Create(); |