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

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

Issue 376213002: DevTools: Make FrameConsole methods accept ConsoleMessage objects. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@scriptFailedToParse
Patch Set: Created 6 years, 5 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
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 124 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 135
136 using SecurityContext::securityOrigin; 136 using SecurityContext::securityOrigin;
137 using SecurityContext::contentSecurityPolicy; 137 using SecurityContext::contentSecurityPolicy;
138 138
139 virtual void trace(Visitor*) OVERRIDE; 139 virtual void trace(Visitor*) OVERRIDE;
140 140
141 protected: 141 protected:
142 WorkerGlobalScope(const KURL&, const String& userAgent, WorkerThread*, d ouble timeOrigin, PassOwnPtrWillBeRawPtr<WorkerClients>); 142 WorkerGlobalScope(const KURL&, const String& userAgent, WorkerThread*, d ouble timeOrigin, PassOwnPtrWillBeRawPtr<WorkerClients>);
143 void applyContentSecurityPolicyFromString(const String& contentSecurityP olicy, ContentSecurityPolicyHeaderType); 143 void applyContentSecurityPolicyFromString(const String& contentSecurityP olicy, ContentSecurityPolicyHeaderType);
144 144
145 virtual void logExceptionToConsole(const String& errorMessage, const Str ing& sourceURL, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<ScriptC allStack>) OVERRIDE; 145 virtual void logExceptionToConsole(PassRefPtr<ConsoleMessage>) OVERRIDE;
146 void addMessageToWorkerConsole(MessageSource, MessageLevel, const String & message, const String& sourceURL, unsigned lineNumber, PassRefPtrWillBeRawPtr< ScriptCallStack>, ScriptState*); 146 void addMessageToWorkerConsole(PassRefPtr<ConsoleMessage>);
147 147
148 private: 148 private:
149 #if !ENABLE(OILPAN) 149 #if !ENABLE(OILPAN)
150 virtual void refExecutionContext() OVERRIDE FINAL { ref(); } 150 virtual void refExecutionContext() OVERRIDE FINAL { ref(); }
151 virtual void derefExecutionContext() OVERRIDE FINAL { deref(); } 151 virtual void derefExecutionContext() OVERRIDE FINAL { deref(); }
152 #endif 152 #endif
153 153
154 virtual const KURL& virtualURL() const OVERRIDE FINAL; 154 virtual const KURL& virtualURL() const OVERRIDE FINAL;
155 virtual KURL virtualCompleteURL(const String&) const OVERRIDE FINAL; 155 virtual KURL virtualCompleteURL(const String&) const OVERRIDE FINAL;
156 156
157 virtual void reportBlockedScriptExecutionToInspector(const String& direc tiveText) OVERRIDE FINAL; 157 virtual void reportBlockedScriptExecutionToInspector(const String& direc tiveText) OVERRIDE FINAL;
158 virtual void addMessage(MessageSource, MessageLevel, const String& messa ge, const String& sourceURL, unsigned lineNumber, ScriptState* = 0) OVERRIDE FIN AL; 158 virtual void addMessage(PassRefPtr<ConsoleMessage>) OVERRIDE FINAL;
159 159
160 virtual EventTarget* errorEventTarget() OVERRIDE FINAL; 160 virtual EventTarget* errorEventTarget() OVERRIDE FINAL;
161 virtual void didUpdateSecurityOrigin() OVERRIDE FINAL { } 161 virtual void didUpdateSecurityOrigin() OVERRIDE FINAL { }
162 162
163 KURL m_url; 163 KURL m_url;
164 String m_userAgent; 164 String m_userAgent;
165 165
166 mutable RefPtrWillBeMember<WorkerConsole> m_console; 166 mutable RefPtrWillBeMember<WorkerConsole> m_console;
167 mutable RefPtrWillBeMember<WorkerLocation> m_location; 167 mutable RefPtrWillBeMember<WorkerLocation> m_location;
168 mutable RefPtrWillBeMember<WorkerNavigator> m_navigator; 168 mutable RefPtrWillBeMember<WorkerNavigator> m_navigator;
(...skipping 10 matching lines...) Expand all
179 179
180 double m_timeOrigin; 180 double m_timeOrigin;
181 TerminationObserver* m_terminationObserver; 181 TerminationObserver* m_terminationObserver;
182 }; 182 };
183 183
184 DEFINE_TYPE_CASTS(WorkerGlobalScope, ExecutionContext, context, context->isWorke rGlobalScope(), context.isWorkerGlobalScope()); 184 DEFINE_TYPE_CASTS(WorkerGlobalScope, ExecutionContext, context, context->isWorke rGlobalScope(), context.isWorkerGlobalScope());
185 185
186 } // namespace WebCore 186 } // namespace WebCore
187 187
188 #endif // WorkerGlobalScope_h 188 #endif // WorkerGlobalScope_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698