Title: [154311] trunk/Source/WebCore
- Revision
- 154311
- Author
- [email protected]
- Date
- 2013-08-19 21:49:37 -0700 (Mon, 19 Aug 2013)
Log Message
<https://webkit.org/b/120041> Remove superfluous min calls in RenderBlock::computeOverflow
Reviewed by Simon Fraser.
Merge https://chromium.googlesource.com/chromium/blink/+/29cad35d6b4642804e6b7c1a30f0b4435dd7a71d
They are contained in an "if" statement that ensures that textIndent < 0 and so the min will never be 0.
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::computeOverflow):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (154310 => 154311)
--- trunk/Source/WebCore/ChangeLog 2013-08-20 01:31:23 UTC (rev 154310)
+++ trunk/Source/WebCore/ChangeLog 2013-08-20 04:49:37 UTC (rev 154311)
@@ -1,5 +1,18 @@
2013-08-19 Ryosuke Niwa <[email protected]>
+ <https://webkit.org/b/120041> Remove superfluous min calls in RenderBlock::computeOverflow
+
+ Reviewed by Simon Fraser.
+
+ Merge https://chromium.googlesource.com/chromium/blink/+/29cad35d6b4642804e6b7c1a30f0b4435dd7a71d
+
+ They are contained in an "if" statement that ensures that textIndent < 0 and so the min will never be 0.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::computeOverflow):
+
+2013-08-19 Ryosuke Niwa <[email protected]>
+
<https://webkit.org/b/119930> input[type=range]: Fix a crash by changing input type in 'input' event handler
Reviewed by Kent Tamura.
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (154310 => 154311)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2013-08-20 01:31:23 UTC (rev 154310)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2013-08-20 04:49:37 UTC (rev 154311)
@@ -1819,7 +1819,7 @@
LayoutUnit textIndent = textIndentOffset();
if (textIndent < 0) {
LayoutRect clientRect(clientBoxRect());
- LayoutRect rectToApply = LayoutRect(clientRect.x() + min<LayoutUnit>(0, textIndent), clientRect.y(), clientRect.width() - min<LayoutUnit>(0, textIndent), clientRect.height());
+ LayoutRect rectToApply = LayoutRect(clientRect.x() + textIndent, clientRect.y(), clientRect.width() - min<LayoutUnit>(0, textIndent), clientRect.height());
addVisualOverflow(rectToApply);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
