Title: [136954] trunk/Source/WebCore
- Revision
- 136954
- Author
- commit-qu...@webkit.org
- Date
- 2012-12-07 07:51:04 -0800 (Fri, 07 Dec 2012)
Log Message
REGRESSION(r136947): Made two tests fail on all platforms (Requested by tonikitoo-ll on #webkit).
https://bugs.webkit.org/show_bug.cgi?id=104368
Unreviewed partial rollout.
r136947 was too aggressive in the sense of fixing RenderBox::canBeScrolledAndHasScrollableArea
as part of itself. Revert the related changes in order to fix both
fast/events/autoscroll-should-not-stop-on-keypress.html and
fast/events/autoscroll-in-textfield.html
Patch by Antonio Gomes <a1.go...@sisa.samsung.com> on 2012-12-07
* rendering/RenderBox.cpp:
(WebCore::RenderBox::canBeScrolledAndHasScrollableArea):
* rendering/RenderBox.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (136953 => 136954)
--- trunk/Source/WebCore/ChangeLog 2012-12-07 15:02:31 UTC (rev 136953)
+++ trunk/Source/WebCore/ChangeLog 2012-12-07 15:51:04 UTC (rev 136954)
@@ -1,3 +1,19 @@
+2012-12-07 Antonio Gomes <a1.go...@sisa.samsung.com>
+
+ REGRESSION(r136947): Made two tests fail on all platforms (Requested by tonikitoo-ll on #webkit).
+ https://bugs.webkit.org/show_bug.cgi?id=104368
+
+ Unreviewed partial rollout.
+
+ r136947 was too aggressive in the sense of fixing RenderBox::canBeScrolledAndHasScrollableArea
+ as part of itself. Revert the related changes in order to fix both
+ fast/events/autoscroll-should-not-stop-on-keypress.html and
+ fast/events/autoscroll-in-textfield.html
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::canBeScrolledAndHasScrollableArea):
+ * rendering/RenderBox.h:
+
2012-12-07 Allan Sandfeld Jensen <allan.jen...@digia.com>
[TexMap] Can not do multiple accelerated animations
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (136953 => 136954)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2012-12-07 15:02:31 UTC (rev 136953)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2012-12-07 15:51:04 UTC (rev 136954)
@@ -615,8 +615,7 @@
bool RenderBox::canBeScrolledAndHasScrollableArea() const
{
- bool hasScrollableOverflow = hasScrollableOverflowX() || hasScrollableOverflowY();
- return hasScrollableOverflow && canBeProgramaticallyScrolled();
+ return canBeProgramaticallyScrolled() && (scrollHeight() != clientHeight() || scrollWidth() != clientWidth());
}
bool RenderBox::canBeProgramaticallyScrolled() const
Modified: trunk/Source/WebCore/rendering/RenderBox.h (136953 => 136954)
--- trunk/Source/WebCore/rendering/RenderBox.h 2012-12-07 15:02:31 UTC (rev 136953)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2012-12-07 15:51:04 UTC (rev 136954)
@@ -446,8 +446,6 @@
bool scrollsOverflow() const { return scrollsOverflowX() || scrollsOverflowY(); }
bool scrollsOverflowX() const { return hasOverflowClip() && (style()->overflowX() == OSCROLL || hasAutoHorizontalScrollbar()); }
bool scrollsOverflowY() const { return hasOverflowClip() && (style()->overflowY() == OSCROLL || hasAutoVerticalScrollbar()); }
- bool hasScrollableOverflowX() const { return scrollsOverflowX() && scrollWidth() != clientWidth(); }
- bool hasScrollableOverflowY() const { return scrollsOverflowY() && scrollHeight() != clientHeight(); }
bool usesCompositedScrolling() const;
bool hasUnsplittableScrollingOverflow() const;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
