| 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 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 222 return; | 222 return; |
| 223 } | 223 } |
| 224 } | 224 } |
| 225 } | 225 } |
| 226 | 226 |
| 227 EventTarget* WorkerGlobalScope::errorEventTarget() | 227 EventTarget* WorkerGlobalScope::errorEventTarget() |
| 228 { | 228 { |
| 229 return this; | 229 return this; |
| 230 } | 230 } |
| 231 | 231 |
| 232 void WorkerGlobalScope::logExceptionToConsole(const String& errorMessage, const
String& sourceURL, int lineNumber, PassRefPtr<ScriptCallStack>) | 232 void WorkerGlobalScope::logExceptionToConsole(const String& errorMessage, const
String& sourceURL, int lineNumber, int columnNumber, PassRefPtr<ScriptCallStack>
) |
| 233 { | 233 { |
| 234 thread()->workerReportingProxy().postExceptionToWorkerObject(errorMessage, l
ineNumber, sourceURL); | 234 thread()->workerReportingProxy().postExceptionToWorkerObject(errorMessage, l
ineNumber, columnNumber, sourceURL); |
| 235 } | 235 } |
| 236 | 236 |
| 237 void WorkerGlobalScope::addConsoleMessage(MessageSource source, MessageLevel lev
el, const String& message, unsigned long requestIdentifier) | 237 void WorkerGlobalScope::addConsoleMessage(MessageSource source, MessageLevel lev
el, const String& message, unsigned long requestIdentifier) |
| 238 { | 238 { |
| 239 if (!isContextThread()) { | 239 if (!isContextThread()) { |
| 240 postTask(AddConsoleMessageTask::create(source, level, message)); | 240 postTask(AddConsoleMessageTask::create(source, level, message)); |
| 241 return; | 241 return; |
| 242 } | 242 } |
| 243 thread()->workerReportingProxy().postConsoleMessageToWorkerObject(source, le
vel, message, 0, String()); | 243 thread()->workerReportingProxy().postConsoleMessageToWorkerObject(source, le
vel, message, 0, String()); |
| 244 | 244 |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 335 { | 335 { |
| 336 return script()->idleNotification(); | 336 return script()->idleNotification(); |
| 337 } | 337 } |
| 338 | 338 |
| 339 WorkerEventQueue* WorkerGlobalScope::eventQueue() const | 339 WorkerEventQueue* WorkerGlobalScope::eventQueue() const |
| 340 { | 340 { |
| 341 return m_eventQueue.get(); | 341 return m_eventQueue.get(); |
| 342 } | 342 } |
| 343 | 343 |
| 344 } // namespace WebCore | 344 } // namespace WebCore |
| OLD | NEW |