[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/work/khtml-svg/svg
From:       Rob Buis <buis () kde ! org>
Date:       2006-03-26 16:48:58
Message-ID: 1143391738.608541.4570.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 522750 by buis:

Prevent crashes when having transform attribute on a svg tag.


 M  +0 -7      SVGStyledElementImpl.cpp  
 M  +2 -2      SVGTransformImpl.cpp  
 M  +4 -4      SVGTransformListImpl.cpp  


--- branches/work/khtml-svg/svg/SVGStyledElementImpl.cpp #522749:522750
@@ -86,7 +86,6 @@
 	return m_pa.get();
 }
 
-
 DOM::CSSValueImpl *SVGStyledElementImpl::getPresentationAttribute(const DOM::DOMString &name)
 {
     return pa()->getPropertyCSSValue(name);
@@ -250,13 +249,7 @@
 }
 
 /*
-KCanvasView *SVGStyledElementImpl::canvasView() const
-{
 
-    SVGDocumentImpl *doc = static_cast<SVGDocumentImpl *>(ownerDocument());
-    return doc ? doc->canvasView() : 0;
-}
-
 void SVGStyledElementImpl::updateCanvasItem()
 {
     if(!m_canvasItem || !m_updateVectorial)
--- branches/work/khtml-svg/svg/SVGTransformImpl.cpp #522749:522750
@@ -24,13 +24,13 @@
 
 #include "SVGMatrixImpl.h"
 #include "SVGTransformImpl.h"
-//#include "SVGSVGElementImpl.h"
+#include "SVGSVGElementImpl.h"
 
 using namespace KSVG;
 
 SVGTransformImpl::SVGTransformImpl() : khtml::Shared<SVGTransformImpl>()
 {
-    m_matrix = 0; /* FIXME SVGSVGElementImpl::createSVGMatrix(); */
+    m_matrix = SVGSVGElementImpl::createSVGMatrix();
 
     m_type = SVG_TRANSFORM_UNKNOWN;
     m_angle = 0;
--- branches/work/khtml-svg/svg/SVGTransformListImpl.cpp #522749:522750
@@ -22,7 +22,7 @@
 
 #include "SVGMatrixImpl.h"
 #include "SVGTransformImpl.h"
-// #include "SVGSVGElementImpl.h"
+#include "SVGSVGElementImpl.h"
 #include "SVGTransformListImpl.h"
 
 using namespace KSVG;
@@ -38,7 +38,7 @@
 
 SVGTransformImpl *SVGTransformListImpl::createSVGTransformFromMatrix(SVGMatrixImpl *matrix) const
 {
-    return 0; /* FIXME SVGSVGElementImpl::createSVGTransformFromMatrix(matrix); */
+    return SVGSVGElementImpl::createSVGTransformFromMatrix(matrix);
 }
 
 SVGTransformImpl *SVGTransformListImpl::consolidate()
@@ -64,8 +64,8 @@
     if(!length)
         return 0;
         
-    SVGTransformImpl *obj = 0; /* FIXME SVGSVGElementImpl::createSVGTransform(); */
-    SVGMatrixImpl *matrix = 0; /* FIXME SVGSVGElementImpl::createSVGMatrix(); */
+    SVGTransformImpl *obj = SVGSVGElementImpl::createSVGTransform();
+    SVGMatrixImpl *matrix = SVGSVGElementImpl::createSVGMatrix();
 
     int ignoreException;
     for(unsigned int i = 0; i < length; i++)
[prev in list] [next in list] [prev in thread] [next in thread]