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

List:       kde-commits
Subject:    branches/work/unity/WebKit/WebCore
From:       Nikolas Zimmermann <wildfox () kde ! org>
Date:       2006-08-10 13:40:30
Message-ID: 1155217230.389458.1482.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 571718 by wildfox:

Working on ksvg2 integration locally - these are the only
bits needed to make ksvg2 compile. Just doing the Qt kcanvas
paint device locally. Then it should at least build with
SVG_SUPPORT enabled. Some 15k CMakeLists patches still on hdd ;-)


 M  +4 -1      css/CSSStyleDeclaration.cpp  
 M  +5 -0      kcanvas/KCanvasFilters.cpp  
 M  +1 -3      kcanvas/RenderSVGImage.cpp  
 M  +2 -0      ksvg2/css/SVGCSSStyleSelector.cpp  
 M  +3 -0      ksvg2/svg/SVGAnimateColorElement.cpp  
 M  +3 -0      ksvg2/svg/SVGMaskElement.cpp  
 M  +3 -0      ksvg2/svg/SVGPatternElement.cpp  
 M  +4 -0      kwq/KWQWMatrix.h  


--- branches/work/unity/WebKit/WebCore/css/CSSStyleDeclaration.cpp #571717:571718
@@ -27,8 +27,11 @@
 #include "CSSPropertyNames.h"
 #include "CSSRule.h"
 #include "DeprecatedValueList.h"
-//#include "ksvgcssproperties.h"
 
+#if SVG_SUPPORT
+#include "ksvgcssproperties.h"
+#endif
+
 // Not in any header, so just declare it here for now.
 WebCore::String getPropertyName(unsigned short id);
 
--- branches/work/unity/WebKit/WebCore/kcanvas/KCanvasFilters.cpp #571717:571718
@@ -22,7 +22,10 @@
 */
 
 #include "config.h"
+
 #if SVG_SUPPORT
+#include <math.h>
+
 #include "KCanvasFilters.h"
 
 #include "CachedImage.h"
@@ -242,6 +245,7 @@
             break;
         case CT_TABLE:
         case CT_DISCRETE:
+        {
             ts << " [table values=";
             Vector<float>::const_iterator itr=func.tableValues.begin();
             if (itr != func.tableValues.end()) {
@@ -252,6 +256,7 @@
             }
             ts << "]";
             break;
+        }
         case CT_LINEAR:
             ts << " [slope=" << func.slope << "]"
                << " [intercept=" << func.intercept << "]";
--- branches/work/unity/WebKit/WebCore/kcanvas/RenderSVGImage.cpp #571717:571718
@@ -26,9 +26,7 @@
 
 #include "Attr.h"
 #include "GraphicsContext.h"
-#include "KCanvasMaskerQuartz.h"
 #include "KCanvasRenderingStyle.h"
-#include "KCanvasResourcesQuartz.h"
 #include "KRenderingDevice.h"
 #include "SVGAnimatedLength.h"
 #include "SVGAnimatedPreserveAspectRatio.h"
@@ -295,4 +293,4 @@
 
 }
 
-#endif // SVG_SUPPORT
+#endif
--- branches/work/unity/WebKit/WebCore/ksvg2/css/SVGCSSStyleSelector.cpp #571717:571718
@@ -28,6 +28,7 @@
 */
 
 #include "config.h"
+
 #if SVG_SUPPORT
 #include "cssstyleselector.h"
 
@@ -43,6 +44,7 @@
 #include "ksvgcssvalues.h"
 #include "ksvgcssproperties.h"
 #include <stdlib.h>
+#include <math.h>
 
 #define HANDLE_INHERIT(prop, Prop) \
 if (isInherit) \
--- branches/work/unity/WebKit/WebCore/ksvg2/svg/SVGAnimateColorElement.cpp #571717:571718
@@ -21,7 +21,10 @@
 */
 
 #include "config.h"
+
 #if SVG_SUPPORT
+#include <math.h>
+
 #include "SVGAnimateColorElement.h"
 #include "KSVGTimeScheduler.h"
 #include "PlatformString.h"
--- branches/work/unity/WebKit/WebCore/ksvg2/svg/SVGMaskElement.cpp #571717:571718
@@ -22,6 +22,7 @@
 */
 
 #include "config.h"
+
 #if SVG_SUPPORT
 #include "SVGMaskElement.h"
 
@@ -37,6 +38,8 @@
 #include "cssstyleselector.h"
 #include "ksvg.h"
 #include "Attr.h"
+
+#include <math.h>
 #include <wtf/OwnPtr.h>
 
 namespace WebCore {
--- branches/work/unity/WebKit/WebCore/ksvg2/svg/SVGPatternElement.cpp #571717:571718
@@ -21,7 +21,10 @@
 */
 
 #include "config.h"
+
 #if SVG_SUPPORT
+#include <math.h>
+
 #include "SVGPatternElement.h"
 
 #include "Attr.h"
--- branches/work/unity/WebKit/WebCore/kwq/KWQWMatrix.h #571717:571718
@@ -26,6 +26,10 @@
 #ifndef QWMATRIX_H_
 #define QWMATRIX_H_
 
+#if PLATFORM(QT)
+#include <QMatrix>
+#endif
+
 #if __APPLE__
 // FIXME: Just comment out the entire file, since its implementation is completely CG-specific.
 
[prev in list] [next in list] [prev in thread] [next in thread]