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

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

Issue 594803002: Transfer SecurityOrigin overrides to Workers. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rename transferPrivileges() to transferPrivilegesFrom() over security origins Created 6 years, 2 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) 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2008, 2009 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 124
125 using SecurityContext::securityOrigin; 125 using SecurityContext::securityOrigin;
126 using SecurityContext::contentSecurityPolicy; 126 using SecurityContext::contentSecurityPolicy;
127 127
128 virtual void addConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) OVERR IDE FINAL; 128 virtual void addConsoleMessage(PassRefPtrWillBeRawPtr<ConsoleMessage>) OVERR IDE FINAL;
129 ConsoleMessageStorage* messageStorage(); 129 ConsoleMessageStorage* messageStorage();
130 130
131 virtual void trace(Visitor*) OVERRIDE; 131 virtual void trace(Visitor*) OVERRIDE;
132 132
133 protected: 133 protected:
134 WorkerGlobalScope(const KURL&, const String& userAgent, WorkerThread*, doubl e timeOrigin, PassOwnPtrWillBeRawPtr<WorkerClients>); 134 WorkerGlobalScope(const KURL&, const String& userAgent, WorkerThread*, doubl e timeOrigin, const SecurityOrigin*, PassOwnPtrWillBeRawPtr<WorkerClients>);
135 void applyContentSecurityPolicyFromString(const String& contentSecurityPolic y, ContentSecurityPolicyHeaderType); 135 void applyContentSecurityPolicyFromString(const String& contentSecurityPolic y, ContentSecurityPolicyHeaderType);
136 136
137 virtual void logExceptionToConsole(const String& errorMessage, int scriptId, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtrWillBeRawP tr<ScriptCallStack>) OVERRIDE; 137 virtual void logExceptionToConsole(const String& errorMessage, int scriptId, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtrWillBeRawP tr<ScriptCallStack>) OVERRIDE;
138 void addMessageToWorkerConsole(PassRefPtrWillBeRawPtr<ConsoleMessage>); 138 void addMessageToWorkerConsole(PassRefPtrWillBeRawPtr<ConsoleMessage>);
139 139
140 private: 140 private:
141 #if !ENABLE(OILPAN) 141 #if !ENABLE(OILPAN)
142 virtual void refExecutionContext() OVERRIDE FINAL { ref(); } 142 virtual void refExecutionContext() OVERRIDE FINAL { ref(); }
143 virtual void derefExecutionContext() OVERRIDE FINAL { deref(); } 143 virtual void derefExecutionContext() OVERRIDE FINAL { deref(); }
144 #endif 144 #endif
(...skipping 26 matching lines...) Expand all
171 double m_timeOrigin; 171 double m_timeOrigin;
172 172
173 OwnPtrWillBeMember<ConsoleMessageStorage> m_messageStorage; 173 OwnPtrWillBeMember<ConsoleMessageStorage> m_messageStorage;
174 }; 174 };
175 175
176 DEFINE_TYPE_CASTS(WorkerGlobalScope, ExecutionContext, context, context->isWorke rGlobalScope(), context.isWorkerGlobalScope()); 176 DEFINE_TYPE_CASTS(WorkerGlobalScope, ExecutionContext, context, context->isWorke rGlobalScope(), context.isWorkerGlobalScope());
177 177
178 } // namespace blink 178 } // namespace blink
179 179
180 #endif // WorkerGlobalScope_h 180 #endif // WorkerGlobalScope_h
OLDNEW
« no previous file with comments | « Source/core/workers/SharedWorkerGlobalScope.cpp ('k') | Source/core/workers/WorkerGlobalScope.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698