<!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>[184183] releases/WebKitGTK/webkit-2.8</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/184183">184183</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-12 02:01:07 -0700 (Tue, 12 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/183948">r183948</a> - Fix sizes crash and add invalid value tests.
https://bugs.webkit.org/show_bug.cgi?id=144739
Reviewed by Darin Adler.
Source/WebCore:
Make sure that only CSS length are allowed when the sizes parser is calling computeLength.
Also make sure that for invalid lengths, the 100vw default is used instead.
Test: fast/dom/HTMLImageElement/sizes/image-sizes-invalids.html
* css/SourceSizeList.cpp:
(WebCore::computeLength):
(WebCore::defaultLength):
(WebCore::parseSizesAttribute):
LayoutTests:
Add tests that make sure that invalid values are properly handled, and a 100vw
source-size length is being used for srcset and for intrinsic dimension calculation.
* fast/dom/HTMLImageElement/sizes/image-sizes-invalids-expected.txt: Added.
* fast/dom/HTMLImageElement/sizes/image-sizes-invalids.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorecssSourceSizeListcpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/css/SourceSizeList.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsfastdomHTMLImageElementsizesimagesizesinvalidsexpectedtxt">releases/WebKitGTK/webkit-2.8/LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-invalids-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsfastdomHTMLImageElementsizesimagesizesinvalidshtml">releases/WebKitGTK/webkit-2.8/LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-invalids.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog (184182 => 184183)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-05-12 09:00:00 UTC (rev 184182)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-05-12 09:01:07 UTC (rev 184183)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-05-07 Yoav Weiss <yoav@yoav.ws>
+
+ Fix sizes crash and add invalid value tests.
+ https://bugs.webkit.org/show_bug.cgi?id=144739
+
+ Reviewed by Darin Adler.
+
+ Add tests that make sure that invalid values are properly handled, and a 100vw
+ source-size length is being used for srcset and for intrinsic dimension calculation.
+
+ * fast/dom/HTMLImageElement/sizes/image-sizes-invalids-expected.txt: Added.
+ * fast/dom/HTMLImageElement/sizes/image-sizes-invalids.html: Added.
+
</ins><span class="cx"> 2015-05-04 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Crash at com.apple.WebKit.WebContent at com.apple.WebCore: WebCore::createWindow + 185
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestsfastdomHTMLImageElementsizesimagesizesinvalidsexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-invalids-expected.txt (0 => 184183)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-invalids-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-invalids-expected.txt 2015-05-12 09:01:07 UTC (rev 184183)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+PASS document.getElementById(elementId).clientWidth is 800
+PASS currentSrcFileName(elementId) is "image-set-2x.png"
+PASS document.getElementById(elementId).clientWidth is 800
+PASS currentSrcFileName(elementId) is "image-set-2x.png"
+PASS document.getElementById(elementId).clientWidth is 800
+PASS currentSrcFileName(elementId) is "image-set-2x.png"
+PASS document.getElementById(elementId).clientWidth is 800
+PASS currentSrcFileName(elementId) is "image-set-2x.png"
+PASS document.getElementById(elementId).clientWidth is 800
+PASS currentSrcFileName(elementId) is "image-set-2x.png"
+PASS document.getElementById(elementId).clientWidth is 800
+PASS currentSrcFileName(elementId) is "image-set-2x.png"
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestsfastdomHTMLImageElementsizesimagesizesinvalidshtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-invalids.html (0 => 184183)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-invalids.html (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/fast/dom/HTMLImageElement/sizes/image-sizes-invalids.html 2015-05-12 09:01:07 UTC (rev 184183)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<!DOCTYPE html>
+<script src="../../../../resources/js-test.js"></script>
+<script src="../resources/currentSrcHelper.js"></script>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ var elementId;
+ addEventListener("load", function() {
+ for (var i = 1; i < 7; ++i) {
+ elementId = "crash" + i;
+ shouldBe('document.getElementById(elementId).clientWidth', '800');
+ shouldBe('currentSrcFileName(elementId)', '"image-set-2x.png"');
+ }
+ }, false);
+</script>
+<!-- crash tests -->
+<img id="crash1" sizes="1q" srcset="../../../hidpi/resources/image-set-2x.png 800w, ../resources/image-set-4x.png 16000w">
+<img id="crash1" sizes="1pxllll" srcset="../../../hidpi/resources/image-set-2x.png 800w, ../resources/image-set-4x.png 16000w">
+<img id="crash2" sizes="1dfsdf4534fddd" srcset="../../../hidpi/resources/image-set-2x.png 800w, ../resources/image-set-4x.png 16000w">
+<img id="crash3" sizes="calc()" srcset="../../../hidpi/resources/image-set-2x.png 800w, ../resources/image-set-4x.png 16000w">
+<img id="crash4" sizes="calc(3q)" srcset="../../../hidpi/resources/image-set-2x.png 800w, ../resources/image-set-4x.png 16000w">
+<img id="crash4" sizes="calcssdff()" srcset="../../../hidpi/resources/image-set-2x.png 800w, ../resources/image-set-4x.png 16000w">
+<img id="crash5" sizes="calc(2px+dfmjbsf,,,skidkk)" srcset="../../../hidpi/resources/image-set-2x.png 800w, ../resources/image-set-4x.png 16000w">
+<img id="crash6" sizes="calc(2px+dfmjbsf,,,skidkk) + 2px, 56px" srcset="../../../hidpi/resources/image-set-2x.png 800w, ../resources/image-set-4x.png 16000w">
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (184182 => 184183)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-12 09:00:00 UTC (rev 184182)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-12 09:01:07 UTC (rev 184183)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-05-07 Yoav Weiss <yoav@yoav.ws>
+
+ Fix sizes crash and add invalid value tests.
+ https://bugs.webkit.org/show_bug.cgi?id=144739
+
+ Reviewed by Darin Adler.
+
+ Make sure that only CSS length are allowed when the sizes parser is calling computeLength.
+ Also make sure that for invalid lengths, the 100vw default is used instead.
+
+ Test: fast/dom/HTMLImageElement/sizes/image-sizes-invalids.html
+
+ * css/SourceSizeList.cpp:
+ (WebCore::computeLength):
+ (WebCore::defaultLength):
+ (WebCore::parseSizesAttribute):
+
</ins><span class="cx"> 2015-05-06 David Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> Avoid copies in scrollOffsetForFixedPosition() and inline it.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorecssSourceSizeListcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/css/SourceSizeList.cpp (184182 => 184183)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/css/SourceSizeList.cpp 2015-05-12 09:00:00 UTC (rev 184182)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/css/SourceSizeList.cpp 2015-05-12 09:01:07 UTC (rev 184183)
</span><span class="lines">@@ -56,16 +56,25 @@
</span><span class="cx"> return mediaQueryEvaluator.eval(mediaQuerySet.get());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static unsigned defaultLength(RenderStyle& style, RenderView* view)
+{
+ return CSSPrimitiveValue::create(100, CSSPrimitiveValue::CSS_VW)->computeLength<unsigned>(CSSToLengthConversionData(&style, &style, view));
+}
+
</ins><span class="cx"> static unsigned computeLength(CSSValue* value, RenderStyle& style, RenderView* view)
</span><span class="cx"> {
</span><span class="cx"> CSSToLengthConversionData conversionData(&style, &style, view);
</span><del>- if (is<CSSPrimitiveValue>(value))
- return downcast<CSSPrimitiveValue>(*value).computeLength<unsigned>(conversionData);
</del><ins>+ if (is<CSSPrimitiveValue>(value)) {
+ CSSPrimitiveValue& primitiveValue = downcast<CSSPrimitiveValue>(*value);
+ if (!primitiveValue.isLength())
+ return defaultLength(style, view);
+ return primitiveValue.computeLength<unsigned>(conversionData);
+ }
</ins><span class="cx"> if (is<CSSCalcValue>(value)) {
</span><span class="cx"> Length length(downcast<CSSCalcValue>(*value).createCalculationValue(conversionData));
</span><span class="cx"> return CSSPrimitiveValue::create(length, &style)->computeLength<unsigned>(conversionData);
</span><span class="cx"> }
</span><del>- return 0;
</del><ins>+ return defaultLength(style, view);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned parseSizesAttribute(StringView sizesAttribute, RenderView* view, Frame* frame)
</span><span class="lines">@@ -77,7 +86,7 @@
</span><span class="cx"> if (match(WTF::move(sourceSize.expression), style, frame))
</span><span class="cx"> return computeLength(sourceSize.length.get(), style, view);
</span><span class="cx"> }
</span><del>- return computeLength(CSSPrimitiveValue::create(100, CSSPrimitiveValue::CSS_VW).ptr(), style, view);
</del><ins>+ return defaultLength(style, view);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>