[webkit-changes] cvs commit: WebCore/khtml/rendering render_form.cpp render_form.h render_replaced.cpp

[Adele]

adele       05/12/02 17:06:06

  Modified:    .        Tag: Safari-2-0-branch ChangeLog
               khtml/rendering Tag: Safari-2-0-branch render_form.cpp
                        render_form.h render_replaced.cpp
  Log:
          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.1.2.90  +18 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.1.2.89
  retrieving revision 1.1.2.90
  diff -u -r1.1.2.89 -r1.1.2.90
  --- ChangeLog	2 Dec 2005 23:58:41 -0000	1.1.2.89
  +++ ChangeLog	3 Dec 2005 01:05:57 -0000	1.1.2.90
  @@ -1,3 +1,21 @@
  +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-02  Timothy Hatcher  <timothy at apple.com>
   
           Merged fix from TOT to Safari-2-0-branch
  
  
  
  No                   revision
  
  
  No                   revision
  
  
  1.102.8.8 +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.8.7
  retrieving revision 1.102.8.8
  diff -u -r1.102.8.7 -r1.102.8.8
  --- render_form.cpp	11 Nov 2005 18:21:05 -0000	1.102.8.7
  +++ render_form.cpp	3 Dec 2005 01:06:04 -0000	1.102.8.8
  @@ -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)
  @@ -1577,13 +1579,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.8.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.8.1
  retrieving revision 1.48.8.2
  diff -u -r1.48.8.1 -r1.48.8.2
  --- render_form.h	11 Nov 2005 06:39:33 -0000	1.48.8.1
  +++ render_form.h	3 Dec 2005 01:06:04 -0000	1.48.8.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.8.5  +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.8.4
  retrieving revision 1.75.8.5
  diff -u -r1.75.8.4 -r1.75.8.5
  --- render_replaced.cpp	11 Nov 2005 20:26:34 -0000	1.75.8.4
  +++ render_replaced.cpp	3 Dec 2005 01:06:05 -0000	1.75.8.5
  @@ -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