diff options
| author | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-29 20:56:20 +0000 |
|---|---|---|
| committer | boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-29 20:56:20 +0000 |
| commit | a877bc1383ef452130a961b146814a2dee383e07 (patch) | |
| tree | a393d72182de0faa57d4e93584bfb0fe9fa007f4 /cc | |
| parent | ada0f2b9787b37db50ce673962c3880f905e1580 (diff) | |
| download | chromium_src-a877bc1383ef452130a961b146814a2dee383e07.zip chromium_src-a877bc1383ef452130a961b146814a2dee383e07.tar.gz chromium_src-a877bc1383ef452130a961b146814a2dee383e07.tar.bz2 | |
cc: Stop assuming LayerImpl::WillDraw returns true
BUG=
Review URL: https://chromiumcodereview.appspot.com/18176010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209341 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc')
| -rw-r--r-- | cc/layers/scrollbar_layer_impl.cc | 7 | ||||
| -rw-r--r-- | cc/layers/video_layer_impl.cc | 3 |
2 files changed, 6 insertions, 4 deletions
diff --git a/cc/layers/scrollbar_layer_impl.cc b/cc/layers/scrollbar_layer_impl.cc index b8da4b6..4160bf0 100644 --- a/cc/layers/scrollbar_layer_impl.cc +++ b/cc/layers/scrollbar_layer_impl.cc @@ -76,9 +76,10 @@ void ScrollbarLayerImpl::PushPropertiesTo(LayerImpl* layer) { bool ScrollbarLayerImpl::WillDraw(DrawMode draw_mode, ResourceProvider* resource_provider) { - LayerImpl::WillDraw(draw_mode, resource_provider); - return draw_mode != DRAW_MODE_RESOURCELESS_SOFTWARE || - layer_tree_impl()->settings().solid_color_scrollbars; + if (draw_mode == DRAW_MODE_RESOURCELESS_SOFTWARE && + !layer_tree_impl()->settings().solid_color_scrollbars) + return false; + return LayerImpl::WillDraw(draw_mode, resource_provider); } void ScrollbarLayerImpl::AppendQuads(QuadSink* quad_sink, diff --git a/cc/layers/video_layer_impl.cc b/cc/layers/video_layer_impl.cc index 0ae2036..dc55ba2 100644 --- a/cc/layers/video_layer_impl.cc +++ b/cc/layers/video_layer_impl.cc @@ -90,7 +90,8 @@ bool VideoLayerImpl::WillDraw(DrawMode draw_mode, return false; } - LayerImpl::WillDraw(draw_mode, resource_provider); + if (!LayerImpl::WillDraw(draw_mode, resource_provider)) + return false; if (!updater_) updater_.reset(new VideoResourceUpdater(resource_provider)); |