cc/output/software_output_device.h - 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: cc/output/software_output_device.h

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

Patch Set: Added TODOs 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: cc/output/software_output_device.h

diff --git a/cc/output/software_output_device.h b/cc/output/software_output_device.h

index c1a97dcbf25fbfac79243c4df402e584f7f6b074..788673ede9520d077ea277d571b0bc8c0c6a9ea6 100644

--- a/cc/output/software_output_device.h

+++ b/cc/output/software_output_device.h

@@ -8,12 +8,13 @@

#include "base/basictypes.h"

#include "cc/base/cc_export.h"

#include "skia/ext/refptr.h"

+// TODO(robertphillips): change this to "class SkBaseDevice;"

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

#include "ui/gfx/rect.h"

#include "ui/gfx/size.h"

#include "ui/gfx/vector2d.h"

class SkBitmap;

-class SkDevice;

class SkCanvas;

namespace cc {

@@ -46,7 +47,7 @@ class CC_EXPORT SoftwareOutputDevice {

protected:

gfx::Size viewport_size_;

gfx::Rect damage_rect_;

- skia::RefPtr<SkDevice> device_;

+ skia::RefPtr<SkBaseDevice> device_;

skia::RefPtr<SkCanvas> canvas_;

private:

« no previous file with comments | « cc/output/gl_renderer.cc ('k') | cc/output/software_output_device.cc » ('j') | no next file with comments »