[webkit-changes] cvs commit: WebCore/khtml/html html_baseimpl.cpp

[Geoffrey]

ggaren      05/12/03 17:21:09

  Modified:    .        ChangeLog
               khtml/html html_baseimpl.cpp
  Log:
          Reviewed by Darin.
  
          Fixed <rdar://problem/4364302> leftmargin and topmargin should match
          marginwidth and marginheight respectively
  
          Layout test added:
          positioning/leftmargin-topmargin-expected.txt
          positioning/leftmargin-topmargin.html
  
          * khtml/html/html_baseimpl.cpp:
          (HTMLBodyElementImpl::parseMappedAttribute): Merged
          leftmargin/marginwidth, topmargin/marginheight
  
  Revision  Changes    Path
  1.467     +15 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.466
  retrieving revision 1.467
  diff -u -r1.466 -r1.467
  --- ChangeLog	4 Dec 2005 00:48:00 -0000	1.466
  +++ ChangeLog	4 Dec 2005 01:21:03 -0000	1.467
  @@ -1,3 +1,18 @@
  +2005-12-03  Geoffrey Garen  <ggaren at apple.com>
  +
  +        Reviewed by Darin.
  +
  +        Fixed <rdar://problem/4364302> leftmargin and topmargin should match 
  +        marginwidth and marginheight respectively
  +
  +        Layout test added:
  +        positioning/leftmargin-topmargin-expected.txt
  +        positioning/leftmargin-topmargin.html
  +
  +        * khtml/html/html_baseimpl.cpp:
  +        (HTMLBodyElementImpl::parseMappedAttribute): Merged
  +        leftmargin/marginwidth, topmargin/marginheight
  +
   2005-12-03  Justin Garcia  <justin.garcia at apple.com>
   
           <http://bugzilla.opendarwin.org/show_bug.cgi?id=5856>
  
  
  
  1.85      +2 -6      WebCore/khtml/html/html_baseimpl.cpp
  
  Index: html_baseimpl.cpp
  ===================================================================
  RCS file: /cvs/root/WebCore/khtml/html/html_baseimpl.cpp,v
  retrieving revision 1.84
  retrieving revision 1.85
  diff -u -r1.84 -r1.85
  --- html_baseimpl.cpp	19 Nov 2005 01:26:46 -0000	1.84
  +++ html_baseimpl.cpp	4 Dec 2005 01:21:09 -0000	1.85
  @@ -101,16 +101,12 @@
           QString url = khtml::parseURL(attr->value()).qstring();
           if (!url.isEmpty())
               addCSSImageProperty(attr, CSS_PROP_BACKGROUND_IMAGE, getDocument()->completeURL(url));
  -    } else if (attr->name() == marginwidthAttr) {
  +    } else if (attr->name() == marginwidthAttr || attr->name() == leftmarginAttr) {
           addCSSLength(attr, CSS_PROP_MARGIN_RIGHT, attr->value());
           addCSSLength(attr, CSS_PROP_MARGIN_LEFT, attr->value());
  -    } else if (attr->name() == leftmarginAttr) {
  -        addCSSLength(attr, CSS_PROP_MARGIN_LEFT, attr->value());
  -    } else if (attr->name() == marginheightAttr) {
  +    } else if (attr->name() == marginheightAttr || attr->name() == topmarginAttr) {
           addCSSLength(attr, CSS_PROP_MARGIN_BOTTOM, attr->value());
           addCSSLength(attr, CSS_PROP_MARGIN_TOP, attr->value());
  -    } else if (attr->name() == topmarginAttr) {
  -        addCSSLength(attr, CSS_PROP_MARGIN_TOP, attr->value());
       } else if (attr->name() == bgcolorAttr) {
           addCSSColor(attr, CSS_PROP_BACKGROUND_COLOR, attr->value());
       } else if (attr->name() == textAttr) {