<!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>[208527] 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/208527">208527</a></dd>

<dt>Author</dt> <dd>rniwa@webkit.org</dd>

<dt>Date</dt> <dd>2016-11-09 23:53:34 -0800 (Wed, 09 Nov 2016)</dd>

</dl>

<h3>Log Message</h3>

<pre>WebHTMLView's _attributeStringFromDOMRange should use HTMLConverter instead of NSAttributedString's _initWithDOMRange

https://bugs.webkit.org/show_bug.cgi?id=164501

&lt;rdar://problem/29152282&gt;

Reviewed by Sam Weinig.

Source/WebKit/mac:

Align what [WebHTMLView attributedString] returns to what would be used on copy &amp; paste by using HTMLConverter

instead of _initWithDOMRange in [WebHTMLView _attributeStringFromDOMRange].

* WebView/WebHTMLView.mm:

(-[WebHTMLView _attributedStringFromDOMRange:]): Renamed from _attributeStringFromDOMRange.

(-[WebHTMLView attributedString]):

(-[WebHTMLView selectedAttributedString]):

(-[WebHTMLView selectedString]): Moved to reduce the number of occurrences of the if-defs.

Tools:

* DumpRenderTree/mac/TextInputController.m:

(-[TextInputController legacyAttributedString:]):

LayoutTests:

Prior to this patch, attributed-string tests were inadvertently testing NSAttributedString's _initWithDOMRange

instead of HTMLConverter as intended because _attributeStringFromDOMRange was using _initWithDOMRange.

This patch aliens [WebHTMLView attributedString] to what we use on copy &amp; paste by using HTMLConverter instead.

The rebaselined done below highlights the existing behavior difference between AppKit's converter and HTMLConverter.

I've manually confirmed that these test results didn't change across the large refactoring as seen in:

https://trac.webkit.org/log/trunk/Source/WebCore/platform/mac/HTMLConverter.mm?rev=166145

* editing/mac/attributed-string/anchor-element-expected.txt:

* editing/mac/attributed-string/basic-expected.txt:

* editing/mac/attributed-string/font-size-expected.txt:

* editing/mac/attributed-string/font-style-variant-effect-expected.txt:

* editing/mac/attributed-string/font-weight-expected.txt:

* editing/mac/attributed-string/letter-spacing-expected.txt:

* editing/mac/attributed-string/text-decorations-expected.txt:

* editing/mac/attributed-string/vertical-align-expected.txt:

* platform/mac-elcapitan/editing/mac/attributed-string/font-style-variant-effect-expected.txt:

* platform/mac-yosemite/editing/mac/attributed-string/anchor-element-expected.txt:

* platform/mac-yosemite/editing/mac/attributed-string/basic-expected.txt:

* platform/mac-yosemite/editing/mac/attributed-string/font-size-expected.txt:

* platform/mac-yosemite/editing/mac/attributed-string/font-style-variant-effect-expected.txt:

* platform/mac-yosemite/editing/mac/attributed-string/font-weight-expected.txt:

* platform/mac-yosemite/editing/mac/attributed-string/letter-spacing-expected.txt:

* platform/mac-yosemite/editing/mac/attributed-string/text-decorations-expected.txt:

* platform/mac-yosemite/editing/mac/attributed-string/vertical-align-expected.txt:</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>

<li><a href="#trunkLayoutTestseditingmacattributedstringanchorelementexpectedtxt">trunk/LayoutTests/editing/mac/attributed-string/anchor-element-expected.txt</a></li>

<li><a href="#trunkLayoutTestseditingmacattributedstringbasicexpectedtxt">trunk/LayoutTests/editing/mac/attributed-string/basic-expected.txt</a></li>

<li><a href="#trunkLayoutTestseditingmacattributedstringfontsizeexpectedtxt">trunk/LayoutTests/editing/mac/attributed-string/font-size-expected.txt</a></li>

<li><a href="#trunkLayoutTestseditingmacattributedstringfontstylevarianteffectexpectedtxt">trunk/LayoutTests/editing/mac/attributed-string/font-style-variant-effect-expected.txt</a></li>

<li><a href="#trunkLayoutTestseditingmacattributedstringfontweightexpectedtxt">trunk/LayoutTests/editing/mac/attributed-string/font-weight-expected.txt</a></li>

<li><a href="#trunkLayoutTestseditingmacattributedstringletterspacingexpectedtxt">trunk/LayoutTests/editing/mac/attributed-string/letter-spacing-expected.txt</a></li>

<li><a href="#trunkLayoutTestseditingmacattributedstringtextdecorationsexpectedtxt">trunk/LayoutTests/editing/mac/attributed-string/text-decorations-expected.txt</a></li>

