<!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>[185682] trunk/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/185682">185682</a></dd>
<dt>Author</dt> <dd>jhoneycutt@apple.com</dd>
<dt>Date</dt> <dd>2015-06-17 17:49:54 -0700 (Wed, 17 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Position::findParent() should take a reference
https://bugs.webkit.org/show_bug.cgi?id=146038
Reviewed by Darin Adler.
* dom/Position.cpp:
(WebCore::Position::containerNode):
(WebCore::Position::parentAnchoredEquivalent):
Pass a reference; there is already a null check.
(WebCore::Position::previous):
Add a missing null check. Code below this expects that node is non-null.
(WebCore::Position::next):
Ditto.
(WebCore::Position::atStartOfTree):
(WebCore::Position::atEndOfTree):
Pass a reference.
(WebCore::Position::findParent):
Changed to take a reference.
* dom/Position.h:
Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomPositioncpp">trunk/Source/WebCore/dom/Position.cpp</a></li>
<li><a href="#trunkSourceWebCoredomPositionh">trunk/Source/WebCore/dom/Position.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185681 => 185682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-18 00:32:33 UTC (rev 185681)
+++ trunk/Source/WebCore/ChangeLog 2015-06-18 00:49:54 UTC (rev 185682)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-06-16 Jon Honeycutt <jhoneycutt@apple.com>
+
+ Position::findParent() should take a reference
+ https://bugs.webkit.org/show_bug.cgi?id=146038
+
+ Reviewed by Darin Adler.
+
+ * dom/Position.cpp:
+ (WebCore::Position::containerNode):
+ (WebCore::Position::parentAnchoredEquivalent):
+ Pass a reference; there is already a null check.
+ (WebCore::Position::previous):
+ Add a missing null check. Code below this expects that node is non-null.
+ (WebCore::Position::next):
+ Ditto.
+ (WebCore::Position::atStartOfTree):
+ (WebCore::Position::atEndOfTree):
+ Pass a reference.
+ (WebCore::Position::findParent):
+ Changed to take a reference.
+
+ * dom/Position.h:
+ Ditto.
+
</ins><span class="cx"> 2015-06-17 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Overflow regions with scroll snap points are not reliably rubber banding
</span></span></pre></div>
<a id="trunkSourceWebCoredomPositioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Position.cpp (185681 => 185682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Position.cpp 2015-06-18 00:32:33 UTC (rev 185681)
+++ trunk/Source/WebCore/dom/Position.cpp 2015-06-18 00:49:54 UTC (rev 185682)
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> return m_anchorNode.get();
</span><span class="cx"> case PositionIsBeforeAnchor:
</span><span class="cx"> case PositionIsAfterAnchor:
</span><del>- return findParent(m_anchorNode.get());
</del><ins>+ return findParent(*m_anchorNode);
</ins><span class="cx"> }
</span><span class="cx"> ASSERT_NOT_REACHED();
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: This should only be necessary for legacy positions, but is also needed for positions before and after Tables
</span><span class="cx"> if (m_offset <= 0 && (m_anchorType != PositionIsAfterAnchor && m_anchorType != PositionIsAfterChildren)) {
</span><del>- if (findParent(m_anchorNode.get()) && (editingIgnoresContent(m_anchorNode.get()) || isRenderedTable(m_anchorNode.get())))
</del><ins>+ if (findParent(*m_anchorNode) && (editingIgnoresContent(m_anchorNode.get()) || isRenderedTable(m_anchorNode.get())))
</ins><span class="cx"> return positionInParentBeforeNode(m_anchorNode.get());
</span><span class="cx"> return Position(m_anchorNode.get(), 0, PositionIsOffsetInAnchor);
</span><span class="cx"> }
</span><span class="lines">@@ -310,6 +310,9 @@
</span><span class="cx">
</span><span class="cx"> if (anchorType() == PositionIsBeforeAnchor) {
</span><span class="cx"> node = containerNode();
</span><ins>+ if (!node)
+ return *this;
+
</ins><span class="cx"> offset = computeOffsetInContainerNode();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -332,7 +335,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ContainerNode* parent = findParent(node);
</del><ins>+ ContainerNode* parent = findParent(*node);
</ins><span class="cx"> if (!parent)
</span><span class="cx"> return *this;
</span><span class="cx">
</span><span class="lines">@@ -360,6 +363,9 @@
</span><span class="cx">
</span><span class="cx"> if (anchorType() == PositionIsAfterAnchor) {
</span><span class="cx"> node = containerNode();
</span><ins>+ if (!node)
+ return *this;
+
</ins><span class="cx"> offset = computeOffsetInContainerNode();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -376,7 +382,7 @@
</span><span class="cx"> return createLegacyEditingPosition(node, (moveType == Character) ? uncheckedNextOffset(node, offset) : offset + 1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ContainerNode* parent = findParent(node);
</del><ins>+ ContainerNode* parent = findParent(*node);
</ins><span class="cx"> if (!parent)
</span><span class="cx"> return *this;
</span><span class="cx">
</span><span class="lines">@@ -478,7 +484,7 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> Node* container = containerNode();
</span><del>- if (container && findParent(container))
</del><ins>+ if (container && findParent(*container))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> switch (m_anchorType) {
</span><span class="lines">@@ -503,7 +509,7 @@
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> Node* container = containerNode();
</span><del>- if (container && findParent(container))
</del><ins>+ if (container && findParent(*container))
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> switch (m_anchorType) {
</span><span class="lines">@@ -938,9 +944,9 @@
</span><span class="cx"> return node && node->renderer() && node->renderer()->style().userSelect() == SELECT_NONE;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ContainerNode* Position::findParent(const Node* node)
</del><ins>+ContainerNode* Position::findParent(const Node& node)
</ins><span class="cx"> {
</span><del>- return node->nonShadowBoundaryParentNode();
</del><ins>+ return node.nonShadowBoundaryParentNode();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(USERSELECT_ALL)
</span></span></pre></div>
<a id="trunkSourceWebCoredomPositionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Position.h (185681 => 185682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Position.h 2015-06-18 00:32:33 UTC (rev 185681)
+++ trunk/Source/WebCore/dom/Position.h 2015-06-18 00:49:54 UTC (rev 185682)
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> static bool nodeIsUserSelectAll(const Node*) { return false; }
</span><span class="cx"> static Node* rootUserSelectAllForNode(Node*) { return 0; }
</span><span class="cx"> #endif
</span><del>- static ContainerNode* findParent(const Node*);
</del><ins>+ static ContainerNode* findParent(const Node&);
</ins><span class="cx">
</span><span class="cx"> void debugPosition(const char* msg = "") const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>