Diff
Modified: trunk/LayoutTests/ChangeLog (216448 => 216449)
--- trunk/LayoutTests/ChangeLog 2017-05-08 20:11:29 UTC (rev 216448)
+++ trunk/LayoutTests/ChangeLog 2017-05-08 20:25:46 UTC (rev 216449)
@@ -1,3 +1,23 @@
+2017-05-08 Beth Dakin <bda...@apple.com>
+
+ WebKit should default to using sRGB with NSColor conversion instead of device
+ color space
+ https://bugs.webkit.org/show_bug.cgi?id=171745
+ -and corresponding-
+ rdar://problem/28314183
+
+ Reviewed by Tim Horton.
+
+ * editing/mac/attributed-string/anchor-element-expected.txt:
+ * editing/mac/attributed-string/basic-expected.txt:
+ * editing/mac/attributed-string/comment-cdata-section-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:
+
2017-05-04 Jiewen Tan <jiewen_...@apple.com>
Search events should not fire synchronously for search type input elements with incremental attribute set
Modified: trunk/LayoutTests/editing/mac/attributed-string/anchor-element-expected.txt (216448 => 216449)
--- trunk/LayoutTests/editing/mac/attributed-string/anchor-element-expected.txt 2017-05-08 20:11:29 UTC (rev 216448)
+++ trunk/LayoutTests/editing/mac/attributed-string/anchor-element-expected.txt 2017-05-08 20:25:46 UTC (rev 216449)
@@ -34,6 +34,6 @@
[ ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
Modified: trunk/LayoutTests/editing/mac/attributed-string/basic-expected.txt (216448 => 216449)
--- trunk/LayoutTests/editing/mac/attributed-string/basic-expected.txt 2017-05-08 20:11:29 UTC (rev 216448)
+++ trunk/LayoutTests/editing/mac/attributed-string/basic-expected.txt 2017-05-08 20:25:46 UTC (rev 216449)
@@ -27,19 +27,19 @@
[hello ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[world]
NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)
- NSColor: #ffffff (NSDeviceRGBColorSpace)
+ NSColor: rgba(255, 2295, 1530, 6) (IEC6)
NSFont: Times-Bold 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 1 1 1 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 1 1 1 1
NSStrokeWidth: 0
[ ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[WebKit]
NSColor: rgba(255, 2295, 1530, 6) (IEC6)
@@ -52,19 +52,19 @@
[.\n]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[this is a ]
NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[t]
NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)
NSFont: Times-Italic 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
NSUnderline: true
[est]
@@ -71,7 +71,7 @@
NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
NSUnderline: true
[ of ]
@@ -78,23 +78,23 @@
NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[attributed]
NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)
NSFont: Times-Italic 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[ string.]
NSBackgroundColor: rgba(255, 2295, 1530, 6) (IEC6)
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[ ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
Modified: trunk/LayoutTests/editing/mac/attributed-string/comment-cdata-section-expected.txt (216448 => 216449)
--- trunk/LayoutTests/editing/mac/attributed-string/comment-cdata-section-expected.txt 2017-05-08 20:11:29 UTC (rev 216448)
+++ trunk/LayoutTests/editing/mac/attributed-string/comment-cdata-section-expected.txt 2017-05-08 20:25:46 UTC (rev 216449)
@@ -26,6 +26,6 @@
[hello world. ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
Modified: trunk/LayoutTests/editing/mac/attributed-string/font-size-expected.txt (216448 => 216449)
--- trunk/LayoutTests/editing/mac/attributed-string/font-size-expected.txt 2017-05-08 20:11:29 UTC (rev 216448)
+++ trunk/LayoutTests/editing/mac/attributed-string/font-size-expected.txt 2017-05-08 20:25:46 UTC (rev 216449)
@@ -35,91 +35,91 @@
[small element]
NSFont: Times-Roman 13.33 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[ ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[xx-small]
NSFont: Times-Roman 9.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[ ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[x-small]
NSFont: Times-Roman 10.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[ ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[small]
NSFont: Times-Roman 13.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[ normal ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[large]
NSFont: Times-Roman 18.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[ ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[x-large]
NSFont: Times-Roman 24.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[ ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[xx-large]
NSFont: Times-Roman 32.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[ ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[5pt]
NSFont: Times-Roman 6.67 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[ ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[15pt]
NSFont: Times-Roman 20.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[ ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
Modified: trunk/LayoutTests/editing/mac/attributed-string/font-style-variant-effect-expected.txt (216448 => 216449)
--- trunk/LayoutTests/editing/mac/attributed-string/font-style-variant-effect-expected.txt 2017-05-08 20:11:29 UTC (rev 216448)
+++ trunk/LayoutTests/editing/mac/attributed-string/font-style-variant-effect-expected.txt 2017-05-08 20:25:46 UTC (rev 216449)
@@ -30,31 +30,31 @@
[italic]
NSFont: Times-Italic 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[ ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[oblique]
NSFont: Times-Italic 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[ ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[small-caps]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[ outline emboss ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
Modified: trunk/LayoutTests/editing/mac/attributed-string/font-weight-expected.txt (216448 => 216449)
--- trunk/LayoutTests/editing/mac/attributed-string/font-weight-expected.txt 2017-05-08 20:11:29 UTC (rev 216448)
+++ trunk/LayoutTests/editing/mac/attributed-string/font-weight-expected.txt 2017-05-08 20:25:46 UTC (rev 216449)
@@ -35,51 +35,51 @@
[bold]
NSFont: Times-Bold 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[ font weight 100 font weight 200 font weight 300 font weight 400 font weight 500 ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[font weight 600]
NSFont: Times-Bold 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[ ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[font weight 700]
NSFont: Times-Bold 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[ ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[font weight 800]
NSFont: Times-Bold 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[ ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[font weight 900]
NSFont: Times-Bold 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[ ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
Modified: trunk/LayoutTests/editing/mac/attributed-string/letter-spacing-expected.txt (216448 => 216449)
--- trunk/LayoutTests/editing/mac/attributed-string/letter-spacing-expected.txt 2017-05-08 20:11:29 UTC (rev 216448)
+++ trunk/LayoutTests/editing/mac/attributed-string/letter-spacing-expected.txt 2017-05-08 20:25:46 UTC (rev 216449)
@@ -26,6 +26,6 @@
[3pt ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
Modified: trunk/LayoutTests/editing/mac/attributed-string/text-decorations-expected.txt (216448 => 216449)
--- trunk/LayoutTests/editing/mac/attributed-string/text-decorations-expected.txt 2017-05-08 20:11:29 UTC (rev 216448)
+++ trunk/LayoutTests/editing/mac/attributed-string/text-decorations-expected.txt 2017-05-08 20:25:46 UTC (rev 216449)
@@ -28,23 +28,23 @@
[underline]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
NSUnderline: true
[ ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[strike]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
NSStrikethrough: true
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[ underline and strike ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
Modified: trunk/LayoutTests/editing/mac/attributed-string/vertical-align-expected.txt (216448 => 216449)
--- trunk/LayoutTests/editing/mac/attributed-string/vertical-align-expected.txt 2017-05-08 20:11:29 UTC (rev 216448)
+++ trunk/LayoutTests/editing/mac/attributed-string/vertical-align-expected.txt 2017-05-08 20:25:46 UTC (rev 216449)
@@ -30,45 +30,45 @@
[sup element]
NSFont: Times-Roman 13.33 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
NSSuperScript: 1
[ ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[sub element]
NSFont: Times-Roman 13.33 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
NSSuperScript: -1
[ ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[vertical align super]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
NSSuperScript: 1
[ ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[vertical align sub]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
NSSuperScript: -1
[ vertical align 50% ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
Modified: trunk/LayoutTests/platform/mac-elcapitan/editing/mac/attributed-string/font-style-variant-effect-expected.txt (216448 => 216449)
--- trunk/LayoutTests/platform/mac-elcapitan/editing/mac/attributed-string/font-style-variant-effect-expected.txt 2017-05-08 20:11:29 UTC (rev 216448)
+++ trunk/LayoutTests/platform/mac-elcapitan/editing/mac/attributed-string/font-style-variant-effect-expected.txt 2017-05-08 20:25:46 UTC (rev 216449)
@@ -30,21 +30,21 @@
[italic]
NSFont: Times-Italic 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[ ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[oblique]
NSFont: Times-Italic 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
[ small-caps outline emboss ]
NSFont: Times-Roman 16.00 pt.
NSKern: 0pt
- NSStrokeColor: NSDeviceRGBColorSpace 0 0 0 1
+ NSStrokeColor: NSCustomColorSpace sRGB IEC61966-2.1 colorspace 0 0 0 1
NSStrokeWidth: 0
Modified: trunk/Source/WebCore/ChangeLog (216448 => 216449)
--- trunk/Source/WebCore/ChangeLog 2017-05-08 20:11:29 UTC (rev 216448)
+++ trunk/Source/WebCore/ChangeLog 2017-05-08 20:25:46 UTC (rev 216449)
@@ -1,3 +1,17 @@
+2017-05-08 Beth Dakin <bda...@apple.com>
+
+ WebKit should default to using sRGB with NSColor conversion instead of device
+ color space
+ https://bugs.webkit.org/show_bug.cgi?id=171745
+ -and corresponding-
+ rdar://problem/28314183
+
+ Reviewed by Tim Horton.
+
+ * platform/graphics/mac/ColorMac.mm:
+ (WebCore::makeRGBAFromNSColor):
+ (WebCore::nsColor):
+
2017-05-08 Alex Christensen <achristen...@webkit.org>
Reduce PassRefPtr use
Modified: trunk/Source/WebCore/platform/graphics/mac/ColorMac.mm (216448 => 216449)
--- trunk/Source/WebCore/platform/graphics/mac/ColorMac.mm 2017-05-08 20:11:29 UTC (rev 216448)
+++ trunk/Source/WebCore/platform/graphics/mac/ColorMac.mm 2017-05-08 20:25:46 UTC (rev 216449)
@@ -58,7 +58,7 @@
CGFloat alpha;
BEGIN_BLOCK_OBJC_EXCEPTIONS;
- NSColor *rgbColor = [c colorUsingColorSpaceName:NSDeviceRGBColorSpace];
+ NSColor *rgbColor = [c colorUsingColorSpace:[NSColorSpace sRGBColorSpace]];
if (!rgbColor)
return makeRGBA(0, 0, 0, 0);
@@ -77,17 +77,17 @@
{
if (!color.isValid()) {
// Need this to avoid returning nil because cachedRGBAValues will default to 0.
- static NeverDestroyed<NSColor *> clearColor = [[NSColor colorWithDeviceRed:0 green:0 blue:0 alpha:0] retain];
+ static NeverDestroyed<NSColor *> clearColor = [[NSColor colorWithSRGBRed:0 green:0 blue:0 alpha:0] retain];
return clearColor;
}
if (Color::isBlackColor(color)) {
- static NeverDestroyed<NSColor *> blackColor = [[NSColor colorWithDeviceRed:0 green:0 blue:0 alpha:1] retain];
+ static NeverDestroyed<NSColor *> blackColor = [[NSColor colorWithSRGBRed:0 green:0 blue:0 alpha:1] retain];
return blackColor;
}
if (Color::isWhiteColor(color)) {
- static NeverDestroyed<NSColor *> whiteColor = [[NSColor colorWithDeviceRed:1 green:1 blue:1 alpha:1] retain];
+ static NeverDestroyed<NSColor *> whiteColor = [[NSColor colorWithSRGBRed:1 green:1 blue:1 alpha:1] retain];
return whiteColor;
}
