third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp - Issue 2351363002: Make CSSStyleImageValue a member of CanvasImageSource.

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: third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp

Issue 2351363002: Make CSSStyleImageValue a member of CanvasImageSource. (Closed)

Patch Set: added additional nullptr checks to getSourceImageForCanvas, changed toImageSourceInternal to includ… Created 4 years, 3 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 | « third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.h ('k') | third_party/WebKit/Source/modules/canvas2d/CanvasRenderingContext2D.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp

diff --git a/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp b/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp

index e0db5591d855ae297d2134e964605ecc916ca831..619496afd06b69b4a33144010c35a2fa809990b8 100644

--- a/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp

+++ b/third_party/WebKit/Source/modules/canvas2d/BaseRenderingContext2D.cpp

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

#include "bindings/core/v8/ExceptionMessages.h"

#include "bindings/core/v8/ExceptionState.h"

#include "bindings/core/v8/ExceptionStatePlaceholder.h"

+#include "core/css/cssom/CSSURLImageValue.h"

#include "core/css/parser/CSSParser.h"

#include "core/frame/ImageBitmap.h"

#include "core/html/HTMLCanvasElement.h"

@@ -19,6 +20,7 @@

#include "modules/canvas2d/CanvasStyle.h"

#include "modules/canvas2d/Path2D.h"

#include "platform/Histogram.h"

+#include "platform/RuntimeEnabledFeatures.h"

#include "platform/geometry/FloatQuad.h"

#include "platform/graphics/Color.h"

#include "platform/graphics/ExpensiveCanvasHeuristicParameters.h"

@@ -867,6 +869,8 @@ static inline void clipRectsToImageRect(const FloatRect& imageRect, FloatRect* s

static inline CanvasImageSource* toImageSourceInternal(const CanvasImageSourceUnion& value, ExceptionState& exceptionState)

{

+ if (value.isCSSImageValue())

+ return RuntimeEnabledFeatures::cssPaintAPIEnabled() ? value.getAsCSSImageValue() : nullptr;

Justin Novosad 2016/09/28 17:12:33 Good idea to do it this way.

Justin Novosad 2016/09/28 17:17:35 Wait a second... To be correct, a TypeError except

Gleb Lanbin 2016/09/28 17:47:00 Done.

if (value.isHTMLImageElement())

return value.getAsHTMLImageElement();

if (value.isHTMLVideoElement())