Commit 9ee1d8f4 authored by nhiroki's avatar nhiroki Committed by Commit bot

Worker: Rename WorkletThreadHolder::threadHolderInstance() to getInstance()

This was raised in https://codereview.chromium.org/2582483002/#msg9

getInstance() would be more common name for a function to get a singleton
instance and less confusing for code readers.

BUG=n/a

Review-Url: https://codereview.chromium.org/2579823002
Cr-Commit-Position: refs/heads/master@{#438984}
parent f2d8f704
...@@ -28,8 +28,8 @@ class ThreadedWorkletThreadForTest : public WorkerThread { ...@@ -28,8 +28,8 @@ class ThreadedWorkletThreadForTest : public WorkerThread {
~ThreadedWorkletThreadForTest() override{}; ~ThreadedWorkletThreadForTest() override{};
WorkerBackingThread& workerBackingThread() override { WorkerBackingThread& workerBackingThread() override {
auto workletThreadHolder = WorkletThreadHolder< auto workletThreadHolder =
ThreadedWorkletThreadForTest>::threadHolderInstance(); WorkletThreadHolder<ThreadedWorkletThreadForTest>::getInstance();
DCHECK(workletThreadHolder); DCHECK(workletThreadHolder);
return *workletThreadHolder->thread(); return *workletThreadHolder->thread();
} }
......
...@@ -19,7 +19,7 @@ namespace blink { ...@@ -19,7 +19,7 @@ namespace blink {
template <class DerivedWorkletThread> template <class DerivedWorkletThread>
class WorkletThreadHolder { class WorkletThreadHolder {
public: public:
static WorkletThreadHolder<DerivedWorkletThread>* threadHolderInstance() { static WorkletThreadHolder<DerivedWorkletThread>* getInstance() {
MutexLocker locker(holderInstanceMutex()); MutexLocker locker(holderInstanceMutex());
return s_threadHolderInstance; return s_threadHolderInstance;
} }
......
...@@ -25,8 +25,7 @@ AbstractAnimationWorkletThread::AbstractAnimationWorkletThread( ...@@ -25,8 +25,7 @@ AbstractAnimationWorkletThread::AbstractAnimationWorkletThread(
AbstractAnimationWorkletThread::~AbstractAnimationWorkletThread() {} AbstractAnimationWorkletThread::~AbstractAnimationWorkletThread() {}
WorkerBackingThread& AbstractAnimationWorkletThread::workerBackingThread() { WorkerBackingThread& AbstractAnimationWorkletThread::workerBackingThread() {
return *WorkletThreadHolder< return *WorkletThreadHolder<AbstractAnimationWorkletThread>::getInstance()
AbstractAnimationWorkletThread>::threadHolderInstance()
->thread(); ->thread();
} }
...@@ -38,12 +37,11 @@ void collectAllGarbageOnThread(WaitableEvent* doneEvent) { ...@@ -38,12 +37,11 @@ void collectAllGarbageOnThread(WaitableEvent* doneEvent) {
void AbstractAnimationWorkletThread::collectAllGarbage() { void AbstractAnimationWorkletThread::collectAllGarbage() {
DCHECK(isMainThread()); DCHECK(isMainThread());
WaitableEvent doneEvent; WaitableEvent doneEvent;
WorkletThreadHolder<AbstractAnimationWorkletThread>* threadHolderInstance = WorkletThreadHolder<AbstractAnimationWorkletThread>* workletThreadHolder =
WorkletThreadHolder< WorkletThreadHolder<AbstractAnimationWorkletThread>::getInstance();
AbstractAnimationWorkletThread>::threadHolderInstance(); if (!workletThreadHolder)
if (!threadHolderInstance)
return; return;
threadHolderInstance->thread()->backingThread().postTask( workletThreadHolder->thread()->backingThread().postTask(
BLINK_FROM_HERE, crossThreadBind(&collectAllGarbageOnThread, BLINK_FROM_HERE, crossThreadBind(&collectAllGarbageOnThread,
crossThreadUnretained(&doneEvent))); crossThreadUnretained(&doneEvent)));
doneEvent.wait(); doneEvent.wait();
......
...@@ -39,8 +39,7 @@ AudioWorkletThread::AudioWorkletThread( ...@@ -39,8 +39,7 @@ AudioWorkletThread::AudioWorkletThread(
AudioWorkletThread::~AudioWorkletThread() {} AudioWorkletThread::~AudioWorkletThread() {}
WorkerBackingThread& AudioWorkletThread::workerBackingThread() { WorkerBackingThread& AudioWorkletThread::workerBackingThread() {
return *WorkletThreadHolder<AudioWorkletThread>::threadHolderInstance() return *WorkletThreadHolder<AudioWorkletThread>::getInstance()->thread();
->thread();
} }
void collectAllGarbageOnAudioWorkletThread(WaitableEvent* doneEvent) { void collectAllGarbageOnAudioWorkletThread(WaitableEvent* doneEvent) {
...@@ -51,11 +50,11 @@ void collectAllGarbageOnAudioWorkletThread(WaitableEvent* doneEvent) { ...@@ -51,11 +50,11 @@ void collectAllGarbageOnAudioWorkletThread(WaitableEvent* doneEvent) {
void AudioWorkletThread::collectAllGarbage() { void AudioWorkletThread::collectAllGarbage() {
DCHECK(isMainThread()); DCHECK(isMainThread());
WaitableEvent doneEvent; WaitableEvent doneEvent;
WorkletThreadHolder<AudioWorkletThread>* threadHolderInstance = WorkletThreadHolder<AudioWorkletThread>* workletThreadHolder =
WorkletThreadHolder<AudioWorkletThread>::threadHolderInstance(); WorkletThreadHolder<AudioWorkletThread>::getInstance();
if (!threadHolderInstance) if (!workletThreadHolder)
return; return;
threadHolderInstance->thread()->backingThread().postTask( workletThreadHolder->thread()->backingThread().postTask(
BLINK_FROM_HERE, crossThreadBind(&collectAllGarbageOnAudioWorkletThread, BLINK_FROM_HERE, crossThreadBind(&collectAllGarbageOnAudioWorkletThread,
crossThreadUnretained(&doneEvent))); crossThreadUnretained(&doneEvent)));
doneEvent.wait(); doneEvent.wait();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment