| 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 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 212 virtual void animate(double monotonicTime) OVERRIDE | 212 virtual void animate(double monotonicTime) OVERRIDE |
| 213 { | 213 { |
| 214 m_testHooks->animate(base::TimeTicks::FromInternalValue(monotonicTime *
base::Time::kMicrosecondsPerSecond)); | 214 m_testHooks->animate(base::TimeTicks::FromInternalValue(monotonicTime *
base::Time::kMicrosecondsPerSecond)); |
| 215 } | 215 } |
| 216 | 216 |
| 217 virtual void layout() OVERRIDE | 217 virtual void layout() OVERRIDE |
| 218 { | 218 { |
| 219 m_testHooks->layout(); | 219 m_testHooks->layout(); |
| 220 } | 220 } |
| 221 | 221 |
| 222 virtual void applyScrollAndScale(const IntSize& scrollDelta, float scale) OV
ERRIDE | 222 virtual void applyScrollAndScale(gfx::Vector2d scrollDelta, float scale) OVERR
IDE |
| 223 { | 223 { |
| 224 m_testHooks->applyScrollAndScale(scrollDelta, scale); | 224 m_testHooks->applyScrollAndScale(scrollDelta, scale); |
| 225 } | 225 } |
| 226 | 226 |
| 227 virtual scoped_ptr<WebCompositorOutputSurface> createOutputSurface() OVERRID
E | 227 virtual scoped_ptr<WebCompositorOutputSurface> createOutputSurface() OVERRID
E |
| 228 { | 228 { |
| 229 return m_testHooks->createOutputSurface(); | 229 return m_testHooks->createOutputSurface(); |
| 230 } | 230 } |
| 231 | 231 |
| 232 virtual void didRecreateOutputSurface(bool succeeded) OVERRIDE | 232 virtual void didRecreateOutputSurface(bool succeeded) OVERRIDE |
| (...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 529 ASSERT_FALSE(m_layerTreeHost.get()); | 529 ASSERT_FALSE(m_layerTreeHost.get()); |
| 530 m_client.reset(); | 530 m_client.reset(); |
| 531 if (m_timedOut) { | 531 if (m_timedOut) { |
| 532 FAIL() << "Test timed out"; | 532 FAIL() << "Test timed out"; |
| 533 return; | 533 return; |
| 534 } | 534 } |
| 535 afterTest(); | 535 afterTest(); |
| 536 } | 536 } |
| 537 | 537 |
| 538 } // namespace WebKitTests | 538 } // namespace WebKitTests |
| OLD | NEW |