Attachment 357208 Details for Bug 192640 – Fixes the bug

[patch] Fixes the bug

bug-192640-20181212222143.patch (text/plain), 38.77 KB, created by Ryosuke Niwa on 2018-12-12 22:21:44 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Ryosuke Niwa

Created: 2018-12-12 22:21:44 PST

Size: 38.77 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 239150)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,41 @@
>+2018-12-12  Ryosuke Niwa  <rniwa@webkit.org>
>+
>+        Make HTMLConverter work across shadow boundaries
>+        https://bugs.webkit.org/show_bug.cgi?id=192640
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Made HTMLConverter work with shadow boundaries by replacing the various tree traversal functions.
>+
>+        Tests: editing/mac/attributed-string/attributed-string-across-shadow-boundaries-1.html
>+               editing/mac/attributed-string/attributed-string-across-shadow-boundaries-2.html
>+               editing/mac/attributed-string/attributed-string-across-shadow-boundaries-3.html
>+               editing/mac/attributed-string/attributed-string-across-shadow-boundaries-4.html
>+               editing/mac/attributed-string/attributed-string-across-shadow-boundaries-5.html
>+               editing/mac/attributed-string/attributed-string-across-shadow-boundaries-with-style-1.html
>+               editing/mac/attributed-string/attributed-string-across-shadow-boundaries-with-style-2.html
>+               editing/mac/attributed-string/attributed-string-across-shadow-boundaries-with-style-3.html
>+
>+        * dom/Position.cpp:
>+        (WebCore::commonShadowIncludingAncestor): Moved from markup.cpp to be shared between HTMLConverter
>+        and serializePreservingVisualAppearanceInternal.
>+        * dom/Position.h:
>+        * editing/cocoa/HTMLConverter.mm:
>+        (HTMLConverter::convert):
>+        (HTMLConverterCaches::propertyValueForNode):
>+        (HTMLConverterCaches::floatPropertyValueForNode):
>+        (HTMLConverter::_blockLevelElementForNode):
>+        (HTMLConverterCaches::colorPropertyValueForNode):
>+        (HTMLConverter::aggregatedAttributesForAncestors):
>+        (HTMLConverter::aggregatedAttributesForElementAndItsAncestors):
>+        (HTMLConverter::_processElement):
>+        (HTMLConverter::_traverseNode):
>+        (HTMLConverter::_traverseFooterNode):
>+        (HTMLConverterCaches::cacheAncestorsOfStartToBeConverted):
>+        (WebCore::attributedStringFromSelection):
>+        * editing/markup.cpp:
>+        (WebCore::commonShadowIncludingAncestor): Moved to Position.cpp.
>+
> 2018-12-12  Simon Fraser  <simon.fraser@apple.com>
> 
>         REGRESSION (r238090): CAPCHA UI jumps to the wrong location
>Index: Source/WebCore/dom/Position.cpp
>===================================================================
>--- Source/WebCore/dom/Position.cpp	(revision 239149)
>+++ Source/WebCore/dom/Position.cpp	(working copy)
>@@ -1601,6 +1601,18 @@ TextStream& operator<<(TextStream& strea
>     return stream;
> }
> 
>+RefPtr<Node> commonShadowIncludingAncestor(const Position& a, const Position& b)
>+{
>+    TreeScope* commonScope = commonTreeScope(a.containerNode(), b.containerNode());
>+    if (!commonScope)
>+        return nullptr;
>+    auto* nodeA = commonScope->ancestorNodeInThisScope(a.containerNode());
>+    ASSERT(nodeA);
>+    auto* nodeB = commonScope->ancestorNodeInThisScope(b.containerNode());
>+    ASSERT(nodeB);
>+    return Range::commonAncestorContainer(nodeA, nodeB);
>+}
>+
> } // namespace WebCore
> 
> #if ENABLE(TREE_DEBUGGING)
>Index: Source/WebCore/dom/Position.h
>===================================================================
>--- Source/WebCore/dom/Position.h	(revision 239149)
>+++ Source/WebCore/dom/Position.h	(working copy)
>@@ -333,6 +333,8 @@ inline bool offsetIsBeforeLastNodeOffset
>     return offset < currentOffset;
> }
> 
>+RefPtr<Node> commonShadowIncludingAncestor(const Position&, const Position&);
>+
> WTF::TextStream& operator<<(WTF::TextStream&, const Position&);
> 
> } // namespace WebCore
>Index: Source/WebCore/editing/markup.cpp
>===================================================================
>--- Source/WebCore/editing/markup.cpp	(revision 239149)
>+++ Source/WebCore/editing/markup.cpp	(working copy)
>@@ -818,18 +818,6 @@ static Node* highestAncestorToWrapMarkup
>     return specialCommonAncestor;
> }
> 
>-static RefPtr<Node> commonShadowIncludingAncestor(const Position& a, const Position& b)
>-{
>-    TreeScope* commonScope = commonTreeScope(a.containerNode(), b.containerNode());
>-    if (!commonScope)
>-        return nullptr;
>-    auto* nodeA = commonScope->ancestorNodeInThisScope(a.containerNode());
>-    ASSERT(nodeA);
>-    auto* nodeB = commonScope->ancestorNodeInThisScope(b.containerNode());
>-    ASSERT(nodeB);
>-    return Range::commonAncestorContainer(nodeA, nodeB);
>-}
>-
> static String serializePreservingVisualAppearanceInternal(const Position& start, const Position& end, Vector<Node*>* nodes, ResolveURLs urlsToResolve, SerializeComposedTree serializeComposedTree,
>     AnnotateForInterchange annotate, ConvertBlocksToInlines convertBlocksToInlines, MSOListMode msoListMode)
> {
>Index: Source/WebCore/editing/cocoa/HTMLConverter.mm
>===================================================================
>--- Source/WebCore/editing/cocoa/HTMLConverter.mm	(revision 239149)
>+++ Source/WebCore/editing/cocoa/HTMLConverter.mm	(working copy)
>@@ -34,6 +34,7 @@
> #import "CharacterData.h"
> #import "ColorCocoa.h"
> #import "ColorMac.h"
>+#import "ComposedTreeIterator.h"
> #import "Document.h"
> #import "DocumentLoader.h"
> #import "Editing.h"
>@@ -494,12 +495,12 @@ NSAttributedString *HTMLConverter::conve
>     m_dataSource = commonAncestorContainer->document().frame()->loader().documentLoader();
>     if (!m_dataSource)
>         return nil;
>-    
>+
>     _domRangeStartIndex = 0;
>     _traverseNode(*commonAncestorContainer, 0, false /* embedded */);
>     if (_domRangeStartIndex > 0 && _domRangeStartIndex <= [_attrStr length])
>         [_attrStr deleteCharactersInRange:NSMakeRange(0, _domRangeStartIndex)];
>-    
>+
>     return [[_attrStr retain] autorelease];
> }
> 
>@@ -665,7 +666,7 @@ static bool stringFromCSSValue(CSSValue&
> String HTMLConverterCaches::propertyValueForNode(Node& node, CSSPropertyID propertyId)
> {
>     if (!is<Element>(node)) {
>-        if (Node* parent = node.parentNode())
>+        if (Node* parent = node.parentInComposedTree())
>             return propertyValueForNode(*parent, propertyId);
>         return String();
>     }
>@@ -773,7 +774,7 @@ String HTMLConverterCaches::propertyValu
>     }
> 
>     if (inherit) {
>-        if (Node* parent = node.parentNode())
>+        if (Node* parent = node.parentInComposedTree())
>             return propertyValueForNode(*parent, propertyId);
>     }
>     
>@@ -810,7 +811,7 @@ static inline bool floatValueFromPrimiti
> bool HTMLConverterCaches::floatPropertyValueForNode(Node& node, CSSPropertyID propertyId, float& result)
> {
>     if (!is<Element>(node)) {
>-        if (ContainerNode* parent = node.parentNode())
>+        if (ContainerNode* parent = node.parentInComposedTree())
>             return floatPropertyValueForNode(*parent, propertyId, result);
>         return false;
>     }
>@@ -843,7 +844,7 @@ bool HTMLConverterCaches::floatPropertyV
>     }
> 
>     if (inherit) {
>-        if (ContainerNode* parent = node.parentNode())
>+        if (ContainerNode* parent = node.parentInComposedTree())
>             return floatPropertyValueForNode(*parent, propertyId, result);
>     }
> 
>@@ -950,7 +951,7 @@ Element* HTMLConverter::_blockLevelEleme
> {
>     Element* element = node->parentElement();
>     if (element && !_caches->isBlockElement(*element))
>-        element = _blockLevelElementForNode(element->parentNode());
>+        element = _blockLevelElementForNode(element->parentInComposedTree());
>     return element;
> }
> 
>@@ -969,7 +970,7 @@ static Color normalizedColor(Color color
> Color HTMLConverterCaches::colorPropertyValueForNode(Node& node, CSSPropertyID propertyId)
> {
>     if (!is<Element>(node)) {
>-        if (Node* parent = node.parentNode())
>+        if (Node* parent = node.parentInComposedTree())
>             return colorPropertyValueForNode(*parent, propertyId);
>         return Color();
>     }
>@@ -1005,7 +1006,7 @@ Color HTMLConverterCaches::colorProperty
>     }
> 
>     if (inherit) {
>-        if (Node* parent = node.parentNode())
>+        if (Node* parent = node.parentInComposedTree())
>             return colorPropertyValueForNode(*parent, propertyId);
>     }
> 
>@@ -1261,9 +1262,9 @@ NSDictionary* HTMLConverter::attributesF
> 
> NSDictionary* HTMLConverter::aggregatedAttributesForAncestors(CharacterData& node)
> {
>-    Node* ancestor = node.parentNode();
>+    Node* ancestor = node.parentInComposedTree();
>     while (ancestor && !is<Element>(*ancestor))
>-        ancestor = ancestor->parentNode();
>+        ancestor = ancestor->parentInComposedTree();
>     if (!ancestor)
>         return nullptr;
>     return aggregatedAttributesForElementAndItsAncestors(downcast<Element>(*ancestor));
>@@ -1278,9 +1279,9 @@ NSDictionary* HTMLConverter::aggregatedA
>     NSDictionary* attributesForCurrentElement = attributesForElement(element);
>     ASSERT(attributesForCurrentElement);
> 
>-    Node* ancestor = element.parentNode();
>+    Node* ancestor = element.parentInComposedTree();
>     while (ancestor && !is<Element>(*ancestor))
>-        ancestor = ancestor->parentNode();
>+        ancestor = ancestor->parentInComposedTree();
> 
>     if (!ancestor) {
>         cachedAttributes = attributesForCurrentElement;
>@@ -1852,7 +1853,7 @@ BOOL HTMLConverter::_processElement(Elem
>         Element* tableElement = &element;
>         if (displayValue == "table-row-group") {
>             // If we are starting in medias res, the first thing we see may be the tbody, so go up to the table
>-            tableElement = _blockLevelElementForNode(element.parentNode());
>+            tableElement = _blockLevelElementForNode(element.parentInComposedTree());
>             if (!tableElement || _caches->propertyValueForNode(*tableElement, CSSPropertyDisplay) != "table")
>                 tableElement = &element;
>         }
>@@ -1923,7 +1924,7 @@ BOOL HTMLConverter::_processElement(Elem
>             retval = NO;
>         }
>     } else if (element.hasTagName(brTag)) {
>-        Element* blockElement = _blockLevelElementForNode(element.parentNode());
>+        Element* blockElement = _blockLevelElementForNode(element.parentInComposedTree());
>         NSString *breakClass = element.getAttribute(classAttr);
>         NSString *blockTag = blockElement ? (NSString *)blockElement->tagName() : nil;
>         BOOL isExtraBreak = [@"Apple-interchange-newline" isEqualToString:breakClass];
>@@ -2285,17 +2286,18 @@ void HTMLConverter::_traverseNode(Node& 
>     bool isStart = false;
>     bool isEnd = false;
>     if (&node == m_start.containerNode()) {
>-        startOffset = m_start.offsetInContainerNode();
>+        startOffset = m_start.computeOffsetInContainerNode();
>         isStart = true;
>         _flags.reachedStart = YES;
>     }
>     if (&node == m_end.containerNode()) {
>-        endOffset = m_end.offsetInContainerNode();
>+        endOffset = m_end.computeOffsetInContainerNode();
>         isEnd = true;
>     }
>     
>     if (node.isDocumentNode() || node.isDocumentFragment()) {
>         Node* child = node.firstChild();
>+        ASSERT(child == firstChildInComposedTreeIgnoringUserAgentShadow(node));
>         for (NSUInteger i = 0; child; i++) {
>             if (isStart && i == startOffset)
>                 _domRangeStartIndex = [_attrStr length];
>@@ -2305,6 +2307,7 @@ void HTMLConverter::_traverseNode(Node& 
>                 _flags.reachedEnd = YES;
>             if (_flags.reachedEnd)
>                 break;
>+            ASSERT(child->nextSibling() == nextSiblingInComposedTreeIgnoringUserAgentShadow(*child));
>             child = child->nextSibling();
>         }
>     } else if (is<Element>(node)) {
>@@ -2312,17 +2315,21 @@ void HTMLConverter::_traverseNode(Node& 
>         if (_enterElement(element, embedded)) {
>             NSUInteger startIndex = [_attrStr length];
>             if (_processElement(element, depth)) {
>-                Node* child = node.firstChild();
>-                for (NSUInteger i = 0; child; i++) {
>-                    if (isStart && i == startOffset)
>-                        _domRangeStartIndex = [_attrStr length];
>-                    if ((!isStart || startOffset <= i) && (!isEnd || endOffset > i))
>-                        _traverseNode(*child, depth + 1, embedded);
>-                    if (isEnd && i + 1 >= endOffset)
>-                        _flags.reachedEnd = YES;
>-                    if (_flags.reachedEnd)
>-                        break;
>-                    child = child->nextSibling();
>+                if (auto* shadowRoot = shadowRootIgnoringUserAgentShadow(element)) // Traverse through shadow root to detect start and end.
>+                    _traverseNode(*shadowRoot, depth + 1, embedded);
>+                else {
>+                    Node* child = firstChildInComposedTreeIgnoringUserAgentShadow(node);
>+                    for (NSUInteger i = 0; child; i++) {
>+                        if (isStart && i == startOffset)
>+                            _domRangeStartIndex = [_attrStr length];
>+                        if ((!isStart || startOffset <= i) && (!isEnd || endOffset > i))
>+                            _traverseNode(*child, depth + 1, embedded);
>+                        if (isEnd && i + 1 >= endOffset)
>+                            _flags.reachedEnd = YES;
>+                        if (_flags.reachedEnd)
>+                            break;
>+                        child = nextSiblingInComposedTreeIgnoringUserAgentShadow(*child);
>+                    }
>                 }
>                 _exitElement(element, depth, startIndex);
>             }
>@@ -2346,19 +2353,19 @@ void HTMLConverter::_traverseFooterNode(
>     bool isStart = false;
>     bool isEnd = false;
>     if (&element == m_start.containerNode()) {
>-        startOffset = m_start.offsetInContainerNode();
>+        startOffset = m_start.computeOffsetInContainerNode();
>         isStart = true;
>         _flags.reachedStart = YES;
>     }
>     if (&element == m_end.containerNode()) {
>-        endOffset = m_end.offsetInContainerNode();
>+        endOffset = m_end.computeOffsetInContainerNode();
>         isEnd = true;
>     }
>     
>     if (_enterElement(element, YES)) {
>         NSUInteger startIndex = [_attrStr length];
>         if (_processElement(element, depth)) {
>-            Node* child = element.firstChild();
>+            Node* child = firstChildInComposedTreeIgnoringUserAgentShadow(element);
>             for (NSUInteger i = 0; child; i++) {
>                 if (isStart && i == startOffset)
>                     _domRangeStartIndex = [_attrStr length];
>@@ -2368,7 +2375,7 @@ void HTMLConverter::_traverseFooterNode(
>                     _flags.reachedEnd = YES;
>                 if (_flags.reachedEnd)
>                     break;
>-                child = child->nextSibling();
>+                child = nextSiblingInComposedTreeIgnoringUserAgentShadow(*child);
>             }
>             _exitElement(element, depth, startIndex);
>         }
>@@ -2388,17 +2395,17 @@ void HTMLConverter::_adjustTrailingNewli
> 
> Node* HTMLConverterCaches::cacheAncestorsOfStartToBeConverted(const Position& start, const Position& end)
> {
>-    Node* commonAncestor = Range::commonAncestorContainer(start.containerNode(), end.containerNode());
>+    auto commonAncestor = commonShadowIncludingAncestor(start, end);
>     Node* ancestor = start.containerNode();
> 
>     while (ancestor) {
>         m_ancestorsUnderCommonAncestor.add(ancestor);
>         if (ancestor == commonAncestor)
>             break;
>-        ancestor = ancestor->parentNode();
>+        ancestor = ancestor->parentInComposedTree();
>     }
> 
>-    return commonAncestor;
>+    return commonAncestor.get();
> }
> 
> #if !PLATFORM(IOS_FAMILY)
>@@ -2465,9 +2472,7 @@ NSAttributedString *attributedStringFrom
> 
> NSAttributedString *attributedStringFromSelection(const VisibleSelection& selection)
> {
>-    auto range = selection.toNormalizedRange();
>-    ASSERT(range);
>-    return attributedStringBetweenStartAndEnd(range->startPosition(), range->endPosition());
>+    return attributedStringBetweenStartAndEnd(selection.start(), selection.end());
> }
> 
> NSAttributedString *attributedStringBetweenStartAndEnd(const Position& start, const Position& end)
>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 239149)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,37 @@
>+2018-12-12  Ryosuke Niwa  <rniwa@webkit.org>
>+
>+        Make HTMLConverter work across shadow boundaries
>+        https://bugs.webkit.org/show_bug.cgi?id=192640
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Added tests for generating attributed string out across shadow boundaries based on the tests
>+        of respective names in editing/pasteboard.
>+
>+        * editing/mac/attributed-string/attributed-string-across-shadow-boundaries-1-expected.txt: Added.
>+        * editing/mac/attributed-string/attributed-string-across-shadow-boundaries-1.html: Added.
>+        * editing/mac/attributed-string/attributed-string-across-shadow-boundaries-2-expected.txt: Added.
>+        * editing/mac/attributed-string/attributed-string-across-shadow-boundaries-2.html: Added.
>+        * editing/mac/attributed-string/attributed-string-across-shadow-boundaries-3-expected.txt: Added.
>+        * editing/mac/attributed-string/attributed-string-across-shadow-boundaries-3.html: Added.
>+        * editing/mac/attributed-string/attributed-string-across-shadow-boundaries-4-expected.txt: Added.
>+        * editing/mac/attributed-string/attributed-string-across-shadow-boundaries-4.html: Added.
>+        * editing/mac/attributed-string/attributed-string-across-shadow-boundaries-5-expected.txt: Added.
>+        * editing/mac/attributed-string/attributed-string-across-shadow-boundaries-5.html: Added.
>+        * editing/mac/attributed-string/attributed-string-across-shadow-boundaries-with-style-1-expected.txt: Added.
>+        * editing/mac/attributed-string/attributed-string-across-shadow-boundaries-with-style-1.html: Added.
>+        * editing/mac/attributed-string/attributed-string-across-shadow-boundaries-with-style-2-expected.txt: Added.
>+        * editing/mac/attributed-string/attributed-string-across-shadow-boundaries-with-style-2.html: Added.
>+        * editing/mac/attributed-string/resources/dump-attributed-string.js:
>+        (window.dumpAttributedString): Now takes start and end containers and offsets.
>+        (serializeSubtreeWithShadow): Added. This function serializes the content of shadow roots along with
>+        start and end markers.
>+        (serializeSubtreeWithShadow.serializeCharacterData): Added.
>+        (serializeSubtreeWithShadow.serializeNode): Added.
>+        (serializeSubtreeWithShadow.serializeChildNodes): Added.
>+        (serializeSubtreeWithShadow.serializeShadowRootAndChildNodes): Added.
>+        (dumpAttributedString): Deleted.
>+
> 2018-12-12  Ryosuke Niwa  <rniwa@webkit.org>
> 
>         Make TextInputController.legacyAttributedString take DOM nodes and offsets
>Index: LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-1-expected.txt
>===================================================================
>--- LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-1-expected.txt	(nonexistent)
>+++ LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-1-expected.txt	(working copy)
>@@ -0,0 +1,31 @@
>+Input:
>+hello <span id="host"><#shadow-start><slot></slot> WebKit<#shadow-end>world</span> rocks
>+
>+Output:
>+NSParagraphStyle:
>+Alignment 4
>+    LineSpacing: 0
>+    ParagraphSpacing: 0
>+    ParagraphSpacingBefore: 0
>+    HeadIndent: 0
>+    TailIndent: 0
>+    FirstLineHeadIndent: 0
>+    LineHeight: 0/0
>+    LineHeightMultiple: 0
>+    LineBreakMode: 0
>+    Tabs: ()
>+    DefaultTabInterval: 36
>+    Blocks: (
>+)
>+    Lists: (
>+)
>+    BaseWritingDirection: 0
>+    HyphenationFactor: 0
>+    TighteningForTruncation: YES
>+    HeaderLevel: 0
>+[hello world WebKit rocks]
>+    NSFont: Times-Roman 16.00 pt.
>+    NSKern: 0pt
>+    NSStrokeColor: #000000 (sRGB)
>+    NSStrokeWidth: 0
>+
>Index: LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-1.html
>===================================================================
>--- LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-1.html	(nonexistent)
>+++ LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-1.html	(working copy)
>@@ -0,0 +1,16 @@
>+<!DOCTYPE html>
>+<html>
>+<body>
>+<div id="container">hello <span id="host">world</span> rocks</div>
>+<script src="resources/dump-attributed-string.js"></script>
>+<script>
>+
>+const shadowRoot = host.attachShadow({mode: 'open'});
>+shadowRoot.innerHTML = '<slot></slot> WebKit';
>+
>+if (window.testRunner)
>+    dumpAttributedString(document.getElementById('container'));
>+
>+</script>
>+</body>
>+</html>
>Index: LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-2-expected.txt
>===================================================================
>--- LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-2-expected.txt	(nonexistent)
>+++ LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-2-expected.txt	(working copy)
>@@ -0,0 +1,31 @@
>+Input:
>+hello <span id="host"><#shadow-start><slot></slot> WebKit<#shadow-end><#start>world</span> rocks<#end>
>+
>+Output:
>+NSParagraphStyle:
>+Alignment 4
>+    LineSpacing: 0
>+    ParagraphSpacing: 0
>+    ParagraphSpacingBefore: 0
>+    HeadIndent: 0
>+    TailIndent: 0
>+    FirstLineHeadIndent: 0
>+    LineHeight: 0/0
>+    LineHeightMultiple: 0
>+    LineBreakMode: 0
>+    Tabs: ()
>+    DefaultTabInterval: 36
>+    Blocks: (
>+)
>+    Lists: (
>+)
>+    BaseWritingDirection: 0
>+    HyphenationFactor: 0
>+    TighteningForTruncation: YES
>+    HeaderLevel: 0
>+[world WebKit rocks]
>+    NSFont: Times-Roman 16.00 pt.
>+    NSKern: 0pt
>+    NSStrokeColor: #000000 (sRGB)
>+    NSStrokeWidth: 0
>+
>Index: LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-2.html
>===================================================================
>--- LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-2.html	(nonexistent)
>+++ LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-2.html	(working copy)
>@@ -0,0 +1,16 @@
>+<!DOCTYPE html>
>+<html>
>+<body>
>+<div id="container">hello <span id="host">world</span> rocks</div>
>+<script src="resources/dump-attributed-string.js"></script>
>+<script>
>+
>+const shadowRoot = host.attachShadow({mode: 'open'});
>+shadowRoot.innerHTML = '<slot></slot> WebKit';
>+
>+if (window.testRunner)
>+    dumpAttributedString(container, host.firstChild, 0, container.lastChild, container.lastChild.data.length);
>+
>+</script>
>+</body>
>+</html>
>Index: LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-3-expected.txt
>===================================================================
>--- LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-3-expected.txt	(nonexistent)
>+++ LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-3-expected.txt	(working copy)
>@@ -0,0 +1,31 @@
>+Input:
>+<span id="host"><#shadow-start>hello <slot></slot><#shadow-end><#start>world WebKit</span> rocks<#end>
>+
>+Output:
>+NSParagraphStyle:
>+Alignment 4
>+    LineSpacing: 0
>+    ParagraphSpacing: 0
>+    ParagraphSpacingBefore: 0
>+    HeadIndent: 0
>+    TailIndent: 0
>+    FirstLineHeadIndent: 0
>+    LineHeight: 0/0
>+    LineHeightMultiple: 0
>+    LineBreakMode: 0
>+    Tabs: ()
>+    DefaultTabInterval: 36
>+    Blocks: (
>+)
>+    Lists: (
>+)
>+    BaseWritingDirection: 0
>+    HyphenationFactor: 0
>+    TighteningForTruncation: YES
>+    HeaderLevel: 0
>+[world WebKit rocks]
>+    NSFont: Times-Roman 16.00 pt.
>+    NSKern: 0pt
>+    NSStrokeColor: #000000 (sRGB)
>+    NSStrokeWidth: 0
>+
>Index: LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-3.html
>===================================================================
>--- LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-3.html	(nonexistent)
>+++ LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-3.html	(working copy)
>@@ -0,0 +1,16 @@
>+<!DOCTYPE html>
>+<html>
>+<body>
>+<div id="container"><span id="host">world WebKit</span> rocks</div>
>+<script src="resources/dump-attributed-string.js"></script>
>+<script>
>+
>+const shadowRoot = host.attachShadow({mode: 'open'});
>+shadowRoot.innerHTML = 'hello <slot></slot>';
>+
>+if (window.testRunner)
>+    dumpAttributedString(container, host.firstChild, 0, container.lastChild, container.lastChild.data.length);
>+
>+</script>
>+</body>
>+</html>
>Index: LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-4-expected.txt
>===================================================================
>--- LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-4-expected.txt	(nonexistent)
>+++ LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-4-expected.txt	(working copy)
>@@ -0,0 +1,31 @@
>+Input:
>+<span id="host"><#shadow-start><#start>hello <slot></slot><#shadow-end>world Web<#end>Kit</span> rocks
>+
>+Output:
>+NSParagraphStyle:
>+Alignment 4
>+    LineSpacing: 0
>+    ParagraphSpacing: 0
>+    ParagraphSpacingBefore: 0
>+    HeadIndent: 0
>+    TailIndent: 0
>+    FirstLineHeadIndent: 0
>+    LineHeight: 0/0
>+    LineHeightMultiple: 0
>+    LineBreakMode: 0
>+    Tabs: ()
>+    DefaultTabInterval: 36
>+    Blocks: (
>+)
>+    Lists: (
>+)
>+    BaseWritingDirection: 0
>+    HyphenationFactor: 0
>+    TighteningForTruncation: YES
>+    HeaderLevel: 0
>+[hello world Web]
>+    NSFont: Times-Roman 16.00 pt.
>+    NSKern: 0pt
>+    NSStrokeColor: #000000 (sRGB)
>+    NSStrokeWidth: 0
>+
>Index: LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-4.html
>===================================================================
>--- LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-4.html	(nonexistent)
>+++ LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-4.html	(working copy)
>@@ -0,0 +1,16 @@
>+<!DOCTYPE html>
>+<html>
>+<body>
>+<div id="container"><span id="host">world WebKit</span> rocks</div>
>+<script src="resources/dump-attributed-string.js"></script>
>+<script>
>+
>+const shadowRoot = host.attachShadow({mode: 'open'});
>+shadowRoot.innerHTML = 'hello <slot></slot>';
>+
>+if (window.testRunner)
>+    dumpAttributedString(container, shadowRoot, 0, host.firstChild, host.firstChild.data.indexOf('Kit'));
>+
>+</script>
>+</body>
>+</html>
>Index: LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-5-expected.txt
>===================================================================
>--- LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-5-expected.txt	(nonexistent)
>+++ LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-5-expected.txt	(working copy)
>@@ -0,0 +1,31 @@
>+Input:
>+<#start><span id="host"><#shadow-start>hello <slot></slot><span style="display:none;"></span><#shadow-end>world</span> WebKit<#end>
>+
>+Output:
>+NSParagraphStyle:
>+Alignment 4
>+    LineSpacing: 0
>+    ParagraphSpacing: 0
>+    ParagraphSpacingBefore: 0
>+    HeadIndent: 0
>+    TailIndent: 0
>+    FirstLineHeadIndent: 0
>+    LineHeight: 0/0
>+    LineHeightMultiple: 0
>+    LineBreakMode: 0
>+    Tabs: ()
>+    DefaultTabInterval: 36
>+    Blocks: (
>+)
>+    Lists: (
>+)
>+    BaseWritingDirection: 0
>+    HyphenationFactor: 0
>+    TighteningForTruncation: YES
>+    HeaderLevel: 0
>+[hello world WebKit]
>+    NSFont: Times-Roman 16.00 pt.
>+    NSKern: 0pt
>+    NSStrokeColor: #000000 (sRGB)
>+    NSStrokeWidth: 0
>+
>Index: LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-5.html
>===================================================================
>--- LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-5.html	(nonexistent)
>+++ LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-5.html	(working copy)
>@@ -0,0 +1,16 @@
>+<!DOCTYPE html>
>+<html>
>+<body>
>+<div id="container"><span id="host">world</span> WebKit</div>
>+<script src="resources/dump-attributed-string.js"></script>
>+<script>
>+
>+const shadowRoot = host.attachShadow({mode: 'open'});
>+shadowRoot.innerHTML = 'hello <slot></slot><span style="display:none;"></span>';
>+
>+if (window.testRunner)
>+    dumpAttributedString(container, container, 0, container, container.childNodes.length);
>+
>+</script>
>+</body>
>+</html>
>Index: LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-with-style-1-expected.txt
>===================================================================
>--- LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-with-style-1-expected.txt	(nonexistent)
>+++ LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-with-style-1-expected.txt	(working copy)
>@@ -0,0 +1,58 @@
>+CONSOLE MESSAGE: line 12: ReferenceError: Can't find variable: source
>+Input:
>+<div id="container"><b>hello <span id="host"><#shadow-start><slot style="color: blue;"></slot> WebKit<#shadow-end>world</span></b> rocks</div>
>+<script src="resources/dump-attributed-string.js"></script>
>+<script>
>+
>+const shadowRoot = host.attachShadow({mode: 'open'});
>+shadowRoot.innerHTML = '<slot style="color: blue;"></slot> WebKit';
>+
>+if (window.testRunner)
>+    dumpAttributedString(container, source, 0, shadowRoot.lastChild, shadowRoot.lastChild.data.indexOf('Kit'));
>+
>+</script>
>+
>+Output:
>+NSParagraphStyle:
>+Alignment 4
>+    LineSpacing: 0
>+    ParagraphSpacing: 0
>+    ParagraphSpacingBefore: 0
>+    HeadIndent: 0
>+    TailIndent: 0
>+    FirstLineHeadIndent: 0
>+    LineHeight: 0/0
>+    LineHeightMultiple: 0
>+    LineBreakMode: 0
>+    Tabs: ()
>+    DefaultTabInterval: 36
>+    Blocks: (
>+)
>+    Lists: (
>+)
>+    BaseWritingDirection: 0
>+    HyphenationFactor: 0
>+    TighteningForTruncation: YES
>+    HeaderLevel: 0
>+[hello ]
>+    NSFont: Times-Bold 16.00 pt.
>+    NSKern: 0pt
>+    NSStrokeColor: #000000 (sRGB)
>+    NSStrokeWidth: 0
>+[world]
>+    NSColor: #0000ff (sRGB)
>+    NSFont: Times-Roman 16.00 pt.
>+    NSKern: 0pt
>+    NSStrokeColor: #0000ff (sRGB)
>+    NSStrokeWidth: 0
>+[ WebKit]
>+    NSFont: Times-Bold 16.00 pt.
>+    NSKern: 0pt
>+    NSStrokeColor: #000000 (sRGB)
>+    NSStrokeWidth: 0
>+[ rocks\n]
>+    NSFont: Times-Roman 16.00 pt.
>+    NSKern: 0pt
>+    NSStrokeColor: #000000 (sRGB)
>+    NSStrokeWidth: 0
>+
>Index: LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-with-style-1.html
>===================================================================
>--- LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-with-style-1.html	(nonexistent)
>+++ LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-with-style-1.html	(working copy)
>@@ -0,0 +1,16 @@
>+<!DOCTYPE html>
>+<html>
>+<body>
>+<div id="container"><b>hello <span id="host">world</span></b> rocks</div>
>+<script src="resources/dump-attributed-string.js"></script>
>+<script>
>+
>+const shadowRoot = host.attachShadow({mode: 'open'});
>+shadowRoot.innerHTML = '<slot style="color: blue;"></slot> WebKit';
>+
>+if (window.testRunner)
>+    dumpAttributedString(container, source, 0, shadowRoot.lastChild, shadowRoot.lastChild.data.indexOf('Kit'));
>+
>+</script>
>+</body>
>+</html>
>Index: LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-with-style-2-expected.txt
>===================================================================
>--- LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-with-style-2-expected.txt	(nonexistent)
>+++ LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-with-style-2-expected.txt	(working copy)
>@@ -0,0 +1,62 @@
>+CONSOLE MESSAGE: line 15: ReferenceError: Can't find variable: source
>+Input:
>+<div id="container"><div style="font-style: italic" id="host1"><#shadow-start><slot style="color: blue;"></slot> world<#shadow-end><b>hello</b></div><div id="host2"><#shadow-start><u>WebKit <slot></slot></u><#shadow-end>rocks</div></div>
>+<script src="resources/dump-attributed-string.js"></script>
>+<script>
>+
>+const shadowRoot1 = host1.attachShadow({mode: 'open'});
>+shadowRoot1.innerHTML = '<slot style="color: blue;"></slot> world';
>+
>+const shadowRoot2 = host2.attachShadow({mode: 'open'});
>+shadowRoot2.innerHTML = '<u>WebKit <slot></slot></u>';
>+
>+if (window.testRunner)
>+    dumpAttributedString(container, source, 0, shadowRoot2.querySelector('u'), 1);
>+
>+</script>
>+
>+Output:
>+NSParagraphStyle:
>+Alignment 4
>+    LineSpacing: 0
>+    ParagraphSpacing: 0
>+    ParagraphSpacingBefore: 0
>+    HeadIndent: 0
>+    TailIndent: 0
>+    FirstLineHeadIndent: 0
>+    LineHeight: 0/0
>+    LineHeightMultiple: 0
>+    LineBreakMode: 0
>+    Tabs: ()
>+    DefaultTabInterval: 36
>+    Blocks: (
>+)
>+    Lists: (
>+)
>+    BaseWritingDirection: 0
>+    HyphenationFactor: 0
>+    TighteningForTruncation: YES
>+    HeaderLevel: 0
>+[hello]
>+    NSColor: #0000ff (sRGB)
>+    NSFont: Times-Italic 16.00 pt.
>+    NSKern: 0pt
>+    NSStrokeColor: #0000ff (sRGB)
>+    NSStrokeWidth: 0
>+[ world\n]
>+    NSFont: Times-Italic 16.00 pt.
>+    NSKern: 0pt
>+    NSStrokeColor: #000000 (sRGB)
>+    NSStrokeWidth: 0
>+[WebKit rocks]
>+    NSFont: Times-Roman 16.00 pt.
>+    NSKern: 0pt
>+    NSStrokeColor: #000000 (sRGB)
>+    NSStrokeWidth: 0
>+    NSUnderline: true
>+[\n]
>+    NSFont: Times-Roman 16.00 pt.
>+    NSKern: 0pt
>+    NSStrokeColor: #000000 (sRGB)
>+    NSStrokeWidth: 0
>+
>Index: LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-with-style-2.html
>===================================================================
>--- LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-with-style-2.html	(nonexistent)
>+++ LayoutTests/editing/mac/attributed-string/attributed-string-across-shadow-boundaries-with-style-2.html	(working copy)
>@@ -0,0 +1,19 @@
>+<!DOCTYPE html>
>+<html>
>+<body>
>+<div id="container"><div style="font-style: italic" id="host1"><b>hello</b></div><div id="host2">rocks</div></div>
>+<script src="resources/dump-attributed-string.js"></script>
>+<script>
>+
>+const shadowRoot1 = host1.attachShadow({mode: 'open'});
>+shadowRoot1.innerHTML = '<slot style="color: blue;"></slot> world';
>+
>+const shadowRoot2 = host2.attachShadow({mode: 'open'});
>+shadowRoot2.innerHTML = '<u>WebKit <slot></slot></u>';
>+
>+if (window.testRunner)
>+    dumpAttributedString(container, source, 0, shadowRoot2.querySelector('u'), 1);
>+
>+</script>
>+</body>
>+</html>
>Index: LayoutTests/editing/mac/attributed-string/resources/dump-attributed-string.js
>===================================================================
>--- LayoutTests/editing/mac/attributed-string/resources/dump-attributed-string.js	(revision 239149)
>+++ LayoutTests/editing/mac/attributed-string/resources/dump-attributed-string.js	(working copy)
>@@ -4,22 +4,85 @@ var shouldAutoDump = true;
>     if (window.testRunner)
>         testRunner.dumpAsText();
> 
>-    function dumpAttributedString(container) {
>+    window.dumpAttributedString = function dumpAttributedString(root = document.body, startContainer, startOffset, endContainer, endOffset) {
>         shouldAutoDump = false;
> 
>-        var body = document.body;
>-        if (!container)
>-            container = body;
>-
>-        var range = document.createRange();
>-        range.selectNodeContents(container);
>-
>-        var pre = document.createElement('pre');
>-        var result = serializeAttributedString(textInputController.legacyAttributedString(container, 0, container, container.childNodes.length));
>-        pre.textContent = 'Input:\n' + container.innerHTML.trim() + '\n\nOutput:\n' + result;
>+        const markup = serializeSubtreeWithShadow(root, startContainer, startOffset, endContainer, endOffset).trim();
> 
>-        body.innerHTML = '';
>-        body.appendChild(pre);
>+        if (!startContainer)
>+            startContainer = root;
>+        if (startOffset == undefined)
>+            startOffset = 0;
>+        if (!endContainer)
>+            endContainer = root;
>+        if (endOffset == undefined)
>+            endOffset = endContainer.childNodes.length;
>+
>+        const pre = document.createElement('pre');
>+        const result = serializeAttributedString(textInputController.legacyAttributedString(startContainer, startOffset, endContainer, endOffset));
>+        pre.textContent = 'Input:\n' + markup + '\n\nOutput:\n' + result;
>+
>+        document.body.innerHTML = '';
>+        document.body.appendChild(pre);
>+    }
>+
>+    function serializeSubtreeWithShadow(parent, startContainer, startOffset, endContainer, endOffset) {
>+        function serializeCharacterData(node) {
>+            let data = node.data;
>+            let result = data;
>+            if (node == startContainer && node == endContainer) {
>+                result = data.substring(0, startOffset);
>+                result += '<#start>';
>+                result = data.substring(startOffset, endOffset);
>+                result += '<#end>';
>+                result += data.substring(endOffset);
>+            } else if (node == startContainer) {
>+                result = data.substring(0, startOffset);
>+                result += '<#start>';
>+                result += data.substring(startOffset);
>+            } else if (node == endContainer) {
>+                result = data.substring(0, endOffset);
>+                result += '<#end>';
>+                result += data.substring(endOffset);
>+            }
>+            return result;
>+        }
>+
>+        function serializeNode(node) {
>+            if (node.nodeType == Node.TEXT_NODE)
>+                return serializeCharacterData(node);
>+            if (node.nodeType == Node.COMMENT_NODE)
>+                return '';
>+            if (node.nodeType == Node.CDATA_SECTION_NODE)
>+                return '';
>+
>+            const elementTags = node.cloneNode(false).outerHTML;
>+            const endTagIndex = elementTags.lastIndexOf('</');
>+            const startTag = endTagIndex >= 0 ? elementTags.substring(0, endTagIndex) : elementTags;
>+            const endTag = endTagIndex >= 0 ? elementTags.substring(endTagIndex) : '';
>+            return startTag + serializeShadowRootAndChildNodes(node) + endTag;
>+        }
>+
>+        function serializeChildNodes(node) {
>+            let result = '';
>+            for (let i = 0; i < node.childNodes.length; i++) {
>+                if (node == startContainer && i == startOffset)
>+                    result += '<#start>';
>+                result += serializeNode(node.childNodes[i]);
>+                if (node == endContainer && i + 1 == endOffset)
>+                    result += '<#end>';
>+            }
>+            return result;
>+        }
>+
>+        function serializeShadowRootAndChildNodes(node) {
>+            const shadowRoot = node.nodeType == Node.ELEMENT_NODE ? internals.shadowRoot(node) : null;
>+            if (!shadowRoot)
>+                return serializeChildNodes(node);
>+            return `<#shadow-start>${serializeChildNodes(shadowRoot)}<#shadow-end>${serializeChildNodes(node)}`;
>+        }
>+
>+        return serializeShadowRootAndChildNodes(parent);
>     }
> 
>     window.serializeAttributedString = function (attributedString) {

Actions: View | Formatted Diff | Diff

Attachments on bug 192640: 357208 | 357213 | 357255 | 357263 | 357269