| 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 Google Inc. All Rights Reserved. | 3 * Copyright (C) 2009 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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 RefPtrWillBeRawPtr<ErrorEvent> event = ErrorEvent::create(errorMessage, sour
ceURL, lineNumber, columnNumber, 0); | 169 RefPtrWillBeRawPtr<ErrorEvent> event = ErrorEvent::create(errorMessage, sour
ceURL, lineNumber, columnNumber, 0); |
| 170 bool errorHandled = !m_workerObject->dispatchEvent(event); | 170 bool errorHandled = !m_workerObject->dispatchEvent(event); |
| 171 if (!errorHandled) | 171 if (!errorHandled) |
| 172 m_executionContext->reportException(event, nullptr, NotSharableCrossOrig
in); | 172 m_executionContext->reportException(event, nullptr, NotSharableCrossOrig
in); |
| 173 } | 173 } |
| 174 | 174 |
| 175 void WorkerMessagingProxy::reportConsoleMessage(MessageSource source, MessageLev
el level, const String& message, int lineNumber, const String& sourceURL) | 175 void WorkerMessagingProxy::reportConsoleMessage(MessageSource source, MessageLev
el level, const String& message, int lineNumber, const String& sourceURL) |
| 176 { | 176 { |
| 177 if (m_askedToTerminate) | 177 if (m_askedToTerminate) |
| 178 return; | 178 return; |
| 179 m_executionContext->addConsoleMessage(source, level, message, sourceURL, lin
eNumber); | 179 m_executionContext->addConsoleMessage(ConsoleMessage::create(source, level,
message, sourceURL, lineNumber)); |
| 180 } | 180 } |
| 181 | 181 |
| 182 void WorkerMessagingProxy::workerThreadCreated(PassRefPtr<DedicatedWorkerThread>
workerThread) | 182 void WorkerMessagingProxy::workerThreadCreated(PassRefPtr<DedicatedWorkerThread>
workerThread) |
| 183 { | 183 { |
| 184 m_workerThread = workerThread; | 184 m_workerThread = workerThread; |
| 185 | 185 |
| 186 if (m_askedToTerminate) { | 186 if (m_askedToTerminate) { |
| 187 // Worker.terminate() could be called from JS before the thread was crea
ted. | 187 // Worker.terminate() could be called from JS before the thread was crea
ted. |
| 188 m_workerThread->stop(); | 188 m_workerThread->stop(); |
| 189 } else { | 189 } else { |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 297 { | 297 { |
| 298 m_workerThreadHadPendingActivity = hasPendingActivity; | 298 m_workerThreadHadPendingActivity = hasPendingActivity; |
| 299 } | 299 } |
| 300 | 300 |
| 301 bool WorkerMessagingProxy::hasPendingActivity() const | 301 bool WorkerMessagingProxy::hasPendingActivity() const |
| 302 { | 302 { |
| 303 return (m_unconfirmedMessageCount || m_workerThreadHadPendingActivity) && !m
_askedToTerminate; | 303 return (m_unconfirmedMessageCount || m_workerThreadHadPendingActivity) && !m
_askedToTerminate; |
| 304 } | 304 } |
| 305 | 305 |
| 306 } // namespace blink | 306 } // namespace blink |
| OLD | NEW |