[webkit-changes] cvs commit: WebCore/khtml/rendering
render_form.cpp render_form.h render_replaced.cpp
Timothy
thatcher at opensource.apple.com
Sun Dec 4 13:12:22 PST 2005
thatcher 05/12/04 13:12:21
Modified: . Tag: Safari-1-3-branch ChangeLog
khtml/rendering Tag: Safari-1-3-branch render_form.cpp
render_form.h render_replaced.cpp
Log:
Merged fix from Safari-2-0-branch to Safari-1-3-branch
2005-12-02 Adele Peterson <adele at apple.com>
Reviewed by Hyatt.
- fixed <rdar://problem/4360657> Regression: Seed: WebKit image scaling broken
Removed fix for <rdar://problem/3952698> Function buttons do not display
properly with Telia Webmail (3488). For a more conservative fix, we've added
RenderButton::calcMinMaxWidth to avoid setting the minWidth to 0 for buttons.
* khtml/rendering/render_form.cpp:
(RenderButton::calcMinMaxWidth):
(RenderLineEdit::calcMinMaxWidth):
(RenderTextArea::calcMinMaxWidth):
* khtml/rendering/render_form.h:
* khtml/rendering/render_replaced.cpp:
(RenderReplaced::calcMinMaxWidth):
Revision Changes Path
No revision
No revision
1.335.2.47 +22 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.335.2.46
retrieving revision 1.335.2.47
diff -u -r1.335.2.46 -r1.335.2.47
--- ChangeLog 4 Dec 2005 21:02:56 -0000 1.335.2.46
+++ ChangeLog 4 Dec 2005 21:12:14 -0000 1.335.2.47
@@ -1,5 +1,27 @@
2005-12-04 Timothy Hatcher <timothy at apple.com>
+ Merged fix from Safari-2-0-branch to Safari-1-3-branch
+
+ 2005-12-02 Adele Peterson <adele at apple.com>
+
+ Reviewed by Hyatt.
+
+ - fixed <rdar://problem/4360657> Regression: Seed: WebKit image scaling broken
+
+ Removed fix for <rdar://problem/3952698> Function buttons do not display
+ properly with Telia Webmail (3488). For a more conservative fix, we've added
+ RenderButton::calcMinMaxWidth to avoid setting the minWidth to 0 for buttons.
+
+ * khtml/rendering/render_form.cpp:
+ (RenderButton::calcMinMaxWidth):
+ (RenderLineEdit::calcMinMaxWidth):
+ (RenderTextArea::calcMinMaxWidth):
+ * khtml/rendering/render_form.h:
+ * khtml/rendering/render_replaced.cpp:
+ (RenderReplaced::calcMinMaxWidth):
+
+2005-12-04 Timothy Hatcher <timothy at apple.com>
+
Merged fix from TOT to Safari-1-3-branch
2005-12-02 Darin Adler <darin at apple.com>
No revision
No revision
1.102.6.7 +9 -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.102.6.6
retrieving revision 1.102.6.7
diff -u -r1.102.6.6 -r1.102.6.7
--- render_form.cpp 11 Nov 2005 18:24:18 -0000 1.102.6.6
+++ render_form.cpp 4 Dec 2005 21:12:19 -0000 1.102.6.7
@@ -269,6 +269,15 @@
#endif
}
+void RenderButton::calcMinMaxWidth()
+{
+ RenderFormElement::calcMinMaxWidth();
+
+ m_minWidth = m_maxWidth;
+
+ setMinMaxKnown();
+}
+
// -------------------------------------------------------------------------------
RenderCheckBox::RenderCheckBox(HTMLInputElementImpl *element)
@@ -624,13 +633,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)
@@ -1565,13 +1567,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.48.6.2 +1 -0 WebCore/khtml/rendering/render_form.h
Index: render_form.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_form.h,v
retrieving revision 1.48.6.1
retrieving revision 1.48.6.2
diff -u -r1.48.6.1 -r1.48.6.2
--- render_form.h 11 Nov 2005 16:40:30 -0000 1.48.6.1
+++ render_form.h 4 Dec 2005 21:12:20 -0000 1.48.6.2
@@ -129,6 +129,7 @@
virtual const char *renderName() const { return "RenderButton"; }
virtual short baselinePosition( bool, bool ) const;
+ virtual void calcMinMaxWidth();
// don't even think about making this method virtual!
DOM::HTMLInputElementImpl* element() const
1.75.6.3 +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.75.6.2
retrieving revision 1.75.6.3
diff -u -r1.75.6.2 -r1.75.6.3
--- render_replaced.cpp 11 Nov 2005 20:27:22 -0000 1.75.6.2
+++ render_replaced.cpp 4 Dec 2005 21:12:20 -0000 1.75.6.3
@@ -98,7 +98,7 @@
#endif
int width = calcReplacedWidth() + paddingLeft() + paddingRight() + borderLeft() + borderRight();
- if (style()->width().isVariable() && style()->height().isPercent()) {
+ if (style()->width().isPercent() || (style()->width().isVariable() && style()->height().isPercent())) {
m_minWidth = 0;
m_maxWidth = width;
} else
More information about the webkit-changes
mailing list