[webkit-changes] cvs commit: SVGSupport/WebCore+SVG KDOMHeaders.h
KDOMStubClasses.h render_kcanvaswrapper.cpp
render_kcanvaswrapper.h dom_kdomdocumentwrapper.cpp
dom_kdomdocumentwrapper.h dom_kdomnodetreewrapper.cpp
dom_kdomnodetreewrapper.h kdomxpath.h kdomxpointer.h
xml_kdomtokenizer.cpp xml_kdomtokenizer.h
Eric
eseidel at opensource.apple.com
Thu Nov 3 16:28:06 PST 2005
eseidel 05/11/03 16:28:06
Modified: WebCore+SVG KDOMHeaders.h KDOMStubClasses.h Tag:
kdom-dom-merger render_kcanvaswrapper.cpp
render_kcanvaswrapper.h
Removed: WebCore+SVG Tag: kdom-dom-merger dom_kdomdocumentwrapper.cpp
dom_kdomdocumentwrapper.h
dom_kdomnodetreewrapper.cpp
dom_kdomnodetreewrapper.h No tag kdomxpath.h
kdomxpointer.h Tag: kdom-dom-merger
xml_kdomtokenizer.cpp xml_kdomtokenizer.h
Log:
Submitted by: eseidel
Reviewed by: none, SVG merger branch only.
Revision Changes Path
1.2 +2 -2 SVGSupport/WebCore+SVG/KDOMHeaders.h
Index: KDOMHeaders.h
===================================================================
RCS file: /cvs/root/SVGSupport/WebCore+SVG/KDOMHeaders.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- KDOMHeaders.h 3 Nov 2005 10:27:17 -0000 1.1
+++ KDOMHeaders.h 4 Nov 2005 00:28:04 -0000 1.2
@@ -6,7 +6,7 @@
class KHTMLView;
namespace khtml {
- class CSSRuleSet;
+ class StyleListImpl;
}
namespace KDOM {
@@ -14,7 +14,7 @@
using namespace khtml;
using ::KHTMLPart;
using ::KHTMLView;
- typedef khtml::CSSRuleSet CSSStyleSelectorList;
+ typedef khtml::StyleListImpl CSSStyleSelectorList;
}
namespace KSVG {
1.2 +0 -33 SVGSupport/WebCore+SVG/KDOMStubClasses.h
Index: KDOMStubClasses.h
===================================================================
RCS file: /cvs/root/SVGSupport/WebCore+SVG/KDOMStubClasses.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- KDOMStubClasses.h 3 Nov 2005 10:27:17 -0000 1.1
+++ KDOMStubClasses.h 4 Nov 2005 00:28:05 -0000 1.2
@@ -27,39 +27,6 @@
if (a) a->deref();
a = b;
}
-
- /**
- * The CDFInterface class has to be implemented by 'layers on top'
- * of kdom (ie. ksvg2/khtml2). This class connects kdom with the
- * layer on top in following ways:
- *
- * - CSS values/properties access / render-style
- * - EcmaScript global object / EcmaInterface object
- *
- **/
- class GlobalObject;
- class EcmaInterface;
- class CDFInterface
- {
- public:
- CDFInterface();
- virtual ~CDFInterface();
-
- // CSS values/properties
- virtual const char *getValueName(unsigned short) const = 0;
- virtual const char *getPropertyName(unsigned short) const = 0;
-
- virtual int getValueID(const char *valStr, int len) const = 0;
- virtual int getPropertyID(const char *propStr, int len) const = 0;
-
- virtual RenderStyle *renderStyle() const = 0;
- virtual bool cssPropertyApplyFirst(int) const = 0;
-
- // EcmaScript interface
- virtual EcmaInterface *ecmaInterface() const = 0;
- virtual GlobalObject *globalObject(DocumentImpl *doc) const = 0;
- };
-
};
#endif // KDOMStubClasses_h
\ No newline at end of file
No revision
No revision
1.2.2.1 +19 -1 SVGSupport/WebCore+SVG/render_kcanvaswrapper.cpp
Index: render_kcanvaswrapper.cpp
===================================================================
RCS file: /cvs/root/SVGSupport/WebCore+SVG/render_kcanvaswrapper.cpp,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- render_kcanvaswrapper.cpp 5 Oct 2005 05:36:54 -0000 1.2
+++ render_kcanvaswrapper.cpp 4 Nov 2005 00:28:05 -0000 1.2.2.1
@@ -27,17 +27,35 @@
#include "render_kcanvaswrapper.h"
#include "kcanvas/KCanvas.h"
+#include "kcanvas/KCanvasView.h"
#include "kcanvas/KCanvasContainer.h"
#include "kcanvas/device/KRenderingDevice.h"
+#include "kcanvas/device/quartz/KRenderingDeviceQuartz.h"
+#include "kcanvas/device/quartz/KCanvasViewQuartz.h"
using namespace khtml;
-RenderKCanvasWrapper::RenderKCanvasWrapper(DOM::KDOMNodeTreeWrapperImpl *node) : RenderReplaced(node), m_canvas(0)
+KRenderingDeviceQuartz *RenderKCanvasWrapper::renderingDevice()
{
+ static KRenderingDeviceQuartz *__quartzRenderingDevice = nil;
+ if (!__quartzRenderingDevice)
+ __quartzRenderingDevice = new KRenderingDeviceQuartz();
+ return __quartzRenderingDevice;
+}
+
+RenderKCanvasWrapper::RenderKCanvasWrapper(DOM::NodeImpl *node) : RenderReplaced(node), m_canvas(0)
+{
+ m_canvas = new KCanvas(RenderKCanvasWrapper::renderingDevice());
+ m_canvasView = new KCanvasViewQuartz();
+ m_canvasView->setRenderObject(this);
+ m_canvasView->init(m_canvas, NULL);
+ m_canvas->addView(m_canvasView);
}
RenderKCanvasWrapper::~RenderKCanvasWrapper()
{
+ delete m_canvas;
+ delete m_canvasView;
}
void RenderKCanvasWrapper::layout()
1.1.2.1 +6 -2 SVGSupport/WebCore+SVG/render_kcanvaswrapper.h
Index: render_kcanvaswrapper.h
===================================================================
RCS file: /cvs/root/SVGSupport/WebCore+SVG/render_kcanvaswrapper.h,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- render_kcanvaswrapper.h 23 Sep 2005 03:28:26 -0000 1.1
+++ render_kcanvaswrapper.h 4 Nov 2005 00:28:05 -0000 1.1.2.1
@@ -28,16 +28,17 @@
#include "khtml/misc/loader.h"
#include "khtml/rendering/render_replaced.h"
-#include "dom_kdomnodetreewrapper.h"
class KCanvas;
+class KCanvasViewQuartz;
+class KRenderingDeviceQuartz;
namespace khtml {
class RenderKCanvasWrapper : public RenderReplaced
{
public:
- RenderKCanvasWrapper(DOM::KDOMNodeTreeWrapperImpl *node);
+ RenderKCanvasWrapper(DOM::NodeImpl *node);
virtual ~RenderKCanvasWrapper();
virtual const char *renderName() const { return "RenderKCanvasWrapper"; }
@@ -51,7 +52,10 @@
int RenderKCanvasWrapper::intrinsicHeight() const;
private:
+ static KRenderingDeviceQuartz *renderingDevice();
+
KCanvas *m_canvas;
+ KCanvasViewQuartz *m_canvasView;
};
}; // namespace
More information about the webkit-changes
mailing list