Update SetPaintToLayer to accept LayerType

ui/views/controls/scroll_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/scroll_view.h"
 
 #include "base/feature_list.h"
 #include "base/logging.h"
 #include "base/macros.h"
+#include "ui/compositor/layer_type.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/focus_ring.h"
 #include "ui/views/style/platform_style.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
@@ skipping 180 matching lines @@
 }
 
 void ScrollView::SetContents(View* a_view) {
   // Protect against clients passing a contents view that has its own Layer.
   DCHECK(!a_view->layer());
   if (ScrollsWithLayers()) {
     if (!a_view->background() && background_color_ != SK_ColorTRANSPARENT) {
       a_view->set_background(
           Background::CreateSolidBackground(background_color_));
     }
-    a_view->SetPaintToLayer(true);
+    a_view->SetPaintToLayer(ui::LAYER_TEXTURED);
     a_view->layer()->SetScrollable(
         contents_viewport_->layer(),
         base::Bind(&ScrollView::OnLayerScrolled, base::Unretained(this)));
   }
   SetHeaderOrContents(contents_viewport_, a_view, &contents_);
 }
 
 void ScrollView::SetHeader(View* header) {
   SetHeaderOrContents(header_viewport_, header, &header_);
 }
@@ skipping 488 matching lines @@
 bool ScrollView::ScrollsWithLayers() const {
   // Just check for the presence of a layer since it's cheaper than querying the
   // Feature flag each time.
   return contents_viewport_->layer() != nullptr;
 }
 
 void ScrollView::EnableViewPortLayer() {
   background_color_ = SK_ColorWHITE;
   contents_viewport_->set_background(
       Background::CreateSolidBackground(background_color_));
-  contents_viewport_->SetPaintToLayer(true);
+  contents_viewport_->SetPaintToLayer(ui::LAYER_TEXTURED);
   contents_viewport_->layer()->SetMasksToBounds(true);
 }
 
 void ScrollView::OnLayerScrolled() {
   UpdateScrollBarPositions();
   ScrollHeader();
 }
 
 void ScrollView::ScrollHeader() {
   if (!header_)
@@ skipping 73 matching lines @@
 
 VariableRowHeightScrollHelper::RowInfo
     FixedRowHeightScrollHelper::GetRowInfo(int y) {
   if (y < top_margin_)
     return RowInfo(0, top_margin_);
   return RowInfo((y - top_margin_) / row_height_ * row_height_ + top_margin_,
                  row_height_);
 }
 
 }  // namespace views