| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 20 matching lines...) Expand all Loading... |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 | 32 |
| 33 #include "core/workers/DedicatedWorkerThread.h" | 33 #include "core/workers/DedicatedWorkerThread.h" |
| 34 | 34 |
| 35 #include "core/workers/DedicatedWorkerGlobalScope.h" | 35 #include "core/workers/DedicatedWorkerGlobalScope.h" |
| 36 #include "core/workers/WorkerObjectProxy.h" | 36 #include "core/workers/WorkerObjectProxy.h" |
| 37 #include "core/workers/WorkerThreadStartupData.h" | 37 #include "core/workers/WorkerThreadStartupData.h" |
| 38 | 38 |
| 39 namespace WebCore { | 39 namespace WebCore { |
| 40 | 40 |
| 41 PassRefPtr<DedicatedWorkerThread> DedicatedWorkerThread::create(WorkerLoaderProx
y& workerLoaderProxy, WorkerObjectProxy& workerObjectProxy, double timeOrigin, P
assOwnPtr<WorkerThreadStartupData> startupData) | 41 PassRefPtr<DedicatedWorkerThread> DedicatedWorkerThread::create(WorkerLoaderProx
y& workerLoaderProxy, WorkerObjectProxy& workerObjectProxy, double timeOrigin, b
ool memoryInfoEnabled, PassOwnPtr<WorkerThreadStartupData> startupData) |
| 42 { | 42 { |
| 43 return adoptRef(new DedicatedWorkerThread(workerLoaderProxy, workerObjectPro
xy, timeOrigin, startupData)); | 43 return adoptRef(new DedicatedWorkerThread(workerLoaderProxy, workerObjectPro
xy, timeOrigin, memoryInfoEnabled, startupData)); |
| 44 } | 44 } |
| 45 | 45 |
| 46 DedicatedWorkerThread::DedicatedWorkerThread(WorkerLoaderProxy& workerLoaderProx
y, WorkerObjectProxy& workerObjectProxy, double timeOrigin, PassOwnPtr<WorkerThr
eadStartupData> startupData) | 46 DedicatedWorkerThread::DedicatedWorkerThread(WorkerLoaderProxy& workerLoaderProx
y, WorkerObjectProxy& workerObjectProxy, double timeOrigin, bool memoryInfoEnabl
ed, PassOwnPtr<WorkerThreadStartupData> startupData) |
| 47 : WorkerThread(workerLoaderProxy, workerObjectProxy, startupData) | 47 : WorkerThread(workerLoaderProxy, workerObjectProxy, startupData) |
| 48 , m_workerObjectProxy(workerObjectProxy) | 48 , m_workerObjectProxy(workerObjectProxy) |
| 49 , m_timeOrigin(timeOrigin) | 49 , m_timeOrigin(timeOrigin) |
| 50 , m_memoryInfoEnabled(memoryInfoEnabled) |
| 50 { | 51 { |
| 51 } | 52 } |
| 52 | 53 |
| 53 DedicatedWorkerThread::~DedicatedWorkerThread() | 54 DedicatedWorkerThread::~DedicatedWorkerThread() |
| 54 { | 55 { |
| 55 } | 56 } |
| 56 | 57 |
| 57 PassRefPtr<WorkerGlobalScope> DedicatedWorkerThread::createWorkerGlobalScope(Pas
sOwnPtr<WorkerThreadStartupData> startupData) | 58 PassRefPtr<WorkerGlobalScope> DedicatedWorkerThread::createWorkerGlobalScope(Pas
sOwnPtr<WorkerThreadStartupData> startupData) |
| 58 { | 59 { |
| 59 return DedicatedWorkerGlobalScope::create(this, startupData, m_timeOrigin); | 60 return DedicatedWorkerGlobalScope::create(this, startupData, m_timeOrigin, m
_memoryInfoEnabled); |
| 60 } | 61 } |
| 61 | 62 |
| 62 void DedicatedWorkerThread::runEventLoop() | 63 void DedicatedWorkerThread::runEventLoop() |
| 63 { | 64 { |
| 64 // Notify the parent object of our current active state before calling the s
uperclass to run the event loop. | 65 // Notify the parent object of our current active state before calling the s
uperclass to run the event loop. |
| 65 m_workerObjectProxy.reportPendingActivity(workerGlobalScope()->hasPendingAct
ivity()); | 66 m_workerObjectProxy.reportPendingActivity(workerGlobalScope()->hasPendingAct
ivity()); |
| 66 WorkerThread::runEventLoop(); | 67 WorkerThread::runEventLoop(); |
| 67 } | 68 } |
| 68 | 69 |
| 69 } // namespace WebCore | 70 } // namespace WebCore |
| OLD | NEW |