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

Unified Diff: third_party/WebKit/Source/core/loader/WorkerThreadableLoader.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/loader/WorkerThreadableLoader.cpp
diff --git a/third_party/WebKit/Source/core/loader/WorkerThreadableLoader.cpp b/third_party/WebKit/Source/core/loader/WorkerThreadableLoader.cpp
index 680bec66fa5628426645e4c83ebca87ca14f7857..909e09c62cd479b53be6a052ed72d56cb3d6b647 100644
--- a/third_party/WebKit/Source/core/loader/WorkerThreadableLoader.cpp
+++ b/third_party/WebKit/Source/core/loader/WorkerThreadableLoader.cpp
@@ -38,6 +38,7 @@
#include "core/workers/WorkerLoaderProxy.h"
#include "core/workers/WorkerThread.h"
#include "platform/ThreadSafeFunctional.h"
+#include "platform/WaitableEvent.h"
#include "platform/heap/SafePoint.h"
#include "platform/network/ResourceError.h"
#include "platform/network/ResourceRequest.h"
@@ -45,7 +46,6 @@
#include "platform/network/ResourceTimingInfo.h"
#include "platform/weborigin/SecurityPolicy.h"
#include "public/platform/Platform.h"
-#include "public/platform/WebWaitableEvent.h"
#include "wtf/MainThread.h"
#include "wtf/OwnPtr.h"
#include "wtf/Vector.h"
@@ -284,21 +284,23 @@ WorkerThreadableLoader::MainThreadSyncBridge::MainThreadSyncBridge(
: MainThreadBridgeBase(workerClientWrapper, workerGlobalScope.thread()->workerLoaderProxy())
, m_done(false)
{
- WebWaitableEvent* shutdownEvent = workerGlobalScope.thread()->shutdownEvent();
- m_loaderDoneEvent = adoptPtr(Platform::current()->createWaitableEvent());
+ WaitableEvent* shutdownEvent = workerGlobalScope.thread()->shutdownEvent();
+ m_loaderDoneEvent = adoptPtr(new WaitableEvent());
createLoader(request, options, resourceLoaderOptions, referrerPolicy, outgoingReferrer);
- WebWaitableEvent* signalled;
+ size_t signaledIndex;
{
- Vector<WebWaitableEvent*> events;
+ Vector<WaitableEvent*> events;
+ // Order is important; indicies are used later.
events.append(shutdownEvent);
events.append(m_loaderDoneEvent.get());
SafePointScope scope(BlinkGC::HeapPointersOnStack);
- signalled = Platform::current()->waitMultipleEvents(events);
+ signaledIndex = WaitableEvent::waitMultiple(events);
}
- if (signalled == shutdownEvent) {
+ // |signaledIndex| is 0; which is shutdownEvent.
+ if (signaledIndex == 0) {
cancel();
return;
}
« no previous file with comments | « third_party/WebKit/Source/core/loader/WorkerThreadableLoader.h ('k') | third_party/WebKit/Source/core/workers/WorkerThread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698