Changeset 157517 in webkit

Timestamp:

Oct 16, 2013, 7:33:31 AM (12 years ago)

Author:

Antti Koivisto

Message:

Move code for finding rendered character offset to RenderTextLineBoxes
​https://bugs.webkit.org/show_bug.cgi?id=122892

Reviewed by Andreas Kling.

• rendering/RenderText.cpp:

(WebCore::RenderText::countRenderedCharacterOffsets):
(WebCore::RenderText::containsRenderedCharacterOffset):

Renamed for consistency.

• rendering/RenderTextLineBoxes.cpp:

(WebCore::RenderTextLineBoxes::countCharacterOffsets):

This used to be Position::renderedPosition.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Position.cpp (modified) (3 diffs)
• dom/Position.h (modified) (1 diff)
• rendering/RenderText.cpp (modified) (1 diff)
• rendering/RenderText.h (modified) (1 diff)
• rendering/RenderTextLineBoxes.cpp (modified) (1 diff)
• rendering/RenderTextLineBoxes.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-10-16  Antti Koivisto  <antti@apple.com>
+
+        Move code for finding rendered character offset to RenderTextLineBoxes
+        https://bugs.webkit.org/show_bug.cgi?id=122892
+
+        Reviewed by Andreas Kling.
+
+        * rendering/RenderText.cpp:
+        (WebCore::RenderText::countRenderedCharacterOffsets):
+        (WebCore::RenderText::containsRenderedCharacterOffset):
+        
+            Renamed for consistency.
+
+        * rendering/RenderTextLineBoxes.cpp:
+        (WebCore::RenderTextLineBoxes::countCharacterOffsets):
+        
+            This used to be Position::renderedPosition.
+
 2013-10-16  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/dom/Position.cpp

@@ -480 +480 @@
 }
 
-int Position::renderedOffset() const
-{
-    if (!deprecatedNode()->isTextNode())
-        return m_offset;
-   
-    if (!deprecatedNode()->renderer())
-        return m_offset;
-                    
-    int result = 0;
-    RenderText* textRenderer = toText(deprecatedNode())->renderer();
-    for (InlineTextBox *box = textRenderer->firstTextBox(); box; box = box->nextTextBox()) {
-        int start = box->start();
-        int end = box->start() + box->len();
-        if (m_offset < start)
-            return result;
-        if (m_offset <= end) {
-            result += m_offset - start;
-            return result;
-        }
-        result += box->len();
-    }
-    return result;
-}
-
 // return first preceding DOM position rendered at a different location, or "this"
 Position Position::previousCharacterPosition(EAffinity affinity) const
@@ -976 +952 @@
         return false;
     
-    return renderer->containsCharacterOffset(m_offset);
+    return renderer->containsRenderedCharacterOffset(m_offset);
 }
 
@@ -1029 +1005 @@
         return false;
 
-    int thisRenderedOffset = renderedOffset();
-    int posRenderedOffset = pos.renderedOffset();
+    int thisRenderedOffset = renderer->isText() ? toRenderText(renderer)->countRenderedCharacterOffsetsUntil(m_offset) : m_offset;
+    int posRenderedOffset = posRenderer->isText() ? toRenderText(posRenderer)->countRenderedCharacterOffsetsUntil(pos.m_offset) : pos.m_offset;
 
     if (renderer == posRenderer && thisRenderedOffset == posRenderedOffset)

trunk/Source/WebCore/dom/Position.h

@@ -208 +208 @@
 private:
     int offsetForPositionAfterAnchor() const;
-
-    int renderedOffset() const;
-
     
     Position previousCharacterPosition(EAffinity) const;

trunk/Source/WebCore/rendering/RenderText.cpp

@@ -1152 +1152 @@
 }
 
-bool RenderText::containsCharacterOffset(unsigned offset) const
+unsigned RenderText::countRenderedCharacterOffsetsUntil(unsigned offset) const
+{
+    return m_lineBoxes.countCharacterOffsetsUntil(offset);
+}
+
+bool RenderText::containsRenderedCharacterOffset(unsigned offset) const
 {
     return m_lineBoxes.containsOffset(*this, offset, RenderTextLineBoxes::CharacterOffset);

trunk/Source/WebCore/rendering/RenderText.h

@@ -121 +121 @@
     virtual int caretMinOffset() const OVERRIDE;
     virtual int caretMaxOffset() const OVERRIDE;
-    bool containsCharacterOffset(unsigned) const;
+    unsigned countRenderedCharacterOffsetsUntil(unsigned) const;
+    bool containsRenderedCharacterOffset(unsigned) const;
     bool containsCaretOffset(unsigned) const;
     bool hasRenderedText() const;

trunk/Source/WebCore/rendering/RenderTextLineBoxes.cpp

@@ -244 +244 @@
 }
 
+unsigned RenderTextLineBoxes::countCharacterOffsetsUntil(unsigned offset) const
+{
+    unsigned result = 0;
+    for (auto box = m_first; box; box = box->nextTextBox()) {
+        if (offset < box->start())
+            return result;
+        if (offset <= box->start() + box->len()) {
+            result += offset - box->start();
+            return result;
+        }
+        result += box->len();
+    }
+    return result;
+}
+
 enum ShouldAffinityBeDownstream { AlwaysDownstream, AlwaysUpstream, UpstreamIfPositionIsNotAtStart };
 

trunk/Source/WebCore/rendering/RenderTextLineBoxes.h

@@ -63 +63 @@
     enum OffsetType { CaretOffset, CharacterOffset };
     bool containsOffset(const RenderText&, unsigned, OffsetType) const;
+    unsigned countCharacterOffsetsUntil(unsigned) const;
 
     VisiblePosition positionForPoint(const RenderText&, const LayoutPoint&) const;