+2006-10-31 Oliver Hunt <oliver@apple.com>
+
+ Reviewed by Geoff.
+
+ Converting Obj-C++ to C++ in kcanvas
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * kcanvas/device/quartz/KCanvasFilterQuartz.h:
+ * kcanvas/device/quartz/KCanvasFilterQuartz.mm:
+ * kcanvas/device/quartz/KCanvasItemQuartz.cpp: Added.
+ * kcanvas/device/quartz/KCanvasItemQuartz.mm: Removed.
+ * kcanvas/device/quartz/KRenderingDeviceQuartz.cpp: Added.
+ * kcanvas/device/quartz/KRenderingDeviceQuartz.h:
+ * kcanvas/device/quartz/KRenderingDeviceQuartz.mm: Removed.
+ * kcanvas/device/quartz/KRenderingPaintServerGradientQuartz.mm:
+ * kcanvas/device/quartz/KRenderingPaintServerQuartz.h:
+ * kcanvas/device/quartz/QuartzSupport.cpp: Added.
+ * kcanvas/device/quartz/QuartzSupport.h:
+ * kcanvas/device/quartz/QuartzSupport.mm: Removed.
+ * platform/graphics/svg/cg/SVGResourceClipperCg.cpp: Added.
+ (WebCore::SVGResourceClipper::applyClip):
+ * platform/graphics/svg/cg/SVGResourceClipperCg.mm: Removed.
+ * platform/graphics/svg/cg/SVGResourceImageCg.cpp: Added.
+ * platform/graphics/svg/cg/SVGResourceImageCg.mm: Removed.
+
2006-10-31 Justin Garcia <justin.garcia@apple.com>
Reviewed by harrison
A88AD3A90952486D001DD196 /* WKSpotLightFilter.m in Sources */ = {isa = PBXBuildFile; fileRef = A8C32934093BB732000B9CAC /* WKSpotLightFilter.m */; };
A88AD3AA0952486D001DD196 /* KCanvasFilterQuartz.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C0FB69089701F800BA5114 /* KCanvasFilterQuartz.h */; };
A88AD3AB0952486D001DD196 /* KCanvasFilterQuartz.mm in Sources */ = {isa = PBXBuildFile; fileRef = A8C0FB6A089701F800BA5114 /* KCanvasFilterQuartz.mm */; };
- A88AD3AD0952486D001DD196 /* KCanvasItemQuartz.mm in Sources */ = {isa = PBXBuildFile; fileRef = A8C0FB6C089701F800BA5114 /* KCanvasItemQuartz.mm */; };
+ A88AD3AD0952486D001DD196 /* KCanvasItemQuartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C0FB6C089701F800BA5114 /* KCanvasItemQuartz.cpp */; };
A88AD3B00952486E001DD196 /* KRenderingDeviceQuartz.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C0FB71089701F800BA5114 /* KRenderingDeviceQuartz.h */; };
- A88AD3B10952486E001DD196 /* KRenderingDeviceQuartz.mm in Sources */ = {isa = PBXBuildFile; fileRef = A8C0FB72089701F800BA5114 /* KRenderingDeviceQuartz.mm */; };
+ A88AD3B10952486E001DD196 /* KRenderingDeviceQuartz.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C0FB72089701F800BA5114 /* KRenderingDeviceQuartz.cpp */; };
A88AD3B20952486E001DD196 /* KRenderingPaintServerGradientQuartz.mm in Sources */ = {isa = PBXBuildFile; fileRef = A8C0FB73089701F800BA5114 /* KRenderingPaintServerGradientQuartz.mm */; };
A88AD3B30952486E001DD196 /* KRenderingPaintServerQuartz.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C0FB74089701F800BA5114 /* KRenderingPaintServerQuartz.h */; };
A88AD3B40952486E001DD196 /* KRenderingPaintServerQuartz.mm in Sources */ = {isa = PBXBuildFile; fileRef = A8C0FB75089701F800BA5114 /* KRenderingPaintServerQuartz.mm */; };
A88AD3B50952486E001DD196 /* QuartzSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C0FB76089701F800BA5114 /* QuartzSupport.h */; };
- A88AD3B60952486E001DD196 /* QuartzSupport.mm in Sources */ = {isa = PBXBuildFile; fileRef = A8C0FB77089701F800BA5114 /* QuartzSupport.mm */; };
+ A88AD3B60952486E001DD196 /* QuartzSupport.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C0FB77089701F800BA5114 /* QuartzSupport.cpp */; };
A88AD3BE0952486E001DD196 /* KCanvasFilters.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C0FB7F089701F800BA5114 /* KCanvasFilters.h */; };
A88AD401095248F0001DD196 /* SVGRenderStyle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C0F6FF089701F100BA5114 /* SVGRenderStyle.cpp */; };
A88AD402095248F0001DD196 /* SVGRenderStyle.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C0F700089701F100BA5114 /* SVGRenderStyle.h */; settings = {ATTRIBUTES = (Private, ); }; };
B2A015A90AF6CD53006BCE0E /* GraphicsContext.h in Headers */ = {isa = PBXBuildFile; fileRef = B2A015930AF6CD53006BCE0E /* GraphicsContext.h */; };
B2A015AA0AF6CD53006BCE0E /* GraphicsTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2A015940AF6CD53006BCE0E /* GraphicsTypes.cpp */; };
B2A015AB0AF6CD53006BCE0E /* GraphicsTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = B2A015950AF6CD53006BCE0E /* GraphicsTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
- B2A015AC0AF6CD53006BCE0E /* SVGResourceClipperCg.mm in Sources */ = {isa = PBXBuildFile; fileRef = B2A015980AF6CD53006BCE0E /* SVGResourceClipperCg.mm */; };
- B2A015AD0AF6CD53006BCE0E /* SVGResourceImageCg.mm in Sources */ = {isa = PBXBuildFile; fileRef = B2A015990AF6CD53006BCE0E /* SVGResourceImageCg.mm */; };
+ B2A015AC0AF6CD53006BCE0E /* SVGResourceClipperCg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2A015980AF6CD53006BCE0E /* SVGResourceClipperCg.cpp */; };
+ B2A015AD0AF6CD53006BCE0E /* SVGResourceImageCg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2A015990AF6CD53006BCE0E /* SVGResourceImageCg.cpp */; };
B2A015AE0AF6CD53006BCE0E /* SVGResourceMaskerCg.mm in Sources */ = {isa = PBXBuildFile; fileRef = B2A0159A0AF6CD53006BCE0E /* SVGResourceMaskerCg.mm */; };
B2A015B20AF6CD53006BCE0E /* SVGResource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B2A0159F0AF6CD53006BCE0E /* SVGResource.cpp */; };
B2A015B30AF6CD53006BCE0E /* SVGResource.h in Headers */ = {isa = PBXBuildFile; fileRef = B2A015A00AF6CD53006BCE0E /* SVGResource.h */; };
A8C0FB63089701F700BA5114 /* KRenderingPaintServerSolid.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KRenderingPaintServerSolid.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
A8C0FB69089701F800BA5114 /* KCanvasFilterQuartz.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KCanvasFilterQuartz.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
A8C0FB6A089701F800BA5114 /* KCanvasFilterQuartz.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KCanvasFilterQuartz.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- A8C0FB6C089701F800BA5114 /* KCanvasItemQuartz.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KCanvasItemQuartz.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+ A8C0FB6C089701F800BA5114 /* KCanvasItemQuartz.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KCanvasItemQuartz.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
A8C0FB71089701F800BA5114 /* KRenderingDeviceQuartz.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KRenderingDeviceQuartz.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- A8C0FB72089701F800BA5114 /* KRenderingDeviceQuartz.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KRenderingDeviceQuartz.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+ A8C0FB72089701F800BA5114 /* KRenderingDeviceQuartz.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KRenderingDeviceQuartz.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
A8C0FB73089701F800BA5114 /* KRenderingPaintServerGradientQuartz.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KRenderingPaintServerGradientQuartz.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
A8C0FB74089701F800BA5114 /* KRenderingPaintServerQuartz.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KRenderingPaintServerQuartz.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
A8C0FB75089701F800BA5114 /* KRenderingPaintServerQuartz.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KRenderingPaintServerQuartz.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
A8C0FB76089701F800BA5114 /* QuartzSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = QuartzSupport.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
- A8C0FB77089701F800BA5114 /* QuartzSupport.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = QuartzSupport.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
+ A8C0FB77089701F800BA5114 /* QuartzSupport.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QuartzSupport.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
A8C0FB7F089701F800BA5114 /* KCanvasFilters.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KCanvasFilters.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
A8C32920093BB732000B9CAC /* WKArithmeticFilter.cikernel */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = text; path = WKArithmeticFilter.cikernel; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
A8C32921093BB732000B9CAC /* WKArithmeticFilter.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = WKArithmeticFilter.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
B2A015930AF6CD53006BCE0E /* GraphicsContext.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = GraphicsContext.h; sourceTree = "<group>"; };
B2A015940AF6CD53006BCE0E /* GraphicsTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = GraphicsTypes.cpp; sourceTree = "<group>"; };
B2A015950AF6CD53006BCE0E /* GraphicsTypes.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = GraphicsTypes.h; sourceTree = "<group>"; };
- B2A015980AF6CD53006BCE0E /* SVGResourceClipperCg.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = SVGResourceClipperCg.mm; sourceTree = "<group>"; };
- B2A015990AF6CD53006BCE0E /* SVGResourceImageCg.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = SVGResourceImageCg.mm; sourceTree = "<group>"; };
+ B2A015980AF6CD53006BCE0E /* SVGResourceClipperCg.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGResourceClipperCg.cpp; sourceTree = "<group>"; };
+ B2A015990AF6CD53006BCE0E /* SVGResourceImageCg.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGResourceImageCg.cpp; sourceTree = "<group>"; };
B2A0159A0AF6CD53006BCE0E /* SVGResourceMaskerCg.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = SVGResourceMaskerCg.mm; sourceTree = "<group>"; };
B2A0159F0AF6CD53006BCE0E /* SVGResource.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = SVGResource.cpp; sourceTree = "<group>"; };
B2A015A00AF6CD53006BCE0E /* SVGResource.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = SVGResource.h; sourceTree = "<group>"; };
A8C3291F093BB732000B9CAC /* filters */,
A8C0FB69089701F800BA5114 /* KCanvasFilterQuartz.h */,
A8C0FB6A089701F800BA5114 /* KCanvasFilterQuartz.mm */,
- A8C0FB6C089701F800BA5114 /* KCanvasItemQuartz.mm */,
+ A8C0FB6C089701F800BA5114 /* KCanvasItemQuartz.cpp */,
A8C0FB71089701F800BA5114 /* KRenderingDeviceQuartz.h */,
- A8C0FB72089701F800BA5114 /* KRenderingDeviceQuartz.mm */,
+ A8C0FB72089701F800BA5114 /* KRenderingDeviceQuartz.cpp */,
A8C0FB73089701F800BA5114 /* KRenderingPaintServerGradientQuartz.mm */,
A8C0FB74089701F800BA5114 /* KRenderingPaintServerQuartz.h */,
A8C0FB75089701F800BA5114 /* KRenderingPaintServerQuartz.mm */,
A8C0FB76089701F800BA5114 /* QuartzSupport.h */,
- A8C0FB77089701F800BA5114 /* QuartzSupport.mm */,
+ A8C0FB77089701F800BA5114 /* QuartzSupport.cpp */,
);
path = quartz;
sourceTree = "<group>";
B2A015970AF6CD53006BCE0E /* cg */ = {
isa = PBXGroup;
children = (
- B2A015980AF6CD53006BCE0E /* SVGResourceClipperCg.mm */,
- B2A015990AF6CD53006BCE0E /* SVGResourceImageCg.mm */,
+ B2A015980AF6CD53006BCE0E /* SVGResourceClipperCg.cpp */,
+ B2A015990AF6CD53006BCE0E /* SVGResourceImageCg.cpp */,
B2A0159A0AF6CD53006BCE0E /* SVGResourceMaskerCg.mm */,
);
path = cg;
A88AD3A60952486D001DD196 /* WKSpecularLightingFilter.m in Sources */,
A88AD3A90952486D001DD196 /* WKSpotLightFilter.m in Sources */,
A88AD3AB0952486D001DD196 /* KCanvasFilterQuartz.mm in Sources */,
- A88AD3AD0952486D001DD196 /* KCanvasItemQuartz.mm in Sources */,
- A88AD3B10952486E001DD196 /* KRenderingDeviceQuartz.mm in Sources */,
+ A88AD3AD0952486D001DD196 /* KCanvasItemQuartz.cpp in Sources */,
+ A88AD3B10952486E001DD196 /* KRenderingDeviceQuartz.cpp in Sources */,
A88AD3B20952486E001DD196 /* KRenderingPaintServerGradientQuartz.mm in Sources */,
A88AD3B40952486E001DD196 /* KRenderingPaintServerQuartz.mm in Sources */,
- A88AD3B60952486E001DD196 /* QuartzSupport.mm in Sources */,
+ A88AD3B60952486E001DD196 /* QuartzSupport.cpp in Sources */,
A88AD401095248F0001DD196 /* SVGRenderStyle.cpp in Sources */,
A88AD403095248F0001DD196 /* SVGRenderStyleDefs.cpp in Sources */,
A88AD40A095248F0001DD196 /* SVGZoomEvent.cpp in Sources */,
93CCF0600AF6CA7600018E89 /* NavigationAction.cpp in Sources */,
B2A015A80AF6CD53006BCE0E /* GraphicsContext.cpp in Sources */,
B2A015AA0AF6CD53006BCE0E /* GraphicsTypes.cpp in Sources */,
- B2A015AC0AF6CD53006BCE0E /* SVGResourceClipperCg.mm in Sources */,
- B2A015AD0AF6CD53006BCE0E /* SVGResourceImageCg.mm in Sources */,
+ B2A015AC0AF6CD53006BCE0E /* SVGResourceClipperCg.cpp in Sources */,
+ B2A015AD0AF6CD53006BCE0E /* SVGResourceImageCg.cpp in Sources */,
B2A015AE0AF6CD53006BCE0E /* SVGResourceMaskerCg.mm in Sources */,
B2A015B20AF6CD53006BCE0E /* SVGResource.cpp in Sources */,
B2A015B40AF6CD53006BCE0E /* SVGResourceClipper.cpp in Sources */,
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#ifndef KCancasFilterQuartz_H
+#define KCanvasFilterQuartz_H
+
#ifdef SVG_SUPPORT
-#import "KCanvasFilters.h"
+#include "KCanvasFilters.h"
#ifdef __OBJC__
@class CIFilter;
#else
class CIFilter;
class CIImage;
+class NSArray;
+class CIContext;
+class NSMutableDictionary;
#endif
namespace WebCore {
virtual void prepareFilter(const FloatRect& bbox);
virtual void applyFilter(const FloatRect& bbox);
-
+
CIImage* imageForName(const String&) const;
void setImageForName(CIImage*, const String&);
void setOutputImage(const KCanvasFilterEffect*, CIImage*);
CIImage* inputImage(const KCanvasFilterEffect*);
-
+
private:
+#if PLATFORM(CI)
NSArray* getCIFilterStack(CIImage* inputImage);
CIContext* m_filterCIContext;
CGLayerRef m_filterCGLayer;
NSMutableDictionary* m_imagesByName;
+#endif
};
class KCanvasFEBlendQuartz : public KCanvasFEBlend {
public:
+#if PLATFORM(CI)
virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
+#endif
};
class KCanvasFEColorMatrixQuartz : public KCanvasFEColorMatrix {
public:
+#if PLATFORM(CI)
virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
+#endif
};
class KCanvasFEComponentTransferQuartz : public KCanvasFEComponentTransfer {
public:
+#if PLATFORM(CI)
virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
+
private:
CIFilter* getFunctionFilter(KCChannelSelectorType, CIImage* inputImage) const;
+#endif
};
class KCanvasFEConvolveMatrixQuartz : public KCanvasFEConvolveMatrix {
public:
+#if PLATFORM(CI)
virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
+#endif
};
class KCanvasFECompositeQuartz : public KCanvasFEComposite {
public:
+#if PLATFORM(CI)
virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
+#endif
};
class KCanvasFEDiffuseLightingQuartz : public KCanvasFEDiffuseLighting {
public:
+#if PLATFORM(CI)
virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
+#endif
};
class KCanvasFEFloodQuartz : public KCanvasFEFlood {
public:
+#if PLATFORM(CI)
virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
+#endif
};
class KCanvasFEGaussianBlurQuartz : public KCanvasFEGaussianBlur {
public:
+#if PLATFORM(CI)
virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
+#endif
};
class KCanvasFEImageQuartz : public KCanvasFEImage {
public:
+#if PLATFORM(CI)
virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
+#endif
};
class KCanvasFEDisplacementMapQuartz : public KCanvasFEDisplacementMap {
public:
+#if PLATFORM(CI)
virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
+#endif
};
class KCanvasFEMergeQuartz : public KCanvasFEMerge {
public:
+#if PLATFORM(CI)
virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
+#endif
};
class KCanvasFEOffsetQuartz : public KCanvasFEOffset {
public:
+#if PLATFORM(CI)
virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
+#endif
};
class KCanvasFESpecularLightingQuartz : public KCanvasFESpecularLighting {
public:
+#if PLATFORM(CI)
virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
+#endif
};
class KCanvasFETileQuartz : public KCanvasFETile {
public:
+#if PLATFORM(CI)
virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
+#endif
};
}
#endif // SVG_SUPPORT
+#endif // !KCanvasFilterQuartz_H
#include "config.h"
#ifdef SVG_SUPPORT
+
#import "KCanvasFilterQuartz.h"
#import "AffineTransform.h"
#include "config.h"
#ifdef SVG_SUPPORT
-#import <wtf/Assertions.h>
+#include <wtf/Assertions.h>
-#import "KCanvasFilterQuartz.h"
-#import "KCanvasRenderingStyle.h"
-#import "KRenderingDeviceQuartz.h"
-#import "QuartzSupport.h"
-#import "RenderPath.h"
-#import "SVGRenderStyle.h"
-#import "SVGStyledElement.h"
+#include <ApplicationServices/ApplicationServices.h>
+#include "KCanvasFilterQuartz.h"
+#include "KCanvasRenderingStyle.h"
+#include "KRenderingDeviceQuartz.h"
+#include "QuartzSupport.h"
+#include "RenderPath.h"
+#include "SVGRenderStyle.h"
+#include "SVGStyledElement.h"
namespace WebCore {
#include "config.h"
#ifdef SVG_SUPPORT
-#import "KRenderingDeviceQuartz.h"
-
-#import "GraphicsContext.h"
-#import "SVGResourceClipper.h"
-#import "SVGResourceImage.h"
-#import "SVGResourceMarker.h"
-#import "KCanvasFilterQuartz.h"
-#import "SVGResourceMasker.h"
-#import "KRenderingPaintServerQuartz.h"
-#import "Logging.h"
-#import "QuartzSupport.h"
-#import "RenderView.h"
+#include "KRenderingDeviceQuartz.h"
+
+#include "GraphicsContext.h"
+#include "SVGResourceClipper.h"
+#include "SVGResourceImage.h"
+#include "SVGResourceMarker.h"
+#include "KCanvasFilterQuartz.h"
+#include "SVGResourceMasker.h"
+#include "KRenderingPaintServerQuartz.h"
+#include "Logging.h"
+#include "QuartzSupport.h"
+#include "RenderView.h"
namespace WebCore {
#define KRenderingDeviceQuartz_H
#ifdef SVG_SUPPORT
-#import "KRenderingDevice.h"
+#include "KRenderingDevice.h"
typedef struct CGRect CGRect;
typedef struct CGContext *CGContextRef;
#include "config.h"
#ifdef SVG_SUPPORT
-#import "KRenderingPaintServerQuartz.h"
-#import "SVGResourceImage.h"
-#import "KRenderingDeviceQuartz.h"
-#import "KRenderingPaintServer.h"
-#import "QuartzSupport.h"
-#import "RenderPath.h"
-#import <wtf/Assertions.h>
+#include "KRenderingPaintServerQuartz.h"
+#include "SVGResourceImage.h"
+#include "KRenderingDeviceQuartz.h"
+#include "KRenderingPaintServer.h"
+#include "QuartzSupport.h"
+#include "RenderPath.h"
+#include <wtf/Assertions.h>
namespace WebCore {
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#ifndef KRenderingPaintServerQuartz_H
+#define KRenderingPaintServerQuartz_H
-#import "KRenderingDevice.h"
-#import "KRenderingPaintServerSolid.h"
-#import "KRenderingPaintServerPattern.h"
-#import "KRenderingPaintServerGradient.h"
+#include "KRenderingDevice.h"
+#include "KRenderingPaintServerSolid.h"
+#include "KRenderingPaintServerPattern.h"
+#include "KRenderingPaintServerGradient.h"
namespace WebCore {
};
}
+
+#endif // !KRenderingPaintServerQuartz_H
#include "config.h"
#ifdef SVG_SUPPORT
-#import "QuartzSupport.h"
-
-#import "GraphicsContext.h"
-#import "KCanvasRenderingStyle.h"
-#import "RenderStyle.h"
-#import "wtf/Assertions.h"
-
-#import <QuartzCore/CoreImage.h>
-
-#import "SVGRenderStyle.h"
+#include <ApplicationServices/ApplicationServices.h>
+#include "QuartzSupport.h"
+
+#include "GraphicsContext.h"
+#include "KCanvasRenderingStyle.h"
+#include "RenderStyle.h"
+#include "wtf/Assertions.h"
+#include "SVGRenderStyle.h"
namespace WebCore {
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#ifndef QuartzSupport_H
+#define QuartzSupport_H
+
#ifdef SVG_SUPPORT
-#import "GraphicsTypes.h"
+#include "GraphicsTypes.h"
namespace WebCore {
}
#endif // SVG_SUPPORT
+#endif // !QuartzSupport_H
#include "config.h"
#ifdef SVG_SUPPORT
-#import "SVGResourceClipper.h"
+#include "SVGResourceClipper.h"
-#import "GraphicsContext.h"
-#import "KCanvasFilterQuartz.h"
-#import "KRenderingDeviceQuartz.h"
-#import "QuartzSupport.h"
+#include "GraphicsContext.h"
+#include "KCanvasFilterQuartz.h"
+#include "KRenderingDeviceQuartz.h"
+#include "QuartzSupport.h"
namespace WebCore {
if (m_clipData.count() < 1)
return;
- BOOL heterogenousClipRules = NO;
+ bool heterogenousClipRules = false;
WindRule clipRule = m_clipData[0].windRule;
context->clearPath();
for (unsigned x = 0; x < m_clipData.count(); x++) {
ClipData data = m_clipData[x];
if (data.windRule != clipRule)
- heterogenousClipRules = YES;
+ heterogenousClipRules = true;
CGPathRef clipPath = data.path.platformPath();
#include "config.h"
#if SVG_SUPPORT
-#import "SVGResourceImage.h"
+#include <ApplicationServices/ApplicationServices.h>
+#include "SVGResourceImage.h"
namespace WebCore {
git://git.webkit.org / WebKit-https.git / commitdiff