Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2711)

Unified Diff: cc/trees/layer_tree_impl.cc

Issue 1365343002: Ensure the viewport is always represented by the inner viewport layer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix more tests. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/trees/layer_tree_host_unittest_picture.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_impl.cc
diff --git a/cc/trees/layer_tree_impl.cc b/cc/trees/layer_tree_impl.cc
index 61a64d63402bb37d7c984c379b9cfa5e2b79d7a1..899c3cd5c1eb46617a87ff744cda017d2c179e2f 100644
--- a/cc/trees/layer_tree_impl.cc
+++ b/cc/trees/layer_tree_impl.cc
@@ -265,6 +265,8 @@ LayerImpl* LayerTreeImpl::CurrentlyScrollingLayer() const {
}
void LayerTreeImpl::SetCurrentlyScrollingLayer(LayerImpl* layer) {
+ DCHECK_IMPLIES(layer, layer != OuterViewportScrollLayer());
+
int new_id = layer ? layer->id() : Layer::INVALID_ID;
if (currently_scrolling_layer_id_ == new_id)
return;
« no previous file with comments | « cc/trees/layer_tree_host_unittest_picture.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698