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 11 matching lines...) Expand all Loading... | |
| 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 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 "core/html/ime/Composition.h" | 32 #include "modules/performance/WorkerPerformance.h" |
| 33 | 33 |
| 34 #include "core/dom/Node.h" | 34 #include "core/workers/DedicatedWorkerContext.h" |
| 35 #include "core/dom/Range.h" | 35 #include "core/workers/WorkerContext.h" |
| 36 #include "wtf/CurrentTime.h" | |
| 36 | 37 |
| 37 namespace WebCore { | 38 namespace WebCore { |
| 38 | 39 |
| 39 Composition::~Composition() | 40 WorkerPerformance::WorkerPerformance(ScriptExecutionContext* context) |
| 41 : ContextDestructionObserver(context) | |
| 40 { | 42 { |
| 41 } | 43 } |
| 42 | 44 |
| 43 PassRefPtr<Composition> Composition::create(Node* text, Range* caret) | 45 WorkerPerformance::~WorkerPerformance() |
| 44 { | 46 { |
| 45 return adoptRef(new Composition(text, caret)); | |
| 46 } | 47 } |
| 47 | 48 |
| 48 Composition::Composition(Node* text, Range* caret) | 49 double WorkerPerformance::now() const |
| 49 : m_text(text) | |
| 50 , m_caret(caret) | |
| 51 { | 50 { |
| 52 ScriptWrappable::init(this); | 51 ScriptExecutionContext* context = scriptExecutionContext(); |
| 52 ASSERT(context); | |
| 53 ASSERT_WITH_SECURITY_IMPLICATION(context->isWorkerContext()); | |
| 54 WorkerContext* workerContext = static_cast<WorkerContext*>(context); | |
| 55 return 1000.0 * (monotonicallyIncreasingTime() - workerContext->timeOrigin() ); | |
|
abarth-chromium
2013/06/13 22:27:16
I missed it the first time too, but it's here on t
| |
| 53 } | 56 } |
| 54 | 57 |
| 55 } // namespace WebCore | 58 } // namespace WebCore |
| OLD | NEW |