<!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>[212554] 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/212554">212554</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2017-02-17 10:41:50 -0800 (Fri, 17 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>RenderView needs to be updated when FrameView changes
https://bugs.webkit.org/show_bug.cgi?id=168481
<rdar://problem/30339638>
Reviewed by Andreas Kling.
The state of the Document's RenderView can get out of sync with the Frame's FrameView.
We need a notification mechanism so that modifications to the Frame's view are properly
relayed to Document so that it can have a correct RenderView.
* dom/Document.cpp:
(WebCore::Document::didBecomeCurrentDocumentInView): Create an updated render tree (if
one does not already exist).
(WebCore::Document::destroyRenderTree): Remove an incorrect ASSERT. We may enter this
code when the Frame uses 'setView(nullptr)', which happens during certain updates.
* dom/Document.h:
* page/Frame.cpp:
(WebCore::Frame::setView): Destroy the old render tree (if present) before switching to
the new view. Then notify the document that it is now the current document in the new view.</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="#trunkSourceWebCorepageFramecpp">trunk/Source/WebCore/page/Frame.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212553 => 212554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-17 18:05:46 UTC (rev 212553)
+++ trunk/Source/WebCore/ChangeLog 2017-02-17 18:41:50 UTC (rev 212554)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2017-02-16 Brent Fulgham <bfulgham@apple.com>
+
+ RenderView needs to be updated when FrameView changes
+ https://bugs.webkit.org/show_bug.cgi?id=168481
+ <rdar://problem/30339638>
+
+ Reviewed by Andreas Kling.
+
+ The state of the Document's RenderView can get out of sync with the Frame's FrameView.
+ We need a notification mechanism so that modifications to the Frame's view are properly
+ relayed to Document so that it can have a correct RenderView.
+
+ * dom/Document.cpp:
+ (WebCore::Document::didBecomeCurrentDocumentInView): Create an updated render tree (if
+ one does not already exist).
+ (WebCore::Document::destroyRenderTree): Remove an incorrect ASSERT. We may enter this
+ code when the Frame uses 'setView(nullptr)', which happens during certain updates.
+ * dom/Document.h:
+ * page/Frame.cpp:
+ (WebCore::Frame::setView): Destroy the old render tree (if present) before switching to
+ the new view. Then notify the document that it is now the current document in the new view.
+
</ins><span class="cx"> 2017-02-17 Enrique Ocaña González <eocanha@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GStreamer] Fast replay on video hide/unhide on platforms with limited video buffer pools
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (212553 => 212554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2017-02-17 18:05:46 UTC (rev 212553)
+++ trunk/Source/WebCore/dom/Document.cpp 2017-02-17 18:41:50 UTC (rev 212554)
</span><span class="lines">@@ -2183,6 +2183,13 @@
</span><span class="cx"> FrameDestructionObserver::frameDestroyed();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Document::didBecomeCurrentDocumentInView()
+{
+ ASSERT(view());
+ if (!hasLivingRenderTree())
+ createRenderTree();
+}
+
</ins><span class="cx"> void Document::attachToCachedFrame(CachedFrameBase& cachedFrame)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(cachedFrame.document() == this);
</span><span class="lines">@@ -2204,7 +2211,6 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(hasLivingRenderTree());
</span><span class="cx"> ASSERT(frame());
</span><del>- ASSERT(frame()->view());
</del><span class="cx"> ASSERT(page());
</span><span class="cx">
</span><span class="cx"> FrameView* frameView = frame()->document() == this ? frame()->view() : nullptr;
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (212553 => 212554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2017-02-17 18:05:46 UTC (rev 212553)
+++ trunk/Source/WebCore/dom/Document.h 2017-02-17 18:41:50 UTC (rev 212554)
</span><span class="lines">@@ -554,6 +554,7 @@
</span><span class="cx"> void didBecomeCurrentDocumentInFrame();
</span><span class="cx"> void destroyRenderTree();
</span><span class="cx"> void prepareForDestruction();
</span><ins>+ void didBecomeCurrentDocumentInView();
</ins><span class="cx">
</span><span class="cx"> // Override ScriptExecutionContext methods to do additional work
</span><span class="cx"> bool shouldBypassMainWorldContentSecurityPolicy() const final;
</span></span></pre></div>
<a id="trunkSourceWebCorepageFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Frame.cpp (212553 => 212554)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Frame.cpp 2017-02-17 18:05:46 UTC (rev 212553)
+++ trunk/Source/WebCore/page/Frame.cpp 2017-02-17 18:41:50 UTC (rev 212554)
</span><span class="lines">@@ -255,8 +255,15 @@
</span><span class="cx"> if (m_eventHandler)
</span><span class="cx"> m_eventHandler->clear();
</span><span class="cx">
</span><ins>+ bool hadLivingRenderTree = m_doc ? m_doc->hasLivingRenderTree() : false;
+ if (hadLivingRenderTree)
+ m_doc->destroyRenderTree();
+
</ins><span class="cx"> m_view = WTFMove(view);
</span><span class="cx">
</span><ins>+ if (hadLivingRenderTree && m_view)
+ m_doc->didBecomeCurrentDocumentInView();
+
</ins><span class="cx"> // Only one form submission is allowed per view of a part.
</span><span class="cx"> // Since this part may be getting reused as a result of being
</span><span class="cx"> // pulled from the back/forward cache, reset this flag.
</span></span></pre>
</div>
</div>
</body>
</html>