| 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 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 virtual void performTask(ScriptExecutionContext*) | 164 virtual void performTask(ScriptExecutionContext*) |
| 165 { | 165 { |
| 166 m_messagingProxy->reportPendingActivityInternal(m_confirmingMessage, m_h
asPendingActivity); | 166 m_messagingProxy->reportPendingActivityInternal(m_confirmingMessage, m_h
asPendingActivity); |
| 167 } | 167 } |
| 168 | 168 |
| 169 WorkerMessagingProxy* m_messagingProxy; | 169 WorkerMessagingProxy* m_messagingProxy; |
| 170 bool m_confirmingMessage; | 170 bool m_confirmingMessage; |
| 171 bool m_hasPendingActivity; | 171 bool m_hasPendingActivity; |
| 172 }; | 172 }; |
| 173 | 173 |
| 174 | |
| 175 #if !PLATFORM(CHROMIUM) | 174 #if !PLATFORM(CHROMIUM) |
| 176 WorkerContextProxy* WorkerContextProxy::create(Worker* worker) | 175 WorkerContextProxy* WorkerContextProxy::create(Worker* worker) |
| 177 { | 176 { |
| 178 return new WorkerMessagingProxy(worker); | 177 return new WorkerMessagingProxy(worker); |
| 179 } | 178 } |
| 180 #endif | 179 #endif |
| 181 | 180 |
| 182 WorkerMessagingProxy::WorkerMessagingProxy(Worker* workerObject) | 181 WorkerMessagingProxy::WorkerMessagingProxy(Worker* workerObject) |
| 183 : m_scriptExecutionContext(workerObject->scriptExecutionContext()) | 182 : m_scriptExecutionContext(workerObject->scriptExecutionContext()) |
| 184 , m_workerObject(workerObject) | 183 , m_workerObject(workerObject) |
| (...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 334 } | 333 } |
| 335 | 334 |
| 336 bool WorkerMessagingProxy::hasPendingActivity() const | 335 bool WorkerMessagingProxy::hasPendingActivity() const |
| 337 { | 336 { |
| 338 return (m_unconfirmedMessageCount || m_workerThreadHadPendingActivity) && !m
_askedToTerminate; | 337 return (m_unconfirmedMessageCount || m_workerThreadHadPendingActivity) && !m
_askedToTerminate; |
| 339 } | 338 } |
| 340 | 339 |
| 341 } // namespace WebCore | 340 } // namespace WebCore |
| 342 | 341 |
| 343 #endif // ENABLE(WORKERS) | 342 #endif // ENABLE(WORKERS) |
| OLD | NEW |