[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 08:31:28 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 4c76f116842594f152cd9e9c7e75b3ff973daf4d
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Mar 31 01:51:48 2004 +0000
Reviewed by Dave.
- fixed <rdar://problem/3570877>: REGRESSION: onfocus handler not working at weather.com
* khtml/ecma/kjs_binding.cpp:
(UString::string): Turn a null UString into a null DOMString, but a non-null empty UString into a
non-null empty DOMString.
(UString::qstring): Ditto, for QString.
(Identifier::string): Ditto, for Identifier.
(Identifier::qstring): Ditto.
* kwq/KWQLineEdit.h: Override focusPolicy.
* kwq/KWQLineEdit.mm: (QLineEdit::focusPolicy): Return StrongFocus instead of TabFocus, since
we allow clicking to focus on these widgets.
* kwq/KWQTextEdit.h: More of the same.
* kwq/KWQTextEdit.mm: (QTextEdit::focusPolicy): And still more.
- fixed <rdar://problem/3605919>: text fields in web pages are too tall
* kwq/KWQTextField.mm:
(-[KWQTextFieldCell _typesetterBehavior]): Ignore the per-application typesetter setting and
instead always use the latest behavior for text fields in web pages.
(-[KWQSecureTextFieldCell _typesetterBehavior]): Ditto.
(-[KWQSearchFieldCell _typesetterBehavior]): Ditto.
- additional cleanup
* khtml/html/html_formimpl.cpp:
(HTMLGenericFormElementImpl::isKeyboardFocusable): Check tab focus bit instead of different modes.
(HTMLGenericFormElementImpl::isMouseFocusable): Check click focus bit instead of different modes.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6280 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/css1/text_properties/text-transform-expected.txt b/LayoutTests/css1/text_properties/text-transform-expected.txt
index 032712c..326ba91 100644
--- a/LayoutTests/css1/text_properties/text-transform-expected.txt
+++ b/LayoutTests/css1/text_properties/text-transform-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 800x2957
+layer at (0,0) size 800x2956
RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x2957
- RenderBlock {HTML} at (0,0) size 800x2957
- RenderBody {BODY} at (8,21) size 784x2920 [bgcolor=#FFFFFF]
+layer at (0,0) size 800x2956
+ RenderBlock {HTML} at (0,0) size 800x2956
+ RenderBody {BODY} at (8,21) size 784x2919 [bgcolor=#FFFFFF]
RenderBlock {H1} at (0,0) size 784x37
RenderText {TEXT} at (0,0) size 431x37
text run at (0,0) width 431: "Tests for text-transform in CSS"
@@ -21,25 +21,25 @@ layer at (0,0) size 800x2957
text run at (397,54) width 359: "http://people.w3.org/rishida/scripts/uniview/uniview.html"
RenderText {TEXT} at (756,54) size 5x18
text run at (756,54) width 5: ")"
- RenderBlock {P} at (0,146) size 784x46 [color=#808080]
+ RenderBlock {P} at (0,146) size 784x45 [color=#808080]
RenderText {TEXT} at (0,0) size 742x43
text run at (0,0) width 482: "On some user agents you will only see glyphs supported by the current font. "
text run at (482,0) width 260: "To help with this situation, you can apply"
text run at (0,25) width 437: "different fonts by typing in a different font name in the following box: "
- RenderLineEdit {INPUT} at (439,25) size 131x19
+ RenderLineEdit {INPUT} at (439,25) size 131x18
RenderText {TEXT} at (572,25) size 4x18
text run at (572,25) width 4: " "
RenderBlock {BUTTON} at (576,18) size 35x21 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderText {TEXT} at (4,4) size 27x13
text run at (4,4) width 27: "Apply"
- RenderBlock {HR} at (0,208) size 784x2 [border: (1px inset #000000)]
- RenderBlock {H2} at (0,229) size 784x28 [color=#808080]
+ RenderBlock {HR} at (0,207) size 784x2 [border: (1px inset #000000)]
+ RenderBlock {H2} at (0,228) size 784x28 [color=#808080]
RenderText {TEXT} at (0,0) size 197x28
text run at (0,0) width 197: "General case: Latin"
- RenderBlock {P} at (0,276) size 784x18 [color=#808080]
+ RenderBlock {P} at (0,275) size 784x18 [color=#808080]
RenderText {TEXT} at (0,0) size 621x18
text run at (0,0) width 621: "The css says: text-transform: uppercase. The right-hand character should match the left-hand one."
- RenderBlock {P} at (0,310) size 784x306
+ RenderBlock {P} at (0,309) size 784x306
RenderText {TEXT} at (0,0) size 784x306
text run at (0,0) width 220: "| A A | B B | C C | D D | E E | F F "
text run at (220,0) width 204: "| G G | H H | I I | J J | K K | L L "
@@ -112,10 +112,10 @@ layer at (0,0) size 800x2957
text run at (369,270) width 242: "| \x{1EE4} \x{1EE4} | \x{1EE6} \x{1EE6} | \x{1EE8} \x{1EE8} | \x{1EEA} \x{1EEA} | \x{1EEC} \x{1EEC} | \x{1EEE} \x{1EEE} "
text run at (611,270) width 167: "| \x{1EF0} \x{1EF0} | \x{1EF2} \x{1EF2} | \x{1EF4} \x{1EF4} | \x{1EF6} \x{1EF6} | \x{1EF8} "
text run at (0,288) width 17: "\x{1EF8} |"
- RenderBlock {P} at (0,632) size 784x18 [color=#808080]
+ RenderBlock {P} at (0,631) size 784x18 [color=#808080]
RenderText {TEXT} at (0,0) size 620x18
text run at (0,0) width 620: "The css says: text-transform: lowercase. The left-hand character should match the right-hand one."
- RenderBlock {P} at (0,666) size 784x252
+ RenderBlock {P} at (0,665) size 784x252
RenderText {TEXT} at (0,0) size 784x252
text run at (0,0) width 149: "| a a | b b | c c | d d | e e "
text run at (149,0) width 164: "| f f | g g | h h | i i | j j | k k "
@@ -186,14 +186,14 @@ layer at (0,0) size 800x2957
text run at (104,234) width 218: "| \x{1EE3} \x{1EE3} | \x{1EE5} \x{1EE5} | \x{1EE7} \x{1EE7} | \x{1EE9} \x{1EE9} | \x{1EEB} \x{1EEB} | \x{1EED} \x{1EED} "
text run at (322,234) width 206: "| \x{1EEF} \x{1EEF} | \x{1EF1} \x{1EF1} | \x{1EF3} \x{1EF3} | \x{1EF5} \x{1EF5} | \x{1EF7} \x{1EF7} | \x{1EF9} \x{1EF9} "
text run at (528,234) width 3: "|"
- RenderBlock {HR} at (0,934) size 784x2 [border: (1px inset #000000)]
- RenderBlock {H2} at (0,955) size 784x28 [color=#808080]
+ RenderBlock {HR} at (0,933) size 784x2 [border: (1px inset #000000)]
+ RenderBlock {H2} at (0,954) size 784x28 [color=#808080]
RenderText {TEXT} at (0,0) size 203x28
text run at (0,0) width 203: "General case: Greek"
- RenderBlock {P} at (0,1002) size 784x18 [color=#808080]
+ RenderBlock {P} at (0,1001) size 784x18 [color=#808080]
RenderText {TEXT} at (0,0) size 621x18
text run at (0,0) width 621: "The css says: text-transform: uppercase. The right-hand character should match the left-hand one."
- RenderBlock {P} at (0,1036) size 784x162
+ RenderBlock {P} at (0,1035) size 784x162
RenderText {TEXT} at (0,0) size 782x162
text run at (0,0) width 119: "| \x{386} \x{386} | \x{388} \x{388} | \x{389} \x{389} "
text run at (119,0) width 210: "| \x{38A} \x{38A} | \x{391} \x{391} | \x{392} \x{392} | \x{393} \x{393} | \x{394} \x{394} | \x{395} \x{395} "
@@ -228,10 +228,10 @@ layer at (0,0) size 800x2957
text run at (530,126) width 228: "| \x{1FB8} \x{1FB8} | \x{1FB9} \x{1FB9} | \x{1FBC} \x{1FBC} | \x{399} \x{399} | \x{1FCC} \x{1FCC} | \x{1FD8} \x{1FD8} "
text run at (758,126) width 21: "| \x{1FD9} \x{1FD9}"
text run at (0,144) width 173: "| \x{1FE8} \x{1FE8} | \x{1FE9} \x{1FE9} | \x{1FEC} \x{1FEC} | \x{1FFC} \x{1FFC} |"
- RenderBlock {P} at (0,1214) size 784x18 [color=#808080]
+ RenderBlock {P} at (0,1213) size 784x18 [color=#808080]
RenderText {TEXT} at (0,0) size 620x18
text run at (0,0) width 620: "The css says: text-transform: lowercase. The left-hand character should match the right-hand one."
- RenderBlock {P} at (0,1248) size 784x90
+ RenderBlock {P} at (0,1247) size 784x90
RenderText {TEXT} at (0,0) size 784x90
text run at (0,0) width 169: "| \x{3AC} \x{3AC} | \x{3AD} \x{3AD} | \x{3AE} \x{3AE} | \x{3AF} \x{3AF} | \x{3CC} \x{3CC} "
text run at (169,0) width 208: "| \x{3CD} \x{3CD} | \x{3CE} \x{3CE} | \x{3B1} \x{3B1} | \x{3B2} \x{3B2} | \x{3B3} \x{3B3} | \x{3B4} \x{3B4} "
@@ -256,32 +256,32 @@ layer at (0,0) size 800x2957
text run at (182,72) width 184: "| \x{1F73} \x{1F73} | \x{1F74} \x{1F74} | \x{1F75} \x{1F75} | \x{1FD0} \x{1FD0} | \x{1FD1} \x{1FD1} | \x{1F76} \x{1F76} "
text run at (366,72) width 202: "| \x{1F77} \x{1F77} | \x{1FE0} \x{1FE0} | \x{1FE1} \x{1FE1} | \x{1F7A} \x{1F7A} | \x{1F7B} \x{1F7B} | \x{1FE5} \x{1FE5} "
text run at (568,72) width 163: "| \x{1F78} \x{1F78} | \x{1F79} \x{1F79} | \x{1F7C} \x{1F7C} | \x{1F7D} \x{1F7D} |"
- RenderBlock {HR} at (0,1354) size 784x2 [border: (1px inset #000000)]
- RenderBlock {H2} at (0,1375) size 784x28 [color=#808080]
+ RenderBlock {HR} at (0,1353) size 784x2 [border: (1px inset #000000)]
+ RenderBlock {H2} at (0,1374) size 784x28 [color=#808080]
RenderText {TEXT} at (0,0) size 208x28
text run at (0,0) width 208: "General case: Coptic"
- RenderBlock {P} at (0,1422) size 784x18 [color=#808080]
+ RenderBlock {P} at (0,1421) size 784x18 [color=#808080]
RenderText {TEXT} at (0,0) size 621x18
text run at (0,0) width 621: "The css says: text-transform: uppercase. The right-hand character should match the left-hand one."
- RenderBlock {P} at (0,1456) size 784x18
+ RenderBlock {P} at (0,1455) size 784x18
RenderText {TEXT} at (0,0) size 360x18
text run at (0,0) width 255: "| \x{3E2} \x{3E2} | \x{3E4} \x{3E4} | \x{3E6} \x{3E6} | \x{3E8} \x{3E8} | \x{3EA} \x{3EA} "
text run at (255,0) width 105: "| \x{3EC} \x{3EC} | \x{3EE} \x{3EE} |"
- RenderBlock {P} at (0,1490) size 784x18 [color=#808080]
+ RenderBlock {P} at (0,1489) size 784x18 [color=#808080]
RenderText {TEXT} at (0,0) size 620x18
text run at (0,0) width 620: "The css says: text-transform: lowercase. The left-hand character should match the right-hand one."
- RenderBlock {P} at (0,1524) size 784x18
+ RenderBlock {P} at (0,1523) size 784x18
RenderText {TEXT} at (0,0) size 360x18
text run at (0,0) width 102: "| \x{3E3} \x{3E3} | \x{3E5} \x{3E5} "
text run at (102,0) width 258: "| \x{3E7} \x{3E7} | \x{3E9} \x{3E9} | \x{3EB} \x{3EB} | \x{3ED} \x{3ED} | \x{3EF} \x{3EF} |"
- RenderBlock {HR} at (0,1558) size 784x2 [border: (1px inset #000000)]
- RenderBlock {H2} at (0,1579) size 784x28 [color=#808080]
+ RenderBlock {HR} at (0,1557) size 784x2 [border: (1px inset #000000)]
+ RenderBlock {H2} at (0,1578) size 784x28 [color=#808080]
RenderText {TEXT} at (0,0) size 218x28
text run at (0,0) width 218: "General case: Cyrillic"
- RenderBlock {P} at (0,1626) size 784x18 [color=#808080]
+ RenderBlock {P} at (0,1625) size 784x18 [color=#808080]
RenderText {TEXT} at (0,0) size 621x18
text run at (0,0) width 621: "The css says: text-transform: uppercase. The right-hand character should match the left-hand one."
- RenderBlock {P} at (0,1660) size 784x126
+ RenderBlock {P} at (0,1659) size 784x126
RenderText {TEXT} at (0,0) size 783x126
text run at (0,0) width 109: "| \x{410} \x{410} | \x{411} \x{411} | \x{412} \x{412} "
text run at (109,0) width 222: "| \x{413} \x{413} | \x{414} \x{414} | \x{415} \x{415} | \x{416} \x{416} | \x{417} \x{417} | \x{418} \x{418} "
@@ -310,10 +310,10 @@ layer at (0,0) size 800x2957
text run at (704,90) width 74: "| \x{4F4} \x{4F4} | \x{4F8} \x{4F8}"
text run at (0,108) width 152: "| \x{500} \x{500} | \x{502} \x{502} | \x{504} \x{504} | \x{506} \x{506} "
text run at (152,108) width 167: "| \x{508} \x{508} | \x{50A} \x{50A} | \x{50C} \x{50C} | \x{50E} \x{50E} |"
- RenderBlock {P} at (0,1802) size 784x18 [color=#808080]
+ RenderBlock {P} at (0,1801) size 784x18 [color=#808080]
RenderText {TEXT} at (0,0) size 620x18
text run at (0,0) width 620: "The css says: text-transform: lowercase. The left-hand character should match the right-hand one."
- RenderBlock {P} at (0,1836) size 784x108
+ RenderBlock {P} at (0,1835) size 784x108
RenderText {TEXT} at (0,0) size 784x108
text run at (0,0) width 200: "| \x{450} \x{450} | \x{451} \x{451} | \x{452} \x{452} | \x{453} \x{453} | \x{454} \x{454} | \x{455} \x{455} "
text run at (200,0) width 198: "| \x{456} \x{456} | \x{457} \x{457} | \x{458} \x{458} | \x{459} \x{459} | \x{45A} \x{45A} | \x{45B} \x{45B} "
@@ -342,14 +342,14 @@ layer at (0,0) size 800x2957
text run at (205,90) width 208: "| \x{4EF} \x{4EF} | \x{4F1} \x{4F1} | \x{4F3} \x{4F3} | \x{4F5} \x{4F5} | \x{4F9} \x{4F9} | \x{501} \x{501} "
text run at (413,90) width 222: "| \x{503} \x{503} | \x{505} \x{505} | \x{507} \x{507} | \x{509} \x{509} | \x{50B} \x{50B} | \x{50D} \x{50D} "
text run at (635,90) width 36: "| \x{50F} \x{50F} |"
- RenderBlock {HR} at (0,1960) size 784x2 [border: (1px inset #000000)]
- RenderBlock {H2} at (0,1981) size 784x28 [color=#808080]
+ RenderBlock {HR} at (0,1959) size 784x2 [border: (1px inset #000000)]
+ RenderBlock {H2} at (0,1980) size 784x28 [color=#808080]
RenderText {TEXT} at (0,0) size 243x28
text run at (0,0) width 243: "General case: Armenian"
- RenderBlock {P} at (0,2028) size 784x18 [color=#808080]
+ RenderBlock {P} at (0,2027) size 784x18 [color=#808080]
RenderText {TEXT} at (0,0) size 621x18
text run at (0,0) width 621: "The css says: text-transform: uppercase. The right-hand character should match the left-hand one."
- RenderBlock {P} at (0,2062) size 784x36
+ RenderBlock {P} at (0,2061) size 784x36
RenderText {TEXT} at (0,0) size 776x36
text run at (0,0) width 72: "| \x{531} \x{531} | \x{532} \x{532} "
text run at (72,0) width 214: "| \x{533} \x{533} | \x{534} \x{534} | \x{535} \x{535} | \x{536} \x{536} | \x{537} \x{537} | \x{538} \x{538} "
@@ -360,10 +360,10 @@ layer at (0,0) size 800x2957
text run at (156,18) width 212: "| \x{54B} \x{54B} | \x{54C} \x{54C} | \x{54D} \x{54D} | \x{54E} \x{54E} | \x{54F} \x{54F} | \x{550} \x{550} "
text run at (368,18) width 210: "| \x{551} \x{551} | \x{552} \x{552} | \x{553} \x{553} | \x{554} \x{554} | \x{555} \x{555} | \x{556} \x{556} "
text run at (578,18) width 3: "|"
- RenderBlock {P} at (0,2114) size 784x18 [color=#808080]
+ RenderBlock {P} at (0,2113) size 784x18 [color=#808080]
RenderText {TEXT} at (0,0) size 620x18
text run at (0,0) width 620: "The css says: text-transform: lowercase. The left-hand character should match the right-hand one."
- RenderBlock {P} at (0,2148) size 784x36
+ RenderBlock {P} at (0,2147) size 784x36
RenderText {TEXT} at (0,0) size 784x36
text run at (0,0) width 140: "| \x{561} \x{561} | \x{562} \x{562} | \x{563} \x{563} | \x{564} \x{564} "
text run at (140,0) width 190: "| \x{565} \x{565} | \x{566} \x{566} | \x{567} \x{567} | \x{568} \x{568} | \x{569} \x{569} | \x{56A} \x{56A} "
@@ -373,34 +373,34 @@ layer at (0,0) size 800x2957
text run at (0,18) width 96: "\x{57A} \x{57A} | \x{57B} \x{57B} | \x{57C} \x{57C} "
text run at (96,18) width 190: "| \x{57D} \x{57D} | \x{57E} \x{57E} | \x{57F} \x{57F} | \x{580} \x{580} | \x{581} \x{581} | \x{582} \x{582} "
text run at (286,18) width 141: "| \x{583} \x{583} | \x{584} \x{584} | \x{585} \x{585} | \x{586} \x{586} |"
- RenderBlock {HR} at (0,2200) size 784x2 [border: (1px inset #000000)]
- RenderBlock {H2} at (0,2221) size 784x28 [color=#808080]
+ RenderBlock {HR} at (0,2199) size 784x2 [border: (1px inset #000000)]
+ RenderBlock {H2} at (0,2220) size 784x28 [color=#808080]
RenderText {TEXT} at (0,0) size 215x28
text run at (0,0) width 215: "General case: Roman"
- RenderBlock {P} at (0,2268) size 784x18 [color=#808080]
+ RenderBlock {P} at (0,2267) size 784x18 [color=#808080]
RenderText {TEXT} at (0,0) size 621x18
text run at (0,0) width 621: "The css says: text-transform: uppercase. The right-hand character should match the left-hand one."
- RenderBlock {P} at (0,2302) size 784x18
+ RenderBlock {P} at (0,2301) size 784x18
RenderText {TEXT} at (0,0) size 667x18
text run at (0,0) width 177: "| \x{2160} \x{2160} | \x{2161} \x{2161} | \x{2162} \x{2162} | \x{2163} \x{2163} | \x{2164} \x{2164} "
text run at (177,0) width 282: "| \x{2165} \x{2165} | \x{2166} \x{2166} | \x{2167} \x{2167} | \x{2168} \x{2168} | \x{2169} \x{2169} | \x{216A} \x{216A} "
text run at (459,0) width 208: "| \x{216B} \x{216B} | \x{216C} \x{216C} | \x{216D} \x{216D} | \x{216E} \x{216E} | \x{216F} \x{216F} |"
- RenderBlock {P} at (0,2336) size 784x18 [color=#808080]
+ RenderBlock {P} at (0,2335) size 784x18 [color=#808080]
RenderText {TEXT} at (0,0) size 620x18
text run at (0,0) width 620: "The css says: text-transform: lowercase. The left-hand character should match the right-hand one."
- RenderBlock {P} at (0,2370) size 784x18
+ RenderBlock {P} at (0,2369) size 784x18
RenderText {TEXT} at (0,0) size 615x18
text run at (0,0) width 167: "| \x{2170} \x{2170} | \x{2171} \x{2171} | \x{2172} \x{2172} | \x{2173} \x{2173} | \x{2174} \x{2174} "
text run at (167,0) width 258: "| \x{2175} \x{2175} | \x{2176} \x{2176} | \x{2177} \x{2177} | \x{2178} \x{2178} | \x{2179} \x{2179} | \x{217A} \x{217A} "
text run at (425,0) width 190: "| \x{217B} \x{217B} | \x{217C} \x{217C} | \x{217D} \x{217D} | \x{217E} \x{217E} | \x{217F} \x{217F} |"
- RenderBlock {HR} at (0,2404) size 784x2 [border: (1px inset #000000)]
- RenderBlock {H2} at (0,2425) size 784x28 [color=#808080]
+ RenderBlock {HR} at (0,2403) size 784x2 [border: (1px inset #000000)]
+ RenderBlock {H2} at (0,2424) size 784x28 [color=#808080]
RenderText {TEXT} at (0,0) size 276x28
text run at (0,0) width 276: "General case: Circled Latin"
- RenderBlock {P} at (0,2472) size 784x18 [color=#808080]
+ RenderBlock {P} at (0,2471) size 784x18 [color=#808080]
RenderText {TEXT} at (0,0) size 621x18
text run at (0,0) width 621: "The css says: text-transform: uppercase. The right-hand character should match the left-hand one."
- RenderBlock {P} at (0,2506) size 784x36
+ RenderBlock {P} at (0,2505) size 784x36
RenderText {TEXT} at (0,0) size 775x36
text run at (0,0) width 141: "| \x{24B6} \x{24B6} | \x{24B7} \x{24B7} | \x{24B8} \x{24B8} "
text run at (141,0) width 282: "| \x{24B9} \x{24B9} | \x{24BA} \x{24BA} | \x{24BB} \x{24BB} | \x{24BC} \x{24BC} | \x{24BD} \x{24BD} | \x{24BE} \x{24BE} "
@@ -408,10 +408,10 @@ layer at (0,0) size 800x2957
text run at (705,0) width 70: "| \x{24C5} \x{24C5} | \x{24C6} "
text run at (0,18) width 208: "\x{24C6} | \x{24C7} \x{24C7} | \x{24C8} \x{24C8} | \x{24C9} \x{24C9} | \x{24CA} \x{24CA} "
text run at (208,18) width 238: "| \x{24CB} \x{24CB} | \x{24CC} \x{24CC} | \x{24CD} \x{24CD} | \x{24CE} \x{24CE} | \x{24CF} \x{24CF} |"
- RenderBlock {P} at (0,2558) size 784x18 [color=#808080]
+ RenderBlock {P} at (0,2557) size 784x18 [color=#808080]
RenderText {TEXT} at (0,0) size 620x18
text run at (0,0) width 620: "The css says: text-transform: lowercase. The left-hand character should match the right-hand one."
- RenderBlock {P} at (0,2592) size 784x36
+ RenderBlock {P} at (0,2591) size 784x36
RenderText {TEXT} at (0,0) size 779x36
text run at (0,0) width 235: "| \x{24D0} \x{24D0} | \x{24D1} \x{24D1} | \x{24D2} \x{24D2} | \x{24D3} \x{24D3} | \x{24D4} \x{24D4} "
text run at (235,0) width 282: "| \x{24D5} \x{24D5} | \x{24D6} \x{24D6} | \x{24D7} \x{24D7} | \x{24D8} \x{24D8} | \x{24D9} \x{24D9} | \x{24DA} \x{24DA} "
@@ -419,14 +419,14 @@ layer at (0,0) size 800x2957
text run at (0,18) width 20: "\x{24E0} "
text run at (20,18) width 282: "| \x{24E1} \x{24E1} | \x{24E2} \x{24E2} | \x{24E3} \x{24E3} | \x{24E4} \x{24E4} | \x{24E5} \x{24E5} | \x{24E6} \x{24E6} "
text run at (302,18) width 144: "| \x{24E7} \x{24E7} | \x{24E8} \x{24E8} | \x{24E9} \x{24E9} |"
- RenderBlock {HR} at (0,2644) size 784x2 [border: (1px inset #000000)]
- RenderBlock {H2} at (0,2665) size 784x28 [color=#808080]
+ RenderBlock {HR} at (0,2643) size 784x2 [border: (1px inset #000000)]
+ RenderBlock {H2} at (0,2664) size 784x28 [color=#808080]
RenderText {TEXT} at (0,0) size 301x28
text run at (0,0) width 301: "General case: Fullwidth Latin"
- RenderBlock {P} at (0,2712) size 784x18 [color=#808080]
+ RenderBlock {P} at (0,2711) size 784x18 [color=#808080]
RenderText {TEXT} at (0,0) size 621x18
text run at (0,0) width 621: "The css says: text-transform: uppercase. The right-hand character should match the left-hand one."
- RenderBlock {P} at (0,2746) size 784x36
+ RenderBlock {P} at (0,2745) size 784x36
RenderText {TEXT} at (0,0) size 779x36
text run at (0,0) width 282: "| \x{FF21} \x{FF21} | \x{FF22} \x{FF22} | \x{FF23} \x{FF23} | \x{FF24} \x{FF24} | \x{FF25} \x{FF25} | \x{FF26} \x{FF26} "
text run at (282,0) width 282: "| \x{FF27} \x{FF27} | \x{FF28} \x{FF28} | \x{FF29} \x{FF29} | \x{FF2A} \x{FF2A} | \x{FF2B} \x{FF2B} | \x{FF2C} \x{FF2C} "
@@ -434,10 +434,10 @@ layer at (0,0) size 800x2957
text run at (0,18) width 67: "\x{FF31} | \x{FF32} \x{FF32} "
text run at (67,18) width 282: "| \x{FF33} \x{FF33} | \x{FF34} \x{FF34} | \x{FF35} \x{FF35} | \x{FF36} \x{FF36} | \x{FF37} \x{FF37} | \x{FF38} \x{FF38} "
text run at (349,18) width 97: "| \x{FF39} \x{FF39} | \x{FF3A} \x{FF3A} |"
- RenderBlock {P} at (0,2798) size 784x18 [color=#808080]
+ RenderBlock {P} at (0,2797) size 784x18 [color=#808080]
RenderText {TEXT} at (0,0) size 620x18
text run at (0,0) width 620: "The css says: text-transform: lowercase. The left-hand character should match the right-hand one."
- RenderBlock {P} at (0,2832) size 784x36
+ RenderBlock {P} at (0,2831) size 784x36
RenderText {TEXT} at (0,0) size 779x36
text run at (0,0) width 94: "| \x{FF41} \x{FF41} | \x{FF42} \x{FF42} "
text run at (94,0) width 282: "| \x{FF43} \x{FF43} | \x{FF44} \x{FF44} | \x{FF45} \x{FF45} | \x{FF46} \x{FF46} | \x{FF47} \x{FF47} | \x{FF48} \x{FF48} "
@@ -446,7 +446,7 @@ layer at (0,0) size 800x2957
text run at (0,18) width 161: "\x{FF51} | \x{FF52} \x{FF52} | \x{FF53} \x{FF53} | \x{FF54} \x{FF54} "
text run at (161,18) width 282: "| \x{FF55} \x{FF55} | \x{FF56} \x{FF56} | \x{FF57} \x{FF57} | \x{FF58} \x{FF58} | \x{FF59} \x{FF59} | \x{FF5A} \x{FF5A} "
text run at (443,18) width 3: "|"
- RenderBlock {HR} at (0,2884) size 784x2 [border: (1px inset #000000)]
- RenderBlock {P} at (0,2902) size 784x18 [color=#808080]
+ RenderBlock {HR} at (0,2883) size 784x2 [border: (1px inset #000000)]
+ RenderBlock {P} at (0,2901) size 784x18 [color=#808080]
RenderText {TEXT} at (0,0) size 416x18
text run at (0,0) width 416: "Thanks to John Cowan for assistance in developing this test page."
diff --git a/LayoutTests/fast/block/margin-collapse/103-expected.txt b/LayoutTests/fast/block/margin-collapse/103-expected.txt
index 8ebd9a7..b313398 100644
--- a/LayoutTests/fast/block/margin-collapse/103-expected.txt
+++ b/LayoutTests/fast/block/margin-collapse/103-expected.txt
@@ -1,11 +1,11 @@
-layer at (0,0) size 800x1691
+layer at (0,0) size 800x1689
RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x1691
- RenderBlock {HTML} at (0,0) size 800x1691
- RenderBody {BODY} at (8,20) size 784x1651 [bgcolor=#A6A972]
- RenderBlock {DIV} at (91,0) size 602x1651 [bgcolor=#FDFDE9] [border: (1px solid #000000)]
+layer at (0,0) size 800x1689
+ RenderBlock {HTML} at (0,0) size 800x1689
+ RenderBody {BODY} at (8,20) size 784x1649 [bgcolor=#A6A972]
+ RenderBlock {DIV} at (91,0) size 602x1649 [bgcolor=#FDFDE9] [border: (1px solid #000000)]
RenderBlock {DIV} at (1,31) size 600x70
- RenderBlock {DIV} at (1,114) size 600x1465
+ RenderBlock {DIV} at (1,114) size 600x1463
RenderBlock {P} at (20,0) size 560x80 [color=#333333]
RenderText {TEXT} at (0,2) size 520x40
text run at (0,2) width 520: "We are trying to understand how UVic students perform Shakespeare related research for"
@@ -22,67 +22,67 @@ layer at (0,0) size 800x1691
RenderBlock {P} at (20,93) size 560x20 [color=#333333]
RenderText {TEXT} at (0,2) size 463x20
text run at (0,2) width 463: "Please take the time to carefully review and complete the following questions."
- RenderBlock {FORM} at (20,138) size 560x1291
+ RenderBlock {FORM} at (20,138) size 560x1289
RenderBlock {H2} at (0,0) size 560x16 [color=#333333]
RenderText {TEXT} at (0,0) size 201x16
text run at (0,0) width 201: "PERSONAL INFORMATION"
RenderBlock (floating) {SPAN} at (0,26) size 325x20 [color=#333333]
RenderText {TEXT} at (0,2) size 68x20
text run at (0,2) width 68: "Your Name*"
- RenderLineEdit {INPUT} at (325,26) size 180x19
- RenderBlock (floating) {SPAN} at (0,47) size 325x20 [color=#333333]
+ RenderLineEdit {INPUT} at (325,26) size 180x18
+ RenderBlock (floating) {SPAN} at (0,46) size 325x20 [color=#333333]
RenderText {TEXT} at (0,2) size 120x20
text run at (0,2) width 120: "Your e-mail address*"
- RenderLineEdit {INPUT} at (325,47) size 180x19
- RenderBlock (floating) {SPAN} at (0,68) size 325x20 [color=#333333]
+ RenderLineEdit {INPUT} at (325,46) size 180x18
+ RenderBlock (floating) {SPAN} at (0,66) size 325x20 [color=#333333]
RenderText {TEXT} at (0,2) size 128x20
text run at (0,2) width 128: "Your degree program*"
- RenderSelect {SELECT} at (325,68) size 180x18
- RenderBlock (floating) {SPAN} at (0,88) size 325x20 [color=#333333]
+ RenderSelect {SELECT} at (325,66) size 180x18
+ RenderBlock (floating) {SPAN} at (0,86) size 325x20 [color=#333333]
RenderText {TEXT} at (0,2) size 110x20
text run at (0,2) width 110: "Your year of study*"
- RenderSelect {SELECT} at (325,88) size 180x18
- RenderBlock (floating) {SPAN} at (0,108) size 325x20 [color=#333333]
+ RenderSelect {SELECT} at (325,86) size 180x18
+ RenderBlock (floating) {SPAN} at (0,106) size 325x20 [color=#333333]
RenderText {TEXT} at (0,2) size 152x20
text run at (0,2) width 152: "Shakespeare classes taken"
- RenderSelect {SELECT} at (325,108) size 180x18
- RenderBlock {P} at (0,139) size 560x20 [color=#333333]
+ RenderSelect {SELECT} at (325,106) size 180x18
+ RenderBlock {P} at (0,137) size 560x20 [color=#333333]
RenderText {TEXT} at (0,2) size 156x20
text run at (0,2) width 156: "* indicates a required field"
- RenderBlock {H2} at (0,184) size 560x16 [color=#333333]
+ RenderBlock {H2} at (0,182) size 560x16 [color=#333333]
RenderText {TEXT} at (0,0) size 298x16
text run at (0,0) width 298: "SHAKESPEARE RESEARCH QUESTIONS"
- RenderBlock (floating) {SPAN} at (0,210) size 325x20 [color=#333333]
+ RenderBlock (floating) {SPAN} at (0,208) size 325x20 [color=#333333]
RenderText {TEXT} at (0,2) size 321x20
text run at (0,2) width 321: "What percentage of your research time is spent online?"
- RenderSelect {SELECT} at (325,210) size 180x18
- RenderBlock (floating) {SPAN} at (0,230) size 325x20 [color=#333333]
+ RenderSelect {SELECT} at (325,208) size 180x18
+ RenderBlock (floating) {SPAN} at (0,228) size 325x20 [color=#333333]
RenderText {TEXT} at (0,2) size 300x40
text run at (0,2) width 300: "What is holding you back from doing more research"
text run at (0,22) width 41: "online?"
- RenderSelect {SELECT} at (325,230) size 180x18
- RenderBlock (floating) {SPAN} at (0,250) size 325x20 [color=#333333]
+ RenderSelect {SELECT} at (325,228) size 180x18
+ RenderBlock (floating) {SPAN} at (0,248) size 325x20 [color=#333333]
RenderText {TEXT} at (0,2) size 220x20
text run at (0,2) width 220: "Your research is primarily focused on:"
- RenderBlock {SPAN} at (325,250) size 180x20 [color=#333333]
+ RenderBlock {SPAN} at (325,248) size 180x20 [color=#333333]
RenderRadioButton {INPUT} at (3,3) size 12x13
RenderText {TEXT} at (18,2) size 32x20
text run at (18,2) width 32: "Texts"
- RenderBlock {SPAN} at (325,270) size 180x20 [color=#333333]
+ RenderBlock {SPAN} at (325,268) size 180x20 [color=#333333]
RenderRadioButton {INPUT} at (3,3) size 12x13
RenderText {TEXT} at (18,2) size 133x20
text run at (18,2) width 133: "Performance materials"
- RenderBlock {SPAN} at (325,290) size 180x20 [color=#333333]
+ RenderBlock {SPAN} at (325,288) size 180x20 [color=#333333]
RenderRadioButton {INPUT} at (3,3) size 12x13
RenderText {TEXT} at (18,2) size 21x20
text run at (18,2) width 21: "n/a"
- RenderBlock {H2} at (0,335) size 560x16 [color=#333333]
+ RenderBlock {H2} at (0,333) size 560x16 [color=#333333]
RenderText {TEXT} at (0,0) size 374x16
text run at (0,0) width 374: "INTERNET SHAKESPEARE EDITIONS QUESTIONS"
- RenderBlock (floating) {SPAN} at (0,361) size 325x20 [color=#333333]
+ RenderBlock (floating) {SPAN} at (0,359) size 325x20 [color=#333333]
RenderText {TEXT} at (0,2) size 302x20
text run at (0,2) width 302: "Have you used UVic's Internet Shakespeare Editions?"
- RenderBlock {SPAN} at (325,361) size 180x20 [color=#333333]
+ RenderBlock {SPAN} at (325,359) size 180x20 [color=#333333]
RenderText {TEXT} at (0,2) size 19x20
text run at (0,2) width 19: "Yes"
RenderRadioButton {INPUT} at (22,3) size 12x13
@@ -91,57 +91,57 @@ layer at (0,0) size 800x1691
text run at (41,2) width 15: "No"
RenderRadioButton {INPUT} at (59,3) size 12x13
RenderText {TEXT} at (0,0) size 0x0
- RenderBlock {P} at (0,394) size 560x20 [color=#333333]
+ RenderBlock {P} at (0,392) size 560x20 [color=#333333]
RenderText {TEXT} at (0,2) size 378x20
text run at (0,2) width 378: "-- If you answered no to this question, skip to the next section --"
- RenderBlock (floating) {SPAN} at (0,427) size 325x20 [color=#333333]
+ RenderBlock (floating) {SPAN} at (0,425) size 325x20 [color=#333333]
RenderText {TEXT} at (0,2) size 274x20
text run at (0,2) width 274: "Which area of the ISE did you find most useful?"
- RenderSelect {SELECT} at (325,427) size 180x18
- RenderBlock (floating) {SPAN} at (0,447) size 325x20 [color=#333333]
+ RenderSelect {SELECT} at (325,425) size 180x18
+ RenderBlock (floating) {SPAN} at (0,445) size 325x20 [color=#333333]
RenderText {TEXT} at (0,2) size 252x20
text run at (0,2) width 252: "How did you find the navigation of the ISE?"
- RenderSelect {SELECT} at (325,447) size 180x18
- RenderBlock (floating) {SPAN} at (0,467) size 325x20 [color=#333333]
+ RenderSelect {SELECT} at (325,445) size 180x18
+ RenderBlock (floating) {SPAN} at (0,465) size 325x20 [color=#333333]
RenderText {TEXT} at (0,2) size 206x20
text run at (0,2) width 206: "Please describe your use of the ISE."
- RenderTextArea {TEXTAREA} at (0,490) size 500x100
- RenderBlock {H2} at (0,615) size 560x16 [color=#333333]
+ RenderTextArea {TEXTAREA} at (0,488) size 500x100
+ RenderBlock {H2} at (0,613) size 560x16 [color=#333333]
RenderText {TEXT} at (0,0) size 291x16
text run at (0,0) width 291: "TOOLS IN DEVELOPMENT QUESTIONS"
- RenderBlock {P} at (0,644) size 560x60 [color=#333333]
+ RenderBlock {P} at (0,642) size 560x60 [color=#333333]
RenderText {TEXT} at (0,2) size 556x60
text run at (0,2) width 453: "We are in the process of both making new material available and developing "
text run at (453,2) width 103: "new tools to view"
text run at (0,22) width 354: "and extrapolate information from Shakespeare's works. The "
text run at (354,22) width 160: "following images are visual"
text run at (0,42) width 343: "representations of some of the ideas being thrown around."
- RenderBlock {P} at (0,717) size 560x20 [color=#333333]
+ RenderBlock {P} at (0,715) size 560x20 [color=#333333]
RenderText {TEXT} at (0,2) size 337x20
text run at (0,2) width 337: "Please review them carefully and provide feedback below"
- RenderBlock (floating) {SPAN} at (0,750) size 325x20 [color=#333333]
+ RenderBlock (floating) {SPAN} at (0,748) size 325x20 [color=#333333]
RenderText {TEXT} at (0,2) size 145x20
text run at (0,2) width 145: "Your comments on Fig. 1"
- RenderTextArea {TEXTAREA} at (0,770) size 500x100
- RenderBlock (floating) {SPAN} at (0,875) size 325x20 [color=#333333]
+ RenderTextArea {TEXTAREA} at (0,768) size 500x100
+ RenderBlock (floating) {SPAN} at (0,873) size 325x20 [color=#333333]
RenderText {TEXT} at (0,2) size 145x20
text run at (0,2) width 145: "Your comments on Fig. 2"
- RenderTextArea {TEXTAREA} at (0,895) size 500x100
- RenderBlock (floating) {SPAN} at (0,1000) size 325x20 [color=#333333]
+ RenderTextArea {TEXTAREA} at (0,893) size 500x100
+ RenderBlock (floating) {SPAN} at (0,998) size 325x20 [color=#333333]
RenderText {TEXT} at (0,2) size 145x20
text run at (0,2) width 145: "Your comments on Fig. 3"
- RenderTextArea {TEXTAREA} at (0,1020) size 500x100
- RenderBlock {H2} at (0,1145) size 560x16 [color=#333333]
+ RenderTextArea {TEXTAREA} at (0,1018) size 500x100
+ RenderBlock {H2} at (0,1143) size 560x16 [color=#333333]
RenderText {TEXT} at (0,0) size 143x16
text run at (0,0) width 143: "OTHER FEEDBACK"
- RenderBlock (floating) {SPAN} at (0,1171) size 325x20 [color=#333333]
+ RenderBlock (floating) {SPAN} at (0,1169) size 325x20 [color=#333333]
RenderText {TEXT} at (0,2) size 220x20
text run at (0,2) width 220: "Please enter any other thoughts here."
- RenderTextArea {TEXTAREA} at (0,1191) size 500x100
- RenderBlock {P} at (20,1445) size 560x20 [color=#333333]
+ RenderTextArea {TEXTAREA} at (0,1189) size 500x100
+ RenderBlock {P} at (20,1443) size 560x20 [color=#333333]
RenderText {TEXT} at (0,2) size 233x20
text run at (0,2) width 233: "Thank you for your time filling this out."
- RenderBlock {DIV} at (1,1599) size 600x51 [border: (1px dashed #A6A972) none]
+ RenderBlock {DIV} at (1,1597) size 600x51 [border: (1px dashed #A6A972) none]
RenderBlock {SPAN} at (0,16) size 600x20 [color=#333333]
RenderText {TEXT} at (247,2) size 106x20
text run at (247,2) width 106: "\x{A9}2003 Kevin Davis"
diff --git a/LayoutTests/fast/forms/form-element-geometry-expected.txt b/LayoutTests/fast/forms/form-element-geometry-expected.txt
index 0fa5b78..b3f1b0d 100644
--- a/LayoutTests/fast/forms/form-element-geometry-expected.txt
+++ b/LayoutTests/fast/forms/form-element-geometry-expected.txt
@@ -1,8 +1,8 @@
-layer at (0,0) size 800x625
+layer at (0,0) size 800x624
RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x625
- RenderBlock {HTML} at (0,0) size 800x625
- RenderBody {BODY} at (8,8) size 784x609
+layer at (0,0) size 800x624
+ RenderBlock {HTML} at (0,0) size 800x624
+ RenderBody {BODY} at (8,8) size 784x608
RenderBlock {H1} at (0,0) size 784x37
RenderText {TEXT} at (0,0) size 422x37
text run at (0,0) width 422: "Form Element Geometry Tests"
@@ -74,9 +74,9 @@ layer at (0,0) size 800x625
RenderTable {TABLE} at (0,226) size 551x68
RenderTableSection {TBODY} at (0,0) size 0x68
RenderTableRow {TR} at (0,0) size 0x0
- RenderTableCell {TD} at (2,2) size 84x25 [r=0 c=0 rs=1 cs=1]
- RenderBlock {DIV} at (1,1) size 82x23 [border: (2px solid #0000FF)]
- RenderLineEdit {INPUT} at (2,2) size 78x19
+ RenderTableCell {TD} at (2,2) size 84x24 [r=0 c=0 rs=1 cs=1]
+ RenderBlock {DIV} at (1,1) size 82x22 [border: (2px solid #0000FF)]
+ RenderLineEdit {INPUT} at (2,2) size 78x18
RenderTableCell {TD} at (88,2) size 40x64 [r=0 c=1 rs=1 cs=1]
RenderBlock {DIV} at (1,1) size 38x62 [border: (2px solid #0000FF)]
RenderSelect {SELECT} at (2,2) size 34x58
@@ -133,10 +133,10 @@ layer at (0,0) size 800x625
text run at (164,5) width 3: " "
RenderCheckBox {INPUT} at (170,5) size 12x12
RenderText {TEXT} at (0,0) size 0x0
- RenderBlock {DIV} at (0,433) size 784x37
+ RenderBlock {DIV} at (0,433) size 784x36
RenderText {TEXT} at (0,16) size 27x18
text run at (0,16) width 27: "text "
- RenderLineEdit {INPUT} at (29,16) size 78x19
+ RenderLineEdit {INPUT} at (29,16) size 78x18
RenderText {TEXT} at (109,16) size 4x18
text run at (109,16) width 4: " "
RenderFileButton {INPUT} at (113,17) size 234x18
@@ -144,10 +144,10 @@ layer at (0,0) size 800x625
text run at (347,16) width 4: " "
RenderTextArea {TEXTAREA} at (353,2) size 167x28
RenderText {TEXT} at (0,0) size 0x0
- RenderBlock {H2} at (0,489) size 784x28
+ RenderBlock {H2} at (0,488) size 784x28
RenderText {TEXT} at (0,0) size 197x28
text run at (0,0) width 197: "Pop-up Menu Sizes"
- RenderBlock {DIV} at (0,536) size 784x29
+ RenderBlock {DIV} at (0,535) size 784x29
RenderInline {FONT} at (0,0) size 181x28
RenderText {TEXT} at (0,0) size 0x0
RenderSelect {SELECT} at (2,9) size 36x18
@@ -158,7 +158,7 @@ layer at (0,0) size 800x625
text run at (86,0) width 6: " "
RenderSelect {SELECT} at (94,9) size 85x18
RenderText {TEXT} at (0,0) size 0x0
- RenderBlock {DIV} at (0,565) size 784x22
+ RenderBlock {DIV} at (0,564) size 784x22
RenderSelect {SELECT} at (2,2) size 36x18
RenderText {TEXT} at (40,1) size 4x18
text run at (40,1) width 4: " "
@@ -167,7 +167,7 @@ layer at (0,0) size 800x625
text run at (84,1) width 4: " "
RenderSelect {SELECT} at (90,2) size 85x18
RenderText {TEXT} at (0,0) size 0x0
- RenderBlock {DIV} at (0,587) size 784x22
+ RenderBlock {DIV} at (0,586) size 784x22
RenderInline {FONT} at (0,0) size 175x13
RenderText {TEXT} at (0,0) size 0x0
RenderSelect {SELECT} at (2,2) size 36x18
diff --git a/LayoutTests/fast/forms/input-width-expected.txt b/LayoutTests/fast/forms/input-width-expected.txt
index cd5f233..be107d5 100644
--- a/LayoutTests/fast/forms/input-width-expected.txt
+++ b/LayoutTests/fast/forms/input-width-expected.txt
@@ -1,6 +1,6 @@
layer at (0,0) size 800x600
RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x39
- RenderBlock {HTML} at (0,0) size 800x39
- RenderBody {BODY} at (8,8) size 784x23
- RenderLineEdit {INPUT} at (2,2) size 50x19
+layer at (0,0) size 800x38
+ RenderBlock {HTML} at (0,0) size 800x38
+ RenderBody {BODY} at (8,8) size 784x22
+ RenderLineEdit {INPUT} at (2,2) size 50x18
diff --git a/LayoutTests/fast/table/003-expected.txt b/LayoutTests/fast/table/003-expected.txt
index cdefd17..5394e21 100644
--- a/LayoutTests/fast/table/003-expected.txt
+++ b/LayoutTests/fast/table/003-expected.txt
@@ -1,25 +1,25 @@
layer at (0,0) size 800x600
RenderCanvas at (0,0) size 800x600
-layer at (0,0) size 800x499
- RenderBlock {HTML} at (0,0) size 800x499
- RenderBody {BODY} at (8,8) size 784x483
- RenderTable {TABLE} at (0,0) size 784x51
- RenderTableSection {TBODY} at (0,0) size 0x51
+layer at (0,0) size 800x498
+ RenderBlock {HTML} at (0,0) size 800x498
+ RenderBody {BODY} at (8,8) size 784x482
+ RenderTable {TABLE} at (0,0) size 784x50
+ RenderTableSection {TBODY} at (0,0) size 0x50
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (2,4) size 52x20 [r=0 c=0 rs=1 cs=1]
RenderText {TEXT} at (1,1) size 37x18
text run at (1,1) width 37: "URL:"
- RenderTableCell {TD} at (56,2) size 726x25 [r=0 c=1 rs=1 cs=1]
- RenderLineEdit {INPUT} at (1,3) size 724x19
+ RenderTableCell {TD} at (56,2) size 726x24 [r=0 c=1 rs=1 cs=1]
+ RenderLineEdit {INPUT} at (1,3) size 724x18
RenderTableRow {TR} at (0,0) size 0x0
- RenderTableCell {TD} at (2,29) size 780x20 [bgcolor=#FF0000] [r=1 c=0 rs=1 cs=2]
+ RenderTableCell {TD} at (2,28) size 780x20 [bgcolor=#FF0000] [r=1 c=0 rs=1 cs=2]
RenderText {TEXT} at (1,1) size 253x18
text run at (1,1) width 253: "Alongwordtogiveyouanicebigminwidth."
- RenderTable {TABLE} at (0,51) size 100x104 [bgcolor=#FF0000] [border: (2px outset #808080)]
+ RenderTable {TABLE} at (0,50) size 100x104 [bgcolor=#FF0000] [border: (2px outset #808080)]
RenderTableSection {TBODY} at (2,2) size 0x100
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (2,48) size 92x4 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
- RenderTable {TABLE} at (0,155) size 183x124 [border: (2px outset #808080)]
+ RenderTable {TABLE} at (0,154) size 183x124 [border: (2px outset #808080)]
RenderTableSection {TBODY} at (2,2) size 0x120
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (2,2) size 175x22 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
@@ -36,7 +36,7 @@ layer at (0,0) size 800x499
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (2,74) size 175x44 [border: (1px inset #808080)] [r=3 c=0 rs=1 cs=1]
RenderTextArea {TEXTAREA} at (4,2) size 167x40
- RenderTable {TABLE} at (0,279) size 106x78
+ RenderTable {TABLE} at (0,278) size 106x78
RenderTableSection {TBODY} at (0,0) size 0x78
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (2,2) size 102x74 [r=0 c=0 rs=1 cs=1]
@@ -46,7 +46,7 @@ layer at (0,0) size 800x499
text run at (1,37) width 56: "nowrap. "
text run at (57,37) width 44: "I really"
text run at (1,55) width 46: "should."
- RenderTable {TABLE} at (0,357) size 106x78
+ RenderTable {TABLE} at (0,356) size 106x78
RenderTableSection {TBODY} at (0,0) size 0x78
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (2,2) size 102x74 [r=0 c=0 rs=1 cs=1]
@@ -57,7 +57,7 @@ layer at (0,0) size 800x499
text run at (0,36) width 56: "nowrap. "
text run at (56,36) width 44: "I really"
text run at (0,54) width 46: "should."
- RenderTable {TABLE} at (0,435) size 369x24
+ RenderTable {TABLE} at (0,434) size 369x24
RenderTableSection {TBODY} at (0,0) size 0x24
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (2,2) size 365x20 [r=0 c=0 rs=1 cs=1]
@@ -65,7 +65,7 @@ layer at (0,0) size 800x499
text run at (1,1) width 145: "I should have nowrap. "
text run at (146,1) width 98: "I really should. "
text run at (244,1) width 120: "Definitely. Should."
- RenderTable {TABLE} at (0,459) size 369x24
+ RenderTable {TABLE} at (0,458) size 369x24
RenderTableSection {TBODY} at (0,0) size 0x24
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (2,2) size 365x20 [r=0 c=0 rs=1 cs=1]
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 125a37c..cdbb2a8 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,36 @@
+2004-03-30 Darin Adler <darin at apple.com>
+
+ Reviewed by Dave.
+
+ - fixed <rdar://problem/3570877>: REGRESSION: onfocus handler not working at weather.com
+
+ * khtml/ecma/kjs_binding.cpp:
+ (UString::string): Turn a null UString into a null DOMString, but a non-null empty UString into a
+ non-null empty DOMString.
+ (UString::qstring): Ditto, for QString.
+ (Identifier::string): Ditto, for Identifier.
+ (Identifier::qstring): Ditto.
+
+ * kwq/KWQLineEdit.h: Override focusPolicy.
+ * kwq/KWQLineEdit.mm: (QLineEdit::focusPolicy): Return StrongFocus instead of TabFocus, since
+ we allow clicking to focus on these widgets.
+ * kwq/KWQTextEdit.h: More of the same.
+ * kwq/KWQTextEdit.mm: (QTextEdit::focusPolicy): And still more.
+
+ - fixed <rdar://problem/3605919>: text fields in web pages are too tall
+
+ * kwq/KWQTextField.mm:
+ (-[KWQTextFieldCell _typesetterBehavior]): Ignore the per-application typesetter setting and
+ instead always use the latest behavior for text fields in web pages.
+ (-[KWQSecureTextFieldCell _typesetterBehavior]): Ditto.
+ (-[KWQSearchFieldCell _typesetterBehavior]): Ditto.
+
+ - additional cleanup
+
+ * khtml/html/html_formimpl.cpp:
+ (HTMLGenericFormElementImpl::isKeyboardFocusable): Check tab focus bit instead of different modes.
+ (HTMLGenericFormElementImpl::isMouseFocusable): Check click focus bit instead of different modes.
+
2004-03-30 David Hyatt <hyatt at apple.com>
Fix for 3603326, spurious line breaks in encyclopedia articles. Make sure makeChildrenNonInline knows to
diff --git a/WebCore/khtml/ecma/kjs_binding.cpp b/WebCore/khtml/ecma/kjs_binding.cpp
index aef11db..e9799ac 100644
--- a/WebCore/khtml/ecma/kjs_binding.cpp
+++ b/WebCore/khtml/ecma/kjs_binding.cpp
@@ -2,7 +2,7 @@
/*
* This file is part of the KDE libraries
* Copyright (C) 1999-2001 Harri Porten (porten at kde.org)
- * Copyright (C) 2003 Apple Computer, Inc.
+ * Copyright (C) 2004 Apple Computer, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -29,6 +29,8 @@
#include <kdebug.h>
+using DOM::DOMString;
+
using namespace KJS;
/* TODO:
@@ -289,7 +291,7 @@ UString::UString(const QString &d)
rep = UString::Rep::create(dat, len);
}
-UString::UString(const DOM::DOMString &d)
+UString::UString(const DOMString &d)
{
if (d.isNull()) {
attach(&Rep::null);
@@ -302,13 +304,21 @@ UString::UString(const DOM::DOMString &d)
rep = UString::Rep::create(dat, len);
}
-DOM::DOMString UString::string() const
+DOMString UString::string() const
{
- return DOM::DOMString((QChar*) data(), size());
+ if (isNull())
+ return DOMString();
+ if (isEmpty())
+ return DOMString("");
+ return DOMString((QChar*) data(), size());
}
QString UString::qstring() const
{
+ if (isNull())
+ return QString();
+ if (isEmpty())
+ return QString("");
return QString((QChar*) data(), size());
}
@@ -317,13 +327,21 @@ QConstString UString::qconststring() const
return QConstString((QChar*) data(), size());
}
-DOM::DOMString Identifier::string() const
+DOMString Identifier::string() const
{
- return DOM::DOMString((QChar*) data(), size());
+ if (isNull())
+ return DOMString();
+ if (isEmpty())
+ return DOMString("");
+ return DOMString((QChar*) data(), size());
}
QString Identifier::qstring() const
{
+ if (isNull())
+ return QString();
+ if (isEmpty())
+ return QString("");
return QString((QChar*) data(), size());
}
@@ -337,7 +355,7 @@ DOM::Node KJS::toNode(const Value& val)
return dobj->toNode();
}
-Value KJS::getStringOrNull(DOM::DOMString s)
+Value KJS::getStringOrNull(DOMString s)
{
if (s.isNull())
return Null();
diff --git a/WebCore/khtml/html/html_formimpl.cpp b/WebCore/khtml/html/html_formimpl.cpp
index 7c8758e..bf7ce9c 100644
--- a/WebCore/khtml/html/html_formimpl.cpp
+++ b/WebCore/khtml/html/html_formimpl.cpp
@@ -4,7 +4,7 @@
* Copyright (C) 1999 Lars Knoll (knoll at kde.org)
* (C) 1999 Antti Koivisto (koivisto at kde.org)
* (C) 2001 Dirk Mueller (mueller at kde.org)
- * Copyright (C) 2003 Apple Computer, Inc.
+ * Copyright (C) 2004 Apple Computer, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -874,8 +874,7 @@ bool HTMLGenericFormElementImpl::isKeyboardFocusable() const
if (isFocusable()) {
if (m_render->isWidget()) {
return static_cast<RenderWidget*>(m_render)->widget() &&
- ((static_cast<RenderWidget*>(m_render)->widget()->focusPolicy() == QWidget::TabFocus) ||
- (static_cast<RenderWidget*>(m_render)->widget()->focusPolicy() == QWidget::StrongFocus));
+ (static_cast<RenderWidget*>(m_render)->widget()->focusPolicy() & QWidget::TabFocus);
}
if (getDocument()->part())
return getDocument()->part()->tabsToAllControls();
@@ -888,8 +887,7 @@ bool HTMLGenericFormElementImpl::isMouseFocusable() const
if (isFocusable()) {
if (m_render->isWidget()) {
return static_cast<RenderWidget*>(m_render)->widget() &&
- ((static_cast<RenderWidget*>(m_render)->widget()->focusPolicy() == QWidget::ClickFocus) ||
- (static_cast<RenderWidget*>(m_render)->widget()->focusPolicy() == QWidget::StrongFocus));
+ (static_cast<RenderWidget*>(m_render)->widget()->focusPolicy() & QWidget::ClickFocus);
}
#if APPLE_CHANGES
// For <input type=image> and <button>, we will assume no mouse focusability. This is
diff --git a/WebCore/kwq/KWQLineEdit.h b/WebCore/kwq/KWQLineEdit.h
index ceef6b6..ef187ac 100644
--- a/WebCore/kwq/KWQLineEdit.h
+++ b/WebCore/kwq/KWQLineEdit.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -73,6 +73,7 @@ public:
void clicked();
+ virtual FocusPolicy focusPolicy() const;
virtual bool checksDescendantsForFocus() const;
Type type() const { return m_type; }
diff --git a/WebCore/kwq/KWQLineEdit.mm b/WebCore/kwq/KWQLineEdit.mm
index 6d32b3a..de01858 100644
--- a/WebCore/kwq/KWQLineEdit.mm
+++ b/WebCore/kwq/KWQLineEdit.mm
@@ -243,6 +243,12 @@ void QLineEdit::setWritingDirection(QPainter::TextDirection direction)
KWQ_UNBLOCK_EXCEPTIONS;
}
+QWidget::FocusPolicy QLineEdit::focusPolicy() const
+{
+ FocusPolicy policy = QWidget::focusPolicy();
+ return policy == TabFocus ? StrongFocus : policy;
+}
+
bool QLineEdit::checksDescendantsForFocus() const
{
return true;
diff --git a/WebCore/kwq/KWQTextEdit.h b/WebCore/kwq/KWQTextEdit.h
index 1ed690f..3368355 100644
--- a/WebCore/kwq/KWQTextEdit.h
+++ b/WebCore/kwq/KWQTextEdit.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -78,6 +78,7 @@ class QTextEdit : public QScrollView
void clicked();
+ virtual FocusPolicy focusPolicy() const;
virtual bool checksDescendantsForFocus() const;
private:
diff --git a/WebCore/kwq/KWQTextEdit.mm b/WebCore/kwq/KWQTextEdit.mm
index fd9cecf..a26afbe 100644
--- a/WebCore/kwq/KWQTextEdit.mm
+++ b/WebCore/kwq/KWQTextEdit.mm
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003 Apple Computer, Inc. All rights reserved.
+ * Copyright (C) 2004 Apple Computer, Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -217,8 +217,13 @@ QSize QTextEdit::sizeWithColumnsAndRows(int numColumns, int numRows) const
return QSize((int)ceil(size.width), (int)ceil(size.height));
}
+QWidget::FocusPolicy QTextEdit::focusPolicy() const
+{
+ FocusPolicy policy = QScrollView::focusPolicy();
+ return policy == TabFocus ? StrongFocus : policy;
+}
+
bool QTextEdit::checksDescendantsForFocus() const
{
return true;
}
-
diff --git a/WebCore/kwq/KWQTextField.mm b/WebCore/kwq/KWQTextField.mm
index 6db42a2..47b1478 100644
--- a/WebCore/kwq/KWQTextField.mm
+++ b/WebCore/kwq/KWQTextField.mm
@@ -553,6 +553,13 @@
return attributes;
}
+// Ignore the per-application typesetter setting and instead always use the latest behavior for
+// text fields in web pages. This fixes the "text fields too tall" problem.
+- (NSTypesetterBehavior)_typesetterBehavior
+{
+ return NSTypesetterLatestBehavior;
+}
+
@end
@@ -746,6 +753,13 @@
return attributes;
}
+// Ignore the per-application typesetter setting and instead always use the latest behavior for
+// text fields in web pages. This fixes the "text fields too tall" problem.
+- (NSTypesetterBehavior)_typesetterBehavior
+{
+ return NSTypesetterLatestBehavior;
+}
+
@end
@implementation KWQSearchField
@@ -901,6 +915,13 @@
return attributes;
}
+// Ignore the per-application typesetter setting and instead always use the latest behavior for
+// text fields in web pages. This fixes the "text fields too tall" problem.
+- (NSTypesetterBehavior)_typesetterBehavior
+{
+ return NSTypesetterLatestBehavior;
+}
+
@end
@implementation KWQTextFieldFormatter
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list