BASELINE: Update Chromium to 55.0.2883.105

And updates ninja to 1.7.2

Change-Id: I20d43c737f82764d857ada9a55586901b18b9243
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

1 files changed, 10 insertions, 31 deletions

diff --git a/chromium/cc/layers/render_surface_impl.h b/chromium/cc/layers/render_surface_impl.h
index dbdd58d1f27..b8c494b42f6 100644
--- a/chromium/cc/layers/render_surface_impl.h
+++ b/chromium/cc/layers/render_surface_impl.h
@@ -53,6 +53,9 @@ class CC_EXPORT RenderSurfaceImpl {
   }
   float draw_opacity() const { return draw_properties_.draw_opacity; }
 
+  SkXfermode::Mode BlendMode() const;
+  bool UsesDefaultBlendMode() const;
+
   void SetNearestOcclusionImmuneAncestor(const RenderSurfaceImpl* surface) {
     nearest_occlusion_immune_ancestor_ = surface;
   }
@@ -61,10 +64,7 @@ class CC_EXPORT RenderSurfaceImpl {
   }
 
   SkColor GetDebugBorderColor() const;
-  SkColor GetReplicaDebugBorderColor() const;
-
   float GetDebugBorderWidth() const;
-  float GetReplicaDebugBorderWidth() const;
 
   void SetDrawTransform(const gfx::Transform& draw_transform) {
     draw_properties_.draw_transform = draw_transform;
@@ -80,22 +80,6 @@ class CC_EXPORT RenderSurfaceImpl {
     return draw_properties_.screen_space_transform;
   }
 
-  void SetReplicaDrawTransform(const gfx::Transform& replica_draw_transform) {
-    draw_properties_.replica_draw_transform = replica_draw_transform;
-  }
-  const gfx::Transform& replica_draw_transform() const {
-    return draw_properties_.replica_draw_transform;
-  }
-
-  void SetReplicaScreenSpaceTransform(
-      const gfx::Transform& replica_screen_space_transform) {
-    draw_properties_.replica_screen_space_transform =
-        replica_screen_space_transform;
-  }
-  const gfx::Transform& replica_screen_space_transform() const {
-    return draw_properties_.replica_screen_space_transform;
-  }
-
   void SetIsClipped(bool is_clipped) {
     draw_properties_.is_clipped = is_clipped;
   }
@@ -141,23 +125,22 @@ class CC_EXPORT RenderSurfaceImpl {
   void ClearLayerLists();
 
   int OwningLayerId() const;
-  bool HasReplica() const;
-  const LayerImpl* ReplicaLayer() const;
-  LayerImpl* ReplicaLayer();
 
   LayerImpl* MaskLayer();
   bool HasMask() const;
 
-  LayerImpl* ReplicaMaskLayer();
-  bool HasReplicaMask() const;
-
+  const FilterOperations& Filters() const;
   const FilterOperations& BackgroundFilters() const;
+  gfx::PointF FiltersOrigin() const;
+  gfx::Transform FiltersTransform() const;
 
   bool HasCopyRequest() const;
 
-  void ResetPropertyChangedFlag() { surface_property_changed_ = false; }
+  void ResetPropertyChangedFlags();
   bool SurfacePropertyChanged() const;
   bool SurfacePropertyChangedOnlyFromDescendant() const;
+  bool AncestorPropertyChanged() const;
+  void NoteAncestorPropertyChanged();
 
   DamageTracker* damage_tracker() const { return damage_tracker_.get(); }
 
@@ -199,11 +182,6 @@ class CC_EXPORT RenderSurfaceImpl {
     // Transforms from the surface's own space to the viewport.
     gfx::Transform screen_space_transform;
 
-    // If the surface has a replica, these transform from the replica's space to
-    // the space of the target surface and the viewport.
-    gfx::Transform replica_draw_transform;
-    gfx::Transform replica_screen_space_transform;
-
     // This is in the surface's own space.
     gfx::Rect content_rect;
 
@@ -219,6 +197,7 @@ class CC_EXPORT RenderSurfaceImpl {
   // Is used to calculate the content rect from property trees.
   gfx::Rect accumulated_content_rect_;
   bool surface_property_changed_ : 1;
+  bool ancestor_property_changed_ : 1;
 
   bool contributes_to_drawn_surface_ : 1;