Diff
Modified: branches/subpixellayout/Source/WebCore/html/shadow/CalendarPickerElement.cpp (113759 => 113760)
--- branches/subpixellayout/Source/WebCore/html/shadow/CalendarPickerElement.cpp 2012-04-10 20:32:16 UTC (rev 113759)
+++ branches/subpixellayout/Source/WebCore/html/shadow/CalendarPickerElement.cpp 2012-04-10 20:34:29 UTC (rev 113760)
@@ -102,7 +102,7 @@
return;
if (!document()->view())
return;
- IntRect elementRectInRootView = document()->view()->contentsToRootView(hostInput()->getRect());
+ IntRect elementRectInRootView = document()->view()->contentsToRootView(hostInput()->getPixelSnappedRect());
m_popup = chrome->client()->openPagePopup(this, elementRectInRootView);
}
Modified: branches/subpixellayout/Source/WebCore/platform/Length.h (113759 => 113760)
--- branches/subpixellayout/Source/WebCore/platform/Length.h 2012-04-10 20:32:16 UTC (rev 113759)
+++ branches/subpixellayout/Source/WebCore/platform/Length.h 2012-04-10 20:34:29 UTC (rev 113760)
@@ -55,7 +55,7 @@
: m_intValue(v), m_quirk(q), m_type(t), m_isFloat(false)
{
}
-
+
Length(FractionalLayoutUnit v, LengthType t, bool q = false)
: m_floatValue(v.toFloat()), m_quirk(q), m_type(t), m_isFloat(true)
{
Modified: branches/subpixellayout/Source/WebCore/platform/win/PlatformScreenWin.cpp (113759 => 113760)
--- branches/subpixellayout/Source/WebCore/platform/win/PlatformScreenWin.cpp 2012-04-10 20:32:16 UTC (rev 113759)
+++ branches/subpixellayout/Source/WebCore/platform/win/PlatformScreenWin.cpp 2012-04-10 20:34:29 UTC (rev 113760)
@@ -109,13 +109,13 @@
FloatRect screenRect(Widget* widget)
{
MONITORINFOEX monitorInfo = monitorInfoForWidget(widget);
- return static_cast<IntRect>(monitorInfo.rcMonitor);
+ return monitorInfo.rcMonitor;
}
FloatRect screenAvailableRect(Widget* widget)
{
MONITORINFOEX monitorInfo = monitorInfoForWidget(widget);
- return static_cast<IntRect>(monitorInfo.rcWork);
+ return monitorInfo.rcWork;
}
} // namespace WebCore
Modified: branches/subpixellayout/Source/WebCore/platform/win/PopupMenuWin.cpp (113759 => 113760)
--- branches/subpixellayout/Source/WebCore/platform/win/PopupMenuWin.cpp 2012-04-10 20:32:16 UTC (rev 113759)
+++ branches/subpixellayout/Source/WebCore/platform/win/PopupMenuWin.cpp 2012-04-10 20:34:29 UTC (rev 113760)
@@ -341,7 +341,7 @@
popupWidth += ScrollbarTheme::theme()->scrollbarThickness(SmallScrollbar);
// Add padding to align the popup text with the <select> text
- popupWidth += max(0, client()->clientPaddingRight() - client()->clientInsetRight()) + max(0, client()->clientPaddingLeft() - client()->clientInsetLeft());
+ popupWidth += max<int>(0, client()->clientPaddingRight() - client()->clientInsetRight()) + max<int>(0, client()->clientPaddingLeft() - client()->clientInsetLeft());
// Leave room for the border
popupWidth += 2 * popupWindowBorderWidth;
@@ -1026,7 +1026,7 @@
case WM_PAINT: {
PAINTSTRUCT paintInfo;
::BeginPaint(popupHandle(), &paintInfo);
- paint(static_cast<IntRect>(paintInfo.rcPaint), paintInfo.hdc);
+ paint(paintInfo.rcPaint, paintInfo.hdc);
::EndPaint(popupHandle(), &paintInfo);
lResult = 0;
break;
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderObject.cpp (113759 => 113760)
--- branches/subpixellayout/Source/WebCore/rendering/RenderObject.cpp 2012-04-10 20:32:16 UTC (rev 113759)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderObject.cpp 2012-04-10 20:34:29 UTC (rev 113760)
@@ -1759,7 +1759,7 @@
// We need to ensure that view->maximalOutlineSize() is valid for any repaints that happen
// during styleDidChange (it's used by clippedOverflowRectForRepaint()).
- if (m_style->outlineWidth() > 0 && m_style->outlineSize() > maximalOutlineSize(PaintPhaseOutline))
+ if (m_style->outlineWidth() > 0 && static_cast<int>(m_style->outlineSize()) > maximalOutlineSize(PaintPhaseOutline))
toRenderView(document()->renderer())->setMaximalOutlineSize(m_style->outlineSize());
styleDidChange(diff, oldStyle.get());
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp (113759 => 113760)
--- branches/subpixellayout/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp 2012-04-10 20:32:16 UTC (rev 113759)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderThemeChromiumSkia.cpp 2012-04-10 20:34:29 UTC (rev 113760)
@@ -264,7 +264,7 @@
IntRect RenderThemeChromiumSkia::convertToPaintingRect(RenderObject* inputRenderer, const RenderObject* partRenderer, IntRect partRect, const IntRect& localOffset) const
{
// Compute an offset between the part renderer and the input renderer.
- IntSize offsetFromInputRenderer = -(partRenderer->offsetFromAncestorContainer(inputRenderer));
+ IntSize offsetFromInputRenderer = -expandedIntSize(partRenderer->offsetFromAncestorContainer(inputRenderer));
// Move the rect into partRenderer's coords.
partRect.move(offsetFromInputRenderer);
// Account for the local drawing offset.
@@ -280,7 +280,7 @@
if (!input->renderer()->isBox())
return false;
RenderBox* inputRenderBox = toRenderBox(input->renderer());
- IntRect inputContentBox = inputRenderBox->contentBoxRect();
+ IntRect inputContentBox = pixelSnappedIntRect(inputRenderBox->contentBoxRect());
// Make sure the scaled button stays square and will fit in its parent's box.
int cancelButtonSize = std::min(inputContentBox.width(), std::min<int>(inputContentBox.height(), r.height()));
@@ -323,7 +323,7 @@
if (!input->renderer()->isBox())
return false;
RenderBox* inputRenderBox = toRenderBox(input->renderer());
- IntRect inputContentBox = inputRenderBox->contentBoxRect();
+ IntRect inputContentBox = pixelSnappedIntRect(inputRenderBox->contentBoxRect());
// Make sure the scaled decoration stays square and will fit in its parent's box.
int magnifierSize = std::min(inputContentBox.width(), std::min<int>(inputContentBox.height(), r.height()));
@@ -358,7 +358,7 @@
if (!input->renderer()->isBox())
return false;
RenderBox* inputRenderBox = toRenderBox(input->renderer());
- IntRect inputContentBox = inputRenderBox->contentBoxRect();
+ IntRect inputContentBox = pixelSnappedIntRect(inputRenderBox->contentBoxRect());
// Make sure the scaled decoration will fit in its parent's box.
int magnifierHeight = std::min<int>(inputContentBox.height(), r.height());
