Rebaseline tests for bug 632548, 636222, 638621

TBR=lazyboy@chromium.org
BUG=632548,636222,638621

Review-Url: https://codereview.chromium.org/2332313003
Cr-Commit-Position: refs/heads/master@{#418476}

third_party/WebKit/LayoutTests/TestExpectations

@@ -51,10 +51,7 @@ crbug.com/309675 compositing/gestures/gesture-tapHighlight-simple-longPress.html
 crbug.com/381840 virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-scroll-background-opaque-to-transparent.html [ Failure ]
 crbug.com/381840 virtual/prefer_compositing_to_lcd_text/compositing/overflow/overflow-scroll-background-transparent-to-opaque.html [ Failure ]
 
-crbug.com/487344 paint/invalidation/video-paint-invalidation.html [ Failure ]
-
 crbug.com/484370 [ Win Debug ] svg/custom/gradient-userSpaceOnUse-with-percentage.svg [ Failure ]
-crbug.com/487344 [ Win ] compositing/video/video-controls-layer-creation.html [ Pass Failure ]
 
 crbug.com/504613 crbug.com/524248 paint/images/image-backgrounds-not-antialiased.html [ Skip ]
 
@@ -107,12 +104,6 @@ crbug.com/630967 [ Linux Debug ] svg/parser/whitespace-angle.html [ Skip ]
 
 crbug.com/632000 [ Win ] fast/images/paint-subrect-grid.html [ Pass Failure ]
 
-crbug.com/632548 [ Win ] paint/invalidation/overflow-scroll-body-appear.html [ Pass Failure ]
-crbug.com/632548 [ Win ] paint/invalidation/invalidation-after-opacity-change-subtree.html [ Pass Failure ]
-crbug.com/632548 [ Win ] paint/invalidation/compositing/text-match-highlight.html [ Pass Failure ]
-
-crbug.com/636222 [ Mac10.10 ] paint/invalidation/fixed-and-absolute-position-scrolled.html [ Failure ]
-
 crbug.com/636271 [ Mac ] paint/invalidation/resize-iframe-text.html [ Pass Failure ]
 crbug.com/636271 [ Linux ] paint/invalidation/resize-iframe-text.html [ Pass Failure ]
 crbug.com/636271 [ Win ] paint/invalidation/resize-iframe-text.html [ Pass Failure ]
@@ -1168,6 +1159,8 @@ crbug.com/624019 [ Mac ] bluetooth/notifications/stop-after-start-succeeds.html
 crbug.com/624019 [ Mac ] bluetooth/notifications/stop-twice.html [ Skip ]
 crbug.com/624019 [ Mac ] bluetooth/notifications/stop-without-starting.html [ Skip ]
 
+crbug.com/487344 paint/invalidation/video-paint-invalidation.html [ Failure ]
+crbug.com/487344 [ Win ] compositing/video/video-controls-layer-creation.html [ Pass Failure ]
 crbug.com/487344 fast/hidpi/video-controls-in-hidpi.html [ Failure ]
 crbug.com/487344 fast/layers/video-layer.html [ Failure ]
 crbug.com/487344 media/audio-controls-rendering.html [ Failure ]
@@ -1186,8 +1179,10 @@ crbug.com/487344 media/video-controls-with-cast-rendering.html [ Failure ]
 crbug.com/487344 media/video-display-toggle.html [ Failure ]
 crbug.com/487344 media/video-empty-source.html [ Failure ]
 crbug.com/487344 media/video-no-audio.html [ Failure ]
-crbug.com/487344 [ Mac ] http/tests/media/video-buffered-range-contains-currentTime.html [ Timeout Failure ]
-crbug.com/638621 [ Win7 ] http/tests/media/video-buffered-range-contains-currentTime.html [ Pass Failure ]
+crbug.com/487344 [ Mac10.10 Mac10.11 Retina ] http/tests/media/video-buffered-range-contains-currentTime.html [ Failure ]
+crbug.com/638621 [ Win ] http/tests/media/video-buffered-range-contains-currentTime.html [ Failure ]
+crbug.com/646644 [ Mac10.9 ] http/tests/media/video-buffered-range-contains-currentTime.html [ Timeout ]
+
 crbug.com/614197 [ Mac ] http/tests/media/pdf-served-as-pdf.html [ Pass Timeout ]
 
 crbug.com/637930 http/tests/media/video-buffered.html [ Pass Failure ]

third_party/WebKit/LayoutTests/platform/win/fast/hidpi/video-controls-in-hidpi-expected.txt

-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x188
-  LayoutBlockFlow {HTML} at (0,0) size 800x188
-    LayoutBlockFlow {BODY} at (8,8) size 784x172
-      LayoutBlockFlow {DIV} at (0,0) size 784x18
-        LayoutText {#text} at (0,0) size 551x17
-          text run at (0,0) width 551: "This test passes if the video controls are non-blurry and properly positioned in HiDPI."
-      LayoutBlockFlow (anonymous) at (0,18) size 784x154
+layer at (0,0) size 1600x1200
+  LayoutView at (0,0) size 1600x1200
+layer at (0,0) size 1600x377
+  LayoutBlockFlow {HTML} at (0,0) size 1600x377
+    LayoutBlockFlow {BODY} at (16,16) size 1568x345
+      LayoutBlockFlow {DIV} at (0,0) size 1568x37
+        LayoutText {#text} at (0,0) size 1101x36
+          text run at (0,0) width 1101: "This test passes if the video controls are non-blurry and properly positioned in HiDPI."
+      LayoutBlockFlow (anonymous) at (0,37) size 1568x308
         LayoutText {#text} at (0,0) size 0x0
         LayoutText {#text} at (0,0) size 0x0
-layer at (8,26) size 300x150
-  LayoutVideo {VIDEO} at (0,0) size 300x150
-layer at (8,26) size 300x150
-  LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
-    LayoutBlockFlow {DIV} at (0,118) size 300x32
-layer at (8,26) size 300x108
-  LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x108
-layer at (8,144) size 300x32 scrollHeight 40
-  LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x32 [bgcolor=#FAFAFA]
-    LayoutButton {INPUT} at (0,0) size 32x32
-    LayoutFlexibleBox {DIV} at (32,0) size 24x32 [color=#5A5A5A]
-      LayoutBlockFlow (anonymous) at (0,0) size 24x32
-        LayoutText {#text} at (0,8) size 24x15
-          text run at (0,8) width 24: "0:00"
-    LayoutSlider {INPUT} at (74,15) size 208x2
-      LayoutFlexibleBox {DIV} at (0,0) size 208x2
-        LayoutBlockFlow {DIV} at (-18,-23) size 244x48
-          LayoutBlockFlow {DIV} at (0,0) size 36x48
+layer at (16,53) size 600x300
+  LayoutVideo {VIDEO} at (0,0) size 600x300
+layer at (16,53) size 600x300
+  LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 600x300
+    LayoutBlockFlow {DIV} at (0,236) size 600x64
+layer at (16,53) size 600x216
+  LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 600x216
+layer at (16,289) size 600x64 scrollHeight 80
+  LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 600x64 [bgcolor=#FAFAFA]
+    LayoutButton {INPUT} at (0,0) size 64x64
+    LayoutFlexibleBox {DIV} at (64,0) size 46.72x64 [color=#5A5A5A]
+      LayoutBlockFlow (anonymous) at (0,0) size 46.72x64
+        LayoutText {#text} at (0,18) size 47x27
+          text run at (0,18) width 47: "0:00"
+    LayoutSlider {INPUT} at (146.72,30) size 417.28x4
+      LayoutFlexibleBox {DIV} at (0,0) size 417.28x4
+        LayoutBlockFlow {DIV} at (-36,-46) size 489.28x96
+          LayoutBlockFlow {DIV} at (0,0) size 72x96

third_party/WebKit/LayoutTests/platform/win/fast/layers/video-layer-expected.txt

@@ -22,4 +22,3 @@ layer at (59,111) size 300x108
   LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x108
 layer at (59,229) size 300x32
   LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x32 [bgcolor=#FAFAFA]
-    LayoutButton {INPUT} at (0,0) size 32x32

third_party/WebKit/LayoutTests/platform/win/media/controls-focus-ring-expected.txt

@@ -14,4 +14,3 @@ layer at (8,50) size 300x32
     LayoutBlockFlow {DIV} at (0,0) size 300x32
 layer at (8,50) size 300x32
   LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x32 [bgcolor=#FAFAFA]
-    LayoutButton {INPUT} at (0,0) size 32x32

third_party/WebKit/LayoutTests/platform/win/media/media-controls-clone-expected.txt

+layer at (0,0) size 800x600
+  LayoutView at (0,0) size 800x600
+layer at (0,0) size 800x324
+  LayoutBlockFlow {HTML} at (0,0) size 800x324
+    LayoutBlockFlow {BODY} at (8,8) size 784x308
+      LayoutBlockFlow {DIV} at (0,0) size 784x154
+      LayoutBlockFlow {DIV} at (0,154) size 784x154
+layer at (8,8) size 300x150
+  LayoutVideo {VIDEO} at (0,0) size 300x150
+layer at (308,126) size 300x32
+  LayoutMedia {AUDIO} at (300,118) size 300x32
+layer at (8,162) size 300x150
+  LayoutVideo {VIDEO} at (0,0) size 300x150
+layer at (308,280) size 300x32
+  LayoutMedia {AUDIO} at (300,118) size 300x32
+layer at (8,8) size 300x150
+  LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
+    LayoutBlockFlow {DIV} at (0,118) size 300x32
+layer at (8,8) size 300x108
+  LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x108
+layer at (8,126) size 300x32
+  LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x32 [bgcolor=#FAFAFA]
+layer at (308,126) size 300x32
+  LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x32
+    LayoutBlockFlow {DIV} at (0,0) size 300x32
+layer at (308,126) size 300x32
+  LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x32 [bgcolor=#FAFAFA]
+layer at (8,162) size 300x150
+  LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
+    LayoutBlockFlow {DIV} at (0,118) size 300x32
+layer at (8,162) size 300x108
+  LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x108
+layer at (8,280) size 300x32
+  LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x32 [bgcolor=#FAFAFA]
+layer at (308,280) size 300x32
+  LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x32
+    LayoutBlockFlow {DIV} at (0,0) size 300x32
+layer at (308,280) size 300x32
+  LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x32 [bgcolor=#FAFAFA]

third_party/WebKit/LayoutTests/platform/win7/fast/hidpi/video-controls-in-hidpi-expected.txt

-layer at (0,0) size 800x600
-  LayoutView at (0,0) size 800x600
-layer at (0,0) size 800x188
-  LayoutBlockFlow {HTML} at (0,0) size 800x188
-    LayoutBlockFlow {BODY} at (8,8) size 784x172
-      LayoutBlockFlow {DIV} at (0,0) size 784x18
-        LayoutText {#text} at (0,0) size 551x17
-          text run at (0,0) width 551: "This test passes if the video controls are non-blurry and properly positioned in HiDPI."
-      LayoutBlockFlow (anonymous) at (0,18) size 784x154
+layer at (0,0) size 1600x1200
+  LayoutView at (0,0) size 1600x1200
+layer at (0,0) size 1600x377
+  LayoutBlockFlow {HTML} at (0,0) size 1600x377
+    LayoutBlockFlow {BODY} at (16,16) size 1568x345
+      LayoutBlockFlow {DIV} at (0,0) size 1568x37
+        LayoutText {#text} at (0,0) size 1101x36
+          text run at (0,0) width 1101: "This test passes if the video controls are non-blurry and properly positioned in HiDPI."
+      LayoutBlockFlow (anonymous) at (0,37) size 1568x308
         LayoutText {#text} at (0,0) size 0x0
         LayoutText {#text} at (0,0) size 0x0
-layer at (8,26) size 300x150
-  LayoutVideo {VIDEO} at (0,0) size 300x150
-layer at (8,26) size 300x150
-  LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x150
-    LayoutBlockFlow {DIV} at (0,118) size 300x32
-layer at (8,26) size 300x108
-  LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x108
-layer at (8,144) size 300x32 scrollHeight 40
-  LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x32 [bgcolor=#FAFAFA]
-    LayoutButton {INPUT} at (0,0) size 32x32
-    LayoutFlexibleBox {DIV} at (32,0) size 17.73x32 [color=#5A5A5A]
-      LayoutBlockFlow (anonymous) at (0,0) size 17.73x32
-        LayoutText {#text} at (0,9) size 18x14
-          text run at (0,9) width 18: "0:00"
-    LayoutSlider {INPUT} at (67.73,15) size 214.27x2
-      LayoutFlexibleBox {DIV} at (0,0) size 214.27x2
-        LayoutBlockFlow {DIV} at (-18,-23) size 250.27x48
-          LayoutBlockFlow {DIV} at (0,0) size 36x48
+layer at (16,53) size 600x300
+  LayoutVideo {VIDEO} at (0,0) size 600x300
+layer at (16,53) size 600x300
+  LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 600x300
+    LayoutBlockFlow {DIV} at (0,236) size 600x64
+layer at (16,53) size 600x216
+  LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 600x216
+layer at (16,289) size 600x64 scrollHeight 80
+  LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 600x64 [bgcolor=#FAFAFA]
+    LayoutButton {INPUT} at (0,0) size 64x64
+    LayoutFlexibleBox {DIV} at (64,0) size 35.45x64 [color=#5A5A5A]
+      LayoutBlockFlow (anonymous) at (0,0) size 35.45x64
+        LayoutText {#text} at (0,18) size 36x28
+          text run at (0,18) width 36: "0:00"
+    LayoutSlider {INPUT} at (135.45,30) size 428.55x4
+      LayoutFlexibleBox {DIV} at (0,0) size 428.55x4
+        LayoutBlockFlow {DIV} at (-36,-46) size 500.55x96
+          LayoutBlockFlow {DIV} at (0,0) size 72x96

third_party/WebKit/LayoutTests/platform/win7/http/tests/media/video-buffered-range-contains-currentTime-expected.txt

@@ -14,20 +14,20 @@ layer at (8,8) size 300x108
 layer at (8,126) size 300x32 scrollHeight 40
   LayoutFlexibleBox (relative positioned) {DIV} at (0,0) size 300x32 [bgcolor=#FAFAFA]
     LayoutButton {INPUT} at (0,0) size 32x32
-    LayoutFlexibleBox {DIV} at (32,0) size 24x32 [color=#5A5A5A]
-      LayoutBlockFlow (anonymous) at (0,0) size 24x32
-        LayoutText {#text} at (0,8) size 24x15
-          text run at (0,8) width 24: "0:07"
-    LayoutFlexibleBox {DIV} at (56,0) size 34x32 [color=#5A5A5A]
-      LayoutBlockFlow (anonymous) at (4,0) size 30x32
-        LayoutText {#text} at (0,8) size 30x15
-          text run at (0,8) width 30: "/ 0:07"
-    LayoutSlider {INPUT} at (108,15) size 81x2
-      LayoutFlexibleBox {DIV} at (0,0) size 81x2
-        LayoutBlockFlow {DIV} at (-18,-23) size 117x48
-          LayoutBlockFlow {DIV} at (81,0) size 36x48
-    LayoutButton {INPUT} at (207,0) size 32x32
-    LayoutSlider {INPUT} at (257,15) size 25x2
-      LayoutFlexibleBox {DIV} at (0,0) size 25x2
-        LayoutBlockFlow {DIV} at (-18,-23) size 61x48
-          LayoutBlockFlow {DIV} at (25,0) size 36x48
+    LayoutFlexibleBox {DIV} at (32,0) size 17.73x32 [color=#5A5A5A]
+      LayoutBlockFlow (anonymous) at (0,0) size 17.73x32
+        LayoutText {#text} at (0,9) size 18x14
+          text run at (0,9) width 18: "0:07"
+    LayoutFlexibleBox {DIV} at (49.73,0) size 28.27x32 [color=#5A5A5A]
+      LayoutBlockFlow (anonymous) at (4,0) size 24.27x32
+        LayoutText {#text} at (0,9) size 25x14
+          text run at (0,9) width 25: "/ 0:07"
+    LayoutSlider {INPUT} at (96,15) size 89.13x2
+      LayoutFlexibleBox {DIV} at (0,0) size 89.13x2
+        LayoutBlockFlow {DIV} at (-18,-23) size 125.13x48
+          LayoutBlockFlow {DIV} at (89.13,0) size 36x48
+    LayoutButton {INPUT} at (203.13,0) size 32x32
+    LayoutSlider {INPUT} at (253.13,15) size 28.88x2
+      LayoutFlexibleBox {DIV} at (0,0) size 28.88x2
+        LayoutBlockFlow {DIV} at (-18,-23) size 64.88x48
+          LayoutBlockFlow {DIV} at (28.88,0) size 36x48