Changeset 233913 in webkit
- Timestamp:
- Jul 18, 2018 8:55:33 AM (6 years ago)
- Location:
- trunk
- Files:
-
- 3 added
- 1 deleted
- 22 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r233903 r233913 1 2018-07-18 Simon Fraser <simon.fraser@apple.com> 2 3 Fix the parsing of colors in attributed string tests, and make it possible to dump the typing attributes 4 https://bugs.webkit.org/show_bug.cgi?id=187747 5 6 Reviewed by Ryosuke Niwa. 7 8 Fix the parsing of color properties in dump-attributed-string.js, and treat NSStrokeColor as 9 a color. Rebase all the affected tests. Give macOS Sierra its own expectations with the legacy NSCustomColorSpace. 10 11 Add attributed-string-for-typing.html which tests typingAttributes. 12 13 * editing/mac/attributed-string/anchor-element-expected.txt: 14 * editing/mac/attributed-string/attributed-string-for-typing-expected.txt: Added. 15 * editing/mac/attributed-string/attributed-string-for-typing.html: Added. 16 * editing/mac/attributed-string/basic-expected.txt: 17 * editing/mac/attributed-string/comment-cdata-section-expected.txt: 18 * editing/mac/attributed-string/font-size-expected.txt: 19 * editing/mac/attributed-string/font-style-variant-effect-expected.txt: 20 * editing/mac/attributed-string/font-weight-expected.txt: 21 * editing/mac/attributed-string/letter-spacing-expected.txt: 22 * editing/mac/attributed-string/resources/dump-attributed-string.js: 23 (dumpAttributedString): 24 (formatNonParagraphAttributeValue): 25 (parseNSColorDescription): 26 (window.onload): 27 (serializeAttributedString.log): Deleted. 28 (serializeAttributedString.): Deleted. 29 (serializeAttributedString): Deleted. 30 * editing/mac/attributed-string/text-decorations-expected.txt: 31 * editing/mac/attributed-string/vertical-align-expected.txt: 32 * platform/mac-sierra/editing/mac/attributed-string/anchor-element-expected.txt: 33 * platform/mac-sierra/editing/mac/attributed-string/attributed-string-for-typing-expected.txt: Added. 34 * platform/mac-sierra/editing/mac/attributed-string/basic-expected.txt: 35 * platform/mac-sierra/editing/mac/attributed-string/comment-cdata-section-expected.txt: 36 * platform/mac-sierra/editing/mac/attributed-string/font-size-expected.txt: 37 * platform/mac-sierra/editing/mac/attributed-string/font-style-variant-effect-expected.txt: 38 * platform/mac-sierra/editing/mac/attributed-string/font-weight-expected.txt: 39 * platform/mac-sierra/editing/mac/attributed-string/letter-spacing-expected.txt: 40 * platform/mac-sierra/editing/mac/attributed-string/text-decorations-expected.txt: 41 * platform/mac-sierra/editing/mac/attributed-string/vertical-align-expected.txt: 42 * platform/mac/editing/mac/attributed-string/anchor-element-expected.txt: Removed. 43 * platform/mac/editing/mac/attributed-string/basic-expected.txt: Removed. 44 * platform/mac/editing/mac/attributed-string/comment-cdata-section-expected.txt: Removed. 45 * platform/mac/editing/mac/attributed-string/font-size-expected.txt: Removed. 46 * platform/mac/editing/mac/attributed-string/font-style-variant-effect-expected.txt: Removed. 47 * platform/mac/editing/mac/attributed-string/font-weight-expected.txt: Removed. 48 * platform/mac/editing/mac/attributed-string/letter-spacing-expected.txt: Removed. 49 * platform/mac/editing/mac/attributed-string/text-decorations-expected.txt: Removed. 50 * platform/mac/editing/mac/attributed-string/vertical-align-expected.txt: Removed. 51 1 52 2018-07-17 Antoine Quint <graouts@apple.com> 2 53 -
trunk/LayoutTests/editing/mac/attributed-string/anchor-element-expected.txt
r216449 r233913 25 25 HeaderLevel: 0 26 26 [webkit.org] 27 NSColor: rgba(255, 2295, 1530, 6) (IEC6)27 NSColor: #0000ee (sRGB) 28 28 NSFont: Times-Roman 16.00 pt. 29 29 NSKern: 0pt 30 30 NSLink: https://webkit.org/ 31 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0.933333 131 NSStrokeColor: #0000ee (sRGB) 32 32 NSStrokeWidth: 0 33 33 NSUnderline: true … … 35 35 NSFont: Times-Roman 16.00 pt. 36 36 NSKern: 0pt 37 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 137 NSStrokeColor: #000000 (sRGB) 38 38 NSStrokeWidth: 0 39 39 -
trunk/LayoutTests/editing/mac/attributed-string/basic-expected.txt
r216449 r233913 28 28 NSFont: Times-Roman 16.00 pt. 29 29 NSKern: 0pt 30 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 130 NSStrokeColor: #000000 (sRGB) 31 31 NSStrokeWidth: 0 32 32 [world] 33 NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)34 NSColor: rgba(255, 2295, 1530, 6) (IEC6)33 NSBackgroundColor: #0000ff (sRGB) 34 NSColor: #ffffff (sRGB) 35 35 NSFont: Times-Bold 16.00 pt. 36 36 NSKern: 0pt 37 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 1 1 1 137 NSStrokeColor: #ffffff (sRGB) 38 38 NSStrokeWidth: 0 39 39 [ ] 40 40 NSFont: Times-Roman 16.00 pt. 41 41 NSKern: 0pt 42 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 142 NSStrokeColor: #000000 (sRGB) 43 43 NSStrokeWidth: 0 44 44 [WebKit] 45 NSColor: rgba(255, 2295, 1530, 6) (IEC6)45 NSColor: #0000ee (sRGB) 46 46 NSFont: Times-Roman 16.00 pt. 47 47 NSKern: 0pt 48 48 NSLink: https://webkit.org/ 49 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0.933333 149 NSStrokeColor: #0000ee (sRGB) 50 50 NSStrokeWidth: 0 51 51 NSUnderline: true … … 53 53 NSFont: Times-Roman 16.00 pt. 54 54 NSKern: 0pt 55 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 155 NSStrokeColor: #000000 (sRGB) 56 56 NSStrokeWidth: 0 57 57 [this is a ] 58 NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)58 NSBackgroundColor: #ffff00 (sRGB) 59 59 NSFont: Times-Roman 16.00 pt. 60 60 NSKern: 0pt 61 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 161 NSStrokeColor: #000000 (sRGB) 62 62 NSStrokeWidth: 0 63 63 [t] 64 NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)64 NSBackgroundColor: #ffff00 (sRGB) 65 65 NSFont: Times-Italic 16.00 pt. 66 66 NSKern: 0pt 67 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 167 NSStrokeColor: #000000 (sRGB) 68 68 NSStrokeWidth: 0 69 69 NSUnderline: true 70 70 [est] 71 NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)71 NSBackgroundColor: #ffff00 (sRGB) 72 72 NSFont: Times-Roman 16.00 pt. 73 73 NSKern: 0pt 74 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 174 NSStrokeColor: #000000 (sRGB) 75 75 NSStrokeWidth: 0 76 76 NSUnderline: true 77 77 [ of ] 78 NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)78 NSBackgroundColor: #ffff00 (sRGB) 79 79 NSFont: Times-Roman 16.00 pt. 80 80 NSKern: 0pt 81 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 181 NSStrokeColor: #000000 (sRGB) 82 82 NSStrokeWidth: 0 83 83 [attributed] 84 NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)84 NSBackgroundColor: #ffff00 (sRGB) 85 85 NSFont: Times-Italic 16.00 pt. 86 86 NSKern: 0pt 87 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 187 NSStrokeColor: #000000 (sRGB) 88 88 NSStrokeWidth: 0 89 89 [ string.] 90 NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)90 NSBackgroundColor: #ffff00 (sRGB) 91 91 NSFont: Times-Roman 16.00 pt. 92 92 NSKern: 0pt 93 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 193 NSStrokeColor: #000000 (sRGB) 94 94 NSStrokeWidth: 0 95 95 [ ] 96 96 NSFont: Times-Roman 16.00 pt. 97 97 NSKern: 0pt 98 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 198 NSStrokeColor: #000000 (sRGB) 99 99 NSStrokeWidth: 0 100 100 -
trunk/LayoutTests/editing/mac/attributed-string/comment-cdata-section-expected.txt
r216449 r233913 27 27 NSFont: Times-Roman 16.00 pt. 28 28 NSKern: 0pt 29 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 129 NSStrokeColor: #000000 (sRGB) 30 30 NSStrokeWidth: 0 31 31 -
trunk/LayoutTests/editing/mac/attributed-string/font-size-expected.txt
r216449 r233913 36 36 NSFont: Times-Roman 13.33 pt. 37 37 NSKern: 0pt 38 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 138 NSStrokeColor: #000000 (sRGB) 39 39 NSStrokeWidth: 0 40 40 [ ] 41 41 NSFont: Times-Roman 16.00 pt. 42 42 NSKern: 0pt 43 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 143 NSStrokeColor: #000000 (sRGB) 44 44 NSStrokeWidth: 0 45 45 [xx-small] 46 46 NSFont: Times-Roman 9.00 pt. 47 47 NSKern: 0pt 48 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 148 NSStrokeColor: #000000 (sRGB) 49 49 NSStrokeWidth: 0 50 50 [ ] 51 51 NSFont: Times-Roman 16.00 pt. 52 52 NSKern: 0pt 53 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 153 NSStrokeColor: #000000 (sRGB) 54 54 NSStrokeWidth: 0 55 55 [x-small] 56 56 NSFont: Times-Roman 10.00 pt. 57 57 NSKern: 0pt 58 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 158 NSStrokeColor: #000000 (sRGB) 59 59 NSStrokeWidth: 0 60 60 [ ] 61 61 NSFont: Times-Roman 16.00 pt. 62 62 NSKern: 0pt 63 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 163 NSStrokeColor: #000000 (sRGB) 64 64 NSStrokeWidth: 0 65 65 [small] 66 66 NSFont: Times-Roman 13.00 pt. 67 67 NSKern: 0pt 68 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 168 NSStrokeColor: #000000 (sRGB) 69 69 NSStrokeWidth: 0 70 70 [ normal ] 71 71 NSFont: Times-Roman 16.00 pt. 72 72 NSKern: 0pt 73 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 173 NSStrokeColor: #000000 (sRGB) 74 74 NSStrokeWidth: 0 75 75 [large] 76 76 NSFont: Times-Roman 18.00 pt. 77 77 NSKern: 0pt 78 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 178 NSStrokeColor: #000000 (sRGB) 79 79 NSStrokeWidth: 0 80 80 [ ] 81 81 NSFont: Times-Roman 16.00 pt. 82 82 NSKern: 0pt 83 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 183 NSStrokeColor: #000000 (sRGB) 84 84 NSStrokeWidth: 0 85 85 [x-large] 86 86 NSFont: Times-Roman 24.00 pt. 87 87 NSKern: 0pt 88 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 188 NSStrokeColor: #000000 (sRGB) 89 89 NSStrokeWidth: 0 90 90 [ ] 91 91 NSFont: Times-Roman 16.00 pt. 92 92 NSKern: 0pt 93 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 193 NSStrokeColor: #000000 (sRGB) 94 94 NSStrokeWidth: 0 95 95 [xx-large] 96 96 NSFont: Times-Roman 32.00 pt. 97 97 NSKern: 0pt 98 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 198 NSStrokeColor: #000000 (sRGB) 99 99 NSStrokeWidth: 0 100 100 [ ] 101 101 NSFont: Times-Roman 16.00 pt. 102 102 NSKern: 0pt 103 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1103 NSStrokeColor: #000000 (sRGB) 104 104 NSStrokeWidth: 0 105 105 [5pt] 106 106 NSFont: Times-Roman 6.67 pt. 107 107 NSKern: 0pt 108 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1108 NSStrokeColor: #000000 (sRGB) 109 109 NSStrokeWidth: 0 110 110 [ ] 111 111 NSFont: Times-Roman 16.00 pt. 112 112 NSKern: 0pt 113 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1113 NSStrokeColor: #000000 (sRGB) 114 114 NSStrokeWidth: 0 115 115 [15pt] 116 116 NSFont: Times-Roman 20.00 pt. 117 117 NSKern: 0pt 118 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1118 NSStrokeColor: #000000 (sRGB) 119 119 NSStrokeWidth: 0 120 120 [ ] 121 121 NSFont: Times-Roman 16.00 pt. 122 122 NSKern: 0pt 123 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1123 NSStrokeColor: #000000 (sRGB) 124 124 NSStrokeWidth: 0 125 125 -
trunk/LayoutTests/editing/mac/attributed-string/font-style-variant-effect-expected.txt
r216449 r233913 31 31 NSFont: Times-Italic 16.00 pt. 32 32 NSKern: 0pt 33 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 133 NSStrokeColor: #000000 (sRGB) 34 34 NSStrokeWidth: 0 35 35 [ ] 36 36 NSFont: Times-Roman 16.00 pt. 37 37 NSKern: 0pt 38 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 138 NSStrokeColor: #000000 (sRGB) 39 39 NSStrokeWidth: 0 40 40 [oblique] 41 41 NSFont: Times-Italic 16.00 pt. 42 42 NSKern: 0pt 43 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 143 NSStrokeColor: #000000 (sRGB) 44 44 NSStrokeWidth: 0 45 45 [ ] 46 46 NSFont: Times-Roman 16.00 pt. 47 47 NSKern: 0pt 48 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 148 NSStrokeColor: #000000 (sRGB) 49 49 NSStrokeWidth: 0 50 50 [small-caps] 51 51 NSFont: Times-Roman 16.00 pt. 52 52 NSKern: 0pt 53 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 153 NSStrokeColor: #000000 (sRGB) 54 54 NSStrokeWidth: 0 55 55 [ outline emboss ] 56 56 NSFont: Times-Roman 16.00 pt. 57 57 NSKern: 0pt 58 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 158 NSStrokeColor: #000000 (sRGB) 59 59 NSStrokeWidth: 0 60 60 -
trunk/LayoutTests/editing/mac/attributed-string/font-weight-expected.txt
r216449 r233913 36 36 NSFont: Times-Bold 16.00 pt. 37 37 NSKern: 0pt 38 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 138 NSStrokeColor: #000000 (sRGB) 39 39 NSStrokeWidth: 0 40 40 [ font weight 100 font weight 200 font weight 300 font weight 400 font weight 500 ] 41 41 NSFont: Times-Roman 16.00 pt. 42 42 NSKern: 0pt 43 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 143 NSStrokeColor: #000000 (sRGB) 44 44 NSStrokeWidth: 0 45 45 [font weight 600] 46 46 NSFont: Times-Bold 16.00 pt. 47 47 NSKern: 0pt 48 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 148 NSStrokeColor: #000000 (sRGB) 49 49 NSStrokeWidth: 0 50 50 [ ] 51 51 NSFont: Times-Roman 16.00 pt. 52 52 NSKern: 0pt 53 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 153 NSStrokeColor: #000000 (sRGB) 54 54 NSStrokeWidth: 0 55 55 [font weight 700] 56 56 NSFont: Times-Bold 16.00 pt. 57 57 NSKern: 0pt 58 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 158 NSStrokeColor: #000000 (sRGB) 59 59 NSStrokeWidth: 0 60 60 [ ] 61 61 NSFont: Times-Roman 16.00 pt. 62 62 NSKern: 0pt 63 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 163 NSStrokeColor: #000000 (sRGB) 64 64 NSStrokeWidth: 0 65 65 [font weight 800] 66 66 NSFont: Times-Bold 16.00 pt. 67 67 NSKern: 0pt 68 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 168 NSStrokeColor: #000000 (sRGB) 69 69 NSStrokeWidth: 0 70 70 [ ] 71 71 NSFont: Times-Roman 16.00 pt. 72 72 NSKern: 0pt 73 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 173 NSStrokeColor: #000000 (sRGB) 74 74 NSStrokeWidth: 0 75 75 [font weight 900] 76 76 NSFont: Times-Bold 16.00 pt. 77 77 NSKern: 0pt 78 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 178 NSStrokeColor: #000000 (sRGB) 79 79 NSStrokeWidth: 0 80 80 [ ] 81 81 NSFont: Times-Roman 16.00 pt. 82 82 NSKern: 0pt 83 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 183 NSStrokeColor: #000000 (sRGB) 84 84 NSStrokeWidth: 0 85 85 -
trunk/LayoutTests/editing/mac/attributed-string/letter-spacing-expected.txt
r216449 r233913 27 27 NSFont: Times-Roman 16.00 pt. 28 28 NSKern: 0pt 29 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 129 NSStrokeColor: #000000 (sRGB) 30 30 NSStrokeWidth: 0 31 31 -
trunk/LayoutTests/editing/mac/attributed-string/resources/dump-attributed-string.js
r187932 r233913 1 var shouldAutoDump = true; 2 1 3 (function () { 2 4 if (window.testRunner) 3 5 testRunner.dumpAsText(); 4 6 5 var called = false;6 7 function dumpAttributedString(container) { 7 called = true;8 shouldAutoDump = false; 8 9 9 10 var body = document.body; … … 21 22 } 22 23 23 function serializeAttributedString(attributedString) {24 window.serializeAttributedString = function (attributedString) { 24 25 var string = attributedString.string(); 25 26 var output = ''; … … 68 69 return value.match(/(.+?)\s+P \[\]/)[1]; 69 70 case 'NSColor': 71 case 'NSStrokeColor': 70 72 case 'NSBackgroundColor': 71 73 var parsed = parseNSColorDescription(value); … … 87 89 88 90 function parseNSColorDescription(value) { 89 var match = value.match(/ \s*(\w+)\s*([0-9\.]+)\s*([0-9\.]+)\s*([0-9\.]+)\s*([0-9\.]+)/);91 var match = value.match(/^\s*(\w+).+\s([0-9\.]+)\s+([0-9\.]+)\s+([0-9\.]+)\s+([0-9\.]+)\s*$/); 90 92 return { 91 93 colorSpace: match[1], … … 127 129 128 130 window.onload = function () { 129 (!called)131 if (shouldAutoDump) 130 132 dumpAttributedString(); 131 133 } -
trunk/LayoutTests/editing/mac/attributed-string/text-decorations-expected.txt
r216449 r233913 29 29 NSFont: Times-Roman 16.00 pt. 30 30 NSKern: 0pt 31 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 131 NSStrokeColor: #000000 (sRGB) 32 32 NSStrokeWidth: 0 33 33 NSUnderline: true … … 35 35 NSFont: Times-Roman 16.00 pt. 36 36 NSKern: 0pt 37 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 137 NSStrokeColor: #000000 (sRGB) 38 38 NSStrokeWidth: 0 39 39 [strike] … … 41 41 NSKern: 0pt 42 42 NSStrikethrough: true 43 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 143 NSStrokeColor: #000000 (sRGB) 44 44 NSStrokeWidth: 0 45 45 [ underline and strike ] 46 46 NSFont: Times-Roman 16.00 pt. 47 47 NSKern: 0pt 48 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 148 NSStrokeColor: #000000 (sRGB) 49 49 NSStrokeWidth: 0 50 50 -
trunk/LayoutTests/editing/mac/attributed-string/vertical-align-expected.txt
r216449 r233913 31 31 NSFont: Times-Roman 13.33 pt. 32 32 NSKern: 0pt 33 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 133 NSStrokeColor: #000000 (sRGB) 34 34 NSStrokeWidth: 0 35 35 NSSuperScript: 1 … … 37 37 NSFont: Times-Roman 16.00 pt. 38 38 NSKern: 0pt 39 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 139 NSStrokeColor: #000000 (sRGB) 40 40 NSStrokeWidth: 0 41 41 [sub element] 42 42 NSFont: Times-Roman 13.33 pt. 43 43 NSKern: 0pt 44 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 144 NSStrokeColor: #000000 (sRGB) 45 45 NSStrokeWidth: 0 46 46 NSSuperScript: -1 … … 48 48 NSFont: Times-Roman 16.00 pt. 49 49 NSKern: 0pt 50 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 150 NSStrokeColor: #000000 (sRGB) 51 51 NSStrokeWidth: 0 52 52 [vertical align super] 53 53 NSFont: Times-Roman 16.00 pt. 54 54 NSKern: 0pt 55 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 155 NSStrokeColor: #000000 (sRGB) 56 56 NSStrokeWidth: 0 57 57 NSSuperScript: 1 … … 59 59 NSFont: Times-Roman 16.00 pt. 60 60 NSKern: 0pt 61 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 161 NSStrokeColor: #000000 (sRGB) 62 62 NSStrokeWidth: 0 63 63 [vertical align sub] 64 64 NSFont: Times-Roman 16.00 pt. 65 65 NSKern: 0pt 66 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 166 NSStrokeColor: #000000 (sRGB) 67 67 NSStrokeWidth: 0 68 68 NSSuperScript: -1 … … 70 70 NSFont: Times-Roman 16.00 pt. 71 71 NSKern: 0pt 72 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 172 NSStrokeColor: #000000 (sRGB) 73 73 NSStrokeWidth: 0 74 74 -
trunk/LayoutTests/platform/mac-sierra/editing/mac/attributed-string/anchor-element-expected.txt
r222117 r233913 25 25 HeaderLevel: 0 26 26 [webkit.org] 27 NSColor: rgba(255, 2295, 1530, 6) (IEC6)27 NSColor: #0000ee (NSCustomColorSpace) 28 28 NSFont: Times-Roman 16.00 pt. 29 29 NSKern: 0pt 30 30 NSLink: https://webkit.org/ 31 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0.933333 131 NSStrokeColor: #0000ee (NSCustomColorSpace) 32 32 NSStrokeWidth: 0 33 33 NSUnderline: true … … 35 35 NSFont: Times-Roman 16.00 pt. 36 36 NSKern: 0pt 37 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 137 NSStrokeColor: #000000 (NSCustomColorSpace) 38 38 NSStrokeWidth: 0 39 39 -
trunk/LayoutTests/platform/mac-sierra/editing/mac/attributed-string/basic-expected.txt
r222117 r233913 28 28 NSFont: Times-Roman 16.00 pt. 29 29 NSKern: 0pt 30 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 130 NSStrokeColor: #000000 (NSCustomColorSpace) 31 31 NSStrokeWidth: 0 32 32 [world] 33 NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)34 NSColor: rgba(255, 2295, 1530, 6) (IEC6)33 NSBackgroundColor: #0000ff (NSCustomColorSpace) 34 NSColor: #ffffff (NSCustomColorSpace) 35 35 NSFont: Times-Bold 16.00 pt. 36 36 NSKern: 0pt 37 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 1 1 1 137 NSStrokeColor: #ffffff (NSCustomColorSpace) 38 38 NSStrokeWidth: 0 39 39 [ ] 40 40 NSFont: Times-Roman 16.00 pt. 41 41 NSKern: 0pt 42 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 142 NSStrokeColor: #000000 (NSCustomColorSpace) 43 43 NSStrokeWidth: 0 44 44 [WebKit] 45 NSColor: rgba(255, 2295, 1530, 6) (IEC6)45 NSColor: #0000ee (NSCustomColorSpace) 46 46 NSFont: Times-Roman 16.00 pt. 47 47 NSKern: 0pt 48 48 NSLink: https://webkit.org/ 49 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0.933333 149 NSStrokeColor: #0000ee (NSCustomColorSpace) 50 50 NSStrokeWidth: 0 51 51 NSUnderline: true … … 53 53 NSFont: Times-Roman 16.00 pt. 54 54 NSKern: 0pt 55 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 155 NSStrokeColor: #000000 (NSCustomColorSpace) 56 56 NSStrokeWidth: 0 57 57 [this is a ] 58 NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)58 NSBackgroundColor: #ffff00 (NSCustomColorSpace) 59 59 NSFont: Times-Roman 16.00 pt. 60 60 NSKern: 0pt 61 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 161 NSStrokeColor: #000000 (NSCustomColorSpace) 62 62 NSStrokeWidth: 0 63 63 [t] 64 NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)64 NSBackgroundColor: #ffff00 (NSCustomColorSpace) 65 65 NSFont: Times-Italic 16.00 pt. 66 66 NSKern: 0pt 67 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 167 NSStrokeColor: #000000 (NSCustomColorSpace) 68 68 NSStrokeWidth: 0 69 69 NSUnderline: true 70 70 [est] 71 NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)71 NSBackgroundColor: #ffff00 (NSCustomColorSpace) 72 72 NSFont: Times-Roman 16.00 pt. 73 73 NSKern: 0pt 74 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 174 NSStrokeColor: #000000 (NSCustomColorSpace) 75 75 NSStrokeWidth: 0 76 76 NSUnderline: true 77 77 [ of ] 78 NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)78 NSBackgroundColor: #ffff00 (NSCustomColorSpace) 79 79 NSFont: Times-Roman 16.00 pt. 80 80 NSKern: 0pt 81 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 181 NSStrokeColor: #000000 (NSCustomColorSpace) 82 82 NSStrokeWidth: 0 83 83 [attributed] 84 NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)84 NSBackgroundColor: #ffff00 (NSCustomColorSpace) 85 85 NSFont: Times-Italic 16.00 pt. 86 86 NSKern: 0pt 87 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 187 NSStrokeColor: #000000 (NSCustomColorSpace) 88 88 NSStrokeWidth: 0 89 89 [ string.] 90 NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)90 NSBackgroundColor: #ffff00 (NSCustomColorSpace) 91 91 NSFont: Times-Roman 16.00 pt. 92 92 NSKern: 0pt 93 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 193 NSStrokeColor: #000000 (NSCustomColorSpace) 94 94 NSStrokeWidth: 0 95 95 [ ] 96 96 NSFont: Times-Roman 16.00 pt. 97 97 NSKern: 0pt 98 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 198 NSStrokeColor: #000000 (NSCustomColorSpace) 99 99 NSStrokeWidth: 0 100 100 -
trunk/LayoutTests/platform/mac-sierra/editing/mac/attributed-string/comment-cdata-section-expected.txt
r222117 r233913 27 27 NSFont: Times-Roman 16.00 pt. 28 28 NSKern: 0pt 29 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 129 NSStrokeColor: #000000 (NSCustomColorSpace) 30 30 NSStrokeWidth: 0 31 31 -
trunk/LayoutTests/platform/mac-sierra/editing/mac/attributed-string/font-size-expected.txt
r222117 r233913 36 36 NSFont: Times-Roman 13.33 pt. 37 37 NSKern: 0pt 38 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 138 NSStrokeColor: #000000 (NSCustomColorSpace) 39 39 NSStrokeWidth: 0 40 40 [ ] 41 41 NSFont: Times-Roman 16.00 pt. 42 42 NSKern: 0pt 43 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 143 NSStrokeColor: #000000 (NSCustomColorSpace) 44 44 NSStrokeWidth: 0 45 45 [xx-small] 46 46 NSFont: Times-Roman 9.00 pt. 47 47 NSKern: 0pt 48 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 148 NSStrokeColor: #000000 (NSCustomColorSpace) 49 49 NSStrokeWidth: 0 50 50 [ ] 51 51 NSFont: Times-Roman 16.00 pt. 52 52 NSKern: 0pt 53 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 153 NSStrokeColor: #000000 (NSCustomColorSpace) 54 54 NSStrokeWidth: 0 55 55 [x-small] 56 56 NSFont: Times-Roman 10.00 pt. 57 57 NSKern: 0pt 58 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 158 NSStrokeColor: #000000 (NSCustomColorSpace) 59 59 NSStrokeWidth: 0 60 60 [ ] 61 61 NSFont: Times-Roman 16.00 pt. 62 62 NSKern: 0pt 63 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 163 NSStrokeColor: #000000 (NSCustomColorSpace) 64 64 NSStrokeWidth: 0 65 65 [small] 66 66 NSFont: Times-Roman 13.00 pt. 67 67 NSKern: 0pt 68 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 168 NSStrokeColor: #000000 (NSCustomColorSpace) 69 69 NSStrokeWidth: 0 70 70 [ normal ] 71 71 NSFont: Times-Roman 16.00 pt. 72 72 NSKern: 0pt 73 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 173 NSStrokeColor: #000000 (NSCustomColorSpace) 74 74 NSStrokeWidth: 0 75 75 [large] 76 76 NSFont: Times-Roman 18.00 pt. 77 77 NSKern: 0pt 78 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 178 NSStrokeColor: #000000 (NSCustomColorSpace) 79 79 NSStrokeWidth: 0 80 80 [ ] 81 81 NSFont: Times-Roman 16.00 pt. 82 82 NSKern: 0pt 83 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 183 NSStrokeColor: #000000 (NSCustomColorSpace) 84 84 NSStrokeWidth: 0 85 85 [x-large] 86 86 NSFont: Times-Roman 24.00 pt. 87 87 NSKern: 0pt 88 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 188 NSStrokeColor: #000000 (NSCustomColorSpace) 89 89 NSStrokeWidth: 0 90 90 [ ] 91 91 NSFont: Times-Roman 16.00 pt. 92 92 NSKern: 0pt 93 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 193 NSStrokeColor: #000000 (NSCustomColorSpace) 94 94 NSStrokeWidth: 0 95 95 [xx-large] 96 96 NSFont: Times-Roman 32.00 pt. 97 97 NSKern: 0pt 98 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 198 NSStrokeColor: #000000 (NSCustomColorSpace) 99 99 NSStrokeWidth: 0 100 100 [ ] 101 101 NSFont: Times-Roman 16.00 pt. 102 102 NSKern: 0pt 103 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1103 NSStrokeColor: #000000 (NSCustomColorSpace) 104 104 NSStrokeWidth: 0 105 105 [5pt] 106 106 NSFont: Times-Roman 6.67 pt. 107 107 NSKern: 0pt 108 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1108 NSStrokeColor: #000000 (NSCustomColorSpace) 109 109 NSStrokeWidth: 0 110 110 [ ] 111 111 NSFont: Times-Roman 16.00 pt. 112 112 NSKern: 0pt 113 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1113 NSStrokeColor: #000000 (NSCustomColorSpace) 114 114 NSStrokeWidth: 0 115 115 [15pt] 116 116 NSFont: Times-Roman 20.00 pt. 117 117 NSKern: 0pt 118 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1118 NSStrokeColor: #000000 (NSCustomColorSpace) 119 119 NSStrokeWidth: 0 120 120 [ ] 121 121 NSFont: Times-Roman 16.00 pt. 122 122 NSKern: 0pt 123 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1123 NSStrokeColor: #000000 (NSCustomColorSpace) 124 124 NSStrokeWidth: 0 125 125 -
trunk/LayoutTests/platform/mac-sierra/editing/mac/attributed-string/font-style-variant-effect-expected.txt
r222193 r233913 31 31 NSFont: Times-Italic 16.00 pt. 32 32 NSKern: 0pt 33 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 133 NSStrokeColor: #000000 (NSCustomColorSpace) 34 34 NSStrokeWidth: 0 35 35 [ ] 36 36 NSFont: Times-Roman 16.00 pt. 37 37 NSKern: 0pt 38 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 138 NSStrokeColor: #000000 (NSCustomColorSpace) 39 39 NSStrokeWidth: 0 40 40 [oblique] 41 41 NSFont: Times-Italic 16.00 pt. 42 42 NSKern: 0pt 43 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 143 NSStrokeColor: #000000 (NSCustomColorSpace) 44 44 NSStrokeWidth: 0 45 45 [ ] 46 46 NSFont: Times-Roman 16.00 pt. 47 47 NSKern: 0pt 48 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 148 NSStrokeColor: #000000 (NSCustomColorSpace) 49 49 NSStrokeWidth: 0 50 50 [small-caps] 51 51 NSFont: Times-Roman 16.00 pt. 52 52 NSKern: 0pt 53 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 153 NSStrokeColor: #000000 (NSCustomColorSpace) 54 54 NSStrokeWidth: 0 55 55 [ outline emboss ] 56 56 NSFont: Times-Roman 16.00 pt. 57 57 NSKern: 0pt 58 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 158 NSStrokeColor: #000000 (NSCustomColorSpace) 59 59 NSStrokeWidth: 0 60 60 -
trunk/LayoutTests/platform/mac-sierra/editing/mac/attributed-string/font-weight-expected.txt
r222117 r233913 36 36 NSFont: Times-Bold 16.00 pt. 37 37 NSKern: 0pt 38 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 138 NSStrokeColor: #000000 (NSCustomColorSpace) 39 39 NSStrokeWidth: 0 40 40 [ font weight 100 font weight 200 font weight 300 font weight 400 font weight 500 ] 41 41 NSFont: Times-Roman 16.00 pt. 42 42 NSKern: 0pt 43 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 143 NSStrokeColor: #000000 (NSCustomColorSpace) 44 44 NSStrokeWidth: 0 45 45 [font weight 600] 46 46 NSFont: Times-Bold 16.00 pt. 47 47 NSKern: 0pt 48 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 148 NSStrokeColor: #000000 (NSCustomColorSpace) 49 49 NSStrokeWidth: 0 50 50 [ ] 51 51 NSFont: Times-Roman 16.00 pt. 52 52 NSKern: 0pt 53 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 153 NSStrokeColor: #000000 (NSCustomColorSpace) 54 54 NSStrokeWidth: 0 55 55 [font weight 700] 56 56 NSFont: Times-Bold 16.00 pt. 57 57 NSKern: 0pt 58 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 158 NSStrokeColor: #000000 (NSCustomColorSpace) 59 59 NSStrokeWidth: 0 60 60 [ ] 61 61 NSFont: Times-Roman 16.00 pt. 62 62 NSKern: 0pt 63 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 163 NSStrokeColor: #000000 (NSCustomColorSpace) 64 64 NSStrokeWidth: 0 65 65 [font weight 800] 66 66 NSFont: Times-Bold 16.00 pt. 67 67 NSKern: 0pt 68 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 168 NSStrokeColor: #000000 (NSCustomColorSpace) 69 69 NSStrokeWidth: 0 70 70 [ ] 71 71 NSFont: Times-Roman 16.00 pt. 72 72 NSKern: 0pt 73 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 173 NSStrokeColor: #000000 (NSCustomColorSpace) 74 74 NSStrokeWidth: 0 75 75 [font weight 900] 76 76 NSFont: Times-Bold 16.00 pt. 77 77 NSKern: 0pt 78 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 178 NSStrokeColor: #000000 (NSCustomColorSpace) 79 79 NSStrokeWidth: 0 80 80 [ ] 81 81 NSFont: Times-Roman 16.00 pt. 82 82 NSKern: 0pt 83 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 183 NSStrokeColor: #000000 (NSCustomColorSpace) 84 84 NSStrokeWidth: 0 85 85 -
trunk/LayoutTests/platform/mac-sierra/editing/mac/attributed-string/letter-spacing-expected.txt
r222117 r233913 27 27 NSFont: Times-Roman 16.00 pt. 28 28 NSKern: 0pt 29 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 129 NSStrokeColor: #000000 (NSCustomColorSpace) 30 30 NSStrokeWidth: 0 31 31 -
trunk/LayoutTests/platform/mac-sierra/editing/mac/attributed-string/text-decorations-expected.txt
r222117 r233913 29 29 NSFont: Times-Roman 16.00 pt. 30 30 NSKern: 0pt 31 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 131 NSStrokeColor: #000000 (NSCustomColorSpace) 32 32 NSStrokeWidth: 0 33 33 NSUnderline: true … … 35 35 NSFont: Times-Roman 16.00 pt. 36 36 NSKern: 0pt 37 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 137 NSStrokeColor: #000000 (NSCustomColorSpace) 38 38 NSStrokeWidth: 0 39 39 [strike] … … 41 41 NSKern: 0pt 42 42 NSStrikethrough: true 43 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 143 NSStrokeColor: #000000 (NSCustomColorSpace) 44 44 NSStrokeWidth: 0 45 45 [ underline and strike ] 46 46 NSFont: Times-Roman 16.00 pt. 47 47 NSKern: 0pt 48 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 148 NSStrokeColor: #000000 (NSCustomColorSpace) 49 49 NSStrokeWidth: 0 50 50 -
trunk/LayoutTests/platform/mac-sierra/editing/mac/attributed-string/vertical-align-expected.txt
r222117 r233913 31 31 NSFont: Times-Roman 13.33 pt. 32 32 NSKern: 0pt 33 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 133 NSStrokeColor: #000000 (NSCustomColorSpace) 34 34 NSStrokeWidth: 0 35 35 NSSuperScript: 1 … … 37 37 NSFont: Times-Roman 16.00 pt. 38 38 NSKern: 0pt 39 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 139 NSStrokeColor: #000000 (NSCustomColorSpace) 40 40 NSStrokeWidth: 0 41 41 [sub element] 42 42 NSFont: Times-Roman 13.33 pt. 43 43 NSKern: 0pt 44 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 144 NSStrokeColor: #000000 (NSCustomColorSpace) 45 45 NSStrokeWidth: 0 46 46 NSSuperScript: -1 … … 48 48 NSFont: Times-Roman 16.00 pt. 49 49 NSKern: 0pt 50 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 150 NSStrokeColor: #000000 (NSCustomColorSpace) 51 51 NSStrokeWidth: 0 52 52 [vertical align super] 53 53 NSFont: Times-Roman 16.00 pt. 54 54 NSKern: 0pt 55 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 155 NSStrokeColor: #000000 (NSCustomColorSpace) 56 56 NSStrokeWidth: 0 57 57 NSSuperScript: 1 … … 59 59 NSFont: Times-Roman 16.00 pt. 60 60 NSKern: 0pt 61 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 161 NSStrokeColor: #000000 (NSCustomColorSpace) 62 62 NSStrokeWidth: 0 63 63 [vertical align sub] 64 64 NSFont: Times-Roman 16.00 pt. 65 65 NSKern: 0pt 66 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 166 NSStrokeColor: #000000 (NSCustomColorSpace) 67 67 NSStrokeWidth: 0 68 68 NSSuperScript: -1 … … 70 70 NSFont: Times-Roman 16.00 pt. 71 71 NSKern: 0pt 72 NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 172 NSStrokeColor: #000000 (NSCustomColorSpace) 73 73 NSStrokeWidth: 0 74 74 -
trunk/Tools/ChangeLog
r233911 r233913 1 2018-07-18 Simon Fraser <simon.fraser@apple.com> 2 3 Fix the parsing of colors in attributed string tests, and make it possible to dump the typing attributes 4 https://bugs.webkit.org/show_bug.cgi?id=187747 5 6 Reviewed by Ryosuke Niwa. 7 8 Add textInputController.attributedStringForTyping(), which returns a one-character 9 attributed string whose attributes are the typing attributes, making it possible to 10 test -[WebView typingAttributes]. 11 12 Sadly WebCore's convertObjcValueToValue() doesn't know how to convert NSDictionary, 13 so we can't return -typingAttributes directly. 14 15 * DumpRenderTree/mac/TextInputControllerMac.m: 16 (+[TextInputController isSelectorExcludedFromWebScript:]): 17 (-[TextInputController attributedStringForTyping]): 18 1 19 2018-07-18 Carlos Garcia Campos <cgarcia@igalia.com> 2 20 -
trunk/Tools/DumpRenderTree/mac/TextInputControllerMac.m
r232452 r233913 51 51 #import <WebKit/WebTypesInternal.h> 52 52 #import <WebKit/WebView.h> 53 #import <WebKit/WebViewPrivate.h> 53 54 #import <wtf/mac/AppKitCompatibilityDeclarations.h> 54 55 … … 236 237 || aSelector == @selector(characterIndexForPointX:Y:) 237 238 || aSelector == @selector(validAttributesForMarkedText) 239 || aSelector == @selector(attributedStringForTyping) 238 240 || aSelector == @selector(attributedStringWithString:) 239 241 || aSelector == @selector(setInputMethodHandler:) … … 455 457 } 456 458 459 - (NSMutableAttributedString *)attributedStringForTyping 460 { 461 // The string has to be non-empty. 462 return [[[NSMutableAttributedString alloc] initWithString:@" " attributes:[webView typingAttributes]] autorelease]; 463 } 464 457 465 - (NSMutableAttributedString *)attributedStringWithString:(NSString *)aString 458 466 {
Note: See TracChangeset
for help on using the changeset viewer.