<!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>[208565] 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/208565">208565</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2016-11-10 14:21:35 -0800 (Thu, 10 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Copied text would contain text inside CDATA sections and comments
https://bugs.webkit.org/show_bug.cgi?id=164578
Source/WebCore:
<rdar://problem/19834542>
Reviewed by Darin Adler.
The bug was caused by HTMLConverter::_traverseNode always including the content of a Text node.
Since Comment and CDataSection nodes are also Text nodes, we need to exclude them.
In the long term, we should check the visibility of the text as done in MarkupAccumulator.
Test: editing/mac/attributed-string/comment-cdata-section.html
* editing/cocoa/HTMLConverter.mm:
(HTMLConverter::_traverseNode):
LayoutTests:
Reviewed by Darin Adler.
Added a regression test for creating an attributed string from different kinds of Text nodes.
Comment and CDataSection should not be included in the attributed string.
* editing/mac/attributed-string/comment-cdata-section-expected.txt: Added.
* editing/mac/attributed-string/comment-cdata-section.html: Added.
* platform/mac-yosemite/editing/mac/attributed-string/comment-cdata-section-expected.txt: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</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>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditingmacattributedstringcommentcdatasectionexpectedtxt">trunk/LayoutTests/editing/mac/attributed-string/comment-cdata-section-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingmacattributedstringcommentcdatasectionhtml">trunk/LayoutTests/editing/mac/attributed-string/comment-cdata-section.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacyosemiteeditingmacattributedstringcommentcdatasectionexpectedtxt">trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/comment-cdata-section-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208564 => 208565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-11-10 22:03:24 UTC (rev 208564)
+++ trunk/LayoutTests/ChangeLog 2016-11-10 22:21:35 UTC (rev 208565)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-11-10 Ryosuke Niwa <rniwa@webkit.org>
+
+ Copied text would contain text inside CDATA sections and comments
+ https://bugs.webkit.org/show_bug.cgi?id=164578
+
+ Reviewed by Darin Adler.
+
+ Added a regression test for creating an attributed string from different kinds of Text nodes.
+ Comment and CDataSection should not be included in the attributed string.
+
+ * editing/mac/attributed-string/comment-cdata-section-expected.txt: Added.
+ * editing/mac/attributed-string/comment-cdata-section.html: Added.
+ * platform/mac-yosemite/editing/mac/attributed-string/comment-cdata-section-expected.txt: Added.
+
</ins><span class="cx"> 2016-11-10 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> test262: DataView / TypedArray methods should throw RangeErrors for negative numbers (ToIndex)
</span></span></pre></div>
<a id="trunkLayoutTestseditingmacattributedstringcommentcdatasectionexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/mac/attributed-string/comment-cdata-section-expected.txt (0 => 208565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/mac/attributed-string/comment-cdata-section-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/mac/attributed-string/comment-cdata-section-expected.txt 2016-11-10 22:21:35 UTC (rev 208565)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+Input:
+hello <!-- FAIL1 --><!--[CDATA[ FAIL2 ]]--> world.
+
+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. ]
+ NSFont: Times-Roman 16.00 pt.
+ NSKern: 0pt
+ NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeWidth: 0
+
</ins></span></pre></div>
<a id="trunkLayoutTestseditingmacattributedstringcommentcdatasectionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/mac/attributed-string/comment-cdata-section.html (0 => 208565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/mac/attributed-string/comment-cdata-section.html (rev 0)
+++ trunk/LayoutTests/editing/mac/attributed-string/comment-cdata-section.html 2016-11-10 22:21:35 UTC (rev 208565)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="resources/dump-attributed-string.js"></script>
+</head>
+<body>
+hello <!-- FAIL1 --><![CDATA[ FAIL2 ]]> world.
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacyosemiteeditingmacattributedstringcommentcdatasectionexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/comment-cdata-section-expected.txt (0 => 208565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/comment-cdata-section-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/comment-cdata-section-expected.txt 2016-11-10 22:21:35 UTC (rev 208565)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+Input:
+hello <!-- FAIL1 --><!--[CDATA[ FAIL2 ]]--> world.
+
+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: (null)
+ Lists: (null)
+ BaseWritingDirection: 0
+ HyphenationFactor: 0
+ TighteningFactor: 0.05
+ HeaderLevel: 0
+[hello world. ]
+ NSFont: Times-Roman 16.00 pt.
+ NSKern: 0pt
+ NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeWidth: 0
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (208564 => 208565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-11-10 22:03:24 UTC (rev 208564)
+++ trunk/Source/WebCore/ChangeLog 2016-11-10 22:21:35 UTC (rev 208565)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-11-10 Ryosuke Niwa <rniwa@webkit.org>
+
+ Copied text would contain text inside CDATA sections and comments
+ https://bugs.webkit.org/show_bug.cgi?id=164578
+ <rdar://problem/19834542>
+
+ Reviewed by Darin Adler.
+
+ The bug was caused by HTMLConverter::_traverseNode always including the content of a Text node.
+ Since Comment and CDataSection nodes are also Text nodes, we need to exclude them.
+
+ In the long term, we should check the visibility of the text as done in MarkupAccumulator.
+
+ Test: editing/mac/attributed-string/comment-cdata-section.html
+
+ * editing/cocoa/HTMLConverter.mm:
+ (HTMLConverter::_traverseNode):
+
</ins><span class="cx"> 2016-11-10 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [MediaStream] apply constraints passed to getUserMedia()
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingcocoaHTMLConvertermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm (208564 => 208565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2016-11-10 22:03:24 UTC (rev 208564)
+++ trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm 2016-11-10 22:21:35 UTC (rev 208565)
</span><span class="lines">@@ -2327,7 +2327,7 @@
</span><span class="cx"> _exitElement(element, depth, startIndex);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- } else if (is<CharacterData>(node))
</del><ins>+ } else if (node.nodeType() == Node::TEXT_NODE)
</ins><span class="cx"> _processText(downcast<CharacterData>(node));
</span><span class="cx">
</span><span class="cx"> if (isEnd)
</span></span></pre>
</div>
</div>
</body>
</html>