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

tkent at chromium.org tkent at chromium.org
Wed Dec 22 13:16:54 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit ea847156f73971d89367bbbabf8a8bdb74b04a5f
Author: tkent at chromium.org <tkent at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 10 06:04:11 2010 +0000

    2010-09-09  Kent Tamura  <tkent at chromium.org>
    
            Unreviewed, second attempt to fix a Qt test failure.
    
            * fast/forms/input-number-unacceptable-style-expected.txt:
            * fast/forms/input-number-unacceptable-style.html:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67172 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index aa6c49d..7b7414d 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,12 @@
 2010-09-09  Kent Tamura  <tkent at chromium.org>
 
+        Unreviewed, second attempt to fix a Qt test failure.
+
+        * fast/forms/input-number-unacceptable-style-expected.txt:
+        * fast/forms/input-number-unacceptable-style.html:
+
+2010-09-09  Kent Tamura  <tkent at chromium.org>
+
         Unreviewed, attempt to fix a Qt test failure.
 
         * fast/forms/input-number-unacceptable-style.html: Set background-color explicitly.
diff --git a/LayoutTests/fast/forms/input-number-unacceptable-style-expected.txt b/LayoutTests/fast/forms/input-number-unacceptable-style-expected.txt
index 21eefc6..2bf6154 100644
--- a/LayoutTests/fast/forms/input-number-unacceptable-style-expected.txt
+++ b/LayoutTests/fast/forms/input-number-unacceptable-style-expected.txt
@@ -4,16 +4,16 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 
 Initial state. The elment has no value.
-PASS colorOf(number) is normalStyleColor
+PASS colorOf(number) != invalidStyleColor is true
 Type '-'. The renderer value becomes unacceptable.
 PASS colorOf(number) is invalidStyleColor
 PASS number.validity.valid is true
 Type '1' additionally. The renderer value becomes acceptable.
-PASS colorOf(number) is normalStyleColor
+PASS colorOf(number) != invalidStyleColor is true
 Type '+' additionally. The renderer value becomes unacceptable again.
 PASS colorOf(number) is invalidStyleColor
 The element losts focus. The unacceptable value should be purged and the style should be normal.
-PASS colorOf(number) is normalStyleColor
+PASS colorOf(number) != invalidStyleColor is true
 PASS document.getSelection().toString() is "-1"
 PASS successfullyParsed is true
 
diff --git a/LayoutTests/fast/forms/input-number-unacceptable-style.html b/LayoutTests/fast/forms/input-number-unacceptable-style.html
index 35b5235..c40b847 100644
--- a/LayoutTests/fast/forms/input-number-unacceptable-style.html
+++ b/LayoutTests/fast/forms/input-number-unacceptable-style.html
@@ -4,9 +4,6 @@
 <link rel="stylesheet" href="../../fast/js/resources/js-test-style.css">
 <script src="../../fast/js/resources/js-test-pre.js"></script>
 <style>
-input {
-  background-color: #ffffff;
-}
 :invalid {
   background-color: #ff0000;
 }
@@ -25,13 +22,12 @@ description('A number input fields with an unacceptable string should have :inva
 function colorOf(el) {
     return document.defaultView.getComputedStyle(el, null).getPropertyValue('background-color');
 }
-var normalStyleColor = 'rgb(255, 255, 255)';
 var invalidStyleColor = 'rgb(255, 0, 0)';
 
 var number = document.getElementById('number');
 number.focus();
 debug('Initial state. The elment has no value.');
-shouldBe('colorOf(number)', 'normalStyleColor');
+shouldBeTrue('colorOf(number) != invalidStyleColor');
 
 debug("Type '-'. The renderer value becomes unacceptable.");
 document.execCommand('InsertText', false, '-');
@@ -40,7 +36,7 @@ shouldBeTrue('number.validity.valid');
 
 debug("Type '1' additionally. The renderer value becomes acceptable.");
 document.execCommand('InsertText', false, '1');
-shouldBe('colorOf(number)', 'normalStyleColor');
+shouldBeTrue('colorOf(number) != invalidStyleColor');
 
 debug("Type '+' additionally. The renderer value becomes unacceptable again.");
 document.execCommand('InsertText', false, '+');
@@ -48,7 +44,7 @@ shouldBe('colorOf(number)', 'invalidStyleColor');
 
 debug("The element losts focus. The unacceptable value should be purged and the style should be normal.");
 document.getElementById('another').focus();
-shouldBe('colorOf(number)', 'normalStyleColor');
+shouldBeTrue('colorOf(number) != invalidStyleColor');
 // Visiblue value is not '-1+'.
 number.focus();
 document.execCommand('SelectAll');

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list