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

Unified Diff: third_party/WebKit/Source/core/workers/WorkerThreadTest.cpp

Issue 1682423002: Remove WebWaitableEvent and replace it with WaitableEvent. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix android build Created 4 years, 10 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/workers/WorkerThreadTest.cpp
diff --git a/third_party/WebKit/Source/core/workers/WorkerThreadTest.cpp b/third_party/WebKit/Source/core/workers/WorkerThreadTest.cpp
index 9229ef824d870345959dbac7d349334921bc3d33..b9ebd1211170fb6608272412d21fd4637fd72738 100644
--- a/third_party/WebKit/Source/core/workers/WorkerThreadTest.cpp
+++ b/third_party/WebKit/Source/core/workers/WorkerThreadTest.cpp
@@ -10,8 +10,8 @@
#include "core/workers/WorkerReportingProxy.h"
#include "core/workers/WorkerThreadStartupData.h"
#include "platform/NotImplemented.h"
+#include "platform/WaitableEvent.h"
#include "public/platform/WebScheduler.h"
-#include "public/platform/WebWaitableEvent.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -100,7 +100,7 @@ public:
WorkerReportingProxy& mockWorkerReportingProxy)
: WorkerThread(WorkerLoaderProxy::create(mockWorkerLoaderProxyProvider), mockWorkerReportingProxy)
, m_thread(WebThreadSupportingGC::create("Test thread"))
- , m_scriptLoadedEvent(adoptPtr(Platform::current()->createWaitableEvent()))
+ , m_scriptLoadedEvent(adoptPtr(new WaitableEvent()))
{
}
@@ -134,7 +134,7 @@ public:
private:
OwnPtr<WebThreadSupportingGC> m_thread;
- OwnPtr<WebWaitableEvent> m_scriptLoadedEvent;
+ OwnPtr<WaitableEvent> m_scriptLoadedEvent;
};
void notifyScriptLoadedEventToWorkerThreadForTest(WorkerThread* thread)
@@ -168,7 +168,10 @@ public:
class SignalTask : public WebTaskRunner::Task {
public:
- SignalTask(WebWaitableEvent* completionEvent) : m_completionEvent(completionEvent) { }
+ SignalTask(WaitableEvent* completionEvent)
+ : m_completionEvent(completionEvent)
+ {
+ }
~SignalTask() override { }
@@ -178,7 +181,7 @@ public:
}
private:
- WebWaitableEvent* m_completionEvent; // Not owned.
+ WaitableEvent* m_completionEvent; // Not owned.
};
} // namespace
@@ -227,7 +230,7 @@ public:
void waitForInit()
{
- OwnPtr<WebWaitableEvent> completionEvent = adoptPtr(Platform::current()->createWaitableEvent());
+ OwnPtr<WaitableEvent> completionEvent = adoptPtr(new WaitableEvent());
m_workerThread->backingThread().postTask(BLINK_FROM_HERE, new SignalTask(completionEvent.get()));
completionEvent->wait();
}

Powered by Google App Engine
This is Rietveld 408576698