Changeset 209682 in webkit

Timestamp:

Dec 11, 2016 10:10:03 AM (7 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] NSAttributedString representation of text copied from -webkit-nbsp-mode:space element contains non-breaking space characters, but shouldn’t
​https://bugs.webkit.org/show_bug.cgi?id=165515
<rdar://problem/4108460>

Reviewed by Darin Adler.

Source/WebCore:

Test: platform/mac/fast/text/attributed-substring-from-range.html

• editing/cocoa/HTMLConverter.mm:

(HTMLConverter::_processText): Emit a space instead of a non-breaking space if the text node

is styled with -webkit-nbsp-mode:space.

(WebCore::editingAttributedStringFromRange): Replace all non-breaking spaces with spaces if

they come from a text node with -webkit-nbsp-mode:space.

LayoutTests:

• platform/mac/fast/text/attributed-substring-from-range-expected.txt: Updated.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/fast/text/attributed-substring-from-range-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/editing/cocoa/HTMLConverter.mm (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-12-11  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] NSAttributedString representation of text copied from -webkit-nbsp-mode:space element contains non-breaking space characters, but shouldn’t
+        https://bugs.webkit.org/show_bug.cgi?id=165515
+        <rdar://problem/4108460>
+
+        Reviewed by Darin Adler.
+
+        * platform/mac/fast/text/attributed-substring-from-range-expected.txt: Updated.
+
 2016-12-10  Simon Fraser  <simon.fraser@apple.com>
 

trunk/LayoutTests/platform/mac/fast/text/attributed-substring-from-range-expected.txt

@@ -14 +14 @@
 total length: 15
 one space: " "
-two spaces: "  "
-three spaces: "   "
-four spaces: "    "
+two spaces: "  "
+three spaces: "   "
+four spaces: "    "
 
 Testing space-only runs (1..2...3....4.5)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-12-11  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] NSAttributedString representation of text copied from -webkit-nbsp-mode:space element contains non-breaking space characters, but shouldn’t
+        https://bugs.webkit.org/show_bug.cgi?id=165515
+        <rdar://problem/4108460>
+
+        Reviewed by Darin Adler.
+
+        Test: platform/mac/fast/text/attributed-substring-from-range.html
+
+        * editing/cocoa/HTMLConverter.mm:
+        (HTMLConverter::_processText): Emit a space instead of a non-breaking space if the text node
+          is styled with -webkit-nbsp-mode:space.
+        (WebCore::editingAttributedStringFromRange): Replace all non-breaking spaces with spaces if
+          they come from a text node with -webkit-nbsp-mode:space.
+
 2016-12-11  Konstantin Tokarev  <annulen@yandex.ru>
 

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

@@ -2237 +2237 @@
         bool wasLeading = true;
         StringBuilder builder;
+        LChar noBreakSpaceRepresentation = 0;
         for (unsigned i = 0; i < count; i++) {
             UChar c = originalString.at(i);
@@ -2245 +2246 @@
                 if (wasSpace)
                     builder.append(' ');
-                builder.append(c);
+                if (c != noBreakSpace)
+                    builder.append(c);
+                else {
+                    if (!noBreakSpaceRepresentation)
+                        noBreakSpaceRepresentation = _caches->propertyValueForNode(characterData, CSSPropertyWebkitNbspMode) == "space" ? ' ' : noBreakSpace;
+                    builder.append(noBreakSpaceRepresentation);
+                }
                 wasSpace = false;
                 wasLeading = false;
@@ -2520 +2527 @@
             [attrs.get() removeObjectForKey:NSBackgroundColorAttributeName];
 
-        [string replaceCharactersInRange:NSMakeRange(stringLength, 0) withString:it.text().createNSStringWithoutCopying().get()];
+        RetainPtr<NSString> text;
+        if (style.nbspMode() == NBNORMAL)
+            text = it.text().createNSStringWithoutCopying();
+        else
+            text = it.text().toString().replace(noBreakSpace, ' ');
+
+        [string replaceCharactersInRange:NSMakeRange(stringLength, 0) withString:text.get()];
         [string setAttributes:attrs.get() range:NSMakeRange(stringLength, currentTextLength)];
         stringLength += currentTextLength;