Title: [124804] trunk/Source/WebKit/chromium
Revision
124804
Author
[email protected]
Date
2012-08-06 15:30:12 -0700 (Mon, 06 Aug 2012)

Log Message

[chromium] REGRESSION(r124714): webkit_unit_tests asserts in Debug
https://bugs.webkit.org/show_bug.cgi?id=93297

Patch by Adrienne Walker <[email protected]> on 2012-08-06
Reviewed by James Robinson.

This is a quick fix to get debug unit tests working again by
implementing a virtual function that has ASSERT_NOT_REACHED in the
base class version.

* tests/ScrollAnimatorNoneTest.cpp:
(MockScrollableArea::scrollPosition):

Modified Paths

Diff

Modified: trunk/Source/WebKit/chromium/ChangeLog (124803 => 124804)


--- trunk/Source/WebKit/chromium/ChangeLog	2012-08-06 22:24:02 UTC (rev 124803)
+++ trunk/Source/WebKit/chromium/ChangeLog	2012-08-06 22:30:12 UTC (rev 124804)
@@ -1,3 +1,17 @@
+2012-08-06  Adrienne Walker  <[email protected]>
+
+        [chromium] REGRESSION(r124714): webkit_unit_tests asserts in Debug
+        https://bugs.webkit.org/show_bug.cgi?id=93297
+
+        Reviewed by James Robinson.
+
+        This is a quick fix to get debug unit tests working again by
+        implementing a virtual function that has ASSERT_NOT_REACHED in the
+        base class version.
+
+        * tests/ScrollAnimatorNoneTest.cpp:
+        (MockScrollableArea::scrollPosition):
+
 2012-08-06  Nasko Oskov  <[email protected]>
 
         Adding APIs to Chromium WebKit API to allow for creating and monitoring frame hierarchy.

Modified: trunk/Source/WebKit/chromium/tests/ScrollAnimatorNoneTest.cpp (124803 => 124804)


--- trunk/Source/WebKit/chromium/tests/ScrollAnimatorNoneTest.cpp	2012-08-06 22:24:02 UTC (rev 124803)
+++ trunk/Source/WebKit/chromium/tests/ScrollAnimatorNoneTest.cpp	2012-08-06 22:30:12 UTC (rev 124804)
@@ -64,6 +64,7 @@
     MOCK_METHOD1(setScrollOffsetFromAnimation, void(const IntPoint&));
     MOCK_CONST_METHOD0(enclosingScrollableArea, ScrollableArea*());
 
+    virtual IntPoint scrollPosition() const { return IntPoint(); }
     virtual int visibleHeight() const { return 768; }
     virtual int visibleWidth() const { return 1024; }
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to