<!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>[182022] 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/182022">182022</a></dd>

<dt>Author</dt> <dd>hyatt@apple.com</dd>

<dt>Date</dt> <dd>2015-03-26 12:09:24 -0700 (Thu, 26 Mar 2015)</dd>

</dl>

<h3>Log Message</h3>

<pre>Improve the offsetWidth/Height layout optimization

https://bugs.webkit.org/show_bug.cgi?id=143008

Reviewed by Zalan Bujtas.

* dom/Document.cpp:

(WebCore::Document::updateLayoutIfDimensionsOutOfDate):

* dom/Document.h:

Change Element* to Element&amp;. Clean up the dimension bits to use shifting. Remove both the inline and

the positioning restrictions on the optimization check.

* dom/Element.cpp:

(WebCore::Element::offsetWidth):

(WebCore::Element::offsetHeight):

Change to use Element&amp; instead of Element*.

(WebCore::Element::clientWidth):

(WebCore::Element::clientHeight):

(WebCore::Element::scrollWidth):

(WebCore::Element::scrollHeight):

Turn on the optimization for clientWidth/Height and scrollWidth/Height.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>

<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>

<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182021 => 182022)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-03-26 19:00:05 UTC (rev 182021)

+++ trunk/Source/WebCore/ChangeLog        2015-03-26 19:09:24 UTC (rev 182022)

</span><span class="lines">@@ -1,3 +1,27 @@

</span><ins>+2015-03-25  David Hyatt  &lt;hyatt@apple.com&gt;

+

+        Improve the offsetWidth/Height layout optimization

+        https://bugs.webkit.org/show_bug.cgi?id=143008

+

+        Reviewed by Zalan Bujtas.

+

+        * dom/Document.cpp:

+        (WebCore::Document::updateLayoutIfDimensionsOutOfDate):

+        * dom/Document.h:

+        Change Element* to Element&amp;. Clean up the dimension bits to use shifting. Remove both the inline and

+        the positioning restrictions on the optimization check.

+

+        * dom/Element.cpp:

+        (WebCore::Element::offsetWidth):

+        (WebCore::Element::offsetHeight):

+        Change to use Element&amp; instead of Element*.

+

+        (WebCore::Element::clientWidth):

+        (WebCore::Element::clientHeight):

+        (WebCore::Element::scrollWidth):

+        (WebCore::Element::scrollHeight):

+        Turn on the optimization for clientWidth/Height and scrollWidth/Height.

+

</ins><span class="cx"> 2015-03-26  Brady Eidson  &lt;beidson@apple.com&gt;

</span><span class="cx"> 

<span class="cx">         Apply ContentExtension actions after redirects.

</span></span></pre></div>

<a id="trunkSourceWebCoredomDocumentcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (182021 => 182022)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/dom/Document.cpp        2015-03-26 19:00:05 UTC (rev 182021)

+++ trunk/Source/WebCore/dom/Document.cpp        2015-03-26 19:09:24 UTC (rev 182022)

</span><span class="lines">@@ -1896,7 +1896,7 @@

</span><span class="cx">     return ensureStyleResolver().styleForElement(element, element-&gt;parentNode() ? element-&gt;parentNode()-&gt;computedStyle() : nullptr);

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-bool Document::updateLayoutIfDimensionsOutOfDate(Element* element, DimensionsCheck dimensionsCheck)

</del><ins>+bool Document::updateLayoutIfDimensionsOutOfDate(Element&amp; element, DimensionsCheck dimensionsCheck)

