[webkit-changes] cvs commit: SVGSupport/ksvg2/svg SVGUseElementImpl.cpp

[Eric]

eseidel     05/10/11 02:19:23

  Modified:    .        ChangeLog
               ksvg2/svg SVGUseElementImpl.cpp
  Log:
  Bug #: 5278
  Submitted by: Rob Buis  <rwlbuis at xs4all.nl>
  Reviewed by: eseidel
          Fix SVGSymbolElementImpl to not warn when inheriting viewbox.
          http://bugzilla.opendarwin.org/show_bug.cgi?id=5278
  
          * ksvg2/svg/SVGUseElementImpl.cpp:
          (SVGUseElementImpl::close):
  
  Revision  Changes    Path
  1.231     +10 -0     WebCore/ChangeLog
  
  Index: ChangeLog
  ===================================================================
  RCS file: /cvs/root/WebCore/ChangeLog,v
  retrieving revision 1.230
  retrieving revision 1.231
  diff -u -r1.230 -r1.231
  --- ChangeLog	11 Oct 2005 09:11:45 -0000	1.230
  +++ ChangeLog	11 Oct 2005 09:19:21 -0000	1.231
  @@ -1,3 +1,13 @@
  +2005-10-11  Rob Buis  <rwlbuis at xs4all.nl>>
  +
  +        Reviewed by eseidel.
  +
  +        Fix SVGSymbolElementImpl to not warn when inheriting viewbox.
  +        http://bugzilla.opendarwin.org/show_bug.cgi?id=5278
  +
  +        * ksvg2/svg/SVGUseElementImpl.cpp:
  +        (SVGUseElementImpl::close):
  +
   2005-10-11  Julien Palmas <julien.palmas at mac.com>>
   
           Reviewed by eseidel.
  
  
  
  1.9       +6 -3      SVGSupport/ksvg2/svg/SVGUseElementImpl.cpp
  
  Index: SVGUseElementImpl.cpp
  ===================================================================
  RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGUseElementImpl.cpp,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- SVGUseElementImpl.cpp	8 Oct 2005 09:18:15 -0000	1.8
  +++ SVGUseElementImpl.cpp	11 Oct 2005 09:19:23 -0000	1.9
  @@ -144,11 +144,14 @@
       if(target->id() == ID_SYMBOL)
       {
           SVGElementImpl *dummy = new SVGSVGElementImpl(docPtr(), ID_SVG, 0);
  -        dummy->setAttributeNS(KDOM::NS_SVG.handle(), KDOM::DOMString("width").handle(), KDOM::DOMString(w).handle());
  -        dummy->setAttributeNS(KDOM::NS_SVG.handle(), KDOM::DOMString("height").handle(), KDOM::DOMString(h).handle());
  +        if(_w > 0)
  +            dummy->setAttributeNS(KDOM::NS_SVG.handle(), KDOM::DOMString("width").handle(), KDOM::DOMString(w).handle());
  +        if(_h > 0)
  +            dummy->setAttributeNS(KDOM::NS_SVG.handle(), KDOM::DOMString("height").handle(), KDOM::DOMString(h).handle());
           
           SVGSymbolElementImpl *symbol = static_cast<SVGSymbolElementImpl *>(target);
  -        dummy->setAttributeNS(KDOM::NS_SVG.handle(), KDOM::DOMString("viewBox").handle(), symbol->getAttributeNS(KDOM::NS_SVG.handle(), KDOM::DOMString("viewBox").handle()));
  +        if(symbol->hasAttribute(new KDOM::DOMStringImpl("viewBox")))
  +            dummy->setAttributeNS(KDOM::NS_SVG.handle(), KDOM::DOMString("viewBox").handle(), symbol->getAttributeNS(KDOM::NS_SVG.handle(), KDOM::DOMString("viewBox").handle()));
           target->cloneChildNodes(dummy, docPtr());
   
           SVGElementImpl *dummy2 = new SVGDummyElementImpl(docPtr(), ID_G, 0);