<!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>[42263] trunk/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/42263">42263</a></dd>
<dt>Author</dt> <dd>eric@webkit.org</dd>
<dt>Date</dt> <dd>2009-04-07 07:25:23 -0700 (Tue, 07 Apr 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>        Reviewed by Darin Adler.

        Add containerNode(), computeOffsetInContainerNode(),
        computeNodeBeforePosition() and computeNodeAfterPosition().
        https://bugs.webkit.org/show_bug.cgi?id=24763

        These functions will replace uses of rangeCompliantPosition()
        in future patches.

        No changes in behavior, thus no tests.

        * dom/Position.cpp:
        (WebCore::Position::containerNode):
        (WebCore::Position::computeOffsetInContainerNode):
        (WebCore::Position::computeNodeBeforePosition):
        (WebCore::Position::computeNodeAfterPosition):
        (WebCore::Position::anchorType):
        * dom/Position.h:
        (WebCore::Position::):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoredomPositioncpp">trunk/WebCore/dom/Position.cpp</a></li>
<li><a href="#trunkWebCoredomPositionh">trunk/WebCore/dom/Position.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (42262 => 42263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-04-07 11:48:06 UTC (rev 42262)
+++ trunk/WebCore/ChangeLog        2009-04-07 14:25:23 UTC (rev 42263)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2009-04-07  Eric Seidel  &lt;eric@webkit.org&gt;
+
+        Reviewed by Darin Adler.
+
+        Add containerNode(), computeOffsetInContainerNode(),
+        computeNodeBeforePosition() and computeNodeAfterPosition().
+        https://bugs.webkit.org/show_bug.cgi?id=24763
+
+        These functions will replace uses of rangeCompliantPosition()
+        in future patches.
+
+        No changes in behavior, thus no tests.
+
+        * dom/Position.cpp:
+        (WebCore::Position::containerNode):
+        (WebCore::Position::computeOffsetInContainerNode):
+        (WebCore::Position::computeNodeBeforePosition):
+        (WebCore::Position::computeNodeAfterPosition):
+        (WebCore::Position::anchorType):
+        * dom/Position.h:
+        (WebCore::Position::):
+
</ins><span class="cx"> 2009-04-06  Sam Weinig  &lt;sam@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Mark Rowe.
</span></span></pre></div>
<a id="trunkWebCoredomPositioncpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/dom/Position.cpp (42262 => 42263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/dom/Position.cpp        2009-04-07 11:48:06 UTC (rev 42262)
+++ trunk/WebCore/dom/Position.cpp        2009-04-07 14:25:23 UTC (rev 42263)
</span><span class="lines">@@ -73,6 +73,91 @@
</span><span class="cx">     return 0;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+Node* Position::containerNode() const
+{
+    if (!m_anchorNode)
+        return 0;
+
+    switch (anchorType()) {
+    case PositionIsOffsetInAnchor:
+        return m_anchorNode.get();
+    case PositionIsBeforeAnchor:
+    case PositionIsAfterAnchor:
+        return m_anchorNode-&gt;parentNode();
+    }
+    ASSERT_NOT_REACHED();
+    return 0;
+}
+
+int Position::computeOffsetInContainerNode() const
+{
+    if (!m_anchorNode)
+        return 0;
+
+    switch (anchorType()) {
+    case PositionIsOffsetInAnchor:
+    {
+        int maximumValidOffset = m_anchorNode-&gt;offsetInCharacters() ? m_anchorNode-&gt;maxCharacterOffset() : m_anchorNode-&gt;childNodeCount();
+        return std::min(maximumValidOffset, m_offset);
+    }
+    case PositionIsBeforeAnchor:
+        return m_anchorNode-&gt;nodeIndex();
+    case PositionIsAfterAnchor:
+        return m_anchorNode-&gt;nodeIndex() + 1;
+    }
+    ASSERT_NOT_REACHED();
+    return 0;
+}
+
+Node* Position::computeNodeBeforePosition() const
+{
+    if (!m_anchorNode)
+        return 0;
+
+    switch (anchorType()) {
+    case PositionIsOffsetInAnchor:
+        return m_anchorNode-&gt;childNode(m_offset - 1); // -1 converts to childNode((unsigned)-1) and returns null.
+    case PositionIsBeforeAnchor:
+        return m_anchorNode-&gt;previousSibling();
+    case PositionIsAfterAnchor:
+        return m_anchorNode.get();
+    }
+    ASSERT_NOT_REACHED();
+    return 0;
+}
+
+Node* Position::computeNodeAfterPosition() const
+{
+    if (!m_anchorNode)
+        return 0;
+
+    switch (anchorType()) {
+    case PositionIsOffsetInAnchor:
+        return m_anchorNode-&gt;childNode(m_offset);
+    case PositionIsBeforeAnchor:
+        return m_anchorNode.get();
+    case PositionIsAfterAnchor:
+        return m_anchorNode-&gt;nextSibling();
+    }
+    ASSERT_NOT_REACHED();
+    return 0;
+}
+
+// FIXME: Position should store an AnchorType up-front, instead of lazily
+// determining it via editingIgnoresContent(anchorNode())
+// That would require fixing moveToOffset to know how to recompute the AnchorType
+// for positions which need historical editing-compatible behavior
+// (and for explicitly anchored positions to ASSERT_NOT_REACHED())
+Position::AnchorType Position::anchorType() const
+{
+    if (m_anchorNode &amp;&amp; editingIgnoresContent(m_anchorNode.get())) {
+        if (m_offset == 0)
+            return PositionIsBeforeAnchor;
+        return PositionIsAfterAnchor;
+    }
+    return PositionIsOffsetInAnchor;
+}
+
</ins><span class="cx"> Element* Position::documentElement() const
</span><span class="cx"> {
</span><span class="cx">     if (Node* n = node())
</span></span></pre></div>
<a id="trunkWebCoredomPositionh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/dom/Position.h (42262 => 42263)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/dom/Position.h        2009-04-07 11:48:06 UTC (rev 42262)
+++ trunk/WebCore/dom/Position.h        2009-04-07 14:25:23 UTC (rev 42263)
</span><span class="lines">@@ -62,6 +62,15 @@
</span><span class="cx"> 
</span><span class="cx">     void clear() { m_anchorNode.clear(); m_offset = 0; }
</span><span class="cx"> 
</span><ins>+    // These are always DOM compliant values.  Editing positions like [img, 0] (aka [img, before])
+    // will return img-&gt;parentNode() and img-&gt;nodeIndex() from these functions.
+    Node* containerNode() const;
+    int computeOffsetInContainerNode() const;
+
+    // These are convenience methods which are smart about whether the position is neighbor anchored or parent anchored
+    Node* computeNodeBeforePosition() const;
+    Node* computeNodeAfterPosition() const;
+
</ins><span class="cx">     Node* anchorNode() const { return m_anchorNode.get(); }
</span><span class="cx"> 
</span><span class="cx">     // FIXME: Callers should be moved off of node(), node() is not always the container for this position.
</span><span class="lines">@@ -133,6 +142,14 @@
</span><span class="cx"> private:
</span><span class="cx">     int renderedOffset() const;
</span><span class="cx"> 
</span><ins>+    enum AnchorType {
+        PositionIsOffsetInAnchor,
+        PositionIsAfterAnchor,
+        PositionIsBeforeAnchor
+    };
+
+    AnchorType anchorType() const;
+
</ins><span class="cx">     Position previousCharacterPosition(EAffinity) const;
</span><span class="cx">     Position nextCharacterPosition(EAffinity) const;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>