[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
darin at apple.com
darin at apple.com
Wed Dec 22 11:14:01 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit d5cff1e95179933866173da3c1e26b967906c158
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jul 15 16:56:52 2010 +0000
More fixes for the text node coalescing.
Some of this was done directly based on buildbot output, but other cases
are speculative. The patch was much bigger before Adam landed almost all the
same fixes while I was committing ;-). I did not land similar chromium fixes
because I don't know how to interpret the different buildbot output format.
* platform/mac/media/controls-strict-expected.txt:
* platform/mac/media/video-display-toggle-expected.txt:
* platform/mac/media/video-no-audio-expected.txt:
* platform/win/media/controls-after-reload-expected.txt:
* platform/win/media/controls-strict-expected.txt:
* platform/win/media/controls-styling-expected.txt:
* platform/win/media/video-no-audio-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63435 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 268ecb6..b46c1ce 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2010-07-15 Darin Adler <darin at apple.com>
+
+ More fixes for the text node coalescing.
+
+ Some of this was done directly based on buildbot output, but other cases
+ are speculative. The patch was much bigger before Adam landed almost all the
+ same fixes while I was committing ;-). I did not land similar chromium fixes
+ because I don't know how to interpret the different buildbot output format.
+
+ * platform/mac/media/controls-strict-expected.txt:
+ * platform/mac/media/video-display-toggle-expected.txt:
+ * platform/mac/media/video-no-audio-expected.txt:
+ * platform/win/media/controls-after-reload-expected.txt:
+ * platform/win/media/controls-strict-expected.txt:
+ * platform/win/media/controls-styling-expected.txt:
+ * platform/win/media/video-no-audio-expected.txt:
+
2010-07-15 Adam Barth <abarth at webkit.org>
Unreviewed.
diff --git a/LayoutTests/platform/mac/media/controls-strict-expected.txt b/LayoutTests/platform/mac/media/controls-strict-expected.txt
index 5b9e0d1..9be7a0c 100644
--- a/LayoutTests/platform/mac/media/controls-strict-expected.txt
+++ b/LayoutTests/platform/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/mac/media/video-display-toggle-expected.txt b/LayoutTests/platform/mac/media/video-display-toggle-expected.txt
index 0bc4275..5ef12de 100644
--- a/LayoutTests/platform/mac/media/video-display-toggle-expected.txt
+++ b/LayoutTests/platform/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/mac/media/video-no-audio-expected.txt b/LayoutTests/platform/mac/media/video-no-audio-expected.txt
index 7ea2fd0..6843b6d 100644
--- a/LayoutTests/platform/mac/media/video-no-audio-expected.txt
+++ b/LayoutTests/platform/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/win/media/controls-after-reload-expected.txt b/LayoutTests/platform/win/media/controls-after-reload-expected.txt
index 923fac3..59db57a 100644
--- a/LayoutTests/platform/win/media/controls-after-reload-expected.txt
+++ b/LayoutTests/platform/win/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/win/media/controls-strict-expected.txt b/LayoutTests/platform/win/media/controls-strict-expected.txt
index 5296d55..3bbf77d 100644
--- a/LayoutTests/platform/win/media/controls-strict-expected.txt
+++ b/LayoutTests/platform/win/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/win/media/controls-styling-expected.txt b/LayoutTests/platform/win/media/controls-styling-expected.txt
index fd24373..f53f32e 100644
--- a/LayoutTests/platform/win/media/controls-styling-expected.txt
+++ b/LayoutTests/platform/win/media/controls-styling-expected.txt
@@ -10,8 +10,6 @@ layer at (0,0) size 800x600
RenderText {#text} at (0,0) size 0x0
RenderBlock (anonymous) at (0,274) 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 (18,42) size 320x240
RenderVideo {VIDEO} at (10,0) size 320x240
layer at (8,282) size 320x240
diff --git a/LayoutTests/platform/win/media/video-no-audio-expected.txt b/LayoutTests/platform/win/media/video-no-audio-expected.txt
index 1de7c85..922f9f2 100644
--- a/LayoutTests/platform/win/media/video-no-audio-expected.txt
+++ b/LayoutTests/platform/win/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
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list