Diff
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderInputSpeech.cpp (112419 => 112420)
--- branches/subpixellayout/Source/WebCore/rendering/RenderInputSpeech.cpp 2012-03-28 18:32:28 UTC (rev 112419)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderInputSpeech.cpp 2012-03-28 18:37:24 UTC (rev 112420)
@@ -66,19 +66,19 @@
if (!input->renderer()->isBox())
return false;
RenderBox* inputRenderBox = toRenderBox(input->renderer());
- IntRect inputContentBox = inputRenderBox->contentBoxRect();
+ LayoutRect inputContentBox = inputRenderBox->contentBoxRect();
// Make sure the scaled button stays square and will fit in its parent's box.
- int buttonSize = std::min(inputContentBox.width(), std::min(inputContentBox.height(), rect.height()));
+ LayoutUnit buttonSize = std::min(inputContentBox.width(), std::min<LayoutUnit>(inputContentBox.height(), rect.height()));
// Calculate 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.
- IntRect buttonRect(object->offsetFromAncestorContainer(inputRenderBox).width(),
- inputContentBox.y() + (inputContentBox.height() - buttonSize + 1) / 2,
- buttonSize, buttonSize);
+ LayoutRect buttonRect(object->offsetFromAncestorContainer(inputRenderBox).width(),
+ inputContentBox.y() + (inputContentBox.height() - buttonSize + 1) / 2,
+ buttonSize, buttonSize);
// Compute an offset between the part renderer and the input renderer.
- IntSize offsetFromInputRenderer = -(object->offsetFromAncestorContainer(inputRenderBox));
+ LayoutSize offsetFromInputRenderer = -(object->offsetFromAncestorContainer(inputRenderBox));
// Move the rect into partRenderer's coords.
buttonRect.move(offsetFromInputRenderer);
// Account for the local drawing offset.
@@ -94,7 +94,7 @@
image = imageStateRecording.get();
else if (speechButton->state() == InputFieldSpeechButtonElement::Recognizing)
image = imageStateWaiting.get();
- paintInfo.context->drawImage(image, object->style()->colorSpace(), buttonRect);
+ paintInfo.context->drawImage(image, object->style()->colorSpace(), pixelSnappedIntRect(buttonRect));
return false;
}
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderThemeChromiumMac.h (112419 => 112420)
--- branches/subpixellayout/Source/WebCore/rendering/RenderThemeChromiumMac.h 2012-03-28 18:32:28 UTC (rev 112419)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderThemeChromiumMac.h 2012-03-28 18:37:24 UTC (rev 112420)
@@ -49,7 +49,7 @@
virtual bool paintMediaVolumeSliderContainer(RenderObject*, const PaintInfo&, const IntRect&);
virtual bool paintMediaVolumeSliderTrack(RenderObject*, const PaintInfo&, const IntRect&);
virtual bool paintMediaVolumeSliderThumb(RenderObject*, const PaintInfo&, const IntRect&);
- virtual LayoutPoint volumeSliderOffsetFromMuteButton(RenderBox*, const LayoutSize&) const;
+ virtual IntPoint volumeSliderOffsetFromMuteButton(RenderBox*, const IntSize&) const;
virtual bool usesMediaControlStatusDisplay() { return false; }
virtual bool hasOwnDisabledStateHandlingFor(ControlPart) const { return true; }
#endif
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderThemeChromiumMac.mm (112419 => 112420)
--- branches/subpixellayout/Source/WebCore/rendering/RenderThemeChromiumMac.mm 2012-03-28 18:32:28 UTC (rev 112419)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderThemeChromiumMac.mm 2012-03-28 18:37:24 UTC (rev 112420)
@@ -211,7 +211,7 @@
return RenderMediaControlsChromium::paintMediaControlsPart(MediaSliderThumb, object, paintInfo, rect);
}
-LayoutPoint RenderThemeChromiumMac::volumeSliderOffsetFromMuteButton(RenderBox* muteButtonBox, const LayoutSize& size) const
+IntPoint RenderThemeChromiumMac::volumeSliderOffsetFromMuteButton(RenderBox* muteButtonBox, const IntSize& size) const
{
return RenderTheme::volumeSliderOffsetFromMuteButton(muteButtonBox, size);
}
Modified: branches/subpixellayout/Source/WebKit/chromium/src/WebFrameImpl.cpp (112419 => 112420)
--- branches/subpixellayout/Source/WebKit/chromium/src/WebFrameImpl.cpp 2012-03-28 18:32:28 UTC (rev 112419)
+++ branches/subpixellayout/Source/WebKit/chromium/src/WebFrameImpl.cpp 2012-03-28 18:37:24 UTC (rev 112420)
@@ -1189,7 +1189,7 @@
IntPoint point = frame()->view()->windowToContents(webPoint);
HitTestResult result = frame()->eventHandler()->hitTestResultAtPoint(point, false);
- RefPtr<Range> range = frame()->rangeForPoint(result.point());
+ RefPtr<Range> range = frame()->rangeForPoint(result.roundedPoint());
if (!range)
return notFound;
