BASELINE: Update Chromium to 53.0.2785.41

Also adds a few extra files for extensions.

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

1 files changed, 8 insertions, 7 deletions

diff --git a/chromium/cc/layers/picture_layer_impl.h b/chromium/cc/layers/picture_layer_impl.h
index 17108518fdf..f6a65242bf8 100644
--- a/chromium/cc/layers/picture_layer_impl.h
+++ b/chromium/cc/layers/picture_layer_impl.h
@@ -92,14 +92,18 @@ class CC_EXPORT PictureLayerImpl
   // Used for benchmarking
   RasterSource* GetRasterSource() const { return raster_source_.get(); }
 
+  void set_is_directly_composited_image(bool is_directly_composited_image) {
+    is_directly_composited_image_ = is_directly_composited_image;
+  }
+
  protected:
   PictureLayerImpl(LayerTreeImpl* tree_impl, int id, bool is_mask);
   PictureLayerTiling* AddTiling(float contents_scale);
   void RemoveAllTilings();
   void AddTilingsForRasterScale();
   void AddLowResolutionTilingIfNeeded();
-  virtual bool ShouldAdjustRasterScale() const;
-  virtual void RecalculateRasterScales();
+  bool ShouldAdjustRasterScale() const;
+  void RecalculateRasterScales();
   void CleanUpTilingsOnActiveLayer(
       const std::vector<PictureLayerTiling*>& used_tilings);
   float MinimumContentsScale() const;
@@ -116,7 +120,7 @@ class CC_EXPORT PictureLayerImpl
       std::vector<PrioritizedTile>* prioritized_tiles) const override;
   void AsValueInto(base::trace_event::TracedValue* dict) const override;
 
-  virtual void UpdateIdealScales();
+  void UpdateIdealScales();
   float MaximumTilingContentsScale() const;
   std::unique_ptr<PictureLayerTilingSet> CreatePictureLayerTilingSet();
 
@@ -130,9 +134,6 @@ class CC_EXPORT PictureLayerImpl
   float ideal_device_scale_;
   float ideal_source_scale_;
   float ideal_contents_scale_;
-  // This refers to the ideal scale from the previous frame (or a previous time
-  // the ideal scale was updated).
-  float last_ideal_source_scale_;
 
   float raster_page_scale_;
   float raster_device_scale_;
@@ -140,12 +141,12 @@ class CC_EXPORT PictureLayerImpl
   float raster_contents_scale_;
   float low_res_raster_contents_scale_;
 
-  bool raster_source_scale_is_fixed_;
   bool was_screen_space_transform_animating_;
   bool only_used_low_res_last_append_quads_;
   const bool is_mask_;
 
   bool nearest_neighbor_;
+  bool is_directly_composited_image_;
 
   // Use this instead of |visible_layer_rect()| for tiling calculations. This
   // takes external viewport and transform for tile priority into account.