summaryrefslogtreecommitdiffstats
path: root/cc
diff options
context:
space:
mode:
authorpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-05 23:46:59 +0000
committerpiman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-05 23:46:59 +0000
commit0570dd374d0f596fb14f58c5077123faa87b0f78 (patch)
tree15f9a1fb687f6bfb3c618ca1f4d2fa011b6c87b3 /cc
parentba173040087222825bcb9eb04a1529329176021b (diff)
downloadchromium_src-0570dd374d0f596fb14f58c5077123faa87b0f78.zip
chromium_src-0570dd374d0f596fb14f58c5077123faa87b0f78.tar.gz
chromium_src-0570dd374d0f596fb14f58c5077123faa87b0f78.tar.bz2
Fix DelegatedRendererLayer::drawsContent to correctly take setIsDrawable into account
BUG=None Review URL: https://codereview.chromium.org/12486002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186283 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
-rw-r--r--cc/delegated_renderer_layer.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/cc/delegated_renderer_layer.cc b/cc/delegated_renderer_layer.cc
index 297a5e8..d4b3b29 100644
--- a/cc/delegated_renderer_layer.cc
+++ b/cc/delegated_renderer_layer.cc
@@ -26,7 +26,7 @@ scoped_ptr<LayerImpl> DelegatedRendererLayer::createLayerImpl(
}
bool DelegatedRendererLayer::drawsContent() const {
- return !frame_size_.IsEmpty();
+ return Layer::drawsContent() && !frame_size_.IsEmpty();
}
void DelegatedRendererLayer::pushPropertiesTo(LayerImpl* impl) {