Diff
Modified: trunk/Source/WebCore/ChangeLog (114314 => 114315)
--- trunk/Source/WebCore/ChangeLog 2012-04-16 23:19:29 UTC (rev 114314)
+++ trunk/Source/WebCore/ChangeLog 2012-04-16 23:24:15 UTC (rev 114315)
@@ -1,3 +1,52 @@
+2012-04-16 Levi Weintraub <le...@chromium.org>
+
+ Make borderBoxRect sub-pixel precise and add a pixel snapped version
+ https://bugs.webkit.org/show_bug.cgi?id=84063
+
+ Reviewed by Eric Seidel.
+
+ In an effort to prevent misuse, we previously decided to have borderBoxRect return a
+ pixel-snapped IntRect. This is because borderBoxRect returns a rect that's positioned
+ at (0,0), and therefore won't snap to the same size as the element it's covering.
+
+ There are a couple uses of borderBoxRect that don't pixel snap the values and require
+ sub-pixel precision. This patch adds a pixelSnappedBorderBoxRect that makes the snapping
+ explicit, and moves uses that would otherwise pixel snap the rect to this version to
+ avoid producing a rect of the incorrect size. For details about pixel snapping with
+ LayoutUnits, please see https://trac.webkit.org/wiki/LayoutUnit
+
+ No new tests. No change in behavior.
+
+ * html/shadow/TextControlInnerElements.cpp:
+ (WebCore::SpinButtonElement::defaultEventHandler):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::addVisualOverflowFromTheme):
+ * rendering/RenderBox.h:
+ (WebCore::RenderBox::borderBoxRect):
+ (WebCore::RenderBox::pixelSnappedBorderBoxRect):
+ (WebCore::RenderBox::borderBoundingBox):
+ (WebCore::RenderBox::hasVisualOverflow):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::scrollCornerRect):
+ (WebCore::RenderLayer::scrollCornerAndResizerRect):
+ (WebCore::RenderLayer::horizontalScrollbarStart):
+ (WebCore::RenderLayer::positionOverflowControls):
+ (WebCore::RenderLayer::paintResizer):
+ (WebCore::RenderLayer::hitTestOverflowControls):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateGraphicsLayerGeometry):
+ (WebCore::RenderLayerBacking::startAnimation):
+ (WebCore::RenderLayerBacking::startTransition):
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::addOverflowFromChildren):
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::paintSearchFieldCancelButton):
+ (WebCore::RenderThemeMac::paintSearchFieldResultsDecoration):
+ (WebCore::RenderThemeMac::paintSearchFieldResultsButton):
+ * rendering/svg/RenderSVGRoot.cpp:
+ (WebCore::RenderSVGRoot::paintReplaced):
+ (WebCore::RenderSVGRoot::computeFloatRectForRepaint):
+
2012-04-16 Anders Carlsson <ander...@apple.com>
Crash when running some editing related tests
Modified: trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp (114314 => 114315)
--- trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp 2012-04-16 23:19:29 UTC (rev 114314)
+++ trunk/Source/WebCore/html/shadow/TextControlInnerElements.cpp 2012-04-16 23:24:15 UTC (rev 114315)
@@ -285,7 +285,7 @@
MouseEvent* mouseEvent = static_cast<MouseEvent*>(event);
IntPoint local = roundedIntPoint(box->absoluteToLocal(mouseEvent->absoluteLocation(), false, true));
if (mouseEvent->type() == eventNames().mousedownEvent && mouseEvent->button() == LeftButton) {
- if (box->borderBoxRect().contains(local)) {
+ if (box->pixelSnappedBorderBoxRect().contains(local)) {
// The following functions of HTMLInputElement may run _javascript_
// code which detaches this shadow node. We need to take a reference
// and check renderer() after such function calls.
@@ -304,7 +304,7 @@
} else if (mouseEvent->type() == eventNames().mouseupEvent && mouseEvent->button() == LeftButton)
stopRepeatingTimer();
else if (event->type() == eventNames().mousemoveEvent) {
- if (box->borderBoxRect().contains(local)) {
+ if (box->pixelSnappedBorderBoxRect().contains(local)) {
if (!m_capturing) {
if (Frame* frame = document()->frame()) {
frame->eventHandler()->setCapturingMouseEventsNode(this);
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (114314 => 114315)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2012-04-16 23:19:29 UTC (rev 114314)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2012-04-16 23:24:15 UTC (rev 114315)
@@ -1666,7 +1666,7 @@
if (!style()->hasAppearance())
return;
- IntRect inflatedRect = borderBoxRect();
+ IntRect inflatedRect = pixelSnappedBorderBoxRect();
theme()->adjustRepaintRect(this, inflatedRect);
addVisualOverflow(inflatedRect);
}
Modified: trunk/Source/WebCore/rendering/RenderBox.h (114314 => 114315)
--- trunk/Source/WebCore/rendering/RenderBox.h 2012-04-16 23:19:29 UTC (rev 114314)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2012-04-16 23:24:15 UTC (rev 114315)
@@ -133,8 +133,9 @@
IntRect pixelSnappedFrameRect() const { return pixelSnappedIntRect(m_frameRect); }
void setFrameRect(const LayoutRect& rect) { m_frameRect = rect; }
- IntRect borderBoxRect() const { return IntRect(IntPoint(), IntSize(m_frameRect.pixelSnappedWidth(), m_frameRect.pixelSnappedHeight())); }
- virtual IntRect borderBoundingBox() const { return borderBoxRect(); }
+ LayoutRect borderBoxRect() const { return LayoutRect(LayoutPoint(), size()); }
+ IntRect pixelSnappedBorderBoxRect() const { return IntRect(IntPoint(), m_frameRect.pixelSnappedSize()); }
+ virtual IntRect borderBoundingBox() const { return pixelSnappedBorderBoxRect(); }
// The content area of the box (excludes padding - and intrinsic padding for table cells, etc... - and border).
LayoutRect contentBoxRect() const { return LayoutRect(borderLeft() + paddingLeft(), borderTop() + paddingTop(), contentWidth(), contentHeight()); }
@@ -454,7 +455,7 @@
LayoutRect layoutOverflowRectForPropagation(RenderStyle*) const;
RenderOverflow* hasRenderOverflow() const { return m_overflow.get(); }
- bool hasVisualOverflow() const { return m_overflow && !borderBoxRect().contains(pixelSnappedIntRect(m_overflow->visualOverflowRect())); }
+ bool hasVisualOverflow() const { return m_overflow && !borderBoxRect().contains(m_overflow->visualOverflowRect()); }
virtual bool needsPreferredWidthsRecalculation() const;
virtual void computeIntrinsicRatioInformation(FloatSize& /* intrinsicSize */, double& /* intrinsicRatio */, bool& /* isPercentageIntrinsicSize */) const { }
Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (114314 => 114315)
--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2012-04-16 23:19:29 UTC (rev 114314)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2012-04-16 23:24:15 UTC (rev 114315)
@@ -1994,7 +1994,7 @@
bool hasVerticalBar = verticalScrollbar();
bool hasResizer = renderer()->style()->resize() != RESIZE_NONE;
if ((hasHorizontalBar && hasVerticalBar) || (hasResizer && (hasHorizontalBar || hasVerticalBar)))
- return cornerRect(this, renderBox()->borderBoxRect());
+ return cornerRect(this, renderBox()->pixelSnappedBorderBoxRect());
return IntRect();
}
@@ -2013,7 +2013,7 @@
return IntRect();
IntRect scrollCornerAndResizer = scrollCornerRect();
if (scrollCornerAndResizer.isEmpty())
- scrollCornerAndResizer = resizerCornerRect(this, pixelSnappedIntRect(box->borderBoxRect()));
+ scrollCornerAndResizer = resizerCornerRect(this, box->pixelSnappedBorderBoxRect());
return scrollCornerAndResizer;
}
@@ -2115,7 +2115,7 @@
const RenderBox* box = renderBox();
int x = minX + box->borderLeft();
if (renderer()->style()->shouldPlaceBlockDirectionScrollbarOnLogicalLeft())
- x += m_vBar ? m_vBar->width() : resizerCornerRect(this, box->borderBoxRect()).width();
+ x += m_vBar ? m_vBar->width() : resizerCornerRect(this, box->pixelSnappedBorderBoxRect()).width();
return x;
}
@@ -2318,7 +2318,7 @@
if (!box)
return;
- const IntRect borderBox = box->borderBoxRect();
+ const IntRect borderBox = box->pixelSnappedBorderBoxRect();
const IntRect& scrollCorner = scrollCornerRect();
IntRect absBounds(borderBox.location() + offsetFromLayer, borderBox.size());
if (m_vBar)
@@ -2657,7 +2657,7 @@
RenderBox* box = renderBox();
ASSERT(box);
- IntRect absRect = resizerCornerRect(this, box->borderBoxRect());
+ IntRect absRect = resizerCornerRect(this, box->pixelSnappedBorderBoxRect());
absRect.moveBy(paintOffset);
if (!absRect.intersects(damageRect))
return;
@@ -2712,7 +2712,7 @@
IntRect resizeControlRect;
if (renderer()->style()->resize() != RESIZE_NONE) {
- resizeControlRect = resizerCornerRect(this, box->borderBoxRect());
+ resizeControlRect = resizerCornerRect(this, box->pixelSnappedBorderBoxRect());
if (resizeControlRect.contains(localPoint))
return true;
}
Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (114314 => 114315)
--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2012-04-16 23:19:29 UTC (rev 114314)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2012-04-16 23:24:15 UTC (rev 114315)
@@ -503,7 +503,7 @@
}
if (m_owningLayer->hasTransform()) {
- const IntRect borderBox = toRenderBox(renderer())->borderBoxRect();
+ const IntRect borderBox = toRenderBox(renderer())->pixelSnappedBorderBoxRect();
// Get layout bounds in the coords of compAncestor to match relativeCompositingBounds.
IntRect layerBounds = IntRect(delta, borderBox.size());
@@ -1296,7 +1296,7 @@
bool didAnimateFilter = false;
#endif
- if (hasTransform && m_graphicsLayer->addAnimation(transformVector, toRenderBox(renderer())->borderBoxRect().size(), anim, keyframes.animationName(), timeOffset)) {
+ if (hasTransform && m_graphicsLayer->addAnimation(transformVector, toRenderBox(renderer())->pixelSnappedBorderBoxRect().size(), anim, keyframes.animationName(), timeOffset)) {
didAnimateTransform = true;
compositor()->didStartAcceleratedAnimation(CSSPropertyWebkitTransform);
}
@@ -1361,7 +1361,7 @@
KeyframeValueList transformVector(AnimatedPropertyWebkitTransform);
transformVector.insert(new TransformAnimationValue(0, &fromStyle->transform()));
transformVector.insert(new TransformAnimationValue(1, &toStyle->transform()));
- if (m_graphicsLayer->addAnimation(transformVector, toRenderBox(renderer())->borderBoxRect().size(), transformAnim, GraphicsLayer::animationNameForTransition(AnimatedPropertyWebkitTransform), timeOffset)) {
+ if (m_graphicsLayer->addAnimation(transformVector, toRenderBox(renderer())->pixelSnappedBorderBoxRect().size(), transformAnim, GraphicsLayer::animationNameForTransition(AnimatedPropertyWebkitTransform), timeOffset)) {
// To ensure that the correct transform is visible when the animation ends, also set the final transform.
updateLayerTransform(toStyle);
didAnimateTransform = true;
Modified: trunk/Source/WebCore/rendering/RenderTable.cpp (114314 => 114315)
--- trunk/Source/WebCore/rendering/RenderTable.cpp 2012-04-16 23:19:29 UTC (rev 114314)
+++ trunk/Source/WebCore/rendering/RenderTable.cpp 2012-04-16 23:24:15 UTC (rev 114315)
@@ -509,7 +509,7 @@
int bottomBorderOverflow = height() + outerBorderBottom() - borderBottom();
int topBorderOverflow = borderTop() - outerBorderTop();
IntRect borderOverflowRect(leftBorderOverflow, topBorderOverflow, rightBorderOverflow - leftBorderOverflow, bottomBorderOverflow - topBorderOverflow);
- if (borderOverflowRect != borderBoxRect()) {
+ if (borderOverflowRect != pixelSnappedBorderBoxRect()) {
addLayoutOverflow(borderOverflowRect);
addVisualOverflow(borderOverflowRect);
}
Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (114314 => 114315)
--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2012-04-16 23:19:29 UTC (rev 114314)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2012-04-16 23:24:15 UTC (rev 114315)
@@ -1534,7 +1534,7 @@
float zoomLevel = o->style()->effectiveZoom();
- FloatRect localBounds = [search cancelButtonRectForBounds:NSRect(input->renderBox()->borderBoxRect())];
+ FloatRect localBounds = [search cancelButtonRectForBounds:NSRect(input->renderBox()->pixelSnappedBorderBoxRect())];
#if ENABLE(INPUT_SPEECH)
// Take care of cases where the cancel button was not aligned with the right border of the input element (for e.g.
@@ -1619,7 +1619,7 @@
updateActiveState([search searchButtonCell], o);
- FloatRect localBounds = [search searchButtonRectForBounds:NSRect(input->renderBox()->borderBoxRect())];
+ FloatRect localBounds = [search searchButtonRectForBounds:NSRect(input->renderBox()->pixelSnappedBorderBoxRect())];
localBounds = convertToPaintingRect(input->renderer(), o, localBounds, r);
[[search searchButtonCell] drawWithFrame:localBounds inView:documentViewFor(o)];
@@ -1655,7 +1655,7 @@
GraphicsContextStateSaver stateSaver(*paintInfo.context);
float zoomLevel = o->style()->effectiveZoom();
- FloatRect localBounds = [search searchButtonRectForBounds:NSRect(input->renderBox()->borderBoxRect())];
+ FloatRect localBounds = [search searchButtonRectForBounds:NSRect(input->renderBox()->pixelSnappedBorderBoxRect())];
localBounds = convertToPaintingRect(input->renderer(), o, localBounds, r);
IntRect unzoomedRect(localBounds);
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp (114314 => 114315)
--- trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2012-04-16 23:19:29 UTC (rev 114314)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2012-04-16 23:24:15 UTC (rev 114315)
@@ -256,7 +256,7 @@
void RenderSVGRoot::paintReplaced(PaintInfo& paintInfo, const LayoutPoint& adjustedPaintOffset)
{
// An empty viewport disables rendering.
- if (borderBoxRect().isEmpty())
+ if (pixelSnappedBorderBoxRect().isEmpty())
return;
// Don't paint, if the context explicitely disabled it.
@@ -368,7 +368,7 @@
repaintRect = m_localToBorderBoxTransform.mapRect(repaintRect);
// Apply initial viewport clip - not affected by overflow settings
- repaintRect.intersect(borderBoxRect());
+ repaintRect.intersect(pixelSnappedBorderBoxRect());
const SVGRenderStyle* svgStyle = style()->svgStyle();
if (const ShadowData* shadow = svgStyle->shadow())
