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 24 matching lines...) Expand all Loading... |
35 #include "core/workers/DedicatedWorkerGlobalScope.h" | 35 #include "core/workers/DedicatedWorkerGlobalScope.h" |
36 #include "core/workers/WorkerGlobalScope.h" | 36 #include "core/workers/WorkerGlobalScope.h" |
37 #include "wtf/CurrentTime.h" | 37 #include "wtf/CurrentTime.h" |
38 | 38 |
39 namespace blink { | 39 namespace blink { |
40 | 40 |
41 WorkerPerformance::WorkerPerformance() | 41 WorkerPerformance::WorkerPerformance() |
42 { | 42 { |
43 } | 43 } |
44 | 44 |
| 45 DEFINE_TRACE(WorkerPerformance) |
| 46 { |
| 47 visitor->trace(m_memoryInfo); |
| 48 } |
| 49 |
45 double WorkerPerformance::now(ExecutionContext* context) const | 50 double WorkerPerformance::now(ExecutionContext* context) const |
46 { | 51 { |
47 ASSERT(context); | 52 ASSERT(context); |
48 ASSERT(context->isWorkerGlobalScope()); | 53 ASSERT(context->isWorkerGlobalScope()); |
49 WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context); | 54 WorkerGlobalScope* workerGlobalScope = toWorkerGlobalScope(context); |
50 return 1000.0 * (monotonicallyIncreasingTime() - workerGlobalScope->timeOrig
in()); | 55 return 1000.0 * (monotonicallyIncreasingTime() - workerGlobalScope->timeOrig
in()); |
51 } | 56 } |
52 | 57 |
53 PassRefPtrWillBeRawPtr<MemoryInfo> WorkerPerformance::memory() const | 58 MemoryInfo* WorkerPerformance::memory() |
54 { | 59 { |
55 // FIXME: We shall not create a new object every time. | 60 if (!m_memoryInfo) |
56 return MemoryInfo::create(); | 61 m_memoryInfo = MemoryInfo::create(); |
| 62 |
| 63 return m_memoryInfo.get(); |
57 } | 64 } |
58 | 65 |
59 } // namespace blink | 66 } // namespace blink |
OLD | NEW |