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 277 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
288 debugger->debugger()->addConsoleMessage( | 288 debugger->debugger()->addConsoleMessage( |
289 debugger->contextGroupId(), | 289 debugger->contextGroupId(), |
290 consoleMessage->source(), | 290 consoleMessage->source(), |
291 consoleMessage->level(), | 291 consoleMessage->level(), |
292 consoleMessage->message(), | 292 consoleMessage->message(), |
293 consoleMessage->location()->url(), | 293 consoleMessage->location()->url(), |
294 consoleMessage->location()->lineNumber(), | 294 consoleMessage->location()->lineNumber(), |
295 consoleMessage->location()->columnNumber(), | 295 consoleMessage->location()->columnNumber(), |
296 consoleMessage->location()->cloneStackTrace(), | 296 consoleMessage->location()->cloneStackTrace(), |
297 consoleMessage->location()->scriptId(), | 297 consoleMessage->location()->scriptId(), |
298 IdentifiersFactory::requestId(consoleMessage->requestIdentifier())); | 298 IdentifiersFactory::requestId(consoleMessage->requestIdentifier()), |
| 299 consoleMessage->workerId()); |
299 } | 300 } |
300 | 301 |
301 bool WorkerGlobalScope::isContextThread() const | 302 bool WorkerGlobalScope::isContextThread() const |
302 { | 303 { |
303 return thread()->isCurrentThread(); | 304 return thread()->isCurrentThread(); |
304 } | 305 } |
305 | 306 |
306 bool WorkerGlobalScope::isJSExecutionForbidden() const | 307 bool WorkerGlobalScope::isJSExecutionForbidden() const |
307 { | 308 { |
308 return m_scriptController->isExecutionForbidden(); | 309 return m_scriptController->isExecutionForbidden(); |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
402 visitor->trace(m_workerClients); | 403 visitor->trace(m_workerClients); |
403 visitor->trace(m_timers); | 404 visitor->trace(m_timers); |
404 visitor->trace(m_eventListeners); | 405 visitor->trace(m_eventListeners); |
405 ExecutionContext::trace(visitor); | 406 ExecutionContext::trace(visitor); |
406 EventTargetWithInlineData::trace(visitor); | 407 EventTargetWithInlineData::trace(visitor); |
407 SecurityContext::trace(visitor); | 408 SecurityContext::trace(visitor); |
408 Supplementable<WorkerGlobalScope>::trace(visitor); | 409 Supplementable<WorkerGlobalScope>::trace(visitor); |
409 } | 410 } |
410 | 411 |
411 } // namespace blink | 412 } // namespace blink |
OLD | NEW |