BASELINE: Update Chromium to 58.0.3029.54

Change-Id: I67f57065a7afdc8e4614adb5c0230281428df4d1
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

1 files changed, 12 insertions, 7 deletions

diff --git a/chromium/cc/layers/picture_layer_impl.h b/chromium/cc/layers/picture_layer_impl.h
index 5f1ddf1b291..93a703e036b 100644
--- a/chromium/cc/layers/picture_layer_impl.h
+++ b/chromium/cc/layers/picture_layer_impl.h
@@ -14,7 +14,9 @@
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "cc/base/cc_export.h"
+#include "cc/layers/layer.h"
 #include "cc/layers/layer_impl.h"
+#include "cc/playback/image_id.h"
 #include "cc/tiles/picture_layer_tiling.h"
 #include "cc/tiles/picture_layer_tiling_set.h"
 #include "cc/tiles/tiling_set_eviction_queue.h"
@@ -29,14 +31,13 @@ class CC_EXPORT PictureLayerImpl
     : public LayerImpl,
       NON_EXPORTED_BASE(public PictureLayerTilingClient) {
  public:
-  static std::unique_ptr<PictureLayerImpl> Create(LayerTreeImpl* tree_impl,
-                                                  int id,
-                                                  bool is_mask) {
-    return base::WrapUnique(new PictureLayerImpl(tree_impl, id, is_mask));
+  static std::unique_ptr<PictureLayerImpl>
+  Create(LayerTreeImpl* tree_impl, int id, Layer::LayerMaskType mask_type) {
+    return base::WrapUnique(new PictureLayerImpl(tree_impl, id, mask_type));
   }
   ~PictureLayerImpl() override;
 
-  bool is_mask() const { return is_mask_; }
+  Layer::LayerMaskType mask_type() const { return mask_type_; }
 
   // LayerImpl overrides.
   const char* LayerTypeAsString() const override;
@@ -98,8 +99,12 @@ class CC_EXPORT PictureLayerImpl
     is_directly_composited_image_ = is_directly_composited_image;
   }
 
+  void InvalidateRegionForImages(const ImageIdFlatSet& images_to_invalidate);
+
  protected:
-  PictureLayerImpl(LayerTreeImpl* tree_impl, int id, bool is_mask);
+  PictureLayerImpl(LayerTreeImpl* tree_impl,
+                   int id,
+                   Layer::LayerMaskType mask_type);
   PictureLayerTiling* AddTiling(float contents_scale);
   void RemoveAllTilings();
   void AddTilingsForRasterScale();
@@ -143,7 +148,7 @@ class CC_EXPORT PictureLayerImpl
 
   bool was_screen_space_transform_animating_;
   bool only_used_low_res_last_append_quads_;
-  const bool is_mask_;
+  const Layer::LayerMaskType mask_type_;
 
   bool nearest_neighbor_;
   bool is_directly_composited_image_;