</ins><span class="cx"> {

</span><span class="cx">     ASSERT(isMainThread());

</span><span class="cx">     

</span><span class="lines">@@ -1920,15 +1920,19 @@

<span class="cx">     // layout.

</span><span class="cx">     bool requireFullLayout = false;

</span><span class="cx">     if (HTMLFrameOwnerElement* owner = ownerElement()) {

</span><del>-        if (owner-&gt;document().updateLayoutIfDimensionsOutOfDate(owner))

</del><ins>+        if (owner-&gt;document().updateLayoutIfDimensionsOutOfDate(*owner))

</ins><span class="cx">             requireFullLayout = true;

</span><span class="cx">     }

</span><span class="cx">     

</span><span class="cx">     updateStyleIfNeeded();

</span><del>-    

-    RenderObject* renderer = element-&gt;renderer();

-    if (!renderer || renderer-&gt;needsLayout())

</del><ins>+

+    RenderObject* renderer = element.renderer();

+    if (!renderer || renderer-&gt;needsLayout() || element.renderNamedFlowFragment()) {

+        // If we don't have a renderer or if the renderer needs layout for any reason, give up.

+        // Named flows can have auto height, so don't try to enforce the optimization in this case.

+        // The 2-pass nature of auto height named flow layout means the region may not be dirty yet.

</ins><span class="cx">         requireFullLayout = true;

</span><ins>+    }

</ins><span class="cx"> 

</span><span class="cx">     bool isVertical = renderer &amp;&amp; !renderer-&gt;isHorizontalWritingMode();

</span><span class="cx">     bool checkingLogicalWidth = ((dimensionsCheck &amp; WidthDimensionsCheck) &amp;&amp; !isVertical) || ((dimensionsCheck &amp; HeightDimensionsCheck) &amp;&amp; isVertical);

</span><span class="lines">@@ -1940,7 +1944,7 @@

</span><span class="cx">         RenderBox* currentBox = nullptr;

</span><span class="cx">         

<span class="cx">         // Check our containing block chain. If anything in the chain needs a layout, then require a full layout.

</span><del>-        for (RenderObject* currRenderer = element-&gt;renderer(); currRenderer &amp;&amp; !currRenderer-&gt;isRenderView(); currRenderer = currRenderer-&gt;container()) {

</del><ins>+        for (RenderObject* currRenderer = element.renderer(); currRenderer &amp;&amp; !currRenderer-&gt;isRenderView(); currRenderer = currRenderer-&gt;container()) {

</ins><span class="cx">             

<span class="cx">             // Require the entire container chain to be boxes.

</span><span class="cx">             if (!is&lt;RenderBox&gt;(currRenderer)) {

</span><span class="lines">@@ -1969,9 +1973,8 @@

</span><span class="cx">                 }

</span><span class="cx">             }

</span><span class="cx">             

</span><del>-            if (!currentBox-&gt;isRenderBlockFlow() || currentBox-&gt;isInline() || currentBox-&gt;isOutOfFlowPositioned() || currentBox-&gt;flowThreadContainingBlock() || currentBox-&gt;isWritingModeRoot()) {

-                // FIXME: For now require only block-level non-positioned

-                // block flows all the way back to the root. This limits the optimization

</del><ins>+            if (!currentBox-&gt;isRenderBlockFlow() || currentBox-&gt;flowThreadContainingBlock() || currentBox-&gt;isWritingModeRoot()) {

+                // FIXME: For now require only block flows all the way back to the root. This limits the optimization

</ins><span class="cx">                 // for now, and we'll expand it in future patches to apply to more and more scenarios.

<span class="cx">                 // Disallow regions/columns from having the optimization.

<span class="cx">                 // Give up if the writing mode changes at all in the containing block chain.

</span></span></pre></div>

<a id="trunkSourceWebCoredomDocumenth"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (182021 => 182022)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/dom/Document.h        2015-03-26 19:00:05 UTC (rev 182021)

+++ trunk/Source/WebCore/dom/Document.h        2015-03-26 19:09:24 UTC (rev 182022)

</span><span class="lines">@@ -260,7 +260,7 @@

</span><span class="cx">     LimitedQuirksMode = 1 &lt;&lt; 2

</span><span class="cx"> };

</span><span class="cx"> 

</span><del>-enum DimensionsCheck { WidthDimensionsCheck = 0x1, HeightDimensionsCheck = 0x2, AllDimensionsCheck = 0x3 };

</del><ins>+enum DimensionsCheck { WidthDimensionsCheck = 1 &lt;&lt; 0, HeightDimensionsCheck = 1 &lt;&lt; 1, AllDimensionsCheck = 1 &lt;&lt; 2 };

</ins><span class="cx"> 

</span><span class="cx"> class Document : public ContainerNode, public TreeScope, public ScriptExecutionContext, public FontSelectorClient {

</span><span class="cx"> public:

</span><span class="lines">@@ -569,7 +569,7 @@

</span><span class="cx">     bool renderTreeBeingDestroyed() const { return m_renderTreeBeingDestroyed; }

</span><span class="cx">     bool hasLivingRenderTree() const { return renderView() &amp;&amp; !renderTreeBeingDestroyed(); }

</span><span class="cx">     

</span><del>-    bool updateLayoutIfDimensionsOutOfDate(Element*, DimensionsCheck = AllDimensionsCheck);

</del><ins>+    bool updateLayoutIfDimensionsOutOfDate(Element&amp;, DimensionsCheck = AllDimensionsCheck);

</ins><span class="cx">     

</span><span class="cx">     AXObjectCache* existingAXObjectCache() const;

</span><span class="cx">     WEBCORE_EXPORT AXObjectCache* axObjectCache() const;

</span></span></pre></div>

<a id="trunkSourceWebCoredomElementcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (182021 => 182022)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/dom/Element.cpp        2015-03-26 19:00:05 UTC (rev 182021)

+++ trunk/Source/WebCore/dom/Element.cpp        2015-03-26 19:09:24 UTC (rev 182022)

</span><span class="lines">@@ -729,7 +729,7 @@

</span><span class="cx"> 

</span><span class="cx"> double Element::offsetWidth()

</span><span class="cx"> {

</span><del>-    document().updateLayoutIfDimensionsOutOfDate(this, WidthDimensionsCheck);

</del><ins>+    document().updateLayoutIfDimensionsOutOfDate(*this, WidthDimensionsCheck);

</ins><span class="cx">     if (RenderBoxModelObject* renderer = renderBoxModelObject()) {

</span><span class="cx">         LayoutUnit offsetWidth = subpixelMetricsEnabled(renderer-&gt;document()) ? renderer-&gt;offsetWidth() : LayoutUnit(renderer-&gt;pixelSnappedOffsetWidth());

</span><span class="cx">         return convertToNonSubpixelValueIfNeeded(adjustLayoutUnitForAbsoluteZoom(offsetWidth, *renderer).toDouble(), renderer-&gt;document());

</span><span class="lines">@@ -739,7 +739,7 @@

</span><span class="cx"> 

</span><span class="cx"> double Element::offsetHeight()

</span><span class="cx"> {

</span><del>-    document().updateLayoutIfDimensionsOutOfDate(this, HeightDimensionsCheck);

</del><ins>+    document().updateLayoutIfDimensionsOutOfDate(*this, HeightDimensionsCheck);

</ins><span class="cx">     if (RenderBoxModelObject* renderer = renderBoxModelObject()) {

</span><span class="cx">         LayoutUnit offsetHeight = subpixelMetricsEnabled(renderer-&gt;document()) ? renderer-&gt;offsetHeight() : LayoutUnit(renderer-&gt;pixelSnappedOffsetHeight());

</span><span class="cx">         return convertToNonSubpixelValueIfNeeded(adjustLayoutUnitForAbsoluteZoom(offsetHeight, *renderer).toDouble(), renderer-&gt;document());

</span><span class="lines">@@ -791,7 +791,7 @@

</span><span class="cx"> 

</span><span class="cx"> double Element::clientWidth()

</span><span class="cx"> {

</span><del>-    document().updateLayoutIgnorePendingStylesheets();

</del><ins>+    document().updateLayoutIfDimensionsOutOfDate(*this, WidthDimensionsCheck);

</ins><span class="cx"> 

</span><span class="cx">     if (!document().hasLivingRenderTree())

</span><span class="cx">         return 0;

</span><span class="lines">@@ -812,8 +812,7 @@

</span><span class="cx"> 

</span><span class="cx"> double Element::clientHeight()

</span><span class="cx"> {

</span><del>-    document().updateLayoutIgnorePendingStylesheets();

-

</del><ins>+    document().updateLayoutIfDimensionsOutOfDate(*this, HeightDimensionsCheck);

</ins><span class="cx">     if (!document().hasLivingRenderTree())

</span><span class="cx">         return 0;

</span><span class="cx">     RenderView&amp; renderView = *document().renderView();

</span><span class="lines">@@ -873,7 +872,7 @@

</span><span class="cx"> 

</span><span class="cx"> int Element::scrollWidth()

</span><span class="cx"> {

</span><del>-    document().updateLayoutIgnorePendingStylesheets();

</del><ins>+    document().updateLayoutIfDimensionsOutOfDate(*this, WidthDimensionsCheck);

</ins><span class="cx">     if (RenderBox* rend = renderBox())

</span><span class="cx">         return adjustForAbsoluteZoom(rend-&gt;scrollWidth(), *rend);

</span><span class="cx">     return 0;

</span><span class="lines">@@ -881,7 +880,7 @@

</span><span class="cx"> 

</span><span class="cx"> int Element::scrollHeight()

</span><span class="cx"> {

</span><del>-    document().updateLayoutIgnorePendingStylesheets();

</del><ins>+    document().updateLayoutIfDimensionsOutOfDate(*this, HeightDimensionsCheck);

</ins><span class="cx">     if (RenderBox* rend = renderBox())

</span><span class="cx">         return adjustForAbsoluteZoom(rend-&gt;scrollHeight(), *rend);

</span><span class="cx">     return 0;

</span></span></pre>

</div>

</div>

</body>

</html>