<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[209682] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/209682">209682</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2016-12-11 10:10:03 -0800 (Sun, 11 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacfasttextattributedsubstringfromrangeexpectedtxt">trunk/LayoutTests/platform/mac/fast/text/attributed-substring-from-range-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingcocoaHTMLConvertermm">trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209681 => 209682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-11 12:48:46 UTC (rev 209681)
+++ trunk/LayoutTests/ChangeLog 2016-12-11 18:10:03 UTC (rev 209682)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+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.
+
</ins><span class="cx"> 2016-12-10 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Support the deprecated dictionary constructor for DOMPointReadOnly and DOMPoint
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfasttextattributedsubstringfromrangeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/text/attributed-substring-from-range-expected.txt (209681 => 209682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/text/attributed-substring-from-range-expected.txt 2016-12-11 12:48:46 UTC (rev 209681)
+++ trunk/LayoutTests/platform/mac/fast/text/attributed-substring-from-range-expected.txt 2016-12-11 18:10:03 UTC (rev 209682)
</span><span class="lines">@@ -13,9 +13,9 @@
</span><span class="cx"> Testing proper space runs (1._2.__3.___4_5)
</span><span class="cx"> total length: 15
</span><span class="cx"> one space: " "
</span><del>-two spaces: " "
-three spaces: " "
-four spaces: " "
</del><ins>+two spaces: " "
+three spaces: " "
+four spaces: " "
</ins><span class="cx">
</span><span class="cx"> Testing space-only runs (1..2...3....4.5)
</span><span class="cx"> total length: 9
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209681 => 209682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-11 12:48:46 UTC (rev 209681)
+++ trunk/Source/WebCore/ChangeLog 2016-12-11 18:10:03 UTC (rev 209682)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+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.
+
</ins><span class="cx"> 2016-12-11 Konstantin Tokarev <annulen@yandex.ru>
</span><span class="cx">
</span><span class="cx"> Unreviewed, add KHR include dir to fix ANGLE build after r209665
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingcocoaHTMLConvertermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm (209681 => 209682)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2016-12-11 12:48:46 UTC (rev 209681)
+++ trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2016-12-11 18:10:03 UTC (rev 209682)
</span><span class="lines">@@ -2236,6 +2236,7 @@
</span><span class="cx"> unsigned count = originalString.length();
</span><span class="cx"> bool wasLeading = true;
</span><span class="cx"> StringBuilder builder;
</span><ins>+ LChar noBreakSpaceRepresentation = 0;
</ins><span class="cx"> for (unsigned i = 0; i < count; i++) {
</span><span class="cx"> UChar c = originalString.at(i);
</span><span class="cx"> bool isWhitespace = c == ' ' || c == '\n' || c == '\r' || c == '\t' || c == 0xc || c == 0x200b;
</span><span class="lines">@@ -2244,7 +2245,13 @@
</span><span class="cx"> else {
</span><span class="cx"> if (wasSpace)
</span><span class="cx"> builder.append(' ');
</span><del>- builder.append(c);
</del><ins>+ if (c != noBreakSpace)
+ builder.append(c);
+ else {
+ if (!noBreakSpaceRepresentation)
+ noBreakSpaceRepresentation = _caches->propertyValueForNode(characterData, CSSPropertyWebkitNbspMode) == "space" ? ' ' : noBreakSpace;
+ builder.append(noBreakSpaceRepresentation);
+ }
</ins><span class="cx"> wasSpace = false;
</span><span class="cx"> wasLeading = false;
</span><span class="cx"> }
</span><span class="lines">@@ -2519,7 +2526,13 @@
</span><span class="cx"> else
</span><span class="cx"> [attrs.get() removeObjectForKey:NSBackgroundColorAttributeName];
</span><span class="cx">
</span><del>- [string replaceCharactersInRange:NSMakeRange(stringLength, 0) withString:it.text().createNSStringWithoutCopying().get()];
</del><ins>+ 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()];
</ins><span class="cx"> [string setAttributes:attrs.get() range:NSMakeRange(stringLength, currentTextLength)];
</span><span class="cx"> stringLength += currentTextLength;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>