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

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

Issue 143113003: CSP 1.1: Ignore report-only inside <meta>. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Nit. Created 6 years, 11 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/frame/UseCounter.h ('k') | no next file » | 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, 2011 Google Inc. All Rights Reserved. 3 * Copyright (C) 2009, 2011 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 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 99
100 // Notify proxy that we are going away. This can free the WorkerThread objec t, so do not access it after this. 100 // Notify proxy that we are going away. This can free the WorkerThread objec t, so do not access it after this.
101 thread()->workerReportingProxy().workerGlobalScopeDestroyed(); 101 thread()->workerReportingProxy().workerGlobalScopeDestroyed();
102 102
103 setClient(0); 103 setClient(0);
104 } 104 }
105 105
106 void WorkerGlobalScope::applyContentSecurityPolicyFromString(const String& polic y, ContentSecurityPolicy::HeaderType contentSecurityPolicyType) 106 void WorkerGlobalScope::applyContentSecurityPolicyFromString(const String& polic y, ContentSecurityPolicy::HeaderType contentSecurityPolicyType)
107 { 107 {
108 setContentSecurityPolicy(ContentSecurityPolicy::create(this)); 108 setContentSecurityPolicy(ContentSecurityPolicy::create(this));
109 contentSecurityPolicy()->didReceiveHeader(policy, contentSecurityPolicyType) ; 109 contentSecurityPolicy()->didReceiveHeader(policy, contentSecurityPolicyType, ContentSecurityPolicy::HeaderSourceHTTP);
110 } 110 }
111 111
112 ExecutionContext* WorkerGlobalScope::executionContext() const 112 ExecutionContext* WorkerGlobalScope::executionContext() const
113 { 113 {
114 return const_cast<WorkerGlobalScope*>(this); 114 return const_cast<WorkerGlobalScope*>(this);
115 } 115 }
116 116
117 const KURL& WorkerGlobalScope::virtualURL() const 117 const KURL& WorkerGlobalScope::virtualURL() const
118 { 118 {
119 return m_url; 119 return m_url;
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
324 { 324 {
325 return script()->idleNotification(); 325 return script()->idleNotification();
326 } 326 }
327 327
328 WorkerEventQueue* WorkerGlobalScope::eventQueue() const 328 WorkerEventQueue* WorkerGlobalScope::eventQueue() const
329 { 329 {
330 return m_eventQueue.get(); 330 return m_eventQueue.get();
331 } 331 }
332 332
333 } // namespace WebCore 333 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/frame/UseCounter.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698