[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

ojan at chromium.org ojan at chromium.org
Wed Dec 22 11:14:12 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 778ee16667a43bc933828db1184f048df71b001f
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 15 18:54:11 2010 +0000

    2010-07-15  Ojan Vafai  <ojan at chromium.org>
    
            Unreviewed.
    
            [chromium] Cleanup more fallout from r63403.
    
            * platform/chromium-mac/fast/layers/video-layer-expected.txt:
            * platform/chromium-mac/fast/tokenizer/external-script-document-write_2-expected.txt:
            * platform/chromium-mac/fast/tokenizer/script_extra_close-expected.txt:
            * platform/chromium-mac/html5lib/runner-expected.txt:
            * platform/chromium-mac/media/controls-after-reload-expected.txt:
            * platform/chromium-mac/media/controls-strict-expected.txt:
            * platform/chromium-mac/media/video-aspect-ratio-expected.txt: Removed.
            * platform/chromium-mac/media/video-display-toggle-expected.txt:
            * platform/chromium-mac/media/video-empty-source-expected.txt:
            * platform/chromium-mac/media/video-no-audio-expected.txt:
            * platform/chromium-mac/media/video-volume-slider-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63443 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index fd66e00..245d944 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,21 @@
+2010-07-15  Ojan Vafai  <ojan at chromium.org>
+
+        Unreviewed.
+
+        [chromium] Cleanup more fallout from r63403.
+
+        * platform/chromium-mac/fast/layers/video-layer-expected.txt:
+        * platform/chromium-mac/fast/tokenizer/external-script-document-write_2-expected.txt:
+        * platform/chromium-mac/fast/tokenizer/script_extra_close-expected.txt:
+        * platform/chromium-mac/html5lib/runner-expected.txt:
+        * platform/chromium-mac/media/controls-after-reload-expected.txt:
+        * platform/chromium-mac/media/controls-strict-expected.txt:
+        * platform/chromium-mac/media/video-aspect-ratio-expected.txt: Removed.
+        * platform/chromium-mac/media/video-display-toggle-expected.txt:
+        * platform/chromium-mac/media/video-empty-source-expected.txt:
+        * platform/chromium-mac/media/video-no-audio-expected.txt:
+        * platform/chromium-mac/media/video-volume-slider-expected.txt:
+
 2010-07-15  Pavel Podivilov  <podivilov at chromium.org>
 
         Reviewed by Ojan Vafai.
diff --git a/LayoutTests/platform/chromium-mac/fast/layers/video-layer-expected.txt b/LayoutTests/platform/chromium-mac/fast/layers/video-layer-expected.txt
index 84b8c66..0b8de2a 100644
--- a/LayoutTests/platform/chromium-mac/fast/layers/video-layer-expected.txt
+++ b/LayoutTests/platform/chromium-mac/fast/layers/video-layer-expected.txt
@@ -13,8 +13,6 @@ layer at (0,0) size 800x600
       RenderBlock (anonymous) at (0,52) size 784x252
         RenderText {#text} at (0,0) size 0x0
         RenderText {#text} at (0,0) size 0x0
-        RenderText {#text} at (0,0) size 0x0
-        RenderText {#text} at (0,0) size 0x0
 layer at (58,110) size 302x152
   RenderVideo {VIDEO} at (50,50) size 302x152 [border: (1px solid #000000)]
 layer at (59,111) size 300x150
diff --git a/LayoutTests/platform/chromium-mac/fast/tokenizer/external-script-document-write_2-expected.txt b/LayoutTests/platform/chromium-mac/fast/tokenizer/external-script-document-write_2-expected.txt
index 636fdff..3e6f19d 100644
--- a/LayoutTests/platform/chromium-mac/fast/tokenizer/external-script-document-write_2-expected.txt
+++ b/LayoutTests/platform/chromium-mac/fast/tokenizer/external-script-document-write_2-expected.txt
@@ -7,4 +7,3 @@ layer at (0,0) size 800x600
       RenderText {#text} at (0,0) size 275x18
         text run at (0,0) width 112: "TEST PASSED. "
         text run at (112,0) width 163: "This text should show up."
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/chromium-mac/fast/tokenizer/script_extra_close-expected.txt b/LayoutTests/platform/chromium-mac/fast/tokenizer/script_extra_close-expected.txt
index c1cad1f..e6ef444 100644
--- a/LayoutTests/platform/chromium-mac/fast/tokenizer/script_extra_close-expected.txt
+++ b/LayoutTests/platform/chromium-mac/fast/tokenizer/script_extra_close-expected.txt
@@ -10,4 +10,3 @@ layer at (0,0) size 800x600
       RenderText {#text} at (55,0) size 232x18
         text run at (55,0) width 69: "PASSED. "
         text run at (124,0) width 163: "This text should show up."
-      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/chromium-mac/html5lib/runner-expected.txt b/LayoutTests/platform/chromium-mac/html5lib/runner-expected.txt
index 0d5421e..75cacac 100644
--- a/LayoutTests/platform/chromium-mac/html5lib/runner-expected.txt
+++ b/LayoutTests/platform/chromium-mac/html5lib/runner-expected.txt
@@ -14,8 +14,6 @@ resources/tests1.dat:
 52
 53
 54
-57
-59
 78
 79
 80
@@ -196,12 +194,9 @@ Got:
 | <html>
 |   <head>
 |   <body>
-|     "A"
-|     "B"
-|     "C"
+|     "ABC"
 |     <select>
-|       "D"
-|       "E"
+|       "DE"
 Expected:
 | <!DOCTYPE html>
 | <html>
@@ -224,8 +219,7 @@ Got:
 |     <script>
 |       " <!-- "
 |   <body>
-|     " --> "
-|     " EOF"
+|     " -->  EOF"
 Expected:
 | <!DOCTYPE html>
 | <html>
@@ -330,46 +324,6 @@ Expected:
 |         "Test"
 |         <u>
 
-Test 57 of 113 in resources/tests1.dat failed. Input:
-<b>Test</i>Test
-Got:
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       "Test"
-|       "Test"
-Expected:
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       "TestTest"
-
-Test 59 of 113 in resources/tests1.dat failed. Input:
-<b>A<cite>B<div>C</cite>D
-Got:
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       "A"
-|       <cite>
-|         "B"
-|         <div>
-|           "C"
-|           "D"
-Expected:
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       "A"
-|       <cite>
-|         "B"
-|         <div>
-|           "CD"
-
 Test 78 of 113 in resources/tests1.dat failed. Input:
 <a href="blah">aba<table><a href="foo">br<tr><td></td></tr>x</table>aoe
 Got:
@@ -784,13 +738,10 @@ resources/tests2.dat:
 8
 9
 11
-32
 36
 42
 44
 45
-53
-54
 
 Test 6 of 59 in resources/tests2.dat failed. Input:
 <!DOCTYPE html><frameset>test
@@ -877,22 +828,6 @@ Expected:
 |       "<td>"
 |     <table>
 
-Test 32 of 59 in resources/tests2.dat failed. Input:
-<!DOCTYPE html>X</body>X
-Got:
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "X"
-|     "X"
-Expected:
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "XX"
-
 Test 36 of 59 in resources/tests2.dat failed. Input:
 <!DOCTYPE html><select><optgroup><option></optgroup><option><select><option>
 Got:
@@ -982,38 +917,6 @@ Expected:
 |     <style>
 |       "
 x { content:"</style" } "
-
-Test 53 of 59 in resources/tests2.dat failed. Input:
-<!DOCTYPE html>X</html>X
-Got:
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "X"
-|     "X"
-Expected:
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "XX"
-
-Test 54 of 59 in resources/tests2.dat failed. Input:
-<!DOCTYPE html>X</html> 
-Got:
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "X"
-|     " "
-Expected:
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "X "
 resources/tests3.dat:
 16
 17
@@ -1144,10 +1047,8 @@ Expected:
 |   "setting head's innerHTML"
 resources/tests5.dat:
 2
-6
 7
 8
-9
 16
 
 Test 2 of 16 in resources/tests5.dat failed. Input:
@@ -1158,8 +1059,7 @@ Got:
 |     <style>
 |       " <!-- "
 |   <body>
-|     " --> "
-|     "x"
+|     " --> x"
 Expected:
 | <html>
 |   <head>
@@ -1169,25 +1069,6 @@ Expected:
 |   <body>
 |     "--> x"
 
-Test 6 of 16 in resources/tests5.dat failed. Input:
-<iframe> <!--- </iframe>->x</iframe> --> </iframe>x
-Got:
-| <html>
-|   <head>
-|   <body>
-|     <iframe>
-|       " <!--- "
-|     "->x"
-|     " --> "
-|     "x"
-Expected:
-| <html>
-|   <head>
-|   <body>
-|     <iframe>
-|       " <!--- "
-|     "->x --> x"
-
 Test 7 of 16 in resources/tests5.dat failed. Input:
 <script> <!-- </script> --> </script>x
 Got:
@@ -1196,8 +1077,7 @@ Got:
 |     <script>
 |       " <!-- "
 |   <body>
-|     " --> "
-|     "x"
+|     " --> x"
 Expected:
 | <html>
 |   <head>
@@ -1215,8 +1095,7 @@ Got:
 |     <title>
 |       " <!-- "
 |   <body>
-|     " --> "
-|     "x"
+|     " --> x"
 Expected:
 | <html>
 |   <head>
@@ -1226,25 +1105,6 @@ Expected:
 |   <body>
 |     "--> x"
 
-Test 9 of 16 in resources/tests5.dat failed. Input:
-<textarea> <!--- </textarea>->x</textarea> --> </textarea>x
-Got:
-| <html>
-|   <head>
-|   <body>
-|     <textarea>
-|       " <!--- "
-|     "->x"
-|     " --> "
-|     "x"
-Expected:
-| <html>
-|   <head>
-|   <body>
-|     <textarea>
-|       " <!--- "
-|     "->x --> x"
-
 Test 16 of 16 in resources/tests5.dat failed. Input:
 <noscript><!--</noscript>--></noscript>
 Got:
@@ -1506,7 +1366,6 @@ resources/tests7.dat:
 18
 19
 24
-25
 27
 28
 29
@@ -1751,24 +1610,6 @@ Expected:
 | <body>
 |   "X"
 
-Test 25 of 30 in resources/tests7.dat failed. Input:
-<div><p>a</x> b
-Got:
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       <p>
-|         "a"
-|         " b"
-Expected:
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       <p>
-|         "a b"
-
 Test 27 of 30 in resources/tests7.dat failed. Input:
 <table><b><tr><td>aaa</td></tr>bbb</table>ccc
 Got:
@@ -1856,104 +1697,11 @@ Expected:
 |     <select>
 |     <keygen>
 resources/tests8.dat:
-1
-2
-3
-4
 5
 6
 8
 9
 
-Test 1 of 9 in resources/tests8.dat failed. Input:
-<div>
-<div></div>
-</span>x
-Got:
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       "
-"
-|       <div>
-|       "
-"
-|       "x"
-Expected:
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       "
-"
-|       <div>
-|       "
-x"
-
-Test 2 of 9 in resources/tests8.dat failed. Input:
-<div>x<div></div>
-</span>x
-Got:
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       "x"
-|       <div>
-|       "
-"
-|       "x"
-Expected:
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       "x"
-|       <div>
-|       "
-x"
-
-Test 3 of 9 in resources/tests8.dat failed. Input:
-<div>x<div></div>x</span>x
-Got:
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       "x"
-|       <div>
-|       "x"
-|       "x"
-Expected:
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       "x"
-|       <div>
-|       "xx"
-
-Test 4 of 9 in resources/tests8.dat failed. Input:
-<div>x<div></div>y</span>z
-Got:
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       "x"
-|       <div>
-|       "y"
-|       "z"
-Expected:
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       "x"
-|       <div>
-|       "yz"
-
 Test 5 of 9 in resources/tests8.dat failed. Input:
 <table><div>x<div></div>x</span>x
 Got:
@@ -1963,8 +1711,7 @@ Got:
 |     <div>
 |       "x"
 |       <div>
-|       "x"
-|       "x"
+|       "xx"
 |     <table>
 |       <tbody>
 Expected:
@@ -2048,7 +1795,6 @@ resources/tests9.dat:
 13
 14
 15
-16
 17
 18
 19
@@ -2412,37 +2158,6 @@ Expected:
 |     <p>
 |       "quux"
 
-Test 16 of 25 in resources/tests9.dat failed. Input:
-<!DOCTYPE html><body><table><tr><td><select><math><mi>foo</mi><mi>bar</mi><p>baz</table><p>quux
-Got:
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             <select>
-|               "foo"
-|               "bar"
-|               "baz"
-|     <p>
-|       "quux"
-Expected:
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             <select>
-|               "foobarbaz"
-|     <p>
-|       "quux"
-
 Test 17 of 25 in resources/tests9.dat failed. Input:
 <!DOCTYPE html><body><table><select><math><mi>foo</mi><mi>bar</mi><p>baz</table><p>quux
 Got:
@@ -2451,9 +2166,7 @@ Got:
 |   <head>
 |   <body>
 |     <select>
-|       "foo"
-|       "bar"
-|       "baz"
+|       "foobarbaz"
 |     <table>
 |       <tbody>
 |     <p>
@@ -2656,7 +2369,6 @@ resources/tests10.dat:
 13
 14
 15
-16
 17
 18
 19
@@ -3020,37 +2732,6 @@ Expected:
 |     <p>
 |       "quux"
 
-Test 16 of 25 in resources/tests10.dat failed. Input:
-<!DOCTYPE html><body><table><tr><td><select><svg><g>foo</g><g>bar</g><p>baz</table><p>quux
-Got:
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             <select>
-|               "foo"
-|               "bar"
-|               "baz"
-|     <p>
-|       "quux"
-Expected:
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             <select>
-|               "foobarbaz"
-|     <p>
-|       "quux"
-
 Test 17 of 25 in resources/tests10.dat failed. Input:
 <!DOCTYPE html><body><table><select><svg><g>foo</g><g>bar</g><p>baz</table><p>quux
 Got:
@@ -3059,9 +2740,7 @@ Got:
 |   <head>
 |   <body>
 |     <select>
-|       "foo"
-|       "bar"
-|       "baz"
+|       "foobarbaz"
 |     <table>
 |       <tbody>
 |     <p>
@@ -4686,8 +4365,6 @@ Expected:
 |       "<!--<noembed>"
 |     "-->"
 resources/webkit01.dat:
-15
-17
 20
 22
 24
@@ -4699,38 +4376,6 @@ resources/webkit01.dat:
 31
 33
 
-Test 15 of 33 in resources/webkit01.dat failed. Input:
-<p>Test</p<p>Test2</p>
-Got:
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       "Test"
-|       "Test2"
-Expected:
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       "TestTest2"
-
-Test 17 of 33 in resources/webkit01.dat failed. Input:
-<A>test< /A>
-Got:
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|       "test"
-|       "< /A>"
-Expected:
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|       "test< /A>"
-
 Test 20 of 33 in resources/webkit01.dat failed. Input:
 <body></br foo="bar"></body>
 Got:
@@ -5004,8 +4649,9 @@ resources/adoption01.dat:
 8
 9
 11
+12
 
-Test 1 of 11 in resources/adoption01.dat failed. Input:
+Test 1 of 13 in resources/adoption01.dat failed. Input:
 <a><p></a></p>
 Got:
 | <html>
@@ -5021,7 +4667,7 @@ Expected:
 |     <p>
 |       <a>
 
-Test 6 of 11 in resources/adoption01.dat failed. Input:
+Test 6 of 13 in resources/adoption01.dat failed. Input:
 <table><a>1<p>2</a>3</p>
 Got:
 | <html>
@@ -5030,8 +4676,7 @@ Got:
 |     <a>
 |       "1"
 |       <p>
-|         "2"
-|         "3"
+|         "23"
 |     <table>
 |       <tbody>
 Expected:
@@ -5046,7 +4691,7 @@ Expected:
 |       "3"
 |     <table>
 
-Test 7 of 11 in resources/adoption01.dat failed. Input:
+Test 7 of 13 in resources/adoption01.dat failed. Input:
 <b><b><a><p></a>
 Got:
 | <html>
@@ -5066,7 +4711,7 @@ Expected:
 |         <p>
 |           <a>
 
-Test 8 of 11 in resources/adoption01.dat failed. Input:
+Test 8 of 13 in resources/adoption01.dat failed. Input:
 <b><a><b><p></a>
 Got:
 | <html>
@@ -5088,7 +4733,7 @@ Expected:
 |         <p>
 |           <a>
 
-Test 9 of 11 in resources/adoption01.dat failed. Input:
+Test 9 of 13 in resources/adoption01.dat failed. Input:
 <a><b><b><p></a>
 Got:
 | <html>
@@ -5112,7 +4757,7 @@ Expected:
 |         <p>
 |           <a>
 
-Test 11 of 11 in resources/adoption01.dat failed. Input:
+Test 11 of 13 in resources/adoption01.dat failed. Input:
 <p><b id="A"><script>document.getElementById("A").id = "B"</script></p>TEXT</b>
 Got:
 | <html>
@@ -5138,6 +4783,34 @@ Expected:
 |     <b>
 |       id="A"
 |       "TEXT"
+
+Test 12 of 13 in resources/adoption01.dat failed. Input:
+<table><a>1<td>2</td>3</table>
+Got:
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|       "1"
+|     "3"
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             "2"
+Expected:
+| <html>
+|   <head>
+|   <body>
+|     <a>
+|       "1"
+|     <a>
+|       "3"
+|     <table>
+|       <tbody>
+|         <tr>
+|           <td>
+|             "2"
 resources/inbody01.dat: PASS
 
 resources/isindex.dat:
diff --git a/LayoutTests/platform/chromium-mac/media/controls-after-reload-expected.txt b/LayoutTests/platform/chromium-mac/media/controls-after-reload-expected.txt
index 337fc41..fe54581 100644
--- a/LayoutTests/platform/chromium-mac/media/controls-after-reload-expected.txt
+++ b/LayoutTests/platform/chromium-mac/media/controls-after-reload-expected.txt
@@ -8,8 +8,6 @@ layer at (0,0) size 800x600
           text run at (0,0) width 360: "Making sure the controller looks ok after a second load()."
       RenderBlock (anonymous) at (0,34) size 784x240
         RenderText {#text} at (0,0) size 0x0
-        RenderText {#text} at (0,0) size 0x0
-        RenderText {#text} at (0,0) size 0x0
 layer at (8,42) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,42) size 320x240
diff --git a/LayoutTests/platform/chromium-mac/media/controls-strict-expected.txt b/LayoutTests/platform/chromium-mac/media/controls-strict-expected.txt
index 4323c12..1405e74 100644
--- a/LayoutTests/platform/chromium-mac/media/controls-strict-expected.txt
+++ b/LayoutTests/platform/chromium-mac/media/controls-strict-expected.txt
@@ -8,8 +8,6 @@ layer at (0,0) size 800x302
           text run at (0,0) width 226: "Drawing the controls in strict mode."
       RenderBlock (anonymous) at (0,34) size 784x244
         RenderText {#text} at (0,0) size 0x0
-        RenderText {#text} at (0,0) size 0x0
-        RenderText {#text} at (0,0) size 0x0
 layer at (8,50) size 320x240
   RenderVideo {VIDEO} at (0,0) size 320x240
 layer at (8,50) size 320x240
diff --git a/LayoutTests/platform/chromium-mac/media/video-aspect-ratio-expected.txt b/LayoutTests/platform/chromium-mac/media/video-aspect-ratio-expected.txt
deleted file mode 100644
index faa075a..0000000
--- a/LayoutTests/platform/chromium-mac/media/video-aspect-ratio-expected.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-layer at (0,0) size 800x600
-  RenderView at (0,0) size 800x600
-layer at (0,0) size 800x600
-  RenderBlock {HTML} at (0,0) size 800x600
-    RenderBody {BODY} at (8,8) size 784x584
-      RenderBlock {P} at (0,0) size 784x18
-        RenderText {#text} at (0,0) size 623x18
-          text run at (0,0) width 623: "Test video sizing. You should see one bigger image (paused video) and 7 small ones of 1/4 its size."
-      RenderBlock (anonymous) at (0,34) size 784x480
-        RenderBR {BR} at (320,240) size 0x0
-        RenderBlock {DIV} at (160,240) size 320x120
-          RenderText {#text} at (0,0) size 0x0
-        RenderBlock {DIV} at (0,360) size 320x120
-          RenderText {#text} at (0,0) size 0x0
-        RenderText {#text} at (0,0) size 0x0
-        RenderText {#text} at (0,0) size 0x0
-layer at (8,42) size 320x240
-  RenderVideo {VIDEO} at (0,0) size 320x240
-layer at (8,282) size 160x120
-  RenderVideo {VIDEO} at (0,240) size 160x120
-layer at (168,282) size 160x120
-  RenderVideo {VIDEO} at (0,0) size 160x120
-layer at (328,282) size 160x120
-  RenderVideo {VIDEO} at (160,0) size 160x120
-layer at (8,402) size 160x120
-  RenderVideo {VIDEO} at (0,0) size 160x120
-layer at (168,402) size 160x120
-  RenderVideo {VIDEO} at (160,0) size 160x120
-layer at (328,402) size 320x120
-  RenderBlock (relative positioned) {DIV} at (320,360) size 320x120
-layer at (328,402) size 160x120
-  RenderVideo {VIDEO} at (0,0) size 160x120
-layer at (488,402) size 160x120
-  RenderVideo {VIDEO} at (160,0) size 160x120
diff --git a/LayoutTests/platform/chromium-mac/media/video-display-toggle-expected.txt b/LayoutTests/platform/chromium-mac/media/video-display-toggle-expected.txt
index 73631cc..c996b97 100644
--- a/LayoutTests/platform/chromium-mac/media/video-display-toggle-expected.txt
+++ b/LayoutTests/platform/chromium-mac/media/video-display-toggle-expected.txt
@@ -7,8 +7,6 @@ layer at (0,0) size 800x600
         text run at (0,0) width 493: "This tests that toggling the display property won't make the controls disappear."
       RenderBR {BR} at (493,14) size 0x0
       RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
 layer at (8,26) size 320x240
   RenderVideo {VIDEO} at (0,18) size 320x240
 layer at (8,26) size 320x240
diff --git a/LayoutTests/platform/chromium-mac/media/video-empty-source-expected.txt b/LayoutTests/platform/chromium-mac/media/video-empty-source-expected.txt
index c32e483..e9760e2 100644
--- a/LayoutTests/platform/chromium-mac/media/video-empty-source-expected.txt
+++ b/LayoutTests/platform/chromium-mac/media/video-empty-source-expected.txt
@@ -8,8 +8,6 @@ layer at (0,0) size 800x600
           text run at (0,0) width 430: "Slider drawing with no source. The controls should render correctly."
       RenderBlock (anonymous) at (0,34) size 784x152
         RenderText {#text} at (0,0) size 0x0
-        RenderText {#text} at (0,0) size 0x0
-        RenderText {#text} at (0,0) size 0x0
 layer at (8,42) size 302x152
   RenderVideo {VIDEO} at (0,0) size 302x152 [border: (1px solid #000000)]
 layer at (9,43) size 300x150
diff --git a/LayoutTests/platform/chromium-mac/media/video-no-audio-expected.txt b/LayoutTests/platform/chromium-mac/media/video-no-audio-expected.txt
index 50eddbd..5fa4d2d 100644
--- a/LayoutTests/platform/chromium-mac/media/video-no-audio-expected.txt
+++ b/LayoutTests/platform/chromium-mac/media/video-no-audio-expected.txt
@@ -8,8 +8,6 @@ layer at (0,0) size 800x600
           text run at (0,0) width 413: "Movie with no audio track. The volume button should not render."
       RenderBlock (anonymous) at (0,34) size 784x288
         RenderText {#text} at (0,0) size 0x0
-        RenderText {#text} at (0,0) size 0x0
-        RenderText {#text} at (0,0) size 0x0
 layer at (8,42) size 352x288
   RenderVideo {VIDEO} at (0,0) size 352x288
 layer at (8,42) size 352x288
diff --git a/LayoutTests/platform/chromium-mac/media/video-volume-slider-expected.txt b/LayoutTests/platform/chromium-mac/media/video-volume-slider-expected.txt
index fd863f1..cc1042f 100644
--- a/LayoutTests/platform/chromium-mac/media/video-volume-slider-expected.txt
+++ b/LayoutTests/platform/chromium-mac/media/video-volume-slider-expected.txt
@@ -13,8 +13,6 @@ layer at (0,0) size 800x600
         text run at (0,36) width 270: "video element will show the volume slider."
       RenderBR {BR} at (270,50) size 0x0
       RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
-      RenderText {#text} at (0,0) size 0x0
 layer at (8,62) size 320x240
   RenderVideo {VIDEO} at (0,54) size 320x240
 layer at (8,62) size 320x240

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list