Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 13 matching lines...) Expand all Loading... | |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "modules/performance/WorkerPerformance.h" | 32 #include "modules/performance/WorkerPerformance.h" |
| 33 | 33 |
| 34 #include "core/timing/MemoryInfo.h" | |
| 34 #include "core/workers/DedicatedWorkerGlobalScope.h" | 35 #include "core/workers/DedicatedWorkerGlobalScope.h" |
| 35 #include "core/workers/WorkerGlobalScope.h" | 36 #include "core/workers/WorkerGlobalScope.h" |
| 36 #include "wtf/CurrentTime.h" | 37 #include "wtf/CurrentTime.h" |
| 37 | 38 |
| 38 namespace WebCore { | 39 namespace WebCore { |
| 39 | 40 |
| 40 DEFINE_GC_INFO(WorkerPerformance); | 41 DEFINE_GC_INFO(WorkerPerformance); |
| 41 | 42 |
| 42 WorkerPerformance::WorkerPerformance() | 43 WorkerPerformance::WorkerPerformance() |
| 43 { | 44 { |
| 44 ScriptWrappable::init(this); | 45 ScriptWrappable::init(this); |
| 45 } | 46 } |
| 46 | 47 |
| 47 WorkerPerformance::~WorkerPerformance() | 48 WorkerPerformance::~WorkerPerformance() |
| 48 { | 49 { |
| 49 } | 50 } |
| 50 | 51 |
| 51 double WorkerPerformance::now(ExecutionContext* context) const | 52 double WorkerPerformance::now(ExecutionContext* context) const |
| 52 { | 53 { |
| 53 ASSERT(context); | 54 ASSERT(context); |
| 54 ASSERT(context->isWorkerGlobalScope()); | 55 ASSERT(context->isWorkerGlobalScope()); |
| 55 WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context); | 56 WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context); |
| 56 return 1000.0 * (monotonicallyIncreasingTime() - workerGlobalScope->timeOrig in()); | 57 return 1000.0 * (monotonicallyIncreasingTime() - workerGlobalScope->timeOrig in()); |
| 57 } | 58 } |
| 58 | 59 |
| 60 PassRefPtrWillBeRawPtr<MemoryInfo> WorkerPerformance::memory() const | |
| 61 { | |
| 62 return MemoryInfo::create(); | |
|
abarth-chromium
2014/03/28 17:38:47
Can you add the same FIXME comment here? We shoul
| |
| 63 } | |
| 64 | |
| 59 } // namespace WebCore | 65 } // namespace WebCore |
| OLD | NEW |