<!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>[180401] branches/safari-600.1.4.15-branch/Source</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/180401">180401</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-02-20 01:53:45 -0800 (Fri, 20 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/180062">r180062</a>. rdar://problem/19711532</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCoreWebCoreexpin">branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.exp.in</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorepageFrameTreecpp">branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameTree.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorepageFrameTreeh">branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameTree.h</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorepageFrameViewcpp">branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameView.cpp</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2ChangeLog">branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebKit2WebProcessWebPageWebPagecpp">branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (180400 => 180401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-02-20 09:51:49 UTC (rev 180400)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-02-20 09:53:45 UTC (rev 180401)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2015-02-20 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r180062.
+
+ 2015-02-12 Simon Fraser <simon.fraser@apple.com>
+
+ determinePrimarySnapshottedPlugIn() should only traverse visible Frames
+ https://bugs.webkit.org/show_bug.cgi?id=141547
+ Part of rdar://problem/18445733.
+
+ Reviewed by Anders Carlsson.
+
+ There's an expectation from clients that FrameView::updateLayoutAndStyleIfNeededRecursive()
+ updates layout in all frames, but it uses the widget tree, so only hits frames
+ that are parented via renderers (i.e. not display:none frames or their descendants).
+
+ Moving towards a future where we remove Widgets, fix by adding a FrameTree
+ traversal function that only finds rendered frames (those with an ownerRenderer).
+
+ Not testable.
+
+ * page/FrameTree.cpp:
+ (WebCore::FrameTree::firstRenderedChild):
+ (WebCore::FrameTree::nextRenderedSibling):
+ (WebCore::FrameTree::traverseNextRendered):
+ (printFrames):
+ * page/FrameTree.h:
+ * page/FrameView.cpp:
+ (WebCore::FrameView::updateLayoutAndStyleIfNeededRecursive):
+
+2015-02-20 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r179877.
</span><span class="cx">
</span><span class="cx"> 2015-02-07 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCoreWebCoreexpin"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.exp.in (180400 => 180401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.exp.in 2015-02-20 09:51:49 UTC (rev 180400)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/WebCore.exp.in 2015-02-20 09:53:45 UTC (rev 180401)
</span><span class="lines">@@ -2010,6 +2010,7 @@
</span><span class="cx"> __ZNK7WebCore9FrameTree10childCountEv
</span><span class="cx"> __ZNK7WebCore9FrameTree12traverseNextEPKNS_5FrameE
</span><span class="cx"> __ZNK7WebCore9FrameTree14isDescendantOfEPKNS_5FrameE
</span><ins>+__ZNK7WebCore9FrameTree20traverseNextRenderedEPKNS_5FrameE
</ins><span class="cx"> __ZNK7WebCore9FrameTree20traverseNextWithWrapEb
</span><span class="cx"> __ZNK7WebCore9FrameTree24traversePreviousWithWrapEb
</span><span class="cx"> __ZNK7WebCore9FrameTree3topEv
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorepageFrameTreecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameTree.cpp (180400 => 180401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameTree.cpp 2015-02-20 09:51:49 UTC (rev 180400)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameTree.cpp 2015-02-20 09:53:45 UTC (rev 180401)
</span><span class="lines">@@ -356,6 +356,68 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+Frame* FrameTree::firstRenderedChild() const
+{
+ Frame* child = firstChild();
+ if (!child)
+ return nullptr;
+
+ if (child->ownerRenderer())
+ return child;
+
+ while ((child = child->tree().nextSibling())) {
+ if (child->ownerRenderer())
+ return child;
+ }
+
+ return nullptr;
+}
+
+Frame* FrameTree::nextRenderedSibling() const
+{
+ Frame* sibling = &m_thisFrame;
+
+ while ((sibling = sibling->tree().nextSibling())) {
+ if (sibling->ownerRenderer())
+ return sibling;
+ }
+
+ return nullptr;
+}
+
+Frame* FrameTree::traverseNextRendered(const Frame* stayWithin) const
+{
+ Frame* child = firstRenderedChild();
+ if (child) {
+ ASSERT(!stayWithin || child->tree().isDescendantOf(stayWithin));
+ return child;
+ }
+
+ if (&m_thisFrame == stayWithin)
+ return nullptr;
+
+ Frame* sibling = nextRenderedSibling();
+ if (sibling) {
+ ASSERT(!stayWithin || sibling->tree().isDescendantOf(stayWithin));
+ return sibling;
+ }
+
+ Frame* frame = &m_thisFrame;
+ while (!sibling && (!stayWithin || frame->tree().parent() != stayWithin)) {
+ frame = frame->tree().parent();
+ if (!frame)
+ return nullptr;
+ sibling = frame->tree().nextRenderedSibling();
+ }
+
+ if (frame) {
+ ASSERT(!stayWithin || !sibling || sibling->tree().isDescendantOf(stayWithin));
+ return sibling;
+ }
+
+ return nullptr;
+}
+
</ins><span class="cx"> Frame* FrameTree::traverseNextWithWrap(bool wrap) const
</span><span class="cx"> {
</span><span class="cx"> if (Frame* result = traverseNext())
</span><span class="lines">@@ -426,8 +488,10 @@
</span><span class="cx"> printIndent(indent);
</span><span class="cx"> printf(" frameView=%p\n", view);
</span><span class="cx"> printIndent(indent);
</span><del>- printf(" document=%p\n", frame.document());
</del><ins>+ printf(" ownerRenderer=%p\n", frame.ownerRenderer());
</ins><span class="cx"> printIndent(indent);
</span><ins>+ printf(" document=%p (needs style recalc %d)\n", frame.document(), frame.document() ? frame.document()->childNeedsStyleRecalc() : false);
+ printIndent(indent);
</ins><span class="cx"> printf(" uri=%s\n\n", frame.document()->documentURI().utf8().data());
</span><span class="cx">
</span><span class="cx"> for (WebCore::Frame* child = frame.tree().firstChild(); child; child = child->tree().nextSibling())
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorepageFrameTreeh"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameTree.h (180400 => 180401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameTree.h 2015-02-20 09:51:49 UTC (rev 180400)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameTree.h 2015-02-20 09:53:45 UTC (rev 180401)
</span><span class="lines">@@ -56,7 +56,9 @@
</span><span class="cx"> Frame* lastChild() const { return m_lastChild; }
</span><span class="cx">
</span><span class="cx"> bool isDescendantOf(const Frame* ancestor) const;
</span><del>- Frame* traverseNext(const Frame* stayWithin = 0) const;
</del><ins>+ Frame* traverseNext(const Frame* stayWithin = nullptr) const;
+ // Rendered means being the main frame or having an ownerRenderer. It may not have been parented in the Widget tree yet (see WidgetHierarchyUpdatesSuspensionScope).
+ Frame* traverseNextRendered(const Frame* stayWithin = nullptr) const;
</ins><span class="cx"> Frame* traverseNextWithWrap(bool) const;
</span><span class="cx"> Frame* traversePreviousWithWrap(bool) const;
</span><span class="cx">
</span><span class="lines">@@ -87,6 +89,9 @@
</span><span class="cx"> Frame* scopedChild(const AtomicString& name, TreeScope*) const;
</span><span class="cx"> unsigned scopedChildCount(TreeScope*) const;
</span><span class="cx">
</span><ins>+ Frame* firstRenderedChild() const;
+ Frame* nextRenderedSibling() const;
+
</ins><span class="cx"> Frame& m_thisFrame;
</span><span class="cx">
</span><span class="cx"> Frame* m_parent;
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameView.cpp (180400 => 180401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameView.cpp 2015-02-20 09:51:49 UTC (rev 180400)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/page/FrameView.cpp 2015-02-20 09:53:45 UTC (rev 180401)
</span><span class="lines">@@ -3836,6 +3836,7 @@
</span><span class="cx"> // Grab a copy of the children() set, as it may be mutated by the following updateLayoutAndStyleIfNeededRecursive
</span><span class="cx"> // calls, as they can potentially re-enter a layout of the parent frame view, which may add/remove scrollbars
</span><span class="cx"> // and thus mutates the children() set.
</span><ins>+ // FIXME: use FrameTree::traverseNextRendered().
</ins><span class="cx"> Vector<Ref<FrameView>, 16> childViews;
</span><span class="cx"> childViews.reserveInitialCapacity(children().size());
</span><span class="cx"> for (auto& widget : children()) {
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog (180400 => 180401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-02-20 09:51:49 UTC (rev 180400)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/ChangeLog 2015-02-20 09:53:45 UTC (rev 180401)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-02-20 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r180062.
+
+ 2015-02-12 Simon Fraser <simon.fraser@apple.com>
+
+ determinePrimarySnapshottedPlugIn() should only traverse visible Frames
+ https://bugs.webkit.org/show_bug.cgi?id=141547
+ Part of rdar://problem/18445733.
+
+ Reviewed by Anders Carlsson.
+
+ Use FrameTree::traverseNextRendered() to avoid doing things in unrendered frames
+ which are not guaranteed to have been laid out.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::determinePrimarySnapshottedPlugIn):
+
+2015-02-20 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r179955.
</span><span class="cx">
</span><span class="cx"> 2015-02-11 Tim Horton <timothy_horton@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (180400 => 180401)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-02-20 09:51:49 UTC (rev 180400)
+++ branches/safari-600.1.4.15-branch/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-02-20 09:53:45 UTC (rev 180401)
</span><span class="lines">@@ -4606,7 +4606,7 @@
</span><span class="cx"> HTMLPlugInImageElement* candidatePlugIn = nullptr;
</span><span class="cx"> unsigned candidatePlugInArea = 0;
</span><span class="cx">
</span><del>- for (Frame* frame = &mainFrame; frame; frame = frame->tree().traverseNext()) {
</del><ins>+ for (Frame* frame = &mainFrame; frame; frame = frame->tree().traverseNextRendered()) {
</ins><span class="cx"> if (!frame->loader().subframeLoader().containsPlugins())
</span><span class="cx"> continue;
</span><span class="cx"> if (!frame->document() || !frame->view())
</span></span></pre>
</div>
</div>
</body>
</html>