third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp - Issue 2104913002: Rename threadSafeBind() to crossThreadBind()

Unified Diff: third_party/WebKit/Source/core/imagebitmap/ImageBitmapFactories.cpp

Issue 2104913002: Rename threadSafeBind() to crossThreadBind() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@TRV_CTCPointer

Patch Set: Rebase Created 4 years, 6 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/html/parser/HTMLParserThread.cpp ('k') | third_party/WebKit/Source/core/loader/WorkerThreadableLoader.cpp » ('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 2af3f36b211c7f2980cb9783b57491b8ad412c5f..2e22bf027d36092ac087c597d8d5949fb13a2b16 100644

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

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

@@ -43,8 +43,8 @@

#include "core/imagebitmap/ImageBitmapOptions.h"

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

#include "core/workers/WorkerGlobalScope.h"

+#include "platform/CrossThreadFunctional.h"

#include "platform/SharedBuffer.h"

-#include "platform/ThreadSafeFunctional.h"

#include "platform/image-decoders/ImageDecoder.h"

#include "platform/threading/BackgroundTaskRunner.h"

#include "public/platform/Platform.h"

@@ -221,7 +221,7 @@ void ImageBitmapFactories::ImageBitmapLoader::scheduleAsyncImageBitmapDecoding(D

if (arrayBuffer->byteLength() >= longTaskByteLengthThreshold)

taskSize = BackgroundTaskRunner::TaskSizeLongRunningTask;

WebTaskRunner* taskRunner = Platform::current()->currentThread()->getWebTaskRunner();

- BackgroundTaskRunner::postOnBackgroundThread(BLINK_FROM_HERE, threadSafeBind(&ImageBitmapFactories::ImageBitmapLoader::decodeImageOnDecoderThread, wrapCrossThreadPersistent(this), crossThreadUnretained(taskRunner), wrapCrossThreadPersistent(arrayBuffer)), taskSize);

+ BackgroundTaskRunner::postOnBackgroundThread(BLINK_FROM_HERE, crossThreadBind(&ImageBitmapFactories::ImageBitmapLoader::decodeImageOnDecoderThread, wrapCrossThreadPersistent(this), crossThreadUnretained(taskRunner), wrapCrossThreadPersistent(arrayBuffer)), taskSize);

}

void ImageBitmapFactories::ImageBitmapLoader::decodeImageOnDecoderThread(WebTaskRunner* taskRunner, DOMArrayBuffer* arrayBuffer)

@@ -241,7 +241,7 @@ void ImageBitmapFactories::ImageBitmapLoader::decodeImageOnDecoderThread(WebTask

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

frame = ImageBitmap::getSkImageFromDecoder(std::move(decoder));

}

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

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

}

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