Source/core/workers/SharedWorkerGlobalScope.cpp - Issue 594803002: Transfer SecurityOrigin overrides to Workers.

Side by Side Diff: Source/core/workers/SharedWorkerGlobalScope.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

« no previous file with comments | « Source/core/workers/DedicatedWorkerGlobalScope.cpp ('k') | Source/core/workers/WorkerMessagingProxy.cpp » ('j') | Source/core/workers/WorkerMessagingProxy.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 37 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
48 RefPtrWillBeRawPtr<MessageEvent> event = MessageEvent::create(adoptPtrWillBe Noop(new MessagePortArray(1, port)), String(), String(), port);	48 RefPtrWillBeRawPtr<MessageEvent> event = MessageEvent::create(adoptPtrWillBe Noop(new MessagePortArray(1, port)), String(), String(), port);

49 event->initEvent(EventTypeNames::connect, false, false);	49 event->initEvent(EventTypeNames::connect, false, false);

50 return event.release();	50 return event.release();

51 }	51 }

52	52

53 // static	53 // static

54 PassRefPtrWillBeRawPtr<SharedWorkerGlobalScope> SharedWorkerGlobalScope::create( const String& name, SharedWorkerThread* thread, PassOwnPtrWillBeRawPtr<WorkerThr eadStartupData> startupData)	54 PassRefPtrWillBeRawPtr<SharedWorkerGlobalScope> SharedWorkerGlobalScope::create( const String& name, SharedWorkerThread* thread, PassOwnPtrWillBeRawPtr<WorkerThr eadStartupData> startupData)

55 {	55 {

56 RefPtrWillBeRawPtr<SharedWorkerGlobalScope> context = adoptRefWillBeNoop(new SharedWorkerGlobalScope(name, startupData->m_scriptURL, startupData->m_userAgen t, thread, startupData->m_workerClients.release()));	56 RefPtrWillBeRawPtr<SharedWorkerGlobalScope> context = adoptRefWillBeNoop(new SharedWorkerGlobalScope(name, startupData->m_scriptURL, startupData->m_userAgen t, thread, startupData->m_workerClients.release()));

57 context->applyContentSecurityPolicyFromString(startupData->m_contentSecurity Policy, startupData->m_contentSecurityPolicyType);	57 context->applyContentSecurityPolicyFromString(startupData->m_contentSecurity Policy, startupData->m_contentSecurityPolicyType);

	58 context->securityOrigin()->applyPolicyOverrides(startupData->m_originPolicyO verrides);

58 return context.release();	59 return context.release();

59 }	60 }

60	61

61 SharedWorkerGlobalScope::SharedWorkerGlobalScope(const String& name, const KURL& url, const String& userAgent, SharedWorkerThread* thread, PassOwnPtrWillBeRawPt r<WorkerClients> workerClients)	62 SharedWorkerGlobalScope::SharedWorkerGlobalScope(const String& name, const KURL& url, const String& userAgent, SharedWorkerThread* thread, PassOwnPtrWillBeRawPt r<WorkerClients> workerClients)

62 : WorkerGlobalScope(url, userAgent, thread, monotonicallyIncreasingTime(), w orkerClients)	63 : WorkerGlobalScope(url, userAgent, thread, monotonicallyIncreasingTime(), w orkerClients)

63 , m_name(name)	64 , m_name(name)

64 {	65 {

65 }	66 }

66	67

67 SharedWorkerGlobalScope::~SharedWorkerGlobalScope()	68 SharedWorkerGlobalScope::~SharedWorkerGlobalScope()

(...skipping 18 matching lines...) Expand all Loading...
86 consoleMessage->setCallStack(callStack);	87 consoleMessage->setCallStack(callStack);

87 addMessageToWorkerConsole(consoleMessage.release());	88 addMessageToWorkerConsole(consoleMessage.release());

88 }	89 }

89	90

90 void SharedWorkerGlobalScope::trace(Visitor* visitor)	91 void SharedWorkerGlobalScope::trace(Visitor* visitor)

91 {	92 {

92 WorkerGlobalScope::trace(visitor);	93 WorkerGlobalScope::trace(visitor);

93 }	94 }

94	95

95 } // namespace blink	96 } // namespace blink

OLD	NEW