Merge 194269

cc/trees/layer_tree_host_common.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/layer_tree_host_common.h"
 
 #include <algorithm>
 
 #include "base/debug/trace_event.h"
 #include "cc/base/math_util.h"
@@ skipping 250 matching lines @@
   // Mask layers don't get this call, so explicitly update them so they can
   // kick off tile rasterization.
   if (layer->mask_layer())
     layer->mask_layer()->UpdateTilePriorities();
   if (layer->replica_layer() && layer->replica_layer()->mask_layer())
     layer->replica_layer()->mask_layer()->UpdateTilePriorities();
 }
 
 static inline void UpdateTilePrioritiesForLayer(Layer* layer) {}
 
+static inline void SavePaintPropertiesLayer(LayerImpl* layer) {}
+
+static inline void SavePaintPropertiesLayer(Layer* layer) {
+  layer->SavePaintProperties();
+
+  if (layer->mask_layer())
+    layer->mask_layer()->SavePaintProperties();
+  if (layer->replica_layer() && layer->replica_layer()->mask_layer())
+    layer->replica_layer()->mask_layer()->SavePaintProperties();
+}
+
 template <typename LayerType>
 static bool SubtreeShouldRenderToSeparateSurface(
     LayerType* layer,
     bool axis_aligned_with_respect_to_parent) {
   //
   // A layer and its descendants should render onto a new RenderSurfaceImpl if
   // any of these rules hold:
   //
 
   // The root layer should always have a render_surface.
@@ skipping 1121 matching lines @@
     *drawable_content_rect_of_subtree =
         gfx::ToEnclosingRect(layer->render_surface()->DrawableContentRect());
   } else {
     *drawable_content_rect_of_subtree = local_drawable_content_rect_of_subtree;
   }
 
   if (layer->HasContributingDelegatedRenderPasses()) {
     layer->render_target()->render_surface()->
         AddContributingDelegatedRenderPassLayer(layer);
   }
+
+  SavePaintPropertiesLayer(layer);
 }
 
 void LayerTreeHostCommon::CalculateDrawProperties(
     Layer* root_layer,
     gfx::Size device_viewport_size,
     float device_scale_factor,
     float page_scale_factor,
     int max_texture_size,
     bool can_use_lcd_text,
     LayerList* render_surface_layer_list) {
@@ skipping 280 matching lines @@
   // At this point, we think the point does hit the touch event handler region
   // on the layer, but we need to walk up the parents to ensure that the layer
   // was not clipped in such a way that the hit point actually should not hit
   // the layer.
   if (PointIsClippedBySurfaceOrClipRect(screen_space_point, layer_impl))
     return false;
 
   return true;
 }
 }  // namespace cc