+2015-03-08 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Last test gardening after r177774 (for reals this time)
+ https://bugs.webkit.org/show_bug.cgi?id=139968
+
+ Unreviewed.
+
+ * platform/mac/TestExpectations:
+ * platform/mac/svg/text/select-textLength-spacingAndGlyphs-squeeze-1-expected.txt:
+ * platform/mac/svg/text/select-textLength-spacingAndGlyphs-squeeze-2-expected.txt:
+ * platform/mac/svg/text/select-textLength-spacingAndGlyphs-squeeze-3-expected.txt:
+ * platform/mac/svg/text/select-textLength-spacingAndGlyphs-squeeze-4-expected.txt:
+ * platform/mac/svg/text/select-textLength-spacingAndGlyphs-stretch-1-expected.txt:
+ * platform/mac/svg/text/select-textLength-spacingAndGlyphs-stretch-2-expected.txt:
+ * platform/mac/svg/text/select-textLength-spacingAndGlyphs-stretch-3-expected.txt:
+ * svg/text/select-textLength-spacingAndGlyphs-squeeze-1.svg:
+ * svg/text/select-textLength-spacingAndGlyphs-squeeze-2.svg:
+ * svg/text/select-textLength-spacingAndGlyphs-squeeze-3.svg:
+ * svg/text/select-textLength-spacingAndGlyphs-squeeze-4.svg:
+ * svg/text/select-textLength-spacingAndGlyphs-stretch-1.svg:
+ * svg/text/select-textLength-spacingAndGlyphs-stretch-2.svg:
+ * svg/text/select-textLength-spacingAndGlyphs-stretch-3.svg:
+
2015-03-08 Benjamin Poulain <benjamin@webkit.org>
Fix the tests for the new double-child descendant in css-set-selector-text
webkit.org/b/140589 svg/text/text-text-06-t.svg [ Failure ]
webkit.org/b/137098 svg/text/text-hkern.svg [ Failure ]
webkit.org/b/137100 svg/text/text-vkern.svg [ Failure ]
-webkit.org/b/139968 svg/text/select-textLength-spacingAndGlyphs-squeeze-1.svg [ Failure ]
-webkit.org/b/139968 svg/text/select-textLength-spacingAndGlyphs-squeeze-2.svg [ Failure ]
-webkit.org/b/139968 svg/text/select-textLength-spacingAndGlyphs-squeeze-3.svg [ Failure ]
-webkit.org/b/139968 svg/text/select-textLength-spacingAndGlyphs-squeeze-4.svg [ Failure ]
-webkit.org/b/139968 svg/text/select-textLength-spacingAndGlyphs-stretch-1.svg [ Failure ]
-webkit.org/b/139968 svg/text/select-textLength-spacingAndGlyphs-stretch-2.svg [ Failure ]
-webkit.org/b/139968 svg/text/select-textLength-spacingAndGlyphs-stretch-3.svg [ Failure ]
webkit.org/b/142470 svg/custom/svg-fonts-without-missing-glyph.xhtml [ Pass Failure ]
webkit.org/b/140537 fast/css/ex-unit-with-no-x-height.html [ Failure ]
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (47,4) size 253x57
- RenderSVGContainer {g} at (47,4) size 73x57
+ RenderSVGContainer {g} at (47,4) size 69x57
RenderSVGPath {svg:line} at (47,4) size 6x57 [stroke={[type=SOLID] [color=#008000]}] [fill={[type=SOLID] [color=#000000]}] [x1=10.00] [y1=0.95] [x2=10.00] [y2=12.17]
- RenderSVGPath {svg:line} at (114,4) size 6x57 [stroke={[type=SOLID] [color=#008000]}] [fill={[type=SOLID] [color=#000000]}] [x1=23.39] [y1=0.95] [x2=23.39] [y2=12.17]
- RenderSVGRect {svg:rect} at (50,4) size 67x57 [fill={[type=SOLID] [color=#FF0000] [opacity=0.40]}] [x=10.00] [y=0.95] [width=13.39] [height=11.17]
+ RenderSVGPath {svg:line} at (110,4) size 6x57 [stroke={[type=SOLID] [color=#008000]}] [fill={[type=SOLID] [color=#000000]}] [x1=22.59] [y1=0.95] [x2=22.59] [y2=12.17]
+ RenderSVGRect {svg:rect} at (50,4) size 63x57 [fill={[type=SOLID] [color=#FF0000] [opacity=0.40]}] [x=10.00] [y=0.95] [width=12.59] [height=11.17]
RenderSVGText {text} at (10,0) size 50x13 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 50x12
- chunk 1 text run 1 at (10.00,10.00) startOffset 0 endOffset 15 width 73.20: "Text to Squeeze"
+ chunk 1 text run 1 at (10.00,10.00) startOffset 0 endOffset 15 width 72.82: "Text to Squeeze"
selection start: position 0 of child 0 {#text} of child 5 {text} of child 0 {svg} of document
-selection end: position 4 of child 0 {#text} of child 5 {text} of child 0 {svg} of document
+selection end: position 2 of child 0 {#text} of child 5 {text} of child 0 {svg} of document
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (50,4) size 250x57
- RenderSVGContainer {g} at (124,4) size 34x57
- RenderSVGPath {svg:line} at (124,4) size 6x57 [stroke={[type=SOLID] [color=#008000]}] [fill={[type=SOLID] [color=#000000]}] [x1=25.30] [y1=0.95] [x2=25.30] [y2=12.17]
- RenderSVGPath {svg:line} at (152,4) size 6x57 [stroke={[type=SOLID] [color=#008000]}] [fill={[type=SOLID] [color=#000000]}] [x1=31.04] [y1=0.95] [x2=31.04] [y2=12.17]
- RenderSVGRect {svg:rect} at (126,4) size 30x57 [fill={[type=SOLID] [color=#FF0000] [opacity=0.40]}] [x=25.30] [y=0.95] [width=5.74] [height=11.17]
+ RenderSVGContainer {g} at (119,4) size 35x57
+ RenderSVGPath {svg:line} at (119,4) size 6x57 [stroke={[type=SOLID] [color=#008000]}] [fill={[type=SOLID] [color=#000000]}] [x1=24.50] [y1=0.95] [x2=24.50] [y2=12.17]
+ RenderSVGPath {svg:line} at (148,4) size 6x57 [stroke={[type=SOLID] [color=#008000]}] [fill={[type=SOLID] [color=#000000]}] [x1=30.23] [y1=0.95] [x2=30.23] [y2=12.17]
+ RenderSVGRect {svg:rect} at (122,4) size 30x57 [fill={[type=SOLID] [color=#FF0000] [opacity=0.40]}] [x=24.50] [y=0.95] [width=5.73] [height=11.17]
RenderSVGText {text} at (10,0) size 50x13 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 50x12
- chunk 1 text run 1 at (10.00,10.00) startOffset 0 endOffset 15 width 73.20: "Text to Squeeze"
-selection start: position 5 of child 0 {#text} of child 5 {text} of child 0 {svg} of document
-selection end: position 7 of child 0 {#text} of child 5 {text} of child 0 {svg} of document
+ chunk 1 text run 1 at (10.00,10.00) startOffset 0 endOffset 15 width 72.82: "Text to Squeeze"
+selection start: position 3 of child 0 {#text} of child 5 {text} of child 0 {svg} of document
+selection end: position 4 of child 0 {#text} of child 5 {text} of child 0 {svg} of document
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (50,4) size 250x57
- RenderSVGContainer {g} at (162,4) size 67x57
- RenderSVGPath {svg:line} at (162,4) size 6x57 [stroke={[type=SOLID] [color=#008000]}] [fill={[type=SOLID] [color=#000000]}] [x1=32.95] [y1=0.95] [x2=32.95] [y2=12.17]
- RenderSVGPath {svg:line} at (223,4) size 6x57 [stroke={[type=SOLID] [color=#008000]}] [fill={[type=SOLID] [color=#000000]}] [x1=45.11] [y1=0.95] [x2=45.11] [y2=12.17]
- RenderSVGRect {svg:rect} at (164,4) size 62x57 [fill={[type=SOLID] [color=#FF0000] [opacity=0.40]}] [x=32.95] [y=0.95] [width=12.16] [height=11.17]
+ RenderSVGContainer {g} at (158,4) size 67x57
+ RenderSVGPath {svg:line} at (158,4) size 6x57 [stroke={[type=SOLID] [color=#008000]}] [fill={[type=SOLID] [color=#000000]}] [x1=32.13] [y1=0.95] [x2=32.13] [y2=12.17]
+ RenderSVGPath {svg:line} at (219,4) size 6x57 [stroke={[type=SOLID] [color=#008000]}] [fill={[type=SOLID] [color=#000000]}] [x1=44.35] [y1=0.95] [x2=44.35] [y2=12.17]
+ RenderSVGRect {svg:rect} at (160,4) size 62x57 [fill={[type=SOLID] [color=#FF0000] [opacity=0.40]}] [x=32.13] [y=0.95] [width=12.22] [height=11.17]
RenderSVGText {text} at (10,0) size 50x13 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 50x12
- chunk 1 text run 1 at (10.00,10.00) startOffset 0 endOffset 15 width 73.20: "Text to Squeeze"
-selection start: position 8 of child 0 {#text} of child 5 {text} of child 0 {svg} of document
-selection end: position 11 of child 0 {#text} of child 5 {text} of child 0 {svg} of document
+ chunk 1 text run 1 at (10.00,10.00) startOffset 0 endOffset 15 width 72.82: "Text to Squeeze"
+selection start: position 5 of child 0 {#text} of child 5 {text} of child 0 {svg} of document
+selection end: position 8 of child 0 {#text} of child 5 {text} of child 0 {svg} of document
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
- RenderSVGRoot {svg} at (47,4) size 256x57
- RenderSVGContainer {g} at (47,4) size 256x57
+ RenderSVGRoot {svg} at (47,4) size 253x57
+ RenderSVGContainer {g} at (47,4) size 252x57
RenderSVGPath {svg:line} at (47,4) size 6x57 [stroke={[type=SOLID] [color=#008000]}] [fill={[type=SOLID] [color=#000000]}] [x1=10.00] [y1=0.95] [x2=10.00] [y2=12.17]
- RenderSVGPath {svg:line} at (297,4) size 6x57 [stroke={[type=SOLID] [color=#008000]}] [fill={[type=SOLID] [color=#000000]}] [x1=60.00] [y1=0.95] [x2=60.00] [y2=12.17]
- RenderSVGRect {svg:rect} at (50,4) size 251x57 [fill={[type=SOLID] [color=#FF0000] [opacity=0.40]}] [x=10.00] [y=0.95] [width=50.00] [height=11.17]
+ RenderSVGPath {svg:line} at (293,4) size 6x57 [stroke={[type=SOLID] [color=#008000]}] [fill={[type=SOLID] [color=#000000]}] [x1=59.24] [y1=0.95] [x2=59.24] [y2=12.17]
+ RenderSVGRect {svg:rect} at (50,4) size 247x57 [fill={[type=SOLID] [color=#FF0000] [opacity=0.40]}] [x=10.00] [y=0.95] [width=49.24] [height=11.17]
RenderSVGText {text} at (10,0) size 50x13 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 50x12
- chunk 1 text run 1 at (10.00,10.00) startOffset 0 endOffset 15 width 73.20: "Text to Squeeze"
+ chunk 1 text run 1 at (10.00,10.00) startOffset 0 endOffset 15 width 72.82: "Text to Squeeze"
selection start: position 0 of child 0 {#text} of child 5 {text} of child 0 {svg} of document
-selection end: position 15 of child 0 {#text} of child 5 {text} of child 0 {svg} of document
+selection end: position 11 of child 0 {#text} of child 5 {text} of child 0 {svg} of document
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (47,4) size 703x57
- RenderSVGContainer {g} at (47,4) size 216x57
+ RenderSVGContainer {g} at (47,4) size 203x57
RenderSVGPath {svg:line} at (47,4) size 6x57 [stroke={[type=SOLID] [color=#008000]}] [fill={[type=SOLID] [color=#000000]}] [x1=10.00] [y1=0.95] [x2=10.00] [y2=12.17]
- RenderSVGPath {svg:line} at (257,4) size 6x57 [stroke={[type=SOLID] [color=#008000]}] [fill={[type=SOLID] [color=#000000]}] [x1=51.96] [y1=0.95] [x2=51.96] [y2=12.17]
- RenderSVGRect {svg:rect} at (50,4) size 210x57 [fill={[type=SOLID] [color=#FF0000] [opacity=0.40]}] [x=10.00] [y=0.95] [width=41.96] [height=11.17]
+ RenderSVGPath {svg:line} at (244,4) size 6x57 [stroke={[type=SOLID] [color=#008000]}] [fill={[type=SOLID] [color=#000000]}] [x1=49.49] [y1=0.95] [x2=49.49] [y2=12.17]
+ RenderSVGRect {svg:rect} at (50,4) size 198x57 [fill={[type=SOLID] [color=#FF0000] [opacity=0.40]}] [x=10.00] [y=0.95] [width=39.49] [height=11.17]
RenderSVGText {text} at (10,0) size 140x13 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 140x12
- chunk 1 text run 1 at (10.00,10.00) startOffset 0 endOffset 15 width 65.40: "Text to Stretch"
+ chunk 1 text run 1 at (10.00,10.00) startOffset 0 endOffset 15 width 65.02: "Text to Stretch"
selection start: position 0 of child 0 {#text} of child 5 {text} of child 0 {svg} of document
-selection end: position 4 of child 0 {#text} of child 5 {text} of child 0 {svg} of document
+selection end: position 9 of child 0 {#text} of child 5 {text} of child 0 {svg} of document
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (50,4) size 700x57
- RenderSVGContainer {g} at (287,4) size 96x57
- RenderSVGPath {svg:line} at (287,4) size 6x57 [stroke={[type=SOLID] [color=#008000]}] [fill={[type=SOLID] [color=#000000]}] [x1=57.95] [y1=0.95] [x2=57.95] [y2=12.17]
- RenderSVGPath {svg:line} at (377,4) size 6x57 [stroke={[type=SOLID] [color=#008000]}] [fill={[type=SOLID] [color=#000000]}] [x1=75.93] [y1=0.95] [x2=75.93] [y2=12.17]
- RenderSVGRect {svg:rect} at (289,4) size 91x57 [fill={[type=SOLID] [color=#FF0000] [opacity=0.40]}] [x=57.95] [y=0.95] [width=17.98] [height=11.17]
+ RenderSVGContainer {g} at (274,4) size 96x57
+ RenderSVGPath {svg:line} at (274,4) size 6x57 [stroke={[type=SOLID] [color=#008000]}] [fill={[type=SOLID] [color=#000000]}] [x1=55.47] [y1=0.95] [x2=55.47] [y2=12.17]
+ RenderSVGPath {svg:line} at (364,4) size 6x57 [stroke={[type=SOLID] [color=#008000]}] [fill={[type=SOLID] [color=#000000]}] [x1=73.42] [y1=0.95] [x2=73.42] [y2=12.17]
+ RenderSVGRect {svg:rect} at (277,4) size 91x57 [fill={[type=SOLID] [color=#FF0000] [opacity=0.40]}] [x=55.47] [y=0.95] [width=17.96] [height=11.17]
RenderSVGText {text} at (10,0) size 140x13 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 140x12
- chunk 1 text run 1 at (10.00,10.00) startOffset 0 endOffset 15 width 65.40: "Text to Stretch"
-selection start: position 5 of child 0 {#text} of child 5 {text} of child 0 {svg} of document
-selection end: position 7 of child 0 {#text} of child 5 {text} of child 0 {svg} of document
+ chunk 1 text run 1 at (10.00,10.00) startOffset 0 endOffset 15 width 65.02: "Text to Stretch"
+selection start: position 11 of child 0 {#text} of child 5 {text} of child 0 {svg} of document
+selection end: position 14 of child 0 {#text} of child 5 {text} of child 0 {svg} of document
RenderView at (0,0) size 800x600
layer at (0,0) size 800x600
RenderSVGRoot {svg} at (50,4) size 700x57
- RenderSVGContainer {g} at (407,4) size 143x57
- RenderSVGPath {svg:line} at (407,4) size 6x57 [stroke={[type=SOLID] [color=#008000]}] [fill={[type=SOLID] [color=#000000]}] [x1=81.93] [y1=0.95] [x2=81.93] [y2=12.17]
- RenderSVGPath {svg:line} at (544,4) size 6x57 [stroke={[type=SOLID] [color=#008000]}] [fill={[type=SOLID] [color=#000000]}] [x1=109.33] [y1=0.95] [x2=109.33] [y2=12.17]
- RenderSVGRect {svg:rect} at (409,4) size 138x57 [fill={[type=SOLID] [color=#FF0000] [opacity=0.40]}] [x=81.93] [y=0.95] [width=27.40] [height=11.17]
+ RenderSVGContainer {g} at (394,4) size 144x57
+ RenderSVGPath {svg:line} at (394,4) size 6x57 [stroke={[type=SOLID] [color=#008000]}] [fill={[type=SOLID] [color=#000000]}] [x1=79.41] [y1=0.95] [x2=79.41] [y2=12.17]
+ RenderSVGPath {svg:line} at (532,4) size 6x57 [stroke={[type=SOLID] [color=#008000]}] [fill={[type=SOLID] [color=#000000]}] [x1=106.92] [y1=0.95] [x2=106.92] [y2=12.17]
+ RenderSVGRect {svg:rect} at (397,4) size 138x57 [fill={[type=SOLID] [color=#FF0000] [opacity=0.40]}] [x=79.41] [y=0.95] [width=27.51] [height=11.17]
RenderSVGText {text} at (10,0) size 140x13 contains 1 chunk(s)
RenderSVGInlineText {#text} at (0,0) size 140x12
- chunk 1 text run 1 at (10.00,10.00) startOffset 0 endOffset 15 width 65.40: "Text to Stretch"
-selection start: position 8 of child 0 {#text} of child 5 {text} of child 0 {svg} of document
-selection end: position 11 of child 0 {#text} of child 5 {text} of child 0 {svg} of document
+ chunk 1 text run 1 at (10.00,10.00) startOffset 0 endOffset 15 width 65.02: "Text to Stretch"
+caret: position 15 of child 0 {#text} of child 5 {text} of child 0 {svg} of document
<text id="test" x="10" y="10" font-family="Arial" font-size="10" textLength="50" lengthAdjust="spacingAndGlyphs">Text to Squeeze</text>
<script xlink:href="resources/SelectionTestCase.js"/>
-<script>selectRange("test", 0, 3, "Text");</script>
+<script>selectRange("test", 0, 3, "Te");</script>
</svg>
<text id="test" x="10" y="10" font-family="Arial" font-size="10" textLength="50" lengthAdjust="spacingAndGlyphs">Text to Squeeze</text>
<script xlink:href="resources/SelectionTestCase.js"/>
-<script>selectRange("test", 5, 6, "to");</script>
+<script>selectRange("test", 5, 6, "t");</script>
</svg>
<text id="test" x="10" y="10" font-family="Arial" font-size="10" textLength="50" lengthAdjust="spacingAndGlyphs">Text to Squeeze</text>
<script xlink:href="resources/SelectionTestCase.js"/>
-<script>selectRange("test", 8, 10, "Squ");</script>
+<script>selectRange("test", 8, 10, "to ");</script>
</svg>
<text id="test" x="10" y="10" font-family="Arial" font-size="10" textLength="50" lengthAdjust="spacingAndGlyphs">Text to Squeeze</text>
<script xlink:href="resources/SelectionTestCase.js"/>
-<script>selectRange("test", 0, 14, "Text to Squeeze");</script>
+<script>selectRange("test", 0, 14, "Text to Squ");</script>
</svg>
<text id="test" x="10" y="10" font-family="Arial" font-size="10" textLength="140" lengthAdjust="spacingAndGlyphs">Text to Stretch</text>
<script xlink:href="resources/SelectionTestCase.js"/>
-<script>selectRange("test", 0, 3, "Text");</script>
+<script>selectRange("test", 0, 3, "Text to S");</script>
</svg>
<text id="test" x="10" y="10" font-family="Arial" font-size="10" textLength="140" lengthAdjust="spacingAndGlyphs">Text to Stretch</text>
<script xlink:href="resources/SelectionTestCase.js"/>
-<script>selectRange("test", 5, 6, "to");</script>
+<script>selectRange("test", 5, 6, "etc");</script>
</svg>
<text id="test" x="10" y="10" font-family="Arial" font-size="10" textLength="140" lengthAdjust="spacingAndGlyphs">Text to Stretch</text>
<script xlink:href="resources/SelectionTestCase.js"/>
-<script>selectRange("test", 8, 10, "Str");</script>
+<script>selectRange("test", 8, 10, "");</script>
</svg>