Reviewed by John.

	- remove init hint argument from VisiblePosition

        * khtml/editing/visible_position.cpp:
        (khtml::VisiblePosition::VisiblePosition):
        (khtml::VisiblePosition::init):
        * khtml/editing/visible_position.h:
        * khtml/editing/visible_units.cpp:
        (khtml::previousBoundary):
        (khtml::nextBoundary):
        * khtml/xml/dom_docimpl.cpp:
        (DocumentImpl::updateSelection):
        * kwq/KWQKHTMLPart.mm:
        (KWQKHTMLPart::styleForSelectionStart):
        * kwq/WebCoreBridge.mm:
        (-[WebCoreBridge setSelectedDOMRange:affinity:closeTyping:]):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9154 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index fb996a293fa35d7754ba9261eb300d1292d6d1c0..b23dd7dd970ce7c4eb9565232d6c2cb52ec5a99d 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,23 @@
+2005-05-09  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by John.
+
+       - remove init hint argument from VisiblePosition 
+
+        * khtml/editing/visible_position.cpp:
+        (khtml::VisiblePosition::VisiblePosition):
+        (khtml::VisiblePosition::init):
+        * khtml/editing/visible_position.h:
+        * khtml/editing/visible_units.cpp:
+        (khtml::previousBoundary):
+        (khtml::nextBoundary):
+        * khtml/xml/dom_docimpl.cpp:
+        (DocumentImpl::updateSelection):
+        * kwq/KWQKHTMLPart.mm:
+        (KWQKHTMLPart::styleForSelectionStart):
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge setSelectedDOMRange:affinity:closeTyping:]):
+
 2005-05-10  Darin Adler  <darin@apple.com>
 
         Reviewed by David Harrison.

diff --git a/WebCore/khtml/editing/visible_position.cpp b/WebCore/khtml/editing/visible_position.cpp
index fdc9fd1085549fefc119523b288219b3d365dfd8..5b2c9e85128a85459ddc49e2b5c4900734de6b98 100644 (file)
--- a/WebCore/khtml/editing/visible_position.cpp
+++ b/WebCore/khtml/editing/visible_position.cpp
@@ -53,14 +53,14 @@ using DOM::TextImpl;
 
 namespace khtml {
 
-VisiblePosition::VisiblePosition(const Position &pos, EAffinity affinity, EInitHint initHint)
+VisiblePosition::VisiblePosition(const Position &pos, EAffinity affinity)
 {
-    init(pos, initHint, affinity);
+    init(pos, affinity);
 }
 
-VisiblePosition::VisiblePosition(NodeImpl *node, long offset, EAffinity affinity, EInitHint initHint)
+VisiblePosition::VisiblePosition(NodeImpl *node, long offset, EAffinity affinity)
 {
-    init(Position(node, offset), initHint, affinity);
+    init(Position(node, offset), affinity);
 }
 
 VisiblePosition::VisiblePosition(const VisiblePosition &other)
@@ -69,26 +69,15 @@ VisiblePosition::VisiblePosition(const VisiblePosition &other)
     m_affinity = other.m_affinity;
 }
 
-void VisiblePosition::init(const Position &pos, EInitHint initHint, EAffinity affinity)
+void VisiblePosition::init(const Position &pos, EAffinity affinity)
 {
     m_affinity = affinity;
 
-    // A first step toward eliminating the initHint parameter.
     // For <br> 0, it's important not to move past the <br>.
     if (pos.node() && pos.node()->id() == ID_BR && pos.offset() == 0)
-        initHint = INIT_UP;
-
-    switch (initHint) {
-        case INIT_UP:
-            initUpstream(pos);
-            break;
-        case INIT_DOWN:
-            initDownstream(pos);
-            break;
-        default:
-            ASSERT_NOT_REACHED();
-            break;
-    }
+        initUpstream(pos);
+    else
+        initDownstream(pos);
 }
 
 void VisiblePosition::initUpstream(const Position &pos)

diff --git a/WebCore/khtml/editing/visible_position.h b/WebCore/khtml/editing/visible_position.h
index f4823098a3761dbfe91f07c70c68cfb4bac7fc29..00ff159f3464efc268e2497bf2c33df89fca4de8 100644 (file)
--- a/WebCore/khtml/editing/visible_position.h
+++ b/WebCore/khtml/editing/visible_position.h
@@ -47,14 +47,9 @@ public:
     typedef DOM::NodeImpl NodeImpl;
     typedef DOM::Position Position;
 
-    enum EInitHint { 
-        INIT_UP, 
-        INIT_DOWN
-    };
-
     VisiblePosition() { m_affinity = VP_DEFAULT_AFFINITY; };
