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

List:       kde-commits
Subject:    branches/work/khtml-svg/svg
From:       Nikolas Zimmermann <wildfox () kde ! org>
Date:       2006-03-30 23:58:08
Message-ID: 1143763088.478057.17233.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 524706 by wildfox:

Oh I must have confused the logic while reading WebKit changes in the ksvg2/ parts
-> now RenderObject creation works again as it used to + display="none" really works


 M  +1 -1      SVGAElementImpl.h  
 M  +1 -1      SVGGElementImpl.h  
 M  +1 -1      SVGLineElementImpl.h  
 M  +1 -1      SVGPathElementImpl.h  
 M  +1 -1      SVGPolyElementImpl.h  
 M  +1 -1      SVGRectElementImpl.h  
 M  +1 -1      SVGSVGElementImpl.h  
 M  +1 -1      SVGStyledElementImpl.cpp  
 M  +4 -1      SVGStyledElementImpl.h  
 M  +1 -1      SVGSwitchElementImpl.h  


--- branches/work/khtml-svg/svg/SVGAElementImpl.h #524705:524706
@@ -55,7 +55,7 @@
         virtual void parseAttribute(DOM::AttributeImpl *attr);
 
         // Derived from: 'SVGStyledElementImpl'
-        virtual bool rendererIsNeeded(khtml::RenderStyle *style) { return \
SVGStyledElementImpl::rendererIsNeeded(style); } +        virtual bool \
rendererIsNeeded(khtml::RenderStyle *style) { return \
                SVGStyledElementImpl::checkIfRendererIsNeeded(style); }
         virtual khtml::RenderObject *createRenderer(khtml::RenderArena *arena, \
khtml::RenderStyle *style);  
         //virtual void defaultEventHandler(Event *evt);
--- branches/work/khtml-svg/svg/SVGGElementImpl.h #524705:524706
@@ -47,7 +47,7 @@
         // 'SVGGElement' functions
         virtual void parseAttribute(DOM::AttributeImpl *);
 
-        virtual bool rendererIsNeeded(khtml::RenderStyle *style) { return \
SVGStyledElementImpl::rendererIsNeeded(style); } +        virtual bool \
rendererIsNeeded(khtml::RenderStyle *style) { return \
                SVGStyledElementImpl::checkIfRendererIsNeeded(style); }
         virtual khtml::RenderObject *createRenderer(khtml::RenderArena *arena, \
khtml::RenderStyle *style);  };
 };
--- branches/work/khtml-svg/svg/SVGLineElementImpl.h #524705:524706
@@ -54,7 +54,7 @@
 
         virtual void parseAttribute(DOM::AttributeImpl *attr);
 
-        virtual bool rendererIsNeeded(khtml::RenderStyle *style) { return \
SVGStyledElementImpl::rendererIsNeeded(style); } +        virtual bool \
rendererIsNeeded(khtml::RenderStyle *style) { return \
SVGStyledElementImpl::checkIfRendererIsNeeded(style); }  virtual KCanvasPath \
*toPathData() const;  
         virtual const SVGStyledElementImpl *pushAttributeContext(const \
                SVGStyledElementImpl *context);
--- branches/work/khtml-svg/svg/SVGPathElementImpl.h #524705:524706
@@ -104,7 +104,7 @@
 
         virtual void parseAttribute(DOM::AttributeImpl *attr);
 
-        virtual bool rendererIsNeeded(khtml::RenderStyle *style) { return \
SVGStyledElementImpl::rendererIsNeeded(style); } +        virtual bool \
rendererIsNeeded(khtml::RenderStyle *style) { return \
SVGStyledElementImpl::checkIfRendererIsNeeded(style); }  virtual KCanvasPath \
*toPathData() const;  
     private:
--- branches/work/khtml-svg/svg/SVGPolyElementImpl.h #524705:524706
@@ -51,7 +51,7 @@
 
         virtual void parseAttribute(DOM::AttributeImpl *attr);
  
