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

aroben at apple.com aroben at apple.com
Wed Dec 22 15:31:09 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 9165ee9f0e30160d07b93ed7ba7f5f5feff28c0b
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 5 15:40:54 2010 +0000

    Update expected results for two tests on Windows
    
    * platform/win/fast/dom/HTMLMeterElement/meter-element-expected.png:
    * platform/win/fast/dom/HTMLMeterElement/meter-element-expected.txt:
    * platform/win/fast/dom/HTMLProgressElement/progress-element-with-child-crash-expected.txt: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71421 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 8db0c70..d4708db 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-05  Adam Roben  <aroben at apple.com>
+
+        Update expected results for two tests on Windows
+
+        * platform/win/fast/dom/HTMLMeterElement/meter-element-expected.png:
+        * platform/win/fast/dom/HTMLMeterElement/meter-element-expected.txt:
+        * platform/win/fast/dom/HTMLProgressElement/progress-element-with-child-crash-expected.txt: Added.
+
 2010-11-05  Csaba Osztrogonác  <ossy at webkit.org>
 
         Unreviewed.
diff --git a/LayoutTests/platform/win/fast/dom/HTMLMeterElement/meter-element-expected.png b/LayoutTests/platform/win/fast/dom/HTMLMeterElement/meter-element-expected.png
index e7c2a76..b5ae55d 100644
Binary files a/LayoutTests/platform/win/fast/dom/HTMLMeterElement/meter-element-expected.png and b/LayoutTests/platform/win/fast/dom/HTMLMeterElement/meter-element-expected.png differ
diff --git a/LayoutTests/platform/win/fast/dom/HTMLMeterElement/meter-element-expected.txt b/LayoutTests/platform/win/fast/dom/HTMLMeterElement/meter-element-expected.txt
index 1e9b17c..466bbe8 100644
--- a/LayoutTests/platform/win/fast/dom/HTMLMeterElement/meter-element-expected.txt
+++ b/LayoutTests/platform/win/fast/dom/HTMLMeterElement/meter-element-expected.txt
@@ -4,13 +4,9 @@ layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderMeter {METER} at (0,44) size 80x16
-        RenderBlock (anonymous) at (0,0) size 0x0
-          RenderText {#text} at (0,0) size 0x0
         RenderBlock {DIV} at (0,0) size 80x16
         RenderBlock {DIV} at (0,0) size 17x16
       RenderMeter {METER} at (80,0) size 10x60
-        RenderBlock (anonymous) at (0,0) size 0x0
-          RenderText {#text} at (0,0) size 0x0
         RenderBlock {DIV} at (0,0) size 10x60
         RenderBlock {DIV} at (0,18) size 10x42
       RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/win/fast/dom/HTMLProgressElement/progress-element-with-child-crash-expected.txt b/LayoutTests/platform/win/fast/dom/HTMLProgressElement/progress-element-with-child-crash-expected.txt
new file mode 100644
index 0000000..05ff317
--- /dev/null
+++ b/LayoutTests/platform/win/fast/dom/HTMLProgressElement/progress-element-with-child-crash-expected.txt
@@ -0,0 +1,3 @@
+Test for Bug 48019. It is OK not to crash.
+
+ 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list