<!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>[243593] branches/safari-607-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/243593">243593</a></dd>
<dt>Author</dt> <dd>alancoon@apple.com</dd>
<dt>Date</dt> <dd>2019-03-27 16:56:26 -0700 (Wed, 27 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/242943">r242943</a>. rdar://problem/49307995

    Cleanup inline boxes when list marker gets blockified
    https://bugs.webkit.org/show_bug.cgi?id=195746
    <rdar://problem/48049175>

    Reviewed by Antti Koivisto.

    Source/WebCore:

    Normally when an element gets blockified (inline -> block) we destroy its renderer and construct a new one (RenderInline -> RenderBlock).
    During this process the associated inline boxtree gets destroyed as well. Since RenderListMarker is just a generic RenderBox, the blockifying
    change does not require a new renderer.
    This patch takes care of destroying the inline boxtree when the marker gains block display type.

    Test: fast/block/float/list-marker-is-float-crash.html

    * rendering/RenderListMarker.cpp:
    (WebCore::RenderListMarker::styleDidChange):

    LayoutTests:

    * fast/block/float/list-marker-is-float-crash-expected.txt: Added.
    * fast/block/float/list-marker-is-float-crash.html: Added.

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242943 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari607branchLayoutTestsChangeLog">branches/safari-607-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari607branchSourceWebCoreChangeLog">branches/safari-607-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari607branchSourceWebCorerenderingRenderListMarkercpp">branches/safari-607-branch/Source/WebCore/rendering/RenderListMarker.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari607branchLayoutTestsfastblockfloatlistmarkerisfloatcrashexpectedtxt">branches/safari-607-branch/LayoutTests/fast/block/float/list-marker-is-float-crash-expected.txt</a></li>
<li><a href="#branchessafari607branchLayoutTestsfastblockfloatlistmarkerisfloatcrashhtml">branches/safari-607-branch/LayoutTests/fast/block/float/list-marker-is-float-crash.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari607branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/LayoutTests/ChangeLog (243592 => 243593)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/LayoutTests/ChangeLog 2019-03-27 23:52:44 UTC (rev 243592)
+++ branches/safari-607-branch/LayoutTests/ChangeLog    2019-03-27 23:56:26 UTC (rev 243593)
</span><span class="lines">@@ -1,5 +1,45 @@
</span><span class="cx"> 2019-03-27  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r242943. rdar://problem/49307995
+
+    Cleanup inline boxes when list marker gets blockified
+    https://bugs.webkit.org/show_bug.cgi?id=195746
+    <rdar://problem/48049175>
+    
+    Reviewed by Antti Koivisto.
+    
+    Source/WebCore:
+    
+    Normally when an element gets blockified (inline -> block) we destroy its renderer and construct a new one (RenderInline -> RenderBlock).
+    During this process the associated inline boxtree gets destroyed as well. Since RenderListMarker is just a generic RenderBox, the blockifying
+    change does not require a new renderer.
+    This patch takes care of destroying the inline boxtree when the marker gains block display type.
+    
+    Test: fast/block/float/list-marker-is-float-crash.html
+    
+    * rendering/RenderListMarker.cpp:
+    (WebCore::RenderListMarker::styleDidChange):
+    
+    LayoutTests:
+    
+    * fast/block/float/list-marker-is-float-crash-expected.txt: Added.
+    * fast/block/float/list-marker-is-float-crash.html: Added.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242943 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-03-14  Zalan Bujtas  <zalan@apple.com>
+
+            Cleanup inline boxes when list marker gets blockified
+            https://bugs.webkit.org/show_bug.cgi?id=195746
+            <rdar://problem/48049175>
+
+            Reviewed by Antti Koivisto.
+
+            * fast/block/float/list-marker-is-float-crash-expected.txt: Added.
+            * fast/block/float/list-marker-is-float-crash.html: Added.
+
+2019-03-27  Alan Coon  <alancoon@apple.com>
+
</ins><span class="cx">         Cherry-pick r243506. rdar://problem/49307987
</span><span class="cx"> 
</span><span class="cx">     vertexAttribPointer must restrict offset parameter
</span></span></pre></div>
<a id="branchessafari607branchLayoutTestsfastblockfloatlistmarkerisfloatcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-607-branch/LayoutTests/fast/block/float/list-marker-is-float-crash-expected.txt (0 => 243593)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/LayoutTests/fast/block/float/list-marker-is-float-crash-expected.txt                          (rev 0)
+++ branches/safari-607-branch/LayoutTests/fast/block/float/list-marker-is-float-crash-expected.txt     2019-03-27 23:56:26 UTC (rev 243593)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+PASS if no crash.
+
</ins></span></pre></div>
<a id="branchessafari607branchLayoutTestsfastblockfloatlistmarkerisfloatcrashhtml"></a>
<div class="addfile"><h4>Added: branches/safari-607-branch/LayoutTests/fast/block/float/list-marker-is-float-crash.html (0 => 243593)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/LayoutTests/fast/block/float/list-marker-is-float-crash.html                          (rev 0)
+++ branches/safari-607-branch/LayoutTests/fast/block/float/list-marker-is-float-crash.html     2019-03-27 23:56:26 UTC (rev 243593)
</span><span class="lines">@@ -0,0 +1,14 @@
</span><ins>+PASS if no crash.
+<li>
+<video src="data:video/mp4;base64,WFFNokI8saLT7Mt03UvGxwdAYkwe7UmwPZacue5goP6rQhBgGMjgK21nSHZWUcz5Y6Ec/wdCPp0Sxx/h6UsSneF9hINuvwAAAAhBmiJsQx92QAAAAAgBnkF5DH/EgQAAAzRtb292AAAAbG12aGQAAAAAAAAAAAAAAAAAAAPoAAAAZAABAAABAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAACXnRyYWsAAABcdGtoZAAAAAMAAAAAAAAAAAAAAAEAAAAAAAAAZAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAEAAAAAAIAAAACAAAAAAACRlZHRzAAAAHGVsc3QAAAAAAAAAAQAAAGQAAAQAAAEAAAAAAdZtZGlhAAAAIG1kaGQAAAAAAAAAAAAAAAAAADwAAAAGAFXEAAAAAAAtaGRscgAAAAAAAAAAdmlkZQAAAAAAAAAAAAAAAFZpZGVvSGFuZGxlcgAAAAGBbWluZgAAABR2bWhkAAAAAQAAAAAAAAAAAAAAJGRpbmYAAAAcZHJlZgAAAAAAAAABAAAADHVybCAAAAABAAABQXN0YmwAAACVc3RzZAAAAAAAAAABAAAAhWF2YzEAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAIAAgAEgAAABIAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY//8AAAAvYXZjQwFkAAr/4QAWZ2QACqzZSWhAAAADAEAAAA8DxIllgAEABmjr48siwAAAABhzdHRzAAAAAAAAAAEAAAADAAACAAAAABRzdHNzAAAAAAAAAAEAAAABAAAAKGN0dHMAAAAAAAAAAwAAAAE
 AAAQAAAAAAQAABgAAAAABAAACAAAAABxzdHNjAAAAAAAAAAEAAAABAAAAAwAAAAEAAAAgc3RzegAAAAAAAAAAAAAAAwAAA3MAAAAMAAAADAAAABRzdGNvAAAAAAAAAAEAAAAwAAAAYnVkdGEAAABabWV0YQAAAAAAAAAhaGRscgAAAAAAAAAAbWRpcmFwcGwAAAAAAAAAAAAAAAAtaWxzdAAAACWpdG9vAAAAHWRhdGEAAAABAAAAAExhdmY1Ni40MC4xMDE=" controls="controls">
+<style>
+:matches(::marker, |*) { 
+       float: left;
+}
+</style>
+
+<script>
+if (window.testRunner)
+    testRunner.dumpAsText();
+document.body.style.columnCount = "2";
+</script>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari607branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebCore/ChangeLog (243592 => 243593)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebCore/ChangeLog      2019-03-27 23:52:44 UTC (rev 243592)
+++ branches/safari-607-branch/Source/WebCore/ChangeLog 2019-03-27 23:56:26 UTC (rev 243593)
</span><span class="lines">@@ -1,5 +1,52 @@
</span><span class="cx"> 2019-03-27  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r242943. rdar://problem/49307995
+
+    Cleanup inline boxes when list marker gets blockified
+    https://bugs.webkit.org/show_bug.cgi?id=195746
+    <rdar://problem/48049175>
+    
+    Reviewed by Antti Koivisto.
+    
+    Source/WebCore:
+    
+    Normally when an element gets blockified (inline -> block) we destroy its renderer and construct a new one (RenderInline -> RenderBlock).
+    During this process the associated inline boxtree gets destroyed as well. Since RenderListMarker is just a generic RenderBox, the blockifying
+    change does not require a new renderer.
+    This patch takes care of destroying the inline boxtree when the marker gains block display type.
+    
+    Test: fast/block/float/list-marker-is-float-crash.html
+    
+    * rendering/RenderListMarker.cpp:
+    (WebCore::RenderListMarker::styleDidChange):
+    
+    LayoutTests:
+    
+    * fast/block/float/list-marker-is-float-crash-expected.txt: Added.
+    * fast/block/float/list-marker-is-float-crash.html: Added.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242943 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-03-14  Zalan Bujtas  <zalan@apple.com>
+
+            Cleanup inline boxes when list marker gets blockified
+            https://bugs.webkit.org/show_bug.cgi?id=195746
+            <rdar://problem/48049175>
+
+            Reviewed by Antti Koivisto.
+
+            Normally when an element gets blockified (inline -> block) we destroy its renderer and construct a new one (RenderInline -> RenderBlock).
+            During this process the associated inline boxtree gets destroyed as well. Since RenderListMarker is just a generic RenderBox, the blockifying
+            change does not require a new renderer.
+            This patch takes care of destroying the inline boxtree when the marker gains block display type.
+
+            Test: fast/block/float/list-marker-is-float-crash.html
+
+            * rendering/RenderListMarker.cpp:
+            (WebCore::RenderListMarker::styleDidChange):
+
+2019-03-27  Alan Coon  <alancoon@apple.com>
+
</ins><span class="cx">         Cherry-pick r242964. rdar://problem/49359851
</span><span class="cx"> 
</span><span class="cx">     Storing a Node in Ref/RefPtr inside its destructor results in double delete
</span></span></pre></div>
<a id="branchessafari607branchSourceWebCorerenderingRenderListMarkercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebCore/rendering/RenderListMarker.cpp (243592 => 243593)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebCore/rendering/RenderListMarker.cpp 2019-03-27 23:52:44 UTC (rev 243592)
+++ branches/safari-607-branch/Source/WebCore/rendering/RenderListMarker.cpp    2019-03-27 23:56:26 UTC (rev 243593)
</span><span class="lines">@@ -1145,8 +1145,14 @@
</span><span class="cx"> {
</span><span class="cx">     RenderBox::styleDidChange(diff, oldStyle);
</span><span class="cx"> 
</span><del>-    if (oldStyle && (style().listStylePosition() != oldStyle->listStylePosition() || style().listStyleType() != oldStyle->listStyleType()))
-        setNeedsLayoutAndPrefWidthsRecalc();
</del><ins>+    if (oldStyle) {
+        if (style().listStylePosition() != oldStyle->listStylePosition() || style().listStyleType() != oldStyle->listStyleType())
+            setNeedsLayoutAndPrefWidthsRecalc();
+        if (oldStyle->isDisplayInlineType() && !style().isDisplayInlineType()) {
+            delete m_inlineBoxWrapper;
+            m_inlineBoxWrapper = nullptr;
+        }
+    }
</ins><span class="cx"> 
</span><span class="cx">     if (m_image != style().listStyleImage()) {
</span><span class="cx">         if (m_image)
</span></span></pre>
</div>
</div>

</body>
</html>