Title: [127896] trunk/Source/WebKit/chromium
- Revision
- 127896
- Author
- commit-qu...@webkit.org
- Date
- 2012-09-07 11:26:08 -0700 (Fri, 07 Sep 2012)
Log Message
[Chromium] GraphicsLayerChromiumTest::applyScrollToScrollableArea() is failing
https://bugs.webkit.org/show_bug.cgi?id=95932
Patch by Sami Kyostila <skyos...@google.com> on 2012-09-07
Reviewed by James Robinson.
Give the FakeScrollableArea valid geometry to allow ScrollAnimatorMac to
properly scroll it.
* tests/GraphicsLayerChromiumTest.cpp:
(WebKit::TEST_F): Re-enable the test.
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (127895 => 127896)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-09-07 18:17:37 UTC (rev 127895)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-09-07 18:26:08 UTC (rev 127896)
@@ -1,3 +1,16 @@
+2012-09-07 Sami Kyostila <skyos...@google.com>
+
+ [Chromium] GraphicsLayerChromiumTest::applyScrollToScrollableArea() is failing
+ https://bugs.webkit.org/show_bug.cgi?id=95932
+
+ Reviewed by James Robinson.
+
+ Give the FakeScrollableArea valid geometry to allow ScrollAnimatorMac to
+ properly scroll it.
+
+ * tests/GraphicsLayerChromiumTest.cpp:
+ (WebKit::TEST_F): Re-enable the test.
+
2012-09-07 James Robinson <jam...@chromium.org>
[chromium] Move some CC unit tests into correct gyp variable
Modified: trunk/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp (127895 => 127896)
--- trunk/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp 2012-09-07 18:17:37 UTC (rev 127895)
+++ trunk/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp 2012-09-07 18:26:08 UTC (rev 127896)
@@ -126,13 +126,13 @@
class FakeScrollableArea : public ScrollableArea {
public:
virtual bool isActive() const OVERRIDE { return false; }
- virtual int scrollSize(ScrollbarOrientation) const OVERRIDE { return 0; }
+ virtual int scrollSize(ScrollbarOrientation) const OVERRIDE { return 100; }
virtual int scrollPosition(Scrollbar*) const OVERRIDE { return 0; }
virtual bool isScrollCornerVisible() const OVERRIDE { return false; }
virtual IntRect scrollCornerRect() const OVERRIDE { return IntRect(); }
- virtual int visibleWidth() const OVERRIDE { return 0; }
- virtual int visibleHeight() const OVERRIDE { return 0; }
- virtual IntSize contentsSize() const OVERRIDE { return IntSize(); }
+ virtual int visibleWidth() const OVERRIDE { return 10; }
+ virtual int visibleHeight() const OVERRIDE { return 10; }
+ virtual IntSize contentsSize() const OVERRIDE { return IntSize(100, 100); }
virtual bool isOnActivePage() const OVERRIDE { return false; }
virtual ScrollableArea* enclosingScrollableArea() const OVERRIDE { return 0; }
virtual IntRect scrollableAreaBoundingBox() const OVERRIDE { return IntRect(); }
@@ -146,7 +146,7 @@
IntPoint m_scrollPosition;
};
-TEST_F(GraphicsLayerChromiumTest, DISABLED_applyScrollToScrollableArea)
+TEST_F(GraphicsLayerChromiumTest, applyScrollToScrollableArea)
{
FakeScrollableArea scrollableArea;
m_graphicsLayer->setScrollableArea(&scrollableArea);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
