[webkit-changes] cvs commit: SVGSupport/ksvg2/svg
SVGAElementImpl.cpp SVGAnimationElementImpl.cpp
SVGClipPathElementImpl.cpp SVGCursorElementImpl.cpp
SVGDOMImplementationImpl.cpp SVGDOMImplementationImpl.h
SVGDocumentImpl.cpp SVGDocumentImpl.h SVGElementImpl.h
SVGFEFloodElementImpl.cpp SVGGradientElementImpl.cpp
SVGStyleElementImpl.cpp SVGStyledElementImpl.cpp
SVGURIReferenceImpl.h SVGZoomAndPanImpl.h
Eric
eseidel at opensource.apple.com
Mon Dec 5 17:53:20 PST 2005
eseidel 05/12/05 17:53:19
Modified: . ChangeLog
ForwardingHeaders/kdom DOMString.h KDOMSettings.h kdom.h
ForwardingHeaders/kdom/cache KDOMCachedDocument.h
KDOMCachedImage.h KDOMCachedObject.h
KDOMCachedObjectClient.h KDOMCachedScript.h
KDOMLoader.h
ForwardingHeaders/kdom/core AttrImpl.h
DOMImplementationImpl.h DOMStringImpl.h
DocumentImpl.h ElementImpl.h NodeImpl.h
XMLElementImpl.h
ForwardingHeaders/kdom/css CSSPrimitiveValueImpl.h
CSSStyleRuleImpl.h CSSStyleSelector.h
CSSStyleSheetImpl.h CSSValueImpl.h KDOMCSSParser.h
RGBColorImpl.h
ForwardingHeaders/kdom/events UIEventImpl.h kdomevents.h
ForwardingHeaders/ksvg2 KSVGPart.h KSVGView.h
WebCore+SVG KDOMHeaders.h
WebCore.xcodeproj project.pbxproj
kcanvas KCanvasTreeDebug.cpp
kcanvas/device/quartz KCanvasItemQuartz.mm
khtml/rendering render_style.cpp render_style.h
ksvg2/css SVGCSSStyleSelector.cpp SVGRenderStyle.cpp
SVGRenderStyle.h SVGRenderStyleDefs.cpp
ksvg2/misc KCanvasRenderingStyle.h
ksvg2/svg SVGAElementImpl.cpp SVGAnimationElementImpl.cpp
SVGClipPathElementImpl.cpp SVGCursorElementImpl.cpp
SVGDOMImplementationImpl.cpp
SVGDOMImplementationImpl.h SVGDocumentImpl.cpp
SVGDocumentImpl.h SVGElementImpl.h
SVGFEFloodElementImpl.cpp
SVGGradientElementImpl.cpp SVGStyleElementImpl.cpp
SVGStyledElementImpl.cpp SVGURIReferenceImpl.h
SVGZoomAndPanImpl.h
Added: khtml/rendering DataRef.h
Removed: ForwardingHeaders/kdom/core CDFInterface.h
WebCore+SVG KDOMStubClasses.h kdomcss.h kdomls.h kdomrange.h
kdomtraversal.h
Log:
Bug #: 5942, 5943
Submitted by: eseidel
Reviewed by: darin
No test cases possible/necessary.
Removing unused ForwardingHeaders, as well as header cleanup in SVG
Fixed KSVG2 files to include proper KDOM headers.
Fixed KDOM forwarding headers to point to correct khtml headers.
Added DataRef.h to hold khtml::DataRef.
Made SVGRenderStyle a DataRef on RenderStyle.
(Landing two bugs at once as their project file changes intertwine)
http://bugzilla.opendarwin.org/show_bug.cgi?id=5942
http://bugzilla.opendarwin.org/show_bug.cgi?id=5943
* ForwardingHeaders/kdom/DOMString.h:
* ForwardingHeaders/kdom/KDOMSettings.h:
* ForwardingHeaders/kdom/cache/KDOMCachedDocument.h:
* ForwardingHeaders/kdom/cache/KDOMCachedImage.h:
* ForwardingHeaders/kdom/cache/KDOMCachedObject.h:
* ForwardingHeaders/kdom/cache/KDOMCachedObjectClient.h:
* ForwardingHeaders/kdom/cache/KDOMCachedScript.h:
* ForwardingHeaders/kdom/cache/KDOMLoader.h:
* ForwardingHeaders/kdom/core/AttrImpl.h:
* ForwardingHeaders/kdom/core/CDFInterface.h: Removed.
* ForwardingHeaders/kdom/core/DOMImplementationImpl.h:
* ForwardingHeaders/kdom/core/DOMStringImpl.h:
* ForwardingHeaders/kdom/core/DocumentImpl.h:
* ForwardingHeaders/kdom/core/ElementImpl.h:
* ForwardingHeaders/kdom/core/NodeImpl.h:
* ForwardingHeaders/kdom/core/XMLElementImpl.h:
* ForwardingHeaders/kdom/css/CSSPrimitiveValueImpl.h:
* ForwardingHeaders/kdom/css/CSSStyleRuleImpl.h:
* ForwardingHeaders/kdom/css/CSSStyleSelector.h:
* ForwardingHeaders/kdom/css/CSSStyleSheetImpl.h:
* ForwardingHeaders/kdom/css/CSSValueImpl.h:
* ForwardingHeaders/kdom/css/KDOMCSSParser.h:
* ForwardingHeaders/kdom/css/RGBColorImpl.h:
* ForwardingHeaders/kdom/events/UIEventImpl.h:
* ForwardingHeaders/kdom/events/kdomevents.h:
* ForwardingHeaders/kdom/kdom.h:
* ForwardingHeaders/ksvg2/KSVGPart.h:
* ForwardingHeaders/ksvg2/KSVGView.h:
* WebCore+SVG/KDOMHeaders.h:
* WebCore+SVG/KDOMStubClasses.h: Removed.
* WebCore+SVG/kdomcss.h: Removed.
* WebCore+SVG/kdomls.h: Removed.
* WebCore+SVG/kdomrange.h: Removed.
* WebCore+SVG/kdomtraversal.h: Removed.
* WebCore.xcodeproj/project.pbxproj:
* kcanvas/KCanvasTreeDebug.cpp:
(writeStyle):
* kcanvas/device/quartz/KCanvasItemQuartz.mm:
(KCanvasItemQuartz::drawMarkersIfNeeded):
* khtml/rendering/DataRef.h: Added.
(khtml::DataRef::DataRef):
(khtml::DataRef::~DataRef):
(khtml::DataRef::operator->):
(khtml::DataRef::get):
(khtml::DataRef::access):
(khtml::DataRef::init):
(khtml::DataRef::operator=):
(khtml::DataRef::operator == ):
(khtml::DataRef::operator != ):
* khtml/rendering/render_style.cpp:
(m_affectedByAttributeSelectors):
(RenderStyle::RenderStyle):
(RenderStyle::inheritFrom):
(RenderStyle::~RenderStyle):
(RenderStyle::operator==):
(RenderStyle::inheritedNotEqual):
(RenderStyle::diff):
* khtml/rendering/render_style.h:
(khtml::RenderStyle::svgStyle):
(khtml::RenderStyle::accessSVGStyle):
* ksvg2/css/SVGCSSStyleSelector.cpp:
(KDOM::CSSStyleSelector::applySVGProperty):
* ksvg2/css/SVGRenderStyle.cpp:
(SVGRenderStyle::SVGRenderStyle):
(SVGRenderStyle::inheritedNotEqual):
* ksvg2/css/SVGRenderStyle.h:
(KSVG::SVGRenderStyle::operator!=):
* ksvg2/css/SVGRenderStyleDefs.cpp:
* ksvg2/misc/KCanvasRenderingStyle.h:
* ksvg2/svg/SVGAElementImpl.cpp:
(SVGAElementImpl::defaultEventHandler):
* ksvg2/svg/SVGAnimationElementImpl.cpp:
* ksvg2/svg/SVGClipPathElementImpl.cpp:
* ksvg2/svg/SVGCursorElementImpl.cpp:
* ksvg2/svg/SVGDOMImplementationImpl.cpp:
* ksvg2/svg/SVGDOMImplementationImpl.h:
* ksvg2/svg/SVGDocumentImpl.cpp:
* ksvg2/svg/SVGDocumentImpl.h:
* ksvg2/svg/SVGElementImpl.h:
* ksvg2/svg/SVGFEFloodElementImpl.cpp:
(SVGFEFloodElementImpl::filterEffect):
* ksvg2/svg/SVGGradientElementImpl.cpp:
* ksvg2/svg/SVGStyleElementImpl.cpp:
* ksvg2/svg/SVGStyledElementImpl.cpp:
* ksvg2/svg/SVGURIReferenceImpl.h:
* ksvg2/svg/SVGZoomAndPanImpl.h:
Revision Changes Path
1.479 +103 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.478
retrieving revision 1.479
diff -u -r1.478 -r1.479
--- ChangeLog 6 Dec 2005 01:23:12 -0000 1.478
+++ ChangeLog 6 Dec 2005 01:52:59 -0000 1.479
@@ -1,5 +1,108 @@
2005-12-05 Eric Seidel <eseidel at apple.com>
+ Reviewed by darin.
+
+ No test cases possible/necessary.
+
+ Removing unused ForwardingHeaders, as well as header cleanup in SVG
+ Fixed KSVG2 files to include proper KDOM headers.
+ Fixed KDOM forwarding headers to point to correct khtml headers.
+ Added DataRef.h to hold khtml::DataRef.
+ Made SVGRenderStyle a DataRef on RenderStyle.
+ (Landing two bugs at once as their project file changes intertwine)
+
+ http://bugzilla.opendarwin.org/show_bug.cgi?id=5942
+ http://bugzilla.opendarwin.org/show_bug.cgi?id=5943
+
+ * ForwardingHeaders/kdom/DOMString.h:
+ * ForwardingHeaders/kdom/KDOMSettings.h:
+ * ForwardingHeaders/kdom/cache/KDOMCachedDocument.h:
+ * ForwardingHeaders/kdom/cache/KDOMCachedImage.h:
+ * ForwardingHeaders/kdom/cache/KDOMCachedObject.h:
+ * ForwardingHeaders/kdom/cache/KDOMCachedObjectClient.h:
+ * ForwardingHeaders/kdom/cache/KDOMCachedScript.h:
+ * ForwardingHeaders/kdom/cache/KDOMLoader.h:
+ * ForwardingHeaders/kdom/core/AttrImpl.h:
+ * ForwardingHeaders/kdom/core/CDFInterface.h: Removed.
+ * ForwardingHeaders/kdom/core/DOMImplementationImpl.h:
+ * ForwardingHeaders/kdom/core/DOMStringImpl.h:
+ * ForwardingHeaders/kdom/core/DocumentImpl.h:
+ * ForwardingHeaders/kdom/core/ElementImpl.h:
+ * ForwardingHeaders/kdom/core/NodeImpl.h:
+ * ForwardingHeaders/kdom/core/XMLElementImpl.h:
+ * ForwardingHeaders/kdom/css/CSSPrimitiveValueImpl.h:
+ * ForwardingHeaders/kdom/css/CSSStyleRuleImpl.h:
+ * ForwardingHeaders/kdom/css/CSSStyleSelector.h:
+ * ForwardingHeaders/kdom/css/CSSStyleSheetImpl.h:
+ * ForwardingHeaders/kdom/css/CSSValueImpl.h:
+ * ForwardingHeaders/kdom/css/KDOMCSSParser.h:
+ * ForwardingHeaders/kdom/css/RGBColorImpl.h:
+ * ForwardingHeaders/kdom/events/UIEventImpl.h:
+ * ForwardingHeaders/kdom/events/kdomevents.h:
+ * ForwardingHeaders/kdom/kdom.h:
+ * ForwardingHeaders/ksvg2/KSVGPart.h:
+ * ForwardingHeaders/ksvg2/KSVGView.h:
+ * WebCore+SVG/KDOMHeaders.h:
+ * WebCore+SVG/KDOMStubClasses.h: Removed.
+ * WebCore+SVG/kdomcss.h: Removed.
+ * WebCore+SVG/kdomls.h: Removed.
+ * WebCore+SVG/kdomrange.h: Removed.
+ * WebCore+SVG/kdomtraversal.h: Removed.
+ * WebCore.xcodeproj/project.pbxproj:
+ * kcanvas/KCanvasTreeDebug.cpp:
+ (writeStyle):
+ * kcanvas/device/quartz/KCanvasItemQuartz.mm:
+ (KCanvasItemQuartz::drawMarkersIfNeeded):
+ * khtml/rendering/DataRef.h: Added.
+ (khtml::DataRef::DataRef):
+ (khtml::DataRef::~DataRef):
+ (khtml::DataRef::operator->):
+ (khtml::DataRef::get):
+ (khtml::DataRef::access):
+ (khtml::DataRef::init):
+ (khtml::DataRef::operator=):
+ (khtml::DataRef::operator == ):
+ (khtml::DataRef::operator != ):
+ * khtml/rendering/render_style.cpp:
+ (m_affectedByAttributeSelectors):
+ (RenderStyle::RenderStyle):
+ (RenderStyle::inheritFrom):
+ (RenderStyle::~RenderStyle):
+ (RenderStyle::operator==):
+ (RenderStyle::inheritedNotEqual):
+ (RenderStyle::diff):
+ * khtml/rendering/render_style.h:
+ (khtml::RenderStyle::svgStyle):
+ (khtml::RenderStyle::accessSVGStyle):
+ * ksvg2/css/SVGCSSStyleSelector.cpp:
+ (KDOM::CSSStyleSelector::applySVGProperty):
+ * ksvg2/css/SVGRenderStyle.cpp:
+ (SVGRenderStyle::SVGRenderStyle):
+ (SVGRenderStyle::inheritedNotEqual):
+ * ksvg2/css/SVGRenderStyle.h:
+ (KSVG::SVGRenderStyle::operator!=):
+ * ksvg2/css/SVGRenderStyleDefs.cpp:
+ * ksvg2/misc/KCanvasRenderingStyle.h:
+ * ksvg2/svg/SVGAElementImpl.cpp:
+ (SVGAElementImpl::defaultEventHandler):
+ * ksvg2/svg/SVGAnimationElementImpl.cpp:
+ * ksvg2/svg/SVGClipPathElementImpl.cpp:
+ * ksvg2/svg/SVGCursorElementImpl.cpp:
+ * ksvg2/svg/SVGDOMImplementationImpl.cpp:
+ * ksvg2/svg/SVGDOMImplementationImpl.h:
+ * ksvg2/svg/SVGDocumentImpl.cpp:
+ * ksvg2/svg/SVGDocumentImpl.h:
+ * ksvg2/svg/SVGElementImpl.h:
+ * ksvg2/svg/SVGFEFloodElementImpl.cpp:
+ (SVGFEFloodElementImpl::filterEffect):
+ * ksvg2/svg/SVGGradientElementImpl.cpp:
+ * ksvg2/svg/SVGStyleElementImpl.cpp:
+ * ksvg2/svg/SVGStyledElementImpl.cpp:
+ * ksvg2/svg/SVGURIReferenceImpl.h:
+ * ksvg2/svg/SVGZoomAndPanImpl.h:
+
+2005-12-05 Eric Seidel <eseidel at apple.com>
+
Reviewed by timo.
5 test cases updated, no additional tests needed.
1.2 +1 -1 WebCore/ForwardingHeaders/kdom/DOMString.h
Index: DOMString.h
===================================================================
RCS file: /cvs/root/WebCore/ForwardingHeaders/kdom/DOMString.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DOMString.h 3 Nov 2005 10:27:06 -0000 1.1
+++ DOMString.h 6 Dec 2005 01:53:04 -0000 1.2
@@ -1 +1 @@
-#include "KDOMHeaders.h"
+#include "dom/dom_string.h"
1.2 +1 -1 WebCore/ForwardingHeaders/kdom/KDOMSettings.h
Index: KDOMSettings.h
===================================================================
RCS file: /cvs/root/WebCore/ForwardingHeaders/kdom/KDOMSettings.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- KDOMSettings.h 3 Nov 2005 10:27:07 -0000 1.1
+++ KDOMSettings.h 6 Dec 2005 01:53:04 -0000 1.2
@@ -1 +1 @@
-#include "KDOMHeaders.h"
+#include "WebCore+SVG/KDOMSettings.h"
1.2 +1 -1 WebCore/ForwardingHeaders/kdom/kdom.h
Index: kdom.h
===================================================================
RCS file: /cvs/root/WebCore/ForwardingHeaders/kdom/kdom.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdom.h 3 Nov 2005 10:27:07 -0000 1.1
+++ kdom.h 6 Dec 2005 01:53:04 -0000 1.2
@@ -1 +1 @@
-#include "KDOMHeaders.h"
+#include "WebCore+SVG/kdom.h"
1.2 +1 -1 WebCore/ForwardingHeaders/kdom/cache/KDOMCachedDocument.h
Index: KDOMCachedDocument.h
===================================================================
RCS file: /cvs/root/WebCore/ForwardingHeaders/kdom/cache/KDOMCachedDocument.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- KDOMCachedDocument.h 3 Nov 2005 10:27:08 -0000 1.1
+++ KDOMCachedDocument.h 6 Dec 2005 01:53:05 -0000 1.2
@@ -1 +1 @@
-#include "KDOMHeaders.h"
+#include "loader.h"
1.2 +1 -1 WebCore/ForwardingHeaders/kdom/cache/KDOMCachedImage.h
Index: KDOMCachedImage.h
===================================================================
RCS file: /cvs/root/WebCore/ForwardingHeaders/kdom/cache/KDOMCachedImage.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- KDOMCachedImage.h 3 Nov 2005 10:27:08 -0000 1.1
+++ KDOMCachedImage.h 6 Dec 2005 01:53:05 -0000 1.2
@@ -1 +1 @@
-#include "KDOMHeaders.h"
+#include "loader.h"
1.2 +1 -1 WebCore/ForwardingHeaders/kdom/cache/KDOMCachedObject.h
Index: KDOMCachedObject.h
===================================================================
RCS file: /cvs/root/WebCore/ForwardingHeaders/kdom/cache/KDOMCachedObject.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- KDOMCachedObject.h 3 Nov 2005 10:27:08 -0000 1.1
+++ KDOMCachedObject.h 6 Dec 2005 01:53:05 -0000 1.2
@@ -1 +1 @@
-#include "KDOMHeaders.h"
+#include "loader.h"
1.2 +1 -1 WebCore/ForwardingHeaders/kdom/cache/KDOMCachedObjectClient.h
Index: KDOMCachedObjectClient.h
===================================================================
RCS file: /cvs/root/WebCore/ForwardingHeaders/kdom/cache/KDOMCachedObjectClient.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- KDOMCachedObjectClient.h 3 Nov 2005 10:27:08 -0000 1.1
+++ KDOMCachedObjectClient.h 6 Dec 2005 01:53:05 -0000 1.2
@@ -1 +1 @@
-#include "KDOMHeaders.h"
+#include "loader_client.h"
1.2 +1 -1 WebCore/ForwardingHeaders/kdom/cache/KDOMCachedScript.h
Index: KDOMCachedScript.h
===================================================================
RCS file: /cvs/root/WebCore/ForwardingHeaders/kdom/cache/KDOMCachedScript.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- KDOMCachedScript.h 3 Nov 2005 10:27:08 -0000 1.1
+++ KDOMCachedScript.h 6 Dec 2005 01:53:05 -0000 1.2
@@ -1 +1 @@
-#include "KDOMHeaders.h"
+#include "loader.h"
1.2 +1 -1 WebCore/ForwardingHeaders/kdom/cache/KDOMLoader.h
Index: KDOMLoader.h
===================================================================
RCS file: /cvs/root/WebCore/ForwardingHeaders/kdom/cache/KDOMLoader.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- KDOMLoader.h 3 Nov 2005 10:27:08 -0000 1.1
+++ KDOMLoader.h 6 Dec 2005 01:53:05 -0000 1.2
@@ -1 +1 @@
-#include "KDOMHeaders.h"
+#include "loader.h"
1.2 +1 -1 WebCore/ForwardingHeaders/kdom/core/AttrImpl.h
Index: AttrImpl.h
===================================================================
RCS file: /cvs/root/WebCore/ForwardingHeaders/kdom/core/AttrImpl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AttrImpl.h 21 Nov 2005 08:29:05 -0000 1.1
+++ AttrImpl.h 6 Dec 2005 01:53:06 -0000 1.2
@@ -1 +1 @@
-#include "KDOMHeaders.h"
+#include "dom_elementimpl.h"
1.2 +1 -1 WebCore/ForwardingHeaders/kdom/core/DOMImplementationImpl.h
Index: DOMImplementationImpl.h
===================================================================
RCS file: /cvs/root/WebCore/ForwardingHeaders/kdom/core/DOMImplementationImpl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DOMImplementationImpl.h 21 Nov 2005 08:29:06 -0000 1.1
+++ DOMImplementationImpl.h 6 Dec 2005 01:53:06 -0000 1.2
@@ -1 +1 @@
-#include "KDOMHeaders.h"
+#include "dom_docimpl.h"
1.2 +1 -1 WebCore/ForwardingHeaders/kdom/core/DOMStringImpl.h
Index: DOMStringImpl.h
===================================================================
RCS file: /cvs/root/WebCore/ForwardingHeaders/kdom/core/DOMStringImpl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DOMStringImpl.h 21 Nov 2005 08:29:06 -0000 1.1
+++ DOMStringImpl.h 6 Dec 2005 01:53:06 -0000 1.2
@@ -1 +1 @@
-#include "KDOMHeaders.h"
+#include "dom_stringimpl.h"
1.2 +1 -1 WebCore/ForwardingHeaders/kdom/core/DocumentImpl.h
Index: DocumentImpl.h
===================================================================
RCS file: /cvs/root/WebCore/ForwardingHeaders/kdom/core/DocumentImpl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DocumentImpl.h 21 Nov 2005 08:29:06 -0000 1.1
+++ DocumentImpl.h 6 Dec 2005 01:53:06 -0000 1.2
@@ -1 +1 @@
-#include "KDOMHeaders.h"
+#include "dom_docimpl.h"
1.2 +1 -1 WebCore/ForwardingHeaders/kdom/core/ElementImpl.h
Index: ElementImpl.h
===================================================================
RCS file: /cvs/root/WebCore/ForwardingHeaders/kdom/core/ElementImpl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ElementImpl.h 21 Nov 2005 08:29:06 -0000 1.1
+++ ElementImpl.h 6 Dec 2005 01:53:06 -0000 1.2
@@ -1 +1 @@
-#include "KDOMHeaders.h"
+#include "dom_elementimpl.h"
1.2 +1 -1 WebCore/ForwardingHeaders/kdom/core/NodeImpl.h
Index: NodeImpl.h
===================================================================
RCS file: /cvs/root/WebCore/ForwardingHeaders/kdom/core/NodeImpl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- NodeImpl.h 21 Nov 2005 08:29:06 -0000 1.1
+++ NodeImpl.h 6 Dec 2005 01:53:06 -0000 1.2
@@ -1 +1 @@
-#include "KDOMHeaders.h"
+#include "dom_nodeimpl.h"
1.2 +1 -1 WebCore/ForwardingHeaders/kdom/core/XMLElementImpl.h
Index: XMLElementImpl.h
===================================================================
RCS file: /cvs/root/WebCore/ForwardingHeaders/kdom/core/XMLElementImpl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLElementImpl.h 21 Nov 2005 08:29:06 -0000 1.1
+++ XMLElementImpl.h 6 Dec 2005 01:53:06 -0000 1.2
@@ -1 +1 @@
-#include "KDOMHeaders.h"
+#include "dom_elementimpl.h"
1.2 +2 -1 WebCore/ForwardingHeaders/kdom/css/CSSPrimitiveValueImpl.h
Index: CSSPrimitiveValueImpl.h
===================================================================
RCS file: /cvs/root/WebCore/ForwardingHeaders/kdom/css/CSSPrimitiveValueImpl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CSSPrimitiveValueImpl.h 3 Nov 2005 10:27:09 -0000 1.1
+++ CSSPrimitiveValueImpl.h 6 Dec 2005 01:53:07 -0000 1.2
@@ -1 +1,2 @@
-#include "KDOMHeaders.h"
+#include "css_value.h"
+#include "css_valueimpl.h"
1.2 +2 -1 WebCore/ForwardingHeaders/kdom/css/CSSStyleRuleImpl.h
Index: CSSStyleRuleImpl.h
===================================================================
RCS file: /cvs/root/WebCore/ForwardingHeaders/kdom/css/CSSStyleRuleImpl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CSSStyleRuleImpl.h 3 Nov 2005 10:27:10 -0000 1.1
+++ CSSStyleRuleImpl.h 6 Dec 2005 01:53:07 -0000 1.2
@@ -1 +1,2 @@
-#include "KDOMHeaders.h"
+#include "css_rule.h"
+#include "css_ruleimpl.h"
1.2 +1 -1 WebCore/ForwardingHeaders/kdom/css/CSSStyleSelector.h
Index: CSSStyleSelector.h
===================================================================
RCS file: /cvs/root/WebCore/ForwardingHeaders/kdom/css/CSSStyleSelector.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CSSStyleSelector.h 3 Nov 2005 10:27:10 -0000 1.1
+++ CSSStyleSelector.h 6 Dec 2005 01:53:07 -0000 1.2
@@ -1 +1 @@
-#include "KDOMHeaders.h"
+#include "khtml/css/cssstyleselector.h"
1.2 +1 -1 WebCore/ForwardingHeaders/kdom/css/CSSStyleSheetImpl.h
Index: CSSStyleSheetImpl.h
===================================================================
RCS file: /cvs/root/WebCore/ForwardingHeaders/kdom/css/CSSStyleSheetImpl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CSSStyleSheetImpl.h 3 Nov 2005 10:27:10 -0000 1.1
+++ CSSStyleSheetImpl.h 6 Dec 2005 01:53:08 -0000 1.2
@@ -1 +1 @@
-#include "KDOMHeaders.h"
+#include "css_stylesheetimpl.h"
1.2 +1 -1 WebCore/ForwardingHeaders/kdom/css/CSSValueImpl.h
Index: CSSValueImpl.h
===================================================================
RCS file: /cvs/root/WebCore/ForwardingHeaders/kdom/css/CSSValueImpl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CSSValueImpl.h 3 Nov 2005 10:27:10 -0000 1.1
+++ CSSValueImpl.h 6 Dec 2005 01:53:08 -0000 1.2
@@ -1 +1 @@
-#include "KDOMHeaders.h"
+#include "css_valueimpl.h"
1.2 +1 -1 WebCore/ForwardingHeaders/kdom/css/KDOMCSSParser.h
Index: KDOMCSSParser.h
===================================================================
RCS file: /cvs/root/WebCore/ForwardingHeaders/kdom/css/KDOMCSSParser.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- KDOMCSSParser.h 3 Nov 2005 10:27:10 -0000 1.1
+++ KDOMCSSParser.h 6 Dec 2005 01:53:08 -0000 1.2
@@ -1 +1 @@
-#include "KDOMHeaders.h"
+#include "cssparser.h"
1.2 +1 -1 WebCore/ForwardingHeaders/kdom/css/RGBColorImpl.h
Index: RGBColorImpl.h
===================================================================
RCS file: /cvs/root/WebCore/ForwardingHeaders/kdom/css/RGBColorImpl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RGBColorImpl.h 3 Nov 2005 10:27:10 -0000 1.1
+++ RGBColorImpl.h 6 Dec 2005 01:53:08 -0000 1.2
@@ -1 +1 @@
-#include "KDOMHeaders.h"
+#include "WebCore+SVG/RGBColorImpl.h"
1.2 +1 -1 WebCore/ForwardingHeaders/kdom/events/UIEventImpl.h
Index: UIEventImpl.h
===================================================================
RCS file: /cvs/root/WebCore/ForwardingHeaders/kdom/events/UIEventImpl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UIEventImpl.h 3 Nov 2005 10:27:13 -0000 1.1
+++ UIEventImpl.h 6 Dec 2005 01:53:09 -0000 1.2
@@ -1 +1 @@
-#include "KDOMHeaders.h"
+#include "dom2_eventsimpl.h"
1.2 +1 -1 WebCore/ForwardingHeaders/kdom/events/kdomevents.h
Index: kdomevents.h
===================================================================
RCS file: /cvs/root/WebCore/ForwardingHeaders/kdom/events/kdomevents.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kdomevents.h 3 Nov 2005 10:27:13 -0000 1.1
+++ kdomevents.h 6 Dec 2005 01:53:09 -0000 1.2
@@ -1 +1 @@
-#include "KDOMHeaders.h"
+#include "WebCore+SVG/kdomevents.h"
1.3 +8 -1 WebCore/ForwardingHeaders/ksvg2/KSVGPart.h
Index: KSVGPart.h
===================================================================
RCS file: /cvs/root/WebCore/ForwardingHeaders/ksvg2/KSVGPart.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- KSVGPart.h 21 Nov 2005 04:01:49 -0000 1.2
+++ KSVGPart.h 6 Dec 2005 01:53:09 -0000 1.3
@@ -1 +1,8 @@
-#include "KDOMHeaders.h"
+#include "khtml/khtml_part.h"
+class KHTMLPart;
+namespace KDOM {
+ using ::KHTMLPart;
+}
+namespace KSVG {
+ using ::KHTMLPart;
+}
1.3 +5 -1 WebCore/ForwardingHeaders/ksvg2/KSVGView.h
Index: KSVGView.h
===================================================================
RCS file: /cvs/root/WebCore/ForwardingHeaders/ksvg2/KSVGView.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- KSVGView.h 21 Nov 2005 04:01:49 -0000 1.2
+++ KSVGView.h 6 Dec 2005 01:53:09 -0000 1.3
@@ -1 +1,5 @@
-#include "KDOMHeaders.h"
+#include "khtml/khtmlview.h"
+class KHTMLView;
+namespace KDOM {
+ using ::KHTMLView;
+}
1.5 +5 -73 SVGSupport/WebCore+SVG/KDOMHeaders.h
Index: KDOMHeaders.h
===================================================================
RCS file: /cvs/root/SVGSupport/WebCore+SVG/KDOMHeaders.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- KDOMHeaders.h 4 Dec 2005 13:08:19 -0000 1.4
+++ KDOMHeaders.h 6 Dec 2005 01:53:10 -0000 1.5
@@ -1,87 +1,19 @@
-#include "khtml/dom/dom_node.h"
-#include "khtml/dom/dom_string.h"
-#include "css_value.h"
-
-class KHTMLPart;
-class KHTMLView;
-
namespace khtml {
class StyleListImpl;
class RenderCanvas;
}
+namespace DOM {
+ class NodeImpl;
+}
+
namespace KDOM {
using namespace DOM;
using namespace khtml;
- using ::KHTMLPart;
- using ::KHTMLView;
typedef khtml::StyleListImpl CSSStyleSelectorList;
+ typedef NodeImpl EventTargetImpl;
}
-namespace KSVG {
- using ::KHTMLPart;
-}
-
-typedef khtml::RenderCanvas KCanvas;
-
-#include "KDOMStubClasses.h"
-
-#include "khtml/khtml_part.h"
-#include "khtml/css/css_base.h"
-#include "khtml/css/css_computedstyle.h"
-#include "khtml/css/css_ruleimpl.h"
-#include "khtml/css/css_stylesheetimpl.h"
-#include "khtml/css/css_valueimpl.h"
-#include "khtml/css/csshelper.h"
-#include "khtml/css/cssparser.h"
-#include "khtml/css/cssstyleselector.h"
-#include "khtml/dom/css_rule.h"
-#include "khtml/dom/css_stylesheet.h"
-#include "khtml/dom/css_value.h"
-#include "khtml/dom/dom2_events.h"
-#include "khtml/dom/dom2_range.h"
-#include "khtml/dom/dom2_traversal.h"
-#include "khtml/dom/dom_exception.h"
-#include "khtml/dom/dom_string.h"
-#include "khtml/khtml_events.h"
-#include "khtml/khtmlpart_p.h"
-#include "khtml/khtmlview.h"
-#include "khtml/misc/arena.h"
-#include "khtml/misc/decoder.h"
-#include "khtml/misc/helper.h"
-#include "khtml/misc/loader.h"
-#include "khtml/misc/loader_client.h"
#include "khtml/misc/shared.h"
-#include "khtml/misc/stringit.h"
-#include "khtml/rendering/render_object.h"
-#include "khtml/rendering/render_style.h"
-#include "khtml/rendering/render_canvas.h"
-#include "khtml/xml/dom2_eventsimpl.h"
-#include "khtml/xml/dom2_rangeimpl.h"
-#include "khtml/xml/dom2_traversalimpl.h"
-#include "khtml/xml/dom2_viewsimpl.h"
#include "khtml/xml/dom_atomicstring.h"
-#include "khtml/xml/dom_atomicstringlist.h"
-#include "khtml/xml/dom_docimpl.h"
-#include "khtml/xml/dom_elementimpl.h"
-#include "khtml/xml/dom_nodeimpl.h"
-#include "khtml/xml/dom_position.h"
#include "khtml/xml/dom_qname.h"
-#include "khtml/xml/dom_stringimpl.h"
-#include "khtml/xml/dom_textimpl.h"
-#include "khtml/xml/dom_xmlimpl.h"
-#include "khtml/xml/EventNames.h"
-#include "khtml/xml/xml_tokenizer.h"
-#include "khtml/xsl/xsl_stylesheetimpl.h"
-
-// All temporary:
-#include "WebCore+SVG/kdom.h"
-#include "WebCore+SVG/kdomevents.h"
-#include "WebCore+SVG/kdomcss.h"
-#include "WebCore+SVG/kdomrange.h"
-#include "WebCore+SVG/kdomtraversal.h"
-#include "WebCore+SVG/kdomls.h"
-#include "SVGNames.h"
-#include "WebCore+SVG/RGBColorImpl.h"
-#include "WebCore+SVG/KDOMSettings.h"
-
1.52 +0 -20 WebCore/WebCore.xcodeproj/project.pbxproj
Index: project.pbxproj
===================================================================
RCS file: /cvs/root/WebCore/WebCore.xcodeproj/project.pbxproj,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- project.pbxproj 6 Dec 2005 01:23:16 -0000 1.51
+++ project.pbxproj 6 Dec 2005 01:53:10 -0000 1.52
@@ -1220,17 +1220,12 @@
A884284709308C1C00B6D461 /* SVGNamesWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A884283809308C1C00B6D461 /* SVGNamesWrapper.cpp */; };
A884284809308C1C00B6D461 /* SVGElementFactoryWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A884283909308C1C00B6D461 /* SVGElementFactoryWrapper.cpp */; };
A884284909308C1C00B6D461 /* kdomevents.h in Headers */ = {isa = PBXBuildFile; fileRef = A884283A09308C1C00B6D461 /* kdomevents.h */; };
- A884284A09308C1C00B6D461 /* kdomcss.h in Headers */ = {isa = PBXBuildFile; fileRef = A884283B09308C1C00B6D461 /* kdomcss.h */; };
A884284B09308C1C00B6D461 /* kdom.h in Headers */ = {isa = PBXBuildFile; fileRef = A884283C09308C1C00B6D461 /* kdom.h */; };
A884284C09308C1C00B6D461 /* DOMList.h in Headers */ = {isa = PBXBuildFile; fileRef = A884283D09308C1C00B6D461 /* DOMList.h */; };
A884284D09308C1C00B6D461 /* RGBColorImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = A884283E09308C1C00B6D461 /* RGBColorImpl.h */; };
A884284E09308C1C00B6D461 /* RGBColorImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A884283F09308C1C00B6D461 /* RGBColorImpl.cpp */; };
A884284F09308C1C00B6D461 /* Namespace.h in Headers */ = {isa = PBXBuildFile; fileRef = A884284009308C1C00B6D461 /* Namespace.h */; };
- A884285009308C1C00B6D461 /* kdomtraversal.h in Headers */ = {isa = PBXBuildFile; fileRef = A884284109308C1C00B6D461 /* kdomtraversal.h */; };
- A884285109308C1C00B6D461 /* KDOMStubClasses.h in Headers */ = {isa = PBXBuildFile; fileRef = A884284209308C1C00B6D461 /* KDOMStubClasses.h */; };
A884285209308C1C00B6D461 /* KDOMSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = A884284309308C1C00B6D461 /* KDOMSettings.h */; };
- A884285309308C1C00B6D461 /* kdomrange.h in Headers */ = {isa = PBXBuildFile; fileRef = A884284409308C1C00B6D461 /* kdomrange.h */; };
- A884285409308C1C00B6D461 /* kdomls.h in Headers */ = {isa = PBXBuildFile; fileRef = A884284509308C1C00B6D461 /* kdomls.h */; };
A884285509308C1C00B6D461 /* KDOMHeaders.h in Headers */ = {isa = PBXBuildFile; fileRef = A884284609308C1C00B6D461 /* KDOMHeaders.h */; };
A890DF1F0930974800513F88 /* SVGStyledTransformableElementImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = A890DF1B0930974800513F88 /* SVGStyledTransformableElementImpl.h */; };
A890DF200930974800513F88 /* SVGStyledTransformableElementImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A890DF1C0930974800513F88 /* SVGStyledTransformableElementImpl.cpp */; };
@@ -2200,17 +2195,12 @@
A884283809308C1C00B6D461 /* SVGNamesWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGNamesWrapper.cpp; sourceTree = "<group>"; };
A884283909308C1C00B6D461 /* SVGElementFactoryWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGElementFactoryWrapper.cpp; sourceTree = "<group>"; };
A884283A09308C1C00B6D461 /* kdomevents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kdomevents.h; sourceTree = "<group>"; };
- A884283B09308C1C00B6D461 /* kdomcss.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kdomcss.h; sourceTree = "<group>"; };
A884283C09308C1C00B6D461 /* kdom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kdom.h; sourceTree = "<group>"; };
A884283D09308C1C00B6D461 /* DOMList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DOMList.h; sourceTree = "<group>"; };
A884283E09308C1C00B6D461 /* RGBColorImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RGBColorImpl.h; sourceTree = "<group>"; };
A884283F09308C1C00B6D461 /* RGBColorImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RGBColorImpl.cpp; sourceTree = "<group>"; };
A884284009308C1C00B6D461 /* Namespace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Namespace.h; sourceTree = "<group>"; };
- A884284109308C1C00B6D461 /* kdomtraversal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kdomtraversal.h; sourceTree = "<group>"; };
- A884284209308C1C00B6D461 /* KDOMStubClasses.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KDOMStubClasses.h; sourceTree = "<group>"; };
A884284309308C1C00B6D461 /* KDOMSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KDOMSettings.h; sourceTree = "<group>"; };
- A884284409308C1C00B6D461 /* kdomrange.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kdomrange.h; sourceTree = "<group>"; };
- A884284509308C1C00B6D461 /* kdomls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = kdomls.h; sourceTree = "<group>"; };
A884284609308C1C00B6D461 /* KDOMHeaders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KDOMHeaders.h; sourceTree = "<group>"; };
A890DF1B0930974800513F88 /* SVGStyledTransformableElementImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SVGStyledTransformableElementImpl.h; sourceTree = "<group>"; };
A890DF1C0930974800513F88 /* SVGStyledTransformableElementImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SVGStyledTransformableElementImpl.cpp; sourceTree = "<group>"; };
@@ -3564,7 +3554,6 @@
A88427FC093081AD00B6D461 /* KDOM Support */ = {
isa = PBXGroup;
children = (
- A884284209308C1C00B6D461 /* KDOMStubClasses.h */,
A884284609308C1C00B6D461 /* KDOMHeaders.h */,
A884283809308C1C00B6D461 /* SVGNamesWrapper.cpp */,
A8C32D96093D8EA4000B9CAC /* XLinkNamesWrapper.cpp */,
@@ -3575,11 +3564,7 @@
A884283D09308C1C00B6D461 /* DOMList.h */,
A884284309308C1C00B6D461 /* KDOMSettings.h */,
A884283A09308C1C00B6D461 /* kdomevents.h */,
- A884283B09308C1C00B6D461 /* kdomcss.h */,
A884283C09308C1C00B6D461 /* kdom.h */,
- A884284109308C1C00B6D461 /* kdomtraversal.h */,
- A884284409308C1C00B6D461 /* kdomrange.h */,
- A884284509308C1C00B6D461 /* kdomls.h */,
);
name = "KDOM Support";
sourceTree = "<group>";
@@ -5644,16 +5629,11 @@
A8BA5C72090CB07A004D1180 /* render_button.h in Headers */,
A83C81A1091189B9009BF4A7 /* XSLTProcessor.h in Headers */,
A884284909308C1C00B6D461 /* kdomevents.h in Headers */,
- A884284A09308C1C00B6D461 /* kdomcss.h in Headers */,
A884284B09308C1C00B6D461 /* kdom.h in Headers */,
A884284C09308C1C00B6D461 /* DOMList.h in Headers */,
A884284D09308C1C00B6D461 /* RGBColorImpl.h in Headers */,
A884284F09308C1C00B6D461 /* Namespace.h in Headers */,
- A884285009308C1C00B6D461 /* kdomtraversal.h in Headers */,
- A884285109308C1C00B6D461 /* KDOMStubClasses.h in Headers */,
A884285209308C1C00B6D461 /* KDOMSettings.h in Headers */,
- A884285309308C1C00B6D461 /* kdomrange.h in Headers */,
- A884285409308C1C00B6D461 /* kdomls.h in Headers */,
A884285509308C1C00B6D461 /* KDOMHeaders.h in Headers */,
A890DF1F0930974800513F88 /* SVGStyledTransformableElementImpl.h in Headers */,
A890DF210930974800513F88 /* SVGStyledLocatableElementImpl.h in Headers */,
1.12 +1 -1 SVGSupport/kcanvas/KCanvasTreeDebug.cpp
Index: KCanvasTreeDebug.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/kcanvas/KCanvasTreeDebug.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- KCanvasTreeDebug.cpp 28 Nov 2005 23:33:58 -0000 1.11
+++ KCanvasTreeDebug.cpp 6 Dec 2005 01:53:12 -0000 1.12
@@ -219,7 +219,7 @@
static void writeStyle(QTextStream &ts, const khtml::RenderObject &object)
{
khtml::RenderStyle *style = object.style();
- SVGRenderStyle *svgStyle = style->svgStyle();
+ const SVGRenderStyle *svgStyle = style->svgStyle();
if (!object.localTransform().isIdentity())
ts << " [transform=" << object.localTransform() << "]";
1.15 +1 -1 SVGSupport/kcanvas/device/quartz/KCanvasItemQuartz.mm
Index: KCanvasItemQuartz.mm
===================================================================
RCS file: /cvs/root/SVGSupport/kcanvas/device/quartz/KCanvasItemQuartz.mm,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- KCanvasItemQuartz.mm 6 Dec 2005 01:23:21 -0000 1.14
+++ KCanvasItemQuartz.mm 6 Dec 2005 01:53:12 -0000 1.15
@@ -161,7 +161,7 @@
void KCanvasItemQuartz::drawMarkersIfNeeded(const QRect &rect, CGPathRef path) const
{
KDOM::DocumentImpl *doc = document();
- KSVG::SVGRenderStyle *svgStyle = style()->svgStyle();
+ const KSVG::SVGRenderStyle *svgStyle = style()->svgStyle();
KCanvasMarker *startMarker = getMarkerById(doc, svgStyle->startMarker().mid(1));
KCanvasMarker *midMarker = getMarkerById(doc, svgStyle->midMarker().mid(1));
1.78 +9 -11 WebCore/khtml/rendering/render_style.cpp
Index: render_style.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_style.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- render_style.cpp 29 Nov 2005 11:20:46 -0000 1.77
+++ render_style.cpp 6 Dec 2005 01:53:13 -0000 1.78
@@ -2,7 +2,7 @@
* This file is part of the DOM implementation for KDE.
*
* Copyright (C) 1999 Antti Koivisto (koivisto at kde.org)
- * Copyright (C) 2004 Apple Computer, Inc.
+ * Copyright (C) 2004, 2005 Apple Computer, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -530,7 +530,7 @@
inherited = _default->inherited;
#if SVG_SUPPORT
- m_svgStyle = new KSVG::SVGRenderStyle();
+ m_svgStyle = _default->m_svgStyle;
#endif
setBitDefaults();
@@ -555,7 +555,7 @@
inherited.init();
#if SVG_SUPPORT
- m_svgStyle = new KSVG::SVGRenderStyle(true);
+ m_svgStyle.init();
#endif
pseudoStyle = 0;
@@ -571,7 +571,7 @@
m_affectedByAttributeSelectors(false)
{
#if SVG_SUPPORT
- m_svgStyle = new KSVG::SVGRenderStyle(*o.svgStyle());
+ m_svgStyle = o.m_svgStyle;
#endif
m_ref = 0;
}
@@ -582,15 +582,13 @@
inherited = inheritParent->inherited;
inherited_flags = inheritParent->inherited_flags;
#if SVG_SUPPORT
- svgStyle()->inheritFrom(inheritParent->svgStyle());
+ if (m_svgStyle != inheritParent->m_svgStyle)
+ m_svgStyle.access()->inheritFrom(inheritParent->m_svgStyle.get());
#endif
}
RenderStyle::~RenderStyle()
{
-#if SVG_SUPPORT
- delete m_svgStyle;
-#endif
}
bool RenderStyle::operator==(const RenderStyle& o) const
@@ -606,7 +604,7 @@
css3InheritedData == o.css3InheritedData &&
inherited == o.inherited
#if SVG_SUPPORT
- && *svgStyle() == *o.svgStyle()
+ && m_svgStyle == o.m_svgStyle
#endif
);
}
@@ -680,7 +678,7 @@
return inherited_flags != other->inherited_flags ||
inherited != other->inherited ||
#if SVG_SUPPORT
- svgStyle()->inheritedNotEqual(other->svgStyle()) ||
+ m_svgStyle->inheritedNotEqual(other->m_svgStyle.get()) ||
#endif
css3InheritedData != other->css3InheritedData;
}
@@ -706,7 +704,7 @@
// This is horribly inefficient. Eventually we'll have to integrate
// this more directly by caling: Diff svgDiff = svgStyle->diff(other)
// and then checking svgDiff and returning from the appropraite places below.
- if (!(*svgStyle() == *(other->svgStyle())))
+ if (m_svgStyle != other->m_svgStyle)
return Layout;
#endif
1.100 +9 -109 WebCore/khtml/rendering/render_style.h
Index: render_style.h
===================================================================
RCS file: /cvs/root/WebCore/khtml/rendering/render_style.h,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- render_style.h 21 Nov 2005 04:01:56 -0000 1.99
+++ render_style.h 6 Dec 2005 01:53:13 -0000 1.100
@@ -4,7 +4,7 @@
* Copyright (C) 2000 Lars Knoll (knoll at kde.org)
* (C) 2000 Antti Koivisto (koivisto at kde.org)
* (C) 2000 Dirk Mueller (mueller at kde.org)
- * Copyright (C) 2003 Apple Computer, Inc.
+ * Copyright (C) 2003, 2005 Apple Computer, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
@@ -44,6 +44,11 @@
#include "misc/khtmllayout.h"
#include "misc/shared.h"
#include "rendering/font.h"
+#include "DataRef.h"
+
+#if SVG_SUPPORT
+#include "SVGRenderStyle.h"
+#endif
#include <assert.h>
@@ -58,89 +63,11 @@
class ShadowValueImpl;
}
-#if SVG_SUPPORT
-namespace KSVG {
- class SVGRenderStyle;
-}
-#endif
-
namespace khtml {
class CachedImage;
class CachedObject;
-template <class DATA>
-class DataRef
-{
-public:
-
- DataRef()
- {
- data=0;
- }
- DataRef( const DataRef<DATA> &d )
- {
- data = d.data;
- data->ref();
- }
-
- ~DataRef()
- {
- if(data) data->deref();
- }
-
- const DATA* operator->() const
- {
- return data;
- }
-
- const DATA* get() const
- {
- return data;
- }
-
-
- DATA* access()
- {
- if (!data->hasOneRef())
- {
- data->deref();
- data = new DATA(*data);
- data->ref();
- }
- return data;
- }
-
- void init()
- {
- data = new DATA;
- data->ref();
- }
-
- DataRef<DATA>& operator=(const DataRef<DATA>& d)
- {
- if (data==d.data)
- return *this;
- if (data)
- data->deref();
- data = d.data;
-
- data->ref();
-
- return *this;
- }
-
- bool operator == ( const DataRef<DATA> &o ) const {
- return (*data == *(o.data) );
- }
- bool operator != ( const DataRef<DATA> &o ) const {
- return (*data != *(o.data) );
- }
-
-private:
- DATA* data;
-};
-
enum PseudoState { PseudoUnknown, PseudoNone, PseudoAnyLink, PseudoLink, PseudoVisited};
//------------------------------------------------
@@ -951,33 +878,6 @@
TABLE_CAPTION, BOX, INLINE_BOX, NONE
};
-#if SVG_SUPPORT
-
-// Helper macros for SVG's 'RenderStyle' properties
-#define RS_DEFINE_ATTRIBUTE(Data, Type, Name, Initial) \
- void set##Type(Data val) { noninherited_flags.f._##Name = val; } \
- Data Name() const { return (Data) noninherited_flags.f._##Name; } \
- static Data initial##Type() { return Initial; }
-
-#define RS_DEFINE_ATTRIBUTE_INHERITED(Data, Type, Name, Initial) \
- void set##Type(Data val) { inherited_flags.f._##Name = val; } \
- Data Name() const { return (Data) inherited_flags.f._##Name; } \
- static Data initial##Type() { return Initial; }
-
-#define RS_DEFINE_ATTRIBUTE_DATAREF(Data, Group, Variable, Type, Name) \
- Data Name() const { return Group->Variable; } \
- void set##Type(Data obj) { RS_SET_VARIABLE(Group, Variable, obj) }
-
-#define RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(Data, Group, Variable, Type, Name, Initial) \
- RS_DEFINE_ATTRIBUTE_DATAREF(Data, Group, Variable, Type, Name) \
- static Data initial##Type() { return Initial; }
-
-#define RS_SET_VARIABLE(Group, Variable, Value) \
- if(!(Group->Variable == Value)) \
- Group.access()->Variable = Value;
-
-#endif
-
class RenderStyle
{
friend class CSSStyleSelector;
@@ -1127,7 +1027,7 @@
int m_ref;
#if SVG_SUPPORT
- KSVG::SVGRenderStyle *m_svgStyle;
+ DataRef<KSVG::SVGRenderStyle> m_svgStyle;
#endif
// !END SYNC!
@@ -1650,9 +1550,9 @@
void setLineClamp(int c) { SET_VAR(css3NonInheritedData, lineClamp, c); }
void setTextSizeAdjust(bool b) { SET_VAR(css3InheritedData, textSizeAdjust, b); }
-
#if SVG_SUPPORT
- KSVG::SVGRenderStyle *svgStyle() const { return m_svgStyle; }
+ const KSVG::SVGRenderStyle* svgStyle() const { return m_svgStyle.get(); }
+ KSVG::SVGRenderStyle* accessSVGStyle() { return m_svgStyle.access(); }
#endif
ContentData* contentData() { return content; }
1.1 WebCore/khtml/rendering/DataRef.h
Index: DataRef.h
===================================================================
/*
* This file is part of the DOM implementation for KDE.
*
* Copyright (C) 2000 Lars Knoll (knoll at kde.org)
* (C) 2000 Antti Koivisto (koivisto at kde.org)
* (C) 2000 Dirk Mueller (mueller at kde.org)
* Copyright (C) 2003, 2005 Apple Computer, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public License
* along with this library; see the file COPYING.LIB. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*
*/
#ifndef KHTML_DataRef_H
#define KHTML_DataRef_H
namespace khtml {
template <class DATA>
class DataRef
{
public:
DataRef() : m_data(0) { }
DataRef(const DataRef<DATA>& d)
{
m_data = d.m_data;
m_data->ref();
}
~DataRef()
{
if(m_data)
m_data->deref();
}
const DATA* operator->() const
{
return m_data;
}
const DATA* get() const
{
return m_data;
}
DATA* access()
{
if (!m_data->hasOneRef()) {
m_data->deref();
m_data = new DATA(*m_data);
m_data->ref();
}
return m_data;
}
void init()
{
m_data = new DATA;
m_data->ref();
}
DataRef<DATA>& operator=(const DataRef<DATA>& d)
{
if (m_data == d.m_data)
return *this;
if (m_data)
m_data->deref();
m_data = d.m_data;
m_data->ref();
return *this;
}
bool operator == (const DataRef<DATA>& o) const
{
return (*m_data == *(o.m_data));
}
bool operator != (const DataRef<DATA>& o) const
{
return (*m_data != *(o.m_data));
}
private:
DATA* m_data;
};
};
#endif
1.11 +1 -1 SVGSupport/ksvg2/css/SVGCSSStyleSelector.cpp
Index: SVGCSSStyleSelector.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/css/SVGCSSStyleSelector.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SVGCSSStyleSelector.cpp 21 Nov 2005 11:59:58 -0000 1.10
+++ SVGCSSStyleSelector.cpp 6 Dec 2005 01:53:14 -0000 1.11
@@ -94,7 +94,7 @@
primitiveValue = static_cast<KDOM::CSSPrimitiveValueImpl *>(value);
KDOM::Length l;
- SVGRenderStyle *svgstyle = style->svgStyle();
+ SVGRenderStyle *svgstyle = style->accessSVGStyle();
unsigned short valueType = value->cssValueType();
1.8 +2 -2 SVGSupport/ksvg2/css/SVGRenderStyle.cpp
Index: SVGRenderStyle.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/css/SVGRenderStyle.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SVGRenderStyle.cpp 29 Nov 2005 11:20:47 -0000 1.7
+++ SVGRenderStyle.cpp 6 Dec 2005 01:53:14 -0000 1.8
@@ -60,7 +60,7 @@
markers.init();
}
-SVGRenderStyle::SVGRenderStyle(const SVGRenderStyle &other)
+SVGRenderStyle::SVGRenderStyle(const SVGRenderStyle &other) : khtml::Shared<SVGRenderStyle>()
{
fill = other.fill;
stroke = other.stroke;
@@ -86,7 +86,7 @@
svg_noninherited_flags == o.svg_noninherited_flags);
}
-bool SVGRenderStyle::inheritedNotEqual(SVGRenderStyle *other) const
+bool SVGRenderStyle::inheritedNotEqual(const SVGRenderStyle *other) const
{
return (fill != other->fill || stroke != other->stroke ||
stops != other->stops || misc != other->misc ||
1.7 +34 -3 SVGSupport/ksvg2/css/SVGRenderStyle.h
Index: SVGRenderStyle.h
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/css/SVGRenderStyle.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SVGRenderStyle.h 29 Nov 2005 11:20:47 -0000 1.6
+++ SVGRenderStyle.h 6 Dec 2005 01:53:14 -0000 1.7
@@ -25,13 +25,43 @@
#include <qrect.h>
+#include "misc/shared.h"
+#include "DataRef.h"
+
+// KSVG compatibility: Allow us to use KDOM:: as though it were khtml::
+namespace KDOM {
+ using namespace khtml;
+};
+
#include <ksvg2/svg/SVGPaintImpl.h>
-#include <kdom/css/RenderStyle.h>
#include <ksvg2/css/SVGRenderStyleDefs.h>
+// Helper macros for SVG's 'RenderStyle' properties
+#define RS_DEFINE_ATTRIBUTE(Data, Type, Name, Initial) \
+ void set##Type(Data val) { noninherited_flags.f._##Name = val; } \
+ Data Name() const { return (Data) noninherited_flags.f._##Name; } \
+ static Data initial##Type() { return Initial; }
+
+#define RS_DEFINE_ATTRIBUTE_INHERITED(Data, Type, Name, Initial) \
+ void set##Type(Data val) { inherited_flags.f._##Name = val; } \
+ Data Name() const { return (Data) inherited_flags.f._##Name; } \
+ static Data initial##Type() { return Initial; }
+
+#define RS_DEFINE_ATTRIBUTE_DATAREF(Data, Group, Variable, Type, Name) \
+ Data Name() const { return Group->Variable; } \
+ void set##Type(Data obj) { RS_SET_VARIABLE(Group, Variable, obj) }
+
+#define RS_DEFINE_ATTRIBUTE_DATAREF_WITH_INITIAL(Data, Group, Variable, Type, Name, Initial) \
+ RS_DEFINE_ATTRIBUTE_DATAREF(Data, Group, Variable, Type, Name) \
+ static Data initial##Type() { return Initial; }
+
+#define RS_SET_VARIABLE(Group, Variable, Value) \
+ if(!(Group->Variable == Value)) \
+ Group.access()->Variable = Value;
+
namespace KSVG
{
- class SVGRenderStyle
+ class SVGRenderStyle : public KDOM::Shared<SVGRenderStyle>
{
public:
SVGRenderStyle();
@@ -39,11 +69,12 @@
SVGRenderStyle(const SVGRenderStyle &other);
~SVGRenderStyle();
- bool inheritedNotEqual(SVGRenderStyle *other) const;
+ bool inheritedNotEqual(const SVGRenderStyle *other) const;
void inheritFrom(const SVGRenderStyle *inheritParent);
bool operator==(const SVGRenderStyle& o) const;
+ bool operator!=(const SVGRenderStyle& o) const { return !(*this == o); }
// SVG CSS Properties
SVG_RS_DEFINE_ATTRIBUTE(EAlignmentBaseline, AlignmentBaseline, alignmentBaseline, AB_AUTO)
1.8 +1 -0 SVGSupport/ksvg2/css/SVGRenderStyleDefs.cpp
Index: SVGRenderStyleDefs.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/css/SVGRenderStyleDefs.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- SVGRenderStyleDefs.cpp 21 Nov 2005 08:29:28 -0000 1.7
+++ SVGRenderStyleDefs.cpp 6 Dec 2005 01:53:14 -0000 1.8
@@ -28,6 +28,7 @@
#include "config.h"
#include "ksvg.h"
+#include "render_style.h"
#include "SVGRenderStyle.h"
#include "SVGRenderStyleDefs.h"
1.9 +2 -0 SVGSupport/ksvg2/misc/KCanvasRenderingStyle.h
Index: KCanvasRenderingStyle.h
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/misc/KCanvasRenderingStyle.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- KCanvasRenderingStyle.h 29 Nov 2005 02:03:56 -0000 1.8
+++ KCanvasRenderingStyle.h 6 Dec 2005 01:53:15 -0000 1.9
@@ -23,6 +23,8 @@
#ifndef KSVG_KCanvasRenderingStyle_H
#define KSVG_KCanvasRenderingStyle_H
+#include <qvaluelist.h>
+
#include <kdom/css/CSSPrimitiveValueImpl.h>
#include <kcanvas/KCanvasMatrix.h>
1.10 +3 -1 SVGSupport/ksvg2/svg/SVGAElementImpl.cpp
Index: SVGAElementImpl.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGAElementImpl.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- SVGAElementImpl.cpp 27 Nov 2005 11:02:21 -0000 1.9
+++ SVGAElementImpl.cpp 6 Dec 2005 01:53:15 -0000 1.10
@@ -25,11 +25,13 @@
#include <kdom/events/MouseEventImpl.h>
#include <kdom/events/kdomevents.h>
#include <kdom/Helper.h>
+#include "csshelper.h"
#include <kcanvas/KCanvasCreator.h>
#include <kcanvas/KCanvasContainer.h>
#include <kcanvas/device/KRenderingDevice.h>
+#include "EventNames.h"
#include "SVGNames.h"
#include "SVGHelper.h"
#include <ksvg2/KSVGPart.h>
@@ -91,7 +93,7 @@
return;
}
#if APPLE_CHANGES
- url = KDOM::parseURL(href()->baseVal()).qstring();
+ url = khtml::parseURL(href()->baseVal()).qstring();
#else
url = KDOM::DOMString(KDOM::Helper::parseURL(href()->baseVal())).qstring();
#endif
1.14 +1 -0 SVGSupport/ksvg2/svg/SVGAnimationElementImpl.cpp
Index: SVGAnimationElementImpl.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGAnimationElementImpl.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- SVGAnimationElementImpl.cpp 3 Dec 2005 01:32:32 -0000 1.13
+++ SVGAnimationElementImpl.cpp 6 Dec 2005 01:53:15 -0000 1.14
@@ -25,6 +25,7 @@
#include <kdom/kdom.h>
#include <kdom/core/AttrImpl.h>
+#include <kdom/core/DocumentImpl.h>
#include <kdom/core/DOMImplementationImpl.h>
#include <kdom/css/CSSStyleDeclarationImpl.h>
#include <kdom/DOMString.h>
1.13 +1 -0 SVGSupport/ksvg2/svg/SVGClipPathElementImpl.cpp
Index: SVGClipPathElementImpl.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGClipPathElementImpl.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SVGClipPathElementImpl.cpp 6 Dec 2005 01:23:23 -0000 1.12
+++ SVGClipPathElementImpl.cpp 6 Dec 2005 01:53:15 -0000 1.13
@@ -26,6 +26,7 @@
#include <kcanvas/KCanvas.h>
#include <kcanvas/KCanvasPath.h>
#include <kcanvas/device/KRenderingDevice.h>
+#include <kdom/css/CSSStyleSelector.h>
#include "ksvg.h"
#include "SVGNames.h"
1.5 +1 -0 SVGSupport/ksvg2/svg/SVGCursorElementImpl.cpp
Index: SVGCursorElementImpl.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGCursorElementImpl.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SVGCursorElementImpl.cpp 26 Nov 2005 22:19:06 -0000 1.4
+++ SVGCursorElementImpl.cpp 6 Dec 2005 01:53:15 -0000 1.5
@@ -22,6 +22,7 @@
#include "config.h"
#include <kdom/core/AttrImpl.h>
+#include <kdom/core/DocumentImpl.h>
#include <kdebug.h>
#include "SVGNames.h"
1.9 +1 -0 SVGSupport/ksvg2/svg/SVGDOMImplementationImpl.cpp
Index: SVGDOMImplementationImpl.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGDOMImplementationImpl.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SVGDOMImplementationImpl.cpp 21 Nov 2005 08:29:36 -0000 1.8
+++ SVGDOMImplementationImpl.cpp 6 Dec 2005 01:53:16 -0000 1.9
@@ -32,6 +32,7 @@
#include <kdom/core/DOMExceptionImpl.h>
#include <kdom/core/DocumentTypeImpl.h>
#include <kdom/css/MediaListImpl.h>
+#include <kdom/css/CSSStyleSheetImpl.h>
#include "ksvg.h"
#include "SVGRenderStyle.h"
1.7 +5 -2 SVGSupport/ksvg2/svg/SVGDOMImplementationImpl.h
Index: SVGDOMImplementationImpl.h
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGDOMImplementationImpl.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SVGDOMImplementationImpl.h 21 Nov 2005 08:29:36 -0000 1.6
+++ SVGDOMImplementationImpl.h 6 Dec 2005 01:53:16 -0000 1.7
@@ -26,17 +26,20 @@
#include <kdom/core/DOMImplementationImpl.h>
#include <qstringlist.h>
+class KHTMLView;
+
namespace KDOM
{
class DOMString;
- class CDFInterface;
class DocumentImpl;
class DocumentTypeImpl;
+ class CSSStyleSheetImpl;
+ using ::KHTMLView;
};
namespace KSVG
{
- class SVGDOMImplementationImpl : public KDOM::DOMImplementationImpl
+ class SVGDOMImplementationImpl : public DOM::DOMImplementationImpl
{
public:
SVGDOMImplementationImpl();
1.15 +1 -1 SVGSupport/ksvg2/svg/SVGDocumentImpl.cpp
Index: SVGDocumentImpl.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGDocumentImpl.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SVGDocumentImpl.cpp 2 Dec 2005 22:44:27 -0000 1.14
+++ SVGDocumentImpl.cpp 6 Dec 2005 01:53:16 -0000 1.15
@@ -33,8 +33,8 @@
#include <kdom/Namespace.h>
#include <kdom/core/domattrs.h>
#include <kdom/cache/KDOMLoader.h>
-#include <kdom/core/CDFInterface.h>
#include <kdom/cache/KDOMCachedObject.h>
+#include <kdom/css/CSSStyleSelector.h>
#include <kdom/css/CSSStyleSheetImpl.h>
#include <kdom/events/MouseEventImpl.h>
#include <kdom/css/StyleSheetListImpl.h>
1.11 +3 -0 SVGSupport/ksvg2/svg/SVGDocumentImpl.h
Index: SVGDocumentImpl.h
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGDocumentImpl.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SVGDocumentImpl.h 26 Nov 2005 22:19:06 -0000 1.10
+++ SVGDocumentImpl.h 6 Dec 2005 01:53:16 -0000 1.11
@@ -33,6 +33,9 @@
#ifdef APPLE_CHANGES
class KHTMLView;
+namespace KDOM {
+ using ::KHTMLView;
+}
#endif
namespace KSVG
1.11 +1 -0 SVGSupport/ksvg2/svg/SVGElementImpl.h
Index: SVGElementImpl.h
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGElementImpl.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SVGElementImpl.h 26 Nov 2005 22:19:06 -0000 1.10
+++ SVGElementImpl.h 6 Dec 2005 01:53:16 -0000 1.11
@@ -30,6 +30,7 @@
{
class Ecma;
class DocumentPtr;
+ typedef StyledElementImpl XMLElementImpl;
};
namespace KSVG
1.13 +1 -1 SVGSupport/ksvg2/svg/SVGFEFloodElementImpl.cpp
Index: SVGFEFloodElementImpl.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGFEFloodElementImpl.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SVGFEFloodElementImpl.cpp 29 Nov 2005 11:20:47 -0000 1.12
+++ SVGFEFloodElementImpl.cpp 6 Dec 2005 01:53:16 -0000 1.13
@@ -73,7 +73,7 @@
m_filterEffect->setIn(KDOM::DOMString(in1()->baseVal()).qstring());
setStandardAttributes(m_filterEffect);
khtml::RenderStyle *filterStyle = const_cast<SVGFEFloodElementImpl *>(this)->styleForRenderer(parentNode()->renderer());
- SVGRenderStyle *svgStyle = filterStyle->svgStyle();
+ const SVGRenderStyle *svgStyle = filterStyle->svgStyle();
m_filterEffect->setFloodColor(svgStyle->floodColor());
m_filterEffect->setFloodOpacity(svgStyle->floodOpacity());
filterStyle->deref(canvas()->renderArena());
1.13 +2 -0 SVGSupport/ksvg2/svg/SVGGradientElementImpl.cpp
Index: SVGGradientElementImpl.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGGradientElementImpl.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- SVGGradientElementImpl.cpp 27 Nov 2005 11:02:25 -0000 1.12
+++ SVGGradientElementImpl.cpp 6 Dec 2005 01:53:16 -0000 1.13
@@ -22,6 +22,7 @@
#include "config.h"
#include <kdom/core/AttrImpl.h>
+#include <kdom/css/CSSStyleSelector.h>
#include "ksvg.h"
#include "SVGNames.h"
@@ -36,6 +37,7 @@
#include "SVGStopElementImpl.h"
#include "SVGRenderStyle.h"
+#include <kcanvas/KCanvas.h>
#include <kcanvas/device/KRenderingPaintServerGradient.h>
#include <kcanvas/device/KRenderingDevice.h>
1.9 +2 -0 SVGSupport/ksvg2/svg/SVGStyleElementImpl.cpp
Index: SVGStyleElementImpl.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGStyleElementImpl.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- SVGStyleElementImpl.cpp 21 Nov 2005 08:29:42 -0000 1.8
+++ SVGStyleElementImpl.cpp 6 Dec 2005 01:53:16 -0000 1.9
@@ -24,6 +24,8 @@
#include <kdom/kdom.h>
#include <kdom/DOMString.h>
#include <kdom/css/MediaListImpl.h>
+#include <kdom/core/DocumentImpl.h>
+#include <kdom/css/CSSStyleSheetImpl.h>
#include "SVGStyleElementImpl.h"
1.16 +0 -1 SVGSupport/ksvg2/svg/SVGStyledElementImpl.cpp
Index: SVGStyledElementImpl.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGStyledElementImpl.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- SVGStyledElementImpl.cpp 6 Dec 2005 01:23:25 -0000 1.15
+++ SVGStyledElementImpl.cpp 6 Dec 2005 01:53:16 -0000 1.16
@@ -24,7 +24,6 @@
#include <kdom/kdom.h>
#include <kdom/core/AttrImpl.h>
#include <kdom/core/domattrs.h>
-#include <kdom/core/CDFInterface.h>
#include <kdom/DOMString.h>
#include <kxmlcore/Assertions.h>
1.7 +1 -1 SVGSupport/ksvg2/svg/SVGURIReferenceImpl.h
Index: SVGURIReferenceImpl.h
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGURIReferenceImpl.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- SVGURIReferenceImpl.h 3 Dec 2005 01:32:42 -0000 1.6
+++ SVGURIReferenceImpl.h 6 Dec 2005 01:53:16 -0000 1.7
@@ -27,7 +27,7 @@
namespace KDOM
{
- class AttributeImpl;
+ class MappedAttributeImpl;
};
namespace KSVG
1.5 +1 -1 SVGSupport/ksvg2/svg/SVGZoomAndPanImpl.h
Index: SVGZoomAndPanImpl.h
===================================================================
RCS file: /cvs/root/SVGSupport/ksvg2/svg/SVGZoomAndPanImpl.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SVGZoomAndPanImpl.h 21 Nov 2005 08:29:43 -0000 1.4
+++ SVGZoomAndPanImpl.h 6 Dec 2005 01:53:17 -0000 1.5
@@ -25,7 +25,7 @@
namespace KDOM
{
- class AttributeImpl;
+ class MappedAttributeImpl;
};
namespace KSVG
More information about the webkit-changes
mailing list