third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp - Issue 2570613002: Add OffscreenCanvas to ImageBitmapSource union typedef

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/core/imagebitmap/ImageBitmapFactories.cpp

Issue 2570613002: Add OffscreenCanvas to ImageBitmapSource union typedef (Closed)

Patch Set: build fix Created 4 years 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/core/imagebitmap/ImageBitmapFactories.h ('k') | third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp

diff --git a/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp b/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp

index 0e3afe2aae2e4ea0c4730edfdaa232d5cf3a63d5..bee46e661fa85faed151a4f92cfdb62aa7729cfc 100644

--- a/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp

+++ b/third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp

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

#include "core/html/HTMLVideoElement.h"

#include "core/html/ImageData.h"

#include "core/imagebitmap/ImageBitmapOptions.h"

+#include "core/offscreencanvas/OffscreenCanvas.h"

#include "core/svg/graphics/SVGImage.h"

#include "core/workers/WorkerGlobalScope.h"

#include "platform/CrossThreadFunctional.h"

@@ -93,6 +94,8 @@ static inline ImageBitmapSource* toImageBitmapSourceInternal(

return value.getAsImageData();

if (value.isImageBitmap())

return value.getAsImageBitmap();

+ if (value.isOffscreenCanvas())

+ return value.getAsOffscreenCanvas();

ASSERT_NOT_REACHED();

return nullptr;

}