<!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>[184176] releases/WebKitGTK/webkit-2.8/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/184176">184176</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-12 01:38:44 -0700 (Tue, 12 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/183879">r183879</a> - Optimize relativePositionOffset() to avoid doing unnecessary work
https://bugs.webkit.org/show_bug.cgi?id=144698
Reviewed by Simon Fraser.
* rendering/RenderBoxModelObject.cpp:
(WebCore::RenderBoxModelObject::relativePositionOffset):
Patch relativePositionOffset to avoid doing unnecessary work in the common case where
all values of top/left/right/bottom are either auto or fixed. We no longer fetch
containingBlock() into a local always, but instead just invoke the function only
when necessary.
Also avoid computing the percentage-relative maximum for the top/right/bottom/left lengths
when they are fixed values, since that maximum won't be examined at all.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorerenderingRenderBoxModelObjectcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderBoxModelObject.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (184175 => 184176)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-12 08:37:54 UTC (rev 184175)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-12 08:38:44 UTC (rev 184176)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-05-06 David Hyatt <hyatt@apple.com>
+
+ Optimize relativePositionOffset() to avoid doing unnecessary work
+ https://bugs.webkit.org/show_bug.cgi?id=144698
+
+ Reviewed by Simon Fraser.
+
+ * rendering/RenderBoxModelObject.cpp:
+ (WebCore::RenderBoxModelObject::relativePositionOffset):
+
+ Patch relativePositionOffset to avoid doing unnecessary work in the common case where
+ all values of top/left/right/bottom are either auto or fixed. We no longer fetch
+ containingBlock() into a local always, but instead just invoke the function only
+ when necessary.
+
+ Also avoid computing the percentage-relative maximum for the top/right/bottom/left lengths
+ when they are fixed values, since that maximum won't be examined at all.
+
</ins><span class="cx"> 2015-05-05 Žan Doberšek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> EventHandler::m_eventHandlerWillResetCapturingMouseEventsElement is incorrectly initialized
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorerenderingRenderBoxModelObjectcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderBoxModelObject.cpp (184175 => 184176)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderBoxModelObject.cpp 2015-05-12 08:37:54 UTC (rev 184175)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderBoxModelObject.cpp 2015-05-12 08:38:44 UTC (rev 184176)
</span><span class="lines">@@ -274,21 +274,22 @@
</span><span class="cx">
</span><span class="cx"> LayoutSize RenderBoxModelObject::relativePositionOffset() const
</span><span class="cx"> {
</span><ins>+ // This function has been optimized to avoid calls to containingBlock() in the common case
+ // where all values are either auto or fixed.
+
</ins><span class="cx"> LayoutSize offset = accumulateInFlowPositionOffsets(this);
</span><span class="cx">
</span><del>- RenderBlock* containingBlock = this->containingBlock();
-
</del><span class="cx"> // Objects that shrink to avoid floats normally use available line width when computing containing block width. However
</span><span class="cx"> // in the case of relative positioning using percentages, we can't do this. The offset should always be resolved using the
</span><span class="cx"> // available width of the containing block. Therefore we don't use containingBlockLogicalWidthForContent() here, but instead explicitly
</span><span class="cx"> // call availableWidth on our containing block.
</span><span class="cx"> if (!style().left().isAuto()) {
</span><del>- if (!style().right().isAuto() && !containingBlock->style().isLeftToRightDirection())
- offset.setWidth(-valueForLength(style().right(), containingBlock->availableWidth()));
</del><ins>+ if (!style().right().isAuto() && !containingBlock()->style().isLeftToRightDirection())
+ offset.setWidth(-valueForLength(style().right(), !style().right().isFixed() ? containingBlock()->availableWidth() : LayoutUnit()));
</ins><span class="cx"> else
</span><del>- offset.expand(valueForLength(style().left(), containingBlock->availableWidth()), 0);
</del><ins>+ offset.expand(valueForLength(style().left(), !style().left().isFixed() ? containingBlock()->availableWidth() : LayoutUnit()), 0);
</ins><span class="cx"> } else if (!style().right().isAuto()) {
</span><del>- offset.expand(-valueForLength(style().right(), containingBlock->availableWidth()), 0);
</del><ins>+ offset.expand(-valueForLength(style().right(), !style().right().isFixed() ? containingBlock()->availableWidth() : LayoutUnit()), 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If the containing block of a relatively positioned element does not
</span><span class="lines">@@ -298,16 +299,16 @@
</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>- && (!containingBlock->hasAutoHeightOrContainingBlockWithAutoHeight()
- || !style().top().isPercent()
- || containingBlock->stretchesToViewport()))
- offset.expand(0, valueForLength(style().top(), containingBlock->availableHeight()));
</del><ins>+ && (!style().top().isPercent()
+ || !containingBlock()->hasAutoHeightOrContainingBlockWithAutoHeight()
+ || containingBlock()->stretchesToViewport()))
+ offset.expand(0, valueForLength(style().top(), !style().top().isFixed() ? containingBlock()->availableHeight() : LayoutUnit()));
</ins><span class="cx">
</span><span class="cx"> else if (!style().bottom().isAuto()
</span><del>- && (!containingBlock->hasAutoHeightOrContainingBlockWithAutoHeight()
- || !style().bottom().isPercent()
- || containingBlock->stretchesToViewport()))
- offset.expand(0, -valueForLength(style().bottom(), containingBlock->availableHeight()));
</del><ins>+ && (!style().bottom().isPercent()
+ || !containingBlock()->hasAutoHeightOrContainingBlockWithAutoHeight()
+ || containingBlock()->stretchesToViewport()))
+ offset.expand(0, -valueForLength(style().bottom(), !style().bottom().isFixed() ? containingBlock()->availableHeight() : LayoutUnit()));
</ins><span class="cx">
</span><span class="cx"> return offset;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>