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

Side by Side Diff: Source/core/workers/WorkerMessagingProxy.cpp

Issue 191003010: Oilpan: move WorkerThreadStartupData to the oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 9 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 unified diff | Download patch
« no previous file with comments | « Source/core/workers/SharedWorkerThread.cpp ('k') | Source/core/workers/WorkerThread.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2008 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008 Apple Inc. All Rights Reserved.
3 * Copyright (C) 2009 Google Inc. All Rights Reserved. 3 * Copyright (C) 2009 Google Inc. All Rights Reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 29 matching lines...) Expand all
40 #include "core/inspector/WorkerDebuggerAgent.h" 40 #include "core/inspector/WorkerDebuggerAgent.h"
41 #include "core/inspector/WorkerInspectorController.h" 41 #include "core/inspector/WorkerInspectorController.h"
42 #include "core/loader/DocumentLoadTiming.h" 42 #include "core/loader/DocumentLoadTiming.h"
43 #include "core/loader/DocumentLoader.h" 43 #include "core/loader/DocumentLoader.h"
44 #include "core/workers/DedicatedWorkerGlobalScope.h" 44 #include "core/workers/DedicatedWorkerGlobalScope.h"
45 #include "core/workers/DedicatedWorkerThread.h" 45 #include "core/workers/DedicatedWorkerThread.h"
46 #include "core/workers/Worker.h" 46 #include "core/workers/Worker.h"
47 #include "core/workers/WorkerClients.h" 47 #include "core/workers/WorkerClients.h"
48 #include "core/workers/WorkerObjectProxy.h" 48 #include "core/workers/WorkerObjectProxy.h"
49 #include "core/workers/WorkerThreadStartupData.h" 49 #include "core/workers/WorkerThreadStartupData.h"
50 #include "heap/Handle.h"
50 #include "platform/NotImplemented.h" 51 #include "platform/NotImplemented.h"
51 #include "wtf/Functional.h" 52 #include "wtf/Functional.h"
52 #include "wtf/MainThread.h" 53 #include "wtf/MainThread.h"
53 54
54 namespace WebCore { 55 namespace WebCore {
55 56
56 class MessageWorkerGlobalScopeTask : public ExecutionContextTask { 57 class MessageWorkerGlobalScopeTask : public ExecutionContextTask {
57 public: 58 public:
58 static PassOwnPtr<MessageWorkerGlobalScopeTask> create(PassRefPtr<Serialized ScriptValue> message, PassOwnPtr<MessagePortChannelArray> channels) 59 static PassOwnPtr<MessageWorkerGlobalScopeTask> create(PassRefPtr<Serialized ScriptValue> message, PassOwnPtr<MessagePortChannelArray> channels)
59 { 60 {
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 ASSERT((m_executionContext->isDocument() && isMainThread()) 104 ASSERT((m_executionContext->isDocument() && isMainThread())
104 || (m_executionContext->isWorkerGlobalScope() && toWorkerGlobalScope(m_e xecutionContext.get())->thread()->isCurrentThread())); 105 || (m_executionContext->isWorkerGlobalScope() && toWorkerGlobalScope(m_e xecutionContext.get())->thread()->isCurrentThread()));
105 } 106 }
106 107
107 void WorkerMessagingProxy::startWorkerGlobalScope(const KURL& scriptURL, const S tring& userAgent, const String& sourceCode, WorkerThreadStartMode startMode) 108 void WorkerMessagingProxy::startWorkerGlobalScope(const KURL& scriptURL, const S tring& userAgent, const String& sourceCode, WorkerThreadStartMode startMode)
108 { 109 {
109 // FIXME: This need to be revisited when we support nested worker one day 110 // FIXME: This need to be revisited when we support nested worker one day
110 ASSERT(m_executionContext->isDocument()); 111 ASSERT(m_executionContext->isDocument());
111 Document* document = toDocument(m_executionContext.get()); 112 Document* document = toDocument(m_executionContext.get());
112 113
113 OwnPtr<WorkerThreadStartupData> startupData = WorkerThreadStartupData::creat e(scriptURL, userAgent, sourceCode, startMode, document->contentSecurityPolicy() ->deprecatedHeader(), document->contentSecurityPolicy()->deprecatedHeaderType(), m_workerClients.release()); 114 OwnPtrWillBeRawPtr<WorkerThreadStartupData> startupData = WorkerThreadStartu pData::create(scriptURL, userAgent, sourceCode, startMode, document->contentSecu rityPolicy()->deprecatedHeader(), document->contentSecurityPolicy()->deprecatedH eaderType(), m_workerClients.release());
114 double originTime = document->loader() ? document->loader()->timing()->refer enceMonotonicTime() : monotonicallyIncreasingTime(); 115 double originTime = document->loader() ? document->loader()->timing()->refer enceMonotonicTime() : monotonicallyIncreasingTime();
115 116
116 RefPtr<DedicatedWorkerThread> thread = DedicatedWorkerThread::create(*this, *m_workerObjectProxy.get(), originTime, startupData.release()); 117 RefPtr<DedicatedWorkerThread> thread = DedicatedWorkerThread::create(*this, *m_workerObjectProxy.get(), originTime, startupData.release());
117 workerThreadCreated(thread); 118 workerThreadCreated(thread);
118 thread->start(); 119 thread->start();
119 InspectorInstrumentation::didStartWorkerGlobalScope(m_executionContext.get() , this, scriptURL); 120 InspectorInstrumentation::didStartWorkerGlobalScope(m_executionContext.get() , this, scriptURL);
120 } 121 }
121 122
122 void WorkerMessagingProxy::postMessageToWorkerObject(PassRefPtr<SerializedScript Value> message, PassOwnPtr<MessagePortChannelArray> channels) 123 void WorkerMessagingProxy::postMessageToWorkerObject(PassRefPtr<SerializedScript Value> message, PassOwnPtr<MessagePortChannelArray> channels)
123 { 124 {
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 { 297 {
297 m_workerThreadHadPendingActivity = hasPendingActivity; 298 m_workerThreadHadPendingActivity = hasPendingActivity;
298 } 299 }
299 300
300 bool WorkerMessagingProxy::hasPendingActivity() const 301 bool WorkerMessagingProxy::hasPendingActivity() const
301 { 302 {
302 return (m_unconfirmedMessageCount || m_workerThreadHadPendingActivity) && !m _askedToTerminate; 303 return (m_unconfirmedMessageCount || m_workerThreadHadPendingActivity) && !m _askedToTerminate;
303 } 304 }
304 305
305 } // namespace WebCore 306 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/workers/SharedWorkerThread.cpp ('k') | Source/core/workers/WorkerThread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698