third_party/WebKit/Source/core/frame/ImageBitmap.cpp - 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.cpp

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

Patch Set: reillyg@ comments and made SkBitmap immutable 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-grabFrame.html ('K') | « third_party/WebKit/Source/core/frame/ImageBitmap.h ('k') | third_party/WebKit/Source/modules/imagecapture/ImageCapture.h » ('j') | third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 62de013040fc6482f6dc4be6e11273456b045b58..3e8e8cce0649f59f4e98c6f8dc0b07bfc39cbd09 100644

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

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

@@ -402,6 +402,15 @@ void ImageBitmap::close()

m_isNeutered = true;

}

+// static

+ImageBitmap* ImageBitmap::take(ScriptPromiseResolver*, PassOwnPtr<SkBitmap> bitmap)

+ RefPtr<StaticBitmapImage> image = StaticBitmapImage::create(

+ adoptRef(SkImage::NewFromBitmap(*bitmap)));

+ return ImageBitmap::create(image);

PassOwnPtr<uint8_t[]> ImageBitmap::copyBitmapData(AlphaDisposition alphaOp)

{

SkImageInfo info = SkImageInfo::Make(width(), height(), kRGBA_8888_SkColorType, (alphaOp == PremultiplyAlpha) ? kPremul_SkAlphaType : kUnpremul_SkAlphaType);