<!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>[200486] 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/200486">200486</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-05-05 15:16:43 -0700 (Thu, 05 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Do not attempt to compute min/max width.
https://bugs.webkit.org/show_bug.cgi?id=157320
Reviewed by David Hyatt.
Replaced elements with no intrinsic size (only with ratio) should not call the containing
block to compute the min/max width when the containing block's min/max width
depends on the children's intrinsic size. It could lead to infinite recursion.
Source/WebCore:
Test: fast/replaced/before-content-intrinsic-crash.html
* rendering/RenderBox.cpp:
(WebCore::RenderBox::computeReplacedLogicalWidthRespectingMinMaxWidth): Unrelated code change.
* rendering/RenderImage.cpp: Unrelated code change.
(WebCore::RenderImage::RenderImage): Deleted.
* rendering/RenderImage.h:
* rendering/RenderReplaced.cpp:
(WebCore::RenderReplaced::computeReplacedLogicalWidth):
LayoutTests:
* fast/replaced/before-content-intrinsic-crash-expected.txt: Added.
* fast/replaced/before-content-intrinsic-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderImagecpp">trunk/Source/WebCore/rendering/RenderImage.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderImageh">trunk/Source/WebCore/rendering/RenderImage.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderReplacedcpp">trunk/Source/WebCore/rendering/RenderReplaced.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastreplacedbeforecontentintrinsiccrashexpectedtxt">trunk/LayoutTests/fast/replaced/before-content-intrinsic-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastreplacedbeforecontentintrinsiccrashhtml">trunk/LayoutTests/fast/replaced/before-content-intrinsic-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (200485 => 200486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-05-05 22:14:08 UTC (rev 200485)
+++ trunk/LayoutTests/ChangeLog 2016-05-05 22:16:43 UTC (rev 200486)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-05-05 Zalan Bujtas <zalan@apple.com>
+
+ Do not attempt to compute min/max width.
+ https://bugs.webkit.org/show_bug.cgi?id=157320
+
+ Reviewed by David Hyatt.
+
+ Replaced elements with no intrinsic size (only with ratio) should not call the containing
+ block to compute the min/max width when the containing block's min/max width
+ depends on the children's intrinsic size. It could lead to infinite recursion.
+
+ * fast/replaced/before-content-intrinsic-crash-expected.txt: Added.
+ * fast/replaced/before-content-intrinsic-crash.html: Added.
+
</ins><span class="cx"> 2016-05-05 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> For keyboard users, activating a fragment URL should transfer focus and caret to the destination
</span></span></pre></div>
<a id="trunkLayoutTestsfastreplacedbeforecontentintrinsiccrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/replaced/before-content-intrinsic-crash-expected.txt (0 => 200486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/replaced/before-content-intrinsic-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/replaced/before-content-intrinsic-crash-expected.txt 2016-05-05 22:16:43 UTC (rev 200486)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+PASS if no crash or ASSERT.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastreplacedbeforecontentintrinsiccrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/replaced/before-content-intrinsic-crash.html (0 => 200486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/replaced/before-content-intrinsic-crash.html (rev 0)
+++ trunk/LayoutTests/fast/replaced/before-content-intrinsic-crash.html 2016-05-05 22:16:43 UTC (rev 200486)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we don't crash when replaced element's (with no intrinsic width/height) parent has min-width/max-width.</title>
+<style>
+.minWidth {
+ width: 0px;
+ min-width: -webkit-min-content;
+}
+
+.minWidth::before {
+ content: url(data:text/plain,broken);
+}
+
+.maxWidth {
+ width: 0px;
+ max-width: -webkit-max-content;
+}
+
+.maxWidth::before {
+ content: url(data:text/plain,broken);
+}
+</style>
+</head>
+<body>
+PASS if no crash or ASSERT.
+<div class=minWidth></div>
+<div class=maxWidth></div>
+<div id=foo></div>
+<div id=bar></div>
+<script>
+if (window.testRunner) {
+ testRunner.waitUntilDone();
+ testRunner.dumpAsText();
+}
+
+setTimeout(function() {
+ document.getElementById("foo").className = "minWidth";
+ document.getElementById("bar").className = "maxWidth";
+ if (window.testRunner)
+ testRunner.notifyDone();
+}, 5);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (200485 => 200486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-05 22:14:08 UTC (rev 200485)
+++ trunk/Source/WebCore/ChangeLog 2016-05-05 22:16:43 UTC (rev 200486)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-05-05 Zalan Bujtas <zalan@apple.com>
+
+ Do not attempt to compute min/max width.
+ https://bugs.webkit.org/show_bug.cgi?id=157320
+
+ Reviewed by David Hyatt.
+
+ Replaced elements with no intrinsic size (only with ratio) should not call the containing
+ block to compute the min/max width when the containing block's min/max width
+ depends on the children's intrinsic size. It could lead to infinite recursion.
+
+ Test: fast/replaced/before-content-intrinsic-crash.html
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::computeReplacedLogicalWidthRespectingMinMaxWidth): Unrelated code change.
+ * rendering/RenderImage.cpp: Unrelated code change.
+ (WebCore::RenderImage::RenderImage): Deleted.
+ * rendering/RenderImage.h:
+ * rendering/RenderReplaced.cpp:
+ (WebCore::RenderReplaced::computeReplacedLogicalWidth):
+
</ins><span class="cx"> 2016-05-04 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: Move all IDB DOM object management from IDBConnectionToServer to IDBConnectionProxy.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (200485 => 200486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2016-05-05 22:14:08 UTC (rev 200485)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2016-05-05 22:16:43 UTC (rev 200486)
</span><span class="lines">@@ -3037,8 +3037,12 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderBox::computeReplacedLogicalWidthRespectingMinMaxWidth(LayoutUnit logicalWidth, ShouldComputePreferred shouldComputePreferred) const
</span><span class="cx"> {
</span><del>- LayoutUnit minLogicalWidth = (shouldComputePreferred == ComputePreferred && style().logicalMinWidth().isPercentOrCalculated()) || style().logicalMinWidth().isUndefined() ? logicalWidth : computeReplacedLogicalWidthUsing(MinSize, style().logicalMinWidth());
- LayoutUnit maxLogicalWidth = (shouldComputePreferred == ComputePreferred && style().logicalMaxWidth().isPercentOrCalculated()) || style().logicalMaxWidth().isUndefined() ? logicalWidth : computeReplacedLogicalWidthUsing(MaxSize, style().logicalMaxWidth());
</del><ins>+ auto& logicalMinWidth = style().logicalMinWidth();
+ auto& logicalMaxWidth = style().logicalMaxWidth();
+ bool useLogicalWidthForMinWidth = (shouldComputePreferred == ComputePreferred && logicalMinWidth.isPercentOrCalculated()) || logicalMinWidth.isUndefined();
+ bool useLogicalWidthForMaxWidth = (shouldComputePreferred == ComputePreferred && logicalMaxWidth.isPercentOrCalculated()) || logicalMaxWidth.isUndefined();
+ auto minLogicalWidth = useLogicalWidthForMinWidth ? logicalWidth : computeReplacedLogicalWidthUsing(MinSize, logicalMinWidth);
+ auto maxLogicalWidth = useLogicalWidthForMaxWidth ? logicalWidth : computeReplacedLogicalWidthUsing(MaxSize, logicalMaxWidth);
</ins><span class="cx"> return std::max(minLogicalWidth, std::min(logicalWidth, maxLogicalWidth));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImage.cpp (200485 => 200486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderImage.cpp 2016-05-05 22:14:08 UTC (rev 200485)
+++ trunk/Source/WebCore/rendering/RenderImage.cpp 2016-05-05 22:16:43 UTC (rev 200486)
</span><span class="lines">@@ -122,15 +122,10 @@
</span><span class="cx"> RenderImage::RenderImage(Element& element, RenderStyle&& style, StyleImage* styleImage, const float imageDevicePixelRatio)
</span><span class="cx"> : RenderReplaced(element, WTFMove(style), IntSize())
</span><span class="cx"> , m_imageResource(styleImage ? std::make_unique<RenderImageResourceStyleImage>(*styleImage) : std::make_unique<RenderImageResource>())
</span><del>- , m_needsToSetSizeForAltText(false)
- , m_didIncrementVisuallyNonEmptyPixelCount(false)
- , m_isGeneratedContent(false)
- , m_hasShadowControls(false)
</del><span class="cx"> , m_imageDevicePixelRatio(imageDevicePixelRatio)
</span><span class="cx"> {
</span><span class="cx"> updateAltText();
</span><span class="cx"> imageResource().initialize(this);
</span><del>-
</del><span class="cx"> if (is<HTMLImageElement>(element))
</span><span class="cx"> m_hasShadowControls = downcast<HTMLImageElement>(element).hasShadowControls();
</span><span class="cx"> }
</span><span class="lines">@@ -138,11 +133,6 @@
</span><span class="cx"> RenderImage::RenderImage(Document& document, RenderStyle&& style, StyleImage* styleImage)
</span><span class="cx"> : RenderReplaced(document, WTFMove(style), IntSize())
</span><span class="cx"> , m_imageResource(styleImage ? std::make_unique<RenderImageResourceStyleImage>(*styleImage) : std::make_unique<RenderImageResource>())
</span><del>- , m_needsToSetSizeForAltText(false)
- , m_didIncrementVisuallyNonEmptyPixelCount(false)
- , m_isGeneratedContent(false)
- , m_hasShadowControls(false)
- , m_imageDevicePixelRatio(1.0f)
</del><span class="cx"> {
</span><span class="cx"> imageResource().initialize(this);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderImage.h (200485 => 200486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderImage.h 2016-05-05 22:14:08 UTC (rev 200485)
+++ trunk/Source/WebCore/rendering/RenderImage.h 2016-05-05 22:16:43 UTC (rev 200486)
</span><span class="lines">@@ -124,11 +124,11 @@
</span><span class="cx"> // Text to display as long as the image isn't available.
</span><span class="cx"> String m_altText;
</span><span class="cx"> std::unique_ptr<RenderImageResource> m_imageResource;
</span><del>- bool m_needsToSetSizeForAltText;
- bool m_didIncrementVisuallyNonEmptyPixelCount;
- bool m_isGeneratedContent;
- bool m_hasShadowControls;
- float m_imageDevicePixelRatio;
</del><ins>+ bool m_needsToSetSizeForAltText { false };
+ bool m_didIncrementVisuallyNonEmptyPixelCount { false };
+ bool m_isGeneratedContent { false };
+ bool m_hasShadowControls { false };
+ float m_imageDevicePixelRatio { 1 };
</ins><span class="cx">
</span><span class="cx"> friend class RenderImageScaleObserver;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderReplacedcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderReplaced.cpp (200485 => 200486)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderReplaced.cpp 2016-05-05 22:14:08 UTC (rev 200485)
+++ trunk/Source/WebCore/rendering/RenderReplaced.cpp 2016-05-05 22:16:43 UTC (rev 200486)
</span><span class="lines">@@ -415,9 +415,11 @@
</span><span class="cx"> // The aforementioned 'constraint equation' used for block-level, non-replaced elements in normal flow:
</span><span class="cx"> // 'margin-left' + 'border-left-width' + 'padding-left' + 'width' + 'padding-right' + 'border-right-width' + 'margin-right' = width of containing block
</span><span class="cx"> LayoutUnit logicalWidth;
</span><del>- if (RenderBlock* blockWithWidth = firstContainingBlockWithLogicalWidth(this))
- logicalWidth = blockWithWidth->computeReplacedLogicalWidthRespectingMinMaxWidth(blockWithWidth->computeReplacedLogicalWidthUsing(MainOrPreferredSize, blockWithWidth->style().logicalWidth()), shouldComputePreferred);
- else
</del><ins>+ if (auto* blockWithWidth = firstContainingBlockWithLogicalWidth(this)) {
+ logicalWidth = blockWithWidth->computeReplacedLogicalWidthUsing(MainOrPreferredSize, blockWithWidth->style().logicalWidth());
+ if (!blockWithWidth->style().logicalMaxWidth().isMaxContent() && !blockWithWidth->style().logicalMinWidth().isMinContent())
+ logicalWidth = blockWithWidth->computeReplacedLogicalWidthRespectingMinMaxWidth(logicalWidth, shouldComputePreferred);
+ } else
</ins><span class="cx"> logicalWidth = containingBlock()->availableLogicalWidth();
</span><span class="cx">
</span><span class="cx"> // This solves above equation for 'width' (== logicalWidth).
</span></span></pre>
</div>
</div>
</body>
</html>