third_party/WebKit/Source/core/frame/ImageBitmap.h - Issue 1899403002: MediaStream Image Capture (2): Platform::ImageCaptureFrameGrabber and grabFrame()

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/frame/ImageBitmap.h

Issue 1899403002: MediaStream Image Capture (2): Platform::ImageCaptureFrameGrabber and grabFrame() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase. LayoutTests: Replace assert_array_equals with an for-each: assert_aprox_equals Created 4 years, 8 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

« third_party/WebKit/LayoutTests/fast/imagecapture/ImageCapture-creation.html ('K') | « third_party/WebKit/LayoutTests/fast/imagecapture/ImageCapture-grabFrame.html ('k') | third_party/WebKit/Source/core/frame/ImageBitmap.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/frame/ImageBitmap.h

diff --git a/third_party/WebKit/Source/core/frame/ImageBitmap.h b/third_party/WebKit/Source/core/frame/ImageBitmap.h

index d9174eb4937509eba785e573c8f519293feb2fbc..61772a4cfbf7de3344b876ba7f44a1d812e2a051 100644

--- a/third_party/WebKit/Source/core/frame/ImageBitmap.h

+++ b/third_party/WebKit/Source/core/frame/ImageBitmap.h

@@ -42,6 +42,10 @@ public:

static ImageBitmap* create(PassRefPtr<StaticBitmapImage>, const IntRect&, const ImageBitmapOptions& = ImageBitmapOptions());

static PassRefPtr<SkImage> getSkImageFromDecoder(PassOwnPtr<ImageDecoder>);

+ // Type and helper function required by CallbackPromiseAdapter:

+ using WebType = sk_sp<SkImage>;

+ static ImageBitmap* take(ScriptPromiseResolver*, sk_sp<SkImage>);

StaticBitmapImage* bitmapImage() const { return (m_image) ? m_image.get() : nullptr; }

PassOwnPtr<uint8_t[]> copyBitmapData(AlphaDisposition alphaOp = DontPremultiplyAlpha);

unsigned long width() const;