OLD | NEW |
---|---|
1 /* | 1 /* |
2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 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 | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
150 | 150 |
151 private: | 151 private: |
152 IntPoint m_scrollPosition; | 152 IntPoint m_scrollPosition; |
153 }; | 153 }; |
154 | 154 |
155 TEST_F(GraphicsLayerTest, applyScrollToScrollableArea) | 155 TEST_F(GraphicsLayerTest, applyScrollToScrollableArea) |
156 { | 156 { |
157 FakeScrollableArea scrollableArea; | 157 FakeScrollableArea scrollableArea; |
158 m_graphicsLayer->setScrollableArea(&scrollableArea, false); | 158 m_graphicsLayer->setScrollableArea(&scrollableArea, false); |
159 | 159 |
160 WebPoint scrollPosition(7, 9); | 160 WebDoublePoint scrollPosition(7, 9); |
Rick Byers
2014/10/04 00:04:24
Can you change these to be fractional, just to ver
Yufeng Shen (Slow to review)
2014/10/06 17:54:58
Done.
| |
161 m_platformLayer->setScrollPosition(scrollPosition); | 161 m_platformLayer->setScrollPositionDouble(scrollPosition); |
162 m_graphicsLayer->didScroll(); | 162 m_graphicsLayer->didScroll(); |
163 | 163 |
164 EXPECT_EQ(scrollPosition, WebPoint(scrollableArea.scrollPosition())); | 164 EXPECT_EQ(scrollPosition.x, scrollableArea.scrollPositionDouble().x()); |
165 EXPECT_EQ(scrollPosition.y, scrollableArea.scrollPositionDouble().y()); | |
165 } | 166 } |
166 | 167 |
167 } // namespace | 168 } // namespace |
OLD | NEW |