<!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>[183052] 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/183052">183052</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-04-20 23:22:57 -0700 (Mon, 20 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crash when showing Web Inspector on page with 'multipart/x-mixed-replace' main resource
https://bugs.webkit.org/show_bug.cgi?id=143979
<rdar://problem/20594948>
Reviewed by Timothy Hatcher.
InspectorDOMAgent::m_document was updated only once per load, from
FrameLoader::dispatchDidCommitLoad(). However, dispatchDidCommitLoad()
is not called for follow-up multipart replacing loads. You can see this
from the following check in DocumentLoader::commitData():
if (!isMultipartReplacingLoad())
frameLoader()->receivedFirstData();
As a result, in the case of a 'multipart/x-mixed-replace' main resource
InspectorDOMAgent::m_document would quickly get outdated as we create
a new Document for each replacing load. This would lead to Web Inspector
code using a Document without frame and causing crashes.
This patch calls InspectorInstrumentation::frameDocumentUpdated() from
Frame::setDocument() so that InspectorDOMAgent::m_document is always up
to date.
No new tests, not easily testable as the main resource needs to be
'multipart/x-mixed-replace'.
* dom/Document.cpp:
(WebCore::Document::applyXSLTransform):
Stop calling InspectorInstrumentation::frameDocumentUpdated() here as
XSLTProcessor::createDocumentFromSource() will call Frame::setDocument()
and frameDocumentUpdated() will be called there.
* page/Frame.cpp:
(WebCore::Frame::setDocument):
Call InspectorInstrumentation::frameDocumentUpdated() to make sure
InspectorDOMAgent::m_document gets updated.</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="#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 (183051 => 183052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-21 05:52:58 UTC (rev 183051)
+++ trunk/Source/WebCore/ChangeLog 2015-04-21 06:22:57 UTC (rev 183052)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2015-04-20 Chris Dumez <cdumez@apple.com>
+
+ Crash when showing Web Inspector on page with 'multipart/x-mixed-replace' main resource
+ https://bugs.webkit.org/show_bug.cgi?id=143979
+ <rdar://problem/20594948>
+
+ Reviewed by Timothy Hatcher.
+
+ InspectorDOMAgent::m_document was updated only once per load, from
+ FrameLoader::dispatchDidCommitLoad(). However, dispatchDidCommitLoad()
+ is not called for follow-up multipart replacing loads. You can see this
+ from the following check in DocumentLoader::commitData():
+ if (!isMultipartReplacingLoad())
+ frameLoader()->receivedFirstData();
+
+ As a result, in the case of a 'multipart/x-mixed-replace' main resource
+ InspectorDOMAgent::m_document would quickly get outdated as we create
+ a new Document for each replacing load. This would lead to Web Inspector
+ code using a Document without frame and causing crashes.
+
+ This patch calls InspectorInstrumentation::frameDocumentUpdated() from
+ Frame::setDocument() so that InspectorDOMAgent::m_document is always up
+ to date.
+
+ No new tests, not easily testable as the main resource needs to be
+ 'multipart/x-mixed-replace'.
+
+ * dom/Document.cpp:
+ (WebCore::Document::applyXSLTransform):
+ Stop calling InspectorInstrumentation::frameDocumentUpdated() here as
+ XSLTProcessor::createDocumentFromSource() will call Frame::setDocument()
+ and frameDocumentUpdated() will be called there.
+
+ * page/Frame.cpp:
+ (WebCore::Frame::setDocument):
+ Call InspectorInstrumentation::frameDocumentUpdated() to make sure
+ InspectorDOMAgent::m_document gets updated.
+
</ins><span class="cx"> 2015-04-20 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Overwrite existing files with moveFile.
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (183051 => 183052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2015-04-21 05:52:58 UTC (rev 183051)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-04-21 06:22:57 UTC (rev 183052)
</span><span class="lines">@@ -4584,7 +4584,6 @@
</span><span class="cx"> // FIXME: If the transform failed we should probably report an error (like Mozilla does).
</span><span class="cx"> Frame* ownerFrame = frame();
</span><span class="cx"> processor->createDocumentFromSource(newSource, resultEncoding, resultMIMEType, this, ownerFrame);
</span><del>- InspectorInstrumentation::frameDocumentUpdated(ownerFrame);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::setTransformSource(std::unique_ptr<TransformSource> source)
</span></span></pre></div>
<a id="trunkSourceWebCorepageFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Frame.cpp (183051 => 183052)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Frame.cpp 2015-04-21 05:52:58 UTC (rev 183051)
+++ trunk/Source/WebCore/page/Frame.cpp 2015-04-21 06:22:57 UTC (rev 183052)
</span><span class="lines">@@ -284,6 +284,8 @@
</span><span class="cx"> // that the document is not destroyed during this function call.
</span><span class="cx"> if (newDocument)
</span><span class="cx"> newDocument->didBecomeCurrentDocumentInFrame();
</span><ins>+
+ InspectorInstrumentation::frameDocumentUpdated(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(ORIENTATION_EVENTS)
</span></span></pre>
</div>
</div>
</body>
</html>