[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

hamaji at chromium.org hamaji at chromium.org
Thu Feb 4 21:36:09 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit cbc69913a005fec50f3fb103bf2f8429e6e719ac
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 2 05:10:43 2010 +0000

    2010-02-01  Shinichiro Hamaji  <hamaji at chromium.org>
    
            Reviewed by Dmitry Titov.
    
            Convert textarea-rows-cols.html to dumpAsText()
            https://bugs.webkit.org/show_bug.cgi?id=34074
    
            Remove checks for the size of scrollbar as scrollbar doesn't
            appear on Windows.
    
            * fast/forms/script-tests/textarea-rows-cols.js:
            * fast/forms/textarea-rows-cols-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54201 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index f74b652..5567811 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,16 @@
+2010-02-01  Shinichiro Hamaji  <hamaji at chromium.org>
+
+        Reviewed by Dmitry Titov.
+
+        Convert textarea-rows-cols.html to dumpAsText()
+        https://bugs.webkit.org/show_bug.cgi?id=34074
+
+        Remove checks for the size of scrollbar as scrollbar doesn't
+        appear on Windows.
+
+        * fast/forms/script-tests/textarea-rows-cols.js:
+        * fast/forms/textarea-rows-cols-expected.txt:
+
 2010-02-01  Kent Tamura  <tkent at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/LayoutTests/fast/forms/script-tests/textarea-rows-cols.js b/LayoutTests/fast/forms/script-tests/textarea-rows-cols.js
index e6faae1..6388256 100644
--- a/LayoutTests/fast/forms/script-tests/textarea-rows-cols.js
+++ b/LayoutTests/fast/forms/script-tests/textarea-rows-cols.js
@@ -10,16 +10,10 @@ var defaultRows = textarea.rows;
 var defaultCols = textarea.cols;
 var defaultHeight = textarea.offsetHeight;
 var defaultWidth = textarea.offsetWidth;
-var defaultScrollHeight = textarea.scrollHeight;
-var defaultScrollWidth = textarea.scrollWidth;
 shouldBe('defaultRows', '2');
 shouldBe('defaultCols', '20');
 shouldBeTrue('defaultHeight > 0');
 shouldBeTrue('defaultWidth > 0');
-shouldBeTrue('defaultScrollHeight > 0');
-shouldBeTrue('defaultScrollWidth > 0');
-shouldBeTrue('defaultScrollHeight < defaultHeight');
-shouldBeTrue('defaultScrollWidth < defaultWidth');
 
 debug('rows = 1');
 parent.innerHTML = '<textarea rows="1">rows = 1</textarea>';
@@ -78,8 +72,6 @@ shouldBe('textarea.cols', '1');
 shouldBeTrue('textarea.offsetWidth > 0');
 shouldBeTrue('textarea.offsetWidth < defaultWidth');
 shouldBe('textarea.offsetHeight', 'defaultHeight');
-shouldBeTrue('textarea.scrollHeight > defaultScrollHeight');
-shouldBeTrue('textarea.scrollWidth < defaultScrollWidth');
 
 debug('cols = 20; should match default width');
 parent.innerHTML = '<textarea cols="20">cols = 20; should match default width</textarea>';
diff --git a/LayoutTests/fast/forms/textarea-rows-cols-expected.txt b/LayoutTests/fast/forms/textarea-rows-cols-expected.txt
index 0948fe6..302c3a2 100644
--- a/LayoutTests/fast/forms/textarea-rows-cols-expected.txt
+++ b/LayoutTests/fast/forms/textarea-rows-cols-expected.txt
@@ -8,10 +8,6 @@ PASS defaultRows is 2
 PASS defaultCols is 20
 PASS defaultHeight > 0 is true
 PASS defaultWidth > 0 is true
-PASS defaultScrollHeight > 0 is true
-PASS defaultScrollWidth > 0 is true
-PASS defaultScrollHeight < defaultHeight is true
-PASS defaultScrollWidth < defaultWidth is true
 rows = 1
 PASS textarea.rows is 1
 PASS textarea.offsetHeight > 0 is true
@@ -46,8 +42,6 @@ PASS textarea.cols is 1
 PASS textarea.offsetWidth > 0 is true
 PASS textarea.offsetWidth < defaultWidth is true
 PASS textarea.offsetHeight is defaultHeight
-PASS textarea.scrollHeight > defaultScrollHeight is true
-PASS textarea.scrollWidth < defaultScrollWidth is true
 cols = 20; should match default width
 PASS textarea.cols is defaultCols
 PASS textarea.offsetWidth is defaultWidth

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list