[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

ojan at chromium.org ojan at chromium.org
Fri Feb 26 22:19:22 UTC 2010


The following commit has been merged in the webkit-1.1 branch:
commit 57f24253ce5447a40b3b3cdf4d144f0be36cb8f0
Author: ojan at chromium.org <ojan at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Feb 13 04:43:10 2010 +0000

    2010-02-12  Ojan Vafai  <ojan at chromium.org>
    
            Reviewed by Maciej Stachowiak.
    
            Four textcontrol tests fail after http://trac.webkit.org/changeset/54748
            https://bugs.webkit.org/show_bug.cgi?id=34916
    
            -Put the baseline for text-control-intrinsic-widths in the right place!
            -I missed perspective-non-layer.html because we don't run it on Leopard.
            -Accidentally deleted drag-text-delay-expected.txt and text-control-intrinsic-widths-expected.txt
            instead of updating their results.
    
            * platform/mac-leopard/fast/forms/text-control-intrinsic-widths-expected.txt: Removed.
            * platform/mac/fast/forms/text-control-intrinsic-widths-expected.txt:
            * platform/mac/transforms/3d/general/perspective-non-layer-expected.txt:
            * platform/win/editing/selection/drag-text-delay-expected.txt: Added.
            * platform/win/fast/forms/text-control-intrinsic-widths-expected.txt: Added.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54749 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ac9feaf..5383c96 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,21 @@
+2010-02-12  Ojan Vafai  <ojan at chromium.org>
+
+        Reviewed by Maciej Stachowiak.
+
+        Four textcontrol tests fail after http://trac.webkit.org/changeset/54748
+        https://bugs.webkit.org/show_bug.cgi?id=34916
+
+        -Put the baseline for text-control-intrinsic-widths in the right place!
+        -I missed perspective-non-layer.html because we don't run it on Leopard.
+        -Accidentally deleted drag-text-delay-expected.txt and text-control-intrinsic-widths-expected.txt
+        instead of updating their results.
+
+        * platform/mac-leopard/fast/forms/text-control-intrinsic-widths-expected.txt: Removed.
+        * platform/mac/fast/forms/text-control-intrinsic-widths-expected.txt:
+        * platform/mac/transforms/3d/general/perspective-non-layer-expected.txt:
+        * platform/win/editing/selection/drag-text-delay-expected.txt: Added.
+        * platform/win/fast/forms/text-control-intrinsic-widths-expected.txt: Added.
+
 2010-01-05  Ojan Vafai  <ojan at chromium.org>
 
         Reviewed by Eric Seidel.
diff --git a/LayoutTests/platform/mac-leopard/fast/forms/text-control-intrinsic-widths-expected.txt b/LayoutTests/platform/mac-leopard/fast/forms/text-control-intrinsic-widths-expected.txt
deleted file mode 100644
index 20a0e2b..0000000
--- a/LayoutTests/platform/mac-leopard/fast/forms/text-control-intrinsic-widths-expected.txt
+++ /dev/null
@@ -1,387 +0,0 @@
-This test measures the width of textareas and text inputs for different fonts.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-Lucida Grande
-input
-size=1 clientWidth=26
-size=2 clientWidth=31
-size=3 clientWidth=36
-size=4 clientWidth=41
-size=5 clientWidth=46
-size=10 clientWidth=71
-size=20 clientWidth=121
-size=50 clientWidth=271
-size=100 clientWidth=521
-size=500 clientWidth=2521
-size=1000 clientWidth=5021
-
-textarea
-cols=1 clientWidth=26
-cols=2 clientWidth=33
-cols=3 clientWidth=40
-cols=4 clientWidth=47
-cols=5 clientWidth=54
-cols=10 clientWidth=89
-cols=20 clientWidth=159
-cols=50 clientWidth=369
-cols=100 clientWidth=719
-cols=500 clientWidth=3519
-cols=1000 clientWidth=7019
-
-Courier
-input
-size=1 clientWidth=11
-size=2 clientWidth=18
-size=3 clientWidth=25
-size=4 clientWidth=32
-size=5 clientWidth=39
-size=10 clientWidth=74
-size=20 clientWidth=144
-size=50 clientWidth=354
-size=100 clientWidth=704
-size=500 clientWidth=3504
-size=1000 clientWidth=7004
-
-textarea
-cols=1 clientWidth=26
-cols=2 clientWidth=33
-cols=3 clientWidth=40
-cols=4 clientWidth=47
-cols=5 clientWidth=54
-cols=10 clientWidth=89
-cols=20 clientWidth=159
-cols=50 clientWidth=369
-cols=100 clientWidth=719
-cols=500 clientWidth=3519
-cols=1000 clientWidth=7019
-
-Helvetica
-input
-size=1 clientWidth=10
-size=2 clientWidth=16
-size=3 clientWidth=22
-size=4 clientWidth=28
-size=5 clientWidth=34
-size=10 clientWidth=64
-size=20 clientWidth=124
-size=50 clientWidth=304
-size=100 clientWidth=604
-size=500 clientWidth=3004
-size=1000 clientWidth=6004
-
-textarea
-cols=1 clientWidth=25
-cols=2 clientWidth=31
-cols=3 clientWidth=37
-cols=4 clientWidth=43
-cols=5 clientWidth=49
-cols=10 clientWidth=79
-cols=20 clientWidth=139
-cols=50 clientWidth=319
-cols=100 clientWidth=619
-cols=500 clientWidth=3019
-cols=1000 clientWidth=6019
-
-Monaco
-input
-size=1 clientWidth=11
-size=2 clientWidth=18
-size=3 clientWidth=25
-size=4 clientWidth=32
-size=5 clientWidth=39
-size=10 clientWidth=74
-size=20 clientWidth=144
-size=50 clientWidth=354
-size=100 clientWidth=704
-size=500 clientWidth=3504
-size=1000 clientWidth=7004
-
-textarea
-cols=1 clientWidth=26
-cols=2 clientWidth=33
-cols=3 clientWidth=40
-cols=4 clientWidth=47
-cols=5 clientWidth=54
-cols=10 clientWidth=89
-cols=20 clientWidth=159
-cols=50 clientWidth=369
-cols=100 clientWidth=719
-cols=500 clientWidth=3519
-cols=1000 clientWidth=7019
-
-Times
-input
-size=1 clientWidth=10
-size=2 clientWidth=16
-size=3 clientWidth=22
-size=4 clientWidth=28
-size=5 clientWidth=34
-size=10 clientWidth=64
-size=20 clientWidth=124
-size=50 clientWidth=304
-size=100 clientWidth=604
-size=500 clientWidth=3004
-size=1000 clientWidth=6004
-
-textarea
-cols=1 clientWidth=25
-cols=2 clientWidth=31
-cols=3 clientWidth=37
-cols=4 clientWidth=43
-cols=5 clientWidth=49
-cols=10 clientWidth=79
-cols=20 clientWidth=139
-cols=50 clientWidth=319
-cols=100 clientWidth=619
-cols=500 clientWidth=3019
-cols=1000 clientWidth=6019
-
-Andale Mono
-input
-size=1 clientWidth=11
-size=2 clientWidth=18
-size=3 clientWidth=25
-size=4 clientWidth=32
-size=5 clientWidth=39
-size=10 clientWidth=74
-size=20 clientWidth=144
-size=50 clientWidth=354
-size=100 clientWidth=704
-size=500 clientWidth=3504
-size=1000 clientWidth=7004
-
-textarea
-cols=1 clientWidth=26
-cols=2 clientWidth=33
-cols=3 clientWidth=40
-cols=4 clientWidth=47
-cols=5 clientWidth=54
-cols=10 clientWidth=89
-cols=20 clientWidth=159
-cols=50 clientWidth=369
-cols=100 clientWidth=719
-cols=500 clientWidth=3519
-cols=1000 clientWidth=7019
-
-Arial
-input
-size=1 clientWidth=33
-size=2 clientWidth=38
-size=3 clientWidth=43
-size=4 clientWidth=48
-size=5 clientWidth=53
-size=10 clientWidth=78
-size=20 clientWidth=128
-size=50 clientWidth=278
-size=100 clientWidth=528
-size=500 clientWidth=2528
-size=1000 clientWidth=5028
-
-textarea
-cols=1 clientWidth=24
-cols=2 clientWidth=29
-cols=3 clientWidth=34
-cols=4 clientWidth=39
-cols=5 clientWidth=44
-cols=10 clientWidth=69
-cols=20 clientWidth=119
-cols=50 clientWidth=269
-cols=100 clientWidth=519
-cols=500 clientWidth=2519
-cols=1000 clientWidth=5019
-
-Comic Sans MS
-input
-size=1 clientWidth=18
-size=2 clientWidth=23
-size=3 clientWidth=28
-size=4 clientWidth=33
-size=5 clientWidth=38
-size=10 clientWidth=63
-size=20 clientWidth=113
-size=50 clientWidth=263
-size=100 clientWidth=513
-size=500 clientWidth=2513
-size=1000 clientWidth=5013
-
-textarea
-cols=1 clientWidth=24
-cols=2 clientWidth=29
-cols=3 clientWidth=34
-cols=4 clientWidth=39
-cols=5 clientWidth=44
-cols=10 clientWidth=69
-cols=20 clientWidth=119
-cols=50 clientWidth=269
-cols=100 clientWidth=519
-cols=500 clientWidth=2519
-cols=1000 clientWidth=5019
-
-Courier New
-input
-size=1 clientWidth=12
-size=2 clientWidth=19
-size=3 clientWidth=26
-size=4 clientWidth=33
-size=5 clientWidth=40
-size=10 clientWidth=75
-size=20 clientWidth=145
-size=50 clientWidth=355
-size=100 clientWidth=705
-size=500 clientWidth=3505
-size=1000 clientWidth=7005
-
-textarea
-cols=1 clientWidth=26
-cols=2 clientWidth=33
-cols=3 clientWidth=40
-cols=4 clientWidth=47
-cols=5 clientWidth=54
-cols=10 clientWidth=89
-cols=20 clientWidth=159
-cols=50 clientWidth=369
-cols=100 clientWidth=719
-cols=500 clientWidth=3519
-cols=1000 clientWidth=7019
-
-Georgia
-input
-size=1 clientWidth=19
-size=2 clientWidth=24
-size=3 clientWidth=29
-size=4 clientWidth=34
-size=5 clientWidth=39
-size=10 clientWidth=64
-size=20 clientWidth=114
-size=50 clientWidth=264
-size=100 clientWidth=514
-size=500 clientWidth=2514
-size=1000 clientWidth=5014
-
-textarea
-cols=1 clientWidth=24
-cols=2 clientWidth=29
-cols=3 clientWidth=34
-cols=4 clientWidth=39
-cols=5 clientWidth=44
-cols=10 clientWidth=69
-cols=20 clientWidth=119
-cols=50 clientWidth=269
-cols=100 clientWidth=519
-cols=500 clientWidth=2519
-cols=1000 clientWidth=5019
-
-Times New Roman
-input
-size=1 clientWidth=32
-size=2 clientWidth=36
-size=3 clientWidth=40
-size=4 clientWidth=44
-size=5 clientWidth=48
-size=10 clientWidth=68
-size=20 clientWidth=108
-size=50 clientWidth=228
-size=100 clientWidth=428
-size=500 clientWidth=2028
-size=1000 clientWidth=4028
-
-textarea
-cols=1 clientWidth=23
-cols=2 clientWidth=27
-cols=3 clientWidth=31
-cols=4 clientWidth=35
-cols=5 clientWidth=39
-cols=10 clientWidth=59
-cols=20 clientWidth=99
-cols=50 clientWidth=219
-cols=100 clientWidth=419
-cols=500 clientWidth=2019
-cols=1000 clientWidth=4019
-
-Trebuchet MS
-input
-size=1 clientWidth=17
-size=2 clientWidth=22
-size=3 clientWidth=27
-size=4 clientWidth=32
-size=5 clientWidth=37
-size=10 clientWidth=62
-size=20 clientWidth=112
-size=50 clientWidth=262
-size=100 clientWidth=512
-size=500 clientWidth=2512
-size=1000 clientWidth=5012
-
-textarea
-cols=1 clientWidth=24
-cols=2 clientWidth=29
-cols=3 clientWidth=34
-cols=4 clientWidth=39
-cols=5 clientWidth=44
-cols=10 clientWidth=69
-cols=20 clientWidth=119
-cols=50 clientWidth=269
-cols=100 clientWidth=519
-cols=500 clientWidth=2519
-cols=1000 clientWidth=5019
-
-Verdana
-input
-size=1 clientWidth=25
-size=2 clientWidth=31
-size=3 clientWidth=37
-size=4 clientWidth=43
-size=5 clientWidth=49
-size=10 clientWidth=79
-size=20 clientWidth=139
-size=50 clientWidth=319
-size=100 clientWidth=619
-size=500 clientWidth=3019
-size=1000 clientWidth=6019
-
-textarea
-cols=1 clientWidth=25
-cols=2 clientWidth=31
-cols=3 clientWidth=37
-cols=4 clientWidth=43
-cols=5 clientWidth=49
-cols=10 clientWidth=79
-cols=20 clientWidth=139
-cols=50 clientWidth=319
-cols=100 clientWidth=619
-cols=500 clientWidth=3019
-cols=1000 clientWidth=6019
-
-Webdings
-input
-size=1 clientWidth=48
-size=2 clientWidth=59
-size=3 clientWidth=70
-size=4 clientWidth=81
-size=5 clientWidth=92
-size=10 clientWidth=147
-size=20 clientWidth=257
-size=50 clientWidth=587
-size=100 clientWidth=1137
-size=500 clientWidth=5537
-size=1000 clientWidth=11037
-
-textarea
-cols=1 clientWidth=30
-cols=2 clientWidth=41
-cols=3 clientWidth=52
-cols=4 clientWidth=63
-cols=5 clientWidth=74
-cols=10 clientWidth=129
-cols=20 clientWidth=239
-cols=50 clientWidth=569
-cols=100 clientWidth=1119
-cols=500 clientWidth=5519
-cols=1000 clientWidth=11019
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/platform/mac/fast/forms/text-control-intrinsic-widths-expected.txt b/LayoutTests/platform/mac/fast/forms/text-control-intrinsic-widths-expected.txt
index 7866401..20a0e2b 100644
--- a/LayoutTests/platform/mac/fast/forms/text-control-intrinsic-widths-expected.txt
+++ b/LayoutTests/platform/mac/fast/forms/text-control-intrinsic-widths-expected.txt
@@ -5,44 +5,44 @@ On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE
 
 Lucida Grande
 input
-size=1 clientWidth=22
-size=2 clientWidth=27
-size=3 clientWidth=33
-size=4 clientWidth=38
-size=5 clientWidth=43
-size=10 clientWidth=70
-size=20 clientWidth=124
-size=50 clientWidth=286
-size=100 clientWidth=556
-size=500 clientWidth=2712
-size=1000 clientWidth=5407
+size=1 clientWidth=26
+size=2 clientWidth=31
+size=3 clientWidth=36
+size=4 clientWidth=41
+size=5 clientWidth=46
+size=10 clientWidth=71
+size=20 clientWidth=121
+size=50 clientWidth=271
+size=100 clientWidth=521
+size=500 clientWidth=2521
+size=1000 clientWidth=5021
 
 textarea
-cols=1 clientWidth=25
-cols=2 clientWidth=30
-cols=3 clientWidth=36
-cols=4 clientWidth=41
-cols=5 clientWidth=46
-cols=10 clientWidth=73
-cols=20 clientWidth=127
-cols=50 clientWidth=289
-cols=100 clientWidth=559
-cols=500 clientWidth=2715
-cols=1000 clientWidth=5410
+cols=1 clientWidth=26
+cols=2 clientWidth=33
+cols=3 clientWidth=40
+cols=4 clientWidth=47
+cols=5 clientWidth=54
+cols=10 clientWidth=89
+cols=20 clientWidth=159
+cols=50 clientWidth=369
+cols=100 clientWidth=719
+cols=500 clientWidth=3519
+cols=1000 clientWidth=7019
 
 Courier
 input
-size=1 clientWidth=13
-size=2 clientWidth=20
-size=3 clientWidth=27
-size=4 clientWidth=34
-size=5 clientWidth=41
-size=10 clientWidth=76
-size=20 clientWidth=146
-size=50 clientWidth=356
-size=100 clientWidth=706
-size=500 clientWidth=3506
-size=1000 clientWidth=7006
+size=1 clientWidth=11
+size=2 clientWidth=18
+size=3 clientWidth=25
+size=4 clientWidth=32
+size=5 clientWidth=39
+size=10 clientWidth=74
+size=20 clientWidth=144
+size=50 clientWidth=354
+size=100 clientWidth=704
+size=500 clientWidth=3504
+size=1000 clientWidth=7004
 
 textarea
 cols=1 clientWidth=26
@@ -59,44 +59,44 @@ cols=1000 clientWidth=7019
 
 Helvetica
 input
-size=1 clientWidth=20
-size=2 clientWidth=25
-size=3 clientWidth=30
-size=4 clientWidth=35
-size=5 clientWidth=40
+size=1 clientWidth=10
+size=2 clientWidth=16
+size=3 clientWidth=22
+size=4 clientWidth=28
+size=5 clientWidth=34
 size=10 clientWidth=64
-size=20 clientWidth=112
-size=50 clientWidth=257
-size=100 clientWidth=498
-size=500 clientWidth=2427
-size=1000 clientWidth=4838
+size=20 clientWidth=124
+size=50 clientWidth=304
+size=100 clientWidth=604
+size=500 clientWidth=3004
+size=1000 clientWidth=6004
 
 textarea
-cols=1 clientWidth=24
-cols=2 clientWidth=29
-cols=3 clientWidth=34
-cols=4 clientWidth=39
-cols=5 clientWidth=44
-cols=10 clientWidth=68
-cols=20 clientWidth=116
-cols=50 clientWidth=261
-cols=100 clientWidth=502
-cols=500 clientWidth=2431
-cols=1000 clientWidth=4842
+cols=1 clientWidth=25
+cols=2 clientWidth=31
+cols=3 clientWidth=37
+cols=4 clientWidth=43
+cols=5 clientWidth=49
+cols=10 clientWidth=79
+cols=20 clientWidth=139
+cols=50 clientWidth=319
+cols=100 clientWidth=619
+cols=500 clientWidth=3019
+cols=1000 clientWidth=6019
 
 Monaco
 input
-size=1 clientWidth=10
-size=2 clientWidth=17
-size=3 clientWidth=24
-size=4 clientWidth=31
-size=5 clientWidth=38
-size=10 clientWidth=73
-size=20 clientWidth=143
-size=50 clientWidth=353
-size=100 clientWidth=703
-size=500 clientWidth=3503
-size=1000 clientWidth=7003
+size=1 clientWidth=11
+size=2 clientWidth=18
+size=3 clientWidth=25
+size=4 clientWidth=32
+size=5 clientWidth=39
+size=10 clientWidth=74
+size=20 clientWidth=144
+size=50 clientWidth=354
+size=100 clientWidth=704
+size=500 clientWidth=3504
+size=1000 clientWidth=7004
 
 textarea
 cols=1 clientWidth=26
@@ -113,44 +113,44 @@ cols=1000 clientWidth=7019
 
 Times
 input
-size=1 clientWidth=23
-size=2 clientWidth=28
-size=3 clientWidth=32
-size=4 clientWidth=37
-size=5 clientWidth=42
-size=10 clientWidth=65
-size=20 clientWidth=111
-size=50 clientWidth=250
-size=100 clientWidth=482
-size=500 clientWidth=2338
-size=1000 clientWidth=4657
+size=1 clientWidth=10
+size=2 clientWidth=16
+size=3 clientWidth=22
+size=4 clientWidth=28
+size=5 clientWidth=34
+size=10 clientWidth=64
+size=20 clientWidth=124
+size=50 clientWidth=304
+size=100 clientWidth=604
+size=500 clientWidth=3004
+size=1000 clientWidth=6004
 
 textarea
-cols=1 clientWidth=24
-cols=2 clientWidth=29
-cols=3 clientWidth=33
-cols=4 clientWidth=38
-cols=5 clientWidth=43
-cols=10 clientWidth=66
-cols=20 clientWidth=112
-cols=50 clientWidth=251
-cols=100 clientWidth=483
-cols=500 clientWidth=2339
-cols=1000 clientWidth=4658
+cols=1 clientWidth=25
+cols=2 clientWidth=31
+cols=3 clientWidth=37
+cols=4 clientWidth=43
+cols=5 clientWidth=49
+cols=10 clientWidth=79
+cols=20 clientWidth=139
+cols=50 clientWidth=319
+cols=100 clientWidth=619
+cols=500 clientWidth=3019
+cols=1000 clientWidth=6019
 
 Andale Mono
 input
-size=1 clientWidth=10
-size=2 clientWidth=17
-size=3 clientWidth=24
-size=4 clientWidth=31
-size=5 clientWidth=38
-size=10 clientWidth=73
-size=20 clientWidth=143
-size=50 clientWidth=353
-size=100 clientWidth=703
-size=500 clientWidth=3503
-size=1000 clientWidth=7003
+size=1 clientWidth=11
+size=2 clientWidth=18
+size=3 clientWidth=25
+size=4 clientWidth=32
+size=5 clientWidth=39
+size=10 clientWidth=74
+size=20 clientWidth=144
+size=50 clientWidth=354
+size=100 clientWidth=704
+size=500 clientWidth=3504
+size=1000 clientWidth=7004
 
 textarea
 cols=1 clientWidth=26
@@ -167,17 +167,17 @@ cols=1000 clientWidth=7019
 
 Arial
 input
-size=1 clientWidth=26
-size=2 clientWidth=31
-size=3 clientWidth=36
-size=4 clientWidth=41
-size=5 clientWidth=46
-size=10 clientWidth=70
-size=20 clientWidth=118
-size=50 clientWidth=263
-size=100 clientWidth=504
-size=500 clientWidth=2433
-size=1000 clientWidth=4844
+size=1 clientWidth=33
+size=2 clientWidth=38
+size=3 clientWidth=43
+size=4 clientWidth=48
+size=5 clientWidth=53
+size=10 clientWidth=78
+size=20 clientWidth=128
+size=50 clientWidth=278
+size=100 clientWidth=528
+size=500 clientWidth=2528
+size=1000 clientWidth=5028
 
 textarea
 cols=1 clientWidth=24
@@ -185,12 +185,12 @@ cols=2 clientWidth=29
 cols=3 clientWidth=34
 cols=4 clientWidth=39
 cols=5 clientWidth=44
-cols=10 clientWidth=68
-cols=20 clientWidth=116
-cols=50 clientWidth=261
-cols=100 clientWidth=502
-cols=500 clientWidth=2431
-cols=1000 clientWidth=4842
+cols=10 clientWidth=69
+cols=20 clientWidth=119
+cols=50 clientWidth=269
+cols=100 clientWidth=519
+cols=500 clientWidth=2519
+cols=1000 clientWidth=5019
 
 Comic Sans MS
 input
@@ -199,39 +199,39 @@ size=2 clientWidth=23
 size=3 clientWidth=28
 size=4 clientWidth=33
 size=5 clientWidth=38
-size=10 clientWidth=64
-size=20 clientWidth=115
-size=50 clientWidth=269
-size=100 clientWidth=525
-size=500 clientWidth=2575
-size=1000 clientWidth=5138
+size=10 clientWidth=63
+size=20 clientWidth=113
+size=50 clientWidth=263
+size=100 clientWidth=513
+size=500 clientWidth=2513
+size=1000 clientWidth=5013
 
 textarea
-cols=1 clientWidth=25
-cols=2 clientWidth=30
-cols=3 clientWidth=35
-cols=4 clientWidth=40
-cols=5 clientWidth=45
-cols=10 clientWidth=71
-cols=20 clientWidth=122
-cols=50 clientWidth=276
-cols=100 clientWidth=532
-cols=500 clientWidth=2582
-cols=1000 clientWidth=5145
+cols=1 clientWidth=24
+cols=2 clientWidth=29
+cols=3 clientWidth=34
+cols=4 clientWidth=39
+cols=5 clientWidth=44
+cols=10 clientWidth=69
+cols=20 clientWidth=119
+cols=50 clientWidth=269
+cols=100 clientWidth=519
+cols=500 clientWidth=2519
+cols=1000 clientWidth=5019
 
 Courier New
 input
-size=1 clientWidth=10
-size=2 clientWidth=17
-size=3 clientWidth=24
-size=4 clientWidth=31
-size=5 clientWidth=38
-size=10 clientWidth=73
-size=20 clientWidth=143
-size=50 clientWidth=353
-size=100 clientWidth=703
-size=500 clientWidth=3503
-size=1000 clientWidth=7003
+size=1 clientWidth=12
+size=2 clientWidth=19
+size=3 clientWidth=26
+size=4 clientWidth=33
+size=5 clientWidth=40
+size=10 clientWidth=75
+size=20 clientWidth=145
+size=50 clientWidth=355
+size=100 clientWidth=705
+size=500 clientWidth=3505
+size=1000 clientWidth=7005
 
 textarea
 cols=1 clientWidth=26
@@ -248,17 +248,17 @@ cols=1000 clientWidth=7019
 
 Georgia
 input
-size=1 clientWidth=17
-size=2 clientWidth=22
-size=3 clientWidth=27
-size=4 clientWidth=32
-size=5 clientWidth=37
-size=10 clientWidth=61
-size=20 clientWidth=110
-size=50 clientWidth=256
-size=100 clientWidth=500
-size=500 clientWidth=2448
-size=1000 clientWidth=4883
+size=1 clientWidth=19
+size=2 clientWidth=24
+size=3 clientWidth=29
+size=4 clientWidth=34
+size=5 clientWidth=39
+size=10 clientWidth=64
+size=20 clientWidth=114
+size=50 clientWidth=264
+size=100 clientWidth=514
+size=500 clientWidth=2514
+size=1000 clientWidth=5014
 
 textarea
 cols=1 clientWidth=24
@@ -266,53 +266,53 @@ cols=2 clientWidth=29
 cols=3 clientWidth=34
 cols=4 clientWidth=39
 cols=5 clientWidth=44
-cols=10 clientWidth=68
-cols=20 clientWidth=117
-cols=50 clientWidth=263
-cols=100 clientWidth=507
-cols=500 clientWidth=2455
-cols=1000 clientWidth=4890
+cols=10 clientWidth=69
+cols=20 clientWidth=119
+cols=50 clientWidth=269
+cols=100 clientWidth=519
+cols=500 clientWidth=2519
+cols=1000 clientWidth=5019
 
 Times New Roman
 input
-size=1 clientWidth=26
-size=2 clientWidth=31
-size=3 clientWidth=35
-size=4 clientWidth=40
-size=5 clientWidth=45
+size=1 clientWidth=32
+size=2 clientWidth=36
+size=3 clientWidth=40
+size=4 clientWidth=44
+size=5 clientWidth=48
 size=10 clientWidth=68
-size=20 clientWidth=114
-size=50 clientWidth=253
-size=100 clientWidth=485
-size=500 clientWidth=2341
-size=1000 clientWidth=4660
+size=20 clientWidth=108
+size=50 clientWidth=228
+size=100 clientWidth=428
+size=500 clientWidth=2028
+size=1000 clientWidth=4028
 
 textarea
-cols=1 clientWidth=24
-cols=2 clientWidth=29
-cols=3 clientWidth=33
-cols=4 clientWidth=38
-cols=5 clientWidth=43
-cols=10 clientWidth=66
-cols=20 clientWidth=112
-cols=50 clientWidth=251
-cols=100 clientWidth=483
-cols=500 clientWidth=2339
-cols=1000 clientWidth=4658
+cols=1 clientWidth=23
+cols=2 clientWidth=27
+cols=3 clientWidth=31
+cols=4 clientWidth=35
+cols=5 clientWidth=39
+cols=10 clientWidth=59
+cols=20 clientWidth=99
+cols=50 clientWidth=219
+cols=100 clientWidth=419
+cols=500 clientWidth=2019
+cols=1000 clientWidth=4019
 
 Trebuchet MS
 input
-size=1 clientWidth=16
-size=2 clientWidth=21
-size=3 clientWidth=26
-size=4 clientWidth=31
-size=5 clientWidth=36
-size=10 clientWidth=60
-size=20 clientWidth=108
-size=50 clientWidth=254
-size=100 clientWidth=496
-size=500 clientWidth=2436
-size=1000 clientWidth=4860
+size=1 clientWidth=17
+size=2 clientWidth=22
+size=3 clientWidth=27
+size=4 clientWidth=32
+size=5 clientWidth=37
+size=10 clientWidth=62
+size=20 clientWidth=112
+size=50 clientWidth=262
+size=100 clientWidth=512
+size=500 clientWidth=2512
+size=1000 clientWidth=5012
 
 textarea
 cols=1 clientWidth=24
@@ -320,66 +320,66 @@ cols=2 clientWidth=29
 cols=3 clientWidth=34
 cols=4 clientWidth=39
 cols=5 clientWidth=44
-cols=10 clientWidth=68
-cols=20 clientWidth=116
-cols=50 clientWidth=262
-cols=100 clientWidth=504
-cols=500 clientWidth=2444
-cols=1000 clientWidth=4868
+cols=10 clientWidth=69
+cols=20 clientWidth=119
+cols=50 clientWidth=269
+cols=100 clientWidth=519
+cols=500 clientWidth=2519
+cols=1000 clientWidth=5019
 
 Verdana
 input
-size=1 clientWidth=20
-size=2 clientWidth=26
-size=3 clientWidth=32
-size=4 clientWidth=38
-size=5 clientWidth=43
-size=10 clientWidth=72
-size=20 clientWidth=130
-size=50 clientWidth=303
-size=100 clientWidth=591
-size=500 clientWidth=2895
-size=1000 clientWidth=5775
+size=1 clientWidth=25
+size=2 clientWidth=31
+size=3 clientWidth=37
+size=4 clientWidth=43
+size=5 clientWidth=49
+size=10 clientWidth=79
+size=20 clientWidth=139
+size=50 clientWidth=319
+size=100 clientWidth=619
+size=500 clientWidth=3019
+size=1000 clientWidth=6019
 
 textarea
 cols=1 clientWidth=25
 cols=2 clientWidth=31
 cols=3 clientWidth=37
 cols=4 clientWidth=43
-cols=5 clientWidth=48
-cols=10 clientWidth=77
-cols=20 clientWidth=135
-cols=50 clientWidth=308
-cols=100 clientWidth=596
-cols=500 clientWidth=2900
-cols=1000 clientWidth=5780
+cols=5 clientWidth=49
+cols=10 clientWidth=79
+cols=20 clientWidth=139
+cols=50 clientWidth=319
+cols=100 clientWidth=619
+cols=500 clientWidth=3019
+cols=1000 clientWidth=6019
 
 Webdings
 input
-size=1 clientWidth=18
-size=2 clientWidth=24
-size=3 clientWidth=30
-size=4 clientWidth=36
-size=5 clientWidth=42
-size=10 clientWidth=71
-size=20 clientWidth=130
-size=50 clientWidth=306
-size=100 clientWidth=599
-size=500 clientWidth=2945
-size=1000 clientWidth=5878
+size=1 clientWidth=48
+size=2 clientWidth=59
+size=3 clientWidth=70
+size=4 clientWidth=81
+size=5 clientWidth=92
+size=10 clientWidth=147
+size=20 clientWidth=257
+size=50 clientWidth=587
+size=100 clientWidth=1137
+size=500 clientWidth=5537
+size=1000 clientWidth=11037
 
 textarea
-cols=1 clientWidth=25
-cols=2 clientWidth=31
-cols=3 clientWidth=37
-cols=4 clientWidth=43
-cols=5 clientWidth=49
-cols=10 clientWidth=78
-cols=20 clientWidth=137
-cols=50 clientWidth=313
-cols=100 clientWidth=606
-cols=500 clientWidth=2952
-cols=1000 clientWidth=5885
+cols=1 clientWidth=30
+cols=2 clientWidth=41
+cols=3 clientWidth=52
+cols=4 clientWidth=63
+cols=5 clientWidth=74
+cols=10 clientWidth=129
+cols=20 clientWidth=239
+cols=50 clientWidth=569
+cols=100 clientWidth=1119
+cols=500 clientWidth=5519
+cols=1000 clientWidth=11019
 
 PASS successfullyParsed is true
 
diff --git a/LayoutTests/platform/mac/transforms/3d/general/perspective-non-layer-expected.txt b/LayoutTests/platform/mac/transforms/3d/general/perspective-non-layer-expected.txt
index ef243b0..18ee85d 100644
--- a/LayoutTests/platform/mac/transforms/3d/general/perspective-non-layer-expected.txt
+++ b/LayoutTests/platform/mac/transforms/3d/general/perspective-non-layer-expected.txt
@@ -4,13 +4,13 @@ layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
       RenderBlock (anonymous) at (0,0) size 784x23
-        RenderInline {SPAN} at (0,0) size 132x18
+        RenderInline {SPAN} at (0,0) size 129x18
           RenderText {#text} at (0,0) size 0x0
-          RenderTextControl {INPUT} at (2,2) size 128x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
+          RenderTextControl {INPUT} at (2,2) size 125x19 [bgcolor=#FFFFFF] [border: (2px inset #000000)]
           RenderText {#text} at (0,0) size 0x0
       RenderBlock (anonymous) at (0,23) size 784x0
         RenderBlock {DIV} at (0,0) size 784x0
       RenderBlock (anonymous) at (0,23) size 784x0
         RenderInline {SPAN} at (0,0) size 0x0
-layer at (13,13) size 122x13
-  RenderBlock {DIV} at (3,3) size 122x13
+layer at (13,13) size 119x13
+  RenderBlock {DIV} at (3,3) size 119x13
diff --git a/LayoutTests/platform/win/editing/selection/drag-text-delay-expected.txt b/LayoutTests/platform/win/editing/selection/drag-text-delay-expected.txt
new file mode 100644
index 0000000..ee68125
--- /dev/null
+++ b/LayoutTests/platform/win/editing/selection/drag-text-delay-expected.txt
@@ -0,0 +1,14 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} 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 59x13
+      text run at (1,0) width 59: " worldhello"
+selection start: position 6 of child 0 {#text} of child 0 {DIV} of child 1 {INPUT} of child 1 {BODY} of child 0 {HTML} of document
+selection end:   position 11 of child 0 {#text} of child 0 {DIV} of child 1 {INPUT} of child 1 {BODY} of child 0 {HTML} of document
diff --git a/LayoutTests/platform/win/fast/forms/text-control-intrinsic-widths-expected.txt b/LayoutTests/platform/win/fast/forms/text-control-intrinsic-widths-expected.txt
new file mode 100644
index 0000000..a7966e3
--- /dev/null
+++ b/LayoutTests/platform/win/fast/forms/text-control-intrinsic-widths-expected.txt
@@ -0,0 +1,387 @@
+This test measures the width of textareas and text inputs for different fonts.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Lucida Grande
+input
+size=1 clientWidth=26
+size=2 clientWidth=31
+size=3 clientWidth=36
+size=4 clientWidth=41
+size=5 clientWidth=46
+size=10 clientWidth=71
+size=20 clientWidth=121
+size=50 clientWidth=271
+size=100 clientWidth=521
+size=500 clientWidth=2521
+size=1000 clientWidth=5021
+
+textarea
+cols=1 clientWidth=26
+cols=2 clientWidth=33
+cols=3 clientWidth=40
+cols=4 clientWidth=47
+cols=5 clientWidth=54
+cols=10 clientWidth=89
+cols=20 clientWidth=159
+cols=50 clientWidth=369
+cols=100 clientWidth=719
+cols=500 clientWidth=3519
+cols=1000 clientWidth=7019
+
+Courier
+input
+size=1 clientWidth=11
+size=2 clientWidth=18
+size=3 clientWidth=25
+size=4 clientWidth=32
+size=5 clientWidth=39
+size=10 clientWidth=74
+size=20 clientWidth=144
+size=50 clientWidth=354
+size=100 clientWidth=704
+size=500 clientWidth=3504
+size=1000 clientWidth=7004
+
+textarea
+cols=1 clientWidth=26
+cols=2 clientWidth=33
+cols=3 clientWidth=40
+cols=4 clientWidth=47
+cols=5 clientWidth=54
+cols=10 clientWidth=89
+cols=20 clientWidth=159
+cols=50 clientWidth=369
+cols=100 clientWidth=719
+cols=500 clientWidth=3519
+cols=1000 clientWidth=7019
+
+Helvetica
+input
+size=1 clientWidth=10
+size=2 clientWidth=16
+size=3 clientWidth=22
+size=4 clientWidth=28
+size=5 clientWidth=34
+size=10 clientWidth=64
+size=20 clientWidth=124
+size=50 clientWidth=304
+size=100 clientWidth=604
+size=500 clientWidth=3004
+size=1000 clientWidth=6004
+
+textarea
+cols=1 clientWidth=25
+cols=2 clientWidth=31
+cols=3 clientWidth=37
+cols=4 clientWidth=43
+cols=5 clientWidth=49
+cols=10 clientWidth=79
+cols=20 clientWidth=139
+cols=50 clientWidth=319
+cols=100 clientWidth=619
+cols=500 clientWidth=3019
+cols=1000 clientWidth=6019
+
+Monaco
+input
+size=1 clientWidth=11
+size=2 clientWidth=18
+size=3 clientWidth=25
+size=4 clientWidth=32
+size=5 clientWidth=39
+size=10 clientWidth=74
+size=20 clientWidth=144
+size=50 clientWidth=354
+size=100 clientWidth=704
+size=500 clientWidth=3504
+size=1000 clientWidth=7004
+
+textarea
+cols=1 clientWidth=26
+cols=2 clientWidth=33
+cols=3 clientWidth=40
+cols=4 clientWidth=47
+cols=5 clientWidth=54
+cols=10 clientWidth=89
+cols=20 clientWidth=159
+cols=50 clientWidth=369
+cols=100 clientWidth=719
+cols=500 clientWidth=3519
+cols=1000 clientWidth=7019
+
+Times
+input
+size=1 clientWidth=10
+size=2 clientWidth=16
+size=3 clientWidth=22
+size=4 clientWidth=28
+size=5 clientWidth=34
+size=10 clientWidth=64
+size=20 clientWidth=124
+size=50 clientWidth=304
+size=100 clientWidth=604
+size=500 clientWidth=3004
+size=1000 clientWidth=6004
+
+textarea
+cols=1 clientWidth=25
+cols=2 clientWidth=31
+cols=3 clientWidth=37
+cols=4 clientWidth=43
+cols=5 clientWidth=49
+cols=10 clientWidth=79
+cols=20 clientWidth=139
+cols=50 clientWidth=319
+cols=100 clientWidth=619
+cols=500 clientWidth=3019
+cols=1000 clientWidth=6019
+
+Andale Mono
+input
+size=1 clientWidth=14
+size=2 clientWidth=20
+size=3 clientWidth=26
+size=4 clientWidth=32
+size=5 clientWidth=38
+size=10 clientWidth=68
+size=20 clientWidth=128
+size=50 clientWidth=308
+size=100 clientWidth=608
+size=500 clientWidth=3008
+size=1000 clientWidth=6008
+
+textarea
+cols=1 clientWidth=25
+cols=2 clientWidth=31
+cols=3 clientWidth=37
+cols=4 clientWidth=43
+cols=5 clientWidth=49
+cols=10 clientWidth=79
+cols=20 clientWidth=139
+cols=50 clientWidth=319
+cols=100 clientWidth=619
+cols=500 clientWidth=3019
+cols=1000 clientWidth=6019
+
+Arial
+input
+size=1 clientWidth=14
+size=2 clientWidth=20
+size=3 clientWidth=26
+size=4 clientWidth=32
+size=5 clientWidth=38
+size=10 clientWidth=68
+size=20 clientWidth=128
+size=50 clientWidth=308
+size=100 clientWidth=608
+size=500 clientWidth=3008
+size=1000 clientWidth=6008
+
+textarea
+cols=1 clientWidth=25
+cols=2 clientWidth=31
+cols=3 clientWidth=37
+cols=4 clientWidth=43
+cols=5 clientWidth=49
+cols=10 clientWidth=79
+cols=20 clientWidth=139
+cols=50 clientWidth=319
+cols=100 clientWidth=619
+cols=500 clientWidth=3019
+cols=1000 clientWidth=6019
+
+Comic Sans MS
+input
+size=1 clientWidth=16
+size=2 clientWidth=23
+size=3 clientWidth=30
+size=4 clientWidth=37
+size=5 clientWidth=44
+size=10 clientWidth=79
+size=20 clientWidth=149
+size=50 clientWidth=359
+size=100 clientWidth=709
+size=500 clientWidth=3509
+size=1000 clientWidth=7009
+
+textarea
+cols=1 clientWidth=26
+cols=2 clientWidth=33
+cols=3 clientWidth=40
+cols=4 clientWidth=47
+cols=5 clientWidth=54
+cols=10 clientWidth=89
+cols=20 clientWidth=159
+cols=50 clientWidth=369
+cols=100 clientWidth=719
+cols=500 clientWidth=3519
+cols=1000 clientWidth=7019
+
+Courier New
+input
+size=1 clientWidth=13
+size=2 clientWidth=20
+size=3 clientWidth=27
+size=4 clientWidth=34
+size=5 clientWidth=41
+size=10 clientWidth=76
+size=20 clientWidth=146
+size=50 clientWidth=356
+size=100 clientWidth=706
+size=500 clientWidth=3506
+size=1000 clientWidth=7006
+
+textarea
+cols=1 clientWidth=26
+cols=2 clientWidth=33
+cols=3 clientWidth=40
+cols=4 clientWidth=47
+cols=5 clientWidth=54
+cols=10 clientWidth=89
+cols=20 clientWidth=159
+cols=50 clientWidth=369
+cols=100 clientWidth=719
+cols=500 clientWidth=3519
+cols=1000 clientWidth=7019
+
+Georgia
+input
+size=1 clientWidth=14
+size=2 clientWidth=21
+size=3 clientWidth=28
+size=4 clientWidth=35
+size=5 clientWidth=42
+size=10 clientWidth=77
+size=20 clientWidth=147
+size=50 clientWidth=357
+size=100 clientWidth=707
+size=500 clientWidth=3507
+size=1000 clientWidth=7007
+
+textarea
+cols=1 clientWidth=26
+cols=2 clientWidth=33
+cols=3 clientWidth=40
+cols=4 clientWidth=47
+cols=5 clientWidth=54
+cols=10 clientWidth=89
+cols=20 clientWidth=159
+cols=50 clientWidth=369
+cols=100 clientWidth=719
+cols=500 clientWidth=3519
+cols=1000 clientWidth=7019
+
+Times New Roman
+input
+size=1 clientWidth=14
+size=2 clientWidth=20
+size=3 clientWidth=26
+size=4 clientWidth=32
+size=5 clientWidth=38
+size=10 clientWidth=68
+size=20 clientWidth=128
+size=50 clientWidth=308
+size=100 clientWidth=608
+size=500 clientWidth=3008
+size=1000 clientWidth=6008
+
+textarea
+cols=1 clientWidth=25
+cols=2 clientWidth=31
+cols=3 clientWidth=37
+cols=4 clientWidth=43
+cols=5 clientWidth=49
+cols=10 clientWidth=79
+cols=20 clientWidth=139
+cols=50 clientWidth=319
+cols=100 clientWidth=619
+cols=500 clientWidth=3019
+cols=1000 clientWidth=6019
+
+Trebuchet MS
+input
+size=1 clientWidth=14
+size=2 clientWidth=20
+size=3 clientWidth=26
+size=4 clientWidth=32
+size=5 clientWidth=38
+size=10 clientWidth=68
+size=20 clientWidth=128
+size=50 clientWidth=308
+size=100 clientWidth=608
+size=500 clientWidth=3008
+size=1000 clientWidth=6008
+
+textarea
+cols=1 clientWidth=25
+cols=2 clientWidth=31
+cols=3 clientWidth=37
+cols=4 clientWidth=43
+cols=5 clientWidth=49
+cols=10 clientWidth=79
+cols=20 clientWidth=139
+cols=50 clientWidth=319
+cols=100 clientWidth=619
+cols=500 clientWidth=3019
+cols=1000 clientWidth=6019
+
+Verdana
+input
+size=1 clientWidth=15
+size=2 clientWidth=22
+size=3 clientWidth=29
+size=4 clientWidth=36
+size=5 clientWidth=43
+size=10 clientWidth=78
+size=20 clientWidth=148
+size=50 clientWidth=358
+size=100 clientWidth=708
+size=500 clientWidth=3508
+size=1000 clientWidth=7008
+
+textarea
+cols=1 clientWidth=26
+cols=2 clientWidth=33
+cols=3 clientWidth=40
+cols=4 clientWidth=47
+cols=5 clientWidth=54
+cols=10 clientWidth=89
+cols=20 clientWidth=159
+cols=50 clientWidth=369
+cols=100 clientWidth=719
+cols=500 clientWidth=3519
+cols=1000 clientWidth=7019
+
+Webdings
+input
+size=1 clientWidth=13
+size=2 clientWidth=18
+size=3 clientWidth=23
+size=4 clientWidth=28
+size=5 clientWidth=33
+size=10 clientWidth=58
+size=20 clientWidth=108
+size=50 clientWidth=258
+size=100 clientWidth=508
+size=500 clientWidth=2508
+size=1000 clientWidth=5008
+
+textarea
+cols=1 clientWidth=24
+cols=2 clientWidth=29
+cols=3 clientWidth=34
+cols=4 clientWidth=39
+cols=5 clientWidth=44
+cols=10 clientWidth=69
+cols=20 clientWidth=119
+cols=50 clientWidth=269
+cols=100 clientWidth=519
+cols=500 clientWidth=2519
+cols=1000 clientWidth=5019
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list