BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1

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

1 files changed, 8 insertions, 5 deletions

diff --git a/chromium/cc/layers/painted_scrollbar_layer_impl.cc b/chromium/cc/layers/painted_scrollbar_layer_impl.cc
index eb44f0dfa17..8014576a403 100644
--- a/chromium/cc/layers/painted_scrollbar_layer_impl.cc
+++ b/chromium/cc/layers/painted_scrollbar_layer_impl.cc
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 
+#include "base/memory/ptr_util.h"
 #include "cc/input/scrollbar_animation_controller.h"
 #include "cc/layers/layer.h"
 #include "cc/quads/solid_color_draw_quad.h"
@@ -17,11 +18,11 @@
 
 namespace cc {
 
-scoped_ptr<PaintedScrollbarLayerImpl> PaintedScrollbarLayerImpl::Create(
+std::unique_ptr<PaintedScrollbarLayerImpl> PaintedScrollbarLayerImpl::Create(
     LayerTreeImpl* tree_impl,
     int id,
     ScrollbarOrientation orientation) {
-  return make_scoped_ptr(
+  return base::WrapUnique(
       new PaintedScrollbarLayerImpl(tree_impl, id, orientation));
 }
 
@@ -41,7 +42,7 @@ PaintedScrollbarLayerImpl::PaintedScrollbarLayerImpl(
 
 PaintedScrollbarLayerImpl::~PaintedScrollbarLayerImpl() {}
 
-scoped_ptr<LayerImpl> PaintedScrollbarLayerImpl::CreateLayerImpl(
+std::unique_ptr<LayerImpl> PaintedScrollbarLayerImpl::CreateLayerImpl(
     LayerTreeImpl* tree_impl) {
   return PaintedScrollbarLayerImpl::Create(tree_impl, id(), orientation());
 }
@@ -111,7 +112,8 @@ void PaintedScrollbarLayerImpl::AppendQuads(
     quad->SetNew(shared_quad_state, scaled_thumb_quad_rect, opaque_rect,
                  scaled_visible_thumb_quad_rect, thumb_resource_id,
                  premultipled_alpha, uv_top_left, uv_bottom_right,
-                 SK_ColorTRANSPARENT, opacity, flipped, nearest_neighbor);
+                 SK_ColorTRANSPARENT, opacity, flipped, nearest_neighbor,
+                 false);
     ValidateQuadResources(quad);
   }
 
@@ -131,7 +133,8 @@ void PaintedScrollbarLayerImpl::AppendQuads(
     quad->SetNew(shared_quad_state, scaled_track_quad_rect, opaque_rect,
                  scaled_visible_track_quad_rect, track_resource_id,
                  premultipled_alpha, uv_top_left, uv_bottom_right,
-                 SK_ColorTRANSPARENT, opacity, flipped, nearest_neighbor);
+                 SK_ColorTRANSPARENT, opacity, flipped, nearest_neighbor,
+                 false);
     ValidateQuadResources(quad);
   }
 }