<!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>[184055] 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/184055">184055</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-10 14:43:26 -0700 (Sun, 10 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename Length::isPercent() and Length::isPercentNotCalculated().
https://bugs.webkit.org/show_bug.cgi?id=144791
Patch by Sungmann Cho <sungmann.cho@navercorp.com> on 2015-05-10
Reviewed by Darin Adler.
1. Rename these methods as below for consistency and clarity.
Length::isPercentNotCalculated() => Length::isPercent()
Length::isPercent() => Length::isPercentOrCalculated()
2. Simplify the condition check of length type in SVGLengthContext::valueForLength().
"length.isPercent() && !length.isCalculated()" => "length.isPercent()"
No new tests, no behavior change.
* css/CSSComputedStyleDeclaration.cpp:
(WebCore::valueForImageSliceSide):
(WebCore::valueForReflection):
(WebCore::percentageOrZoomAdjustedValue):
(WebCore::lineHeightFromStyle):
(WebCore::ComputedStyleExtractor::propertyValue):
* html/HTMLPlugInImageElement.cpp:
(WebCore::is100Percent):
* page/animation/AnimationBase.cpp:
(WebCore::AnimationBase::computeTransformedExtentViaTransformList):
* platform/Length.h:
(WebCore::Length::percent):
(WebCore::Length::isPercent):
(WebCore::Length::isPercentOrCalculated):
(WebCore::Length::isSpecified):
(WebCore::Length::isPercentNotCalculated): Deleted.
* platform/graphics/transforms/TranslateTransformOperation.h:
* rendering/AutoTableLayout.cpp:
(WebCore::AutoTableLayout::recalcColumn):
(WebCore::AutoTableLayout::fullRecalc):
(WebCore::shouldScaleColumns):
(WebCore::AutoTableLayout::computeIntrinsicLogicalWidths):
(WebCore::AutoTableLayout::calcEffectiveLogicalWidth):
(WebCore::AutoTableLayout::layout):
* rendering/FixedTableLayout.cpp:
(WebCore::FixedTableLayout::calcWidthArray):
(WebCore::FixedTableLayout::applyPreferredLogicalWidthQuirks):
(WebCore::FixedTableLayout::layout):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::isSelfCollapsingBlock):
(WebCore::RenderBlock::textIndentOffset):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::needsPreferredWidthsRecalculation):
(WebCore::RenderBox::computeLogicalHeight):
(WebCore::RenderBox::computeContentAndScrollbarLogicalHeightUsing):
(WebCore::RenderBox::computePercentageLogicalHeight):
(WebCore::RenderBox::computeReplacedLogicalWidthRespectingMinMaxWidth):
(WebCore::RenderBox::computeReplacedLogicalWidthUsing):
(WebCore::RenderBox::computeReplacedLogicalHeightUsing):
(WebCore::RenderBox::availableLogicalHeightUsing):
(WebCore::logicalWidthIsResolvable):
(WebCore::RenderBox::percentageLogicalHeightIsResolvableFromBlock):
(WebCore::RenderBox::hasUnsplittableScrollingOverflow):
(WebCore::RenderBox::layoutOverflowRectForPropagation):
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::hasAutoHeightOrContainingBlockWithAutoHeight):
(WebCore::RenderBoxModelObject::relativePositionOffset):
(WebCore::RenderBoxModelObject::computedCSSPadding):
(WebCore::RenderBoxModelObject::calculateImageIntrinsicDimensions):
(WebCore::RenderBoxModelObject::calculateFillTileSize):
* rendering/RenderDeprecatedFlexibleBox.cpp:
(WebCore::RenderDeprecatedFlexibleBox::applyLineClamp):
(WebCore::RenderDeprecatedFlexibleBox::clearLineClamp):
* rendering/RenderElement.cpp:
(WebCore::mustRepaintFillLayers):
* rendering/RenderFileUploadControl.cpp:
(WebCore::RenderFileUploadControl::computeIntrinsicLogicalWidths):
* rendering/RenderFrameSet.cpp:
(WebCore::RenderFrameSet::layOutAxis):
* rendering/RenderImage.cpp:
(WebCore::RenderImage::repaintOrMarkForLayout):
* rendering/RenderInline.cpp:
(WebCore::computeMargin):
* rendering/RenderListBox.cpp:
(WebCore::RenderListBox::computeIntrinsicLogicalWidths):
* rendering/RenderMenuList.cpp:
(RenderMenuList::computeIntrinsicLogicalWidths):
* rendering/RenderObject.cpp:
(WebCore::objectIsRelayoutBoundary):
* rendering/RenderReplaced.cpp:
(WebCore::RenderReplaced::computePreferredLogicalWidths):
* rendering/RenderSlider.cpp:
(WebCore::RenderSlider::computeIntrinsicLogicalWidths):
* rendering/RenderTable.cpp:
(WebCore::RenderTable::convertStyleLogicalHeightToComputedHeight):
* rendering/RenderTableSection.cpp:
(WebCore::RenderTableSection::layoutRows):
* rendering/RenderTextControl.cpp:
(WebCore::RenderTextControl::computeIntrinsicLogicalWidths):
* rendering/RenderView.cpp:
(WebCore::RenderView::layout):
* rendering/RootInlineBox.cpp:
(WebCore::RootInlineBox::verticalPositionForBox):
* rendering/style/GridLength.h:
(WebCore::GridLength::isPercentage):
* rendering/style/GridTrackSize.h:
(WebCore::GridTrackSize::isPercentage):
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::computedLineHeight):
* rendering/svg/RenderSVGRoot.cpp:
(WebCore::RenderSVGRoot::hasRelativeDimensions):
* svg/SVGLengthContext.cpp:
(WebCore::SVGLengthContext::valueForLength):
* svg/graphics/SVGImage.cpp:
(WebCore::SVGImage::hasRelativeWidth):
(WebCore::SVGImage::hasRelativeHeight):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssCSSComputedStyleDeclarationcpp">trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPlugInImageElementcpp">trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCorepageanimationAnimationBasecpp">trunk/Source/WebCore/page/animation/AnimationBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLengthh">trunk/Source/WebCore/platform/Length.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicstransformsTranslateTransformOperationh">trunk/Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.h</a></li>
<li><a href="#trunkSourceWebCorerenderingAutoTableLayoutcpp">trunk/Source/WebCore/rendering/AutoTableLayout.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingFixedTableLayoutcpp">trunk/Source/WebCore/rendering/FixedTableLayout.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderDeprecatedFlexibleBoxcpp">trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFileUploadControlcpp">trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFrameSetcpp">trunk/Source/WebCore/rendering/RenderFrameSet.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderImagecpp">trunk/Source/WebCore/rendering/RenderImage.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderInlinecpp">trunk/Source/WebCore/rendering/RenderInline.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="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderReplacedcpp">trunk/Source/WebCore/rendering/RenderReplaced.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderSlidercpp">trunk/Source/WebCore/rendering/RenderSlider.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTablecpp">trunk/Source/WebCore/rendering/RenderTable.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTableSectioncpp">trunk/Source/WebCore/rendering/RenderTableSection.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextControlcpp">trunk/Source/WebCore/rendering/RenderTextControl.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderViewcpp">trunk/Source/WebCore/rendering/RenderView.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRootInlineBoxcpp">trunk/Source/WebCore/rendering/RootInlineBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleGridLengthh">trunk/Source/WebCore/rendering/style/GridLength.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleGridTrackSizeh">trunk/Source/WebCore/rendering/style/GridTrackSize.h</a></li>
<li><a href="#trunkSourceWebCorerenderingstyleRenderStylecpp">trunk/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingsvgRenderSVGRootcpp">trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGLengthContextcpp">trunk/Source/WebCore/svg/SVGLengthContext.cpp</a></li>
<li><a href="#trunkSourceWebCoresvggraphicsSVGImagecpp">trunk/Source/WebCore/svg/graphics/SVGImage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/ChangeLog 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -1,5 +1,120 @@
</span><span class="cx"> 2015-05-10 Sungmann Cho <sungmann.cho@navercorp.com>
</span><span class="cx">
</span><ins>+ Rename Length::isPercent() and Length::isPercentNotCalculated().
+ https://bugs.webkit.org/show_bug.cgi?id=144791
+
+ Reviewed by Darin Adler.
+
+ 1. Rename these methods as below for consistency and clarity.
+
+ Length::isPercentNotCalculated() => Length::isPercent()
+ Length::isPercent() => Length::isPercentOrCalculated()
+
+ 2. Simplify the condition check of length type in SVGLengthContext::valueForLength().
+
+ "length.isPercent() && !length.isCalculated()" => "length.isPercent()"
+
+ No new tests, no behavior change.
+
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::valueForImageSliceSide):
+ (WebCore::valueForReflection):
+ (WebCore::percentageOrZoomAdjustedValue):
+ (WebCore::lineHeightFromStyle):
+ (WebCore::ComputedStyleExtractor::propertyValue):
+ * html/HTMLPlugInImageElement.cpp:
+ (WebCore::is100Percent):
+ * page/animation/AnimationBase.cpp:
+ (WebCore::AnimationBase::computeTransformedExtentViaTransformList):
+ * platform/Length.h:
+ (WebCore::Length::percent):
+ (WebCore::Length::isPercent):
+ (WebCore::Length::isPercentOrCalculated):
+ (WebCore::Length::isSpecified):
+ (WebCore::Length::isPercentNotCalculated): Deleted.
+ * platform/graphics/transforms/TranslateTransformOperation.h:
+ * rendering/AutoTableLayout.cpp:
+ (WebCore::AutoTableLayout::recalcColumn):
+ (WebCore::AutoTableLayout::fullRecalc):
+ (WebCore::shouldScaleColumns):
+ (WebCore::AutoTableLayout::computeIntrinsicLogicalWidths):
+ (WebCore::AutoTableLayout::calcEffectiveLogicalWidth):
+ (WebCore::AutoTableLayout::layout):
+ * rendering/FixedTableLayout.cpp:
+ (WebCore::FixedTableLayout::calcWidthArray):
+ (WebCore::FixedTableLayout::applyPreferredLogicalWidthQuirks):
+ (WebCore::FixedTableLayout::layout):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::isSelfCollapsingBlock):
+ (WebCore::RenderBlock::textIndentOffset):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::needsPreferredWidthsRecalculation):
+ (WebCore::RenderBox::computeLogicalHeight):
+ (WebCore::RenderBox::computeContentAndScrollbarLogicalHeightUsing):
+ (WebCore::RenderBox::computePercentageLogicalHeight):
+ (WebCore::RenderBox::computeReplacedLogicalWidthRespectingMinMaxWidth):
+ (WebCore::RenderBox::computeReplacedLogicalWidthUsing):
+ (WebCore::RenderBox::computeReplacedLogicalHeightUsing):
+ (WebCore::RenderBox::availableLogicalHeightUsing):
+ (WebCore::logicalWidthIsResolvable):
+ (WebCore::RenderBox::percentageLogicalHeightIsResolvableFromBlock):
+ (WebCore::RenderBox::hasUnsplittableScrollingOverflow):
+ (WebCore::RenderBox::layoutOverflowRectForPropagation):
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::hasAutoHeightOrContainingBlockWithAutoHeight):
+ (WebCore::RenderBoxModelObject::relativePositionOffset):
+ (WebCore::RenderBoxModelObject::computedCSSPadding):
+ (WebCore::RenderBoxModelObject::calculateImageIntrinsicDimensions):
+ (WebCore::RenderBoxModelObject::calculateFillTileSize):
+ * rendering/RenderDeprecatedFlexibleBox.cpp:
+ (WebCore::RenderDeprecatedFlexibleBox::applyLineClamp):
+ (WebCore::RenderDeprecatedFlexibleBox::clearLineClamp):
+ * rendering/RenderElement.cpp:
+ (WebCore::mustRepaintFillLayers):
+ * rendering/RenderFileUploadControl.cpp:
+ (WebCore::RenderFileUploadControl::computeIntrinsicLogicalWidths):
+ * rendering/RenderFrameSet.cpp:
+ (WebCore::RenderFrameSet::layOutAxis):
+ * rendering/RenderImage.cpp:
+ (WebCore::RenderImage::repaintOrMarkForLayout):
+ * rendering/RenderInline.cpp:
+ (WebCore::computeMargin):
+ * rendering/RenderListBox.cpp:
+ (WebCore::RenderListBox::computeIntrinsicLogicalWidths):
+ * rendering/RenderMenuList.cpp:
+ (RenderMenuList::computeIntrinsicLogicalWidths):
+ * rendering/RenderObject.cpp:
+ (WebCore::objectIsRelayoutBoundary):
+ * rendering/RenderReplaced.cpp:
+ (WebCore::RenderReplaced::computePreferredLogicalWidths):
+ * rendering/RenderSlider.cpp:
+ (WebCore::RenderSlider::computeIntrinsicLogicalWidths):
+ * rendering/RenderTable.cpp:
+ (WebCore::RenderTable::convertStyleLogicalHeightToComputedHeight):
+ * rendering/RenderTableSection.cpp:
+ (WebCore::RenderTableSection::layoutRows):
+ * rendering/RenderTextControl.cpp:
+ (WebCore::RenderTextControl::computeIntrinsicLogicalWidths):
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::layout):
+ * rendering/RootInlineBox.cpp:
+ (WebCore::RootInlineBox::verticalPositionForBox):
+ * rendering/style/GridLength.h:
+ (WebCore::GridLength::isPercentage):
+ * rendering/style/GridTrackSize.h:
+ (WebCore::GridTrackSize::isPercentage):
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::computedLineHeight):
+ * rendering/svg/RenderSVGRoot.cpp:
+ (WebCore::RenderSVGRoot::hasRelativeDimensions):
+ * svg/SVGLengthContext.cpp:
+ (WebCore::SVGLengthContext::valueForLength):
+ * svg/graphics/SVGImage.cpp:
+ (WebCore::SVGImage::hasRelativeWidth):
+ (WebCore::SVGImage::hasRelativeHeight):
+
+2015-05-10 Sungmann Cho <sungmann.cho@navercorp.com>
+
</ins><span class="cx"> Remove unnecessary semicolons.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=144844
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSComputedStyleDeclarationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -483,7 +483,7 @@
</span><span class="cx"> {
</span><span class="cx"> // These values can be percentages, numbers, or while an animation of mixed types is in progress,
</span><span class="cx"> // a calculation that combines a percentage and a number.
</span><del>- if (length.isPercentNotCalculated())
</del><ins>+ if (length.isPercent())
</ins><span class="cx"> return cssValuePool().createValue(length.percent(), CSSPrimitiveValue::CSS_PERCENTAGE);
</span><span class="cx"> if (length.isFixed())
</span><span class="cx"> return cssValuePool().createValue(length.value(), CSSPrimitiveValue::CSS_NUMBER);
</span><span class="lines">@@ -646,7 +646,7 @@
</span><span class="cx"> return cssValuePool().createIdentifierValue(CSSValueNone);
</span><span class="cx">
</span><span class="cx"> RefPtr<CSSPrimitiveValue> offset;
</span><del>- if (reflection->offset().isPercent())
</del><ins>+ if (reflection->offset().isPercentOrCalculated())
</ins><span class="cx"> offset = cssValuePool().createValue(reflection->offset().percent(), CSSPrimitiveValue::CSS_PERCENTAGE);
</span><span class="cx"> else
</span><span class="cx"> offset = zoomAdjustedPixelValue(reflection->offset().value(), style);
</span><span class="lines">@@ -736,7 +736,7 @@
</span><span class="cx">
</span><span class="cx"> static Ref<CSSPrimitiveValue> percentageOrZoomAdjustedValue(Length length, const RenderStyle* style)
</span><span class="cx"> {
</span><del>- if (length.isPercentNotCalculated())
</del><ins>+ if (length.isPercent())
</ins><span class="cx"> return cssValuePool().createValue(length.percent(), CSSPrimitiveValue::CSS_PERCENTAGE);
</span><span class="cx">
</span><span class="cx"> return zoomAdjustedPixelValue(valueForLength(length, 0), style);
</span><span class="lines">@@ -1559,7 +1559,7 @@
</span><span class="cx"> Length length = style->lineHeight();
</span><span class="cx"> if (length.isNegative()) // If true, line-height not set; use the font's line spacing.
</span><span class="cx"> return zoomAdjustedPixelValue(style->fontMetrics().floatLineSpacing(), style);
</span><del>- if (length.isPercentNotCalculated()) {
</del><ins>+ if (length.isPercent()) {
</ins><span class="cx"> // This is imperfect, because it doesn't include the zoom factor and the real computation
</span><span class="cx"> // for how high to be in pixels does include things like minimum font size and the zoom factor.
</span><span class="cx"> // On the other hand, since font-size doesn't include the zoom factor, we really can't do
</span><span class="lines">@@ -2429,7 +2429,7 @@
</span><span class="cx"> if (marginRight.isFixed() || !is<RenderBox>(renderer))
</span><span class="cx"> return zoomAdjustedPixelValueForLength(marginRight, style.get());
</span><span class="cx"> float value;
</span><del>- if (marginRight.isPercent()) {
</del><ins>+ if (marginRight.isPercentOrCalculated()) {
</ins><span class="cx"> // RenderBox gives a marginRight() that is the distance between the right-edge of the child box
</span><span class="cx"> // and the right-edge of the containing box, when display == BLOCK. Let's calculate the absolute
</span><span class="cx"> // value of the specified margin-right % instead of relying on RenderBox's marginRight() value.
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPlugInImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -571,7 +571,7 @@
</span><span class="cx">
</span><span class="cx"> static inline bool is100Percent(Length length)
</span><span class="cx"> {
</span><del>- return length.isPercentNotCalculated() && length.percent() == 100;
</del><ins>+ return length.isPercent() && length.percent() == 100;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static inline bool isSmallerThanTinySizingThreshold(const RenderEmbeddedObject& renderer)
</span></span></pre></div>
<a id="trunkSourceWebCorepageanimationAnimationBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/animation/AnimationBase.cpp (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/animation/AnimationBase.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/page/animation/AnimationBase.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -778,8 +778,8 @@
</span><span class="cx">
</span><span class="cx"> bool applyTransformOrigin = containsRotation(style.transform().operations()) || style.transform().affectedByTransformOrigin();
</span><span class="cx"> if (applyTransformOrigin) {
</span><del>- float offsetX = style.transformOriginX().isPercentNotCalculated() ? rendererBox.x() : 0;
- float offsetY = style.transformOriginY().isPercentNotCalculated() ? rendererBox.y() : 0;
</del><ins>+ float offsetX = style.transformOriginX().isPercent() ? rendererBox.x() : 0;
+ float offsetY = style.transformOriginY().isPercent() ? rendererBox.y() : 0;
</ins><span class="cx">
</span><span class="cx"> transformOrigin.setX(floatValueForLength(style.transformOriginX(), rendererBox.width()) + offsetX);
</span><span class="cx"> transformOrigin.setY(floatValueForLength(style.transformOriginY(), rendererBox.height()) + offsetY);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLengthh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/Length.h (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/Length.h 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/platform/Length.h 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> bool isFixed() const;
</span><span class="cx"> bool isMaxContent() const;
</span><span class="cx"> bool isMinContent() const;
</span><del>- bool isPercentNotCalculated() const; // FIXME: Rename to isPercent.
</del><ins>+ bool isPercent() const;
</ins><span class="cx"> bool isRelative() const;
</span><span class="cx"> bool isUndefined() const;
</span><span class="cx">
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> bool isPositive() const;
</span><span class="cx"> bool isNegative() const;
</span><span class="cx">
</span><del>- bool isPercent() const; // Returns true for both Percent and Calculated. FIXME: Find a better name for this.
</del><ins>+ bool isPercentOrCalculated() const; // Returns true for both Percent and Calculated.
</ins><span class="cx">
</span><span class="cx"> bool isIntrinsic() const;
</span><span class="cx"> bool isIntrinsicOrAuto() const;
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx">
</span><span class="cx"> inline float Length::percent() const
</span><span class="cx"> {
</span><del>- ASSERT(isPercentNotCalculated());
</del><ins>+ ASSERT(isPercent());
</ins><span class="cx"> return value();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -333,7 +333,7 @@
</span><span class="cx"> return m_isFloat ? (m_floatValue < 0) : (m_intValue < 0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool Length::isPercentNotCalculated() const
</del><ins>+inline bool Length::isPercent() const
</ins><span class="cx"> {
</span><span class="cx"> return type() == Percent;
</span><span class="cx"> }
</span><span class="lines">@@ -348,9 +348,9 @@
</span><span class="cx"> return type() == Undefined;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool Length::isPercent() const
</del><ins>+inline bool Length::isPercentOrCalculated() const
</ins><span class="cx"> {
</span><del>- return isPercentNotCalculated() || isCalculated();
</del><ins>+ return isPercent() || isCalculated();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool Length::isPositive() const
</span><span class="lines">@@ -392,7 +392,7 @@
</span><span class="cx">
</span><span class="cx"> inline bool Length::isSpecified() const
</span><span class="cx"> {
</span><del>- return isFixed() || isPercent();
</del><ins>+ return isFixed() || isPercentOrCalculated();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool Length::isSpecifiedOrIntrinsic() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicstransformsTranslateTransformOperationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.h (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.h 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/platform/graphics/transforms/TranslateTransformOperation.h 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> virtual bool apply(TransformationMatrix& transform, const FloatSize& borderBoxSize) const override
</span><span class="cx"> {
</span><span class="cx"> transform.translate3d(x(borderBoxSize), y(borderBoxSize), z(borderBoxSize));
</span><del>- return m_x.isPercentNotCalculated() || m_y.isPercentNotCalculated();
</del><ins>+ return m_x.isPercent() || m_y.isPercent();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual PassRefPtr<TransformOperation> blend(const TransformOperation* from, double progress, bool blendToIdentity = false) override;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingAutoTableLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/AutoTableLayout.cpp (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/AutoTableLayout.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/rendering/AutoTableLayout.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> switch (cellLogicalWidth.type()) {
</span><span class="cx"> case Fixed:
</span><span class="cx"> // ignore width=0
</span><del>- if (cellLogicalWidth.isPositive() && !columnLayout.logicalWidth.isPercent()) {
</del><ins>+ if (cellLogicalWidth.isPositive() && !columnLayout.logicalWidth.isPercentOrCalculated()) {
</ins><span class="cx"> int logicalWidth = cell->adjustBorderBoxLogicalWidthForBoxSizing(cellLogicalWidth.value());
</span><span class="cx"> if (columnLayout.logicalWidth.isFixed()) {
</span><span class="cx"> // Nav/IE weirdness
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case Percent:
</span><span class="cx"> m_hasPercent = true;
</span><del>- if (cellLogicalWidth.isPositive() && (!columnLayout.logicalWidth.isPercentNotCalculated() || cellLogicalWidth.percent() > columnLayout.logicalWidth.percent()))
</del><ins>+ if (cellLogicalWidth.isPositive() && (!columnLayout.logicalWidth.isPercent() || cellLogicalWidth.percent() > columnLayout.logicalWidth.percent()))
</ins><span class="cx"> columnLayout.logicalWidth = cellLogicalWidth;
</span><span class="cx"> break;
</span><span class="cx"> case Relative:
</span><span class="lines">@@ -159,7 +159,7 @@
</span><span class="cx"> Length colLogicalWidth = column->style().logicalWidth();
</span><span class="cx"> if (colLogicalWidth.isAuto())
</span><span class="cx"> colLogicalWidth = groupLogicalWidth;
</span><del>- if ((colLogicalWidth.isFixed() || colLogicalWidth.isPercent()) && colLogicalWidth.isZero())
</del><ins>+ if ((colLogicalWidth.isFixed() || colLogicalWidth.isPercentOrCalculated()) && colLogicalWidth.isZero())
</ins><span class="cx"> colLogicalWidth = Length();
</span><span class="cx"> unsigned effCol = m_table->colToEffCol(currentColumn);
</span><span class="cx"> unsigned span = column->span();
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> bool scale = true;
</span><span class="cx"> while (table) {
</span><span class="cx"> Length tableWidth = table->style().width();
</span><del>- if ((tableWidth.isAuto() || tableWidth.isPercent()) && !table->isOutOfFlowPositioned()) {
</del><ins>+ if ((tableWidth.isAuto() || tableWidth.isPercentOrCalculated()) && !table->isOutOfFlowPositioned()) {
</ins><span class="cx"> RenderBlock* containingBlock = table->containingBlock();
</span><span class="cx"> while (containingBlock && !is<RenderView>(*containingBlock) && !is<RenderTableCell>(*containingBlock)
</span><span class="cx"> && containingBlock->style().width().isAuto() && !containingBlock->isOutOfFlowPositioned())
</span><span class="lines">@@ -196,7 +196,7 @@
</span><span class="cx">
</span><span class="cx"> table = nullptr;
</span><span class="cx"> if (is<RenderTableCell>(containingBlock)
</span><del>- && (containingBlock->style().width().isAuto() || containingBlock->style().width().isPercent())) {
</del><ins>+ && (containingBlock->style().width().isAuto() || containingBlock->style().width().isPercentOrCalculated())) {
</ins><span class="cx"> RenderTableCell& cell = downcast<RenderTableCell>(*containingBlock);
</span><span class="cx"> if (cell.colSpan() > 1 || cell.table()->style().width().isAuto())
</span><span class="cx"> scale = false;
</span><span class="lines">@@ -230,7 +230,7 @@
</span><span class="cx"> minWidth += m_layoutStruct[i].effectiveMinLogicalWidth;
</span><span class="cx"> maxWidth += m_layoutStruct[i].effectiveMaxLogicalWidth;
</span><span class="cx"> if (scaleColumns) {
</span><del>- if (m_layoutStruct[i].effectiveLogicalWidth.isPercentNotCalculated()) {
</del><ins>+ if (m_layoutStruct[i].effectiveLogicalWidth.isPercent()) {
</ins><span class="cx"> float percent = std::min(m_layoutStruct[i].effectiveLogicalWidth.percent(), remainingPercent);
</span><span class="cx"> float logicalWidth = static_cast<float>(m_layoutStruct[i].effectiveMaxLogicalWidth) * 100 / std::max(percent, epsilon);
</span><span class="cx"> maxPercent = std::max(logicalWidth, maxPercent);
</span><span class="lines">@@ -323,7 +323,7 @@
</span><span class="cx"> // <tr><td>1</td><td colspan=2>2-3</tr>
</span><span class="cx"> // <tr><td>1</td><td colspan=2 width=100%>2-3</td></tr>
</span><span class="cx"> // </table>
</span><del>- if (!columnLayout.effectiveLogicalWidth.isPercentNotCalculated()) {
</del><ins>+ if (!columnLayout.effectiveLogicalWidth.isPercent()) {
</ins><span class="cx"> columnLayout.effectiveLogicalWidth = Length();
</span><span class="cx"> allColsArePercent = false;
</span><span class="cx"> } else
</span><span class="lines">@@ -341,7 +341,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // adjust table max width if needed
</span><del>- if (cellLogicalWidth.isPercentNotCalculated()) {
</del><ins>+ if (cellLogicalWidth.isPercent()) {
</ins><span class="cx"> if (totalPercent > cellLogicalWidth.percent() || allColsArePercent) {
</span><span class="cx"> // can't satify this condition, treat as variable
</span><span class="cx"> cellLogicalWidth = Length();
</span><span class="lines">@@ -352,12 +352,12 @@
</span><span class="cx"> float percentMissing = cellLogicalWidth.percent() - totalPercent;
</span><span class="cx"> int totalWidth = 0;
</span><span class="cx"> for (unsigned pos = effCol; pos < lastCol; ++pos) {
</span><del>- if (!m_layoutStruct[pos].effectiveLogicalWidth.isPercent())
</del><ins>+ if (!m_layoutStruct[pos].effectiveLogicalWidth.isPercentOrCalculated())
</ins><span class="cx"> totalWidth += m_layoutStruct[pos].effectiveMaxLogicalWidth;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (unsigned pos = effCol; pos < lastCol && totalWidth > 0; ++pos) {
</span><del>- if (!m_layoutStruct[pos].effectiveLogicalWidth.isPercent()) {
</del><ins>+ if (!m_layoutStruct[pos].effectiveLogicalWidth.isPercentOrCalculated()) {
</ins><span class="cx"> float percent = percentMissing * static_cast<float>(m_layoutStruct[pos].effectiveMaxLogicalWidth) / totalWidth;
</span><span class="cx"> totalWidth -= m_layoutStruct[pos].effectiveMaxLogicalWidth;
</span><span class="cx"> percentMissing -= percent;
</span><span class="lines">@@ -384,9 +384,9 @@
</span><span class="cx"> int allocatedMinLogicalWidth = 0;
</span><span class="cx"> int allocatedMaxLogicalWidth = 0;
</span><span class="cx"> for (unsigned pos = effCol; pos < lastCol; ++pos) {
</span><del>- ASSERT(m_layoutStruct[pos].logicalWidth.isPercentNotCalculated() || m_layoutStruct[pos].effectiveLogicalWidth.isPercentNotCalculated());
</del><ins>+ ASSERT(m_layoutStruct[pos].logicalWidth.isPercent() || m_layoutStruct[pos].effectiveLogicalWidth.isPercent());
</ins><span class="cx"> // |allColsArePercent| means that either the logicalWidth *or* the effectiveLogicalWidth are percents, handle both of them here.
</span><del>- float percent = m_layoutStruct[pos].logicalWidth.isPercentNotCalculated() ? m_layoutStruct[pos].logicalWidth.percent() : m_layoutStruct[pos].effectiveLogicalWidth.percent();
</del><ins>+ float percent = m_layoutStruct[pos].logicalWidth.isPercent() ? m_layoutStruct[pos].logicalWidth.percent() : m_layoutStruct[pos].effectiveLogicalWidth.percent();
</ins><span class="cx"> int columnMinLogicalWidth = static_cast<int>(percent * cellMinLogicalWidth / totalPercent);
</span><span class="cx"> int columnMaxLogicalWidth = static_cast<int>(percent * cellMaxLogicalWidth / totalPercent);
</span><span class="cx"> m_layoutStruct[pos].effectiveMinLogicalWidth = std::max(m_layoutStruct[pos].effectiveMinLogicalWidth, columnMinLogicalWidth);
</span><span class="lines">@@ -426,7 +426,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- if (!cellLogicalWidth.isPercent()) {
</del><ins>+ if (!cellLogicalWidth.isPercentOrCalculated()) {
</ins><span class="cx"> if (cellMaxLogicalWidth > spanMaxLogicalWidth) {
</span><span class="cx"> for (unsigned pos = effCol; spanMaxLogicalWidth >= 0 && pos < lastCol; ++pos) {
</span><span class="cx"> int colMaxLogicalWidth = std::max(m_layoutStruct[pos].effectiveMaxLogicalWidth, static_cast<int>(spanMaxLogicalWidth ? cellMaxLogicalWidth * static_cast<float>(m_layoutStruct[pos].effectiveMaxLogicalWidth) / spanMaxLogicalWidth : cellMaxLogicalWidth));
</span><span class="lines">@@ -541,7 +541,7 @@
</span><span class="cx"> if (available > 0 && havePercent) {
</span><span class="cx"> for (size_t i = 0; i < nEffCols; ++i) {
</span><span class="cx"> Length& logicalWidth = m_layoutStruct[i].effectiveLogicalWidth;
</span><del>- if (logicalWidth.isPercent()) {
</del><ins>+ if (logicalWidth.isPercentOrCalculated()) {
</ins><span class="cx"> int cellLogicalWidth = std::max<int>(m_layoutStruct[i].effectiveMinLogicalWidth, minimumValueForLength(logicalWidth, tableLogicalWidth));
</span><span class="cx"> available += m_layoutStruct[i].computedLogicalWidth - cellLogicalWidth;
</span><span class="cx"> m_layoutStruct[i].computedLogicalWidth = cellLogicalWidth;
</span><span class="lines">@@ -552,7 +552,7 @@
</span><span class="cx"> int excess = tableLogicalWidth * (totalPercent - 100) / 100;
</span><span class="cx"> for (unsigned i = nEffCols; i; ) {
</span><span class="cx"> --i;
</span><del>- if (m_layoutStruct[i].effectiveLogicalWidth.isPercent()) {
</del><ins>+ if (m_layoutStruct[i].effectiveLogicalWidth.isPercentOrCalculated()) {
</ins><span class="cx"> int cellLogicalWidth = m_layoutStruct[i].computedLogicalWidth;
</span><span class="cx"> int reduction = std::min(cellLogicalWidth, excess);
</span><span class="cx"> // the lines below might look inconsistent, but that's the way it's handled in mozilla
</span><span class="lines">@@ -620,7 +620,7 @@
</span><span class="cx"> if (available > 0 && m_hasPercent && totalPercent < 100) {
</span><span class="cx"> for (size_t i = 0; i < nEffCols; ++i) {
</span><span class="cx"> Length& logicalWidth = m_layoutStruct[i].effectiveLogicalWidth;
</span><del>- if (logicalWidth.isPercentNotCalculated()) {
</del><ins>+ if (logicalWidth.isPercent()) {
</ins><span class="cx"> int cellLogicalWidth = available * logicalWidth.percent() / totalPercent;
</span><span class="cx"> available -= cellLogicalWidth;
</span><span class="cx"> totalPercent -= logicalWidth.percent();
</span><span class="lines">@@ -733,14 +733,14 @@
</span><span class="cx"> for (unsigned i = nEffCols; i; ) {
</span><span class="cx"> --i;
</span><span class="cx"> Length& logicalWidth = m_layoutStruct[i].effectiveLogicalWidth;
</span><del>- if (logicalWidth.isPercent())
</del><ins>+ if (logicalWidth.isPercentOrCalculated())
</ins><span class="cx"> logicalWidthBeyondMin += m_layoutStruct[i].computedLogicalWidth - m_layoutStruct[i].effectiveMinLogicalWidth;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (unsigned i = nEffCols; i && logicalWidthBeyondMin > 0; ) {
</span><span class="cx"> --i;
</span><span class="cx"> Length& logicalWidth = m_layoutStruct[i].effectiveLogicalWidth;
</span><del>- if (logicalWidth.isPercent()) {
</del><ins>+ if (logicalWidth.isPercentOrCalculated()) {
</ins><span class="cx"> int minMaxDiff = m_layoutStruct[i].computedLogicalWidth - m_layoutStruct[i].effectiveMinLogicalWidth;
</span><span class="cx"> int reduce = available * minMaxDiff / logicalWidthBeyondMin;
</span><span class="cx"> m_layoutStruct[i].computedLogicalWidth += reduce;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingFixedTableLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/FixedTableLayout.cpp (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/FixedTableLayout.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/rendering/FixedTableLayout.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx"> }
</span><span class="cx"> spanInCurrentEffectiveColumn = m_table->spanOfEffCol(currentEffectiveColumn);
</span><span class="cx"> }
</span><del>- if ((colStyleLogicalWidth.isFixed() || colStyleLogicalWidth.isPercent()) && colStyleLogicalWidth.isPositive()) {
</del><ins>+ if ((colStyleLogicalWidth.isFixed() || colStyleLogicalWidth.isPercentOrCalculated()) && colStyleLogicalWidth.isPositive()) {
</ins><span class="cx"> m_width[currentEffectiveColumn] = colStyleLogicalWidth;
</span><span class="cx"> m_width[currentEffectiveColumn] *= spanInCurrentEffectiveColumn;
</span><span class="cx"> usedWidth += effectiveColWidth * spanInCurrentEffectiveColumn;
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> // In this example, the two inner tables should be as large as the outer table.
</span><span class="cx"> // We can achieve this effect by making the maxwidth of fixed tables with percentage
</span><span class="cx"> // widths be infinite.
</span><del>- if (m_table->style().logicalWidth().isPercent() && maxWidth < tableMaxWidth)
</del><ins>+ if (m_table->style().logicalWidth().isPercentOrCalculated() && maxWidth < tableMaxWidth)
</ins><span class="cx"> maxWidth = tableMaxWidth;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> if (m_width[i].isFixed()) {
</span><span class="cx"> calcWidth[i] = m_width[i].value();
</span><span class="cx"> totalFixedWidth += calcWidth[i];
</span><del>- } else if (m_width[i].isPercentNotCalculated()) {
</del><ins>+ } else if (m_width[i].isPercent()) {
</ins><span class="cx"> calcWidth[i] = valueForLength(m_width[i], tableLogicalWidth);
</span><span class="cx"> totalPercentWidth += calcWidth[i];
</span><span class="cx"> totalPercent += m_width[i].percent();
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx"> if (totalPercent) {
</span><span class="cx"> totalPercentWidth = 0;
</span><span class="cx"> for (unsigned i = 0; i < nEffCols; i++) {
</span><del>- if (m_width[i].isPercentNotCalculated()) {
</del><ins>+ if (m_width[i].isPercent()) {
</ins><span class="cx"> calcWidth[i] = m_width[i].percent() * (tableLogicalWidth - totalFixedWidth) / totalPercent;
</span><span class="cx"> totalPercentWidth += calcWidth[i];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -811,7 +811,7 @@
</span><span class="cx">
</span><span class="cx"> Length logicalHeightLength = style().logicalHeight();
</span><span class="cx"> bool hasAutoHeight = logicalHeightLength.isAuto();
</span><del>- if (logicalHeightLength.isPercent() && !document().inQuirksMode()) {
</del><ins>+ if (logicalHeightLength.isPercentOrCalculated() && !document().inQuirksMode()) {
</ins><span class="cx"> hasAutoHeight = true;
</span><span class="cx"> for (RenderBlock* cb = containingBlock(); !cb->isRenderView(); cb = cb->containingBlock()) {
</span><span class="cx"> if (cb->style().logicalHeight().isFixed() || cb->isTableCell())
</span><span class="lines">@@ -821,7 +821,7 @@
</span><span class="cx">
</span><span class="cx"> // If the height is 0 or auto, then whether or not we are a self-collapsing block depends
</span><span class="cx"> // on whether we have content that is all self-collapsing or not.
</span><del>- if (hasAutoHeight || ((logicalHeightLength.isFixed() || logicalHeightLength.isPercent()) && logicalHeightLength.isZero())) {
</del><ins>+ if (hasAutoHeight || ((logicalHeightLength.isFixed() || logicalHeightLength.isPercentOrCalculated()) && logicalHeightLength.isZero())) {
</ins><span class="cx"> // If the block has inline children, see if we generated any line boxes. If we have any
</span><span class="cx"> // line boxes, then we can't be self-collapsing, since we have content.
</span><span class="cx"> if (childrenInline())
</span><span class="lines">@@ -2256,7 +2256,7 @@
</span><span class="cx"> LayoutUnit RenderBlock::textIndentOffset() const
</span><span class="cx"> {
</span><span class="cx"> LayoutUnit cw = 0;
</span><del>- if (style().textIndent().isPercent())
</del><ins>+ if (style().textIndent().isPercentOrCalculated())
</ins><span class="cx"> cw = containingBlock()->availableLogicalWidth();
</span><span class="cx"> return minimumValueForLength(style().textIndent(), cw);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -978,7 +978,7 @@
</span><span class="cx">
</span><span class="cx"> bool RenderBox::needsPreferredWidthsRecalculation() const
</span><span class="cx"> {
</span><del>- return style().paddingStart().isPercent() || style().paddingEnd().isPercent();
</del><ins>+ return style().paddingStart().isPercentOrCalculated() || style().paddingEnd().isPercentOrCalculated();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntSize RenderBox::scrolledContentOffset() const
</span><span class="lines">@@ -2782,8 +2782,8 @@
</span><span class="cx"> // is specified. When we're printing, we also need this quirk if the body or root has a percentage
</span><span class="cx"> // height since we don't set a height in RenderView when we're printing. So without this quirk, the
</span><span class="cx"> // height has nothing to be a percentage of, and it ends up being 0. That is bad.
</span><del>- bool paginatedContentNeedsBaseHeight = document().printing() && h.isPercent()
- && (isRoot() || (isBody() && document().documentElement()->renderer()->style().logicalHeight().isPercent())) && !isInline();
</del><ins>+ bool paginatedContentNeedsBaseHeight = document().printing() && h.isPercentOrCalculated()
+ && (isRoot() || (isBody() && document().documentElement()->renderer()->style().logicalHeight().isPercentOrCalculated())) && !isInline();
</ins><span class="cx"> if (stretchesToViewport() || paginatedContentNeedsBaseHeight) {
</span><span class="cx"> LayoutUnit margins = collapsedMarginBefore() + collapsedMarginAfter();
</span><span class="cx"> LayoutUnit visibleHeight = view().pageOrViewLogicalHeight();
</span><span class="lines">@@ -2816,7 +2816,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (height.isFixed())
</span><span class="cx"> return height.value();
</span><del>- if (height.isPercent())
</del><ins>+ if (height.isPercentOrCalculated())
</ins><span class="cx"> return computePercentageLogicalHeight(height);
</span><span class="cx"> return -1;
</span><span class="cx"> }
</span><span class="lines">@@ -2891,7 +2891,7 @@
</span><span class="cx"> } else if (cbstyle.logicalHeight().isFixed()) {
</span><span class="cx"> LayoutUnit contentBoxHeight = cb->adjustContentBoxLogicalHeightForBoxSizing(cbstyle.logicalHeight().value());
</span><span class="cx"> availableHeight = std::max<LayoutUnit>(0, cb->constrainContentBoxLogicalHeightByMinMax(contentBoxHeight - cb->scrollbarLogicalHeight()));
</span><del>- } else if (cbstyle.logicalHeight().isPercent() && !isOutOfFlowPositionedWithSpecifiedHeight) {
</del><ins>+ } else if (cbstyle.logicalHeight().isPercentOrCalculated() && !isOutOfFlowPositionedWithSpecifiedHeight) {
</ins><span class="cx"> // We need to recur and compute the percentage height for our containing block.
</span><span class="cx"> LayoutUnit heightWithScrollbar = cb->computePercentageLogicalHeight(cbstyle.logicalHeight());
</span><span class="cx"> if (heightWithScrollbar != -1) {
</span><span class="lines">@@ -2936,8 +2936,8 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderBox::computeReplacedLogicalWidthRespectingMinMaxWidth(LayoutUnit logicalWidth, ShouldComputePreferred shouldComputePreferred) const
</span><span class="cx"> {
</span><del>- LayoutUnit minLogicalWidth = (shouldComputePreferred == ComputePreferred && style().logicalMinWidth().isPercent()) || style().logicalMinWidth().isUndefined() ? logicalWidth : computeReplacedLogicalWidthUsing(style().logicalMinWidth());
- LayoutUnit maxLogicalWidth = (shouldComputePreferred == ComputePreferred && style().logicalMaxWidth().isPercent()) || style().logicalMaxWidth().isUndefined() ? logicalWidth : computeReplacedLogicalWidthUsing(style().logicalMaxWidth());
</del><ins>+ LayoutUnit minLogicalWidth = (shouldComputePreferred == ComputePreferred && style().logicalMinWidth().isPercentOrCalculated()) || style().logicalMinWidth().isUndefined() ? logicalWidth : computeReplacedLogicalWidthUsing(style().logicalMinWidth());
+ LayoutUnit maxLogicalWidth = (shouldComputePreferred == ComputePreferred && style().logicalMaxWidth().isPercentOrCalculated()) || style().logicalMaxWidth().isUndefined() ? logicalWidth : computeReplacedLogicalWidthUsing(style().logicalMaxWidth());
</ins><span class="cx"> return std::max(minLogicalWidth, std::min(logicalWidth, maxLogicalWidth));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2965,7 +2965,7 @@
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=91071
</span><span class="cx"> if (logicalWidth.isIntrinsic())
</span><span class="cx"> return computeIntrinsicLogicalWidthUsing(logicalWidth, cw, borderAndPaddingLogicalWidth()) - borderAndPaddingLogicalWidth();
</span><del>- if (cw > 0 || (!cw && (containerLogicalWidth.isFixed() || containerLogicalWidth.isPercent())))
</del><ins>+ if (cw > 0 || (!cw && (containerLogicalWidth.isFixed() || containerLogicalWidth.isPercentOrCalculated())))
</ins><span class="cx"> return adjustContentBoxLogicalWidthForBoxSizing(minimumValueForLength(logicalWidth, cw));
</span><span class="cx"> }
</span><span class="cx"> FALLTHROUGH;
</span><span class="lines">@@ -3032,7 +3032,7 @@
</span><span class="cx"> // table cells using percentage heights.
</span><span class="cx"> // FIXME: This needs to be made block-flow-aware. If the cell and image are perpendicular block-flows, this isn't right.
</span><span class="cx"> // https://bugs.webkit.org/show_bug.cgi?id=46997
</span><del>- while (cb && !cb->isRenderView() && (cb->style().logicalHeight().isAuto() || cb->style().logicalHeight().isPercent())) {
</del><ins>+ while (cb && !cb->isRenderView() && (cb->style().logicalHeight().isAuto() || cb->style().logicalHeight().isPercentOrCalculated())) {
</ins><span class="cx"> if (cb->isTableCell()) {
</span><span class="cx"> // Don't let table cells squeeze percent-height replaced elements
</span><span class="cx"> // <http://bugs.webkit.org/show_bug.cgi?id=15359>
</span><span class="lines">@@ -3060,13 +3060,13 @@
</span><span class="cx"> // We need to stop here, since we don't want to increase the height of the table
</span><span class="cx"> // artificially. We're going to rely on this cell getting expanded to some new
</span><span class="cx"> // height, and then when we lay out again we'll use the calculation below.
</span><del>- if (isTableCell() && (h.isAuto() || h.isPercent())) {
</del><ins>+ if (isTableCell() && (h.isAuto() || h.isPercentOrCalculated())) {
</ins><span class="cx"> if (hasOverrideLogicalContentHeight())
</span><span class="cx"> return overrideLogicalContentHeight();
</span><span class="cx"> return logicalHeight() - borderAndPaddingLogicalHeight();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (h.isPercent() && isOutOfFlowPositioned() && !isRenderFlowThread()) {
</del><ins>+ if (h.isPercentOrCalculated() && isOutOfFlowPositioned() && !isRenderFlowThread()) {
</ins><span class="cx"> // FIXME: This is wrong if the containingBlock has a perpendicular writing mode.
</span><span class="cx"> LayoutUnit availableHeight = containingBlockLogicalHeightForPositioned(containingBlock());
</span><span class="cx"> return adjustContentBoxLogicalHeightForBoxSizing(valueForLength(h, availableHeight));
</span><span class="lines">@@ -4498,7 +4498,7 @@
</span><span class="cx"> if (box->hasOverrideContainingBlockLogicalWidth())
</span><span class="cx"> return box->overrideContainingBlockContentLogicalWidth() != -1;
</span><span class="cx"> #endif
</span><del>- if (box->style().logicalWidth().isPercent())
</del><ins>+ if (box->style().logicalWidth().isPercentOrCalculated())
</ins><span class="cx"> return logicalWidthIsResolvable(*box->containingBlock());
</span><span class="cx">
</span><span class="cx"> return false;
</span><span class="lines">@@ -4550,7 +4550,7 @@
</span><span class="cx"> // height.
</span><span class="cx"> if (cb->style().logicalHeight().isFixed())
</span><span class="cx"> return true;
</span><del>- if (cb->style().logicalHeight().isPercent() && !isOutOfFlowPositionedWithSpecifiedHeight)
</del><ins>+ if (cb->style().logicalHeight().isPercentOrCalculated() && !isOutOfFlowPositionedWithSpecifiedHeight)
</ins><span class="cx"> return percentageLogicalHeightIsResolvableFromBlock(cb->containingBlock(), cb->isOutOfFlowPositioned());
</span><span class="cx"> if (cb->isRenderView() || inQuirksMode || isOutOfFlowPositionedWithSpecifiedHeight)
</span><span class="cx"> return true;
</span><span class="lines">@@ -4595,8 +4595,8 @@
</span><span class="cx"> // conditions, but it should work out to be good enough for common cases. Paginating overflow
</span><span class="cx"> // with scrollbars present is not the end of the world and is what we used to do in the old model anyway.
</span><span class="cx"> return !style().logicalHeight().isIntrinsicOrAuto()
</span><del>- || (!style().logicalMaxHeight().isIntrinsicOrAuto() && !style().logicalMaxHeight().isUndefined() && (!style().logicalMaxHeight().isPercent() || percentageLogicalHeightIsResolvable(this)))
- || (!style().logicalMinHeight().isIntrinsicOrAuto() && style().logicalMinHeight().isPositive() && (!style().logicalMinHeight().isPercent() || percentageLogicalHeightIsResolvable(this)));
</del><ins>+ || (!style().logicalMaxHeight().isIntrinsicOrAuto() && !style().logicalMaxHeight().isUndefined() && (!style().logicalMaxHeight().isPercentOrCalculated() || percentageLogicalHeightIsResolvable(this)))
+ || (!style().logicalMinHeight().isIntrinsicOrAuto() && style().logicalMinHeight().isPositive() && (!style().logicalMinHeight().isPercentOrCalculated() || percentageLogicalHeightIsResolvable(this)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderBox::isUnsplittableForPagination() const
</span><span class="lines">@@ -4869,23 +4869,23 @@
</span><span class="cx">
</span><span class="cx"> bool RenderBox::hasRelativeDimensions() const
</span><span class="cx"> {
</span><del>- return style().height().isPercent() || style().width().isPercent()
- || style().maxHeight().isPercent() || style().maxWidth().isPercent()
- || style().minHeight().isPercent() || style().minWidth().isPercent();
</del><ins>+ return style().height().isPercentOrCalculated() || style().width().isPercentOrCalculated()
+ || style().maxHeight().isPercentOrCalculated() || style().maxWidth().isPercentOrCalculated()
+ || style().minHeight().isPercentOrCalculated() || style().minWidth().isPercentOrCalculated();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderBox::hasRelativeLogicalHeight() const
</span><span class="cx"> {
</span><del>- return style().logicalHeight().isPercent()
- || style().logicalMinHeight().isPercent()
- || style().logicalMaxHeight().isPercent();
</del><ins>+ return style().logicalHeight().isPercentOrCalculated()
+ || style().logicalMinHeight().isPercentOrCalculated()
+ || style().logicalMaxHeight().isPercentOrCalculated();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderBox::hasRelativeLogicalWidth() const
</span><span class="cx"> {
</span><del>- return style().logicalWidth().isPercent()
- || style().logicalMinWidth().isPercent()
- || style().logicalMaxWidth().isPercent();
</del><ins>+ return style().logicalWidth().isPercentOrCalculated()
+ || style().logicalMinWidth().isPercentOrCalculated()
+ || style().logicalMaxWidth().isPercentOrCalculated();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void markBoxForRelayoutAfterSplit(RenderBox& box)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -244,7 +244,7 @@
</span><span class="cx"> // For percentage heights: The percentage is calculated with respect to the height of the generated box's
</span><span class="cx"> // containing block. If the height of the containing block is not specified explicitly (i.e., it depends
</span><span class="cx"> // on content height), and this element is not absolutely positioned, the value computes to 'auto'.
</span><del>- if (!logicalHeightLength.isPercent() || isOutOfFlowPositioned() || document().inQuirksMode())
</del><ins>+ if (!logicalHeightLength.isPercentOrCalculated() || isOutOfFlowPositioned() || document().inQuirksMode())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Anonymous block boxes are ignored when resolving percentage values that would refer to it:
</span><span class="lines">@@ -299,13 +299,13 @@
</span><span class="cx"> // calculate the percent offset based on this height.
</span><span class="cx"> // See <https://bugs.webkit.org/show_bug.cgi?id=26396>.
</span><span class="cx"> if (!style().top().isAuto()
</span><del>- && (!style().top().isPercent()
</del><ins>+ && (!style().top().isPercentOrCalculated()
</ins><span class="cx"> || !containingBlock()->hasAutoHeightOrContainingBlockWithAutoHeight()
</span><span class="cx"> || containingBlock()->stretchesToViewport()))
</span><span class="cx"> offset.expand(0, valueForLength(style().top(), !style().top().isFixed() ? containingBlock()->availableHeight() : LayoutUnit()));
</span><span class="cx">
</span><span class="cx"> else if (!style().bottom().isAuto()
</span><del>- && (!style().bottom().isPercent()
</del><ins>+ && (!style().bottom().isPercentOrCalculated()
</ins><span class="cx"> || !containingBlock()->hasAutoHeightOrContainingBlockWithAutoHeight()
</span><span class="cx"> || containingBlock()->stretchesToViewport()))
</span><span class="cx"> offset.expand(0, -valueForLength(style().bottom(), !style().bottom().isFixed() ? containingBlock()->availableHeight() : LayoutUnit()));
</span><span class="lines">@@ -519,7 +519,7 @@
</span><span class="cx"> LayoutUnit RenderBoxModelObject::computedCSSPadding(const Length& padding) const
</span><span class="cx"> {
</span><span class="cx"> LayoutUnit w = 0;
</span><del>- if (padding.isPercent())
</del><ins>+ if (padding.isPercentOrCalculated())
</ins><span class="cx"> w = containingBlockLogicalWidthForContent();
</span><span class="cx"> return minimumValueForLength(padding, w);
</span><span class="cx"> }
</span><span class="lines">@@ -932,8 +932,8 @@
</span><span class="cx"> FloatSize intrinsicRatio;
</span><span class="cx"> image->computeIntrinsicDimensions(this, intrinsicWidth, intrinsicHeight, intrinsicRatio);
</span><span class="cx">
</span><del>- ASSERT(!intrinsicWidth.isPercent());
- ASSERT(!intrinsicHeight.isPercent());
</del><ins>+ ASSERT(!intrinsicWidth.isPercentOrCalculated());
+ ASSERT(!intrinsicHeight.isPercentOrCalculated());
</ins><span class="cx">
</span><span class="cx"> LayoutSize resolvedSize(intrinsicWidth.value(), intrinsicHeight.value());
</span><span class="cx"> LayoutSize minimumSize(resolvedSize.width() > 0 ? 1 : 0, resolvedSize.height() > 0 ? 1 : 0);
</span><span class="lines">@@ -983,12 +983,12 @@
</span><span class="cx">
</span><span class="cx"> if (layerWidth.isFixed())
</span><span class="cx"> tileSize.setWidth(layerWidth.value());
</span><del>- else if (layerWidth.isPercent())
</del><ins>+ else if (layerWidth.isPercentOrCalculated())
</ins><span class="cx"> tileSize.setWidth(valueForLength(layerWidth, positioningAreaSize.width()));
</span><span class="cx">
</span><span class="cx"> if (layerHeight.isFixed())
</span><span class="cx"> tileSize.setHeight(layerHeight.value());
</span><del>- else if (layerHeight.isPercent())
</del><ins>+ else if (layerHeight.isPercentOrCalculated())
</ins><span class="cx"> tileSize.setHeight(valueForLength(layerHeight, positioningAreaSize.height()));
</span><span class="cx">
</span><span class="cx"> // If one of the values is auto we have to use the appropriate
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderDeprecatedFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/rendering/RenderDeprecatedFlexibleBox.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -934,7 +934,7 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> child->clearOverrideSize();
</span><del>- if (relayoutChildren || (child->isReplaced() && (child->style().width().isPercent() || child->style().height().isPercent()))
</del><ins>+ if (relayoutChildren || (child->isReplaced() && (child->style().width().isPercentOrCalculated() || child->style().height().isPercentOrCalculated()))
</ins><span class="cx"> || (child->style().height().isAuto() && is<RenderBlockFlow>(*child))) {
</span><span class="cx"> child->setChildNeedsLayout(MarkOnlyThis);
</span><span class="cx">
</span><span class="lines">@@ -1034,7 +1034,7 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> child->clearOverrideSize();
</span><del>- if ((child->isReplaced() && (child->style().width().isPercent() || child->style().height().isPercent()))
</del><ins>+ if ((child->isReplaced() && (child->style().width().isPercentOrCalculated() || child->style().height().isPercentOrCalculated()))
</ins><span class="cx"> || (child->style().height().isAuto() && is<RenderBlockFlow>(*child))) {
</span><span class="cx"> child->setChildNeedsLayout();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -1216,7 +1216,7 @@
</span><span class="cx">
</span><span class="cx"> if (sizeType == SizeLength) {
</span><span class="cx"> LengthSize size = layer->sizeLength();
</span><del>- if (size.width().isPercent() || size.height().isPercent())
</del><ins>+ if (size.width().isPercentOrCalculated() || size.height().isPercentOrCalculated())
</ins><span class="cx"> return true;
</span><span class="cx"> // If the image has neither an intrinsic width nor an intrinsic height, its size is determined as for 'contain'.
</span><span class="cx"> if ((size.width().isAuto() || size.height().isAuto()) && image->isGeneratedImage())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFileUploadControlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/rendering/RenderFileUploadControl.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -213,7 +213,7 @@
</span><span class="cx"> defaultLabelWidth += buttonRenderer->maxPreferredLogicalWidth() + afterButtonSpacing;
</span><span class="cx"> maxLogicalWidth = static_cast<int>(ceilf(std::max(minDefaultLabelWidth, defaultLabelWidth)));
</span><span class="cx">
</span><del>- if (!style().width().isPercent())
</del><ins>+ if (!style().width().isPercentOrCalculated())
</ins><span class="cx"> minLogicalWidth = maxLogicalWidth;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFrameSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFrameSet.cpp (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFrameSet.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/rendering/RenderFrameSet.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -206,7 +206,7 @@
</span><span class="cx">
</span><span class="cx"> // Count the total percentage of all of the percentage columns/rows -> totalPercent
</span><span class="cx"> // Count the number of columns/rows which are percentages -> countPercent
</span><del>- if (grid[i].isPercent()) {
</del><ins>+ if (grid[i].isPercentOrCalculated()) {
</ins><span class="cx"> gridLayout[i] = std::max(intValueForLength(grid[i], availableLen), 0);
</span><span class="cx"> totalPercent += gridLayout[i];
</span><span class="cx"> countPercent++;
</span><span class="lines">@@ -244,7 +244,7 @@
</span><span class="cx"> int remainingPercent = remainingLen;
</span><span class="cx">
</span><span class="cx"> for (int i = 0; i < gridLen; ++i) {
</span><del>- if (grid[i].isPercent()) {
</del><ins>+ if (grid[i].isPercentOrCalculated()) {
</ins><span class="cx"> gridLayout[i] = (gridLayout[i] * remainingPercent) / totalPercent;
</span><span class="cx"> remainingLen -= gridLayout[i];
</span><span class="cx"> }
</span><span class="lines">@@ -288,7 +288,7 @@
</span><span class="cx"> int changePercent = 0;
</span><span class="cx">
</span><span class="cx"> for (int i = 0; i < gridLen; ++i) {
</span><del>- if (grid[i].isPercent()) {
</del><ins>+ if (grid[i].isPercentOrCalculated()) {
</ins><span class="cx"> changePercent = (remainingPercent * gridLayout[i]) / totalPercent;
</span><span class="cx"> gridLayout[i] += changePercent;
</span><span class="cx"> remainingLen -= changePercent;
</span><span class="lines">@@ -320,7 +320,7 @@
</span><span class="cx"> int changePercent = 0;
</span><span class="cx">
</span><span class="cx"> for (int i = 0; i < gridLen; ++i) {
</span><del>- if (grid[i].isPercent()) {
</del><ins>+ if (grid[i].isPercentOrCalculated()) {
</ins><span class="cx"> changePercent = remainingPercent / countPercent;
</span><span class="cx"> gridLayout[i] += changePercent;
</span><span class="cx"> remainingLen -= changePercent;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImage.cpp (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderImage.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/rendering/RenderImage.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -315,9 +315,9 @@
</span><span class="cx"> // if the containing block's size depends on the image's size (i.e., the container uses shrink-to-fit sizing).
</span><span class="cx"> // There's no easy way to detect that shrink-to-fit is needed, always force a layout.
</span><span class="cx"> bool containingBlockNeedsToRecomputePreferredSize =
</span><del>- style().logicalWidth().isPercent()
- || style().logicalMaxWidth().isPercent()
- || style().logicalMinWidth().isPercent();
</del><ins>+ style().logicalWidth().isPercentOrCalculated()
+ || style().logicalMaxWidth().isPercentOrCalculated()
+ || style().logicalMinWidth().isPercentOrCalculated();
</ins><span class="cx">
</span><span class="cx"> bool layoutSizeDependsOnIntrinsicSize = style().aspectRatioType() == AspectRatioFromIntrinsic;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderInlinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderInline.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -791,7 +791,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> if (margin.isFixed())
</span><span class="cx"> return margin.value();
</span><del>- if (margin.isPercent())
</del><ins>+ if (margin.isPercentOrCalculated())
</ins><span class="cx"> return minimumValueForLength(margin, std::max<LayoutUnit>(0, renderer->containingBlock()->availableLogicalWidth()));
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderListBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderListBox.cpp (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderListBox.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/rendering/RenderListBox.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -193,7 +193,7 @@
</span><span class="cx"> maxLogicalWidth = m_optionsWidth + 2 * optionsSpacingHorizontal;
</span><span class="cx"> if (m_vBar)
</span><span class="cx"> maxLogicalWidth += m_vBar->width();
</span><del>- if (!style().width().isPercent())
</del><ins>+ if (!style().width().isPercentOrCalculated())
</ins><span class="cx"> minLogicalWidth = maxLogicalWidth;
</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 (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMenuList.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/rendering/RenderMenuList.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -324,7 +324,7 @@
</span><span class="cx"> void RenderMenuList::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const
</span><span class="cx"> {
</span><span class="cx"> maxLogicalWidth = std::max(m_optionsWidth, theme().minimumMenuListSize(style())) + m_innerBlock->paddingLeft() + m_innerBlock->paddingRight();
</span><del>- if (!style().width().isPercent())
</del><ins>+ if (!style().width().isPercentOrCalculated())
</ins><span class="cx"> minLogicalWidth = maxLogicalWidth;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -543,7 +543,7 @@
</span><span class="cx"> if (!object->hasOverflowClip())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (object->style().width().isIntrinsicOrAuto() || object->style().height().isIntrinsicOrAuto() || object->style().height().isPercent())
</del><ins>+ if (object->style().width().isIntrinsicOrAuto() || object->style().height().isIntrinsicOrAuto() || object->style().height().isPercentOrCalculated())
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> // Table parts can't be relayout roots since the table is responsible for layouting all the parts.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderReplacedcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderReplaced.cpp (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderReplaced.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/rendering/RenderReplaced.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -486,13 +486,13 @@
</span><span class="cx">
</span><span class="cx"> // We cannot resolve any percent logical width here as the available logical
</span><span class="cx"> // width may not be set on our containing block.
</span><del>- if (style().logicalWidth().isPercent())
</del><ins>+ if (style().logicalWidth().isPercentOrCalculated())
</ins><span class="cx"> computeIntrinsicLogicalWidths(m_minPreferredLogicalWidth, m_maxPreferredLogicalWidth);
</span><span class="cx"> else
</span><span class="cx"> m_minPreferredLogicalWidth = m_maxPreferredLogicalWidth = computeReplacedLogicalWidth(ComputePreferred);
</span><span class="cx">
</span><span class="cx"> const RenderStyle& styleToUse = style();
</span><del>- if (styleToUse.logicalWidth().isPercent() || styleToUse.logicalMaxWidth().isPercent())
</del><ins>+ if (styleToUse.logicalWidth().isPercentOrCalculated() || styleToUse.logicalMaxWidth().isPercentOrCalculated())
</ins><span class="cx"> m_minPreferredLogicalWidth = 0;
</span><span class="cx">
</span><span class="cx"> if (styleToUse.logicalMinWidth().isFixed() && styleToUse.logicalMinWidth().value() > 0) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderSlidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderSlider.cpp (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderSlider.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/rendering/RenderSlider.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> void RenderSlider::computeIntrinsicLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const
</span><span class="cx"> {
</span><span class="cx"> maxLogicalWidth = defaultTrackLength * style().effectiveZoom();
</span><del>- if (!style().width().isPercent())
</del><ins>+ if (!style().width().isPercentOrCalculated())
</ins><span class="cx"> minLogicalWidth = maxLogicalWidth;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTable.cpp (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTable.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/rendering/RenderTable.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -368,7 +368,7 @@
</span><span class="cx"> borders = borderAndPaddingBefore + borderAndPaddingAfter;
</span><span class="cx"> }
</span><span class="cx"> computedLogicalHeight = styleLogicalHeight.value() - borders;
</span><del>- } else if (styleLogicalHeight.isPercent())
</del><ins>+ } else if (styleLogicalHeight.isPercentOrCalculated())
</ins><span class="cx"> computedLogicalHeight = computePercentageLogicalHeight(styleLogicalHeight);
</span><span class="cx"> else
</span><span class="cx"> ASSERT_NOT_REACHED();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTableSectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTableSection.cpp (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTableSection.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/rendering/RenderTableSection.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> Length cRowLogicalHeight = row.logicalHeight;
</span><span class="cx"> switch (logicalHeight.type()) {
</span><span class="cx"> case Percent:
</span><del>- if (!cRowLogicalHeight.isPercentNotCalculated() || cRowLogicalHeight.percent() < logicalHeight.percent())
</del><ins>+ if (!cRowLogicalHeight.isPercent() || cRowLogicalHeight.percent() < logicalHeight.percent())
</ins><span class="cx"> row.logicalHeight = logicalHeight;
</span><span class="cx"> break;
</span><span class="cx"> case Fixed:
</span><span class="lines">@@ -425,7 +425,7 @@
</span><span class="cx"> totalPercent = std::min(totalPercent, 100);
</span><span class="cx"> int rowHeight = m_rowPos[1] - m_rowPos[0];
</span><span class="cx"> for (unsigned r = 0; r < totalRows; ++r) {
</span><del>- if (totalPercent > 0 && m_grid[r].logicalHeight.isPercentNotCalculated()) {
</del><ins>+ if (totalPercent > 0 && m_grid[r].logicalHeight.isPercent()) {
</ins><span class="cx"> int toAdd = std::min<int>(extraLogicalHeight, (totalHeight * m_grid[r].logicalHeight.percent() / 100) - rowHeight);
</span><span class="cx"> // If toAdd is negative, then we don't want to shrink the row (this bug
</span><span class="cx"> // affected Outlook Web Access).
</span><span class="lines">@@ -497,7 +497,7 @@
</span><span class="cx"> for (unsigned r = 0; r < totalRows; r++) {
</span><span class="cx"> if (m_grid[r].logicalHeight.isAuto())
</span><span class="cx"> ++autoRowsCount;
</span><del>- else if (m_grid[r].logicalHeight.isPercentNotCalculated())
</del><ins>+ else if (m_grid[r].logicalHeight.isPercent())
</ins><span class="cx"> totalPercent += m_grid[r].logicalHeight.percent();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -568,7 +568,7 @@
</span><span class="cx"> || (!table()->style().logicalHeight().isAuto() && rHeight != cell->logicalHeight());
</span><span class="cx">
</span><span class="cx"> for (RenderObject* renderer = cell->firstChild(); renderer; renderer = renderer->nextSibling()) {
</span><del>- if (!is<RenderText>(*renderer) && renderer->style().logicalHeight().isPercent() && (flexAllChildren || ((renderer->isReplaced() || (is<RenderBox>(*renderer) && downcast<RenderBox>(*renderer).scrollsOverflow())) && !is<RenderTextControl>(*renderer)))) {
</del><ins>+ if (!is<RenderText>(*renderer) && renderer->style().logicalHeight().isPercentOrCalculated() && (flexAllChildren || ((renderer->isReplaced() || (is<RenderBox>(*renderer) && downcast<RenderBox>(*renderer).scrollsOverflow())) && !is<RenderTextControl>(*renderer)))) {
</ins><span class="cx"> // Tables with no sections do not flex.
</span><span class="cx"> if (!is<RenderTable>(*renderer) || downcast<RenderTable>(*renderer).hasSections()) {
</span><span class="cx"> renderer->setNeedsLayout(MarkOnlyThis);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextControlcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextControl.cpp (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextControl.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/rendering/RenderTextControl.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> maxLogicalWidth = preferredContentLogicalWidth(const_cast<RenderTextControl*>(this)->getAverageCharWidth());
</span><span class="cx"> if (RenderBox* innerTextRenderBox = innerTextElement()->renderBox())
</span><span class="cx"> maxLogicalWidth += innerTextRenderBox->paddingStart() + innerTextRenderBox->paddingEnd();
</span><del>- if (!style().logicalWidth().isPercent())
</del><ins>+ if (!style().logicalWidth().isPercentOrCalculated())
</ins><span class="cx"> minLogicalWidth = maxLogicalWidth;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderView.cpp (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderView.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -333,9 +333,9 @@
</span><span class="cx">
</span><span class="cx"> for (auto& box : childrenOfType<RenderBox>(*this)) {
</span><span class="cx"> if (box.hasRelativeLogicalHeight()
</span><del>- || box.style().logicalHeight().isPercent()
- || box.style().logicalMinHeight().isPercent()
- || box.style().logicalMaxHeight().isPercent()
</del><ins>+ || box.style().logicalHeight().isPercentOrCalculated()
+ || box.style().logicalMinHeight().isPercentOrCalculated()
+ || box.style().logicalMaxHeight().isPercentOrCalculated()
</ins><span class="cx"> || box.isSVGRoot()
</span><span class="cx"> )
</span><span class="cx"> box.setChildNeedsLayout(MarkOnlyThis);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRootInlineBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RootInlineBox.cpp (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RootInlineBox.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/rendering/RootInlineBox.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -1050,7 +1050,7 @@
</span><span class="cx"> else if (verticalAlign == LENGTH) {
</span><span class="cx"> LayoutUnit lineHeight;
</span><span class="cx"> //Per http://www.w3.org/TR/CSS21/visudet.html#propdef-vertical-align: 'Percentages: refer to the 'line-height' of the element itself'.
</span><del>- if (renderer->style().verticalAlignLength().isPercent())
</del><ins>+ if (renderer->style().verticalAlignLength().isPercentOrCalculated())
</ins><span class="cx"> lineHeight = renderer->style().computedLineHeight();
</span><span class="cx"> else
</span><span class="cx"> lineHeight = renderer->lineHeight(firstLine, lineDirection);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleGridLengthh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/GridLength.h (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/GridLength.h 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/rendering/style/GridLength.h 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> double flex() const { ASSERT(isFlex()); return m_flex; }
</span><span class="cx">
</span><del>- bool isPercentage() const { return m_type == LengthType && m_length.isPercent(); }
</del><ins>+ bool isPercentage() const { return m_type == LengthType && m_length.isPercentOrCalculated(); }
</ins><span class="cx">
</span><span class="cx"> bool operator==(const GridLength& o) const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleGridTrackSizeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/GridTrackSize.h (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/GridTrackSize.h 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/rendering/style/GridTrackSize.h 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx">
</span><span class="cx"> bool isContentSized() const { return m_minTrackBreadth.isContentSized() || m_maxTrackBreadth.isContentSized(); }
</span><span class="cx">
</span><del>- bool isPercentage() const { return m_type == LengthTrackSizing && length().isLength() && length().length().isPercent(); }
</del><ins>+ bool isPercentage() const { return m_type == LengthTrackSizing && length().isLength() && length().length().isPercentOrCalculated(); }
</ins><span class="cx">
</span><span class="cx"> bool operator==(const GridTrackSize& other) const
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/style/RenderStyle.cpp (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/rendering/style/RenderStyle.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -1077,8 +1077,8 @@
</span><span class="cx"> auto& operations = rareNonInheritedData->m_transform->m_operations.operations();
</span><span class="cx"> bool applyTransformOrigin = requireTransformOrigin(operations, applyOrigin);
</span><span class="cx">
</span><del>- float offsetX = transformOriginX().isPercentNotCalculated() ? boundingBox.x() : 0;
- float offsetY = transformOriginY().isPercentNotCalculated() ? boundingBox.y() : 0;
</del><ins>+ float offsetX = transformOriginX().isPercent() ? boundingBox.x() : 0;
+ float offsetY = transformOriginY().isPercent() ? boundingBox.y() : 0;
</ins><span class="cx">
</span><span class="cx"> if (applyTransformOrigin) {
</span><span class="cx"> transform.translate3d(floatValueForLength(transformOriginX(), boundingBox.width()) + offsetX,
</span><span class="lines">@@ -1456,7 +1456,7 @@
</span><span class="cx"> if (lh.isNegative())
</span><span class="cx"> return fontMetrics().lineSpacing();
</span><span class="cx">
</span><del>- if (lh.isPercent())
</del><ins>+ if (lh.isPercentOrCalculated())
</ins><span class="cx"> return minimumValueForLength(lh, fontSize());
</span><span class="cx">
</span><span class="cx"> return clampTo<int>(lh.value());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGRootcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -436,7 +436,7 @@
</span><span class="cx">
</span><span class="cx"> bool RenderSVGRoot::hasRelativeDimensions() const
</span><span class="cx"> {
</span><del>- return svgSVGElement().intrinsicHeight().isPercent() || svgSVGElement().intrinsicWidth().isPercent();
</del><ins>+ return svgSVGElement().intrinsicHeight().isPercentOrCalculated() || svgSVGElement().intrinsicWidth().isPercentOrCalculated();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderSVGRoot::addResourceForClientInvalidation(RenderSVGResourceContainer* resource)
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGLengthContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGLengthContext.cpp (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGLengthContext.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/svg/SVGLengthContext.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx">
</span><span class="cx"> float SVGLengthContext::valueForLength(const Length& length, SVGLengthMode mode)
</span><span class="cx"> {
</span><del>- if (length.isPercent() && !length.isCalculated())
</del><ins>+ if (length.isPercent())
</ins><span class="cx"> return convertValueFromPercentageToUserUnits(length.value() / 100, mode, IGNORE_EXCEPTION);
</span><span class="cx"> if (length.isAuto())
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebCoresvggraphicsSVGImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/graphics/SVGImage.cpp (184054 => 184055)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/graphics/SVGImage.cpp 2015-05-10 21:26:51 UTC (rev 184054)
+++ trunk/Source/WebCore/svg/graphics/SVGImage.cpp 2015-05-10 21:43:26 UTC (rev 184055)
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx"> SVGSVGElement* rootElement = this->rootElement();
</span><span class="cx"> if (!rootElement)
</span><span class="cx"> return false;
</span><del>- return rootElement->intrinsicWidth().isPercent();
</del><ins>+ return rootElement->intrinsicWidth().isPercentOrCalculated();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool SVGImage::hasRelativeHeight() const
</span><span class="lines">@@ -294,7 +294,7 @@
</span><span class="cx"> SVGSVGElement* rootElement = this->rootElement();
</span><span class="cx"> if (!rootElement)
</span><span class="cx"> return false;
</span><del>- return rootElement->intrinsicHeight().isPercent();
</del><ins>+ return rootElement->intrinsicHeight().isPercentOrCalculated();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SVGImage::computeIntrinsicDimensions(Length& intrinsicWidth, Length& intrinsicHeight, FloatSize& intrinsicRatio)
</span></span></pre>
</div>
</div>
</body>
</html>