Title: [208527] trunk
Revision
208527
Author
[email protected]
Date
2016-11-09 23:53:34 -0800 (Wed, 09 Nov 2016)

Log Message

WebHTMLView's _attributeStringFromDOMRange should use HTMLConverter instead of NSAttributedString's _initWithDOMRange
https://bugs.webkit.org/show_bug.cgi?id=164501
<rdar://problem/29152282>

Reviewed by Sam Weinig.

Source/WebKit/mac:

Align what [WebHTMLView attributedString] returns to what would be used on copy & 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 & 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:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (208526 => 208527)


--- trunk/LayoutTests/ChangeLog	2016-11-10 07:46:17 UTC (rev 208526)
+++ trunk/LayoutTests/ChangeLog	2016-11-10 07:53:34 UTC (rev 208527)
@@ -1,3 +1,38 @@
+2016-11-09  Ryosuke Niwa  <[email protected]>
+
+        WebHTMLView's _attributeStringFromDOMRange should use HTMLConverter instead of NSAttributedString's _initWithDOMRange
+        https://bugs.webkit.org/show_bug.cgi?id=164501
+        <rdar://problem/29152282>
+
+        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 & 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:
+
 2016-11-09  Chris Dumez  <[email protected]>
 
         [WK2][!NETWORK_SESSION] Add support for downloading file backed blobs

Modified: trunk/LayoutTests/editing/mac/attributed-string/anchor-element-expected.txt (208526 => 208527)


--- 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)
@@ -10,7 +10,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 18/0
+    LineHeight: 0/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()
@@ -32,7 +32,6 @@
     NSStrokeWidth: 0
     NSUnderline: true
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1

Modified: trunk/LayoutTests/editing/mac/attributed-string/basic-expected.txt (208526 => 208527)


