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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
158 FakeScrollableArea scrollableArea; | 158 FakeScrollableArea scrollableArea; |
159 m_graphicsLayer->setScrollableArea(&scrollableArea, false); | 159 m_graphicsLayer->setScrollableArea(&scrollableArea, false); |
160 | 160 |
161 WebPoint scrollPosition(7, 9); | 161 WebPoint scrollPosition(7, 9); |
162 m_platformLayer->setScrollPosition(scrollPosition); | 162 m_platformLayer->setScrollPosition(scrollPosition); |
163 m_graphicsLayer->didScroll(); | 163 m_graphicsLayer->didScroll(); |
164 | 164 |
165 EXPECT_EQ(scrollPosition, WebPoint(scrollableArea.scrollPosition())); | 165 EXPECT_EQ(scrollPosition, WebPoint(scrollableArea.scrollPosition())); |
166 } | 166 } |
167 | 167 |
168 TEST_F(GraphicsLayerTest, DISABLED_setContentsToSolidColor) | |
169 { | |
170 m_graphicsLayer->setContentsToSolidColor(Color::transparent); | |
171 EXPECT_FALSE(m_graphicsLayer->contentsLayer()); | |
172 | |
173 m_graphicsLayer->setContentsToSolidColor(Color::white); | |
174 EXPECT_TRUE(m_graphicsLayer->contentsLayer()); | |
175 | |
176 m_graphicsLayer->setContentsToSolidColor(Color()); | |
177 EXPECT_FALSE(m_graphicsLayer->contentsLayer()); | |
178 } | |
179 | |
180 } // namespace | 168 } // namespace |
OLD | NEW |