Title: [123825] trunk/Source/WebCore
- Revision
- 123825
- Author
- [email protected]
- Date
- 2012-07-26 18:07:39 -0700 (Thu, 26 Jul 2012)
Log Message
[Chromium-Android] Don't overlay scrollbars in layout test mode
https://bugs.webkit.org/show_bug.cgi?id=92419
Reviewed by Adam Barth.
No new tests. This fixes failures of existing tests, e.g. css1/box_properties/border.html and many others.
* platform/chromium/ScrollbarThemeChromiumAndroid.cpp:
(WebCore::ScrollbarThemeChromiumAndroid::usesOverlayScrollbars): Returns false in layout test mode.
(WebCore):
(WebCore::ScrollbarThemeChromiumAndroid::hasThumb): Returns false in layout test mode (to match pixel test expectations).
* platform/chromium/ScrollbarThemeChromiumAndroid.h:
(ScrollbarThemeChromiumAndroid):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (123824 => 123825)
--- trunk/Source/WebCore/ChangeLog 2012-07-27 01:00:42 UTC (rev 123824)
+++ trunk/Source/WebCore/ChangeLog 2012-07-27 01:07:39 UTC (rev 123825)
@@ -1,3 +1,19 @@
+2012-07-26 Xianzhu Wang <[email protected]>
+
+ [Chromium-Android] Don't overlay scrollbars in layout test mode
+ https://bugs.webkit.org/show_bug.cgi?id=92419
+
+ Reviewed by Adam Barth.
+
+ No new tests. This fixes failures of existing tests, e.g. css1/box_properties/border.html and many others.
+
+ * platform/chromium/ScrollbarThemeChromiumAndroid.cpp:
+ (WebCore::ScrollbarThemeChromiumAndroid::usesOverlayScrollbars): Returns false in layout test mode.
+ (WebCore):
+ (WebCore::ScrollbarThemeChromiumAndroid::hasThumb): Returns false in layout test mode (to match pixel test expectations).
+ * platform/chromium/ScrollbarThemeChromiumAndroid.h:
+ (ScrollbarThemeChromiumAndroid):
+
2012-07-26 Jeffrey Pfau <[email protected]>
Reloading substitute-data/alternate html string for unreachableURL will add an item to the back-forward-history for each reload
Modified: trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumAndroid.cpp (123824 => 123825)
--- trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumAndroid.cpp 2012-07-27 01:00:42 UTC (rev 123824)
+++ trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumAndroid.cpp 2012-07-27 01:07:39 UTC (rev 123825)
@@ -61,6 +61,12 @@
return scrollbarWidth + scrollbarMargin;
}
+bool ScrollbarThemeChromiumAndroid::usesOverlayScrollbars() const
+{
+ // In layout test mode, match Chromium-Linux.
+ return !isRunningLayoutTest();
+}
+
int ScrollbarThemeChromiumAndroid::thumbPosition(ScrollbarThemeClient* scrollbar)
{
if (!scrollbar->totalSize())
@@ -84,6 +90,12 @@
return length;
}
+bool ScrollbarThemeChromiumAndroid::hasThumb(ScrollbarThemeClient* scrollbar)
+{
+ // In layout test mode, match Chromium-Linux.
+ return !isRunningLayoutTest();
+}
+
IntRect ScrollbarThemeChromiumAndroid::backButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool)
{
return IntRect();
Modified: trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumAndroid.h (123824 => 123825)
--- trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumAndroid.h 2012-07-27 01:00:42 UTC (rev 123824)
+++ trunk/Source/WebCore/platform/chromium/ScrollbarThemeChromiumAndroid.h 2012-07-27 01:07:39 UTC (rev 123825)
@@ -33,13 +33,13 @@
class ScrollbarThemeChromiumAndroid : public ScrollbarThemeComposite {
public:
virtual int scrollbarThickness(ScrollbarControlSize);
- virtual bool usesOverlayScrollbars() const { return true; }
+ virtual bool usesOverlayScrollbars() const;
virtual int thumbPosition(ScrollbarThemeClient*);
virtual int thumbLength(ScrollbarThemeClient*);
virtual bool hasButtons(ScrollbarThemeClient*) { return false; };
- virtual bool hasThumb(ScrollbarThemeClient*) { return true; };
+ virtual bool hasThumb(ScrollbarThemeClient*);
virtual IntRect backButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool painting = false);
virtual IntRect forwardButtonRect(ScrollbarThemeClient*, ScrollbarPart, bool painting = false);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