<li><a href="#trunkLayoutTestseditingmacattributedstringverticalalignexpectedtxt">trunk/LayoutTests/editing/mac/attributed-string/vertical-align-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmacelcapitaneditingmacattributedstringfontstylevarianteffectexpectedtxt">trunk/LayoutTests/platform/mac-elcapitan/editing/mac/attributed-string/font-style-variant-effect-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmacyosemiteeditingmacattributedstringanchorelementexpectedtxt">trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/anchor-element-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmacyosemiteeditingmacattributedstringbasicexpectedtxt">trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/basic-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmacyosemiteeditingmacattributedstringfontsizeexpectedtxt">trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/font-size-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmacyosemiteeditingmacattributedstringfontstylevarianteffectexpectedtxt">trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/font-style-variant-effect-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmacyosemiteeditingmacattributedstringfontweightexpectedtxt">trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/font-weight-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmacyosemiteeditingmacattributedstringletterspacingexpectedtxt">trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/letter-spacing-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmacyosemiteeditingmacattributedstringtextdecorationsexpectedtxt">trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/text-decorations-expected.txt</a></li>

<li><a href="#trunkLayoutTestsplatformmacyosemiteeditingmacattributedstringverticalalignexpectedtxt">trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/vertical-align-expected.txt</a></li>

<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>

<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>

<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>

<li><a href="#trunkToolsDumpRenderTreemacTextInputControllerm">trunk/Tools/DumpRenderTree/mac/TextInputController.m</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkLayoutTestsChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208526 => 208527)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/ChangeLog        2016-11-10 07:46:17 UTC (rev 208526)

+++ trunk/LayoutTests/ChangeLog        2016-11-10 07:53:34 UTC (rev 208527)

</span><span class="lines">@@ -1,3 +1,38 @@

</span><ins>+2016-11-09  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;

+

+        WebHTMLView's _attributeStringFromDOMRange should use HTMLConverter instead of NSAttributedString's _initWithDOMRange

+        https://bugs.webkit.org/show_bug.cgi?id=164501

+        &lt;rdar://problem/29152282&gt;

+

+        Reviewed by Sam Weinig.

+

+        Prior to this patch, attributed-string tests were inadvertently testing NSAttributedString's _initWithDOMRange

+        instead of HTMLConverter as intended because _attributeStringFromDOMRange was using _initWithDOMRange.

+

+        This patch aliens [WebHTMLView attributedString] to what we use on copy &amp; paste by using HTMLConverter instead.

+        The rebaselined done below highlights the existing behavior difference between AppKit's converter and HTMLConverter.

+

+        I've manually confirmed that these test results didn't change across the large refactoring as seen in:

+        https://trac.webkit.org/log/trunk/Source/WebCore/platform/mac/HTMLConverter.mm?rev=166145

+

+        * editing/mac/attributed-string/anchor-element-expected.txt:

+        * editing/mac/attributed-string/basic-expected.txt:

+        * editing/mac/attributed-string/font-size-expected.txt:

+        * editing/mac/attributed-string/font-style-variant-effect-expected.txt:

+        * editing/mac/attributed-string/font-weight-expected.txt:

+        * editing/mac/attributed-string/letter-spacing-expected.txt:

+        * editing/mac/attributed-string/text-decorations-expected.txt:

+        * editing/mac/attributed-string/vertical-align-expected.txt:

+        * platform/mac-elcapitan/editing/mac/attributed-string/font-style-variant-effect-expected.txt:

+        * platform/mac-yosemite/editing/mac/attributed-string/anchor-element-expected.txt:

+        * platform/mac-yosemite/editing/mac/attributed-string/basic-expected.txt:

+        * platform/mac-yosemite/editing/mac/attributed-string/font-size-expected.txt:

+        * platform/mac-yosemite/editing/mac/attributed-string/font-style-variant-effect-expected.txt:

+        * platform/mac-yosemite/editing/mac/attributed-string/font-weight-expected.txt:

+        * platform/mac-yosemite/editing/mac/attributed-string/letter-spacing-expected.txt:

+        * platform/mac-yosemite/editing/mac/attributed-string/text-decorations-expected.txt:

+        * platform/mac-yosemite/editing/mac/attributed-string/vertical-align-expected.txt:

+

</ins><span class="cx"> 2016-11-09  Chris Dumez  &lt;cdumez@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         [WK2][!NETWORK_SESSION] Add support for downloading file backed blobs

</span></span></pre></div>

<a id="trunkLayoutTestseditingmacattributedstringanchorelementexpectedtxt"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/mac/attributed-string/anchor-element-expected.txt (208526 => 208527)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/editing/mac/attributed-string/anchor-element-expected.txt        2016-11-10 07:46:17 UTC (rev 208526)

+++ trunk/LayoutTests/editing/mac/attributed-string/anchor-element-expected.txt        2016-11-10 07:53:34 UTC (rev 208527)

</span><span class="lines">@@ -10,7 +10,7 @@

</span><span class="cx">     HeadIndent: 0

</span><span class="cx">     TailIndent: 0

</span><span class="cx">     FirstLineHeadIndent: 0

</span><del>-    LineHeight: 18/0

</del><ins>+    LineHeight: 0/0

</ins><span class="cx">     LineHeightMultiple: 0

</span><span class="cx">     LineBreakMode: 0

</span><span class="cx">     Tabs: ()

</span><span class="lines">@@ -32,7 +32,6 @@

</span><span class="cx">     NSStrokeWidth: 0

</span><span class="cx">     NSUnderline: true

</span><span class="cx"> [ ]

</span><del>-    NSColor: #000000 (NSDeviceRGBColorSpace)