| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 "ScrollbarLayerChromium.h" | 7 #include "cc/scrollbar_layer.h" |
| 8 | 8 |
| 9 #include "CCScrollbarAnimationController.h" | 9 #include "CCScrollbarAnimationController.h" |
| 10 #include "CCScrollbarLayerImpl.h" | 10 #include "CCScrollbarLayerImpl.h" |
| 11 #include "CCSingleThreadProxy.h" | 11 #include "CCSingleThreadProxy.h" |
| 12 #include "TreeSynchronizer.h" | |
| 13 #include "cc/test/fake_web_scrollbar_theme_geometry.h" | 12 #include "cc/test/fake_web_scrollbar_theme_geometry.h" |
| 13 #include "cc/tree_synchronizer.h" |
| 14 #include "testing/gtest/include/gtest/gtest.h" | 14 #include "testing/gtest/include/gtest/gtest.h" |
| 15 #include <public/WebScrollbar.h> | 15 #include <public/WebScrollbar.h> |
| 16 #include <public/WebScrollbarThemeGeometry.h> | 16 #include <public/WebScrollbarThemeGeometry.h> |
| 17 #include <public/WebScrollbarThemePainter.h> | 17 #include <public/WebScrollbarThemePainter.h> |
| 18 | 18 |
| 19 using namespace cc; | 19 using namespace cc; |
| 20 | 20 |
| 21 namespace { | 21 namespace { |
| 22 | 22 |
| 23 class FakeWebScrollbar : public WebKit::WebScrollbar { | 23 class FakeWebScrollbar : public WebKit::WebScrollbar { |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 122 EXPECT_EQ(300, ccScrollbarLayer->maximum()); | 122 EXPECT_EQ(300, ccScrollbarLayer->maximum()); |
| 123 | 123 |
| 124 ccLayerTreeRoot->scrollBy(FloatSize(12, 34)); | 124 ccLayerTreeRoot->scrollBy(FloatSize(12, 34)); |
| 125 | 125 |
| 126 EXPECT_EQ(112, ccScrollbarLayer->currentPos()); | 126 EXPECT_EQ(112, ccScrollbarLayer->currentPos()); |
| 127 EXPECT_EQ(1000, ccScrollbarLayer->totalSize()); | 127 EXPECT_EQ(1000, ccScrollbarLayer->totalSize()); |
| 128 EXPECT_EQ(300, ccScrollbarLayer->maximum()); | 128 EXPECT_EQ(300, ccScrollbarLayer->maximum()); |
| 129 } | 129 } |
| 130 | 130 |
| 131 } | 131 } |
| OLD | NEW |