Title: [114767] branches/subpixellayout/Source/WebCore
- Revision
- 114767
- Author
- e...@chromium.org
- Date
- 2012-04-20 11:46:15 -0700 (Fri, 20 Apr 2012)
Log Message
Misc platform fixes on branch.
Modified Paths
Diff
Modified: branches/subpixellayout/Source/WebCore/platform/win/PopupMenuWin.cpp (114766 => 114767)
--- branches/subpixellayout/Source/WebCore/platform/win/PopupMenuWin.cpp 2012-04-20 18:41:15 UTC (rev 114766)
+++ branches/subpixellayout/Source/WebCore/platform/win/PopupMenuWin.cpp 2012-04-20 18:46:15 UTC (rev 114767)
@@ -655,7 +655,7 @@
if (itemStyle.isVisible()) {
int textX = max<int>(0, client()->clientPaddingLeft() - client()->clientInsetLeft());
if (RenderTheme::defaultTheme()->popupOptionSupportsTextIndent() && itemStyle.textDirection() == LTR)
- textX += minimumValueForLength(itemStyle.textIndent(), itemRect.width());
+ textX += static_cast<int>(minimumValueForLength(itemStyle.textIndent(), itemRect.width()));
int textY = itemRect.y() + itemFont.fontMetrics().ascent() + (itemRect.height() - itemFont.fontMetrics().height()) / 2;
context.drawBidiText(itemFont, textRun, IntPoint(textX, textY));
}
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp (114766 => 114767)
--- branches/subpixellayout/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp 2012-04-20 18:41:15 UTC (rev 114766)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp 2012-04-20 18:46:15 UTC (rev 114767)
@@ -361,7 +361,7 @@
LayoutRect inputContentBox = inputRenderBox->contentBoxRect();
// Make sure the scaled decoration will fit in its parent's box.
- LayoutUnit magnifierHeight = std::min(inputContentBox.height(), r.height());
+ LayoutUnit magnifierHeight = std::min<LayoutUnit>(inputContentBox.height(), r.height());
LayoutUnit magnifierWidth = std::min<LayoutUnit>(inputContentBox.width(), magnifierHeight * defaultSearchFieldResultsButtonWidth / defaultSearchFieldResultsDecorationSize);
LayoutRect magnifierRect(magnifierObject->offsetFromAncestorContainer(inputRenderBox).width(),
inputContentBox.y() + (inputContentBox.height() - magnifierHeight + 1) / 2,
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
