<!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>[195092] trunk</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/195092">195092</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-01-14 23:18:47 -0800 (Thu, 14 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/195064">r195064</a>.
https://bugs.webkit.org/show_bug.cgi?id=153118
test fails most of the time (Requested by alexchristensen on
#webkit).
Reverted changeset:
"Avoid downloading the wrong image for <picture> elements."
https://bugs.webkit.org/show_bug.cgi?id=153027
http://trac.webkit.org/changeset/195064
Patch by Commit Queue <commit-queue@webkit.org> on 2016-01-14</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLImageElementcpp">trunk/Source/WebCore/html/HTMLImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLImageElementh">trunk/Source/WebCore/html/HTMLImageElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLPictureElementh">trunk/Source/WebCore/html/HTMLPictureElement.h</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLConstructionSitecpp">trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserHTMLPreloadScannercpp">trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastpicturehidpiimagepictureloadsexpectedtxt">trunk/LayoutTests/fast/picture/hidpi-image-picture-loads-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastpicturehidpiimagepictureloadshtml">trunk/LayoutTests/fast/picture/hidpi-image-picture-loads.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacyosemiteTestExpectations">trunk/LayoutTests/platform/mac-yosemite/TestExpectations</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195091 => 195092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-15 06:12:56 UTC (rev 195091)
+++ trunk/LayoutTests/ChangeLog 2016-01-15 07:18:47 UTC (rev 195092)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-01-14 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r195064.
+ https://bugs.webkit.org/show_bug.cgi?id=153118
+
+ test fails most of the time (Requested by alexchristensen on
+ #webkit).
+
+ Reverted changeset:
+
+ "Avoid downloading the wrong image for <picture> elements."
+ https://bugs.webkit.org/show_bug.cgi?id=153027
+ http://trac.webkit.org/changeset/195064
+
</ins><span class="cx"> 2016-01-14 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Test gardening after r195088
</span></span></pre></div>
<a id="trunkLayoutTestsfastpicturehidpiimagepictureloadsexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/picture/hidpi-image-picture-loads-expected.txt (195091 => 195092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/picture/hidpi-image-picture-loads-expected.txt 2016-01-15 06:12:56 UTC (rev 195091)
+++ trunk/LayoutTests/fast/picture/hidpi-image-picture-loads-expected.txt 2016-01-15 07:18:47 UTC (rev 195092)
</span><span class="lines">@@ -1,13 +0,0 @@
</span><del>-resources/image-set-4x.png - willSendRequest <NSURLRequest URL resources/image-set-4x.png, main document URL hidpi-image-picture-loads.html, http method GET> redirectResponse (null)
-resources/image-set-4x.png - willSendRequest <NSURLRequest URL resources/image-set-4x.png, main document URL hidpi-image-picture-loads.html, http method GET> redirectResponse (null)
-data:,b - willSendRequest <NSURLRequest URL data:,b, main document URL hidpi-image-picture-loads.html, http method GET> redirectResponse (null)
-hidpi-image-picture-loads.html - didFinishLoading
-resources/image-set-4x.png - didReceiveResponse <NSURLResponse resources/image-set-4x.png, http status code 0>
-resources/image-set-4x.png - didFinishLoading
-resources/image-set-4x.png - didReceiveResponse <NSURLResponse resources/image-set-4x.png, http status code 0>
-resources/image-set-4x.png - didFinishLoading
-data:,b - didReceiveResponse <NSURLResponse data:,b, http status code 0>
-data:,b - didFinishLoading
-
-some text
-
</del></span></pre></div>
<a id="trunkLayoutTestsfastpicturehidpiimagepictureloadshtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/picture/hidpi-image-picture-loads.html (195091 => 195092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/picture/hidpi-image-picture-loads.html 2016-01-15 06:12:56 UTC (rev 195091)
+++ trunk/LayoutTests/fast/picture/hidpi-image-picture-loads.html 2016-01-15 07:18:47 UTC (rev 195092)
</span><span class="lines">@@ -1,108 +0,0 @@
</span><del>-<!DOCTYPE html>
- <script>
- if (window.testRunner) {
- testRunner.dumpAsText();
- testRunner.dumpResourceLoadCallbacks();
- }
- </script>
- <!-- simple picture construct -->
- <picture>
- <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
- resources/image-set-4x.png?10001 1600w">
- <source media="(max-width: 800px)" sizes="800px" srcset="../hidpi/resources/image-set-1x.png?10002 400w, ../hidpi/resources/image-set-2x.png?10002 800w,
- resources/image-set-4x.png?10002 1600w">
- <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
- resources/image-set-4x.png?10003 1600w">
- <img id="simple" src="resources/blue_rect.jpg?1">
- </picture>
- <!-- Multiple img elements -->
- <picture>
- <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
- resources/image-set-4x.png?10001 1600w">
- <source media="(max-width: 800px)" sizes="800px" srcset="../hidpi/resources/image-set-1x.png?10002 400w, ../hidpi/resources/image-set-2x.png?10002 800w,
- resources/image-set-4x.png?10002 1600w">
- <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
- resources/image-set-4x.png?10003 1600w">
- <img src="resources/blue_rect.jpg?1">
- <img id="multiple" src="resources/blue_rect.jpg?1">
- </picture>
- <!-- non-source children - should be ignored-->
- <picture>
- <div>some text</div>
- <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
- resources/image-set-4x.png?10001 1600w">
- <source media="(max-width: 800px)" sizes="800px" srcset="../hidpi/resources/image-set-1x.png?10002 400w, ../hidpi/resources/image-set-2x.png?10002 800w,
- resources/image-set-4x.png?10002 1600w">
- <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
- resources/image-set-4x.png?10003 1600w">
- <img id="other_children" src="resources/blue_rect.jpg?1">
- </picture>
- <!-- source with unknown type - should be ignored -->
- <picture>
- <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
- resources/image-set-4x.png?10001 1600w">
- <source media="(max-width: 800px)" type="image/nonsense" sizes="800px" srcset="../hidpi/resources/image-set-1x.png?10002 400w, ../hidpi/resources/image-set-2x.png?10002 800w,
- resources/image-set-4x.png?10002 1600w">
- <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
- resources/image-set-4x.png?10003 1600w">
- <img id="unknown_type" src="resources/blue_rect.jpg?1">
- </picture>
- <!-- SVG source - should not be ignored -->
- <picture>
- <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
- resources/image-set-4x.png?10001 1600w">
- <source media="(max-width: 800px)" type="image/svg+xml" sizes="800px" srcset="../hidpi/resources/image-set-1x.png?10002 400w, ../hidpi/resources/image-set-2x.png?10002 800w,
- resources/image-set-4x.png?10002 1600w">
- <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
- resources/image-set-4x.png?10003 1600w">
- <img id="svg_type" src="resources/blue_rect.jpg?1">
- </picture>
- <!-- Empty type - should not be ignored -->
- <picture>
- <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
- resources/image-set-4x.png?10001 1600w">
- <source media="(max-width: 800px)" type="" sizes="800px" srcset="../hidpi/resources/image-set-1x.png?10002 400w, ../hidpi/resources/image-set-2x.png?10002 800w,
- resources/image-set-4x.png?10002 1600w">
- <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
- resources/image-set-4x.png?10003 1600w">
- <img id="empty_type" src="resources/blue_rect.jpg?1">
- </picture>
- <!-- whitespace type - should not be ignored -->
- <picture>
- <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
- resources/image-set-4x.png?10001 1600w">
- <source media="(max-width: 800px)" type=" " sizes="800px" srcset="../hidpi/resources/image-set-1x.png?10002 400w, ../hidpi/resources/image-set-2x.png?10002 800w,
- resources/image-set-4x.png?10002 1600w">
- <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
- resources/image-set-4x.png?10003 1600w">
- <img id="whitespace_type" src="resources/blue_rect.jpg?1">
- </picture>
- <!-- parameter type - should not be ignored -->
- <picture>
- <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
- resources/image-set-4x.png?10001 1600w">
- <source media="(max-width: 800px)" type="image/png;bla=bla" sizes="800px" srcset="../hidpi/resources/image-set-1x.png?10002 400w, ../hidpi/resources/image-set-2x.png?10002 800w,
- resources/image-set-4x.png?10002 1600w">
- <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
- resources/image-set-4x.png?10003 1600w">
- <img id="parameter_type" src="resources/blue_rect.jpg?1">
- </picture>
- <!-- source with empty srcset - should be ignored -->
- <picture>
- <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
- resources/image-set-4x.png?10001 1600w">
- <source media="(max-width: 800px)" sizes="800px" srcset=", , ">
- <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
- resources/image-set-4x.png?10003 1600w">
- <img id="empty_srcset" src="resources/blue_rect.jpg?1">
- </picture>
- <!-- source with no srcset - should be ignored -->
- <picture>
- <source media="(max-width: 400px)" sizes="400px" srcset="../hidpi/resources/image-set-1x.png?10001 400w, ../hidpi/resources/image-set-2x.png?10001 800w,
- resources/image-set-4x.png?10001 1600w">
- <source media="(max-width: 800px)" sizes="800px">
- <source media="(max-width: 1600px)" sizes="1600px" srcset="../hidpi/resources/image-set-1x.png?10003 400w, ../hidpi/resources/image-set-2x.png?10003 800w,
- resources/image-set-4x.png?10003 1600w">
- <img id="no_srcset" src="resources/blue_rect.jpg?1">
- </picture>
- <picture><source srcset="data:,b"><img src="resources/blue_rect.jpg?1"></picture>
</del></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (195091 => 195092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-01-15 06:12:56 UTC (rev 195091)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-01-15 07:18:47 UTC (rev 195092)
</span><span class="lines">@@ -2839,6 +2839,7 @@
</span><span class="cx"> webkit.org/b/152141 fast/picture/image-picture-1x.html [ Skip ]
</span><span class="cx"> webkit.org/b/152141 fast/picture/image-picture-invalid.html [ Skip ]
</span><span class="cx"> webkit.org/b/152141 fast/picture/image-picture-nested.html [ Skip ]
</span><ins>+webkit.org/b/153043 fast/picture/image-picture-loads-1x.html [ Skip ]
</ins><span class="cx"> webkit.org/b/152992 http/tests/loading/preload-picture-invalid.html [ Skip ]
</span><span class="cx"> webkit.org/b/152992 http/tests/loading/preload-picture-nested.html [ Skip ]
</span><span class="cx"> webkit.org/b/152992 http/tests/loading/preload-picture-sizes.html [ Skip ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacyosemiteTestExpectations"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/platform/mac-yosemite/TestExpectations (195091 => 195092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-yosemite/TestExpectations 2016-01-15 06:12:56 UTC (rev 195091)
+++ trunk/LayoutTests/platform/mac-yosemite/TestExpectations 2016-01-15 07:18:47 UTC (rev 195092)
</span><span class="lines">@@ -1 +0,0 @@
</span><del>-webkit.org/b/153027 fast/picture/hidpi-image-picture-loads.html [ Skip ]
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195091 => 195092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-15 06:12:56 UTC (rev 195091)
+++ trunk/Source/WebCore/ChangeLog 2016-01-15 07:18:47 UTC (rev 195092)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-01-14 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r195064.
+ https://bugs.webkit.org/show_bug.cgi?id=153118
+
+ test fails most of the time (Requested by alexchristensen on
+ #webkit).
+
+ Reverted changeset:
+
+ "Avoid downloading the wrong image for <picture> elements."
+ https://bugs.webkit.org/show_bug.cgi?id=153027
+ http://trac.webkit.org/changeset/195064
+
</ins><span class="cx"> 2016-01-14 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> createElement should not lowercase non-ASCII characters
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLImageElement.cpp (195091 => 195092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLImageElement.cpp 2016-01-15 06:12:56 UTC (rev 195091)
+++ trunk/Source/WebCore/html/HTMLImageElement.cpp 2016-01-15 07:18:47 UTC (rev 195092)
</span><span class="lines">@@ -53,9 +53,6 @@
</span><span class="cx">
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx">
</span><del>-typedef HashMap<const HTMLImageElement*, WeakPtr<HTMLPictureElement>> PictureOwnerMap;
-static PictureOwnerMap* gPictureOwnerMap = nullptr;
-
</del><span class="cx"> HTMLImageElement::HTMLImageElement(const QualifiedName& tagName, Document& document, HTMLFormElement* form)
</span><span class="cx"> : HTMLElement(tagName, document)
</span><span class="cx"> , m_imageLoader(*this)
</span><span class="lines">@@ -85,7 +82,6 @@
</span><span class="cx"> {
</span><span class="cx"> if (m_form)
</span><span class="cx"> m_form->removeImgElement(this);
</span><del>- setPictureElement(nullptr);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Ref<HTMLImageElement> HTMLImageElement::createForJSConstructor(Document& document, const int* optionalWidth, const int* optionalHeight)
</span><span class="lines">@@ -144,12 +140,13 @@
</span><span class="cx">
</span><span class="cx"> ImageCandidate HTMLImageElement::bestFitSourceFromPictureElement()
</span><span class="cx"> {
</span><del>- auto* picture = pictureElement();
- if (!picture)
</del><ins>+ auto* parent = parentNode();
+ if (!is<HTMLPictureElement>(parent))
</ins><span class="cx"> return { };
</span><ins>+ auto* picture = downcast<HTMLPictureElement>(parent);
</ins><span class="cx"> picture->clearViewportDependentResults();
</span><span class="cx"> document().removeViewportDependentPicture(*picture);
</span><del>- for (Node* child = picture->firstChild(); child && child != this; child = child->nextSibling()) {
</del><ins>+ for (Node* child = parent->firstChild(); child && child != this; child = child->nextSibling()) {
</ins><span class="cx"> if (!is<HTMLSourceElement>(*child))
</span><span class="cx"> continue;
</span><span class="cx"> auto& source = downcast<HTMLSourceElement>(*child);
</span><span class="lines">@@ -166,7 +163,7 @@
</span><span class="cx"> if (!type.isEmpty() && !MIMETypeRegistry::isSupportedImageMIMEType(type) && type != "image/svg+xml")
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>- MediaQueryEvaluator evaluator(document().printing() ? "print" : "screen", document().frame(), document().documentElement() ? document().documentElement()->computedStyle() : nullptr);
</del><ins>+ MediaQueryEvaluator evaluator(document().printing() ? "print" : "screen", document().frame(), computedStyle());
</ins><span class="cx"> bool evaluation = evaluator.evalCheckingViewportDependentResults(source.mediaQuerySet(), picture->viewportDependentResults());
</span><span class="cx"> if (picture->hasViewportDependentResults())
</span><span class="cx"> document().addViewportDependentPicture(*picture);
</span><span class="lines">@@ -316,10 +313,8 @@
</span><span class="cx"> if (insertionPoint.inDocument() && !m_lowercasedUsemap.isNull())
</span><span class="cx"> document().addImageElementByLowercasedUsemap(*m_lowercasedUsemap.impl(), *this);
</span><span class="cx">
</span><del>- if (is<HTMLPictureElement>(parentNode())) {
- setPictureElement(&downcast<HTMLPictureElement>(*parentNode()));
</del><ins>+ if (is<HTMLPictureElement>(parentNode()))
</ins><span class="cx"> selectImageSource();
</span><del>- }
</del><span class="cx">
</span><span class="cx"> // If we have been inserted from a renderer-less document,
</span><span class="cx"> // our loader may have not fetched the image, so do it now.
</span><span class="lines">@@ -336,37 +331,11 @@
</span><span class="cx">
</span><span class="cx"> if (insertionPoint.inDocument() && !m_lowercasedUsemap.isNull())
</span><span class="cx"> document().removeImageElementByLowercasedUsemap(*m_lowercasedUsemap.impl(), *this);
</span><del>-
- if (is<HTMLPictureElement>(parentNode()))
- setPictureElement(nullptr);
-
</del><ins>+
</ins><span class="cx"> m_form = nullptr;
</span><span class="cx"> HTMLElement::removedFrom(insertionPoint);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HTMLPictureElement* HTMLImageElement::pictureElement() const
-{
- if (!gPictureOwnerMap || !gPictureOwnerMap->contains(this))
- return nullptr;
- HTMLPictureElement* result = gPictureOwnerMap->get(this).get();
- if (!result)
- gPictureOwnerMap->remove(this);
- return result;
-}
-
-void HTMLImageElement::setPictureElement(HTMLPictureElement* pictureElement)
-{
- if (!pictureElement) {
- if (gPictureOwnerMap)
- gPictureOwnerMap->remove(this);
- return;
- }
-
- if (!gPictureOwnerMap)
- gPictureOwnerMap = new PictureOwnerMap();
- gPictureOwnerMap->add(this, pictureElement->createWeakPtr());
-}
-
</del><span class="cx"> int HTMLImageElement::width(bool ignorePendingStylesheets)
</span><span class="cx"> {
</span><span class="cx"> if (!renderer()) {
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLImageElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLImageElement.h (195091 => 195092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLImageElement.h 2016-01-15 06:12:56 UTC (rev 195091)
+++ trunk/Source/WebCore/html/HTMLImageElement.h 2016-01-15 07:18:47 UTC (rev 195092)
</span><span class="lines">@@ -87,9 +87,6 @@
</span><span class="cx"> virtual const AtomicString& imageSourceURL() const override;
</span><span class="cx">
</span><span class="cx"> bool hasShadowControls() const { return m_experimentalImageMenuEnabled; }
</span><del>-
- HTMLPictureElement* pictureElement() const;
- void setPictureElement(HTMLPictureElement*);
</del><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> HTMLImageElement(const QualifiedName&, Document&, HTMLFormElement* = 0);
</span><span class="lines">@@ -130,7 +127,6 @@
</span><span class="cx"> HTMLImageLoader m_imageLoader;
</span><span class="cx"> HTMLFormElement* m_form;
</span><span class="cx"> HTMLFormElement* m_formSetByParser;
</span><del>-
</del><span class="cx"> CompositeOperator m_compositeOperator;
</span><span class="cx"> AtomicString m_bestFitImageURL;
</span><span class="cx"> AtomicString m_currentSrc;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLPictureElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLPictureElement.h (195091 => 195092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLPictureElement.h 2016-01-15 06:12:56 UTC (rev 195091)
+++ trunk/Source/WebCore/html/HTMLPictureElement.h 2016-01-15 07:18:47 UTC (rev 195092)
</span><span class="lines">@@ -46,12 +46,9 @@
</span><span class="cx">
</span><span class="cx"> bool viewportChangeAffectedPicture();
</span><span class="cx">
</span><del>- WeakPtr<HTMLPictureElement> createWeakPtr() { return m_weakFactory.createWeakPtr(); }
-
</del><span class="cx"> private:
</span><span class="cx"> HTMLPictureElement(const QualifiedName&, Document&);
</span><span class="cx">
</span><del>- WeakPtrFactory<HTMLPictureElement> m_weakFactory { this };
</del><span class="cx"> Vector<std::unique_ptr<MediaQueryResult>> m_viewportDependentMediaQueryResults;
</span><span class="cx">
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLConstructionSitecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp (195091 => 195092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp 2016-01-15 06:12:56 UTC (rev 195091)
+++ trunk/Source/WebCore/html/parser/HTMLConstructionSite.cpp 2016-01-15 07:18:47 UTC (rev 195092)
</span><span class="lines">@@ -36,11 +36,9 @@
</span><span class="cx"> #include "HTMLElementFactory.h"
</span><span class="cx"> #include "HTMLFormElement.h"
</span><span class="cx"> #include "HTMLHtmlElement.h"
</span><del>-#include "HTMLImageElement.h"
</del><span class="cx"> #include "HTMLOptGroupElement.h"
</span><span class="cx"> #include "HTMLOptionElement.h"
</span><span class="cx"> #include "HTMLParserIdioms.h"
</span><del>-#include "HTMLPictureElement.h"
</del><span class="cx"> #include "HTMLScriptElement.h"
</span><span class="cx"> #include "HTMLTemplateElement.h"
</span><span class="cx"> #include "NotImplemented.h"
</span><span class="lines">@@ -642,13 +640,6 @@
</span><span class="cx"> Document& ownerDocument = ownerDocumentForCurrentNode();
</span><span class="cx"> bool insideTemplateElement = !ownerDocument.frame();
</span><span class="cx"> RefPtr<Element> element = HTMLElementFactory::createElement(tagName, ownerDocument, insideTemplateElement ? nullptr : form(), true);
</span><del>-
- // FIXME: This is a hack to connect images to pictures before the image has
- // been inserted into the document. It can be removed once asynchronous image
- // loading is working.
- if (is<HTMLPictureElement>(currentNode()) && is<HTMLImageElement>(*element.get()))
- downcast<HTMLImageElement>(*element.get()).setPictureElement(&downcast<HTMLPictureElement>(currentNode()));
-
</del><span class="cx"> setAttributes(element.get(), token, m_parserContentPolicy);
</span><span class="cx"> ASSERT(element->isHTMLElement());
</span><span class="cx"> return element.release();
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLPreloadScannercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp (195091 => 195092)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2016-01-15 06:12:56 UTC (rev 195091)
+++ trunk/Source/WebCore/html/parser/HTMLPreloadScanner.cpp 2016-01-15 07:18:47 UTC (rev 195092)
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx"> m_mediaAttribute = attributeValue;
</span><span class="cx"> Ref<MediaQuerySet> mediaSet = MediaQuerySet::createAllowingDescriptionSyntax(attributeValue);
</span><span class="cx"> Vector<std::unique_ptr<MediaQueryResult>> viewportDependentMediaQueryResults;
</span><del>- MediaQueryEvaluator evaluator(document.printing() ? "print" : "screen", document.frame(), document.documentElement() ? document.documentElement()->computedStyle() : nullptr);
</del><ins>+ MediaQueryEvaluator evaluator(document.printing() ? "print" : "screen", document.frame(), document.documentElement()->computedStyle());
</ins><span class="cx"> m_mediaMatched = evaluator.evalCheckingViewportDependentResults(mediaSet.ptr(), viewportDependentMediaQueryResults);
</span><span class="cx"> }
</span><span class="cx"> break;
</span></span></pre>
</div>
</div>
</body>
</html>