Manually rebaseline XP tests after glyph overflow change

This patch manually rebaselines the following tests on XP: fast/repaint/block-layout-inline-children-float-positioned.html fast/repaint/bugzilla-6278.html fast/repaint/invalidation-after-opacity-change-subtree.html fast/repaint/line-flow-with-floats-1.html fast/repaint/line-flow-with-floats-2.html fast/repaint/line-flow-with-floats-3.html fast/repaint/line-flow-with-floats-4.html fast/repaint/line-flow-with-floats-5.html fast/repaint/line-flow-with-floats-7.html fast/repaint/line-flow-with-floats-8.html fast/repaint/line-flow-with-floats-9.html fast/repaint/make-children-non-inline.html fast/repaint/outline-clip-change.html fast/repaint/overflow-delete-line.html fast/repaint/text-append-dirty-lines.html BUG=570581,569833 TBR=drott Review URL: https://codereview.chromium.org/1532043002 Cr-Commit-Position: refs/heads/master@{#365775}
Denger-Network · Dec 17, 2015 · 7a89317 · 7a89317
1 parent 1fbd9f9
commit 7a89317
Show file tree

Hide file tree

Showing 16 changed files with 58 additions and 59 deletions.
diff --git a/third_party/WebKit/LayoutTests/TestExpectations b/third_party/WebKit/LayoutTests/TestExpectations
@@ -1342,19 +1342,3 @@ crbug.com/569919 fast/canvas/canvas-toDataURL-jpeg-maximum-quality.html [ Failur
 crbug.com/570002 [ XP Linux ] virtual/display_list_2d_canvas/fast/canvas/canvas-shadow-source-in.html [ Failure ]
 crbug.com/570002 [ XP ] virtual/gpu/fast/canvas/canvas-incremental-repaint.html [ Failure ]
 crbug.com/570002 [ XP ] virtual/gpu/fast/canvas/canvas-shadow-source-in.html [ Failure ]
-
-crbug.com/570581 [ XP ] fast/repaint/block-layout-inline-children-float-positioned.html [ Failure ]
-crbug.com/570581 [ XP ] fast/repaint/bugzilla-6278.html [ Failure ]
-crbug.com/570581 [ XP ] fast/repaint/invalidation-after-opacity-change-subtree.html [ Failure ]
-crbug.com/570581 [ XP ] fast/repaint/line-flow-with-floats-1.html [ Failure ]
-crbug.com/570581 [ XP ] fast/repaint/line-flow-with-floats-2.html [ Failure ]
-crbug.com/570581 [ XP ] fast/repaint/line-flow-with-floats-3.html [ Failure ]
-crbug.com/570581 [ XP ] fast/repaint/line-flow-with-floats-4.html [ Failure ]
-crbug.com/570581 [ XP ] fast/repaint/line-flow-with-floats-5.html [ Failure ]
-crbug.com/570581 [ XP ] fast/repaint/line-flow-with-floats-7.html [ Failure ]
-crbug.com/570581 [ XP ] fast/repaint/line-flow-with-floats-8.html [ Failure ]
-crbug.com/570581 [ XP ] fast/repaint/line-flow-with-floats-9.html [ Failure ]
-crbug.com/570581 [ XP ] fast/repaint/make-children-non-inline.html [ Failure ]
-crbug.com/570581 [ XP ] fast/repaint/outline-clip-change.html [ Failure ]
-crbug.com/570581 [ XP ] fast/repaint/overflow-delete-line.html [ Failure ]
-crbug.com/570581 [ XP ] fast/repaint/text-append-dirty-lines.html [ Failure ]
diff --git a/...s/platform/win-xp/fast/repaint/block-layout-inline-children-float-positioned-expected.txt b/...s/platform/win-xp/fast/repaint/block-layout-inline-children-float-positioned-expected.txt
@@ -6,10 +6,10 @@
       "contentsOpaque": true,
       "drawsContent": true,
       "repaintRects": [
-        [324, 37, 277, 20],
-        [324, 37, 277, 19],
-        [162, 37, 278, 20],
-        [162, 37, 278, 19]
+        [324, 37, 278, 20],
+        [324, 37, 278, 19],
+        [162, 37, 279, 20],
+        [162, 37, 279, 19]
       ],
       "paintInvalidationClients": [
         "LayoutBlockFlow (floating) SPAN",

diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/fast/repaint/bugzilla-6278-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/fast/repaint/bugzilla-6278-expected.txt
@@ -9,11 +9,11 @@
         [304, 138, 2, 215],
         [254, 138, 52, 235],
         [252, 138, 50, 215],
-        [249, 138, 50, 159],
+        [250, 138, 49, 159],
         [10, 353, 242, 20],
         [10, 323, 242, 50],
         [10, 303, 292, 50],
-        [10, 297, 239, 20],
+        [10, 297, 240, 20],
         [10, 138, 292, 160],
         [10, 138, 242, 180]
       ],

diff --git a/...Tests/platform/win-xp/fast/repaint/invalidation-after-opacity-change-subtree-expected.txt b/...Tests/platform/win-xp/fast/repaint/invalidation-after-opacity-change-subtree-expected.txt
@@ -1,17 +1,17 @@
 {
-  "bounds": [800, 2350],
+  "bounds": [785, 2350],
   "children": [
     {
-      "bounds": [800, 2350],
+      "bounds": [785, 2350],
       "contentsOpaque": true,
       "drawsContent": true,
       "repaintRects": [
-        [8, 2196, 792, 107],
+        [8, 2196, 777, 107],
         [8, 2196, 639, 107],
-        [8, 2046, 792, 107],
-        [8, 2046, 766, 107],
-        [8, 2000, 792, 350],
-        [8, 2000, 792, 350]
+        [8, 2046, 777, 107],
+        [8, 2046, 768, 107],
+        [8, 2000, 777, 350],
+        [8, 2000, 777, 350]
       ],
       "paintInvalidationClients": [
         "LayoutBlockFlow DIV id='container'",

diff --git a/...arty/WebKit/LayoutTests/platform/win-xp/fast/repaint/line-flow-with-floats-1-expected.txt b/...arty/WebKit/LayoutTests/platform/win-xp/fast/repaint/line-flow-with-floats-1-expected.txt
@@ -6,20 +6,21 @@
       "contentsOpaque": true,
       "drawsContent": true,
       "repaintRects": [
+        [420, 180, 1, 59],
         [378, 138, 70, 30],
-        [368, 80, 52, 119],
-        [303, 420, 66, 19],
-        [244, 420, 64, 19],
+        [369, 80, 52, 119],
+        [303, 420, 67, 19],
+        [244, 420, 65, 19],
         [151, 180, 40, 19],
         [134, 360, 132, 19],
         [84, 180, 40, 19],
         [65, 380, 304, 59],
         [65, 360, 132, 19],
         [14, 440, 354, 59],
-        [14, 420, 354, 79],
+        [14, 420, 355, 79],
         [14, 380, 355, 59],
         [14, 363, 48, 65],
-        [14, 359, 406, 20],
+        [14, 359, 407, 20],
         [14, 343, 48, 65],
         [14, 239, 406, 20],
         [8, 120, 418, 479]

diff --git a/...arty/WebKit/LayoutTests/platform/win-xp/fast/repaint/line-flow-with-floats-2-expected.txt b/...arty/WebKit/LayoutTests/platform/win-xp/fast/repaint/line-flow-with-floats-2-expected.txt
@@ -9,8 +9,8 @@
         [485, 0, 15, 600],
         [372, 384, 48, 81],
         [372, 383, 48, 81],
-        [303, 421, 66, 19],
-        [303, 420, 66, 19],
+        [303, 421, 67, 19],
+        [303, 420, 67, 19],
         [151, 180, 40, 19],
         [149, 180, 45, 20],
         [134, 361, 132, 19],
@@ -19,15 +19,15 @@
         [65, 381, 287, 19],
         [65, 380, 304, 59],
         [65, 380, 287, 19],
-        [14, 501, 406, 99],
-        [14, 500, 406, 99],
+        [14, 501, 407, 99],
+        [14, 500, 407, 99],
         [14, 441, 354, 59],
         [14, 440, 354, 59],
         [14, 364, 48, 65],
         [14, 363, 48, 65],
-        [14, 241, 406, 139],
-        [14, 240, 406, 139],
-        [14, 199, 354, 1],
+        [14, 241, 407, 139],
+        [14, 240, 407, 139],
+        [14, 199, 355, 1],
         [14, 181, 406, 79],
         [14, 180, 406, 79],
         [8, 160, 418, 440],

diff --git a/...arty/WebKit/LayoutTests/platform/win-xp/fast/repaint/line-flow-with-floats-3-expected.txt b/...arty/WebKit/LayoutTests/platform/win-xp/fast/repaint/line-flow-with-floats-3-expected.txt
@@ -9,9 +9,9 @@
         [372, 383, 48, 81],
         [356, 383, 64, 81],
         [353, 440, 15, 59],
-        [352, 380, 1, 19],
-        [303, 420, 66, 19],
-        [65, 400, 288, 39],
+        [352, 380, 2, 19],
+        [303, 420, 67, 19],
+        [65, 400, 289, 39],
         [65, 380, 304, 59],
         [14, 420, 339, 39],
         [8, 380, 418, 219]

diff --git a/...arty/WebKit/LayoutTests/platform/win-xp/fast/repaint/line-flow-with-floats-4-expected.txt b/...arty/WebKit/LayoutTests/platform/win-xp/fast/repaint/line-flow-with-floats-4-expected.txt
@@ -7,7 +7,7 @@
       "drawsContent": true,
       "repaintRects": [
         [372, 447, 48, 17],
-        [368, 440, 52, 59],
+        [368, 440, 53, 59],
         [8, 380, 418, 219]
       ],
       "paintInvalidationClients": [

diff --git a/...arty/WebKit/LayoutTests/platform/win-xp/fast/repaint/line-flow-with-floats-5-expected.txt b/...arty/WebKit/LayoutTests/platform/win-xp/fast/repaint/line-flow-with-floats-5-expected.txt
@@ -6,8 +6,8 @@
       "contentsOpaque": true,
       "drawsContent": true,
       "repaintRects": [
-        [303, 420, 66, 19],
-        [275, 420, 64, 19],
+        [303, 420, 67, 19],
+        [275, 420, 65, 19],
         [134, 360, 132, 19],
         [118, 360, 132, 19],
         [65, 380, 304, 59],

diff --git a/...arty/WebKit/LayoutTests/platform/win-xp/fast/repaint/line-flow-with-floats-7-expected.txt b/...arty/WebKit/LayoutTests/platform/win-xp/fast/repaint/line-flow-with-floats-7-expected.txt
@@ -6,7 +6,7 @@
       "contentsOpaque": true,
       "drawsContent": true,
       "repaintRects": [
-        [303, 420, 66, 19],
+        [303, 420, 67, 19],
         [297, 420, 72, 19],
         [8, 400, 418, 39]
       ],

diff --git a/...arty/WebKit/LayoutTests/platform/win-xp/fast/repaint/line-flow-with-floats-8-expected.txt b/...arty/WebKit/LayoutTests/platform/win-xp/fast/repaint/line-flow-with-floats-8-expected.txt
@@ -7,14 +7,14 @@
       "drawsContent": true,
       "repaintRects": [
         [485, 0, 15, 600],
-        [303, 420, 66, 19],
-        [143, 420, 64, 19],
+        [303, 420, 67, 19],
+        [143, 420, 65, 19],
         [134, 360, 132, 19],
         [83, 360, 131, 19],
         [65, 380, 304, 59],
         [65, 380, 287, 19],
-        [14, 500, 406, 99],
-        [14, 480, 406, 99],
+        [14, 500, 407, 99],
+        [14, 480, 407, 99],
         [14, 440, 354, 59],
         [14, 420, 354, 59],
         [14, 380, 354, 59],

diff --git a/...arty/WebKit/LayoutTests/platform/win-xp/fast/repaint/line-flow-with-floats-9-expected.txt b/...arty/WebKit/LayoutTests/platform/win-xp/fast/repaint/line-flow-with-floats-9-expected.txt
@@ -6,6 +6,7 @@
       "contentsOpaque": true,
       "drawsContent": true,
       "repaintRects": [
+        [420, 240, 1, 139],
         [372, 243, 48, 49],
         [8, 80, 418, 519]
       ],
@@ -85,7 +86,20 @@
         "InlineTextBox 'wonder is, that there\u2018s any one left alive!\u2019'",
         "RootInlineBox",
         "LayoutBlockFlow P",
-        "LayoutBlockFlow (floating) SPAN id='yellowFloat'"
+        "LayoutBlockFlow (floating) SPAN id='yellowFloat'",
+        "LayoutText #text",
+        "InlineTextBox 'begin again, it was very provoking to find that the'",
+        "InlineTextBox 'hedgehog had\n'",
+        "InlineTextBox 'unrolled itself, and was in the act of crawling'",
+        "InlineTextBox 'away: besides all\n'",
+        "InlineTextBox 'this, there was generally a ridge or furrow'",
+        "InlineTextBox 'in the way wherever\n'",
+        "InlineTextBox 'she wanted to send the hedgehog to, and, as'",
+        "InlineTextBox 'the doubled-up\n'",
+        "InlineTextBox 'soldiers were always getting up and walking off to'",
+        "InlineTextBox 'other parts of\n'",
+        "InlineTextBox 'the ground, Alice soon came to the conclusion that it'",
+        "InlineTextBox 'was a very\n'"
       ]
     }
   ]

diff --git a/...rty/WebKit/LayoutTests/platform/win-xp/fast/repaint/make-children-non-inline-expected.txt b/...rty/WebKit/LayoutTests/platform/win-xp/fast/repaint/make-children-non-inline-expected.txt
@@ -10,11 +10,11 @@
         [8, 304, 27, 19],
         [8, 284, 65, 19],
         [8, 264, 784, 80],
-        [8, 264, 102, 19],
+        [8, 264, 105, 19],
         [8, 224, 61, 19],
         [8, 204, 27, 19],
         [8, 184, 65, 19],
-        [8, 164, 102, 19],
+        [8, 164, 105, 19],
         [8, 164, 10, 100],
         [8, 144, 77, 19],
         [8, 124, 42, 19],

diff --git a/third_party/WebKit/LayoutTests/platform/win-xp/fast/repaint/outline-clip-change-expected.txt b/third_party/WebKit/LayoutTests/platform/win-xp/fast/repaint/outline-clip-change-expected.txt
@@ -6,8 +6,8 @@
       "contentsOpaque": true,
       "drawsContent": true,
       "repaintRects": [
-        [48, 108, 81, 20],
-        [48, 108, 81, 19],
+        [48, 108, 82, 20],
+        [48, 108, 82, 19],
         [43, 103, 91, 30]
       ],
       "paintInvalidationClients": [

diff --git a/...d_party/WebKit/LayoutTests/platform/win-xp/fast/repaint/overflow-delete-line-expected.txt b/...d_party/WebKit/LayoutTests/platform/win-xp/fast/repaint/overflow-delete-line-expected.txt
@@ -8,7 +8,7 @@
       "repaintRects": [
         [8, 74, 80, 19],
         [8, 74, 80, 19],
-        [8, 74, 68, 19]
+        [8, 74, 69, 19]
       ],
       "paintInvalidationClients": [
         "InlineTextBox ''",

diff --git a/...arty/WebKit/LayoutTests/platform/win-xp/fast/repaint/text-append-dirty-lines-expected.txt b/...arty/WebKit/LayoutTests/platform/win-xp/fast/repaint/text-append-dirty-lines-expected.txt
@@ -7,7 +7,7 @@
       "drawsContent": true,
       "repaintRects": [
         [8, 124, 784, 39],
-        [8, 44, 783, 119]
+        [8, 44, 784, 119]
       ],
       "paintInvalidationClients": [
         "InlineTextBox 'Quisque enim metus, luctus tincidunt, vestibulum eu, vestibulum eu, libero. Mauris sagittis aliquam nunc. Nullam pharetra molestie'",