third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp - Issue 1781613002: Fix data race problem in createImageBitmap(Blob)

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 1781613002: Fix data race problem in createImageBitmap(Blob) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix data rance layout test Created 4 years, 9 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/core/imagebitmap/ImageBitmapFactories.h ('k') | third_party/WebKit/Source/platform/CrossThreadCopier.h » ('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 22d2cd2190dfaf3ecd236a1e664806a31269b37e..f457c91774bebd1c090cd3adb7ecf7ddf18c3d85 100644

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

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

@@ -223,18 +223,20 @@ void ImageBitmapFactories::ImageBitmapLoader::decodeImageOnDecoderThread(WebTask

if (m_options.premultiplyAlpha() == "none")

alphaOp = ImageDecoder::AlphaNotPremultiplied;

OwnPtr<ImageDecoder> decoder(ImageDecoder::create(*sharedBuffer, alphaOp, ImageDecoder::GammaAndColorProfileApplied));

- if (decoder)

+ RefPtr<SkImage> frame;

+ if (decoder) {

decoder->setData(sharedBuffer.get(), true);

- taskRunner->postTask(BLINK_FROM_HERE, threadSafeBind(&ImageBitmapFactories::ImageBitmapLoader::resolvePromiseOnOriginalThread, AllowCrossThreadAccess(this), decoder.release()));

+ frame = ImageBitmap::getSkImageFromDecoder(decoder.release());

+ }

+ taskRunner->postTask(BLINK_FROM_HERE, threadSafeBind(&ImageBitmapFactories::ImageBitmapLoader::resolvePromiseOnOriginalThread, AllowCrossThreadAccess(this), frame.release()));

}

-void ImageBitmapFactories::ImageBitmapLoader::resolvePromiseOnOriginalThread(PassOwnPtr<ImageDecoder> decoder)

+void ImageBitmapFactories::ImageBitmapLoader::resolvePromiseOnOriginalThread(PassRefPtr<SkImage> frame)

{

- if (!decoder) {

+ if (!frame) {

rejectPromise();

return;

}

- RefPtr<SkImage> frame = ImageBitmap::getSkImageFromDecoder(decoder);

ASSERT(!frame || (frame->width() && frame->height()));

if (!frame) {

rejectPromise();