| OLD | NEW |
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 | 6 |
| 7 #include "cc/test/layer_tree_test_common.h" | 7 #include "cc/test/layer_tree_test_common.h" |
| 8 | 8 |
| 9 #include "base/stl_util.h" | 9 #include "base/stl_util.h" |
| 10 #include "cc/active_animation.h" | 10 #include "cc/active_animation.h" |
| (...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 result = false; | 118 result = false; |
| 119 return result; | 119 return result; |
| 120 } | 120 } |
| 121 | 121 |
| 122 void MockLayerTreeHostImpl::drawLayers(const FrameData& frame) | 122 void MockLayerTreeHostImpl::drawLayers(const FrameData& frame) |
| 123 { | 123 { |
| 124 LayerTreeHostImpl::drawLayers(frame); | 124 LayerTreeHostImpl::drawLayers(frame); |
| 125 m_testHooks->drawLayersOnThread(this); | 125 m_testHooks->drawLayersOnThread(this); |
| 126 } | 126 } |
| 127 | 127 |
| 128 void MockLayerTreeHostImpl::animateLayers(double monotonicTime, double wallClock
Time) | 128 void MockLayerTreeHostImpl::animateLayers(base::TimeTicks monotonicTime, base::T
ime wallClockTime) |
| 129 { | 129 { |
| 130 m_testHooks->willAnimateLayers(this, monotonicTime); | 130 m_testHooks->willAnimateLayers(this, monotonicTime); |
| 131 LayerTreeHostImpl::animateLayers(monotonicTime, wallClockTime); | 131 LayerTreeHostImpl::animateLayers(monotonicTime, wallClockTime); |
| 132 m_testHooks->animateLayers(this, monotonicTime); | 132 m_testHooks->animateLayers(this, monotonicTime); |
| 133 } | 133 } |
| 134 | 134 |
| 135 base::TimeDelta MockLayerTreeHostImpl::lowFrequencyAnimationInterval() const | 135 base::TimeDelta MockLayerTreeHostImpl::lowFrequencyAnimationInterval() const |
| 136 { | 136 { |
| 137 return base::TimeDelta::FromMilliseconds(16); | 137 return base::TimeDelta::FromMilliseconds(16); |
| 138 } | 138 } |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 209 virtual void willBeginFrame() OVERRIDE | 209 virtual void willBeginFrame() OVERRIDE |
| 210 { | 210 { |
| 211 } | 211 } |
| 212 | 212 |
| 213 virtual void didBeginFrame() OVERRIDE | 213 virtual void didBeginFrame() OVERRIDE |
| 214 { | 214 { |
| 215 } | 215 } |
| 216 | 216 |
| 217 virtual void animate(double monotonicTime) OVERRIDE | 217 virtual void animate(double monotonicTime) OVERRIDE |
| 218 { | 218 { |
| 219 m_testHooks->animate(monotonicTime); | 219 m_testHooks->animate(base::TimeTicks::FromInternalValue(monotonicTime *
base::Time::kMicrosecondsPerSecond)); |
| 220 } | 220 } |
| 221 | 221 |
| 222 virtual void layout() OVERRIDE | 222 virtual void layout() OVERRIDE |
| 223 { | 223 { |
| 224 m_testHooks->layout(); | 224 m_testHooks->layout(); |
| 225 } | 225 } |
| 226 | 226 |
| 227 virtual void applyScrollAndScale(const IntSize& scrollDelta, float scale) OV
ERRIDE | 227 virtual void applyScrollAndScale(const IntSize& scrollDelta, float scale) OV
ERRIDE |
| 228 { | 228 { |
| 229 m_testHooks->applyScrollAndScale(scrollDelta, scale); | 229 m_testHooks->applyScrollAndScale(scrollDelta, scale); |
| (...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 580 if (m_timedOut) { | 580 if (m_timedOut) { |
| 581 FAIL() << "Test timed out"; | 581 FAIL() << "Test timed out"; |
| 582 Platform::current()->compositorSupport()->shutdown(); | 582 Platform::current()->compositorSupport()->shutdown(); |
| 583 return; | 583 return; |
| 584 } | 584 } |
| 585 afterTest(); | 585 afterTest(); |
| 586 Platform::current()->compositorSupport()->shutdown(); | 586 Platform::current()->compositorSupport()->shutdown(); |
| 587 } | 587 } |
| 588 | 588 |
| 589 } // namespace WebKitTests | 589 } // namespace WebKitTests |
| OLD | NEW |