Source/core/html/HTMLCanvasElement.cpp - Issue 895153002: Make CanvasRenderingContext2D use SkCanvas directly

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: Source/core/html/HTMLCanvasElement.cpp

Issue 895153002: Make CanvasRenderingContext2D use SkCanvas directly (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: fixing component build Created 5 years, 10 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

« no previous file with comments | « Source/core/html/HTMLCanvasElement.h ('k') | Source/core/html/canvas/CanvasRenderingContext2D.h » ('j') | Source/core/html/canvas/CanvasRenderingContext2D.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/core/html/HTMLCanvasElement.cpp

diff --git a/Source/core/html/HTMLCanvasElement.cpp b/Source/core/html/HTMLCanvasElement.cpp

index 3ec540eaa09f374d7a955719435f7b1a1984cef6..81b458ffdbfb9e60ef013c927eb195f40bac85e3 100644

--- a/Source/core/html/HTMLCanvasElement.cpp

+++ b/Source/core/html/HTMLCanvasElement.cpp

@@ -701,7 +701,7 @@ void HTMLCanvasElement::updateExternallyAllocatedMemory() const

GraphicsContext* HTMLCanvasElement::drawingContext() const

{

- return buffer() ? m_imageBuffer->context() : 0;

+ return buffer() ? m_imageBuffer->context() : nullptr;

}

GraphicsContext* HTMLCanvasElement::existingDrawingContext() const

@@ -712,6 +712,19 @@ GraphicsContext* HTMLCanvasElement::existingDrawingContext() const

return drawingContext();

}

+SkCanvas* HTMLCanvasElement::drawingCanvas() const

+ return buffer() ? m_imageBuffer->canvas() : nullptr;

+SkCanvas* HTMLCanvasElement::existingDrawingCanvas() const

+ if (!hasImageBuffer())

+ return nullptr;

+ return m_imageBuffer->canvas();

ImageBuffer* HTMLCanvasElement::buffer() const

{

ASSERT(m_context);