Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(210)

Unified Diff: third_party/WebKit/Source/core/frame/ImageBitmap.cpp

Issue 1781613002: Fix data race problem in createImageBitmap(Blob) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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 a3a1d3e383122481fe5312ebce086d3f80f56c80..85446d7ba55e79cb9328d6fcc890f03a70bd4f94 100644
--- a/third_party/WebKit/Source/core/frame/ImageBitmap.cpp
+++ b/third_party/WebKit/Source/core/frame/ImageBitmap.cpp
@@ -89,7 +89,7 @@ static PassRefPtr<SkImage> premulSkImageToUnPremul(SkImage* input)
return newSkImageFromRaster(info, dstPixels.release(), input->width() * info.bytesPerPixel());
}
-PassRefPtr<SkImage> ImageBitmap::getSkImageFromDecoder(PassOwnPtr<ImageDecoder> decoder)
+PassRefPtr<SkImage> getSkImageFromDecoder(PassOwnPtr<ImageDecoder> decoder)
{
if (!decoder->frameCount())
return nullptr;
@@ -127,7 +127,7 @@ static PassRefPtr<StaticBitmapImage> cropImage(Image* image, const IntRect& crop
if (!decoder)
return nullptr;
decoder->setData(image->data(), true);
- skiaImage = ImageBitmap::getSkImageFromDecoder(decoder.release());
+ skiaImage = getSkImageFromDecoder(decoder.release());
if (!skiaImage)
return nullptr;
}

Powered by Google App Engine
This is Rietveld 408576698