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

Side by Side Diff: cc/trees/layer_tree_host.cc

Issue 1417903005: Revert of Remove DCHECK_IMPLIES/CHECK_IMPLIES. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « cc/tiles/tile_manager_unittest.cc ('k') | cc/trees/layer_tree_host_common.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/trees/layer_tree_host.h" 5 #include "cc/trees/layer_tree_host.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <stack> 8 #include <stack>
9 #include <string> 9 #include <string>
10 10
(...skipping 937 matching lines...) Expand 10 before | Expand all | Expand 10 after
948 948
949 const UIResourceClientData& data = iter->second; 949 const UIResourceClientData& data = iter->second;
950 return data.size; 950 return data.size;
951 } 951 }
952 952
953 void LayerTreeHost::RegisterViewportLayers( 953 void LayerTreeHost::RegisterViewportLayers(
954 scoped_refptr<Layer> overscroll_elasticity_layer, 954 scoped_refptr<Layer> overscroll_elasticity_layer,
955 scoped_refptr<Layer> page_scale_layer, 955 scoped_refptr<Layer> page_scale_layer,
956 scoped_refptr<Layer> inner_viewport_scroll_layer, 956 scoped_refptr<Layer> inner_viewport_scroll_layer,
957 scoped_refptr<Layer> outer_viewport_scroll_layer) { 957 scoped_refptr<Layer> outer_viewport_scroll_layer) {
958 DCHECK(!inner_viewport_scroll_layer || 958 DCHECK_IMPLIES(inner_viewport_scroll_layer,
959 inner_viewport_scroll_layer != outer_viewport_scroll_layer); 959 inner_viewport_scroll_layer != outer_viewport_scroll_layer);
960 overscroll_elasticity_layer_ = overscroll_elasticity_layer; 960 overscroll_elasticity_layer_ = overscroll_elasticity_layer;
961 page_scale_layer_ = page_scale_layer; 961 page_scale_layer_ = page_scale_layer;
962 inner_viewport_scroll_layer_ = inner_viewport_scroll_layer; 962 inner_viewport_scroll_layer_ = inner_viewport_scroll_layer;
963 outer_viewport_scroll_layer_ = outer_viewport_scroll_layer; 963 outer_viewport_scroll_layer_ = outer_viewport_scroll_layer;
964 } 964 }
965 965
966 void LayerTreeHost::RegisterSelection(const LayerSelection& selection) { 966 void LayerTreeHost::RegisterSelection(const LayerSelection& selection) {
967 if (selection_ == selection) 967 if (selection_ == selection)
968 return; 968 return;
969 969
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
1220 return animation_host_ ? animation_host_->HasAnyAnimation(layer->id()) 1220 return animation_host_ ? animation_host_->HasAnyAnimation(layer->id())
1221 : false; 1221 : false;
1222 } 1222 }
1223 1223
1224 bool LayerTreeHost::HasActiveAnimation(const Layer* layer) const { 1224 bool LayerTreeHost::HasActiveAnimation(const Layer* layer) const {
1225 return animation_host_ ? animation_host_->HasActiveAnimation(layer->id()) 1225 return animation_host_ ? animation_host_->HasActiveAnimation(layer->id())
1226 : false; 1226 : false;
1227 } 1227 }
1228 1228
1229 } // namespace cc 1229 } // namespace cc
OLDNEW
« no previous file with comments | « cc/tiles/tile_manager_unittest.cc ('k') | cc/trees/layer_tree_host_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698