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

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

Issue 1041053005: Oilpan: fix WorkerThreadStartupData finalization handling. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: add comment clarifying use of CrossThreadPersistent<> Created 5 years, 8 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 | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * 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 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 23 matching lines...) Expand all
34 #include "bindings/core/v8/ExceptionState.h" 34 #include "bindings/core/v8/ExceptionState.h"
35 #include "bindings/core/v8/SerializedScriptValue.h" 35 #include "bindings/core/v8/SerializedScriptValue.h"
36 #include "core/frame/LocalDOMWindow.h" 36 #include "core/frame/LocalDOMWindow.h"
37 #include "core/workers/DedicatedWorkerThread.h" 37 #include "core/workers/DedicatedWorkerThread.h"
38 #include "core/workers/WorkerClients.h" 38 #include "core/workers/WorkerClients.h"
39 #include "core/workers/WorkerObjectProxy.h" 39 #include "core/workers/WorkerObjectProxy.h"
40 #include "core/workers/WorkerThreadStartupData.h" 40 #include "core/workers/WorkerThreadStartupData.h"
41 41
42 namespace blink { 42 namespace blink {
43 43
44 PassRefPtrWillBeRawPtr<DedicatedWorkerGlobalScope> DedicatedWorkerGlobalScope::c reate(DedicatedWorkerThread* thread, PassOwnPtrWillBeRawPtr<WorkerThreadStartupD ata> startupData, double timeOrigin) 44 PassRefPtrWillBeRawPtr<DedicatedWorkerGlobalScope> DedicatedWorkerGlobalScope::c reate(DedicatedWorkerThread* thread, PassOwnPtr<WorkerThreadStartupData> startup Data, double timeOrigin)
45 { 45 {
46 // Note: startupData is finalized on return. After the relevant parts has be en
47 // passed along to the created 'context'.
46 RefPtrWillBeRawPtr<DedicatedWorkerGlobalScope> context = adoptRefWillBeNoop( new DedicatedWorkerGlobalScope(startupData->m_scriptURL, startupData->m_userAgen t, thread, timeOrigin, startupData->m_starterOrigin, startupData->m_workerClient s.release())); 48 RefPtrWillBeRawPtr<DedicatedWorkerGlobalScope> context = adoptRefWillBeNoop( new DedicatedWorkerGlobalScope(startupData->m_scriptURL, startupData->m_userAgen t, thread, timeOrigin, startupData->m_starterOrigin, startupData->m_workerClient s.release()));
47 context->applyContentSecurityPolicyFromString(startupData->m_contentSecurity Policy, startupData->m_contentSecurityPolicyType); 49 context->applyContentSecurityPolicyFromString(startupData->m_contentSecurity Policy, startupData->m_contentSecurityPolicyType);
48 return context.release(); 50 return context.release();
49 } 51 }
50 52
51 DedicatedWorkerGlobalScope::DedicatedWorkerGlobalScope(const KURL& url, const St ring& userAgent, DedicatedWorkerThread* thread, double timeOrigin, const Securit yOrigin* starterOrigin, PassOwnPtrWillBeRawPtr<WorkerClients> workerClients) 53 DedicatedWorkerGlobalScope::DedicatedWorkerGlobalScope(const KURL& url, const St ring& userAgent, DedicatedWorkerThread* thread, double timeOrigin, const Securit yOrigin* starterOrigin, PassOwnPtrWillBeRawPtr<WorkerClients> workerClients)
52 : WorkerGlobalScope(url, userAgent, thread, timeOrigin, starterOrigin, worke rClients) 54 : WorkerGlobalScope(url, userAgent, thread, timeOrigin, starterOrigin, worke rClients)
53 { 55 {
54 } 56 }
55 57
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 { 118 {
117 thread()->workerObjectProxy().postTaskToMainExecutionContext(UseCounterTask: :createDeprecation(feature)); 119 thread()->workerObjectProxy().postTaskToMainExecutionContext(UseCounterTask: :createDeprecation(feature));
118 } 120 }
119 121
120 DEFINE_TRACE(DedicatedWorkerGlobalScope) 122 DEFINE_TRACE(DedicatedWorkerGlobalScope)
121 { 123 {
122 WorkerGlobalScope::trace(visitor); 124 WorkerGlobalScope::trace(visitor);
123 } 125 }
124 126
125 } // namespace blink 127 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/workers/DedicatedWorkerGlobalScope.h ('k') | Source/core/workers/DedicatedWorkerThread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698