Title: [114946] branches/subpixellayout/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp
- Revision
- 114946
- Author
- e...@chromium.org
- Date
- 2012-04-23 14:28:28 -0700 (Mon, 23 Apr 2012)
Log Message
Fix Chromium Skia on branch.
Modified Paths
Diff
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp (114945 => 114946)
--- branches/subpixellayout/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp 2012-04-23 21:23:34 UTC (rev 114945)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp 2012-04-23 21:28:28 UTC (rev 114946)
@@ -283,7 +283,7 @@
LayoutRect inputContentBox = inputRenderBox->contentBoxRect();
// Make sure the scaled button stays square and will fit in its parent's box.
- LayoutUnit cancelButtonSize = std::min(inputContentBox.width(), std::min(inputContentBox.height(), r.height()));
+ LayoutUnit cancelButtonSize = std::min(inputContentBox.width(), std::min<LayoutUnit>(inputContentBox.height(), r.height()));
// Calculate cancel button's coordinates relative to the input element.
// Center the button vertically. Round up though, so if it has to be one pixel off-center, it will
// be one pixel closer to the bottom of the field. This tends to look better with the text.
@@ -326,7 +326,7 @@
LayoutRect inputContentBox = inputRenderBox->contentBoxRect();
// Make sure the scaled decoration stays square and will fit in its parent's box.
- LayoutUnit magnifierSize = std::min(inputContentBox.width(), std::min(inputContentBox.height(), r.height()));
+ LayoutUnit magnifierSize = std::min(inputContentBox.width(), std::min<LayoutUnit>(inputContentBox.height(), r.height()));
// Calculate decoration's coordinates relative to the input element.
// Center the decoration vertically. Round up though, so if it has to be one pixel off-center, it will
// be one pixel closer to the bottom of the field. This tends to look better with the text.
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
