[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
abarth at webkit.org
abarth at webkit.org
Wed Dec 22 11:14:03 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 4c3d3b592ccd995f23903c4b8579ae105be095a7
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Jul 15 17:01:07 2010 +0000
2010-07-15 Adam Barth <abarth at webkit.org>
Update some more baselines for Eric's text node coalescing patch. I
think these bots were behind and he didn't see the results before he
went to sleep.
* platform/win/editing/selection/drag-text-delay-expected.txt:
* platform/win/fast/css/resize-corner-tracking-expected.txt:
* platform/win/fast/dom/HTMLTextAreaElement/reset-textarea-expected.txt:
* platform/win/fast/forms/basic-textareas-expected.txt:
* platform/win/fast/forms/search-display-none-cancel-button-expected.txt:
* platform/win/fast/forms/textarea-placeholder-set-value-expected.txt:
* platform/win/fast/forms/textarea-scrollbar-expected.txt:
* platform/win/fast/forms/textarea-width-expected.txt:
* platform/win/fast/images/favicon-as-image-expected.txt:
* platform/win/fast/layers/video-layer-expected.txt:
* platform/win/fast/parser/entity-comment-in-textarea-expected.txt:
* platform/win/fast/parser/open-comment-in-textarea-expected.txt:
* platform/win/fast/ruby/ruby-empty-rt-expected.txt:
* platform/win/fast/ruby/ruby-length-expected.txt:
* platform/win/media/video-display-toggle-expected.txt:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@63436 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b46c1ce..aa2decb 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,25 @@
+2010-07-15 Adam Barth <abarth at webkit.org>
+
+ Update some more baselines for Eric's text node coalescing patch. I
+ think these bots were behind and he didn't see the results before he
+ went to sleep.
+
+ * platform/win/editing/selection/drag-text-delay-expected.txt:
+ * platform/win/fast/css/resize-corner-tracking-expected.txt:
+ * platform/win/fast/dom/HTMLTextAreaElement/reset-textarea-expected.txt:
+ * platform/win/fast/forms/basic-textareas-expected.txt:
+ * platform/win/fast/forms/search-display-none-cancel-button-expected.txt:
+ * platform/win/fast/forms/textarea-placeholder-set-value-expected.txt:
+ * platform/win/fast/forms/textarea-scrollbar-expected.txt:
+ * platform/win/fast/forms/textarea-width-expected.txt:
+ * platform/win/fast/images/favicon-as-image-expected.txt:
+ * platform/win/fast/layers/video-layer-expected.txt:
+ * platform/win/fast/parser/entity-comment-in-textarea-expected.txt:
+ * platform/win/fast/parser/open-comment-in-textarea-expected.txt:
+ * platform/win/fast/ruby/ruby-empty-rt-expected.txt:
+ * platform/win/fast/ruby/ruby-length-expected.txt:
+ * platform/win/media/video-display-toggle-expected.txt:
+
2010-07-15 Darin Adler <darin at apple.com>
More fixes for the text node coalescing.
diff --git a/LayoutTests/platform/win/editing/selection/drag-text-delay-expected.txt b/LayoutTests/platform/win/editing/selection/drag-text-delay-expected.txt
index c0cb235..d5c94fc 100644
--- a/LayoutTests/platform/win/editing/selection/drag-text-delay-expected.txt
+++ b/LayoutTests/platform/win/editing/selection/drag-text-delay-expected.txt
@@ -5,7 +5,6 @@ layer at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderTextControl {INPUT} at (2,2) size 125x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
layer at (13,13) size 119x13
RenderBlock {DIV} at (3,3) size 119x13
RenderText {#text} at (1,0) size 56x13
diff --git a/LayoutTests/platform/win/fast/css/resize-corner-tracking-expected.txt b/LayoutTests/platform/win/fast/css/resize-corner-tracking-expected.txt
index 91516f2..02ed7db 100644
--- a/LayoutTests/platform/win/fast/css/resize-corner-tracking-expected.txt
+++ b/LayoutTests/platform/win/fast/css/resize-corner-tracking-expected.txt
@@ -22,7 +22,6 @@ layer at (0,0) size 800x600
text run at (169,107) width 4: " "
RenderBR {BR} at (0,0) size 0x0
RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
layer at (8,70) size 173x125 clip at (10,72) size 169x121
RenderBlock {DIV} at (0,62) size 173x125 [border: (2px solid #0000FF)]
layer at (8,195) size 169x121 clip at (10,197) size 165x117
diff --git a/LayoutTests/platform/win/fast/dom/HTMLTextAreaElement/reset-textarea-expected.txt b/LayoutTests/platform/win/fast/dom/HTMLTextAreaElement/reset-textarea-expected.txt
index c9561ef..bce4900 100644
--- a/LayoutTests/platform/win/fast/dom/HTMLTextAreaElement/reset-textarea-expected.txt
+++ b/LayoutTests/platform/win/fast/dom/HTMLTextAreaElement/reset-textarea-expected.txt
@@ -25,8 +25,6 @@ layer at (0,0) size 800x600
RenderBR {BR} at (175,50) size 0x0
RenderText {#text} at (0,54) size 176x18
text run at (0,54) width 176: "hasDefaultText: SUCCESS"
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
layer at (10,10) size 161x32 clip at (11,11) size 159x30
RenderTextControl {TEXTAREA} at (2,2) size 161x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
RenderBlock {DIV} at (3,3) size 155x13
diff --git a/LayoutTests/platform/win/fast/forms/basic-textareas-expected.txt b/LayoutTests/platform/win/fast/forms/basic-textareas-expected.txt
index 011df5b..777f731 100644
--- a/LayoutTests/platform/win/fast/forms/basic-textareas-expected.txt
+++ b/LayoutTests/platform/win/fast/forms/basic-textareas-expected.txt
@@ -1343,5 +1343,3 @@ layer at (0,0) size 785x1438
text run at (0,13) width 183: "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
text run at (0,26) width 130: "abcdefghijklmnopqrstuv"
RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/win/fast/forms/search-display-none-cancel-button-expected.txt b/LayoutTests/platform/win/fast/forms/search-display-none-cancel-button-expected.txt
index 5bbdbd7..3c2934d 100644
--- a/LayoutTests/platform/win/fast/forms/search-display-none-cancel-button-expected.txt
+++ b/LayoutTests/platform/win/fast/forms/search-display-none-cancel-button-expected.txt
@@ -10,8 +10,6 @@ layer at (0,0) size 800x600
RenderBlock {DIV} at (3,3) size 119x13
RenderBlock {DIV} at (0,0) size 8x11
RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
layer at (21,31) size 111x13
RenderBlock {DIV} at (8,0) size 111x13
RenderText {#text} at (1,0) size 20x13
diff --git a/LayoutTests/platform/win/fast/forms/textarea-placeholder-set-value-expected.txt b/LayoutTests/platform/win/fast/forms/textarea-placeholder-set-value-expected.txt
index 27ccf6f..dcbc135 100644
--- a/LayoutTests/platform/win/fast/forms/textarea-placeholder-set-value-expected.txt
+++ b/LayoutTests/platform/win/fast/forms/textarea-placeholder-set-value-expected.txt
@@ -13,8 +13,6 @@ layer at (0,0) size 800x600
text run at (358,0) width 4: "."
RenderBlock (anonymous) at (0,34) size 784x36
RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
layer at (10,44) size 161x32 clip at (11,45) size 159x30
RenderTextControl {TEXTAREA} at (2,2) size 161x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
RenderBlock {DIV} at (3,3) size 155x13
diff --git a/LayoutTests/platform/win/fast/forms/textarea-scrollbar-expected.txt b/LayoutTests/platform/win/fast/forms/textarea-scrollbar-expected.txt
index 7e94e0b..5c6f28d 100644
--- a/LayoutTests/platform/win/fast/forms/textarea-scrollbar-expected.txt
+++ b/LayoutTests/platform/win/fast/forms/textarea-scrollbar-expected.txt
@@ -7,8 +7,6 @@ layer at (0,0) size 800x600
text run at (0,0) width 442: "This tests that a scrollbar will appear when text overflows the textarea "
RenderBR {BR} at (442,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 (10,28) size 161x84 clip at (11,29) size 144x82 scrollHeight 121
RenderTextControl {TEXTAREA} at (2,20) size 161x84 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
RenderBlock {DIV} at (3,3) size 140x117
diff --git a/LayoutTests/platform/win/fast/forms/textarea-width-expected.txt b/LayoutTests/platform/win/fast/forms/textarea-width-expected.txt
index 938382a..18f04d3 100644
--- a/LayoutTests/platform/win/fast/forms/textarea-width-expected.txt
+++ b/LayoutTests/platform/win/fast/forms/textarea-width-expected.txt
@@ -10,8 +10,6 @@ layer at (0,0) size 800x600
RenderBlock (anonymous) at (0,36) size 784x264
RenderBR {BR} at (0,0) size 0x18
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 549x246 clip at (9,63) size 547x244
RenderTextControl {TEXTAREA} at (0,18) size 549x246 [color=#333333] [bgcolor=#FFFFFF] [border: (1px solid #333333)]
RenderBlock {DIV} at (3,3) size 543x36
diff --git a/LayoutTests/platform/win/fast/images/favicon-as-image-expected.txt b/LayoutTests/platform/win/fast/images/favicon-as-image-expected.txt
index 2a5a5c4..ba1785b 100644
--- a/LayoutTests/platform/win/fast/images/favicon-as-image-expected.txt
+++ b/LayoutTests/platform/win/fast/images/favicon-as-image-expected.txt
@@ -18,5 +18,3 @@ layer at (0,0) size 800x600
RenderBody {BODY} at (0,0) size 16x16
RenderImage {IMG} at (0,0) size 16x16
RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/win/fast/layers/video-layer-expected.txt b/LayoutTests/platform/win/fast/layers/video-layer-expected.txt
index 7b9ba6f..d648e1a 100644
--- a/LayoutTests/platform/win/fast/layers/video-layer-expected.txt
+++ b/LayoutTests/platform/win/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/win/fast/parser/entity-comment-in-textarea-expected.txt b/LayoutTests/platform/win/fast/parser/entity-comment-in-textarea-expected.txt
index 6ef4ed8..a1c5521 100644
--- a/LayoutTests/platform/win/fast/parser/entity-comment-in-textarea-expected.txt
+++ b/LayoutTests/platform/win/fast/parser/entity-comment-in-textarea-expected.txt
@@ -5,9 +5,6 @@ layer at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderText {#text} at (165,22) size 249x18
text run at (165,22) width 249: " --> This should be outside the textarea."
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
layer at (10,10) size 161x32 clip at (11,11) size 159x30
RenderTextControl {TEXTAREA} at (2,2) size 161x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
RenderBlock {DIV} at (3,3) size 155x13
diff --git a/LayoutTests/platform/win/fast/parser/open-comment-in-textarea-expected.txt b/LayoutTests/platform/win/fast/parser/open-comment-in-textarea-expected.txt
index 9bb26cc..ab1cc84 100644
--- a/LayoutTests/platform/win/fast/parser/open-comment-in-textarea-expected.txt
+++ b/LayoutTests/platform/win/fast/parser/open-comment-in-textarea-expected.txt
@@ -5,8 +5,6 @@ layer at (0,0) size 800x600
RenderBody {BODY} at (8,8) size 784x584
RenderText {#text} at (165,22) size 246x18
text run at (165,22) width 246: " This should not be part of the textarea."
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
layer at (10,10) size 161x32 clip at (11,11) size 144x30 scrollHeight 56
RenderTextControl {TEXTAREA} at (2,2) size 161x32 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
RenderBlock {DIV} at (3,3) size 140x52
diff --git a/LayoutTests/platform/win/fast/ruby/ruby-empty-rt-expected.txt b/LayoutTests/platform/win/fast/ruby/ruby-empty-rt-expected.txt
index 7f487dc..781b379 100755
--- a/LayoutTests/platform/win/fast/ruby/ruby-empty-rt-expected.txt
+++ b/LayoutTests/platform/win/fast/ruby/ruby-empty-rt-expected.txt
@@ -26,5 +26,3 @@ layer at (0,0) size 800x600
text run at (0,0) width 15: "text"
RenderText {#text} at (124,13) size 163x18
text run at (124,13) width 163: " to contain the annotation."
- RenderText {#text} at (0,0) size 0x0
- RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/win/fast/ruby/ruby-length-expected.txt b/LayoutTests/platform/win/fast/ruby/ruby-length-expected.txt
index 925c6fa..7cd308a 100755
--- a/LayoutTests/platform/win/fast/ruby/ruby-length-expected.txt
+++ b/LayoutTests/platform/win/fast/ruby/ruby-length-expected.txt
@@ -31,4 +31,3 @@ layer at (0,0) size 800x600
text run at (28,0) width 37: "CSS3"
RenderText {#text} at (464,67) size 42x18
text run at (464,67) width 42: " specs."
- RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/win/media/video-display-toggle-expected.txt b/LayoutTests/platform/win/media/video-display-toggle-expected.txt
index a9baa00..285d545 100644
--- a/LayoutTests/platform/win/media/video-display-toggle-expected.txt
+++ b/LayoutTests/platform/win/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
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list