Modified: trunk/LayoutTests/ChangeLog (220713 => 220714)
--- trunk/LayoutTests/ChangeLog 2017-08-14 18:42:26 UTC (rev 220713)
+++ trunk/LayoutTests/ChangeLog 2017-08-14 19:28:33 UTC (rev 220714)
@@ -1,3 +1,14 @@
+2017-08-14 Daniel Bates <[email protected]>
+
+ [css-ui] Implement caret-color support
+ https://bugs.webkit.org/show_bug.cgi?id=166572
+ <rdar://problem/33852589>
+
+ Update GTK expected results following r220706.
+
+ * platform/gtk/editing/style/5065910-expected.txt:
+ * platform/gtk/editing/style/5084241-expected.txt:
+
2017-08-14 Chris Dumez <[email protected]>
Unreviewed, rollout r220622 & r220696
Modified: trunk/LayoutTests/platform/gtk/editing/style/5065910-expected.txt (220713 => 220714)
--- trunk/LayoutTests/platform/gtk/editing/style/5065910-expected.txt 2017-08-14 18:42:26 UTC (rev 220713)
+++ trunk/LayoutTests/platform/gtk/editing/style/5065910-expected.txt 2017-08-14 19:28:33 UTC (rev 220714)
@@ -12,13 +12,14 @@
RenderText {#text} at (0,0) size 148x17
text run at (0,0) width 148: "This text should be red."
RenderBlock {DIV} at (0,17) size 784x17
- RenderInline {FONT} at (0,0) size 124x17 [color=#0000FF]
- RenderText {#text} at (0,0) size 124x17
- text run at (0,0) width 124: "This text should be "
- RenderInline {FONT} at (0,0) size 235x17 [color=#008000]
- RenderText {#text} at (124,0) size 235x17
- text run at (124,0) width 235: "a combination of green and blue, not "
- RenderInline {FONT} at (0,0) size 24x17 [color=#0000FF]
- RenderText {#text} at (359,0) size 24x17
- text run at (359,0) width 24: "red."
-caret: position 37 of child 0 {#text} of child 1 {FONT} of child 1 {DIV} of child 2 {DIV} of body
+ RenderInline {SPAN} at (0,0) size 383x17
+ RenderInline {FONT} at (0,0) size 124x17 [color=#0000FF]
+ RenderText {#text} at (0,0) size 124x17
+ text run at (0,0) width 124: "This text should be "
+ RenderInline {FONT} at (0,0) size 235x17 [color=#008000]
+ RenderText {#text} at (124,0) size 235x17
+ text run at (124,0) width 235: "a combination of green and blue, not "
+ RenderInline {FONT} at (0,0) size 24x17 [color=#0000FF]
+ RenderText {#text} at (359,0) size 24x17
+ text run at (359,0) width 24: "red."
+caret: position 37 of child 0 {#text} of child 1 {FONT} of child 0 {SPAN} of child 1 {DIV} of child 2 {DIV} of body
Modified: trunk/LayoutTests/platform/gtk/editing/style/5084241-expected.txt (220713 => 220714)
--- trunk/LayoutTests/platform/gtk/editing/style/5084241-expected.txt 2017-08-14 18:42:26 UTC (rev 220713)
+++ trunk/LayoutTests/platform/gtk/editing/style/5084241-expected.txt 2017-08-14 19:28:33 UTC (rev 220714)
@@ -8,10 +8,11 @@
text run at (0,0) width 771: "This tests for a bug where deleting everything in a paragraph of colored text would prevent the user from changing the text"
text run at (0,17) width 36: "color."
RenderBlock {DIV} at (0,50) size 784x17
- RenderInline {FONT} at (0,0) size 148x17 [color=#FF0000]
- RenderText {#text} at (0,0) size 148x17
- text run at (0,0) width 148: "This text should be red."
- RenderInline {FONT} at (0,0) size 155x17 [color=#0000FF]
- RenderText {#text} at (148,0) size 155x17
- text run at (148,0) width 155: "This text should be blue."
-caret: position 25 of child 0 {#text} of child 1 {FONT} of child 2 {DIV} of body
+ RenderInline {SPAN} at (0,0) size 303x17
+ RenderInline {FONT} at (0,0) size 148x17 [color=#FF0000]
+ RenderText {#text} at (0,0) size 148x17
+ text run at (0,0) width 148: "This text should be red."
+ RenderInline {FONT} at (0,0) size 155x17 [color=#0000FF]
+ RenderText {#text} at (148,0) size 155x17
+ text run at (148,0) width 155: "This text should be blue."
+caret: position 25 of child 0 {#text} of child 1 {FONT} of child 0 {SPAN} of child 2 {DIV} of body