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

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

Issue 325143002: Oilpan: Prepare moving inspector script related classes to oilpan. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed Created 6 years, 6 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/WorkerGlobalScope.h ('k') | Source/modules/websockets/WebSocketChannel.cpp » ('j') | 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 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 return; 265 return;
266 } 266 }
267 } 267 }
268 } 268 }
269 269
270 EventTarget* WorkerGlobalScope::errorEventTarget() 270 EventTarget* WorkerGlobalScope::errorEventTarget()
271 { 271 {
272 return this; 272 return this;
273 } 273 }
274 274
275 void WorkerGlobalScope::logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<ScriptCallStack> ) 275 void WorkerGlobalScope::logExceptionToConsole(const String& errorMessage, const String& sourceURL, int lineNumber, int columnNumber, PassRefPtrWillBeRawPtr<Scri ptCallStack>)
276 { 276 {
277 thread()->workerReportingProxy().reportException(errorMessage, lineNumber, c olumnNumber, sourceURL); 277 thread()->workerReportingProxy().reportException(errorMessage, lineNumber, c olumnNumber, sourceURL);
278 } 278 }
279 279
280 void WorkerGlobalScope::reportBlockedScriptExecutionToInspector(const String& di rectiveText) 280 void WorkerGlobalScope::reportBlockedScriptExecutionToInspector(const String& di rectiveText)
281 { 281 {
282 InspectorInstrumentation::scriptExecutionBlockedByCSP(this, directiveText); 282 InspectorInstrumentation::scriptExecutionBlockedByCSP(this, directiveText);
283 } 283 }
284 284
285 void WorkerGlobalScope::addMessage(MessageSource source, MessageLevel level, con st String& message, const String& sourceURL, unsigned lineNumber, ScriptState* s criptState) 285 void WorkerGlobalScope::addMessage(MessageSource source, MessageLevel level, con st String& message, const String& sourceURL, unsigned lineNumber, ScriptState* s criptState)
286 { 286 {
287 if (!isContextThread()) { 287 if (!isContextThread()) {
288 postTask(AddConsoleMessageTask::create(source, level, message)); 288 postTask(AddConsoleMessageTask::create(source, level, message));
289 return; 289 return;
290 } 290 }
291 thread()->workerReportingProxy().reportConsoleMessage(source, level, message , lineNumber, sourceURL); 291 thread()->workerReportingProxy().reportConsoleMessage(source, level, message , lineNumber, sourceURL);
292 addMessageToWorkerConsole(source, level, message, sourceURL, lineNumber, nul lptr, scriptState); 292 addMessageToWorkerConsole(source, level, message, sourceURL, lineNumber, nul lptr, scriptState);
293 } 293 }
294 294
295 void WorkerGlobalScope::addMessageToWorkerConsole(MessageSource source, MessageL evel level, const String& message, const String& sourceURL, unsigned lineNumber, PassRefPtr<ScriptCallStack> callStack, ScriptState* scriptState) 295 void WorkerGlobalScope::addMessageToWorkerConsole(MessageSource source, MessageL evel level, const String& message, const String& sourceURL, unsigned lineNumber, PassRefPtrWillBeRawPtr<ScriptCallStack> callStack, ScriptState* scriptState)
296 { 296 {
297 ASSERT(isContextThread()); 297 ASSERT(isContextThread());
298 if (callStack) 298 if (callStack)
299 InspectorInstrumentation::addMessageToConsole(this, source, LogMessageTy pe, level, message, callStack); 299 InspectorInstrumentation::addMessageToConsole(this, source, LogMessageTy pe, level, message, callStack);
300 else 300 else
301 InspectorInstrumentation::addMessageToConsole(this, source, LogMessageTy pe, level, message, sourceURL, lineNumber, 0, scriptState); 301 InspectorInstrumentation::addMessageToConsole(this, source, LogMessageTy pe, level, message, sourceURL, lineNumber, 0, scriptState);
302 } 302 }
303 303
304 bool WorkerGlobalScope::isContextThread() const 304 bool WorkerGlobalScope::isContextThread() const
305 { 305 {
(...skipping 21 matching lines...) Expand all
327 visitor->trace(m_location); 327 visitor->trace(m_location);
328 visitor->trace(m_navigator); 328 visitor->trace(m_navigator);
329 visitor->trace(m_eventQueue); 329 visitor->trace(m_eventQueue);
330 visitor->trace(m_workerClients); 330 visitor->trace(m_workerClients);
331 WillBeHeapSupplementable<WorkerGlobalScope>::trace(visitor); 331 WillBeHeapSupplementable<WorkerGlobalScope>::trace(visitor);
332 ExecutionContext::trace(visitor); 332 ExecutionContext::trace(visitor);
333 EventTargetWithInlineData::trace(visitor); 333 EventTargetWithInlineData::trace(visitor);
334 } 334 }
335 335
336 } // namespace WebCore 336 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/workers/WorkerGlobalScope.h ('k') | Source/modules/websockets/WebSocketChannel.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698