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

Unified Diff: Source/core/workers/WorkerThread.h

Issue 15338009: Move workers to Chromium threading (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Remove extra assert Created 7 years, 7 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: Source/core/workers/WorkerThread.h
diff --git a/Source/core/workers/WorkerThread.h b/Source/core/workers/WorkerThread.h
index 3a036519c8889415bc5b0b5beb5207402fb67950..c925558f717bc3116b931ca216cbe57480993afd 100644
--- a/Source/core/workers/WorkerThread.h
+++ b/Source/core/workers/WorkerThread.h
@@ -31,10 +31,11 @@
#include "core/page/GroupSettings.h"
#include "core/workers/WorkerRunLoop.h"
#include "weborigin/SecurityOrigin.h"
-#include <wtf/Forward.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
+#include "wtf/Forward.h"
+#include "wtf/OwnPtr.h"
+#include "wtf/PassRefPtr.h"
+#include "wtf/RefCounted.h"
+#include <public/WebThread.h>
namespace WebCore {
@@ -54,7 +55,7 @@ namespace WebCore {
bool start();
void stop();
- ThreadIdentifier threadID() const { return m_threadID; }
+ bool isCurrentThread() const;
WorkerRunLoop& runLoop() { return m_runLoop; }
WorkerLoaderProxy& workerLoaderProxy() const { return m_workerLoaderProxy; }
WorkerReportingProxy& workerReportingProxy() const { return m_workerReportingProxy; }
@@ -80,11 +81,9 @@ namespace WebCore {
WorkerContext* workerContext() { return m_workerContext.get(); }
private:
- // Static function executed as the core routine on the new thread. Passed a pointer to a WorkerThread object.
- static void workerThreadStart(void*);
void workerThread();
- ThreadIdentifier m_threadID;
+ OwnPtr<WebKit::WebThread> m_thread;
WorkerRunLoop m_runLoop;
WorkerLoaderProxy& m_workerLoaderProxy;
WorkerReportingProxy& m_workerReportingProxy;

Powered by Google App Engine
This is Rietveld 408576698