[webkit-changes] cvs commit: WebCore/khtml/rendering render_object.cpp

[David]

hyatt       05/08/27 21:10:13

  Modified:    .        ChangeLog
               khtml/css cssparser.cpp
               khtml/rendering render_object.cpp
  Log:
  	Fix two minor bugs with border-image and border-radius.
  	border-image didn't parse properly when the border width
  	was omitted.  border-radius had over-aggressive clipping.
  
          * khtml/css/cssparser.cpp:
          (BorderImageParseContext::commitNumber):
          * khtml/rendering/render_object.cpp:
          (RenderObject::paintBorder):
  
  Revision  Changes    Path
  1.25      +11 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- ChangeLog	28 Aug 2005 00:58:41 -0000	1.24
  +++ ChangeLog	28 Aug 2005 04:10:12 -0000	1.25
  @@ -1,3 +1,14 @@
  +2005-08-27  David Hyatt  <hyatt at apple.com>
  +
  +	Fix two minor bugs with border-image and border-radius.
  +	border-image didn't parse properly when the border width
  +	was omitted.  border-radius had over-aggressive clipping.
  +	
  +        * khtml/css/cssparser.cpp:
  +        (BorderImageParseContext::commitNumber):
  +        * khtml/rendering/render_object.cpp:
  +        (RenderObject::paintBorder):
  +
   2005-08-27  David Harrison  <harrison at apple.com>
   
           Reviewed by Adele and John.
  
  
  
  1.105     +1 -1      WebCore/khtml/css/cssparser.cpp
  
  Index: cssparser.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/css/cssparser.cpp,v
  retrieving revision 1.104
  retrieving revision 1.105
  diff -u -r1.104 -r1.105
  --- cssparser.cpp	27 Aug 2005 00:14:18 -0000	1.104
  +++ cssparser.cpp	28 Aug 2005 04:10:12 -0000	1.105
  @@ -2497,7 +2497,7 @@
               m_left = val;
           }
           
  -        m_allowBreak = m_allowSlash = true;
  +        m_allowBreak = m_allowSlash = m_allowRule = true;
           m_allowNumber = !m_left;
       }
       void commitSlash() { m_allowBreak = m_allowSlash = m_allowNumber = false; m_allowWidth = true; }
  
  
  
  1.208     +6 -1      WebCore/khtml/rendering/render_object.cpp
  
  Index: render_object.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/rendering/render_object.cpp,v
  retrieving revision 1.207
  retrieving revision 1.208
  diff -u -r1.207 -r1.208
  --- render_object.cpp	27 Aug 2005 00:14:21 -0000	1.207
  +++ render_object.cpp	28 Aug 2005 04:10:13 -0000	1.208
  @@ -1138,8 +1138,10 @@
       }
       
       // Clip to the rounded rectangle.
  -    if (render_radii)
  +    if (render_radii) {
  +        p->save();
           p->addRoundedRectClip(QRect(_tx, _ty, w, h), topLeft, topRight, bottomLeft, bottomRight);
  +    }
   
       if (render_t) {
           bool ignore_left = (render_radii && topLeft.width() > 0) ||
  @@ -1232,6 +1234,9 @@
   		   ignore_top?0:style->borderTopWidth(),
   		   ignore_bottom?0:style->borderBottomWidth());
       }
  +    
  +    if (render_radii)
  +        p->restore(); // Undo the clip.
   }
   
   void RenderObject::absoluteRects(QValueList<QRect>& rects, int _tx, int _ty)