<!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>[194991] branches/safari-601.1.46-branch</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/194991">194991</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-01-13 15:10:34 -0800 (Wed, 13 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/191180">r191180</a>. rdar://problem/24154421</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCorehtmlparserHTMLPreloadScannercpp">branches/safari-601.1.46-branch/Source/WebCore/html/parser/HTMLPreloadScanner.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorehtmlparserHTMLPreloadScannerh">branches/safari-601.1.46-branch/Source/WebCore/html/parser/HTMLPreloadScanner.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsfastpreloaderframesrcexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/fast/preloader/frame-src-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastpreloaderframesrchtml">branches/safari-601.1.46-branch/LayoutTests/fast/preloader/frame-src.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastpreloaderresourcestestFramehtml">branches/safari-601.1.46-branch/LayoutTests/fast/preloader/resources/testFrame.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestshttptestsloadingpreloadnostoreframesrcexpectedtxt">branches/safari-601.1.46-branch/LayoutTests/http/tests/loading/preload-no-store-frame-src-expected.txt</a></li>
<li><a href="#branchessafari601146branchLayoutTestshttptestsloadingpreloadnostoreframesrchtml">branches/safari-601.1.46-branch/LayoutTests/http/tests/loading/preload-no-store-frame-src.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (194990 => 194991)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-01-13 23:10:29 UTC (rev 194990)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2016-01-13 23:10:34 UTC (rev 194991)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2016-01-13 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r191180. rdar://problem/24154421
+
+ 2015-10-16 Chris Dumez <cdumez@apple.com>
+
+ HTMLPreloadScanner should preload iframes
+ https://bugs.webkit.org/show_bug.cgi?id=150097
+ <rdar://problem/23094475>
+
+ Reviewed by Antti Koivisto.
+
+ Add layout test to check that iframes are indeed preloaded.
+
+ * fast/preloader/frame-src-expected.txt: Added.
+ * fast/preloader/frame-src.html: Added.
+ * fast/preloader/resources/testFrame.html: Added.
+ * http/tests/loading/preload-no-store-frame-src-expected.txt: Added.
+ * http/tests/loading/preload-no-store-frame-src.html: Added.
+
+2016-01-13 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r193939. rdar://problem/24154418
</span><span class="cx">
</span><span class="cx"> 2015-12-10 Daniel Bates <dabates@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastpreloaderframesrcexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/fast/preloader/frame-src-expected.txt (0 => 194991)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/preloader/frame-src-expected.txt (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/preloader/frame-src-expected.txt 2016-01-13 23:10:34 UTC (rev 194991)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+js-test-pre.js has MIME type text/javascript
+testFrame.html has MIME type text/html
+PASS internals.isPreloaded("resources/testFrame.html"); is true
+Tests that iframes are preloaded.
+
+
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastpreloaderframesrchtml"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/fast/preloader/frame-src.html (0 => 194991)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/preloader/frame-src.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/preloader/frame-src.html 2016-01-13 23:10:34 UTC (rev 194991)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<html>
+<head>
+<script>
+if (window.testRunner)
+ testRunner.dumpResourceResponseMIMETypes();
+</script>
+<script src="../../resources/js-test-pre.js"></script>
+<script src=resources/non-existant.js></script>
+<script>
+ shouldBeTrue('internals.isPreloaded("resources/testFrame.html");');
+</script>
+</head>
+<body>
+<p>Tests that iframes are preloaded.</p>
+<iframe src="resources/testFrame.html"></iframe>
+</body>
+</html>
+
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastpreloaderresourcestestFramehtml"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/fast/preloader/resources/testFrame.html (0 => 194991)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/preloader/resources/testFrame.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/preloader/resources/testFrame.html 2016-01-13 23:10:34 UTC (rev 194991)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<!DOCTYPE html>
+<body>
+<p>Test frame</p>
+</body>
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestshttptestsloadingpreloadnostoreframesrcexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/http/tests/loading/preload-no-store-frame-src-expected.txt (0 => 194991)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/http/tests/loading/preload-no-store-frame-src-expected.txt (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/http/tests/loading/preload-no-store-frame-src-expected.txt 2016-01-13 23:10:34 UTC (rev 194991)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+main frame - didStartProvisionalLoadForFrame
+main frame - didCommitLoadForFrame
+js-test-pre.js has MIME type application/x-javascript
+slow-script.pl has MIME type application/javascript
+frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
+main frame - didFinishDocumentLoadForFrame
+no-store-frame.php has MIME type text/html
+frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
+frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
+frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
+main frame - didHandleOnloadEventsForFrame
+frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
+main frame - didFinishLoadForFrame
+PASS internals.isPreloaded("/navigation/resources/no-store-frame.php"); is true
+Tests that 'no-store' iframes are preloaded.
+
+
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestshttptestsloadingpreloadnostoreframesrchtml"></a>
<div class="addfile"><h4>Added: branches/safari-601.1.46-branch/LayoutTests/http/tests/loading/preload-no-store-frame-src.html (0 => 194991)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/http/tests/loading/preload-no-store-frame-src.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/http/tests/loading/preload-no-store-frame-src.html 2016-01-13 23:10:34 UTC (rev 194991)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<html>
+<head>
+<script>
+if (window.testRunner)
+ testRunner.dumpResourceResponseMIMETypes();
+</script>
+<script src="../../resources/js-test-pre.js"></script>
+<script src="http://127.0.0.1:8000/resources/slow-script.pl?delay=100"></script>
+<script>
+ shouldBeTrue('internals.isPreloaded("/navigation/resources/no-store-frame.php");');
+</script>
+</head>
+<body>
+<p>Tests that 'no-store' iframes are preloaded.</p>
+<iframe src="/navigation/resources/no-store-frame.php"></iframe>
+</body>
+</html>
+
</ins></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (194990 => 194991)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-01-13 23:10:29 UTC (rev 194990)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2016-01-13 23:10:34 UTC (rev 194991)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2016-01-13 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r191180. rdar://problem/24154421
+
+ 2015-10-16 Chris Dumez <cdumez@apple.com>
+
+ HTMLPreloadScanner should preload iframes
+ https://bugs.webkit.org/show_bug.cgi?id=150097
+ <rdar://problem/23094475>
+
+ Reviewed by Antti Koivisto.
+
+ HTMLPreloadScanner should preload iframes to decrease page load time.
+
+ Tests:
+ - fast/preloader/frame-src.html
+ - http/tests/loading/preload-no-store-frame-src.html
+
+ * html/parser/HTMLPreloadScanner.cpp:
+ (WebCore::TokenPreloadScanner::tagIdFor):
+ (WebCore::TokenPreloadScanner::initiatorFor):
+ (WebCore::TokenPreloadScanner::StartTagScanner::createPreloadRequest):
+ (WebCore::TokenPreloadScanner::StartTagScanner::processAttribute):
+ (WebCore::TokenPreloadScanner::StartTagScanner::resourceType):
+ (WebCore::TokenPreloadScanner::StartTagScanner::setUrlToLoad): Deleted.
+ (WebCore::TokenPreloadScanner::StartTagScanner::charset): Deleted.
+ * html/parser/HTMLPreloadScanner.h:
+
+2016-01-13 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r190641. rdar://problem/24154421
</span><span class="cx">
</span><span class="cx"> 2015-10-06 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorehtmlparserHTMLPreloadScannercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/html/parser/HTMLPreloadScanner.cpp (194990 => 194991)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2016-01-13 23:10:29 UTC (rev 194990)
+++ branches/safari-601.1.46-branch/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2016-01-13 23:10:34 UTC (rev 194991)
</span><span class="lines">@@ -44,6 +44,8 @@
</span><span class="cx"> TokenPreloadScanner::TagId TokenPreloadScanner::tagIdFor(const HTMLToken::DataVector& data)
</span><span class="cx"> {
</span><span class="cx"> AtomicString tagName(data);
</span><ins>+ if (tagName == iframeTag)
+ return TagId::Iframe;
</ins><span class="cx"> if (tagName == imgTag)
</span><span class="cx"> return TagId::Img;
</span><span class="cx"> if (tagName == inputTag)
</span><span class="lines">@@ -66,6 +68,8 @@
</span><span class="cx"> String TokenPreloadScanner::initiatorFor(TagId tagId)
</span><span class="cx"> {
</span><span class="cx"> switch (tagId) {
</span><ins>+ case TagId::Iframe:
+ return "iframe";
</ins><span class="cx"> case TagId::Img:
</span><span class="cx"> return "img";
</span><span class="cx"> case TagId::Input:
</span><span class="lines">@@ -153,6 +157,10 @@
</span><span class="cx"> void processAttribute(const AtomicString& attributeName, const String& attributeValue)
</span><span class="cx"> {
</span><span class="cx"> switch (m_tagId) {
</span><ins>+ case TagId::Iframe:
+ if (match(attributeName, srcAttr))
+ setUrlToLoad(attributeValue);
+ break;
</ins><span class="cx"> case TagId::Img:
</span><span class="cx"> if (match(attributeName, srcsetAttr) && m_srcSetAttribute.isNull()) {
</span><span class="cx"> m_srcSetAttribute = attributeValue;
</span><span class="lines">@@ -222,12 +230,25 @@
</span><span class="cx">
</span><span class="cx"> CachedResource::Type resourceType() const
</span><span class="cx"> {
</span><del>- if (m_tagId == TagId::Script)
</del><ins>+ switch (m_tagId) {
+ case TagId::Iframe:
+ return CachedResource::MainResource;
+ case TagId::Script:
</ins><span class="cx"> return CachedResource::Script;
</span><del>- if (m_tagId == TagId::Img || (m_tagId == TagId::Input && m_inputIsImage))
</del><ins>+ case TagId::Img:
+ case TagId::Input:
+ ASSERT(m_tagId != TagId::Input || m_inputIsImage);
</ins><span class="cx"> return CachedResource::ImageResource;
</span><del>- if (m_tagId == TagId::Link && m_linkIsStyleSheet)
</del><ins>+ case TagId::Link:
+ ASSERT(m_linkIsStyleSheet);
</ins><span class="cx"> return CachedResource::CSSStyleSheet;
</span><ins>+ case TagId::Meta:
+ case TagId::Unknown:
+ case TagId::Style:
+ case TagId::Base:
+ case TagId::Template:
+ break;
+ }
</ins><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return CachedResource::RawResource;
</span><span class="cx"> }
</span><span class="lines">@@ -237,6 +258,9 @@
</span><span class="cx"> if (m_urlToLoad.isEmpty())
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (protocolIs(m_urlToLoad, "data") || protocolIs(m_urlToLoad, "about"))
+ return false;
+
</ins><span class="cx"> if (m_tagId == TagId::Link && !m_linkIsStyleSheet)
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorehtmlparserHTMLPreloadScannerh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/html/parser/HTMLPreloadScanner.h (194990 => 194991)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/html/parser/HTMLPreloadScanner.h 2016-01-13 23:10:29 UTC (rev 194990)
+++ branches/safari-601.1.46-branch/Source/WebCore/html/parser/HTMLPreloadScanner.h 2016-01-13 23:10:34 UTC (rev 194991)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> private:
</span><span class="cx"> enum class TagId {
</span><span class="cx"> // These tags are scanned by the StartTagScanner.
</span><ins>+ Iframe,
</ins><span class="cx"> Img,
</span><span class="cx"> Input,
</span><span class="cx"> Link,
</span></span></pre>
</div>
</div>
</body>
</html>