[webkit-changes] cvs commit: WebCore/khtml/rendering
render_form.cpp render_replaced.cpp
Adele
adele at opensource.apple.com
Fri Dec 2 17:06:46 PST 2005
adele 05/12/02 17:06:46
Modified: . ChangeLog
fast/replaced width100percent-expected.checksum
width100percent-expected.png
width100percent-expected.txt width100percent.html
. ChangeLog
khtml/rendering render_form.cpp render_replaced.cpp
Log:
LayoutTests:
Updating test for latest changes in:
<rdar://problem/4360657> Regression: Seed: WebKit image scaling broken
* fast/replaced/width100percent-expected.checksum:
* fast/replaced/width100percent-expected.png:
* fast/replaced/width100percent-expected.txt:
* fast/replaced/width100percent.html:
WebCore:
Reviewed by Hyatt.
- fix for <rdar://problem/4360657> Regression: Seed: WebKit image scaling broken
We're backing out the fix for <rdar://problem/3952698>.
With the new button implementation, the buttons will
not overlap for the telia webmail case. We may need to address
the minWidth behavior for other elements at a later time.
* khtml/rendering/render_form.cpp:
(RenderLineEdit::calcMinMaxWidth):
(RenderTextArea::calcMinMaxWidth):
* khtml/rendering/render_replaced.cpp:
(RenderReplaced::calcMinMaxWidth):
Revision Changes Path
1.121 +10 -0 LayoutTests/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/LayoutTests/ChangeLog,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- ChangeLog 2 Dec 2005 09:00:50 -0000 1.120
+++ ChangeLog 3 Dec 2005 01:06:39 -0000 1.121
@@ -1,3 +1,13 @@
+2005-12-02 Adele Peterson <adele at apple.com>
+
+ Updating test for latest changes in:
+ <rdar://problem/4360657> Regression: Seed: WebKit image scaling broken
+
+ * fast/replaced/width100percent-expected.checksum:
+ * fast/replaced/width100percent-expected.png:
+ * fast/replaced/width100percent-expected.txt:
+ * fast/replaced/width100percent.html:
+
2005-12-01 Graham Dennis <Graham.Dennis at gmail.com>
Reviewed by justin
1.2 +1 -1 LayoutTests/fast/replaced/width100percent-expected.checksum
Index: width100percent-expected.checksum
===================================================================
RCS file: /cvs/root/LayoutTests/fast/replaced/width100percent-expected.checksum,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- width100percent-expected.checksum 11 Nov 2005 17:44:44 -0000 1.1
+++ width100percent-expected.checksum 3 Dec 2005 01:06:40 -0000 1.2
@@ -1 +1 @@
-ccee2b09cf2ee97320abd9964a135afc
\ No newline at end of file
+b7add300a93bc3e86d3ccd53b54e19a6
\ No newline at end of file
1.2 +242 -388 LayoutTests/fast/replaced/width100percent-expected.png
<<Binary file>>
1.2 +38 -31 LayoutTests/fast/replaced/width100percent-expected.txt
Index: width100percent-expected.txt
===================================================================
RCS file: /cvs/root/LayoutTests/fast/replaced/width100percent-expected.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- width100percent-expected.txt 11 Nov 2005 17:44:44 -0000 1.1
+++ width100percent-expected.txt 3 Dec 2005 01:06:40 -0000 1.2
@@ -1,9 +1,12 @@
-layer at (0,0) size 785x926
+layer at (0,0) size 785x980
RenderCanvas at (0,0) size 785x600
-layer at (0,0) size 785x926
- RenderBlock {HTML} at (0,0) size 785x926
- RenderBody {BODY} at (8,8) size 769x910
- RenderTable {TABLE} at (0,0) size 769x26
+layer at (0,0) size 785x980
+ RenderBlock {HTML} at (0,0) size 785x980
+ RenderBody {BODY} at (8,8) size 769x964
+ RenderBlock (anonymous) at (0,0) size 769x18
+ RenderText {TEXT} at (0,0) size 309x18
+ text run at (0,0) width 309: "The following sets of buttons should not overlap."
+ RenderTable {TABLE} at (0,18) size 769x26
RenderTableSection {TBODY} at (0,0) size 0x26
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (1,1) size 66x24 [r=0 c=0 rs=1 cs=1]
@@ -24,10 +27,10 @@
RenderTableCell {TD} at (181,3) size 587x20 [r=0 c=3 rs=1 cs=1]
RenderText {TEXT} at (1,1) size 4x18
text run at (1,1) width 4: " "
- RenderBlock (anonymous) at (0,26) size 769x36
+ RenderBlock (anonymous) at (0,44) size 769x36
RenderBR {BR} at (0,0) size 0x18
RenderBR {BR} at (0,18) size 0x18
- RenderTable {TABLE} at (0,62) size 769x26
+ RenderTable {TABLE} at (0,80) size 769x26
RenderTableSection {TBODY} at (0,0) size 0x26
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (1,1) size 66x24 [r=0 c=0 rs=1 cs=1]
@@ -48,10 +51,10 @@
RenderTableCell {TD} at (181,3) size 587x20 [r=0 c=3 rs=1 cs=1]
RenderText {TEXT} at (1,1) size 4x18
text run at (1,1) width 4: " "
- RenderBlock (anonymous) at (0,88) size 769x36
+ RenderBlock (anonymous) at (0,106) size 769x36
RenderBR {BR} at (0,0) size 0x18
RenderBR {BR} at (0,18) size 0x18
- RenderTable {TABLE} at (0,124) size 769x22
+ RenderTable {TABLE} at (0,142) size 769x22
RenderTableSection {TBODY} at (0,0) size 0x22
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (1,1) size 8x20 [r=0 c=0 rs=1 cs=1]
@@ -63,10 +66,10 @@
RenderTableCell {TD} at (28,1) size 740x20 [r=0 c=3 rs=1 cs=1]
RenderText {TEXT} at (1,1) size 4x18
text run at (1,1) width 4: " "
- RenderBlock (anonymous) at (0,146) size 769x36
+ RenderBlock (anonymous) at (0,164) size 769x36
RenderBR {BR} at (0,0) size 0x18
RenderBR {BR} at (0,18) size 0x18
- RenderTable {TABLE} at (0,182) size 769x23
+ RenderTable {TABLE} at (0,200) size 769x23
RenderTableSection {TBODY} at (0,0) size 0x23
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (1,1) size 8x21 [r=0 c=0 rs=1 cs=1]
@@ -78,10 +81,14 @@
RenderTableCell {TD} at (28,1) size 740x20 [r=0 c=3 rs=1 cs=1]
RenderText {TEXT} at (1,1) size 4x18
text run at (1,1) width 4: " "
- RenderBlock (anonymous) at (0,205) size 769x36
+ RenderBlock (anonymous) at (0,223) size 769x72
RenderBR {BR} at (0,0) size 0x18
RenderBR {BR} at (0,18) size 0x18
- RenderTable {TABLE} at (0,241) size 769x27
+ RenderText {TEXT} at (0,36) size 761x36
+ text run at (0,36) width 718: "The following elements behave differently in different browsers. Our current behavior will cause them to overlap, "
+ text run at (718,36) width 43: "but we"
+ text run at (0,54) width 236: "may need to change this in the future."
+ RenderTable {TABLE} at (0,295) size 769x27
RenderTableSection {TBODY} at (0,0) size 0x27
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (1,1) size 150x25 [r=0 c=0 rs=1 cs=1]
@@ -93,10 +100,10 @@
RenderTableCell {TD} at (158,3) size 610x20 [r=0 c=3 rs=1 cs=1]
RenderText {TEXT} at (1,1) size 4x18
text run at (1,1) width 4: " "
- RenderBlock (anonymous) at (0,268) size 769x36
+ RenderBlock (anonymous) at (0,322) size 769x36
RenderBR {BR} at (0,0) size 0x18
RenderBR {BR} at (0,18) size 0x18
- RenderTable {TABLE} at (0,304) size 769x27
+ RenderTable {TABLE} at (0,358) size 769x27
RenderTableSection {TBODY} at (0,0) size 0x27
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (1,1) size 706x25 [r=0 c=0 rs=1 cs=1]
@@ -108,25 +115,25 @@
RenderTableCell {TD} at (714,3) size 54x20 [r=0 c=3 rs=1 cs=1]
RenderText {TEXT} at (1,1) size 4x18
text run at (1,1) width 4: " "
- RenderBlock (anonymous) at (0,331) size 769x36
+ RenderBlock (anonymous) at (0,385) size 769x36
RenderBR {BR} at (0,0) size 0x18
RenderBR {BR} at (0,18) size 0x18
- RenderTable {TABLE} at (0,367) size 769x279
+ RenderTable {TABLE} at (0,421) size 769x279
RenderTableSection {TBODY} at (0,0) size 0x279
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (1,1) size 216x277 [r=0 c=0 rs=1 cs=1]
RenderImage {IMG} at (1,1) size 214x275
- RenderTableCell {TD} at (218,1) size 216x277 [r=0 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (218,1) size 2x277 [r=0 c=1 rs=1 cs=1]
RenderImage {IMG} at (1,1) size 214x275
- RenderTableCell {TD} at (435,1) size 216x277 [r=0 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (221,1) size 2x277 [r=0 c=2 rs=1 cs=1]
RenderImage {IMG} at (1,1) size 214x275
- RenderTableCell {TD} at (652,129) size 116x20 [r=0 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (224,129) size 544x20 [r=0 c=3 rs=1 cs=1]
RenderText {TEXT} at (1,1) size 4x18
text run at (1,1) width 4: " "
- RenderBlock (anonymous) at (0,646) size 769x36
+ RenderBlock (anonymous) at (0,700) size 769x36
RenderBR {BR} at (0,0) size 0x18
RenderBR {BR} at (0,18) size 0x18
- RenderTable {TABLE} at (0,682) size 769x36
+ RenderTable {TABLE} at (0,736) size 769x36
RenderTableSection {TBODY} at (0,0) size 0x36
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (1,1) size 169x34 [r=0 c=0 rs=1 cs=1]
@@ -138,10 +145,10 @@
RenderTableCell {TD} at (177,8) size 591x20 [r=0 c=3 rs=1 cs=1]
RenderText {TEXT} at (1,1) size 4x18
text run at (1,1) width 4: " "
- RenderBlock (anonymous) at (0,718) size 769x36
+ RenderBlock (anonymous) at (0,772) size 769x36
RenderBR {BR} at (0,0) size 0x18
RenderBR {BR} at (0,18) size 0x18
- RenderTable {TABLE} at (0,754) size 769x36
+ RenderTable {TABLE} at (0,808) size 769x36
RenderTableSection {TBODY} at (0,0) size 0x36
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (1,1) size 238x34 [r=0 c=0 rs=1 cs=1]
@@ -153,25 +160,25 @@
RenderTableCell {TD} at (246,8) size 522x20 [r=0 c=3 rs=1 cs=1]
RenderText {TEXT} at (1,1) size 4x18
text run at (1,1) width 4: " "
- RenderBlock (anonymous) at (0,790) size 769x36
+ RenderBlock (anonymous) at (0,844) size 769x36
RenderBR {BR} at (0,0) size 0x18
RenderBR {BR} at (0,18) size 0x18
- RenderTable {TABLE} at (0,826) size 769x26
+ RenderTable {TABLE} at (0,880) size 769x26
RenderTableSection {TBODY} at (0,0) size 0x26
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (1,1) size 53x24 [r=0 c=0 rs=1 cs=1]
RenderSelect {SELECT} at (1,3) size 51x18
- RenderTableCell {TD} at (55,1) size 53x24 [r=0 c=1 rs=1 cs=1]
+ RenderTableCell {TD} at (55,1) size 2x24 [r=0 c=1 rs=1 cs=1]
RenderSelect {SELECT} at (1,3) size 51x18
- RenderTableCell {TD} at (109,1) size 61x24 [r=0 c=2 rs=1 cs=1]
+ RenderTableCell {TD} at (58,1) size 2x24 [r=0 c=2 rs=1 cs=1]
RenderSelect {SELECT} at (1,3) size 59x18
- RenderTableCell {TD} at (171,3) size 597x20 [r=0 c=3 rs=1 cs=1]
+ RenderTableCell {TD} at (61,3) size 707x20 [r=0 c=3 rs=1 cs=1]
RenderText {TEXT} at (1,1) size 4x18
text run at (1,1) width 4: " "
- RenderBlock (anonymous) at (0,852) size 769x36
+ RenderBlock (anonymous) at (0,906) size 769x36
RenderBR {BR} at (0,0) size 0x18
RenderBR {BR} at (0,18) size 0x18
- RenderTable {TABLE} at (0,888) size 769x22
+ RenderTable {TABLE} at (0,942) size 769x22
RenderTableSection {TBODY} at (0,0) size 0x22
RenderTableRow {TR} at (0,0) size 0x0
RenderTableCell {TD} at (1,1) size 2x18 [r=0 c=0 rs=1 cs=1]
1.2 +4 -2 LayoutTests/fast/replaced/width100percent.html
Index: width100percent.html
===================================================================
RCS file: /cvs/root/LayoutTests/fast/replaced/width100percent.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- width100percent.html 11 Nov 2005 17:44:44 -0000 1.1
+++ width100percent.html 3 Dec 2005 01:06:40 -0000 1.2
@@ -5,7 +5,7 @@
</style>
</head>
<body>
-
+The following sets of buttons should not overlap.
<table border="0" cellspacing="1" cellpadding="1" width="100%">
<tr>
<td nowrap><input type="button" value="New Mail" class="test"></td>
@@ -17,7 +17,6 @@
<br>
<br>
-
<table border="0" cellspacing="1" cellpadding="1" width="100%">
<tr>
<td nowrap><input type="submit" value="New Mail" class="test"></td>
@@ -54,6 +53,9 @@
<br>
<br>
+The following elements behave differently in different browsers.
+Our current behavior will cause them to overlap,
+but we may need to change this in the future.
<table border="0" cellspacing="1" cellpadding="1" width="100%">
<tr>
<td nowrap><input type="text" name="b" value="New Mail" class="test"></td>
1.458 +17 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.457
retrieving revision 1.458
diff -u -r1.457 -r1.458
--- ChangeLog 2 Dec 2005 23:19:32 -0000 1.457
+++ ChangeLog 3 Dec 2005 01:06:41 -0000 1.458
@@ -1,3 +1,20 @@
+2005-12-02 Adele Peterson <adele at apple.com>
+
+ Reviewed by Hyatt.
+
+ - fix for <rdar://problem/4360657> Regression: Seed: WebKit image scaling broken
+
+ We're backing out the fix for <rdar://problem/3952698>.
+ With the new button implementation, the buttons will
+ not overlap for the telia webmail case. We may need to address
+ the minWidth behavior for other elements at a later time.
+
+ * khtml/rendering/render_form.cpp:
+ (RenderLineEdit::calcMinMaxWidth):
+ (RenderTextArea::calcMinMaxWidth):
+ * khtml/rendering/render_replaced.cpp:
+ (RenderReplaced::calcMinMaxWidth):
+
2005-12-02 Geoffrey Garen <ggaren at apple.com>
Reviewed by NOBODY (OOPS!).
1.133 +0 -14 WebCore/khtml/rendering/render_form.cpp
Index: render_form.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_form.cpp,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- render_form.cpp 21 Nov 2005 01:20:24 -0000 1.132
+++ render_form.cpp 3 Dec 2005 01:06:45 -0000 1.133
@@ -271,13 +271,6 @@
setIntrinsicHeight( s.height() );
RenderFormElement::calcMinMaxWidth();
-
- // FIXME: m_minWidth should not really be set to 0. If textfields
- // have value text in them to begin with, then to match WinIE the
- // field should only be as wide as the text. Setting m_minWidth to
- // 0 also makes textfields with width:100% overlap.
- if (style()->width().isPercent())
- m_minWidth = 0;
}
void RenderLineEdit::setStyle(RenderStyle *s)
@@ -1024,13 +1017,6 @@
setIntrinsicHeight( size.height() );
RenderFormElement::calcMinMaxWidth();
-
- // FIXME: m_minWidth should not really be set to 0. If textareas
- // have value text in them to begin with, then to match WinIE the
- // textarea should only be as wide as the text. Setting m_minWidth
- // to 0 also makes textareas with width:100% overlap.
- if (style()->width().isPercent())
- m_minWidth = 0;
}
void RenderTextArea::setStyle(RenderStyle *s)
1.95 +1 -1 WebCore/khtml/rendering/render_replaced.cpp
Index: render_replaced.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_replaced.cpp,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- render_replaced.cpp 21 Nov 2005 01:20:27 -0000 1.94
+++ render_replaced.cpp 3 Dec 2005 01:06:45 -0000 1.95
@@ -100,7 +100,7 @@
#endif
int width = calcReplacedWidth() + paddingLeft() + paddingRight() + borderLeft() + borderRight();
- if (style()->width().isAuto() && style()->height().isPercent()) {
+ if (style()->width().isPercent() || (style()->width().isAuto() && style()->height().isPercent())) {
m_minWidth = 0;
m_maxWidth = width;
} else
More information about the webkit-changes
mailing list