Update from https://crrev.com/315085

cc/layers/picture_image_layer.cc

 // Copyright 2010 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 "cc/layers/picture_image_layer.h"
 
 #include "cc/layers/picture_image_layer_impl.h"
 #include "cc/resources/drawing_display_item.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
@@ skipping 29 matching lines @@
     return;
 
   bitmap_ = bitmap;
   UpdateDrawsContent(HasDrawableContent());
   SetNeedsDisplay();
 }
 
 void PictureImageLayer::PaintContents(
     SkCanvas* canvas,
     const gfx::Rect& clip,
-    ContentLayerClient::GraphicsContextStatus gc_status) {
+    ContentLayerClient::PaintingControlSetting painting_control) {
   if (!bitmap_.width() || !bitmap_.height())
     return;
 
   SkScalar content_to_layer_scale_x =
       SkFloatToScalar(static_cast<float>(bounds().width()) / bitmap_.width());
   SkScalar content_to_layer_scale_y =
       SkFloatToScalar(static_cast<float>(bounds().height()) / bitmap_.height());
   canvas->scale(content_to_layer_scale_x, content_to_layer_scale_y);
 
   // Because Android WebView resourceless software draw mode rasters directly
   // to the root canvas, this draw must use the kSrcOver_Mode so that
   // transparent images blend correctly.
   canvas->drawBitmap(bitmap_, 0, 0);
 }
 
 scoped_refptr<DisplayItemList> PictureImageLayer::PaintContentsToDisplayList(
     const gfx::Rect& clip,
-    GraphicsContextStatus gc_status) {
+    ContentLayerClient::PaintingControlSetting painting_control) {
   scoped_refptr<DisplayItemList> display_item_list = DisplayItemList::Create();
 
   SkPictureRecorder recorder;
   SkCanvas* canvas = recorder.beginRecording(gfx::RectToSkRect(clip));
-  PaintContents(canvas, clip, gc_status);
+  PaintContents(canvas, clip, painting_control);
 
   skia::RefPtr<SkPicture> picture = skia::AdoptRef(recorder.endRecording());
   display_item_list->AppendItem(
       DrawingDisplayItem::Create(picture, gfx::Point()));
   return display_item_list;
 }
 
 bool PictureImageLayer::FillsBoundsCompletely() const {
   return false;
 }
 
 }  // namespace cc