-    VisiblePosition(NodeImpl *, long offset, EAffinity, EInitHint initHint=INIT_DOWN);
-    VisiblePosition(const Position &, EAffinity, EInitHint initHint=INIT_DOWN);
+    VisiblePosition(NodeImpl *, long offset, EAffinity);
+    VisiblePosition(const Position &, EAffinity);
     VisiblePosition(const VisiblePosition &);
 
     void clear() { m_deepPosition.clear(); }
@@ -90,7 +85,7 @@ public:
 #endif
     
 private:
-    void init(const Position &, EInitHint, EAffinity);
+    void init(const Position &, EAffinity);
     void initUpstream(const Position &);
     void initDownstream(const Position &);
 

diff --git a/WebCore/khtml/editing/visible_units.cpp b/WebCore/khtml/editing/visible_units.cpp
index db1a0fa9535330113d2851b7d9e9b708684c46c4..a5db8eafec1230a817475cc6219a58021210c8fc 100644 (file)
--- a/WebCore/khtml/editing/visible_units.cpp
+++ b/WebCore/khtml/editing/visible_units.cpp
@@ -117,7 +117,7 @@ static VisiblePosition previousBoundary(const VisiblePosition &c, unsigned (*sea
         }
     }
 
-    return VisiblePosition(pos, DOWNSTREAM, VisiblePosition::INIT_DOWN);
+    return VisiblePosition(pos, DOWNSTREAM);
 }
 
 static VisiblePosition nextBoundary(const VisiblePosition &c, unsigned (*searchFunction)(const QChar *, unsigned))
@@ -184,7 +184,7 @@ static VisiblePosition nextBoundary(const VisiblePosition &c, unsigned (*searchF
         charIt.advance(next - 1);
         pos = Position(charIt.range().endContainer().handle(), charIt.range().endOffset());
     }
-    return VisiblePosition(pos, UPSTREAM, VisiblePosition::INIT_UP);
+    return VisiblePosition(pos, UPSTREAM);
 }
 
 // ---------

diff --git a/WebCore/khtml/xml/dom_docimpl.cpp b/WebCore/khtml/xml/dom_docimpl.cpp
index 8c52ec2786983bbc6a05de2dbdf1bd1df96b2be6..9275f7be60f1706f88c6916a7ee7f1d126b2c572 100644 (file)
--- a/WebCore/khtml/xml/dom_docimpl.cpp
+++ b/WebCore/khtml/xml/dom_docimpl.cpp
@@ -1338,8 +1338,8 @@ void DocumentImpl::updateSelection()
         canvas->clearSelection();
     }
     else {
-        Position startPos = VisiblePosition(s.start(), s.startAffinity(), khtml::VisiblePosition::INIT_UP).deepEquivalent();
-        Position endPos = VisiblePosition(s.end(), s.endAffinity(), khtml::VisiblePosition::INIT_DOWN).deepEquivalent();
+        Position startPos = VisiblePosition(s.start(), s.startAffinity()).deepEquivalent();
+        Position endPos = VisiblePosition(s.end(), s.endAffinity()).deepEquivalent();
         if (startPos.isNotNull() && endPos.isNotNull()) {
             RenderObject *startRenderer = startPos.node()->renderer();
             RenderObject *endRenderer = endPos.node()->renderer();

diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 1b3906ff2ca78a7774cda8286507cb0b1feaed53..55f10a6979c71a206294ddbd379ac8f63cf26563 100644 (file)
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -3466,7 +3466,7 @@ RenderStyle *KWQKHTMLPart::styleForSelectionStart(NodeImpl *&nodeToRemove) const
     if (d->m_selection.isNone())
         return 0;
     
-    Position pos = VisiblePosition(d->m_selection.start(), d->m_selection.startAffinity(), khtml::VisiblePosition::INIT_UP).deepEquivalent();
+    Position pos = VisiblePosition(d->m_selection.start(), d->m_selection.startAffinity()).deepEquivalent();
     if (!pos.inRenderedContent())
         return 0;
     NodeImpl *node = pos.node();

diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 18631064467325eca909a434ccf85d3b4ef54b7e..30e24302482fcf92fae5d185fdbc5cd5be2e72be 100644 (file)
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -1610,7 +1610,7 @@ static HTMLFormElementImpl *formElementFromDOMElement(DOMElement *element)
     // If that bug wasn't an issue, we could just make the position from the range directly.
     Position start(startContainer, [range startOffset]);
     Position end(endContainer, [range endOffset]);
-    VisiblePosition visibleStart(start, affinity, khtml::VisiblePosition::INIT_UP);
+    VisiblePosition visibleStart(start, affinity);
     start = visibleStart.deepEquivalent();
 
     if (rangeCollapsed) {