<!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>[159231] 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/159231">159231</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2013-11-13 13:28:55 -0800 (Wed, 13 Nov 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Code cleanup: change FrameView::doLayoutWithFrameFlattening() to make it more explicit.
https://bugs.webkit.org/show_bug.cgi?id=124238

Reviewed by Simon Fraser.

Rename doLayoutWithFrameFlattening() and change its signature so that it's inline with
what it does.

Covered by existing tests.

* page/FrameView.cpp:
(WebCore::FrameView::layout):
(WebCore::FrameView::startLayoutAtMainFrameViewIfNeeded):
* page/FrameView.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#trunkSourceWebCorepageFrameViewh">trunk/Source/WebCore/page/FrameView.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (159230 => 159231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-11-13 21:26:48 UTC (rev 159230)
+++ trunk/Source/WebCore/ChangeLog        2013-11-13 21:28:55 UTC (rev 159231)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2013-11-13  Zalan Bujtas  &lt;zalan@apple.com&gt;
+
+        Code cleanup: change FrameView::doLayoutWithFrameFlattening() to make it more explicit.
+        https://bugs.webkit.org/show_bug.cgi?id=124238
+
+        Reviewed by Simon Fraser.
+
+        Rename doLayoutWithFrameFlattening() and change its signature so that it's inline with
+        what it does.
+
+        Covered by existing tests.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::layout):
+        (WebCore::FrameView::startLayoutAtMainFrameViewIfNeeded):
+        * page/FrameView.h:
+
</ins><span class="cx"> 2013-11-13  Thiago de Barros Lacerda  &lt;thiago.lacerda@openbossa.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Modifying RTCSessionDescription object construction to match the spec
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (159230 => 159231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp        2013-11-13 21:26:48 UTC (rev 159230)
+++ trunk/Source/WebCore/page/FrameView.cpp        2013-11-13 21:28:55 UTC (rev 159231)
</span><span class="lines">@@ -1081,7 +1081,9 @@
</span><span class="cx">     bool inChildFrameLayoutWithFrameFlattening = isInChildFrameWithFrameFlattening();
</span><span class="cx"> 
</span><span class="cx">     if (inChildFrameLayoutWithFrameFlattening) {
</span><del>-        if (doLayoutWithFrameFlattening(allowSubtree))
</del><ins>+        startLayoutAtMainFrameViewIfNeeded(allowSubtree);
+        RenderElement* root = m_layoutRoot ? m_layoutRoot : frame().document()-&gt;renderView();
+        if (!root-&gt;needsLayout())
</ins><span class="cx">             return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="lines">@@ -3360,21 +3362,22 @@
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool FrameView::doLayoutWithFrameFlattening(bool allowSubtree)
</del><ins>+void FrameView::startLayoutAtMainFrameViewIfNeeded(bool allowSubtree)
</ins><span class="cx"> {
</span><del>-    // Try initiating layout from the topmost parent.
</del><ins>+    // When we start a layout at the child level as opposed to the topmost frame view and this child
+    // frame requires flattening, we need to re-initiate the layout at the topmost view. Layout
+    // will hit this view eventually.
</ins><span class="cx">     FrameView* parentView = parentFrameView();
</span><del>-
</del><span class="cx">     if (!parentView)
</span><del>-        return false;
</del><ins>+        return;
</ins><span class="cx"> 
</span><span class="cx">     // In the middle of parent layout, no need to restart from topmost.
</span><span class="cx">     if (parentView-&gt;m_nestedLayoutCount)
</span><del>-        return false;
</del><ins>+        return;
</ins><span class="cx"> 
</span><span class="cx">     // Parent tree is clean. Starting layout from it would have no effect.
</span><span class="cx">     if (!parentView-&gt;needsLayout())
</span><del>-        return false;
</del><ins>+        return;
</ins><span class="cx"> 
</span><span class="cx">     while (parentView-&gt;parentFrameView())
</span><span class="cx">         parentView = parentView-&gt;parentFrameView();
</span><span class="lines">@@ -3383,8 +3386,6 @@
</span><span class="cx"> 
</span><span class="cx">     RenderElement* root = m_layoutRoot ? m_layoutRoot : frame().document()-&gt;renderView();
</span><span class="cx">     ASSERT_UNUSED(root, !root-&gt;needsLayout());
</span><del>-
-    return true;
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void FrameView::updateControlTints()
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.h (159230 => 159231)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.h        2013-11-13 21:26:48 UTC (rev 159230)
+++ trunk/Source/WebCore/page/FrameView.h        2013-11-13 21:28:55 UTC (rev 159231)
</span><span class="lines">@@ -539,7 +539,7 @@
</span><span class="cx"> 
</span><span class="cx">     FrameView* parentFrameView() const;
</span><span class="cx"> 
</span><del>-    bool doLayoutWithFrameFlattening(bool allowSubtree);
</del><ins>+    void startLayoutAtMainFrameViewIfNeeded(bool allowSubtree);
</ins><span class="cx">     bool frameFlatteningEnabled() const;
</span><span class="cx">     bool isFrameFlatteningValidForThisFrame() const;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>