-		virtual bool rendererIsNeeded(khtml::RenderStyle *style) { return \
SVGStyledElementImpl::rendererIsNeeded(style); } +		virtual bool \
rendererIsNeeded(khtml::RenderStyle *style) { return \
SVGStyledElementImpl::checkIfRendererIsNeeded(style); }  
         virtual void notifyAttributeChange() const;
 
--- branches/work/khtml-svg/svg/SVGRectElementImpl.h #524705:524706
@@ -59,7 +59,7 @@
 
         virtual void parseAttribute(DOM::AttributeImpl *attr);
 
-        virtual bool rendererIsNeeded(khtml::RenderStyle *style) { return \
SVGStyledElementImpl::rendererIsNeeded(style); } +        virtual bool \
rendererIsNeeded(khtml::RenderStyle *style) { return \
SVGStyledElementImpl::checkIfRendererIsNeeded(style); }  virtual KCanvasPath \
*toPathData() const;  
         virtual const SVGStyledElementImpl *pushAttributeContext(const \
                SVGStyledElementImpl *context);
--- branches/work/khtml-svg/svg/SVGSVGElementImpl.h #524705:524706
@@ -127,7 +127,7 @@
         virtual SVGMatrixImpl *getScreenCTM() const;
         virtual SVGMatrixImpl *localMatrix() const;
 
-        virtual bool rendererIsNeeded(khtml::RenderStyle *style) { return \
SVGStyledElementImpl::rendererIsNeeded(style); } +        virtual bool \
rendererIsNeeded(khtml::RenderStyle *style) { return \
                SVGStyledElementImpl::checkIfRendererIsNeeded(style); }
         virtual khtml::RenderObject *createRenderer(khtml::RenderArena *arena, \
khtml::RenderStyle *style);  
         // 'virtual SVGZoomAndPan functions
--- branches/work/khtml-svg/svg/SVGStyledElementImpl.cpp #524705:524706
@@ -66,7 +66,7 @@
     return pa()->getPropertyCSSValue(name);
 }
 
-bool SVGStyledElementImpl::rendererIsNeeded(khtml::RenderStyle *style)
+bool SVGStyledElementImpl::checkIfRendererIsNeeded(khtml::RenderStyle *style) const
 {
     return (getDocument()->documentElement() == this) || (style->display() != \
khtml::NONE);  }
--- branches/work/khtml-svg/svg/SVGStyledElementImpl.h #524705:524706
@@ -54,7 +54,7 @@
         virtual DOM::CSSValueImpl *getPresentationAttribute(const DOM::DOMString \
&name);  
         // This needs to be implemented.
-        virtual bool rendererIsNeeded(khtml::RenderStyle *style);
+        virtual bool rendererIsNeeded(khtml::RenderStyle *style) { return false; }
         virtual KCanvasPath *toPathData() const { return 0; }
         virtual khtml::RenderObject *createRenderer(khtml::RenderArena *arena, \
khtml::RenderStyle *style);  virtual KCanvasResource *canvasResource() { return 0; }
@@ -71,6 +71,9 @@
 
         khtml::RenderCanvas *canvas() const;
 
+    protected:
+        bool checkIfRendererIsNeeded(khtml::RenderStyle *style) const;
+
     private:
         mutable RefPtr<DOM::CSSStyleDeclarationImpl> m_pa;
         mutable RefPtr<SVGAnimatedStringImpl> m_className;
--- branches/work/khtml-svg/svg/SVGSwitchElementImpl.h #524705:524706
@@ -45,7 +45,7 @@
         virtual bool isValid() const { return SVGTestsImpl::isValid(); }
 
         // Derived from: 'SVGStyledElementImpl'
-        virtual bool rendererIsNeeded(khtml::RenderStyle *style) { return \
SVGStyledElementImpl::rendererIsNeeded(style); } +        virtual bool \
rendererIsNeeded(khtml::RenderStyle *style) { return \
                SVGStyledElementImpl::checkIfRendererIsNeeded(style); }
         virtual bool childShouldCreateRenderer(DOM::NodeImpl *child) const;
 
         khtml::RenderObject *createRenderer(khtml::RenderArena *arena, \
khtml::RenderStyle *style);


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