Changeset 239127 in webkit

Timestamp:

Dec 12, 2018 1:20:10 PM (5 years ago)

Author:

rniwa@webkit.org

Message:

Make HTMLConverter take two Positions in preparation to make it work with shadow DOM
​https://bugs.webkit.org/show_bug.cgi?id=192613

Reviewed by Darin Adler.

This patch makes HTMLConverter store two Position's instead of a Range so that HTMLConverter can work with
a selection which spans across shadow boundaries in the future.

No new tests since there should be no observable behavioral change.

• editing/cocoa/EditorCocoa.mm:

(WebCore::Editor::writeSelectionToPasteboard): Uses the newly introduced writeSelectionToPasteboard.
(WebCore::Editor::writeSelection): Ditto.

• editing/cocoa/HTMLConverter.h:
• editing/cocoa/HTMLConverter.mm:

(HTMLConverter::HTMLConverter): Now takes two Position's.
(HTMLConverter::convert): Updated to work with Position's.
(HTMLConverter::_processText): Ditto.
(HTMLConverter::_traverseNode): Ditto.
(HTMLConverter::_traverseFooterNode): Ditto.
(HTMLConverterCaches::cacheAncestorsOfStartToBeConverted): Ditto.
(WebCore::attributedStringFromRange): Ditto.
(WebCore::attributedStringFromSelection): Added. For now, we first create a Range via toNormalizedRange
in order to preserve the exact behavior.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/cocoa/EditorCocoa.mm (modified) (2 diffs)
• editing/cocoa/HTMLConverter.h (modified) (1 diff)
• editing/cocoa/HTMLConverter.mm (modified) (12 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-12-11  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Make HTMLConverter take two Positions in preparation to make it work with shadow DOM
+        https://bugs.webkit.org/show_bug.cgi?id=192613
+
+        Reviewed by Darin Adler.
+
+        This patch makes HTMLConverter store two Position's instead of a Range so that HTMLConverter can work with
+        a selection which spans across shadow boundaries in the future.
+
+        No new tests since there should be no observable behavioral change.
+
+        * editing/cocoa/EditorCocoa.mm:
+        (WebCore::Editor::writeSelectionToPasteboard): Uses the newly introduced writeSelectionToPasteboard.
+        (WebCore::Editor::writeSelection): Ditto.
+        * editing/cocoa/HTMLConverter.h:
+        * editing/cocoa/HTMLConverter.mm:
+        (HTMLConverter::HTMLConverter): Now takes two Position's.
+        (HTMLConverter::convert): Updated to work with Position's.
+        (HTMLConverter::_processText): Ditto.
+        (HTMLConverter::_traverseNode): Ditto.
+        (HTMLConverter::_traverseFooterNode): Ditto.
+        (HTMLConverterCaches::cacheAncestorsOfStartToBeConverted): Ditto.
+        (WebCore::attributedStringFromRange): Ditto.
+        (WebCore::attributedStringFromSelection): Added. For now, we first create a Range via toNormalizedRange
+        in order to preserve the exact behavior.
+
 2018-12-12  Michael Catanzaro  <mcatanzaro@igalia.com>
 

trunk/Source/WebCore/editing/cocoa/EditorCocoa.mm

@@ -104 +104 @@
 void Editor::writeSelectionToPasteboard(Pasteboard& pasteboard)
 {
-    NSAttributedString *attributedString = attributedStringFromRange(*selectedRange());
+    NSAttributedString *attributedString = attributedStringFromSelection(m_frame.selection().selection());
 
     PasteboardWebContent content;
@@ -122 +122 @@
 void Editor::writeSelection(PasteboardWriterData& pasteboardWriterData)
 {
-    NSAttributedString *attributedString = attributedStringFromRange(*selectedRange());
+    NSAttributedString *attributedString = attributedStringFromSelection(m_frame.selection().selection());
 
     PasteboardWriterData::WebContent webContent;

trunk/Source/WebCore/editing/cocoa/HTMLConverter.h

@@ -31 +31 @@
     
 class Range;
+class VisibleSelection;
 
 enum class IncludeImagesInAttributedString { Yes, No };
-    
+
+NSAttributedString *attributedStringFromSelection(const VisibleSelection&);
 WEBCORE_EXPORT NSAttributedString *attributedStringFromRange(Range&);
 #if !PLATFORM(IOS_FAMILY)

trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm

@@ -37 +37 @@
 #import "Document.h"
 #import "DocumentLoader.h"
+#import "Editing.h"
 #import "Element.h"
 #import "ElementTraversal.h"
@@ -62 +63 @@
 #import "StyledElement.h"
 #import "TextIterator.h"
+#import "VisibleSelection.h"
 #import <objc/runtime.h>
 #import <pal/spi/cocoa/NSAttributedStringSPI.h>
@@ -337 +339 @@
     RefPtr<CSSValue> inlineStylePropertyForElement(Element&, CSSPropertyID);
 
-    Node* cacheAncestorsOfStartToBeConverted(const Range&);
+    Node* cacheAncestorsOfStartToBeConverted(const Position&, const Position&);
     bool isAncestorsOfStartToBeConverted(Node& node) const { return m_ancestorsUnderCommonAncestor.contains(&node); }
 
@@ -360 +362 @@
 class HTMLConverter {
 public:
-    HTMLConverter(Range&);
+    HTMLConverter(const Position&, const Position&);
     ~HTMLConverter();
     
@@ -366 +368 @@
     
 private:
-    Ref<Range> m_range;
+    Position m_start;
+    Position m_end;
     DocumentLoader* m_dataSource;
     
@@ -435 +438 @@
 };
 
-HTMLConverter::HTMLConverter(Range& range)
-    : m_range(range)
+HTMLConverter::HTMLConverter(const Position& start, const Position& end)
+    : m_start(start)
+    , m_end(end)
     , m_dataSource(nullptr)
 {
@@ -482 +486 @@
 NSAttributedString *HTMLConverter::convert()
 {
-    Node* commonAncestorContainer = _caches->cacheAncestorsOfStartToBeConverted(m_range);
+    if (comparePositions(m_start, m_end) > 0)
+        return nil;
+
+    Node* commonAncestorContainer = _caches->cacheAncestorsOfStartToBeConverted(m_start, m_end);
     ASSERT(commonAncestorContainer);
 
@@ -2198 +2205 @@
     unsigned startOffset = 0;
     unsigned endOffset = originalString.length();
-    if (&characterData == &m_range->startContainer()) {
-        startOffset = m_range->startOffset();
+    if (&characterData == m_start.containerNode()) {
+        startOffset = m_start.offsetInContainerNode();
         _domRangeStartIndex = [_attrStr length];
         _flags.reachedStart = YES;
     }
-    if (&characterData == &m_range->endContainer()) {
-        endOffset = m_range->endOffset();
+    if (&characterData == m_end.containerNode()) {
+        endOffset = m_end.offsetInContainerNode();
         _flags.reachedEnd = YES;
     }
@@ -2278 +2285 @@
     bool isStart = false;
     bool isEnd = false;
-    if (&node == &m_range->startContainer()) {
-        startOffset = m_range->startOffset();
+    if (&node == m_start.containerNode()) {
+        startOffset = m_start.offsetInContainerNode();
         isStart = true;
         _flags.reachedStart = YES;
     }
-    if (&node == &m_range->endContainer()) {
-        endOffset = m_range->endOffset();
+    if (&node == m_end.containerNode()) {
+        endOffset = m_end.offsetInContainerNode();
         isEnd = true;
     }
@@ -2339 +2346 @@
     bool isStart = false;
     bool isEnd = false;
-    if (&element == &m_range->startContainer()) {
-        startOffset = m_range->startOffset();
+    if (&element == m_start.containerNode()) {
+        startOffset = m_start.offsetInContainerNode();
         isStart = true;
         _flags.reachedStart = YES;
     }
-    if (&element == &m_range->endContainer()) {
-        endOffset = m_range->endOffset();
+    if (&element == m_end.containerNode()) {
+        endOffset = m_end.offsetInContainerNode();
         isEnd = true;
     }
@@ -2380 +2387 @@
 }
 
-Node* HTMLConverterCaches::cacheAncestorsOfStartToBeConverted(const Range& range)
-{
-    Node* commonAncestor = range.commonAncestorContainer();
-    Node* ancestor = &range.startContainer();
+Node* HTMLConverterCaches::cacheAncestorsOfStartToBeConverted(const Position& start, const Position& end)
+{
+    Node* commonAncestor = Range::commonAncestorContainer(start.containerNode(), end.containerNode());
+    Node* ancestor = start.containerNode();
 
     while (ancestor) {
@@ -2454 +2461 @@
 NSAttributedString *attributedStringFromRange(Range& range)
 {
-    HTMLConverter converter(range);
-    return converter.convert();
+    return HTMLConverter { range.startPosition(), range.endPosition() }.convert();
+}
+
+NSAttributedString *attributedStringFromSelection(const VisibleSelection& selection)
+{
+    auto range = selection.toNormalizedRange();
+    ASSERT(range);
+    return HTMLConverter { range->startPosition(), range->endPosition() }.convert();
 }