| OLD | NEW |
| 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 229 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 return; | 240 return; |
| 241 } | 241 } |
| 242 } | 242 } |
| 243 } | 243 } |
| 244 | 244 |
| 245 EventTarget* WorkerGlobalScope::errorEventTarget() | 245 EventTarget* WorkerGlobalScope::errorEventTarget() |
| 246 { | 246 { |
| 247 return this; | 247 return this; |
| 248 } | 248 } |
| 249 | 249 |
| 250 void WorkerGlobalScope::logExceptionToConsole(const String& errorMessage, const
String& sourceURL, int lineNumber, PassRefPtr<ScriptCallStack>) | 250 void WorkerGlobalScope::logExceptionToConsole(const String& errorMessage, const
String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<ScriptCallStack>
) |
| 251 { | 251 { |
| 252 thread()->workerReportingProxy().postExceptionToWorkerObject(errorMessage, l
ineNumber, sourceURL); | 252 thread()->workerReportingProxy().postExceptionToWorkerObject(errorMessage, l
ineNumber, columnNumber, sourceURL); |
| 253 } | 253 } |
| 254 | 254 |
| 255 void WorkerGlobalScope::addConsoleMessage(MessageSource source, MessageLevel lev
el, const String& message, unsigned long requestIdentifier) | 255 void WorkerGlobalScope::addConsoleMessage(MessageSource source, MessageLevel lev
el, const String& message, unsigned long requestIdentifier) |
| 256 { | 256 { |
| 257 if (!isContextThread()) { | 257 if (!isContextThread()) { |
| 258 postTask(AddConsoleMessageTask::create(source, level, message)); | 258 postTask(AddConsoleMessageTask::create(source, level, message)); |
| 259 return; | 259 return; |
| 260 } | 260 } |
| 261 thread()->workerReportingProxy().postConsoleMessageToWorkerObject(source, le
vel, message, 0, String()); | 261 thread()->workerReportingProxy().postConsoleMessageToWorkerObject(source, le
vel, message, 0, String()); |
| 262 | 262 |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 348 iter = m_workerObservers.begin(); | 348 iter = m_workerObservers.begin(); |
| 349 } | 349 } |
| 350 } | 350 } |
| 351 | 351 |
| 352 WorkerEventQueue* WorkerGlobalScope::eventQueue() const | 352 WorkerEventQueue* WorkerGlobalScope::eventQueue() const |
| 353 { | 353 { |
| 354 return m_eventQueue.get(); | 354 return m_eventQueue.get(); |
| 355 } | 355 } |
| 356 | 356 |
| 357 } // namespace WebCore | 357 } // namespace WebCore |
| OLD | NEW |