<!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>[201401] 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/201401">201401</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2016-05-25 14:13:22 -0700 (Wed, 25 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify and inline minimumValueForLength()
https://bugs.webkit.org/show_bug.cgi?id=158084
Reviewed by Zalan Bujtas.
Simplify and inline minimumValueForLength(). Based on iOS PLT profiles,
we spend up to 0.7% of CPU time during page loads in this function.
The roundPercentages parameter has been dropped because it was false
for all call sites.
* css/LengthFunctions.cpp:
(WebCore::minimumIntValueForLength): Deleted.
(WebCore::minimumValueForLength): Deleted.
* css/LengthFunctions.h:
(WebCore::minimumValueForLength):
(WebCore::minimumIntValueForLength):
* rendering/RenderBoxModelObject.cpp:
(WebCore::resolveEdgeRelativeLength):
(WebCore::RenderBoxModelObject::calculateBackgroundImageGeometry):
* rendering/RenderElement.h:
(WebCore::RenderElement::minimumValueForLength):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssLengthFunctionscpp">trunk/Source/WebCore/css/LengthFunctions.cpp</a></li>
<li><a href="#trunkSourceWebCorecssLengthFunctionsh">trunk/Source/WebCore/css/LengthFunctions.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxModelObjectcpp">trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementh">trunk/Source/WebCore/rendering/RenderElement.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201400 => 201401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-25 21:02:11 UTC (rev 201400)
+++ trunk/Source/WebCore/ChangeLog 2016-05-25 21:13:22 UTC (rev 201401)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-05-25 Chris Dumez <cdumez@apple.com>
+
+ Simplify and inline minimumValueForLength()
+ https://bugs.webkit.org/show_bug.cgi?id=158084
+
+ Reviewed by Zalan Bujtas.
+
+ Simplify and inline minimumValueForLength(). Based on iOS PLT profiles,
+ we spend up to 0.7% of CPU time during page loads in this function.
+
+ The roundPercentages parameter has been dropped because it was false
+ for all call sites.
+
+ * css/LengthFunctions.cpp:
+ (WebCore::minimumIntValueForLength): Deleted.
+ (WebCore::minimumValueForLength): Deleted.
+ * css/LengthFunctions.h:
+ (WebCore::minimumValueForLength):
+ (WebCore::minimumIntValueForLength):
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::resolveEdgeRelativeLength):
+ (WebCore::RenderBoxModelObject::calculateBackgroundImageGeometry):
+ * rendering/RenderElement.h:
+ (WebCore::RenderElement::minimumValueForLength):
+
</ins><span class="cx"> 2016-05-25 Manuel Rego Casasnovas <rego@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-grid] Update <fixed-size> syntax
</span></span></pre></div>
<a id="trunkSourceWebCorecssLengthFunctionscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/LengthFunctions.cpp (201400 => 201401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/LengthFunctions.cpp 2016-05-25 21:02:11 UTC (rev 201400)
+++ trunk/Source/WebCore/css/LengthFunctions.cpp 2016-05-25 21:13:22 UTC (rev 201401)
</span><span class="lines">@@ -25,50 +25,15 @@
</span><span class="cx"> #include "LengthFunctions.h"
</span><span class="cx">
</span><span class="cx"> #include "FloatSize.h"
</span><del>-#include "LayoutUnit.h"
</del><span class="cx"> #include "LengthSize.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-int minimumIntValueForLength(const Length& length, LayoutUnit maximumValue, bool roundPercentages)
-{
- return static_cast<int>(minimumValueForLength(length, maximumValue, roundPercentages));
-}
-
</del><span class="cx"> int intValueForLength(const Length& length, LayoutUnit maximumValue)
</span><span class="cx"> {
</span><span class="cx"> return static_cast<int>(valueForLength(length, maximumValue));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-LayoutUnit minimumValueForLength(const Length& length, LayoutUnit maximumValue, bool roundPercentages)
-{
- switch (length.type()) {
- case Fixed:
- return length.value();
- case Percent:
- if (roundPercentages)
- return LayoutUnit(round(maximumValue * length.percent() / 100.0f));
- // Don't remove the extra cast to float. It is needed for rounding on 32-bit Intel machines that use the FPU stack.
- return LayoutUnit(static_cast<float>(maximumValue * length.percent() / 100.0f));
- case Calculated:
- return length.nonNanCalculatedValue(maximumValue);
- case FillAvailable:
- case Auto:
- return 0;
- case Relative:
- case Intrinsic:
- case MinIntrinsic:
- case MinContent:
- case MaxContent:
- case FitContent:
- case Undefined:
- ASSERT_NOT_REACHED();
- return 0;
- }
- ASSERT_NOT_REACHED();
- return 0;
-}
-
</del><span class="cx"> LayoutUnit valueForLength(const Length& length, LayoutUnit maximumValue)
</span><span class="cx"> {
</span><span class="cx"> switch (length.type()) {
</span></span></pre></div>
<a id="trunkSourceWebCorecssLengthFunctionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/LengthFunctions.h (201400 => 201401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/LengthFunctions.h 2016-05-25 21:02:11 UTC (rev 201400)
+++ trunk/Source/WebCore/css/LengthFunctions.h 2016-05-25 21:13:22 UTC (rev 201401)
</span><span class="lines">@@ -24,6 +24,9 @@
</span><span class="cx"> #ifndef LengthFunctions_h
</span><span class="cx"> #define LengthFunctions_h
</span><span class="cx">
</span><ins>+#include "LayoutUnit.h"
+#include "Length.h"
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class FloatSize;
</span><span class="lines">@@ -32,14 +35,45 @@
</span><span class="cx"> struct Length;
</span><span class="cx"> struct LengthSize;
</span><span class="cx">
</span><del>-int minimumIntValueForLength(const Length&, LayoutUnit maximumValue, bool roundPercentages = false);
</del><ins>+int minimumIntValueForLength(const Length&, LayoutUnit maximumValue);
</ins><span class="cx"> int intValueForLength(const Length&, LayoutUnit maximumValue);
</span><del>-LayoutUnit minimumValueForLength(const Length&, LayoutUnit maximumValue, bool roundPercentages = false);
</del><ins>+LayoutUnit minimumValueForLength(const Length&, LayoutUnit maximumValue);
</ins><span class="cx"> WEBCORE_EXPORT LayoutUnit valueForLength(const Length&, LayoutUnit maximumValue);
</span><span class="cx"> float floatValueForLength(const Length&, LayoutUnit maximumValue);
</span><span class="cx"> WEBCORE_EXPORT float floatValueForLength(const Length&, float maximumValue);
</span><span class="cx"> FloatSize floatSizeForLengthSize(const LengthSize&, const FloatSize&);
</span><span class="cx">
</span><ins>+inline LayoutUnit minimumValueForLength(const Length& length, LayoutUnit maximumValue)
+{
+ switch (length.type()) {
+ case Fixed:
+ return length.value();
+ case Percent:
+ // Don't remove the extra cast to float. It is needed for rounding on 32-bit Intel machines that use the FPU stack.
+ return LayoutUnit(static_cast<float>(maximumValue * length.percent() / 100.0f));
+ case Calculated:
+ return length.nonNanCalculatedValue(maximumValue);
+ case FillAvailable:
+ case Auto:
+ return 0;
+ case Relative:
+ case Intrinsic:
+ case MinIntrinsic:
+ case MinContent:
+ case MaxContent:
+ case FitContent:
+ case Undefined:
+ break;
+ }
+ ASSERT_NOT_REACHED();
+ return 0;
+}
+
+inline int minimumIntValueForLength(const Length& length, LayoutUnit maximumValue)
+{
+ return static_cast<int>(minimumValueForLength(length, maximumValue));
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // LengthFunctions_h
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp (201400 => 201401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2016-05-25 21:02:11 UTC (rev 201400)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp 2016-05-25 21:13:22 UTC (rev 201401)
</span><span class="lines">@@ -1051,7 +1051,7 @@
</span><span class="cx">
</span><span class="cx"> static LayoutUnit resolveEdgeRelativeLength(const Length& length, Edge edge, LayoutUnit availableSpace, const LayoutSize& areaSize, const LayoutSize& tileSize)
</span><span class="cx"> {
</span><del>- LayoutUnit result = minimumValueForLength(length, availableSpace, false);
</del><ins>+ LayoutUnit result = minimumValueForLength(length, availableSpace);
</ins><span class="cx">
</span><span class="cx"> if (edge == Edge::Right)
</span><span class="cx"> return areaSize.width() - tileSize.width() - result;
</span><span class="lines">@@ -1192,7 +1192,7 @@
</span><span class="cx"> LayoutUnit space = getSpace(positioningAreaSize.width(), tileSize.width());
</span><span class="cx"> if (space >= 0) {
</span><span class="cx"> LayoutUnit actualWidth = tileSize.width() + space;
</span><del>- computedXPosition = minimumValueForLength(Length(), availableWidth, false);
</del><ins>+ computedXPosition = minimumValueForLength(Length(), availableWidth);
</ins><span class="cx"> spaceSize.setWidth(space);
</span><span class="cx"> spaceSize.setHeight(0);
</span><span class="cx"> phase.setWidth(actualWidth ? actualWidth - fmodf((computedXPosition + left), actualWidth) : 0);
</span><span class="lines">@@ -1218,7 +1218,7 @@
</span><span class="cx">
</span><span class="cx"> if (space >= 0) {
</span><span class="cx"> LayoutUnit actualHeight = tileSize.height() + space;
</span><del>- computedYPosition = minimumValueForLength(Length(), availableHeight, false);
</del><ins>+ computedYPosition = minimumValueForLength(Length(), availableHeight);
</ins><span class="cx"> spaceSize.setHeight(space);
</span><span class="cx"> phase.setHeight(actualHeight ? actualHeight - fmodf((computedYPosition + top), actualHeight) : 0);
</span><span class="cx"> } else
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.h (201400 => 201401)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.h 2016-05-25 21:02:11 UTC (rev 201400)
+++ trunk/Source/WebCore/rendering/RenderElement.h 2016-05-25 21:13:22 UTC (rev 201401)
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx"> void propagateStyleToAnonymousChildren(StylePropagationType);
</span><span class="cx">
</span><span class="cx"> LayoutUnit valueForLength(const Length&, LayoutUnit maximumValue) const;
</span><del>- LayoutUnit minimumValueForLength(const Length&, LayoutUnit maximumValue, bool roundPercentages = false) const;
</del><ins>+ LayoutUnit minimumValueForLength(const Length&, LayoutUnit maximumValue) const;
</ins><span class="cx">
</span><span class="cx"> void setFirstChild(RenderObject* child) { m_firstChild = child; }
</span><span class="cx"> void setLastChild(RenderObject* child) { m_lastChild = child; }
</span><span class="lines">@@ -371,9 +371,9 @@
</span><span class="cx"> return WebCore::valueForLength(length, maximumValue);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline LayoutUnit RenderElement::minimumValueForLength(const Length& length, LayoutUnit maximumValue, bool roundPercentages) const
</del><ins>+inline LayoutUnit RenderElement::minimumValueForLength(const Length& length, LayoutUnit maximumValue) const
</ins><span class="cx"> {
</span><del>- return WebCore::minimumValueForLength(length, maximumValue, roundPercentages);
</del><ins>+ return WebCore::minimumValueForLength(length, maximumValue);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool RenderElement::isRenderLayerModelObject() const
</span></span></pre>
</div>
</div>
</body>
</html>