--- trunk/LayoutTests/editing/mac/attributed-string/basic-expected.txt	2016-11-10 07:46:17 UTC (rev 208526)
+++ trunk/LayoutTests/editing/mac/attributed-string/basic-expected.txt	2016-11-10 07:53:34 UTC (rev 208527)
@@ -11,7 +11,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 18/0
+    LineHeight: 0/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()
@@ -25,7 +25,6 @@
     TighteningForTruncation: YES
     HeaderLevel: 0
 [hello ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
@@ -38,7 +37,6 @@
     NSStrokeColor: NSDeviceRGBColorSpace 1 1 1 1
     NSStrokeWidth: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
@@ -52,7 +50,6 @@
     NSStrokeWidth: 0
     NSUnderline: true
 [.\n]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
@@ -59,7 +56,6 @@
     NSStrokeWidth: 0
 [this is a ]
     NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
@@ -66,7 +62,6 @@
     NSStrokeWidth: 0
 [t]
     NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Italic 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
@@ -74,7 +69,6 @@
     NSUnderline: true
 [est]
     NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
@@ -82,7 +76,6 @@
     NSUnderline: true
 [ of ]
     NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
@@ -89,7 +82,6 @@
     NSStrokeWidth: 0
 [attributed]
     NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Italic 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
@@ -96,13 +88,11 @@
     NSStrokeWidth: 0
 [ string.]
     NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1

Modified: trunk/LayoutTests/editing/mac/attributed-string/font-size-expected.txt (208526 => 208527)


--- trunk/LayoutTests/editing/mac/attributed-string/font-size-expected.txt	2016-11-10 07:46:17 UTC (rev 208526)
+++ trunk/LayoutTests/editing/mac/attributed-string/font-size-expected.txt	2016-11-10 07:53:34 UTC (rev 208527)
@@ -19,7 +19,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 15/0
+    LineHeight: 0/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()
@@ -33,466 +33,91 @@
     TighteningForTruncation: YES
     HeaderLevel: 0
 [small element]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 13.33 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 18/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (
-)
-    Lists: (
-)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningForTruncation: YES
-    HeaderLevel: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 10/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (
-)
-    Lists: (
-)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningForTruncation: YES
-    HeaderLevel: 0
 [xx-small]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 9.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 18/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (
-)
-    Lists: (
-)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningForTruncation: YES
-    HeaderLevel: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 13/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (
-)
-    Lists: (
-)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningForTruncation: YES
-    HeaderLevel: 0
 [x-small]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 10.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 18/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (
-)
-    Lists: (
-)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningForTruncation: YES
-    HeaderLevel: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 15/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (
-)
-    Lists: (
-)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningForTruncation: YES
-    HeaderLevel: 0
 [small]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 13.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 18/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (
-)
-    Lists: (
-)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningForTruncation: YES
-    HeaderLevel: 0
 [ normal ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 22/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (
-)
-    Lists: (
-)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningForTruncation: YES
-    HeaderLevel: 0
 [large]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 18.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 18/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (
-)
-    Lists: (
-)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningForTruncation: YES
-    HeaderLevel: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 28/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (
-)
-    Lists: (
-)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningForTruncation: YES
-    HeaderLevel: 0
 [x-large]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 24.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 18/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (
-)
-    Lists: (
-)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningForTruncation: YES
-    HeaderLevel: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 37/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (
-)
-    Lists: (
-)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningForTruncation: YES
-    HeaderLevel: 0
 [xx-large]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 32.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 18/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (
-)
-    Lists: (
-)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningForTruncation: YES
-    HeaderLevel: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 8/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (
-)
-    Lists: (
-)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningForTruncation: YES
-    HeaderLevel: 0
 [5pt]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 6.67 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 18/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (
-)
-    Lists: (
-)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningForTruncation: YES
-    HeaderLevel: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 23/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (
-)
-    Lists: (
-)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningForTruncation: YES
-    HeaderLevel: 0
 [15pt]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 20.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 18/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (
-)
-    Lists: (
-)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningForTruncation: YES
-    HeaderLevel: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1

Modified: trunk/LayoutTests/editing/mac/attributed-string/font-style-variant-effect-expected.txt (208526 => 208527)


--- trunk/LayoutTests/editing/mac/attributed-string/font-style-variant-effect-expected.txt	2016-11-10 07:46:17 UTC (rev 208526)
+++ trunk/LayoutTests/editing/mac/attributed-string/font-style-variant-effect-expected.txt	2016-11-10 07:53:34 UTC (rev 208527)
@@ -14,7 +14,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 18/0
+    LineHeight: 0/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()
@@ -28,37 +28,31 @@
     TighteningForTruncation: YES
     HeaderLevel: 0
 [italic]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Italic 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [oblique]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Italic 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [small-caps]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [ outline emboss ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1

Modified: trunk/LayoutTests/editing/mac/attributed-string/font-weight-expected.txt (208526 => 208527)


--- trunk/LayoutTests/editing/mac/attributed-string/font-weight-expected.txt	2016-11-10 07:46:17 UTC (rev 208526)
+++ trunk/LayoutTests/editing/mac/attributed-string/font-weight-expected.txt	2016-11-10 07:53:34 UTC (rev 208527)
@@ -19,7 +19,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 18/0
+    LineHeight: 0/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()
@@ -33,61 +33,51 @@
     TighteningForTruncation: YES
     HeaderLevel: 0
 [bold]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Bold 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [ font weight 100 font weight 200 font weight 300 font weight 400 font weight 500 ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [font weight 600]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Bold 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [font weight 700]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Bold 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [font weight 800]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Bold 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [font weight 900]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Bold 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1

Modified: trunk/LayoutTests/editing/mac/attributed-string/letter-spacing-expected.txt (208526 => 208527)


--- trunk/LayoutTests/editing/mac/attributed-string/letter-spacing-expected.txt	2016-11-10 07:46:17 UTC (rev 208526)
+++ trunk/LayoutTests/editing/mac/attributed-string/letter-spacing-expected.txt	2016-11-10 07:53:34 UTC (rev 208527)
@@ -10,7 +10,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 18/0
+    LineHeight: 0/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()
@@ -24,7 +24,6 @@
     TighteningForTruncation: YES
     HeaderLevel: 0
 [3pt ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1

Modified: trunk/LayoutTests/editing/mac/attributed-string/text-decorations-expected.txt (208526 => 208527)


--- trunk/LayoutTests/editing/mac/attributed-string/text-decorations-expected.txt	2016-11-10 07:46:17 UTC (rev 208526)
+++ trunk/LayoutTests/editing/mac/attributed-string/text-decorations-expected.txt	2016-11-10 07:53:34 UTC (rev 208527)
@@ -12,7 +12,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 18/0
+    LineHeight: 0/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()
@@ -26,7 +26,6 @@
     TighteningForTruncation: YES
     HeaderLevel: 0
 [underline]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
@@ -33,13 +32,11 @@
     NSStrokeWidth: 0
     NSUnderline: true
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [strike]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrikethrough: true
@@ -46,7 +43,6 @@
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [ underline and strike ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1

Modified: trunk/LayoutTests/editing/mac/attributed-string/vertical-align-expected.txt (208526 => 208527)


--- trunk/LayoutTests/editing/mac/attributed-string/vertical-align-expected.txt	2016-11-10 07:46:17 UTC (rev 208526)
+++ trunk/LayoutTests/editing/mac/attributed-string/vertical-align-expected.txt	2016-11-10 07:53:34 UTC (rev 208527)
@@ -14,7 +14,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 15/0
+    LineHeight: 0/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()
@@ -28,96 +28,28 @@
     TighteningForTruncation: YES
     HeaderLevel: 0
 [sup element]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 13.33 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
     NSSuperScript: 1
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 18/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (
-)
-    Lists: (
-)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningForTruncation: YES
-    HeaderLevel: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 15/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (
-)
-    Lists: (
-)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningForTruncation: YES
-    HeaderLevel: 0
 [sub element]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 13.33 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
     NSSuperScript: -1
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 18/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (
-)
-    Lists: (
-)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningForTruncation: YES
-    HeaderLevel: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [vertical align super]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
@@ -124,13 +56,11 @@
     NSStrokeWidth: 0
     NSSuperScript: 1
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [vertical align sub]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
@@ -137,7 +67,6 @@
     NSStrokeWidth: 0
     NSSuperScript: -1
 [ vertical align 50% ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1

Modified: trunk/LayoutTests/platform/mac-elcapitan/editing/mac/attributed-string/font-style-variant-effect-expected.txt (208526 => 208527)


--- trunk/LayoutTests/platform/mac-elcapitan/editing/mac/attributed-string/font-style-variant-effect-expected.txt	2016-11-10 07:46:17 UTC (rev 208526)
+++ trunk/LayoutTests/platform/mac-elcapitan/editing/mac/attributed-string/font-style-variant-effect-expected.txt	2016-11-10 07:53:34 UTC (rev 208527)
@@ -14,7 +14,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 18/0
+    LineHeight: 0/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()
@@ -28,25 +28,21 @@
     TighteningForTruncation: YES
     HeaderLevel: 0
 [italic]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Italic 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [oblique]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Italic 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [ small-caps outline emboss ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1

Modified: trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/anchor-element-expected.txt (208526 => 208527)


--- trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/anchor-element-expected.txt	2016-11-10 07:46:17 UTC (rev 208526)
+++ trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/anchor-element-expected.txt	2016-11-10 07:53:34 UTC (rev 208527)
@@ -10,7 +10,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 18/0
+    LineHeight: 0/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()
@@ -30,7 +30,6 @@
     NSStrokeWidth: 0
     NSUnderline: true
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1

Modified: trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/basic-expected.txt (208526 => 208527)


--- trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/basic-expected.txt	2016-11-10 07:46:17 UTC (rev 208526)
+++ trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/basic-expected.txt	2016-11-10 07:53:34 UTC (rev 208527)
@@ -11,7 +11,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 18/0
+    LineHeight: 0/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()
@@ -23,7 +23,6 @@
     TighteningFactor: 0.05
     HeaderLevel: 0
 [hello ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
@@ -36,7 +35,6 @@
     NSStrokeColor: NSDeviceRGBColorSpace 1 1 1 1
     NSStrokeWidth: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
@@ -50,7 +48,6 @@
     NSStrokeWidth: 0
     NSUnderline: true
 [.\n]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
@@ -57,7 +54,6 @@
     NSStrokeWidth: 0
 [this is a ]
     NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
@@ -64,7 +60,6 @@
     NSStrokeWidth: 0
 [t]
     NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Italic 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
@@ -72,7 +67,6 @@
     NSUnderline: true
 [est]
     NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
@@ -80,7 +74,6 @@
     NSUnderline: true
 [ of ]
     NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
@@ -87,7 +80,6 @@
     NSStrokeWidth: 0
 [attributed]
     NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Italic 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
@@ -94,13 +86,11 @@
     NSStrokeWidth: 0
 [ string.]
     NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1

Modified: trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/font-size-expected.txt (208526 => 208527)


--- trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/font-size-expected.txt	2016-11-10 07:46:17 UTC (rev 208526)
+++ trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/font-size-expected.txt	2016-11-10 07:53:34 UTC (rev 208527)
@@ -19,7 +19,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 15/0
+    LineHeight: 0/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()
@@ -31,432 +31,91 @@
     TighteningFactor: 0.05
     HeaderLevel: 0
 [small element]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 13.33 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 18/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (null)
-    Lists: (null)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningFactor: 0.05
-    HeaderLevel: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 10/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (null)
-    Lists: (null)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningFactor: 0.05
-    HeaderLevel: 0
 [xx-small]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 9.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 18/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (null)
-    Lists: (null)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningFactor: 0.05
-    HeaderLevel: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 13/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (null)
-    Lists: (null)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningFactor: 0.05
-    HeaderLevel: 0
 [x-small]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 10.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 18/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (null)
-    Lists: (null)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningFactor: 0.05
-    HeaderLevel: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 15/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (null)
-    Lists: (null)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningFactor: 0.05
-    HeaderLevel: 0
 [small]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 13.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 18/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (null)
-    Lists: (null)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningFactor: 0.05
-    HeaderLevel: 0
 [ normal ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 22/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (null)
-    Lists: (null)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningFactor: 0.05
-    HeaderLevel: 0
 [large]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 18.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 18/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (null)
-    Lists: (null)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningFactor: 0.05
-    HeaderLevel: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 28/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (null)
-    Lists: (null)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningFactor: 0.05
-    HeaderLevel: 0
 [x-large]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 24.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 18/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (null)
-    Lists: (null)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningFactor: 0.05
-    HeaderLevel: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 37/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (null)
-    Lists: (null)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningFactor: 0.05
-    HeaderLevel: 0
 [xx-large]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 32.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 18/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (null)
-    Lists: (null)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningFactor: 0.05
-    HeaderLevel: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 8/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (null)
-    Lists: (null)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningFactor: 0.05
-    HeaderLevel: 0
 [5pt]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 6.67 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 18/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (null)
-    Lists: (null)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningFactor: 0.05
-    HeaderLevel: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 23/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (null)
-    Lists: (null)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningFactor: 0.05
-    HeaderLevel: 0
 [15pt]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 20.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 18/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (null)
-    Lists: (null)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningFactor: 0.05
-    HeaderLevel: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1

Modified: trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/font-style-variant-effect-expected.txt (208526 => 208527)


--- trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/font-style-variant-effect-expected.txt	2016-11-10 07:46:17 UTC (rev 208526)
+++ trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/font-style-variant-effect-expected.txt	2016-11-10 07:53:34 UTC (rev 208527)
@@ -14,7 +14,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 18/0
+    LineHeight: 0/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()
@@ -26,25 +26,21 @@
     TighteningFactor: 0.05
     HeaderLevel: 0
 [italic]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Italic 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [oblique]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Italic 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [ small-caps outline emboss ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1

Modified: trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/font-weight-expected.txt (208526 => 208527)


--- trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/font-weight-expected.txt	2016-11-10 07:46:17 UTC (rev 208526)
+++ trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/font-weight-expected.txt	2016-11-10 07:53:34 UTC (rev 208527)
@@ -19,7 +19,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 18/0
+    LineHeight: 0/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()
@@ -31,61 +31,51 @@
     TighteningFactor: 0.05
     HeaderLevel: 0
 [bold]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Bold 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [ font weight 100 font weight 200 font weight 300 font weight 400 font weight 500 ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [font weight 600]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Bold 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [font weight 700]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Bold 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [font weight 800]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Bold 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [font weight 900]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Bold 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1

Modified: trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/letter-spacing-expected.txt (208526 => 208527)


--- trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/letter-spacing-expected.txt	2016-11-10 07:46:17 UTC (rev 208526)
+++ trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/letter-spacing-expected.txt	2016-11-10 07:53:34 UTC (rev 208527)
@@ -10,7 +10,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 18/0
+    LineHeight: 0/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()
@@ -22,7 +22,6 @@
     TighteningFactor: 0.05
     HeaderLevel: 0
 [3pt ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1

Modified: trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/text-decorations-expected.txt (208526 => 208527)


--- trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/text-decorations-expected.txt	2016-11-10 07:46:17 UTC (rev 208526)
+++ trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/text-decorations-expected.txt	2016-11-10 07:53:34 UTC (rev 208527)
@@ -12,7 +12,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 18/0
+    LineHeight: 0/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()
@@ -24,7 +24,6 @@
     TighteningFactor: 0.05
     HeaderLevel: 0
 [underline]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
@@ -31,13 +30,11 @@
     NSStrokeWidth: 0
     NSUnderline: true
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [strike]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrikethrough: true
@@ -44,7 +41,6 @@
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [ underline and strike ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1

Modified: trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/vertical-align-expected.txt (208526 => 208527)


--- trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/vertical-align-expected.txt	2016-11-10 07:46:17 UTC (rev 208526)
+++ trunk/LayoutTests/platform/mac-yosemite/editing/mac/attributed-string/vertical-align-expected.txt	2016-11-10 07:53:34 UTC (rev 208527)
@@ -14,7 +14,7 @@
     HeadIndent: 0
     TailIndent: 0
     FirstLineHeadIndent: 0
-    LineHeight: 15/0
+    LineHeight: 0/0
     LineHeightMultiple: 0
     LineBreakMode: 0
     Tabs: ()
@@ -26,90 +26,28 @@
     TighteningFactor: 0.05
     HeaderLevel: 0
 [sup element]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 13.33 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
     NSSuperScript: 1
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 18/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (null)
-    Lists: (null)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningFactor: 0.05
-    HeaderLevel: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 15/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (null)
-    Lists: (null)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningFactor: 0.05
-    HeaderLevel: 0
 [sub element]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 13.33 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
     NSSuperScript: -1
-NSParagraphStyle:
-Alignment 4
-    LineSpacing: 0
-    ParagraphSpacing: 0
-    ParagraphSpacingBefore: 0
-    HeadIndent: 0
-    TailIndent: 0
-    FirstLineHeadIndent: 0
-    LineHeight: 18/0
-    LineHeightMultiple: 0
-    LineBreakMode: 0
-    Tabs: ()
-    DefaultTabInterval: 36
-    Blocks: (null)
-    Lists: (null)
-    BaseWritingDirection: 0
-    HyphenationFactor: 0
-    TighteningFactor: 0.05
-    HeaderLevel: 0
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [vertical align super]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
@@ -116,13 +54,11 @@
     NSStrokeWidth: 0
     NSSuperScript: 1
 [ ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
     NSStrokeWidth: 0
 [vertical align sub]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
@@ -129,7 +65,6 @@
     NSStrokeWidth: 0
     NSSuperScript: -1
 [ vertical align 50% ]
-    NSColor: #000000 (NSDeviceRGBColorSpace)
     NSFont: Times-Roman 16.00 pt.
     NSKern: 0pt
     NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1

Modified: trunk/Source/WebKit/mac/ChangeLog (208526 => 208527)


--- trunk/Source/WebKit/mac/ChangeLog	2016-11-10 07:46:17 UTC (rev 208526)
+++ trunk/Source/WebKit/mac/ChangeLog	2016-11-10 07:53:34 UTC (rev 208527)
@@ -1,3 +1,20 @@
+2016-11-09  Ryosuke Niwa  <[email protected]>
+
+        WebHTMLView's _attributeStringFromDOMRange should use HTMLConverter instead of NSAttributedString's _initWithDOMRange
+        https://bugs.webkit.org/show_bug.cgi?id=164501
+        <rdar://problem/29152282>
+
+        Reviewed by Sam Weinig.
+
+        Align what [WebHTMLView attributedString] returns to what would be used on copy & 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.
+
 2016-11-04  Brent Fulgham  <[email protected]>
 
         Local HTML should be blocked from localStorage access unless "Disable Local File Restrictions" is checked

Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (208526 => 208527)


--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm	2016-11-10 07:46:17 UTC (rev 208526)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm	2016-11-10 07:53:34 UTC (rev 208527)
@@ -752,7 +752,6 @@
 @end
 
 @interface NSAttributedString (WebNSAttributedStringDetails)
-- (id)_initWithDOMRange:(DOMRange *)range;
 - (DOMDocumentFragment *)_documentFromRange:(NSRange)range document:(DOMDocument *)document documentAttributes:(NSDictionary *)dict subresources:(NSArray **)subresources;
 @end
 
@@ -7378,13 +7377,15 @@
 }
 
 #if !PLATFORM(IOS)
-- (NSAttributedString *)_attributeStringFromDOMRange:(DOMRange *)range
+- (NSAttributedString *)_attributedStringFromDOMRange:(DOMRange *)range
 {
     NSAttributedString *attributedString;
 #if !LOG_DISABLED
     double start = CFAbsoluteTimeGetCurrent();
-#endif    
-    attributedString = [[[NSAttributedString alloc] _initWithDOMRange:range] autorelease];
+#endif
+    if (!range)
+        return nullptr;
+    attributedString = attributedStringFromRange(*core(range));
 #if !LOG_DISABLED
     double duration = CFAbsoluteTimeGetCurrent() - start;
     LOG(Timing, "creating attributed string from selection took %f seconds.", duration);
@@ -7395,7 +7396,7 @@
 - (NSAttributedString *)attributedString
 {
     DOMDocument *document = [[self _frame] DOMDocument];
-    NSAttributedString *attributedString = [self _attributeStringFromDOMRange:[document _documentRange]];
+    NSAttributedString *attributedString = [self _attributedStringFromDOMRange:[document _documentRange]];
     if (!attributedString) {
         Document* coreDocument = core(document);
         attributedString = editingAttributedStringFromRange(Range::create(*coreDocument, coreDocument, 0, coreDocument, coreDocument->countChildNodes()));
@@ -7402,17 +7403,10 @@
     }
     return attributedString;
 }
-#endif
 
-- (NSString *)selectedString
-{
-    return [[self _frame] _selectedString];
-}
-
-#if !PLATFORM(IOS)
 - (NSAttributedString *)selectedAttributedString
 {
-    NSAttributedString *attributedString = [self _attributeStringFromDOMRange:[self _selectedRange]];
+    NSAttributedString *attributedString = [self _attributedStringFromDOMRange:[self _selectedRange]];
     if (!attributedString) {
         Frame* coreFrame = core([self _frame]);
         if (coreFrame) {
@@ -7427,6 +7421,11 @@
 }
 #endif
 
+- (NSString *)selectedString
+{
+    return [[self _frame] _selectedString];
+}
+
 - (BOOL)supportsTextEncoding
 {
     return YES;

Modified: trunk/Tools/ChangeLog (208526 => 208527)


--- trunk/Tools/ChangeLog	2016-11-10 07:46:17 UTC (rev 208526)
+++ trunk/Tools/ChangeLog	2016-11-10 07:53:34 UTC (rev 208527)
@@ -1,3 +1,14 @@
+2016-11-09  Ryosuke Niwa  <[email protected]>
+
+        WebHTMLView's _attributeStringFromDOMRange should use HTMLConverter instead of NSAttributedString's _initWithDOMRange
+        https://bugs.webkit.org/show_bug.cgi?id=164501
+        <rdar://problem/29152282>
+
+        Reviewed by Sam Weinig.
+
+        * DumpRenderTree/mac/TextInputController.m:
+        (-[TextInputController legacyAttributedString:]):
+
 2016-11-09  Chris Dumez  <[email protected]>
 
         [WK2][NETWORK_SESSION] Add support for downloading file backed blobs

Modified: trunk/Tools/DumpRenderTree/mac/TextInputController.m (208526 => 208527)


--- trunk/Tools/DumpRenderTree/mac/TextInputController.m	2016-11-10 07:46:17 UTC (rev 208526)
+++ trunk/Tools/DumpRenderTree/mac/TextInputController.m	2016-11-10 07:53:34 UTC (rev 208527)
@@ -63,7 +63,7 @@
 
 @interface WebHTMLView (WebKitSecretsTextInputControllerIsAwareOf)
 - (WebFrame *)_frame;
-- (NSAttributedString *)_attributeStringFromDOMRange:(DOMRange *)range;
+- (NSAttributedString *)_attributedStringFromDOMRange:(DOMRange *)range;
 @end
 
 @implementation WebHTMLView (DumpRenderTreeInputMethodHandler)
@@ -378,7 +378,7 @@
     if (![documentView isKindOfClass:[WebHTMLView class]])
         return string;
 
-    [string setAttributedString:[(WebHTMLView *)documentView _attributeStringFromDOMRange:range]];
+    [string setAttributedString:[(WebHTMLView *)documentView _attributedStringFromDOMRange:range]];
     return string;
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to