Revert 191400 "cc: Add ‘chromium_code’: 1 to cc.gyp and cc_t..."

trunk/src/cc/trees/layer_tree_host_impl.cc

Index: trunk/src/cc/trees/layer_tree_host_impl.cc
===================================================================
--- trunk/src/cc/trees/layer_tree_host_impl.cc	(revision 191412)
+++ trunk/src/cc/trees/layer_tree_host_impl.cc	(working copy)
@@ -1108,7 +1108,7 @@
 }
 
 bool LayerTreeHostImpl::haveRootScrollLayer() const {
-  return !!RootScrollLayer();
+  return RootScrollLayer();
 }
 
 LayerImpl* LayerTreeHostImpl::RootLayer() const {
@@ -1395,7 +1395,7 @@
 
 bool LayerTreeHostImpl::EnsureRenderSurfaceLayerList() {
   active_tree_->UpdateDrawProperties(LayerTreeImpl::UPDATE_ACTIVE_TREE);
-  return !active_tree_->RenderSurfaceLayerList().empty();
+  return active_tree_->RenderSurfaceLayerList().size();
 }
 
 InputHandlerClient::ScrollStatus LayerTreeHostImpl::ScrollBegin(
Property changes on: trunk/src/cc/trees/layer_tree_host_impl.cc
___________________________________________________________________
Added: svn:mergeinfo