BASELINE: Update Chromium to 62.0.3202.101

Change-Id: I2d5eca8117600df6d331f6166ab24d943d9814ac
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 15 insertions, 16 deletions

diff --git a/chromium/cc/layers/painted_scrollbar_layer_impl.cc b/chromium/cc/layers/painted_scrollbar_layer_impl.cc
index 6e6db9f91f7..73dbaf3c7d2 100644
--- a/chromium/cc/layers/painted_scrollbar_layer_impl.cc
+++ b/chromium/cc/layers/painted_scrollbar_layer_impl.cc
@@ -92,7 +92,7 @@ void PaintedScrollbarLayerImpl::AppendQuads(
   gfx::PointF uv_top_left(0.f, 0.f);
   gfx::PointF uv_bottom_right(1.f, 1.f);
 
-  SharedQuadState* shared_quad_state =
+  viz::SharedQuadState* shared_quad_state =
       render_pass->CreateAndAppendSharedQuadState();
   PopulateScaledSharedQuadState(shared_quad_state, internal_contents_scale_,
                                 internal_contents_scale_);
@@ -109,22 +109,22 @@ void PaintedScrollbarLayerImpl::AppendQuads(
   gfx::Rect scaled_visible_thumb_quad_rect = gfx::ScaleToEnclosingRect(
       visible_thumb_quad_rect, internal_contents_scale_);
 
-  ResourceId thumb_resource_id =
+  viz::ResourceId thumb_resource_id =
       layer_tree_impl()->ResourceIdForUIResource(thumb_ui_resource_id_);
-  ResourceId track_resource_id =
+  viz::ResourceId track_resource_id =
       layer_tree_impl()->ResourceIdForUIResource(track_ui_resource_id_);
 
   if (thumb_resource_id && !visible_thumb_quad_rect.IsEmpty()) {
-    gfx::Rect opaque_rect;
+    bool needs_blending = true;
     const float opacity[] = {thumb_opacity_, thumb_opacity_, thumb_opacity_,
                              thumb_opacity_};
     TextureDrawQuad* quad =
         render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
-    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,
-                 false);
+    quad->SetNew(shared_quad_state, scaled_thumb_quad_rect,
+                 scaled_visible_thumb_quad_rect, needs_blending,
+                 thumb_resource_id, premultipled_alpha, uv_top_left,
+                 uv_bottom_right, SK_ColorTRANSPARENT, opacity, flipped,
+                 nearest_neighbor, false);
     ValidateQuadResources(quad);
   }
 
@@ -136,16 +136,15 @@ void PaintedScrollbarLayerImpl::AppendQuads(
   gfx::Rect scaled_visible_track_quad_rect = gfx::ScaleToEnclosingRect(
       visible_track_quad_rect, internal_contents_scale_);
   if (track_resource_id && !visible_track_quad_rect.IsEmpty()) {
-    gfx::Rect opaque_rect(contents_opaque() ? scaled_track_quad_rect
-                                            : gfx::Rect());
+    bool needs_blending = !contents_opaque();
     const float opacity[] = {1.0f, 1.0f, 1.0f, 1.0f};
     TextureDrawQuad* quad =
         render_pass->CreateAndAppendDrawQuad<TextureDrawQuad>();
-    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,
-                 false);
+    quad->SetNew(shared_quad_state, scaled_track_quad_rect,
+                 scaled_visible_track_quad_rect, needs_blending,
+                 track_resource_id, premultipled_alpha, uv_top_left,
+                 uv_bottom_right, SK_ColorTRANSPARENT, opacity, flipped,
+                 nearest_neighbor, false);
     ValidateQuadResources(quad);
   }
 }