skia/ext/benchmarking_canvas.cc - Issue 22796028: Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: skia/ext/benchmarking_canvas.cc

Issue 22796028: Updating Chromium to Skia SkBaseDevice/SkBitmapDevice split (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Minor cleanup Created 7 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: skia/ext/benchmarking_canvas.cc

diff --git a/skia/ext/benchmarking_canvas.cc b/skia/ext/benchmarking_canvas.cc

index fbd2eb1865bbaacc44ffaf8bb3dc03e185252df9..557827f37cb3aaeecd4ee9a3ae20bad3c203c8dc 100644

--- a/skia/ext/benchmarking_canvas.cc

+++ b/skia/ext/benchmarking_canvas.cc

@@ -6,7 +6,7 @@

#include "base/logging.h"

#include "base/time/time.h"

#include "skia/ext/benchmarking_canvas.h"

-#include "third_party/skia/include/core/SkDevice.h"

+#include "third_party/skia/include/core/SkBitmapDevice.h"

#include "third_party/skia/include/utils/SkProxyCanvas.h"

namespace skia {

@@ -25,8 +25,8 @@ class TimingCanvas : public SkProxyCanvas {

public:

TimingCanvas(int width, int height, const BenchmarkingCanvas* track_canvas)

: tracking_canvas_(track_canvas) {

- skia::RefPtr<SkDevice> device = skia::AdoptRef(

- SkNEW_ARGS(SkDevice, (SkBitmap::kARGB_8888_Config, width, height)));

+ skia::RefPtr<SkBaseDevice> device = skia::AdoptRef(

+ SkNEW_ARGS(SkBitmapDevice, (SkBitmap::kARGB_8888_Config, width, height)));

canvas_ = skia::AdoptRef(SkNEW_ARGS(SkCanvas, (device.get())));

setProxy(canvas_.get());

« skia/ext/analysis_canvas.h ('K') | « skia/ext/analysis_canvas.cc ('k') | skia/ext/bitmap_platform_device_android.h » ('j') | skia/ext/bitmap_platform_device_mac.cc » ('J')