| 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 OwnPtr<MessagePortArray> ports = MessagePort::entanglePorts(*scriptConte
xt, m_channels.release()); | 75 OwnPtr<MessagePortArray> ports = MessagePort::entanglePorts(*scriptConte
xt, m_channels.release()); |
| 76 context->dispatchEvent(MessageEvent::create(ports.release(), m_message))
; | 76 context->dispatchEvent(MessageEvent::create(ports.release(), m_message))
; |
| 77 context->thread()->workerObjectProxy().confirmMessageFromWorkerObject(co
ntext->hasPendingActivity()); | 77 context->thread()->workerObjectProxy().confirmMessageFromWorkerObject(co
ntext->hasPendingActivity()); |
| 78 } | 78 } |
| 79 | 79 |
| 80 private: | 80 private: |
| 81 RefPtr<SerializedScriptValue> m_message; | 81 RefPtr<SerializedScriptValue> m_message; |
| 82 OwnPtr<MessagePortChannelArray> m_channels; | 82 OwnPtr<MessagePortChannelArray> m_channels; |
| 83 }; | 83 }; |
| 84 | 84 |
| 85 WorkerMessagingProxy::WorkerMessagingProxy(Worker* workerObject, PassOwnPtr<Work
erClients> workerClients) | 85 WorkerMessagingProxy::WorkerMessagingProxy(Worker* workerObject, PassOwnPtrWillB
eRawPtr<WorkerClients> workerClients) |
| 86 : m_executionContext(workerObject->executionContext()) | 86 : m_executionContext(workerObject->executionContext()) |
| 87 , m_workerObjectProxy(WorkerObjectProxy::create(m_executionContext.get(), th
is)) | 87 , m_workerObjectProxy(WorkerObjectProxy::create(m_executionContext.get(), th
is)) |
| 88 , m_workerObject(workerObject) | 88 , m_workerObject(workerObject) |
| 89 , m_mayBeDestroyed(false) | 89 , m_mayBeDestroyed(false) |
| 90 , m_unconfirmedMessageCount(0) | 90 , m_unconfirmedMessageCount(0) |
| 91 , m_workerThreadHadPendingActivity(false) | 91 , m_workerThreadHadPendingActivity(false) |
| 92 , m_askedToTerminate(false) | 92 , m_askedToTerminate(false) |
| 93 , m_pageInspector(0) | 93 , m_pageInspector(0) |
| 94 , m_workerClients(workerClients) | 94 , m_workerClients(workerClients) |
| 95 { | 95 { |
| (...skipping 201 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 WebCore | 306 } // namespace WebCore |
| OLD | NEW |