Title: [88901] trunk/Source/WebCore
- Revision
- 88901
- Author
- tk...@chromium.org
- Date
- 2011-06-14 20:41:24 -0700 (Tue, 14 Jun 2011)
Log Message
2011-06-14 Kent Tamura <tk...@chromium.org>
Reviewed by Hajime Morita.
REGRESSION(r88757): [Chromium] Vertical position of media slider thumb is wrong.
https://bugs.webkit.org/show_bug.cgi?id=62685
No new tests. Covered by existing tests.
* rendering/RenderSlider.cpp:
(WebCore::RenderSlider::layout): Center the thumb position.
* rendering/RenderSlider.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (88900 => 88901)
--- trunk/Source/WebCore/ChangeLog 2011-06-15 03:27:37 UTC (rev 88900)
+++ trunk/Source/WebCore/ChangeLog 2011-06-15 03:41:24 UTC (rev 88901)
@@ -1,3 +1,16 @@
+2011-06-14 Kent Tamura <tk...@chromium.org>
+
+ Reviewed by Hajime Morita.
+
+ REGRESSION(r88757): [Chromium] Vertical position of media slider thumb is wrong.
+ https://bugs.webkit.org/show_bug.cgi?id=62685
+
+ No new tests. Covered by existing tests.
+
+ * rendering/RenderSlider.cpp:
+ (WebCore::RenderSlider::layout): Center the thumb position.
+ * rendering/RenderSlider.h:
+
2011-06-14 Gyuyoung Kim <gyuyoung....@samsung.com>
Reviewed by Kent Tamura.
Modified: trunk/Source/WebCore/rendering/RenderSlider.cpp (88900 => 88901)
--- trunk/Source/WebCore/rendering/RenderSlider.cpp 2011-06-15 03:27:37 UTC (rev 88900)
+++ trunk/Source/WebCore/rendering/RenderSlider.cpp 2011-06-15 03:41:24 UTC (rev 88901)
@@ -95,6 +95,17 @@
setPreferredLogicalWidthsDirty(false);
}
+void RenderSlider::layout()
+{
+ RenderBlock::layout();
+ RenderBox* thumbBox = sliderThumbElementOf(node())->renderBox();
+ if (!thumbBox)
+ return;
+ int heightDiff = thumbBox->height() - contentHeight();
+ if (heightDiff > 0)
+ thumbBox->setY(thumbBox->y() - (heightDiff / 2));
+}
+
bool RenderSlider::inDragMode() const
{
return sliderThumbElementOf(node())->active();
Modified: trunk/Source/WebCore/rendering/RenderSlider.h (88900 => 88901)
--- trunk/Source/WebCore/rendering/RenderSlider.h 2011-06-15 03:27:37 UTC (rev 88900)
+++ trunk/Source/WebCore/rendering/RenderSlider.h 2011-06-15 03:41:24 UTC (rev 88901)
@@ -43,6 +43,7 @@
virtual int baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const;
virtual void computePreferredLogicalWidths();
virtual bool requiresForcedStyleRecalcPropagation() const { return true; }
+ virtual void layout();
};
inline RenderSlider* toRenderSlider(RenderObject* object)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
