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

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

Issue 594803002: Transfer SecurityOrigin overrides to Workers. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Add tests Created 6 years, 3 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 27 matching lines...) Expand all
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, PassOwnPtrWillBeRawPtr<WorkerThreadStartupD ata> startupData, double timeOrigin)
45 { 45 {
46 RefPtrWillBeRawPtr<DedicatedWorkerGlobalScope> context = adoptRefWillBeNoop( new DedicatedWorkerGlobalScope(startupData->m_scriptURL, startupData->m_userAgen t, thread, timeOrigin, startupData->m_workerClients.release())); 46 RefPtrWillBeRawPtr<DedicatedWorkerGlobalScope> context = adoptRefWillBeNoop( new DedicatedWorkerGlobalScope(startupData->m_scriptURL, startupData->m_userAgen t, thread, timeOrigin, startupData->m_workerClients.release()));
47 context->applyContentSecurityPolicyFromString(startupData->m_contentSecurity Policy, startupData->m_contentSecurityPolicyType); 47 context->applyContentSecurityPolicyFromString(startupData->m_contentSecurity Policy, startupData->m_contentSecurityPolicyType);
48 context->securityOrigin()->applyPolicyOverrides(startupData->m_originPolicyO verrides);
48 return context.release(); 49 return context.release();
49 } 50 }
50 51
51 DedicatedWorkerGlobalScope::DedicatedWorkerGlobalScope(const KURL& url, const St ring& userAgent, DedicatedWorkerThread* thread, double timeOrigin, PassOwnPtrWil lBeRawPtr<WorkerClients> workerClients) 52 DedicatedWorkerGlobalScope::DedicatedWorkerGlobalScope(const KURL& url, const St ring& userAgent, DedicatedWorkerThread* thread, double timeOrigin, PassOwnPtrWil lBeRawPtr<WorkerClients> workerClients)
52 : WorkerGlobalScope(url, userAgent, thread, timeOrigin, workerClients) 53 : WorkerGlobalScope(url, userAgent, thread, timeOrigin, workerClients)
53 { 54 {
54 } 55 }
55 56
56 DedicatedWorkerGlobalScope::~DedicatedWorkerGlobalScope() 57 DedicatedWorkerGlobalScope::~DedicatedWorkerGlobalScope()
57 { 58 {
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 { 117 {
117 thread()->workerObjectProxy().postTaskToMainExecutionContext(UseCounterTask: :createDeprecation(feature)); 118 thread()->workerObjectProxy().postTaskToMainExecutionContext(UseCounterTask: :createDeprecation(feature));
118 } 119 }
119 120
120 void DedicatedWorkerGlobalScope::trace(Visitor* visitor) 121 void DedicatedWorkerGlobalScope::trace(Visitor* visitor)
121 { 122 {
122 WorkerGlobalScope::trace(visitor); 123 WorkerGlobalScope::trace(visitor);
123 } 124 }
124 125
125 } // namespace blink 126 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698