<!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>[164441] 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/164441">164441</a></dd>
<dt>Author</dt> <dd>bjonesbe@adobe.com</dd>
<dt>Date</dt> <dd>2014-02-20 12:01:19 -0800 (Thu, 20 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename border/padding/margin width/height to horizontal/vertical extent on RenderBoxModelObject
https://bugs.webkit.org/show_bug.cgi?id=129043
Reviewed by David Hyatt.
Using horizontal extent instead of width and vertical extent instead
of height makes it more obvious that these are measurements of both
border/margin/padding sides, not just one.
As David Hyatt put it: "I dislike using terms like 'width' since it
could be confused with the actual border-width CSS name, i.e., a
person new to this code would think the method was returning the pixel
width of a single border."
No new tests, no behavior change.
* html/HTMLAppletElement.cpp:
(WebCore::HTMLAppletElement::updateWidget):
* inspector/InspectorOverlay.cpp:
* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlockFlow::checkFloatsInCleanLine):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::repaintLayerRectsForImage):
(WebCore::RenderBox::positionForPoint):
* rendering/RenderBoxModelObject.h:
(WebCore::RenderBoxModelObject::horizontalBorderExtent):
(WebCore::RenderBoxModelObject::verticalBorderExtent):
(WebCore::RenderBoxModelObject::verticalBorderAndPaddingExtent):
(WebCore::RenderBoxModelObject::horizontalBorderAndPaddingExtent):
(WebCore::RenderBoxModelObject::verticalMarginExtent):
(WebCore::RenderBoxModelObject::horizontalMarginExtent):
* rendering/RenderDeprecatedFlexibleBox.cpp:
(WebCore::RenderDeprecatedFlexibleBox::layoutHorizontalBox):
(WebCore::RenderDeprecatedFlexibleBox::layoutVerticalBox):
(WebCore::RenderDeprecatedFlexibleBox::applyLineClamp):
* rendering/RenderFieldset.cpp:
(WebCore::RenderFieldset::computePreferredLogicalWidths):
* rendering/RenderFileUploadControl.cpp:
(WebCore::RenderFileUploadControl::computePreferredLogicalWidths):
* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::crossAxisMarginExtentForChild):
(WebCore::RenderFlexibleBox::mainAxisBorderAndPaddingExtentForChild):
(WebCore::RenderFlexibleBox::computeNextFlexLine):
* rendering/RenderInline.cpp:
(WebCore::RenderInline::localCaretRect):
(WebCore::RenderInline::generateCulledLineBoxRects):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::resize):
* rendering/RenderListBox.cpp:
(WebCore::RenderListBox::computePreferredLogicalWidths):
(WebCore::RenderListBox::computeLogicalHeight):
* rendering/RenderMenuList.cpp:
(RenderMenuList::computePreferredLogicalWidths):
* rendering/RenderScrollbar.cpp:
(WebCore::RenderScrollbar::trackPieceRectWithMargins):
* rendering/RenderSlider.cpp:
(WebCore::RenderSlider::computePreferredLogicalWidths):
* rendering/RenderTextControl.cpp:
(WebCore::RenderTextControl::computeLogicalHeight):
* rendering/RenderTextControlSingleLine.cpp:
(WebCore::RenderTextControlSingleLine::layout):
* rendering/line/LineLayoutState.h:
(WebCore::FloatWithRect::FloatWithRect):
* rendering/shapes/ShapeInfo.cpp:
(WebCore::ShapeInfo<RenderType>::setReferenceBoxLogicalSize):
* rendering/svg/RenderSVGRoot.cpp:
(WebCore::RenderSVGRoot::updateCachedBoundaries):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAppletElementcpp">trunk/Source/WebCore/html/HTMLAppletElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlaycpp">trunk/Source/WebCore/inspector/InspectorOverlay.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockLineLayoutcpp">trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjecth">trunk/Source/WebCore/rendering/RenderBoxModelObject.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderDeprecatedFlexibleBoxcpp">trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFieldsetcpp">trunk/Source/WebCore/rendering/RenderFieldset.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFileUploadControlcpp">trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlexibleBoxcpp">trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderInlinecpp">trunk/Source/WebCore/rendering/RenderInline.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderListBoxcpp">trunk/Source/WebCore/rendering/RenderListBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMenuListcpp">trunk/Source/WebCore/rendering/RenderMenuList.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderScrollbarcpp">trunk/Source/WebCore/rendering/RenderScrollbar.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderSlidercpp">trunk/Source/WebCore/rendering/RenderSlider.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextControlcpp">trunk/Source/WebCore/rendering/RenderTextControl.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextControlSingleLinecpp">trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderinglineLineLayoutStateh">trunk/Source/WebCore/rendering/line/LineLayoutState.h</a></li>
<li><a href="#trunkSourceWebCorerenderingshapesShapeInfocpp">trunk/Source/WebCore/rendering/shapes/ShapeInfo.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 (164440 => 164441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-20 19:40:28 UTC (rev 164440)
+++ trunk/Source/WebCore/ChangeLog 2014-02-20 20:01:19 UTC (rev 164441)
</span><span class="lines">@@ -1,5 +1,75 @@
</span><span class="cx"> 2014-02-20 Bem Jones-Bey <bjonesbe@adobe.com>
</span><span class="cx">
</span><ins>+ Rename border/padding/margin width/height to horizontal/vertical extent on RenderBoxModelObject
+ https://bugs.webkit.org/show_bug.cgi?id=129043
+
+ Reviewed by David Hyatt.
+
+ Using horizontal extent instead of width and vertical extent instead
+ of height makes it more obvious that these are measurements of both
+ border/margin/padding sides, not just one.
+
+ As David Hyatt put it: "I dislike using terms like 'width' since it
+ could be confused with the actual border-width CSS name, i.e., a
+ person new to this code would think the method was returning the pixel
+ width of a single border."
+
+ No new tests, no behavior change.
+
+ * html/HTMLAppletElement.cpp:
+ (WebCore::HTMLAppletElement::updateWidget):
+ * inspector/InspectorOverlay.cpp:
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebCore::RenderBlockFlow::checkFloatsInCleanLine):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::repaintLayerRectsForImage):
+ (WebCore::RenderBox::positionForPoint):
+ * rendering/RenderBoxModelObject.h:
+ (WebCore::RenderBoxModelObject::horizontalBorderExtent):
+ (WebCore::RenderBoxModelObject::verticalBorderExtent):
+ (WebCore::RenderBoxModelObject::verticalBorderAndPaddingExtent):
+ (WebCore::RenderBoxModelObject::horizontalBorderAndPaddingExtent):
+ (WebCore::RenderBoxModelObject::verticalMarginExtent):
+ (WebCore::RenderBoxModelObject::horizontalMarginExtent):
+ * rendering/RenderDeprecatedFlexibleBox.cpp:
+ (WebCore::RenderDeprecatedFlexibleBox::layoutHorizontalBox):
+ (WebCore::RenderDeprecatedFlexibleBox::layoutVerticalBox):
+ (WebCore::RenderDeprecatedFlexibleBox::applyLineClamp):
+ * rendering/RenderFieldset.cpp:
+ (WebCore::RenderFieldset::computePreferredLogicalWidths):
+ * rendering/RenderFileUploadControl.cpp:
+ (WebCore::RenderFileUploadControl::computePreferredLogicalWidths):
+ * rendering/RenderFlexibleBox.cpp:
+ (WebCore::RenderFlexibleBox::crossAxisMarginExtentForChild):
+ (WebCore::RenderFlexibleBox::mainAxisBorderAndPaddingExtentForChild):
+ (WebCore::RenderFlexibleBox::computeNextFlexLine):
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::localCaretRect):
+ (WebCore::RenderInline::generateCulledLineBoxRects):
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::resize):
+ * rendering/RenderListBox.cpp:
+ (WebCore::RenderListBox::computePreferredLogicalWidths):
+ (WebCore::RenderListBox::computeLogicalHeight):
+ * rendering/RenderMenuList.cpp:
+ (RenderMenuList::computePreferredLogicalWidths):
+ * rendering/RenderScrollbar.cpp:
+ (WebCore::RenderScrollbar::trackPieceRectWithMargins):
+ * rendering/RenderSlider.cpp:
+ (WebCore::RenderSlider::computePreferredLogicalWidths):
+ * rendering/RenderTextControl.cpp:
+ (WebCore::RenderTextControl::computeLogicalHeight):
+ * rendering/RenderTextControlSingleLine.cpp:
+ (WebCore::RenderTextControlSingleLine::layout):
+ * rendering/line/LineLayoutState.h:
+ (WebCore::FloatWithRect::FloatWithRect):
+ * rendering/shapes/ShapeInfo.cpp:
+ (WebCore::ShapeInfo<RenderType>::setReferenceBoxLogicalSize):
+ * rendering/svg/RenderSVGRoot.cpp:
+ (WebCore::RenderSVGRoot::updateCachedBoundaries):
+
+2014-02-20 Bem Jones-Bey <bjonesbe@adobe.com>
+
</ins><span class="cx"> Rename RenderBlockFlow::clearFloats and RenderBlockFlow::newLine to be more accurate
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=128991
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAppletElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAppletElement.cpp (164440 => 164441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAppletElement.cpp 2014-02-20 19:40:28 UTC (rev 164440)
+++ trunk/Source/WebCore/html/HTMLAppletElement.cpp 2014-02-20 20:01:19 UTC (rev 164441)
</span><span class="lines">@@ -114,9 +114,9 @@
</span><span class="cx"> RenderEmbeddedObject* renderer = renderEmbeddedObject();
</span><span class="cx">
</span><span class="cx"> LayoutUnit contentWidth = renderer->style().width().isFixed() ? LayoutUnit(renderer->style().width().value()) :
</span><del>- renderer->width() - renderer->borderAndPaddingWidth();
</del><ins>+ renderer->width() - renderer->horizontalBorderAndPaddingExtent();
</ins><span class="cx"> LayoutUnit contentHeight = renderer->style().height().isFixed() ? LayoutUnit(renderer->style().height().value()) :
</span><del>- renderer->height() - renderer->borderAndPaddingHeight();
</del><ins>+ renderer->height() - renderer->verticalBorderAndPaddingExtent();
</ins><span class="cx">
</span><span class="cx"> Vector<String> paramNames;
</span><span class="cx"> Vector<String> paramValues;
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlay.cpp (164440 => 164441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2014-02-20 19:40:28 UTC (rev 164440)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2014-02-20 20:01:19 UTC (rev 164441)
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> paddingBox.width() - renderInline->paddingLeft() - renderInline->paddingRight(), paddingBox.height() - renderInline->paddingTop() - renderInline->paddingBottom());
</span><span class="cx"> // Ignore marginTop and marginBottom for inlines.
</span><span class="cx"> marginBox = LayoutRect(borderBox.x() - renderInline->marginLeft(), borderBox.y(),
</span><del>- borderBox.width() + renderInline->marginWidth(), borderBox.height());
</del><ins>+ borderBox.width() + renderInline->horizontalMarginExtent(), borderBox.height());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FloatQuad absContentQuad;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (164440 => 164441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2014-02-20 19:40:28 UTC (rev 164440)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2014-02-20 20:01:19 UTC (rev 164441)
</span><span class="lines">@@ -1720,7 +1720,7 @@
</span><span class="cx"> for (auto it = cleanLineFloats->begin(), end = cleanLineFloats->end(); it != end; ++it) {
</span><span class="cx"> RenderBox* floatingBox = *it;
</span><span class="cx"> floatingBox->layoutIfNeeded();
</span><del>- LayoutSize newSize(floatingBox->width() + floatingBox->marginWidth(), floatingBox->height() + floatingBox->marginHeight());
</del><ins>+ LayoutSize newSize(floatingBox->width() + floatingBox->horizontalMarginExtent(), floatingBox->height() + floatingBox->verticalMarginExtent());
</ins><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(floatIndex < floats.size());
</span><span class="cx"> if (&floats[floatIndex].object != floatingBox) {
</span><span class="cx"> encounteredNewFloat = true;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (164440 => 164441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2014-02-20 19:40:28 UTC (rev 164440)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2014-02-20 20:01:19 UTC (rev 164441)
</span><span class="lines">@@ -1582,8 +1582,8 @@
</span><span class="cx">
</span><span class="cx"> rendererRect = LayoutRect(-layerRenderer->marginLeft(),
</span><span class="cx"> -layerRenderer->marginTop(),
</span><del>- std::max(layerRenderer->width() + layerRenderer->marginWidth() + layerRenderer->borderLeft() + layerRenderer->borderRight(), rw),
- std::max(layerRenderer->height() + layerRenderer->marginHeight() + layerRenderer->borderTop() + layerRenderer->borderBottom(), rh));
</del><ins>+ std::max(layerRenderer->width() + layerRenderer->horizontalMarginExtent() + layerRenderer->borderLeft() + layerRenderer->borderRight(), rw),
+ std::max(layerRenderer->height() + layerRenderer->verticalMarginExtent() + layerRenderer->borderTop() + layerRenderer->borderBottom(), rh));
</ins><span class="cx"> } else {
</span><span class="cx"> layerRenderer = this;
</span><span class="cx"> rendererRect = borderBoxRect();
</span><span class="lines">@@ -4116,8 +4116,8 @@
</span><span class="cx"> return createVisiblePosition(nonPseudoElement() ? firstPositionInOrBeforeNode(nonPseudoElement()) : Position());
</span><span class="cx">
</span><span class="cx"> if (isTable() && nonPseudoElement()) {
</span><del>- LayoutUnit right = contentWidth() + borderAndPaddingWidth();
- LayoutUnit bottom = contentHeight() + borderAndPaddingHeight();
</del><ins>+ LayoutUnit right = contentWidth() + horizontalBorderAndPaddingExtent();
+ LayoutUnit bottom = contentHeight() + verticalBorderAndPaddingExtent();
</ins><span class="cx">
</span><span class="cx"> if (point.x() < 0 || point.x() > right || point.y() < 0 || point.y() > bottom) {
</span><span class="cx"> if (point.x() <= right / 2)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.h (164440 => 164441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2014-02-20 19:40:28 UTC (rev 164440)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2014-02-20 20:01:19 UTC (rev 164441)
</span><span class="lines">@@ -117,8 +117,8 @@
</span><span class="cx"> virtual LayoutUnit borderBottom() const { return style().borderBottomWidth(); }
</span><span class="cx"> virtual LayoutUnit borderLeft() const { return style().borderLeftWidth(); }
</span><span class="cx"> virtual LayoutUnit borderRight() const { return style().borderRightWidth(); }
</span><del>- virtual LayoutUnit borderWidth() const { return borderLeft() + borderRight(); }
- virtual LayoutUnit borderHeight() const { return borderTop() + borderBottom(); }
</del><ins>+ virtual LayoutUnit horizontalBorderExtent() const { return borderLeft() + borderRight(); }
+ virtual LayoutUnit verticalBorderExtent() const { return borderTop() + borderBottom(); }
</ins><span class="cx"> virtual LayoutUnit borderBefore() const { return style().borderBeforeWidth(); }
</span><span class="cx"> virtual LayoutUnit borderAfter() const { return style().borderAfterWidth(); }
</span><span class="cx"> virtual LayoutUnit borderStart() const { return style().borderStartWidth(); }
</span><span class="lines">@@ -128,8 +128,8 @@
</span><span class="cx"> LayoutUnit borderAndPaddingBefore() const { return borderBefore() + paddingBefore(); }
</span><span class="cx"> LayoutUnit borderAndPaddingAfter() const { return borderAfter() + paddingAfter(); }
</span><span class="cx">
</span><del>- LayoutUnit borderAndPaddingHeight() const { return borderTop() + borderBottom() + paddingTop() + paddingBottom(); }
- LayoutUnit borderAndPaddingWidth() const { return borderLeft() + borderRight() + paddingLeft() + paddingRight(); }
</del><ins>+ LayoutUnit verticalBorderAndPaddingExtent() const { return borderTop() + borderBottom() + paddingTop() + paddingBottom(); }
+ LayoutUnit horizontalBorderAndPaddingExtent() const { return borderLeft() + borderRight() + paddingLeft() + paddingRight(); }
</ins><span class="cx"> LayoutUnit borderAndPaddingLogicalHeight() const { return borderAndPaddingBefore() + borderAndPaddingAfter(); }
</span><span class="cx"> LayoutUnit borderAndPaddingLogicalWidth() const { return borderStart() + borderEnd() + paddingStart() + paddingEnd(); }
</span><span class="cx"> LayoutUnit borderAndPaddingLogicalLeft() const { return style().isHorizontalWritingMode() ? borderLeft() + paddingLeft() : borderTop() + paddingTop(); }
</span><span class="lines">@@ -152,8 +152,8 @@
</span><span class="cx"> virtual LayoutUnit marginAfter(const RenderStyle* otherStyle = 0) const = 0;
</span><span class="cx"> virtual LayoutUnit marginStart(const RenderStyle* otherStyle = 0) const = 0;
</span><span class="cx"> virtual LayoutUnit marginEnd(const RenderStyle* otherStyle = 0) const = 0;
</span><del>- LayoutUnit marginHeight() const { return marginTop() + marginBottom(); }
- LayoutUnit marginWidth() const { return marginLeft() + marginRight(); }
</del><ins>+ LayoutUnit verticalMarginExtent() const { return marginTop() + marginBottom(); }
+ LayoutUnit horizontalMarginExtent() const { return marginLeft() + marginRight(); }
</ins><span class="cx"> LayoutUnit marginLogicalHeight() const { return marginBefore() + marginAfter(); }
</span><span class="cx"> LayoutUnit marginLogicalWidth() const { return marginStart() + marginEnd(); }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderDeprecatedFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (164440 => 164441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2014-02-20 19:40:28 UTC (rev 164440)
+++ trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2014-02-20 20:01:19 UTC (rev 164441)
</span><span class="lines">@@ -443,7 +443,7 @@
</span><span class="cx"> if (ascent == -1)
</span><span class="cx"> ascent = child->height() + child->marginBottom();
</span><span class="cx"> ascent += child->marginTop();
</span><del>- LayoutUnit descent = (child->height() + child->marginHeight()) - ascent;
</del><ins>+ LayoutUnit descent = (child->height() + child->verticalMarginExtent()) - ascent;
</ins><span class="cx">
</span><span class="cx"> // Update our maximum ascent.
</span><span class="cx"> maxAscent = std::max(maxAscent, ascent);
</span><span class="lines">@@ -455,7 +455,7 @@
</span><span class="cx"> setHeight(std::max(yPos + maxAscent + maxDescent, height()));
</span><span class="cx"> }
</span><span class="cx"> else
</span><del>- setHeight(std::max(height(), yPos + child->height() + child->marginHeight()));
</del><ins>+ setHeight(std::max(height(), yPos + child->height() + child->verticalMarginExtent()));
</ins><span class="cx"> }
</span><span class="cx"> ASSERT(childIndex == childLayoutDeltas.size());
</span><span class="cx">
</span><span class="lines">@@ -514,7 +514,7 @@
</span><span class="cx"> LayoutUnit childY = yPos;
</span><span class="cx"> switch (style().boxAlign()) {
</span><span class="cx"> case BCENTER:
</span><del>- childY += child->marginTop() + std::max<LayoutUnit>(0, (contentHeight() - (child->height() + child->marginHeight())) / 2);
</del><ins>+ childY += child->marginTop() + std::max<LayoutUnit>(0, (contentHeight() - (child->height() + child->verticalMarginExtent())) / 2);
</ins><span class="cx"> break;
</span><span class="cx"> case BBASELINE: {
</span><span class="cx"> LayoutUnit ascent = child->firstLineBaseline();
</span><span class="lines">@@ -760,7 +760,7 @@
</span><span class="cx"> switch (style().boxAlign()) {
</span><span class="cx"> case BCENTER:
</span><span class="cx"> case BBASELINE: // Baseline just maps to center for vertical boxes
</span><del>- childX += child->marginLeft() + std::max<LayoutUnit>(0, (contentWidth() - (child->width() + child->marginWidth())) / 2);
</del><ins>+ childX += child->marginLeft() + std::max<LayoutUnit>(0, (contentWidth() - (child->width() + child->horizontalMarginExtent())) / 2);
</ins><span class="cx"> break;
</span><span class="cx"> case BEND:
</span><span class="cx"> if (!style().isLeftToRightDirection())
</span><span class="lines">@@ -982,7 +982,7 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> child->setChildNeedsLayout(MarkOnlyThis);
</span><del>- child->setOverrideLogicalContentHeight(newHeight - child->borderAndPaddingHeight());
</del><ins>+ child->setOverrideLogicalContentHeight(newHeight - child->verticalBorderAndPaddingExtent());
</ins><span class="cx"> child->layoutIfNeeded();
</span><span class="cx">
</span><span class="cx"> // FIXME: For now don't support RTL.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFieldsetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFieldset.cpp (164440 => 164441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFieldset.cpp 2014-02-20 19:40:28 UTC (rev 164440)
+++ trunk/Source/WebCore/rendering/RenderFieldset.cpp 2014-02-20 20:01:19 UTC (rev 164441)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> if (legendMarginRight.isFixed())
</span><span class="cx"> legendMinWidth += legendMarginRight.value();
</span><span class="cx">
</span><del>- m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, legendMinWidth + borderAndPaddingWidth());
</del><ins>+ m_minPreferredLogicalWidth = std::max(m_minPreferredLogicalWidth, legendMinWidth + horizontalBorderAndPaddingExtent());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFileUploadControlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp (164440 => 164441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp 2014-02-20 19:40:28 UTC (rev 164440)
+++ trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp 2014-02-20 20:01:19 UTC (rev 164441)
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx"> m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().maxWidth().value()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- int toAdd = borderAndPaddingWidth();
</del><ins>+ int toAdd = horizontalBorderAndPaddingExtent();
</ins><span class="cx"> m_minPreferredLogicalWidth += toAdd;
</span><span class="cx"> m_maxPreferredLogicalWidth += toAdd;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (164440 => 164441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2014-02-20 19:40:28 UTC (rev 164440)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2014-02-20 20:01:19 UTC (rev 164441)
</span><span class="lines">@@ -634,7 +634,7 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderFlexibleBox::crossAxisMarginExtentForChild(RenderBox& child) const
</span><span class="cx"> {
</span><del>- return isHorizontalFlow() ? child.marginHeight() : child.marginWidth();
</del><ins>+ return isHorizontalFlow() ? child.verticalMarginExtent() : child.horizontalMarginExtent();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderFlexibleBox::crossAxisScrollbarExtent() const
</span><span class="lines">@@ -657,7 +657,7 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderFlexibleBox::mainAxisBorderAndPaddingExtentForChild(RenderBox& child) const
</span><span class="cx"> {
</span><del>- return isHorizontalFlow() ? child.borderAndPaddingWidth() : child.borderAndPaddingHeight();
</del><ins>+ return isHorizontalFlow() ? child.horizontalBorderAndPaddingExtent() : child.verticalBorderAndPaddingExtent();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderFlexibleBox::mainAxisScrollbarExtentForChild(RenderBox& child) const
</span><span class="lines">@@ -901,7 +901,7 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit childMainAxisExtent = preferredMainAxisContentExtentForChild(*child, hasInfiniteLineLength);
</span><span class="cx"> LayoutUnit childMainAxisMarginBoxExtent = mainAxisBorderAndPaddingExtentForChild(*child) + childMainAxisExtent;
</span><del>- childMainAxisMarginBoxExtent += isHorizontalFlow() ? child->marginWidth() : child->marginHeight();
</del><ins>+ childMainAxisMarginBoxExtent += isHorizontalFlow() ? child->horizontalMarginExtent() : child->verticalMarginExtent();
</ins><span class="cx">
</span><span class="cx"> if (isMultiline() && preferredMainAxisExtent + childMainAxisMarginBoxExtent > lineBreakLength && lineHasInFlowItem)
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderInlinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (164440 => 164441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderInline.cpp 2014-02-20 19:40:28 UTC (rev 164440)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2014-02-20 20:01:19 UTC (rev 164441)
</span><span class="lines">@@ -249,7 +249,7 @@
</span><span class="cx"> if (extraWidthToEndOfLine)
</span><span class="cx"> *extraWidthToEndOfLine = 0;
</span><span class="cx">
</span><del>- LayoutRect caretRect = localCaretRectForEmptyElement(borderAndPaddingWidth(), 0);
</del><ins>+ LayoutRect caretRect = localCaretRectForEmptyElement(horizontalBorderAndPaddingExtent(), 0);
</ins><span class="cx">
</span><span class="cx"> if (InlineBox* firstBox = firstLineBox())
</span><span class="cx"> caretRect.moveBy(roundedLayoutPoint(firstBox->topLeft()));
</span><span class="lines">@@ -573,9 +573,9 @@
</span><span class="cx"> int logicalTop = rootBox.logicalTop() + (rootBox.lineStyle().font().fontMetrics().ascent() - containerStyle.font().fontMetrics().ascent());
</span><span class="cx"> int logicalHeight = containerStyle.font().fontMetrics().height();
</span><span class="cx"> if (isHorizontal)
</span><del>- yield(FloatRect(currBox->inlineBoxWrapper()->x() - currBox->marginLeft(), logicalTop, currBox->width() + currBox->marginWidth(), logicalHeight));
</del><ins>+ yield(FloatRect(currBox->inlineBoxWrapper()->x() - currBox->marginLeft(), logicalTop, currBox->width() + currBox->horizontalMarginExtent(), logicalHeight));
</ins><span class="cx"> else
</span><del>- yield(FloatRect(logicalTop, currBox->inlineBoxWrapper()->y() - currBox->marginTop(), logicalHeight, currBox->height() + currBox->marginHeight()));
</del><ins>+ yield(FloatRect(logicalTop, currBox->inlineBoxWrapper()->y() - currBox->marginTop(), logicalHeight, currBox->height() + currBox->verticalMarginExtent()));
</ins><span class="cx"> }
</span><span class="cx"> } else if (curr->isRenderInline()) {
</span><span class="cx"> // If the child doesn't need line boxes either, then we can recur.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (164440 => 164441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-02-20 19:40:28 UTC (rev 164440)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-02-20 20:01:19 UTC (rev 164441)
</span><span class="lines">@@ -2565,7 +2565,7 @@
</span><span class="cx"> styledElement->setInlineStyleProperty(CSSPropertyMarginLeft, renderer->marginLeft() / zoomFactor, CSSPrimitiveValue::CSS_PX);
</span><span class="cx"> styledElement->setInlineStyleProperty(CSSPropertyMarginRight, renderer->marginRight() / zoomFactor, CSSPrimitiveValue::CSS_PX);
</span><span class="cx"> }
</span><del>- LayoutUnit baseWidth = renderer->width() - (isBoxSizingBorder ? LayoutUnit() : renderer->borderAndPaddingWidth());
</del><ins>+ LayoutUnit baseWidth = renderer->width() - (isBoxSizingBorder ? LayoutUnit() : renderer->horizontalBorderAndPaddingExtent());
</ins><span class="cx"> baseWidth = baseWidth / zoomFactor;
</span><span class="cx"> styledElement->setInlineStyleProperty(CSSPropertyWidth, roundToInt(baseWidth + difference.width()), CSSPrimitiveValue::CSS_PX);
</span><span class="cx"> }
</span><span class="lines">@@ -2576,7 +2576,7 @@
</span><span class="cx"> styledElement->setInlineStyleProperty(CSSPropertyMarginTop, renderer->marginTop() / zoomFactor, CSSPrimitiveValue::CSS_PX);
</span><span class="cx"> styledElement->setInlineStyleProperty(CSSPropertyMarginBottom, renderer->marginBottom() / zoomFactor, CSSPrimitiveValue::CSS_PX);
</span><span class="cx"> }
</span><del>- LayoutUnit baseHeight = renderer->height() - (isBoxSizingBorder ? LayoutUnit() : renderer->borderAndPaddingHeight());
</del><ins>+ LayoutUnit baseHeight = renderer->height() - (isBoxSizingBorder ? LayoutUnit() : renderer->verticalBorderAndPaddingExtent());
</ins><span class="cx"> baseHeight = baseHeight / zoomFactor;
</span><span class="cx"> styledElement->setInlineStyleProperty(CSSPropertyHeight, roundToInt(baseHeight + difference.height()), CSSPrimitiveValue::CSS_PX);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp (164440 => 164441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.cpp 2014-02-20 19:40:28 UTC (rev 164440)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp 2014-02-20 20:01:19 UTC (rev 164441)
</span><span class="lines">@@ -219,7 +219,7 @@
</span><span class="cx"> m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().maxWidth().value()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- LayoutUnit toAdd = borderAndPaddingWidth();
</del><ins>+ LayoutUnit toAdd = horizontalBorderAndPaddingExtent();
</ins><span class="cx"> m_minPreferredLogicalWidth += toAdd;
</span><span class="cx"> m_maxPreferredLogicalWidth += toAdd;
</span><span class="cx">
</span><span class="lines">@@ -253,7 +253,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderListBox::computeLogicalHeight(LayoutUnit, LayoutUnit logicalTop, LogicalExtentComputedValues& computedValues) const
</span><span class="cx"> {
</span><del>- LayoutUnit height = itemHeight() * size() - rowSpacing + borderAndPaddingHeight();
</del><ins>+ LayoutUnit height = itemHeight() * size() - rowSpacing + verticalBorderAndPaddingExtent();
</ins><span class="cx"> RenderBox::computeLogicalHeight(height, logicalTop, computedValues);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMenuListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMenuList.cpp (164440 => 164441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMenuList.cpp 2014-02-20 19:40:28 UTC (rev 164440)
+++ trunk/Source/WebCore/rendering/RenderMenuList.cpp 2014-02-20 20:01:19 UTC (rev 164441)
</span><span class="lines">@@ -344,7 +344,7 @@
</span><span class="cx"> m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().maxWidth().value()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- LayoutUnit toAdd = borderAndPaddingWidth();
</del><ins>+ LayoutUnit toAdd = horizontalBorderAndPaddingExtent();
</ins><span class="cx"> m_minPreferredLogicalWidth += toAdd;
</span><span class="cx"> m_maxPreferredLogicalWidth += toAdd;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderScrollbarcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderScrollbar.cpp (164440 => 164441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderScrollbar.cpp 2014-02-20 19:40:28 UTC (rev 164440)
+++ trunk/Source/WebCore/rendering/RenderScrollbar.cpp 2014-02-20 20:01:19 UTC (rev 164441)
</span><span class="lines">@@ -325,10 +325,10 @@
</span><span class="cx"> IntRect rect = oldRect;
</span><span class="cx"> if (orientation() == HorizontalScrollbar) {
</span><span class="cx"> rect.setX(rect.x() + partRenderer->marginLeft());
</span><del>- rect.setWidth(rect.width() - partRenderer->marginWidth());
</del><ins>+ rect.setWidth(rect.width() - partRenderer->horizontalMarginExtent());
</ins><span class="cx"> } else {
</span><span class="cx"> rect.setY(rect.y() + partRenderer->marginTop());
</span><del>- rect.setHeight(rect.height() - partRenderer->marginHeight());
</del><ins>+ rect.setHeight(rect.height() - partRenderer->verticalMarginExtent());
</ins><span class="cx"> }
</span><span class="cx"> return rect;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderSlidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderSlider.cpp (164440 => 164441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderSlider.cpp 2014-02-20 19:40:28 UTC (rev 164440)
+++ trunk/Source/WebCore/rendering/RenderSlider.cpp 2014-02-20 20:01:19 UTC (rev 164441)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> m_minPreferredLogicalWidth = std::min(m_minPreferredLogicalWidth, adjustContentBoxLogicalWidthForBoxSizing(style().maxWidth().value()));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- LayoutUnit toAdd = borderAndPaddingWidth();
</del><ins>+ LayoutUnit toAdd = horizontalBorderAndPaddingExtent();
</ins><span class="cx"> m_minPreferredLogicalWidth += toAdd;
</span><span class="cx"> m_maxPreferredLogicalWidth += toAdd;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextControlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextControl.cpp (164440 => 164441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextControl.cpp 2014-02-20 19:40:28 UTC (rev 164440)
+++ trunk/Source/WebCore/rendering/RenderTextControl.cpp 2014-02-20 20:01:19 UTC (rev 164441)
</span><span class="lines">@@ -153,8 +153,8 @@
</span><span class="cx"> TextControlInnerTextElement* innerText = innerTextElement();
</span><span class="cx"> ASSERT(innerText);
</span><span class="cx"> if (RenderBox* innerTextBox = innerText->renderBox()) {
</span><del>- LayoutUnit nonContentHeight = innerTextBox->borderAndPaddingHeight() + innerTextBox->marginHeight();
- logicalHeight = computeControlLogicalHeight(innerTextBox->lineHeight(true, HorizontalLine, PositionOfInteriorLineBoxes), nonContentHeight) + borderAndPaddingHeight();
</del><ins>+ LayoutUnit nonContentHeight = innerTextBox->verticalBorderAndPaddingExtent() + innerTextBox->verticalMarginExtent();
+ logicalHeight = computeControlLogicalHeight(innerTextBox->lineHeight(true, HorizontalLine, PositionOfInteriorLineBoxes), nonContentHeight) + verticalBorderAndPaddingExtent();
</ins><span class="cx">
</span><span class="cx"> // We are able to have a horizontal scrollbar if the overflow style is scroll, or if its auto and there's no word wrap.
</span><span class="cx"> if ((isHorizontalWritingMode() && (style().overflowX() == OSCROLL || (style().overflowX() == OAUTO && innerText->renderer()->style().overflowWrap() == NormalOverflowWrap)))
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextControlSingleLinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp (164440 => 164441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp 2014-02-20 19:40:28 UTC (rev 164440)
+++ trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp 2014-02-20 20:01:19 UTC (rev 164441)
</span><span class="lines">@@ -197,8 +197,8 @@
</span><span class="cx"> LayoutSize innerTextSize;
</span><span class="cx"> if (innerTextRenderer)
</span><span class="cx"> innerTextSize = innerTextRenderer->size();
</span><del>- placeholderBox->style().setWidth(Length(innerTextSize.width() - placeholderBox->borderAndPaddingWidth(), Fixed));
- placeholderBox->style().setHeight(Length(innerTextSize.height() - placeholderBox->borderAndPaddingHeight(), Fixed));
</del><ins>+ placeholderBox->style().setWidth(Length(innerTextSize.width() - placeholderBox->horizontalBorderAndPaddingExtent(), Fixed));
+ placeholderBox->style().setHeight(Length(innerTextSize.height() - placeholderBox->verticalBorderAndPaddingExtent(), Fixed));
</ins><span class="cx"> bool neededLayout = placeholderBox->needsLayout();
</span><span class="cx"> bool placeholderBoxHadLayout = placeholderBox->everHadLayout();
</span><span class="cx"> placeholderBox->layoutIfNeeded();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineLineLayoutStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/LineLayoutState.h (164440 => 164441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/LineLayoutState.h 2014-02-20 19:40:28 UTC (rev 164440)
+++ trunk/Source/WebCore/rendering/line/LineLayoutState.h 2014-02-20 20:01:19 UTC (rev 164441)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> struct FloatWithRect {
</span><span class="cx"> FloatWithRect(RenderBox& f)
</span><span class="cx"> : object(f)
</span><del>- , rect(LayoutRect(f.x() - f.marginLeft(), f.y() - f.marginTop(), f.width() + f.marginWidth(), f.height() + f.marginHeight()))
</del><ins>+ , rect(LayoutRect(f.x() - f.marginLeft(), f.y() - f.marginTop(), f.width() + f.horizontalMarginExtent(), f.height() + f.verticalMarginExtent()))
</ins><span class="cx"> , everHadLayout(f.everHadLayout())
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingshapesShapeInfocpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/shapes/ShapeInfo.cpp (164440 => 164441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/shapes/ShapeInfo.cpp 2014-02-20 19:40:28 UTC (rev 164440)
+++ trunk/Source/WebCore/rendering/shapes/ShapeInfo.cpp 2014-02-20 20:01:19 UTC (rev 164441)
</span><span class="lines">@@ -49,23 +49,23 @@
</span><span class="cx"> switch (referenceBox()) {
</span><span class="cx"> case MarginBox:
</span><span class="cx"> if (isHorizontalWritingMode)
</span><del>- newReferenceBoxLogicalSize.expand(m_renderer.marginWidth(), m_renderer.marginHeight());
</del><ins>+ newReferenceBoxLogicalSize.expand(m_renderer.horizontalMarginExtent(), m_renderer.verticalMarginExtent());
</ins><span class="cx"> else
</span><del>- newReferenceBoxLogicalSize.expand(m_renderer.marginHeight(), m_renderer.marginWidth());
</del><ins>+ newReferenceBoxLogicalSize.expand(m_renderer.verticalMarginExtent(), m_renderer.horizontalMarginExtent());
</ins><span class="cx"> break;
</span><span class="cx"> case BorderBox:
</span><span class="cx"> break;
</span><span class="cx"> case PaddingBox:
</span><span class="cx"> if (isHorizontalWritingMode)
</span><del>- newReferenceBoxLogicalSize.shrink(m_renderer.borderWidth(), m_renderer.borderHeight());
</del><ins>+ newReferenceBoxLogicalSize.shrink(m_renderer.horizontalBorderExtent(), m_renderer.verticalBorderExtent());
</ins><span class="cx"> else
</span><del>- newReferenceBoxLogicalSize.shrink(m_renderer.borderHeight(), m_renderer.borderWidth());
</del><ins>+ newReferenceBoxLogicalSize.shrink(m_renderer.verticalBorderExtent(), m_renderer.horizontalBorderExtent());
</ins><span class="cx"> break;
</span><span class="cx"> case ContentBox:
</span><span class="cx"> if (isHorizontalWritingMode)
</span><del>- newReferenceBoxLogicalSize.shrink(m_renderer.borderAndPaddingWidth(), m_renderer.borderAndPaddingHeight());
</del><ins>+ newReferenceBoxLogicalSize.shrink(m_renderer.horizontalBorderAndPaddingExtent(), m_renderer.verticalBorderAndPaddingExtent());
</ins><span class="cx"> else
</span><del>- newReferenceBoxLogicalSize.shrink(m_renderer.borderAndPaddingHeight(), m_renderer.borderAndPaddingWidth());
</del><ins>+ newReferenceBoxLogicalSize.shrink(m_renderer.verticalBorderAndPaddingExtent(), m_renderer.horizontalBorderAndPaddingExtent());
</ins><span class="cx"> break;
</span><span class="cx"> case Fill:
</span><span class="cx"> case Stroke:
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGRootcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp (164440 => 164441)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2014-02-20 19:40:28 UTC (rev 164440)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2014-02-20 20:01:19 UTC (rev 164441)
</span><span class="lines">@@ -389,7 +389,7 @@
</span><span class="cx"> {
</span><span class="cx"> SVGRenderSupport::computeContainerBoundingBoxes(*this, m_objectBoundingBox, m_objectBoundingBoxValid, m_strokeBoundingBox, m_repaintBoundingBoxExcludingShadow);
</span><span class="cx"> SVGRenderSupport::intersectRepaintRectWithResources(*this, m_repaintBoundingBoxExcludingShadow);
</span><del>- m_repaintBoundingBoxExcludingShadow.inflate(borderAndPaddingWidth());
</del><ins>+ m_repaintBoundingBoxExcludingShadow.inflate(horizontalBorderAndPaddingExtent());
</ins><span class="cx">
</span><span class="cx"> m_repaintBoundingBox = m_repaintBoundingBoxExcludingShadow;
</span><span class="cx"> SVGRenderSupport::intersectRepaintRectWithShadows(*this, m_repaintBoundingBox);
</span></span></pre>
</div>
</div>
</body>
</html>