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

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

    [WeakPtr] RenderListMarker::m_listItem should be a WeakPtr
    https://bugs.webkit.org/show_bug.cgi?id=195704
    <rdar://problem/48486278>

    Reviewed by Simon Fraser.

    * rendering/RenderListMarker.cpp:
    (WebCore::RenderListMarker::RenderListMarker):
    (WebCore::RenderListMarker::paint):
    (WebCore::RenderListMarker::layout):
    (WebCore::RenderListMarker::updateContent):
    (WebCore::RenderListMarker::computePreferredLogicalWidths):
    (WebCore::RenderListMarker::lineHeight const):
    (WebCore::RenderListMarker::baselinePosition const):
    (WebCore::RenderListMarker::suffix const):
    (WebCore::RenderListMarker::isInside const):
    (WebCore::RenderListMarker::getRelativeMarkerRect):
    * rendering/RenderListMarker.h:

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

<h3>Modified Paths</h3>
<ul>
<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>
<li><a href="#branchessafari607branchSourceWebCorerenderingRenderListMarkerh">branches/safari-607-branch/Source/WebCore/rendering/RenderListMarker.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari607branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebCore/ChangeLog (243573 => 243574)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebCore/ChangeLog      2019-03-27 23:43:41 UTC (rev 243573)
+++ branches/safari-607-branch/Source/WebCore/ChangeLog 2019-03-27 23:43:43 UTC (rev 243574)
</span><span class="lines">@@ -1,5 +1,51 @@
</span><span class="cx"> 2019-03-27  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r242921. rdar://problem/49308071
+
+    [WeakPtr] RenderListMarker::m_listItem should be a WeakPtr
+    https://bugs.webkit.org/show_bug.cgi?id=195704
+    <rdar://problem/48486278>
+    
+    Reviewed by Simon Fraser.
+    
+    * rendering/RenderListMarker.cpp:
+    (WebCore::RenderListMarker::RenderListMarker):
+    (WebCore::RenderListMarker::paint):
+    (WebCore::RenderListMarker::layout):
+    (WebCore::RenderListMarker::updateContent):
+    (WebCore::RenderListMarker::computePreferredLogicalWidths):
+    (WebCore::RenderListMarker::lineHeight const):
+    (WebCore::RenderListMarker::baselinePosition const):
+    (WebCore::RenderListMarker::suffix const):
+    (WebCore::RenderListMarker::isInside const):
+    (WebCore::RenderListMarker::getRelativeMarkerRect):
+    * rendering/RenderListMarker.h:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@242921 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-03-13  Zalan Bujtas  <zalan@apple.com>
+
+            [WeakPtr] RenderListMarker::m_listItem should be a WeakPtr
+            https://bugs.webkit.org/show_bug.cgi?id=195704
+            <rdar://problem/48486278>
+
+            Reviewed by Simon Fraser.
+
+            * rendering/RenderListMarker.cpp:
+            (WebCore::RenderListMarker::RenderListMarker):
+            (WebCore::RenderListMarker::paint):
+            (WebCore::RenderListMarker::layout):
+            (WebCore::RenderListMarker::updateContent):
+            (WebCore::RenderListMarker::computePreferredLogicalWidths):
+            (WebCore::RenderListMarker::lineHeight const):
+            (WebCore::RenderListMarker::baselinePosition const):
+            (WebCore::RenderListMarker::suffix const):
+            (WebCore::RenderListMarker::isInside const):
+            (WebCore::RenderListMarker::getRelativeMarkerRect):
+            * rendering/RenderListMarker.h:
+
+2019-03-27  Alan Coon  <alancoon@apple.com>
+
</ins><span class="cx">         Cherry-pick r242919. rdar://problem/49307949
</span><span class="cx"> 
</span><span class="cx">     Use RenderBox::previousSiblingBox/nextSiblingBox in RenderMultiColumnFlow
</span></span></pre></div>
<a id="branchessafari607branchSourceWebCorerenderingRenderListMarkercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebCore/rendering/RenderListMarker.cpp (243573 => 243574)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebCore/rendering/RenderListMarker.cpp 2019-03-27 23:43:41 UTC (rev 243573)
+++ branches/safari-607-branch/Source/WebCore/rendering/RenderListMarker.cpp    2019-03-27 23:43:43 UTC (rev 243574)
</span><span class="lines">@@ -1122,7 +1122,7 @@
</span><span class="cx"> 
</span><span class="cx"> RenderListMarker::RenderListMarker(RenderListItem& listItem, RenderStyle&& style)
</span><span class="cx">     : RenderBox(listItem.document(), WTFMove(style), 0)
</span><del>-    , m_listItem(listItem)
</del><ins>+    , m_listItem(makeWeakPtr(listItem))
</ins><span class="cx"> {
</span><span class="cx">     // init RenderObject attributes
</span><span class="cx">     setInline(true);   // our object is Inline
</span><span class="lines">@@ -1210,7 +1210,7 @@
</span><span class="cx">         if (selectionState() != SelectionNone) {
</span><span class="cx">             LayoutRect selRect = localSelectionRect();
</span><span class="cx">             selRect.moveBy(boxOrigin);
</span><del>-            context.fillRect(snappedIntRect(selRect), m_listItem.selectionBackgroundColor());
</del><ins>+            context.fillRect(snappedIntRect(selRect), m_listItem->selectionBackgroundColor());
</ins><span class="cx">         }
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="lines">@@ -1218,7 +1218,7 @@
</span><span class="cx">     if (selectionState() != SelectionNone) {
</span><span class="cx">         LayoutRect selRect = localSelectionRect();
</span><span class="cx">         selRect.moveBy(boxOrigin);
</span><del>-        context.fillRect(snappedIntRect(selRect), m_listItem.selectionBackgroundColor());
</del><ins>+        context.fillRect(snappedIntRect(selRect), m_listItem->selectionBackgroundColor());
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     const Color color(style().visitedDependentColorWithColorFilter(CSSPropertyColor));
</span><span class="lines">@@ -1343,7 +1343,7 @@
</span><span class="cx">     if (type == ListStyleType::Asterisks || type == ListStyleType::Footnotes)
</span><span class="cx">         context.drawText(font, textRun, textOrigin);
</span><span class="cx">     else {
</span><del>-        const UChar suffix = listMarkerSuffix(type, m_listItem.value());
</del><ins>+        const UChar suffix = listMarkerSuffix(type, m_listItem->value());
</ins><span class="cx"> 
</span><span class="cx">         // Text is not arbitrary. We can judge whether it's RTL from the first character,
</span><span class="cx">         // and we only need to handle the direction U_RIGHT_TO_LEFT for now.
</span><span class="lines">@@ -1382,12 +1382,12 @@
</span><span class="cx">     ASSERT(needsLayout());
</span><span class="cx"> 
</span><span class="cx">     LayoutUnit blockOffset;
</span><del>-    for (auto* ancestor = parentBox(); ancestor && ancestor != &m_listItem; ancestor = ancestor->parentBox())
</del><ins>+    for (auto* ancestor = parentBox(); ancestor && ancestor != m_listItem.get(); ancestor = ancestor->parentBox())
</ins><span class="cx">         blockOffset += ancestor->logicalTop();
</span><span class="cx">     if (style().isLeftToRightDirection())
</span><del>-        m_lineOffsetForListItem = m_listItem.logicalLeftOffsetForLine(blockOffset, DoNotIndentText, 0_lu);
</del><ins>+        m_lineOffsetForListItem = m_listItem->logicalLeftOffsetForLine(blockOffset, DoNotIndentText, 0_lu);
</ins><span class="cx">     else
</span><del>-        m_lineOffsetForListItem = m_listItem.logicalRightOffsetForLine(blockOffset, DoNotIndentText, 0_lu);
</del><ins>+        m_lineOffsetForListItem = m_listItem->logicalRightOffsetForLine(blockOffset, DoNotIndentText, 0_lu);
</ins><span class="cx">  
</span><span class="cx">     if (isImage()) {
</span><span class="cx">         updateMarginsAndContent();
</span><span class="lines">@@ -1534,7 +1534,7 @@
</span><span class="cx">     case ListStyleType::UpperNorwegian:
</span><span class="cx">     case ListStyleType::UpperRoman:
</span><span class="cx">     case ListStyleType::Urdu:
</span><del>-        m_text = listMarkerText(type, m_listItem.value());
</del><ins>+        m_text = listMarkerText(type, m_listItem->value());
</ins><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="lines">@@ -1650,7 +1650,7 @@
</span><span class="cx">         else {
</span><span class="cx">             TextRun run = RenderBlock::constructTextRun(m_text, style());
</span><span class="cx">             LayoutUnit itemWidth = font.width(run);
</span><del>-            UChar suffixSpace[2] = { listMarkerSuffix(type, m_listItem.value()), ' ' };
</del><ins>+            UChar suffixSpace[2] = { listMarkerSuffix(type, m_listItem->value()), ' ' };
</ins><span class="cx">             LayoutUnit suffixSpaceWidth = font.width(RenderBlock::constructTextRun(suffixSpace, 2, style()));
</span><span class="cx">             logicalWidth = itemWidth + suffixSpaceWidth;
</span><span class="cx">         }
</span><span class="lines">@@ -1733,7 +1733,7 @@
</span><span class="cx"> LayoutUnit RenderListMarker::lineHeight(bool firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) const
</span><span class="cx"> {
</span><span class="cx">     if (!isImage())
</span><del>-        return m_listItem.lineHeight(firstLine, direction, PositionOfInteriorLineBoxes);
</del><ins>+        return m_listItem->lineHeight(firstLine, direction, PositionOfInteriorLineBoxes);
</ins><span class="cx">     return RenderBox::lineHeight(firstLine, direction, linePositionMode);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -1740,7 +1740,7 @@
</span><span class="cx"> int RenderListMarker::baselinePosition(FontBaseline baselineType, bool firstLine, LineDirectionMode direction, LinePositionMode linePositionMode) const
</span><span class="cx"> {
</span><span class="cx">     if (!isImage())
</span><del>-        return m_listItem.baselinePosition(baselineType, firstLine, direction, PositionOfInteriorLineBoxes);
</del><ins>+        return m_listItem->baselinePosition(baselineType, firstLine, direction, PositionOfInteriorLineBoxes);
</ins><span class="cx">     return RenderBox::baselinePosition(baselineType, firstLine, direction, linePositionMode);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -1747,7 +1747,7 @@
</span><span class="cx"> String RenderListMarker::suffix() const
</span><span class="cx"> {
</span><span class="cx">     ListStyleType type = style().listStyleType();
</span><del>-    const UChar suffix = listMarkerSuffix(type, m_listItem.value());
</del><ins>+    const UChar suffix = listMarkerSuffix(type, m_listItem->value());
</ins><span class="cx"> 
</span><span class="cx">     if (suffix == ' ')
</span><span class="cx">         return " "_str;
</span><span class="lines">@@ -1767,7 +1767,7 @@
</span><span class="cx"> 
</span><span class="cx"> bool RenderListMarker::isInside() const
</span><span class="cx"> {
</span><del>-    return m_listItem.notInList() || style().listStylePosition() == ListStylePosition::Inside;
</del><ins>+    return m_listItem->notInList() || style().listStylePosition() == ListStylePosition::Inside;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> FloatRect RenderListMarker::getRelativeMarkerRect()
</span><span class="lines">@@ -1877,7 +1877,7 @@
</span><span class="cx">         const FontCascade& font = style().fontCascade();
</span><span class="cx">         TextRun run = RenderBlock::constructTextRun(m_text, style());
</span><span class="cx">         float itemWidth = font.width(run);
</span><del>-        UChar suffixSpace[2] = { listMarkerSuffix(type, m_listItem.value()), ' ' };
</del><ins>+        UChar suffixSpace[2] = { listMarkerSuffix(type, m_listItem->value()), ' ' };
</ins><span class="cx">         float suffixSpaceWidth = font.width(RenderBlock::constructTextRun(suffixSpace, 2, style()));
</span><span class="cx">         relativeRect = FloatRect(0, 0, itemWidth + suffixSpaceWidth, font.fontMetrics().height());
</span><span class="cx">     }
</span></span></pre></div>
<a id="branchessafari607branchSourceWebCorerenderingRenderListMarkerh"></a>
<div class="modfile"><h4>Modified: branches/safari-607-branch/Source/WebCore/rendering/RenderListMarker.h (243573 => 243574)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-607-branch/Source/WebCore/rendering/RenderListMarker.h   2019-03-27 23:43:41 UTC (rev 243573)
+++ branches/safari-607-branch/Source/WebCore/rendering/RenderListMarker.h      2019-03-27 23:43:43 UTC (rev 243574)
</span><span class="lines">@@ -47,10 +47,6 @@
</span><span class="cx"> 
</span><span class="cx">     void updateMarginsAndContent();
</span><span class="cx"> 
</span><del>-#if !ASSERT_DISABLED
-    RenderListItem& listItem() const { return m_listItem; }
-#endif
-
</del><span class="cx"> private:
</span><span class="cx">     void willBeDestroyed() override;
</span><span class="cx"> 
</span><span class="lines">@@ -90,7 +86,7 @@
</span><span class="cx"> 
</span><span class="cx">     String m_text;
</span><span class="cx">     RefPtr<StyleImage> m_image;
</span><del>-    RenderListItem& m_listItem;
</del><ins>+    WeakPtr<RenderListItem> m_listItem;
</ins><span class="cx">     LayoutUnit m_lineOffsetForListItem;
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>