<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[188433] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/188433">188433</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-08-13 21:34:31 -0700 (Thu, 13 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove pixelSnapped* functions from RenderBoxModelObject/RenderBox.
https://bugs.webkit.org/show_bug.cgi?id=147982
Reviewed by Simon Fraser.
RenderBoxModelObject/RenderBox::pixelSnapped* functions are misleading.
They all round to integral values, while the rest of the pixel snapping
functions round to device pixels.
This patch moves integral rounding to the callers. (Note that they all will eventually
go away as we convert additional modules to subpixel rendering (tables, scrolling etc).)
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
* dom/Element.cpp:
(WebCore::Element::offsetLeft):
(WebCore::Element::offsetTop):
(WebCore::Element::offsetWidth):
(WebCore::Element::offsetHeight):
(WebCore::Element::clientWidth):
(WebCore::Element::clientHeight):
* dom/Position.cpp:
(WebCore::Position::hasRenderedNonAnonymousDescendantsWithHeight):
* html/HTMLImageElement.cpp:
(WebCore::HTMLImageElement::width):
(WebCore::HTMLImageElement::height):
* html/shadow/SpinButtonElement.cpp:
(WebCore::SpinButtonElement::defaultEventHandler):
* inspector/InspectorOverlay.cpp:
(WebCore::buildObjectForElementData):
* page/FrameView.cpp:
(WebCore::FrameView::applyPaginationToViewport):
(WebCore::FrameView::calculateScrollbarModesForLayout):
(WebCore::FrameView::calculateExtendedBackgroundMode):
(WebCore::FrameView::qualifiesAsVisuallyNonEmpty):
* page/PrintContext.cpp:
(WebCore::PrintContext::pageNumberForElement):
* platform/graphics/LayoutRect.h:
(WebCore::LayoutRect::pixelSnappedSize): Deleted.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
(WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerLayer):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::pixelSnappedClientWidth): Deleted.
(WebCore::RenderBox::pixelSnappedClientHeight): Deleted.
(WebCore::RenderBox::pixelSnappedOffsetWidth): Deleted.
(WebCore::RenderBox::pixelSnappedOffsetHeight): Deleted.
* rendering/RenderBox.h:
(WebCore::RenderBox::pixelSnappedLogicalHeight): Deleted.
(WebCore::RenderBox::pixelSnappedLogicalWidth): Deleted.
(WebCore::RenderBox::pixelSnappedSize): Deleted.
(WebCore::RenderBox::pixelSnappedBorderBoxRect): Deleted.
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::pixelSnappedOffsetWidth): Deleted.
(WebCore::RenderBoxModelObject::pixelSnappedOffsetHeight): Deleted.
* rendering/RenderBoxModelObject.h:
(WebCore::RenderBoxModelObject::pixelSnappedOffsetLeft): Deleted.
(WebCore::RenderBoxModelObject::pixelSnappedOffsetTop): Deleted.
* rendering/RenderFileUploadControl.cpp:
(WebCore::nodeWidth):
(WebCore::nodeHeight):
(WebCore::RenderFileUploadControl::maxFilenameWidth):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::updateLayerPosition):
(WebCore::RenderLayer::perspectiveTransform):
(WebCore::RenderLayer::clampScrollOffset):
(WebCore::RenderLayer::visibleSize):
(WebCore::RenderLayer::positionOverflowControls):
(WebCore::RenderLayer::hasHorizontalOverflow):
(WebCore::RenderLayer::hasVerticalOverflow):
(WebCore::RenderLayer::updateScrollbarsAfterLayout):
(WebCore::RenderLayer::overflowControlsIntersectRect):
(WebCore::RenderLayer::isPointInResizeControl):
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateGeometry):
(WebCore::RenderLayerBacking::positionOverflowControlsLayers):
(WebCore::RenderLayerBacking::startAnimation):
(WebCore::RenderLayerBacking::startTransition):
* rendering/RenderLayerBacking.h:
* rendering/RenderListBox.cpp:
(WebCore::RenderListBox::scrollWidth):
(WebCore::RenderListBox::scrollHeight):
* rendering/RenderMediaControlElements.cpp:
(WebCore::RenderMediaVolumeSliderContainer::layout):
* rendering/RenderScrollbar.cpp:
(WebCore::RenderScrollbar::buttonRect):
* rendering/RenderTable.cpp:
(WebCore::RenderTable::addOverflowFromChildren):
* rendering/RenderTableCell.cpp:
(WebCore::RenderTableCell::computeIntrinsicPadding):
(WebCore::RenderTableCell::paintCollapsedBorders):
(WebCore::RenderTableCell::paintBackgroundsBehindCell):
(WebCore::RenderTableCell::paintBoxDecorations):
(WebCore::RenderTableCell::paintMask):
* rendering/RenderTableCell.h:
(WebCore::RenderTableCell::logicalHeightForRowSizing):
* rendering/RenderTheme.cpp:
(WebCore::RenderTheme::volumeSliderOffsetFromMuteButton):
* rendering/RenderTheme.h:
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::paintSearchFieldCancelButton):
(WebCore::RenderThemeMac::paintSearchFieldResultsDecorationPart):
(WebCore::RenderThemeMac::paintSearchFieldResultsButton):
* rendering/RenderTreeAsText.cpp:
(WebCore::write):
* rendering/mathml/RenderMathMLFraction.cpp:
(WebCore::RenderMathMLFraction::paint):
* rendering/mathml/RenderMathMLRoot.cpp:
(WebCore::RenderMathMLRoot::paint):
* rendering/svg/RenderSVGRoot.cpp:
(WebCore::RenderSVGRoot::paintReplaced):
(WebCore::RenderSVGRoot::computeFloatRectForRepaint):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityatkWebKitAccessibleInterfaceImagecpp">trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomPositioncpp">trunk/Source/WebCore/dom/Position.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLImageElementcpp">trunk/Source/WebCore/html/HTMLImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlshadowSpinButtonElementcpp">trunk/Source/WebCore/html/shadow/SpinButtonElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlaycpp">trunk/Source/WebCore/inspector/InspectorOverlay.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePrintContextcpp">trunk/Source/WebCore/page/PrintContext.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsLayoutRecth">trunk/Source/WebCore/platform/graphics/LayoutRect.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxh">trunk/Source/WebCore/rendering/RenderBox.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjecth">trunk/Source/WebCore/rendering/RenderBoxModelObject.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFileUploadControlcpp">trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerBackingh">trunk/Source/WebCore/rendering/RenderLayerBacking.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListBoxcpp">trunk/Source/WebCore/rendering/RenderListBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMediaControlElementscpp">trunk/Source/WebCore/rendering/RenderMediaControlElements.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderScrollbarcpp">trunk/Source/WebCore/rendering/RenderScrollbar.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTablecpp">trunk/Source/WebCore/rendering/RenderTable.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableCellcpp">trunk/Source/WebCore/rendering/RenderTableCell.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableCellh">trunk/Source/WebCore/rendering/RenderTableCell.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemecpp">trunk/Source/WebCore/rendering/RenderTheme.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeh">trunk/Source/WebCore/rendering/RenderTheme.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderThemeMacmm">trunk/Source/WebCore/rendering/RenderThemeMac.mm</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTreeAsTextcpp">trunk/Source/WebCore/rendering/RenderTreeAsText.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLFractioncpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingmathmlRenderMathMLRootcpp">trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGRootcpp">trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/ChangeLog 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -1,3 +1,116 @@
</span><ins>+2015-08-13 Zalan Bujtas <zalan@apple.com>
+
+ Remove pixelSnapped* functions from RenderBoxModelObject/RenderBox.
+ https://bugs.webkit.org/show_bug.cgi?id=147982
+
+ Reviewed by Simon Fraser.
+
+ RenderBoxModelObject/RenderBox::pixelSnapped* functions are misleading.
+ They all round to integral values, while the rest of the pixel snapping
+ functions round to device pixels.
+ This patch moves integral rounding to the callers. (Note that they all will eventually
+ go away as we convert additional modules to subpixel rendering (tables, scrolling etc).)
+
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
+ * dom/Element.cpp:
+ (WebCore::Element::offsetLeft):
+ (WebCore::Element::offsetTop):
+ (WebCore::Element::offsetWidth):
+ (WebCore::Element::offsetHeight):
+ (WebCore::Element::clientWidth):
+ (WebCore::Element::clientHeight):
+ * dom/Position.cpp:
+ (WebCore::Position::hasRenderedNonAnonymousDescendantsWithHeight):
+ * html/HTMLImageElement.cpp:
+ (WebCore::HTMLImageElement::width):
+ (WebCore::HTMLImageElement::height):
+ * html/shadow/SpinButtonElement.cpp:
+ (WebCore::SpinButtonElement::defaultEventHandler):
+ * inspector/InspectorOverlay.cpp:
+ (WebCore::buildObjectForElementData):
+ * page/FrameView.cpp:
+ (WebCore::FrameView::applyPaginationToViewport):
+ (WebCore::FrameView::calculateScrollbarModesForLayout):
+ (WebCore::FrameView::calculateExtendedBackgroundMode):
+ (WebCore::FrameView::qualifiesAsVisuallyNonEmpty):
+ * page/PrintContext.cpp:
+ (WebCore::PrintContext::pageNumberForElement):
+ * platform/graphics/LayoutRect.h:
+ (WebCore::LayoutRect::pixelSnappedSize): Deleted.
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayerLayer):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::pixelSnappedClientWidth): Deleted.
+ (WebCore::RenderBox::pixelSnappedClientHeight): Deleted.
+ (WebCore::RenderBox::pixelSnappedOffsetWidth): Deleted.
+ (WebCore::RenderBox::pixelSnappedOffsetHeight): Deleted.
+ * rendering/RenderBox.h:
+ (WebCore::RenderBox::pixelSnappedLogicalHeight): Deleted.
+ (WebCore::RenderBox::pixelSnappedLogicalWidth): Deleted.
+ (WebCore::RenderBox::pixelSnappedSize): Deleted.
+ (WebCore::RenderBox::pixelSnappedBorderBoxRect): Deleted.
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::pixelSnappedOffsetWidth): Deleted.
+ (WebCore::RenderBoxModelObject::pixelSnappedOffsetHeight): Deleted.
+ * rendering/RenderBoxModelObject.h:
+ (WebCore::RenderBoxModelObject::pixelSnappedOffsetLeft): Deleted.
+ (WebCore::RenderBoxModelObject::pixelSnappedOffsetTop): Deleted.
+ * rendering/RenderFileUploadControl.cpp:
+ (WebCore::nodeWidth):
+ (WebCore::nodeHeight):
+ (WebCore::RenderFileUploadControl::maxFilenameWidth):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::updateLayerPosition):
+ (WebCore::RenderLayer::perspectiveTransform):
+ (WebCore::RenderLayer::clampScrollOffset):
+ (WebCore::RenderLayer::visibleSize):
+ (WebCore::RenderLayer::positionOverflowControls):
+ (WebCore::RenderLayer::hasHorizontalOverflow):
+ (WebCore::RenderLayer::hasVerticalOverflow):
+ (WebCore::RenderLayer::updateScrollbarsAfterLayout):
+ (WebCore::RenderLayer::overflowControlsIntersectRect):
+ (WebCore::RenderLayer::isPointInResizeControl):
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateGeometry):
+ (WebCore::RenderLayerBacking::positionOverflowControlsLayers):
+ (WebCore::RenderLayerBacking::startAnimation):
+ (WebCore::RenderLayerBacking::startTransition):
+ * rendering/RenderLayerBacking.h:
+ * rendering/RenderListBox.cpp:
+ (WebCore::RenderListBox::scrollWidth):
+ (WebCore::RenderListBox::scrollHeight):
+ * rendering/RenderMediaControlElements.cpp:
+ (WebCore::RenderMediaVolumeSliderContainer::layout):
+ * rendering/RenderScrollbar.cpp:
+ (WebCore::RenderScrollbar::buttonRect):
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::addOverflowFromChildren):
+ * rendering/RenderTableCell.cpp:
+ (WebCore::RenderTableCell::computeIntrinsicPadding):
+ (WebCore::RenderTableCell::paintCollapsedBorders):
+ (WebCore::RenderTableCell::paintBackgroundsBehindCell):
+ (WebCore::RenderTableCell::paintBoxDecorations):
+ (WebCore::RenderTableCell::paintMask):
+ * rendering/RenderTableCell.h:
+ (WebCore::RenderTableCell::logicalHeightForRowSizing):
+ * rendering/RenderTheme.cpp:
+ (WebCore::RenderTheme::volumeSliderOffsetFromMuteButton):
+ * rendering/RenderTheme.h:
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::paintSearchFieldCancelButton):
+ (WebCore::RenderThemeMac::paintSearchFieldResultsDecorationPart):
+ (WebCore::RenderThemeMac::paintSearchFieldResultsButton):
+ * rendering/RenderTreeAsText.cpp:
+ (WebCore::write):
+ * rendering/mathml/RenderMathMLFraction.cpp:
+ (WebCore::RenderMathMLFraction::paint):
+ * rendering/mathml/RenderMathMLRoot.cpp:
+ (WebCore::RenderMathMLRoot::paint):
+ * rendering/svg/RenderSVGRoot.cpp:
+ (WebCore::RenderSVGRoot::paintReplaced):
+ (WebCore::RenderSVGRoot::computeFloatRectForRepaint):
+
</ins><span class="cx"> 2015-08-13 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Minor GraphicsLayer.h/PlatformCALayer.h cleanup
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityatkWebKitAccessibleInterfaceImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceImage.cpp (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceImage.cpp 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessibleInterfaceImage.cpp 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> g_return_if_fail(ATK_IMAGE(image));
</span><span class="cx"> returnIfWebKitAccessibleIsInvalid(WEBKIT_ACCESSIBLE(image));
</span><span class="cx">
</span><del>- IntSize size = core(image)->elementRect().pixelSnappedSize();
</del><ins>+ IntSize size = snappedIntRect(core(image)->elementRect()).size();
</ins><span class="cx">
</span><span class="cx"> if (width)
</span><span class="cx"> *width = size.width();
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -2578,7 +2578,7 @@
</span><span class="cx"> return [NSNumber numberWithBool: m_object->isEnabled()];
</span><span class="cx">
</span><span class="cx"> if ([attributeName isEqualToString: NSAccessibilitySizeAttribute]) {
</span><del>- IntSize s = m_object->elementRect().pixelSnappedSize();
</del><ins>+ IntSize s = snappedIntRect(m_object->elementRect()).size();
</ins><span class="cx"> return [NSValue valueWithSize: NSMakeSize(s.width(), s.height())];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/dom/Element.cpp 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -714,7 +714,7 @@
</span><span class="cx"> {
</span><span class="cx"> document().updateLayoutIgnorePendingStylesheets();
</span><span class="cx"> if (RenderBoxModelObject* renderer = renderBoxModelObject()) {
</span><del>- LayoutUnit offsetLeft = subpixelMetricsEnabled(renderer->document()) ? renderer->offsetLeft() : LayoutUnit(renderer->pixelSnappedOffsetLeft());
</del><ins>+ LayoutUnit offsetLeft = subpixelMetricsEnabled(renderer->document()) ? renderer->offsetLeft() : LayoutUnit(roundToInt(renderer->offsetLeft()));
</ins><span class="cx"> double zoomFactor = 1;
</span><span class="cx"> double offsetLeftAdjustedWithZoom = adjustForLocalZoom(offsetLeft, *renderer, zoomFactor);
</span><span class="cx"> return convertToNonSubpixelValueIfNeeded(offsetLeftAdjustedWithZoom, renderer->document(), zoomFactor == 1 ? Floor : Round);
</span><span class="lines">@@ -726,7 +726,7 @@
</span><span class="cx"> {
</span><span class="cx"> document().updateLayoutIgnorePendingStylesheets();
</span><span class="cx"> if (RenderBoxModelObject* renderer = renderBoxModelObject()) {
</span><del>- LayoutUnit offsetTop = subpixelMetricsEnabled(renderer->document()) ? renderer->offsetTop() : LayoutUnit(renderer->pixelSnappedOffsetTop());
</del><ins>+ LayoutUnit offsetTop = subpixelMetricsEnabled(renderer->document()) ? renderer->offsetTop() : LayoutUnit(roundToInt(renderer->offsetTop()));
</ins><span class="cx"> double zoomFactor = 1;
</span><span class="cx"> double offsetTopAdjustedWithZoom = adjustForLocalZoom(offsetTop, *renderer, zoomFactor);
</span><span class="cx"> return convertToNonSubpixelValueIfNeeded(offsetTopAdjustedWithZoom, renderer->document(), zoomFactor == 1 ? Floor : Round);
</span><span class="lines">@@ -738,7 +738,7 @@
</span><span class="cx"> {
</span><span class="cx"> document().updateLayoutIfDimensionsOutOfDate(*this, WidthDimensionsCheck);
</span><span class="cx"> if (RenderBoxModelObject* renderer = renderBoxModelObject()) {
</span><del>- LayoutUnit offsetWidth = subpixelMetricsEnabled(renderer->document()) ? renderer->offsetWidth() : LayoutUnit(renderer->pixelSnappedOffsetWidth());
</del><ins>+ LayoutUnit offsetWidth = subpixelMetricsEnabled(renderer->document()) ? renderer->offsetWidth() : LayoutUnit(roundToInt(renderer->offsetWidth()));
</ins><span class="cx"> return convertToNonSubpixelValueIfNeeded(adjustLayoutUnitForAbsoluteZoom(offsetWidth, *renderer).toDouble(), renderer->document());
</span><span class="cx"> }
</span><span class="cx"> return 0;
</span><span class="lines">@@ -748,7 +748,7 @@
</span><span class="cx"> {
</span><span class="cx"> document().updateLayoutIfDimensionsOutOfDate(*this, HeightDimensionsCheck);
</span><span class="cx"> if (RenderBoxModelObject* renderer = renderBoxModelObject()) {
</span><del>- LayoutUnit offsetHeight = subpixelMetricsEnabled(renderer->document()) ? renderer->offsetHeight() : LayoutUnit(renderer->pixelSnappedOffsetHeight());
</del><ins>+ LayoutUnit offsetHeight = subpixelMetricsEnabled(renderer->document()) ? renderer->offsetHeight() : LayoutUnit(roundToInt(renderer->offsetHeight()));
</ins><span class="cx"> return convertToNonSubpixelValueIfNeeded(adjustLayoutUnitForAbsoluteZoom(offsetHeight, *renderer).toDouble(), renderer->document());
</span><span class="cx"> }
</span><span class="cx"> return 0;
</span><span class="lines">@@ -811,7 +811,7 @@
</span><span class="cx"> return adjustForAbsoluteZoom(renderView.frameView().layoutWidth(), renderView);
</span><span class="cx">
</span><span class="cx"> if (RenderBox* renderer = renderBox()) {
</span><del>- LayoutUnit clientWidth = subpixelMetricsEnabled(renderer->document()) ? renderer->clientWidth() : LayoutUnit(renderer->pixelSnappedClientWidth());
</del><ins>+ LayoutUnit clientWidth = subpixelMetricsEnabled(renderer->document()) ? renderer->clientWidth() : LayoutUnit(roundToInt(renderer->clientWidth()));
</ins><span class="cx"> return convertToNonSubpixelValueIfNeeded(adjustLayoutUnitForAbsoluteZoom(clientWidth, *renderer).toDouble(), renderer->document());
</span><span class="cx"> }
</span><span class="cx"> return 0;
</span><span class="lines">@@ -831,7 +831,7 @@
</span><span class="cx"> return adjustForAbsoluteZoom(renderView.frameView().layoutHeight(), renderView);
</span><span class="cx">
</span><span class="cx"> if (RenderBox* renderer = renderBox()) {
</span><del>- LayoutUnit clientHeight = subpixelMetricsEnabled(renderer->document()) ? renderer->clientHeight() : LayoutUnit(renderer->pixelSnappedClientHeight());
</del><ins>+ LayoutUnit clientHeight = subpixelMetricsEnabled(renderer->document()) ? renderer->clientHeight() : LayoutUnit(roundToInt(renderer->clientHeight()));
</ins><span class="cx"> return convertToNonSubpixelValueIfNeeded(adjustLayoutUnitForAbsoluteZoom(clientHeight, *renderer).toDouble(), renderer->document());
</span><span class="cx"> }
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebCoredomPositioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Position.cpp (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Position.cpp 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/dom/Position.cpp 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -925,7 +925,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> if (is<RenderBox>(*o)) {
</span><del>- if (downcast<RenderBox>(*o).pixelSnappedLogicalHeight())
</del><ins>+ if (roundToInt(downcast<RenderBox>(*o).logicalHeight()))
</ins><span class="cx"> return true;
</span><span class="cx"> continue;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLImageElement.cpp (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLImageElement.cpp 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/html/HTMLImageElement.cpp 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -296,7 +296,10 @@
</span><span class="cx"> document().updateLayout();
</span><span class="cx">
</span><span class="cx"> RenderBox* box = renderBox();
</span><del>- return box ? adjustForAbsoluteZoom(box->contentBoxRect().pixelSnappedSize().width(), *box) : 0;
</del><ins>+ if (!box)
+ return 0;
+ LayoutRect contentRect = box->contentBoxRect();
+ return adjustForAbsoluteZoom(snappedIntRect(contentRect).width(), *box);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int HTMLImageElement::height(bool ignorePendingStylesheets)
</span><span class="lines">@@ -319,7 +322,10 @@
</span><span class="cx"> document().updateLayout();
</span><span class="cx">
</span><span class="cx"> RenderBox* box = renderBox();
</span><del>- return box ? adjustForAbsoluteZoom(box->contentBoxRect().pixelSnappedSize().height(), *box) : 0;
</del><ins>+ if (!box)
+ return 0;
+ LayoutRect contentRect = box->contentBoxRect();
+ return adjustForAbsoluteZoom(snappedIntRect(contentRect).height(), *box);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int HTMLImageElement::naturalWidth() const
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlshadowSpinButtonElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/shadow/SpinButtonElement.cpp (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/shadow/SpinButtonElement.cpp 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/html/shadow/SpinButtonElement.cpp 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> MouseEvent& mouseEvent = downcast<MouseEvent>(*event);
</span><span class="cx"> IntPoint local = roundedIntPoint(box->absoluteToLocal(mouseEvent.absoluteLocation(), UseTransforms));
</span><span class="cx"> if (mouseEvent.type() == eventNames().mousedownEvent && mouseEvent.button() == LeftButton) {
</span><del>- if (box->pixelSnappedBorderBoxRect().contains(local)) {
</del><ins>+ if (box->borderBoxRect().contains(local)) {
</ins><span class="cx"> // The following functions of HTMLInputElement may run JavaScript
</span><span class="cx"> // code which detaches this shadow node. We need to take a reference
</span><span class="cx"> // and check renderer() after such function calls.
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> } else if (mouseEvent.type() == eventNames().mouseupEvent && mouseEvent.button() == LeftButton)
</span><span class="cx"> stopRepeatingTimer();
</span><span class="cx"> else if (mouseEvent.type() == eventNames().mousemoveEvent) {
</span><del>- if (box->pixelSnappedBorderBoxRect().contains(local)) {
</del><ins>+ if (box->borderBoxRect().contains(local)) {
</ins><span class="cx"> if (!m_capturing) {
</span><span class="cx"> if (Frame* frame = document().frame()) {
</span><span class="cx"> frame->eventHandler().setCapturingMouseEventsElement(this);
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlay.cpp (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -745,8 +745,8 @@
</span><span class="cx"> IntRect boundingBox = snappedIntRect(containingView->contentsToRootView(renderer->absoluteBoundingBoxRect()));
</span><span class="cx"> RenderBoxModelObject* modelObject = is<RenderBoxModelObject>(*renderer) ? downcast<RenderBoxModelObject>(renderer) : nullptr;
</span><span class="cx"> auto sizeObject = Inspector::Protocol::OverlayTypes::Size::create()
</span><del>- .setWidth(modelObject ? adjustForAbsoluteZoom(modelObject->pixelSnappedOffsetWidth(), *modelObject) : boundingBox.width())
- .setHeight(modelObject ? adjustForAbsoluteZoom(modelObject->pixelSnappedOffsetHeight(), *modelObject) : boundingBox.height())
</del><ins>+ .setWidth(modelObject ? adjustForAbsoluteZoom(roundToInt(modelObject->offsetWidth()), *modelObject) : boundingBox.width())
+ .setHeight(modelObject ? adjustForAbsoluteZoom(roundToInt(modelObject->offsetHeight()), *modelObject) : boundingBox.height())
</ins><span class="cx"> .release();
</span><span class="cx"> elementData->setSize(WTF::move(sizeObject));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -735,7 +735,7 @@
</span><span class="cx"> void FrameView::applyPaginationToViewport()
</span><span class="cx"> {
</span><span class="cx"> Document* document = frame().document();
</span><del>- auto documentElement = document->documentElement();
</del><ins>+ auto* documentElement = document->documentElement();
</ins><span class="cx"> RenderElement* documentRenderer = documentElement ? documentElement->renderer() : nullptr;
</span><span class="cx"> RenderElement* documentOrBodyRenderer = documentRenderer;
</span><span class="cx"> auto* body = document->body();
</span><span class="lines">@@ -784,7 +784,7 @@
</span><span class="cx"> if (!document)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- auto documentElement = document->documentElement();
</del><ins>+ auto* documentElement = document->documentElement();
</ins><span class="cx"> if (!documentElement)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -2858,8 +2858,8 @@
</span><span class="cx"> if (!document)
</span><span class="cx"> return ExtendedBackgroundModeNone;
</span><span class="cx">
</span><del>- auto documentElement = document->documentElement();
- auto documentElementRenderer = documentElement ? documentElement->renderer() : nullptr;
</del><ins>+ auto* documentElement = document->documentElement();
+ auto* documentElementRenderer = documentElement ? documentElement->renderer() : nullptr;
</ins><span class="cx"> if (!documentElementRenderer)
</span><span class="cx"> return ExtendedBackgroundModeNone;
</span><span class="cx">
</span><span class="lines">@@ -4174,7 +4174,8 @@
</span><span class="cx">
</span><span class="cx"> // Require the document to grow a bit.
</span><span class="cx"> static const int documentHeightThreshold = 200;
</span><del>- if (documentElement->renderBox()->layoutOverflowRect().pixelSnappedSize().height() < documentHeightThreshold)
</del><ins>+ LayoutRect overflowRect = documentElement->renderBox()->layoutOverflowRect();
+ if (snappedIntRect(overflowRect).height() < documentHeightThreshold)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // The first few hundred characters rarely contain the interesting content of the page.
</span></span></pre></div>
<a id="trunkSourceWebCorepagePrintContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PrintContext.cpp (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PrintContext.cpp 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/page/PrintContext.cpp 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -250,8 +250,8 @@
</span><span class="cx"> scaledPageSize.scale(frame->view()->contentsSize().width() / pageRect.width());
</span><span class="cx"> printContext.computePageRectsWithPageSize(scaledPageSize, false);
</span><span class="cx">
</span><del>- int top = box->pixelSnappedOffsetTop();
- int left = box->pixelSnappedOffsetLeft();
</del><ins>+ int top = roundToInt(box->offsetTop());
+ int left = roundToInt(box->offsetLeft());
</ins><span class="cx"> size_t pageNumber = 0;
</span><span class="cx"> for (; pageNumber < printContext.pageCount(); pageNumber++) {
</span><span class="cx"> const IntRect& page = printContext.pageRect(pageNumber);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsLayoutRecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/LayoutRect.h (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/LayoutRect.h 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/platform/graphics/LayoutRect.h 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -55,8 +55,6 @@
</span><span class="cx"> LayoutPoint location() const { return m_location; }
</span><span class="cx"> LayoutSize size() const { return m_size; }
</span><span class="cx">
</span><del>- IntSize pixelSnappedSize() const { return snappedIntSize(m_size, m_location); }
-
</del><span class="cx"> void setLocation(const LayoutPoint& location) { m_location = location; }
</span><span class="cx"> void setSize(const LayoutSize& size) { m_size = size; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateAVFoundationObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -676,7 +676,7 @@
</span><span class="cx"> [m_videoLayer addObserver:m_objcObserver.get() forKeyPath:@"readyForDisplay" options:NSKeyValueObservingOptionNew context:(void *)MediaPlayerAVFoundationObservationContextAVPlayerLayer];
</span><span class="cx"> updateVideoLayerGravity();
</span><span class="cx"> [m_videoLayer setContentsScale:player()->client().mediaPlayerContentsScale()];
</span><del>- IntSize defaultSize = player()->client().mediaPlayerContentBoxRect().pixelSnappedSize();
</del><ins>+ IntSize defaultSize = snappedIntRect(player()->client().mediaPlayerContentBoxRect()).size();
</ins><span class="cx"> LOG(Media, "MediaPlayerPrivateAVFoundationObjC::createVideoLayer(%p) - returning %p", this, m_videoLayer.get());
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -571,30 +571,6 @@
</span><span class="cx"> return height() - borderTop() - borderBottom() - horizontalScrollbarHeight();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int RenderBox::pixelSnappedClientWidth() const
-{
- // FIXME: This should use snappedIntSize() instead with absolute coordinates.
- return roundToInt(clientWidth());
-}
-
-int RenderBox::pixelSnappedClientHeight() const
-{
- // FIXME: This should use snappedIntSize() instead with absolute coordinates.
- return roundToInt(clientHeight());
-}
-
-int RenderBox::pixelSnappedOffsetWidth() const
-{
- // FIXME: This should use snappedIntSize() instead with absolute coordinates.
- return roundToInt(offsetWidth());
-}
-
-int RenderBox::pixelSnappedOffsetHeight() const
-{
- // FIXME: This should use snappedIntSize() instead with absolute coordinates.
- return roundToInt(offsetHeight());
-}
-
</del><span class="cx"> int RenderBox::scrollWidth() const
</span><span class="cx"> {
</span><span class="cx"> if (hasOverflowClip())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.h (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.h 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -90,9 +90,6 @@
</span><span class="cx"> LayoutUnit constrainLogicalHeightByMinMax(LayoutUnit logicalHeight, LayoutUnit intrinsicContentHeight) const;
</span><span class="cx"> LayoutUnit constrainContentBoxLogicalHeightByMinMax(LayoutUnit logicalHeight, LayoutUnit intrinsicContentHeight) const;
</span><span class="cx">
</span><del>- int pixelSnappedLogicalHeight() const { return style().isHorizontalWritingMode() ? pixelSnappedSize().height() : pixelSnappedSize().width(); }
- int pixelSnappedLogicalWidth() const { return style().isHorizontalWritingMode() ? pixelSnappedSize().width() : pixelSnappedSize().height(); }
-
</del><span class="cx"> void setLogicalLeft(LayoutUnit left)
</span><span class="cx"> {
</span><span class="cx"> if (style().isHorizontalWritingMode())
</span><span class="lines">@@ -139,7 +136,6 @@
</span><span class="cx"> LayoutPoint location() const { return m_frameRect.location(); }
</span><span class="cx"> LayoutSize locationOffset() const { return LayoutSize(x(), y()); }
</span><span class="cx"> LayoutSize size() const { return m_frameRect.size(); }
</span><del>- IntSize pixelSnappedSize() const { return m_frameRect.pixelSnappedSize(); }
</del><span class="cx">
</span><span class="cx"> void setLocation(const LayoutPoint& location) { m_frameRect.setLocation(location); }
</span><span class="cx">
</span><span class="lines">@@ -157,8 +153,7 @@
</span><span class="cx"> }
</span><span class="cx"> LayoutRect borderBoxRect() const { return LayoutRect(LayoutPoint(), size()); }
</span><span class="cx"> LayoutRect paddingBoxRect() const { return LayoutRect(borderLeft(), borderTop(), contentWidth() + paddingLeft() + paddingRight(), contentHeight() + paddingTop() + paddingBottom()); }
</span><del>- IntRect pixelSnappedBorderBoxRect() const { return IntRect(IntPoint(), pixelSnappedSize()); }
- virtual IntRect borderBoundingBox() const override final { return pixelSnappedBorderBoxRect(); }
</del><ins>+ virtual IntRect borderBoundingBox() const override final { return enclosingIntRect(borderBoxRect()); }
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT RoundedRect::Radii borderRadii() const;
</span><span class="cx">
</span><span class="lines">@@ -224,9 +219,6 @@
</span><span class="cx"> virtual LayoutUnit offsetWidth() const override { return width(); }
</span><span class="cx"> virtual LayoutUnit offsetHeight() const override { return height(); }
</span><span class="cx">
</span><del>- virtual int pixelSnappedOffsetWidth() const override final;
- virtual int pixelSnappedOffsetHeight() const override final;
-
</del><span class="cx"> // More IE extensions. clientWidth and clientHeight represent the interior of an object
</span><span class="cx"> // excluding border and scrollbar. clientLeft/Top are just the borderLeftWidth and borderTopWidth.
</span><span class="cx"> LayoutUnit clientLeft() const { return borderLeft(); }
</span><span class="lines">@@ -238,9 +230,6 @@
</span><span class="cx"> LayoutUnit clientLogicalBottom() const { return borderBefore() + clientLogicalHeight(); }
</span><span class="cx"> LayoutRect clientBoxRect() const { return LayoutRect(clientLeft(), clientTop(), clientWidth(), clientHeight()); }
</span><span class="cx">
</span><del>- int pixelSnappedClientWidth() const;
- int pixelSnappedClientHeight() const;
-
</del><span class="cx"> // scrollWidth/scrollHeight will be the same as clientWidth/clientHeight unless the
</span><span class="cx"> // object has overflow:hidden/scroll/auto specified and also has overflow.
</span><span class="cx"> // scrollLeft/Top return the current scroll position. These methods are virtual so that objects like
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -499,18 +499,6 @@
</span><span class="cx"> return adjustedPositionRelativeToOffsetParent(LayoutPoint()).y();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-int RenderBoxModelObject::pixelSnappedOffsetWidth() const
-{
- // FIXME: This should use snappedIntSize() instead with absolute coordinates.
- return roundToInt(offsetWidth());
-}
-
-int RenderBoxModelObject::pixelSnappedOffsetHeight() const
-{
- // FIXME: This should use snappedIntSize() instead with absolute coordinates.
- return roundToInt(offsetHeight());
-}
-
</del><span class="cx"> LayoutUnit RenderBoxModelObject::computedCSSPadding(const Length& padding) const
</span><span class="cx"> {
</span><span class="cx"> LayoutUnit w = 0;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.h (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -125,11 +125,6 @@
</span><span class="cx"> virtual LayoutUnit offsetWidth() const = 0;
</span><span class="cx"> virtual LayoutUnit offsetHeight() const = 0;
</span><span class="cx">
</span><del>- int pixelSnappedOffsetLeft() const { return roundToInt(offsetLeft()); }
- int pixelSnappedOffsetTop() const { return roundToInt(offsetTop()); }
- virtual int pixelSnappedOffsetWidth() const;
- virtual int pixelSnappedOffsetHeight() const;
-
</del><span class="cx"> virtual void updateFromStyle() override;
</span><span class="cx">
</span><span class="cx"> virtual bool requiresLayer() const override { return isRoot() || isPositioned() || createsGroup() || hasClipPath() || hasTransformRelatedProperty() || hasHiddenBackface() || hasReflection(); }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFileUploadControlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -95,13 +95,13 @@
</span><span class="cx">
</span><span class="cx"> static int nodeWidth(Node* node)
</span><span class="cx"> {
</span><del>- return (node && node->renderBox()) ? node->renderBox()->pixelSnappedSize().width() : 0;
</del><ins>+ return (node && node->renderBox()) ? roundToInt(node->renderBox()->size().width()) : 0;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> static int nodeHeight(Node* node)
</span><span class="cx"> {
</span><del>- return (node && node->renderBox()) ? node->renderBox()->pixelSnappedSize().height() : 0;
</del><ins>+ return (node && node->renderBox()) ? roundToInt(node->renderBox()->size().height()) : 0;
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> int iconWidth = nodeHeight(uploadButton());
</span><span class="cx"> #endif
</span><del>- return std::max(0, contentBoxRect().pixelSnappedSize().width() - nodeWidth(uploadButton()) - afterButtonSpacing
</del><ins>+ return std::max(0, snappedIntRect(contentBoxRect()).width() - nodeWidth(uploadButton()) - afterButtonSpacing
</ins><span class="cx"> - (inputElement().icon() ? iconWidth + iconFilenameSpacing : 0));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -1313,7 +1313,7 @@
</span><span class="cx"> localPoint += inlineBoundingBoxOffset;
</span><span class="cx"> } else if (RenderBox* box = renderBox()) {
</span><span class="cx"> // FIXME: Is snapping the size really needed here for the RenderBox case?
</span><del>- setSize(box->pixelSnappedSize());
</del><ins>+ setSize(snappedIntRect(box->frameRect()).size());
</ins><span class="cx"> box->applyTopLeftLocationOffset(localPoint);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1375,25 +1375,26 @@
</span><span class="cx">
</span><span class="cx"> TransformationMatrix RenderLayer::perspectiveTransform() const
</span><span class="cx"> {
</span><del>- if (!renderer().hasTransformRelatedProperty())
</del><ins>+ RenderBox* box = renderBox();
+ if (!box)
</ins><span class="cx"> return TransformationMatrix();
</span><ins>+
+ if (!box->hasTransformRelatedProperty())
+ return TransformationMatrix();
</ins><span class="cx">
</span><del>- const RenderStyle& style = renderer().style();
</del><ins>+ const RenderStyle& style = box->style();
</ins><span class="cx"> if (!style.hasPerspective())
</span><span class="cx"> return TransformationMatrix();
</span><span class="cx">
</span><span class="cx"> // Maybe fetch the perspective from the backing?
</span><del>- const IntRect borderBox = downcast<RenderBox>(renderer()).pixelSnappedBorderBoxRect();
- const float boxWidth = borderBox.width();
- const float boxHeight = borderBox.height();
</del><ins>+ const FloatRect borderBox = snapRectToDevicePixels(box->borderBoxRect(), box->document().deviceScaleFactor());
+ float perspectiveOriginX = floatValueForLength(style.perspectiveOriginX(), borderBox.width());
+ float perspectiveOriginY = floatValueForLength(style.perspectiveOriginY(), borderBox.height());
</ins><span class="cx">
</span><del>- float perspectiveOriginX = floatValueForLength(style.perspectiveOriginX(), boxWidth);
- float perspectiveOriginY = floatValueForLength(style.perspectiveOriginY(), boxHeight);
-
</del><span class="cx"> // A perspective origin of 0,0 makes the vanishing point in the center of the element.
</span><span class="cx"> // We want it to be in the top-left, so subtract half the height and width.
</span><del>- perspectiveOriginX -= boxWidth / 2.0f;
- perspectiveOriginY -= boxHeight / 2.0f;
</del><ins>+ perspectiveOriginX -= borderBox.width() / 2.0f;
+ perspectiveOriginY -= borderBox.height() / 2.0f;
</ins><span class="cx">
</span><span class="cx"> TransformationMatrix t;
</span><span class="cx"> t.translate(perspectiveOriginX, perspectiveOriginY);
</span><span class="lines">@@ -2318,8 +2319,8 @@
</span><span class="cx"> RenderBox* box = renderBox();
</span><span class="cx"> ASSERT(box);
</span><span class="cx">
</span><del>- int maxX = scrollWidth() - box->pixelSnappedClientWidth();
- int maxY = scrollHeight() - box->pixelSnappedClientHeight();
</del><ins>+ int maxX = scrollWidth() - roundToInt(box->clientWidth());
+ int maxY = scrollHeight() - roundToInt(box->clientHeight());
</ins><span class="cx">
</span><span class="cx"> int x = std::max(std::min(scrollOffset.width(), maxX), 0);
</span><span class="cx"> int y = std::max(std::min(scrollOffset.height(), maxY), 0);
</span><span class="lines">@@ -2888,10 +2889,11 @@
</span><span class="cx">
</span><span class="cx"> IntSize RenderLayer::visibleSize() const
</span><span class="cx"> {
</span><del>- if (!renderer().isBox())
</del><ins>+ RenderBox* box = renderBox();
+ if (!box)
</ins><span class="cx"> return IntSize();
</span><span class="cx">
</span><del>- return IntSize(renderBox()->pixelSnappedClientWidth(), renderBox()->pixelSnappedClientHeight());
</del><ins>+ return IntSize(roundToInt(box->clientWidth()), roundToInt(box->clientHeight()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntSize RenderLayer::contentsSize() const
</span><span class="lines">@@ -3264,7 +3266,7 @@
</span><span class="cx"> if (!box)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- const IntRect borderBox = box->pixelSnappedBorderBoxRect();
</del><ins>+ const IntRect borderBox = snappedIntRect(box->borderBoxRect());
</ins><span class="cx"> const IntRect& scrollCorner = scrollCornerRect();
</span><span class="cx"> IntRect absBounds(borderBox.location() + offsetFromRoot, borderBox.size());
</span><span class="cx"> if (m_vBar) {
</span><span class="lines">@@ -3367,14 +3369,14 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_scrollDimensionsDirty);
</span><span class="cx">
</span><del>- return scrollWidth() > renderBox()->pixelSnappedClientWidth();
</del><ins>+ return scrollWidth() > roundToInt(renderBox()->clientWidth());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderLayer::hasVerticalOverflow() const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_scrollDimensionsDirty);
</span><span class="cx">
</span><del>- return scrollHeight() > renderBox()->pixelSnappedClientHeight();
</del><ins>+ return scrollHeight() > roundToInt(renderBox()->clientHeight());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool styleRequiresScrollbar(const RenderStyle& style, ScrollbarOrientation axis)
</span><span class="lines">@@ -3447,13 +3449,13 @@
</span><span class="cx">
</span><span class="cx"> // Set up the range (and page step/line step).
</span><span class="cx"> if (m_hBar) {
</span><del>- int clientWidth = box->pixelSnappedClientWidth();
</del><ins>+ int clientWidth = roundToInt(box->clientWidth());
</ins><span class="cx"> int pageStep = Scrollbar::pageStep(clientWidth);
</span><span class="cx"> m_hBar->setSteps(Scrollbar::pixelsPerLineStep(), pageStep);
</span><span class="cx"> m_hBar->setProportion(clientWidth, m_scrollSize.width().round());
</span><span class="cx"> }
</span><span class="cx"> if (m_vBar) {
</span><del>- int clientHeight = box->pixelSnappedClientHeight();
</del><ins>+ int clientHeight = roundToInt(box->clientHeight());
</ins><span class="cx"> int pageStep = Scrollbar::pageStep(clientHeight);
</span><span class="cx"> m_vBar->setSteps(Scrollbar::pixelsPerLineStep(), pageStep);
</span><span class="cx"> m_vBar->setProportion(clientHeight, m_scrollSize.height().round());
</span><span class="lines">@@ -3511,7 +3513,7 @@
</span><span class="cx">
</span><span class="cx"> bool RenderLayer::overflowControlsIntersectRect(const IntRect& localRect) const
</span><span class="cx"> {
</span><del>- const IntRect borderBox = renderBox()->pixelSnappedBorderBoxRect();
</del><ins>+ const IntRect borderBox = snappedIntRect(renderBox()->borderBoxRect());
</ins><span class="cx">
</span><span class="cx"> if (rectForHorizontalScrollbar(borderBox).intersects(localRect))
</span><span class="cx"> return true;
</span><span class="lines">@@ -3705,7 +3707,7 @@
</span><span class="cx">
</span><span class="cx"> IntPoint localPoint = roundedIntPoint(absoluteToContents(absolutePoint));
</span><span class="cx">
</span><del>- IntRect localBounds(IntPoint(), box->pixelSnappedSize());
</del><ins>+ IntRect localBounds(IntPoint(), snappedIntRect(box->frameRect()).size());
</ins><span class="cx"> return resizerCornerRect(this, localBounds).contains(localPoint);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -952,8 +952,7 @@
</span><span class="cx"> // FIXME: need to do some pixel snapping here.
</span><span class="cx"> m_scrollingLayer->setPosition(FloatPoint(paddingBox.location() - localCompositingBounds.location()));
</span><span class="cx">
</span><del>- IntSize pixelSnappedClientSize(renderBox.pixelSnappedClientWidth(), renderBox.pixelSnappedClientHeight());
- m_scrollingLayer->setSize(pixelSnappedClientSize);
</del><ins>+ m_scrollingLayer->setSize(roundedIntSize(LayoutSize(renderBox.clientWidth(), renderBox.clientHeight())));
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> FloatSize oldScrollingLayerOffset = m_scrollingLayer->offsetFromRenderer();
</span><span class="cx"> m_scrollingLayer->setOffsetFromRenderer(FloatPoint() - paddingBox.location());
</span><span class="lines">@@ -1343,7 +1342,7 @@
</span><span class="cx"> if (!m_owningLayer.hasScrollbars())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- const IntRect borderBox = downcast<RenderBox>(renderer()).pixelSnappedBorderBoxRect();
</del><ins>+ const IntRect borderBox = snappedIntRect(renderBox()->borderBoxRect());
</ins><span class="cx">
</span><span class="cx"> FloatSize offsetFromRenderer = m_graphicsLayer->offsetFromRenderer();
</span><span class="cx"> if (GraphicsLayer* layer = layerForHorizontalScrollbar()) {
</span><span class="lines">@@ -2522,7 +2521,7 @@
</span><span class="cx">
</span><span class="cx"> bool didAnimate = false;
</span><span class="cx">
</span><del>- if (hasTransform && m_graphicsLayer->addAnimation(transformVector, downcast<RenderBox>(renderer()).pixelSnappedBorderBoxRect().size(), anim, keyframes.animationName(), timeOffset))
</del><ins>+ if (hasTransform && m_graphicsLayer->addAnimation(transformVector, snappedIntRect(renderBox()->borderBoxRect()).size(), anim, keyframes.animationName(), timeOffset))
</ins><span class="cx"> didAnimate = true;
</span><span class="cx">
</span><span class="cx"> if (hasOpacity && m_graphicsLayer->addAnimation(opacityVector, IntSize(), anim, keyframes.animationName(), timeOffset))
</span><span class="lines">@@ -2576,7 +2575,7 @@
</span><span class="cx"> KeyframeValueList transformVector(AnimatedPropertyTransform);
</span><span class="cx"> transformVector.insert(std::make_unique<TransformAnimationValue>(0, fromStyle->transform()));
</span><span class="cx"> transformVector.insert(std::make_unique<TransformAnimationValue>(1, toStyle->transform()));
</span><del>- if (m_graphicsLayer->addAnimation(transformVector, downcast<RenderBox>(renderer()).pixelSnappedBorderBoxRect().size(), transformAnim, GraphicsLayer::animationNameForTransition(AnimatedPropertyTransform), timeOffset)) {
</del><ins>+ if (m_graphicsLayer->addAnimation(transformVector, snappedIntRect(renderBox()->borderBoxRect()).size(), transformAnim, GraphicsLayer::animationNameForTransition(AnimatedPropertyTransform), timeOffset)) {
</ins><span class="cx"> // To ensure that the correct transform is visible when the animation ends, also set the final transform.
</span><span class="cx"> updateTransform(*toStyle);
</span><span class="cx"> didAnimate = true;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.h (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.h 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.h 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -255,6 +255,7 @@
</span><span class="cx"> std::unique_ptr<GraphicsLayer> createGraphicsLayer(const String&, GraphicsLayer::Type = GraphicsLayer::Type::Normal);
</span><span class="cx">
</span><span class="cx"> RenderLayerModelObject& renderer() const { return m_owningLayer.renderer(); }
</span><ins>+ RenderBox* renderBox() const { return m_owningLayer.renderBox(); }
</ins><span class="cx"> RenderLayerCompositor& compositor() const { return m_owningLayer.compositor(); }
</span><span class="cx">
</span><span class="cx"> void updateInternalHierarchy();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.cpp 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -640,12 +640,12 @@
</span><span class="cx"> int RenderListBox::scrollWidth() const
</span><span class="cx"> {
</span><span class="cx"> // There is no horizontal scrolling allowed.
</span><del>- return pixelSnappedClientWidth();
</del><ins>+ return roundToInt(clientWidth());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int RenderListBox::scrollHeight() const
</span><span class="cx"> {
</span><del>- return std::max(pixelSnappedClientHeight(), roundToInt(listHeight()));
</del><ins>+ return roundToInt(std::max(clientHeight(), listHeight()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int RenderListBox::scrollLeft() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMediaControlElementscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMediaControlElements.cpp (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMediaControlElements.cpp 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/rendering/RenderMediaControlElements.cpp 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> // If the slider would be rendered outside the page, it should be moved below the controls.
</span><span class="cx"> if (UNLIKELY(absoluteOffsetTop < 0))
</span><del>- setY(buttonBox.offsetTop() + theme().volumeSliderOffsetFromMuteButton(buttonBox, pixelSnappedSize()).y());
</del><ins>+ setY(buttonBox.offsetTop() + theme().volumeSliderOffsetFromMuteButton(buttonBox, size()).y());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // ----------------------------
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderScrollbarcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderScrollbar.cpp (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderScrollbar.cpp 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/rendering/RenderScrollbar.cpp 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -269,7 +269,7 @@
</span><span class="cx"> partRenderer->layout();
</span><span class="cx">
</span><span class="cx"> bool isHorizontal = orientation() == HorizontalScrollbar;
</span><del>- IntSize pixelSnappedIntSize = partRenderer->pixelSnappedSize();
</del><ins>+ IntSize pixelSnappedIntSize = snappedIntRect(partRenderer->frameRect()).size();
</ins><span class="cx"> if (partType == BackButtonStartPart)
</span><span class="cx"> return IntRect(location(), IntSize(isHorizontal ? pixelSnappedIntSize.width() : width(), isHorizontal ? height() : pixelSnappedIntSize.height()));
</span><span class="cx"> if (partType == ForwardButtonEndPart)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTable.cpp (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTable.cpp 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/rendering/RenderTable.cpp 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -638,7 +638,7 @@
</span><span class="cx"> int bottomBorderOverflow = height() + outerBorderBottom() - borderBottom();
</span><span class="cx"> int topBorderOverflow = borderTop() - outerBorderTop();
</span><span class="cx"> IntRect borderOverflowRect(leftBorderOverflow, topBorderOverflow, rightBorderOverflow - leftBorderOverflow, bottomBorderOverflow - topBorderOverflow);
</span><del>- if (borderOverflowRect != pixelSnappedBorderBoxRect()) {
</del><ins>+ if (borderOverflowRect != snappedIntRect(borderBoxRect())) {
</ins><span class="cx"> addLayoutOverflow(borderOverflowRect);
</span><span class="cx"> addVisualOverflow(borderOverflowRect);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableCellcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableCell.cpp (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableCell.cpp 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/rendering/RenderTableCell.cpp 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> {
</span><span class="cx"> int oldIntrinsicPaddingBefore = intrinsicPaddingBefore();
</span><span class="cx"> int oldIntrinsicPaddingAfter = intrinsicPaddingAfter();
</span><del>- int logicalHeightWithoutIntrinsicPadding = pixelSnappedLogicalHeight() - oldIntrinsicPaddingBefore - oldIntrinsicPaddingAfter;
</del><ins>+ int logicalHeightWithoutIntrinsicPadding = roundToInt(logicalHeight()) - oldIntrinsicPaddingBefore - oldIntrinsicPaddingAfter;
</ins><span class="cx">
</span><span class="cx"> int intrinsicPaddingBefore = 0;
</span><span class="cx"> switch (style().verticalAlign()) {
</span><span class="lines">@@ -1194,7 +1194,7 @@
</span><span class="cx"> LayoutRect localRepaintRect = paintInfo.rect;
</span><span class="cx"> localRepaintRect.inflate(maximalOutlineSize(paintInfo.phase));
</span><span class="cx">
</span><del>- LayoutRect paintRect = LayoutRect(paintOffset + location(), pixelSnappedSize());
</del><ins>+ LayoutRect paintRect = LayoutRect(paintOffset + location(), snappedIntRect(frameRect()).size());
</ins><span class="cx"> if (paintRect.y() - table()->outerBorderTop() >= localRepaintRect.maxY())
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -1281,7 +1281,7 @@
</span><span class="cx"> width() - borderLeft() - borderRight(), height() - borderTop() - borderBottom());
</span><span class="cx"> paintInfo.context->clip(clipRect);
</span><span class="cx"> }
</span><del>- paintFillLayers(paintInfo, c, bgLayer, LayoutRect(adjustedPaintOffset, pixelSnappedSize()), BackgroundBleedNone, CompositeSourceOver, backgroundObject);
</del><ins>+ paintFillLayers(paintInfo, c, bgLayer, LayoutRect(adjustedPaintOffset, snappedIntRect(frameRect()).size()), BackgroundBleedNone, CompositeSourceOver, backgroundObject);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1294,7 +1294,7 @@
</span><span class="cx"> if (!tableElt->collapseBorders() && style().emptyCells() == HIDE && !firstChild())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- LayoutRect paintRect = LayoutRect(paintOffset, pixelSnappedSize());
</del><ins>+ LayoutRect paintRect = LayoutRect(paintOffset, snappedIntRect(frameRect()).size());
</ins><span class="cx"> paintBoxShadow(paintInfo, paintRect, style(), Normal);
</span><span class="cx">
</span><span class="cx"> // Paint our cell background.
</span><span class="lines">@@ -1317,7 +1317,7 @@
</span><span class="cx"> if (!tableElt->collapseBorders() && style().emptyCells() == HIDE && !firstChild())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- paintMaskImages(paintInfo, LayoutRect(paintOffset, pixelSnappedSize()));
</del><ins>+ paintMaskImages(paintInfo, LayoutRect(paintOffset, snappedIntRect(frameRect()).size()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderTableCell::boxShadowShouldBeAppliedToBackground(const LayoutPoint&, BackgroundBleedAvoidance, InlineFlowBox*) const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableCellh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableCell.h (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableCell.h 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/rendering/RenderTableCell.h 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -283,7 +283,7 @@
</span><span class="cx"> inline int RenderTableCell::logicalHeightForRowSizing() const
</span><span class="cx"> {
</span><span class="cx"> // FIXME: This function does too much work, and is very hot during table layout!
</span><del>- int adjustedLogicalHeight = pixelSnappedLogicalHeight() - (intrinsicPaddingBefore() + intrinsicPaddingAfter());
</del><ins>+ int adjustedLogicalHeight = roundToInt(logicalHeight()) - (intrinsicPaddingBefore() + intrinsicPaddingAfter());
</ins><span class="cx"> int styleLogicalHeight = valueForLength(style().logicalHeight(), 0);
</span><span class="cx"> // In strict mode, box-sizing: content-box do the right thing and actually add in the border and padding.
</span><span class="cx"> // Call computedCSSPadding* directly to avoid including implicitPadding.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.cpp (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.cpp 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/rendering/RenderTheme.cpp 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -552,13 +552,13 @@
</span><span class="cx"> return formatMediaControlsTime(currentTime - duration);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-IntPoint RenderTheme::volumeSliderOffsetFromMuteButton(const RenderBox& muteButtonBox, const IntSize& size) const
</del><ins>+LayoutPoint RenderTheme::volumeSliderOffsetFromMuteButton(const RenderBox& muteButtonBox, const LayoutSize& size) const
</ins><span class="cx"> {
</span><del>- int y = -size.height();
- FloatPoint absPoint = muteButtonBox.localToAbsolute(FloatPoint(muteButtonBox.pixelSnappedOffsetLeft(), y), IsFixed | UseTransforms);
</del><ins>+ LayoutUnit y = -size.height();
+ FloatPoint absPoint = muteButtonBox.localToAbsolute(FloatPoint(muteButtonBox.offsetLeft(), y), IsFixed | UseTransforms);
</ins><span class="cx"> if (absPoint.y() < 0)
</span><span class="cx"> y = muteButtonBox.height();
</span><del>- return IntPoint(0, y);
</del><ins>+ return LayoutPoint(0, y);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTheme.h (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTheme.h 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/rendering/RenderTheme.h 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx"> virtual String formatMediaControlsRemainingTime(float currentTime, float duration) const;
</span><span class="cx">
</span><span class="cx"> // Returns the media volume slider container's offset from the mute button.
</span><del>- virtual IntPoint volumeSliderOffsetFromMuteButton(const RenderBox&, const IntSize&) const;
</del><ins>+ virtual LayoutPoint volumeSliderOffsetFromMuteButton(const RenderBox&, const LayoutSize&) const;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(METER_ELEMENT)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderThemeMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -1712,7 +1712,7 @@
</span><span class="cx">
</span><span class="cx"> float zoomLevel = o.style().effectiveZoom();
</span><span class="cx">
</span><del>- FloatRect localBounds = [search cancelButtonRectForBounds:NSRect(input->renderBox()->pixelSnappedBorderBoxRect())];
</del><ins>+ FloatRect localBounds = [search cancelButtonRectForBounds:NSRect(snappedIntRect(input->renderBox()->borderBoxRect()))];
</ins><span class="cx"> localBounds = convertToPaintingRect(*input->renderer(), o, localBounds, r);
</span><span class="cx">
</span><span class="cx"> FloatRect unzoomedRect(localBounds);
</span><span class="lines">@@ -1787,7 +1787,7 @@
</span><span class="cx"> if ([search searchMenuTemplate] != nil)
</span><span class="cx"> [search setSearchMenuTemplate:nil];
</span><span class="cx">
</span><del>- FloatRect localBounds = [search searchButtonRectForBounds:NSRect(input->renderBox()->pixelSnappedBorderBoxRect())];
</del><ins>+ FloatRect localBounds = [search searchButtonRectForBounds:NSRect(snappedIntRect(input->renderBox()->borderBoxRect()))];
</ins><span class="cx"> localBounds = convertToPaintingRect(*input->renderer(), o, localBounds, r);
</span><span class="cx">
</span><span class="cx"> [[search searchButtonCell] drawWithFrame:localBounds inView:documentViewFor(o)];
</span><span class="lines">@@ -1823,7 +1823,7 @@
</span><span class="cx"> GraphicsContextStateSaver stateSaver(*paintInfo.context);
</span><span class="cx"> float zoomLevel = o.style().effectiveZoom();
</span><span class="cx">
</span><del>- FloatRect localBounds = [search searchButtonRectForBounds:NSRect(input->renderBox()->pixelSnappedBorderBoxRect())];
</del><ins>+ FloatRect localBounds = [search searchButtonRectForBounds:NSRect(snappedIntRect(input->renderBox()->borderBoxRect()))];
</ins><span class="cx"> localBounds = convertToPaintingRect(*input->renderer(), o, localBounds, r);
</span><span class="cx">
</span><span class="cx"> IntRect unzoomedRect(localBounds);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTreeAsTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTreeAsText.cpp (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/rendering/RenderTreeAsText.cpp 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -615,9 +615,9 @@
</span><span class="cx"> ts << " scrollX " << l.scrollXOffset();
</span><span class="cx"> if (l.scrollYOffset())
</span><span class="cx"> ts << " scrollY " << l.scrollYOffset();
</span><del>- if (l.renderBox() && l.renderBox()->pixelSnappedClientWidth() != l.scrollWidth())
</del><ins>+ if (l.renderBox() && roundToInt(l.renderBox()->clientWidth()) != l.scrollWidth())
</ins><span class="cx"> ts << " scrollWidth " << l.scrollWidth();
</span><del>- if (l.renderBox() && l.renderBox()->pixelSnappedClientHeight() != l.scrollHeight())
</del><ins>+ if (l.renderBox() && roundToInt(l.renderBox()->clientHeight()) != l.scrollHeight())
</ins><span class="cx"> ts << " scrollHeight " << l.scrollHeight();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLFractioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLFraction.cpp 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -155,8 +155,7 @@
</span><span class="cx"> info.context->setStrokeThickness(m_lineThickness);
</span><span class="cx"> info.context->setStrokeStyle(SolidStroke);
</span><span class="cx"> info.context->setStrokeColor(style().visitedDependentColor(CSSPropertyColor), ColorSpaceSRGB);
</span><del>-
- info.context->drawLine(adjustedPaintOffset, IntPoint(adjustedPaintOffset.x() + denominatorWrapper->pixelSnappedOffsetWidth(), adjustedPaintOffset.y()));
</del><ins>+ info.context->drawLine(adjustedPaintOffset, roundedIntPoint(LayoutPoint(adjustedPaintOffset.x() + denominatorWrapper->offsetWidth(), adjustedPaintOffset.y())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Optional<int> RenderMathMLFraction::firstLineBaseline() const
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingmathmlRenderMathMLRootcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/rendering/mathml/RenderMathMLRoot.cpp 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -337,7 +337,7 @@
</span><span class="cx"> // The preferred width of the radical is sometimes incorrect, so we draw a slightly longer line to ensure it touches the radical symbol (https://bugs.webkit.org/show_bug.cgi?id=130326).
</span><span class="cx"> LayoutUnit sizeError = radical->trailingSpaceError();
</span><span class="cx"> IntPoint adjustedPaintOffset = roundedIntPoint(paintOffset + location() + base->location() + LayoutPoint(-sizeError, -(m_verticalGap + m_ruleThickness / 2)));
</span><del>- info.context->drawLine(adjustedPaintOffset, IntPoint(adjustedPaintOffset.x() + base->pixelSnappedOffsetWidth() + sizeError, adjustedPaintOffset.y()));
</del><ins>+ info.context->drawLine(adjustedPaintOffset, roundedIntPoint(LayoutPoint(adjustedPaintOffset.x() + base->offsetWidth() + sizeError, adjustedPaintOffset.y())));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderPtr<RenderMathMLRootWrapper> RenderMathMLRootWrapper::createAnonymousWrapper(RenderMathMLRoot* renderObject)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGRootcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp (188432 => 188433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2015-08-14 03:54:32 UTC (rev 188432)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2015-08-14 04:34:31 UTC (rev 188433)
</span><span class="lines">@@ -224,7 +224,7 @@
</span><span class="cx"> void RenderSVGRoot::paintReplaced(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
</span><span class="cx"> {
</span><span class="cx"> // An empty viewport disables rendering.
</span><del>- if (pixelSnappedBorderBoxRect().isEmpty())
</del><ins>+ if (borderBoxRect().isEmpty())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Don't paint, if the context explicitly disabled it.
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx">
</span><span class="cx"> // Apply initial viewport clip
</span><span class="cx"> if (shouldApplyViewportClip())
</span><del>- repaintRect.intersect(pixelSnappedBorderBoxRect());
</del><ins>+ repaintRect.intersect(snappedIntRect(borderBoxRect()));
</ins><span class="cx">
</span><span class="cx"> if (m_hasBoxDecorations || hasRenderOverflow()) {
</span><span class="cx"> // The selectionRect can project outside of the overflowRect, so take their union
</span></span></pre>
</div>
</div>
</body>
</html>