diff options
author | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 13:46:56 +0000 |
---|---|---|
committer | reed@google.com <reed@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 13:46:56 +0000 |
commit | 9d611ca0375cf3594423fa8571a30ed356e568f6 (patch) | |
tree | 6e04e592faf658dd786ea2cb1115af7ac7247124 /content/renderer/render_widget.h | |
parent | bd3db410a3334cbcbd50247306d286326003eb2c (diff) | |
download | chromium_src-9d611ca0375cf3594423fa8571a30ed356e568f6.zip chromium_src-9d611ca0375cf3594423fa8571a30ed356e568f6.tar.gz chromium_src-9d611ca0375cf3594423fa8571a30ed356e568f6.tar.bz2 |
Simplify platform_canvas.h by recognizing that PlatformCanvas does not actually extend
SkCanvas in any way, other than provide a host of constructors (and delayed constructors
in the form of 'initialize' methods).
These late initializers are a problem, as SkCanvas is deprecating its setDevice() call,
moving to model where the backingstore/device for the canvas must be created before the
canvas is created. This is necessary to allow skia to continue to extend SkCanvas for
its backends (e.g. GPU, PDF, Picture, Pipe, etc.).
The practical change in this CL is to make PlatformCanvas just a typedef for SkCanvas,
and change the call-sites that want to call initialize() to instead create the canvas
using one of the provided Factory functions (e.g. CreatePlatformCanvas). The modifier
Platform is maintained, to document that this canvas may be backed by platform-specific
pixels (e.g. allocated by GDI or cairo).
Review URL: https://codereview.chromium.org/11138024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167669 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_widget.h')
-rw-r--r-- | content/renderer/render_widget.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/content/renderer/render_widget.h b/content/renderer/render_widget.h index 28d961d..99eb137 100644 --- a/content/renderer/render_widget.h +++ b/content/renderer/render_widget.h @@ -47,10 +47,6 @@ class WebMouseEvent; class WebTouchEvent; } -namespace skia { -class PlatformCanvas; -} - namespace ui { class Range; } @@ -227,10 +223,10 @@ class CONTENT_EXPORT RenderWidget // shared memory segment returned by AllocPaintBuf on Windows). The caller // must ensure that the given rect fits within the bounds of the WebWidget. void PaintRect(const gfx::Rect& rect, const gfx::Point& canvas_origin, - skia::PlatformCanvas* canvas); + SkCanvas* canvas); // Paints a border at the given rect for debugging purposes. - void PaintDebugBorder(const gfx::Rect& rect, skia::PlatformCanvas* canvas); + void PaintDebugBorder(const gfx::Rect& rect, SkCanvas* canvas); bool IsRenderingVSynced(); void AnimationCallback(); |