Remove skia::ScopedPlatformPaint

skia/ext/platform_canvas.cc

 // Copyright (c) 2011 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 "skia/ext/platform_canvas.h"
 
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "skia/ext/platform_device.h"
@@ skipping 72 matching lines @@
 #if defined(OS_MACOSX)
 void SetIsPreviewMetafile(const SkCanvas& canvas, bool is_preview) {
   SetBoolMetaData(canvas, kIsPreviewMetafileKey, is_preview);
 }
 
 bool IsPreviewMetafile(const SkCanvas& canvas) {
   return GetBoolMetaData(canvas, kIsPreviewMetafileKey);
 }
 #endif
 
-ScopedPlatformPaint::ScopedPlatformPaint(SkCanvas* canvas) :
-    canvas_(canvas),
-    native_drawing_context_(nullptr) {
-  // TODO(tomhudson) we're assuming non-null canvas?
+NativeDrawingContext GetNativeDrawingContext(SkCanvas* canvas) {
   PlatformDevice* platform_device = GetPlatformDevice(canvas->getTopDevice(true));
-  if (platform_device) {
-    // Compensate for drawing to a layer rather than the entire canvas
-    SkMatrix ctm;
-    SkIRect clip_bounds;
-    canvas->temporary_internal_describeTopLayer(&ctm, &clip_bounds);
-    native_drawing_context_ = platform_device->BeginPlatformPaint(ctm, clip_bounds);
-  }
+  if (!platform_device)
+    return nullptr;
+
+  // Compensate for drawing to a layer rather than the entire canvas
+  SkMatrix ctm;
+  SkIRect clip_bounds;
+  canvas->temporary_internal_describeTopLayer(&ctm, &clip_bounds);
+
+  return platform_device->BeginPlatformPaint(ctm, clip_bounds);
 }
 
 }  // namespace skia