Changeset 269747 in webkit

Timestamp:

Nov 12, 2020 1:24:14 PM (3 years ago)

Author:

Antti Koivisto

Message:

[LFC][Integration] VisiblePosition::absoluteSelectionBoundsForLine should use iterator
​https://bugs.webkit.org/show_bug.cgi?id=218866

Reviewed by Zalan Bujtas.

• editing/VisiblePosition.cpp:

(WebCore::VisiblePosition::absoluteSelectionBoundsForLine const):

Also fix confused logical->physical mapping. The client wants physical position.

• editing/VisiblePosition.h:

(WebCore::VisiblePosition::inlineBoxAndOffset const): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/VisiblePosition.cpp (modified) (2 diffs)
• editing/VisiblePosition.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-11-12  Antti Koivisto  <antti@apple.com>
+
+        [LFC][Integration] VisiblePosition::absoluteSelectionBoundsForLine should use iterator
+        https://bugs.webkit.org/show_bug.cgi?id=218866
+
+        Reviewed by Zalan Bujtas.
+
+        * editing/VisiblePosition.cpp:
+        (WebCore::VisiblePosition::absoluteSelectionBoundsForLine const):
+
+        Also fix confused logical->physical mapping. The client wants physical position.
+
+        * editing/VisiblePosition.h:
+        (WebCore::VisiblePosition::inlineBoxAndOffset const): Deleted.
+
 2020-11-12  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/editing/VisiblePosition.cpp

@@ -41 +41 @@
 #include "Logging.h"
 #include "Range.h"
-#include "RenderBlock.h"
-#include "RootInlineBox.h"
+#include "RenderBlockFlow.h"
 #include "SimpleRange.h"
 #include "Text.h"
@@ -657 +656 @@
 FloatRect VisiblePosition::absoluteSelectionBoundsForLine() const
 {
-    auto inlineBox = inlineBoxAndOffset().box;
-    if (!inlineBox)
+    auto run = inlineRunAndOffset().run;
+    if (!run)
         return { };
 
-    auto& root = inlineBox->root();
-    auto localRect = FloatRect { root.x(), root.selectionTop(), root.width(), root.selectionHeight() };
-    return root.renderer().localToAbsoluteQuad(localRect).boundingBox();
+    auto line = run.line();
+    auto localRect = FloatRect { FloatPoint { line->logicalLeft(), line->selectionTop() }, FloatPoint { line->logicalRight(), line->selectionBottom() } };
+    if (!line->isHorizontal())
+        localRect = localRect.transposedRect();
+
+    return line->containingBlock().localToAbsoluteQuad(localRect).boundingBox();
 }
 

trunk/Source/WebCore/editing/VisiblePosition.h

@@ -70 +70 @@
     InlineRunAndOffset inlineRunAndOffset() const;
     InlineRunAndOffset inlineRunAndOffset(TextDirection primaryDirection) const;
-
-    InlineBoxAndOffset inlineBoxAndOffset() const;
-    InlineBoxAndOffset inlineBoxAndOffset(TextDirection primaryDirection) const;
 
     struct LocalCaretRect {
@@ -182 +179 @@
 }
 
-inline auto VisiblePosition::inlineBoxAndOffset() const -> InlineBoxAndOffset
-{
-    return m_deepPosition.inlineBoxAndOffset(m_affinity);
-}
-
-inline auto VisiblePosition::inlineBoxAndOffset(TextDirection primaryDirection) const -> InlineBoxAndOffset
-{
-    return m_deepPosition.inlineBoxAndOffset(m_affinity, primaryDirection);
-}
-
 } // namespace WebCore