2006-09-20 Eric Seidel <eric@eseidel.com>
authoreseidel <eseidel@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Sep 2006 23:37:33 +0000 (23:37 +0000)
committereseidel <eseidel@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 20 Sep 2006 23:37:33 +0000 (23:37 +0000)
        Reviewed by beth.

        Cleanup style in KCanvas.
        Remove extra white-space, unneeded arguments, etc.

        * WebCore.xcodeproj/project.pbxproj:
        * kcanvas/KCanvasClipper.cpp:
        (WebCore::operator<<):
        (WebCore::KCanvasClipper::externalRepresentation):
        * kcanvas/KCanvasClipper.h:
        * kcanvas/KCanvasFilters.cpp:
        (WebCore::KCanvasFilter::externalRepresentation):
        (WebCore::operator<<):
        (WebCore::KCanvasFilterEffect::externalRepresentation):
        (WebCore::KCPointLightSource::externalRepresentation):
        (WebCore::KCSpotLightSource::externalRepresentation):
        (WebCore::KCDistantLightSource::externalRepresentation):
        (WebCore::KCanvasFEBlend::externalRepresentation):
        (WebCore::KCanvasFEColorMatrix::externalRepresentation):
        (WebCore::KCanvasFEComponentTransfer::externalRepresentation):
        (WebCore::KCanvasFEComposite::externalRepresentation):
        (WebCore::KCanvasFEConvolveMatrix::externalRepresentation):
        (WebCore::KCanvasFEDiffuseLighting::externalRepresentation):
        (WebCore::KCanvasFEDisplacementMap::externalRepresentation):
        (WebCore::KCanvasFEFlood::externalRepresentation):
        (WebCore::KCanvasFEGaussianBlur::externalRepresentation):
        (WebCore::KCanvasFEImage::externalRepresentation):
        (WebCore::KCanvasFEMerge::externalRepresentation):
        (WebCore::KCanvasFEMorphology::externalRepresentation):
        (WebCore::KCanvasFEOffset::externalRepresentation):
        (WebCore::KCanvasFESpecularLighting::externalRepresentation):
        (WebCore::KCanvasFETile::externalRepresentation):
        (WebCore::KCanvasFETurbulence::externalRepresentation):
        * kcanvas/KCanvasFilters.h:
        (WebCore::KCanvasFEDiffuseLighting::lightSource):
        (WebCore::KCanvasFESpecularLighting::lightSource):
        * kcanvas/KCanvasImage.h:
        * kcanvas/KCanvasMarker.cpp:
        (WebCore::KCanvasMarker::externalRepresentation):
        * kcanvas/KCanvasMarker.h:
        * kcanvas/KCanvasResource.cpp:
        (WebCore::operator<<):
        * kcanvas/KCanvasResource.h:
        * kcanvas/KCanvasTreeDebug.cpp:
        (WebCore::operator<<):
        (WebCore::writeIndent):
        (WebCore::writeStyle):
        (WebCore::write):
        (WebCore::writeRenderResources):
        * kcanvas/KCanvasTreeDebug.h:
        (WebCore::operator<<):
        * kcanvas/RenderForeignObject.cpp:
        (WebCore::RenderForeignObject::paint):
        * kcanvas/RenderPath.cpp:
        (WebCore::RenderPath::paint):
        (WebCore::drawStartAndMidMarkers):
        * kcanvas/RenderSVGContainer.cpp:
        (WebCore::RenderSVGContainer::paint):
        * kcanvas/RenderSVGImage.cpp:
        (WebCore::RenderSVGImage::translateForAttributes):
        * kcanvas/RenderSVGImage.h:
        * kcanvas/device/KRenderingDevice.cpp:
        (WebCore::KRenderingDevice::currentContext):
        (WebCore::KRenderingDevice::popContext):
        (WebCore::KRenderingDevice::pushContext):
        * kcanvas/device/KRenderingDevice.h:
        * kcanvas/device/KRenderingFillPainter.h:
        * kcanvas/device/KRenderingPaintServer.h:
        (WebCore::KRenderingPaintServer::KRenderingPaintServer):
        (WebCore::KRenderingPaintServer::activeClient):
        (WebCore::KRenderingPaintServer::setActiveClient):
        * kcanvas/device/KRenderingPaintServerGradient.cpp:
        (WebCore::operator<<):
        (WebCore::KRenderingPaintServerGradient::externalRepresentation):
        (WebCore::KRenderingPaintServerLinearGradient::externalRepresentation):
        (WebCore::KRenderingPaintServerGradient::listener):
        (WebCore::KRenderingPaintServerGradient::setListener):
        (WebCore::KRenderingPaintServerRadialGradient::externalRepresentation):
        * kcanvas/device/KRenderingPaintServerGradient.h:
        * kcanvas/device/KRenderingPaintServerPattern.cpp:
        (WebCore::KRenderingPaintServerPattern::tile):
        (WebCore::KRenderingPaintServerPattern::setTile):
        (WebCore::KRenderingPaintServerPattern::listener):
        (WebCore::KRenderingPaintServerPattern::setListener):
        (WebCore::KRenderingPaintServerPattern::externalRepresentation):
        * kcanvas/device/KRenderingPaintServerPattern.h:
        * kcanvas/device/KRenderingPaintServerSolid.cpp:
        (WebCore::KRenderingPaintServerSolid::externalRepresentation):
        * kcanvas/device/KRenderingPaintServerSolid.h:
        * kcanvas/device/KRenderingStrokePainter.cpp:
        (WebCore::KRenderingStrokePainter::strokeMiterLimit):
        (WebCore::KRenderingStrokePainter::setStrokeMiterLimit):
        * kcanvas/device/KRenderingStrokePainter.h:
        * kcanvas/device/quartz/KCanvasFilterQuartz.h:
        * kcanvas/device/quartz/KCanvasFilterQuartz.mm:
        (WebCore::KCanvasFilterQuartz::prepareFilter):
        * kcanvas/device/quartz/KCanvasItemQuartz.h: Removed.
        * kcanvas/device/quartz/KCanvasMaskerQuartz.mm:
        (WebCore::KCanvasMaskerQuartz::applyMask):
        * kcanvas/device/quartz/KCanvasResourcesQuartz.h:
        (WebCore::KCanvasImageQuartz::init):
        * kcanvas/device/quartz/KCanvasResourcesQuartz.mm:
        (WebCore::KCanvasClipperQuartz::applyClip):
        * kcanvas/device/quartz/KRenderingDeviceQuartz.h:
        * kcanvas/device/quartz/KRenderingDeviceQuartz.mm:
        (WebCore::KRenderingDeviceQuartz::quartzContext):
        (WebCore::KRenderingDeviceQuartz::contextForImage):
        (WebCore::KRenderingDeviceQuartz::createPaintServer):
        (WebCore::KRenderingDeviceQuartz::createResource):
        (WebCore::KRenderingDeviceQuartz::createFilterEffect):
        * kcanvas/device/quartz/KRenderingPaintServerGradientQuartz.mm:
        (WebCore::CGShadingRefForLinearGradient):
        (WebCore::CGShadingRefForRadialGradient):
        (WebCore::KRenderingPaintServerGradientQuartz::updateQuartzGradientCache):
        (WebCore::KRenderingPaintServerGradientQuartz::teardown):
        * kcanvas/device/quartz/KRenderingPaintServerQuartz.h:
        * kcanvas/device/quartz/KRenderingPaintServerQuartz.mm:
        (WebCore::KRenderingPaintServerQuartzHelper::strokePath):
        (WebCore::KRenderingPaintServerQuartzHelper::clipToStrokePath):
        (WebCore::KRenderingPaintServerQuartzHelper::fillPath):
        (WebCore::KRenderingPaintServerQuartzHelper::clipToFillPath):
        (WebCore::KRenderingPaintServerSolidQuartz::draw):
        (WebCore::KRenderingPaintServerSolidQuartz::setup):
        (WebCore::KRenderingPaintServerSolidQuartz::renderPath):
        (WebCore::KRenderingPaintServerPatternQuartz::setup):
        (WebCore::KRenderingPaintServerPatternQuartz::renderPath):
        (WebCore::KRenderingPaintServerPatternQuartz::teardown):
        * kcanvas/device/quartz/QuartzSupport.h:
        * kcanvas/device/quartz/QuartzSupport.mm:
        (WebCore::applyStrokeStyleToContext):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16488 268f45cc-cd09-0410-ab3c-d52691b4dbfc

44 files changed:
WebCore/ChangeLog
WebCore/WebCore.xcodeproj/project.pbxproj
WebCore/kcanvas/KCanvasClipper.cpp
WebCore/kcanvas/KCanvasClipper.h
WebCore/kcanvas/KCanvasFilters.cpp
WebCore/kcanvas/KCanvasFilters.h
WebCore/kcanvas/KCanvasImage.h
WebCore/kcanvas/KCanvasMarker.cpp
WebCore/kcanvas/KCanvasMarker.h
WebCore/kcanvas/KCanvasResource.cpp
WebCore/kcanvas/KCanvasResource.h
WebCore/kcanvas/KCanvasTreeDebug.cpp
WebCore/kcanvas/KCanvasTreeDebug.h
WebCore/kcanvas/RenderForeignObject.cpp
WebCore/kcanvas/RenderPath.cpp
WebCore/kcanvas/RenderPath.h
WebCore/kcanvas/RenderSVGContainer.cpp
WebCore/kcanvas/RenderSVGImage.cpp
WebCore/kcanvas/RenderSVGImage.h
WebCore/kcanvas/RenderSVGText.cpp
WebCore/kcanvas/device/KRenderingDevice.cpp
WebCore/kcanvas/device/KRenderingDevice.h
WebCore/kcanvas/device/KRenderingFillPainter.h
WebCore/kcanvas/device/KRenderingPaintServer.h
WebCore/kcanvas/device/KRenderingPaintServerGradient.cpp
WebCore/kcanvas/device/KRenderingPaintServerGradient.h
WebCore/kcanvas/device/KRenderingPaintServerPattern.cpp
WebCore/kcanvas/device/KRenderingPaintServerPattern.h
WebCore/kcanvas/device/KRenderingPaintServerSolid.cpp
WebCore/kcanvas/device/KRenderingPaintServerSolid.h
WebCore/kcanvas/device/KRenderingStrokePainter.cpp
WebCore/kcanvas/device/KRenderingStrokePainter.h
WebCore/kcanvas/device/quartz/KCanvasFilterQuartz.h
WebCore/kcanvas/device/quartz/KCanvasFilterQuartz.mm
WebCore/kcanvas/device/quartz/KCanvasMaskerQuartz.mm
WebCore/kcanvas/device/quartz/KCanvasResourcesQuartz.h
WebCore/kcanvas/device/quartz/KCanvasResourcesQuartz.mm
WebCore/kcanvas/device/quartz/KRenderingDeviceQuartz.h
WebCore/kcanvas/device/quartz/KRenderingDeviceQuartz.mm
WebCore/kcanvas/device/quartz/KRenderingPaintServerGradientQuartz.mm
WebCore/kcanvas/device/quartz/KRenderingPaintServerQuartz.h
WebCore/kcanvas/device/quartz/KRenderingPaintServerQuartz.mm
WebCore/kcanvas/device/quartz/QuartzSupport.h
WebCore/kcanvas/device/quartz/QuartzSupport.mm

index 7e98cf478589c064ba9685b1ed783edd0e8a7859..53ae7c9e8f7245b91eeca48236745ae1ed6a2fa0 100644 (file)
@@ -1,3 +1,136 @@
+2006-09-20  Eric Seidel  <eric@eseidel.com>
+
+        Reviewed by beth.
+
+        Cleanup style in KCanvas.
+        Remove extra white-space, unneeded arguments, etc.
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * kcanvas/KCanvasClipper.cpp:
+        (WebCore::operator<<):
+        (WebCore::KCanvasClipper::externalRepresentation):
+        * kcanvas/KCanvasClipper.h:
+        * kcanvas/KCanvasFilters.cpp:
+        (WebCore::KCanvasFilter::externalRepresentation):
+        (WebCore::operator<<):
+        (WebCore::KCanvasFilterEffect::externalRepresentation):
+        (WebCore::KCPointLightSource::externalRepresentation):
+        (WebCore::KCSpotLightSource::externalRepresentation):
+        (WebCore::KCDistantLightSource::externalRepresentation):
+        (WebCore::KCanvasFEBlend::externalRepresentation):
+        (WebCore::KCanvasFEColorMatrix::externalRepresentation):
+        (WebCore::KCanvasFEComponentTransfer::externalRepresentation):
+        (WebCore::KCanvasFEComposite::externalRepresentation):
+        (WebCore::KCanvasFEConvolveMatrix::externalRepresentation):
+        (WebCore::KCanvasFEDiffuseLighting::externalRepresentation):
+        (WebCore::KCanvasFEDisplacementMap::externalRepresentation):
+        (WebCore::KCanvasFEFlood::externalRepresentation):
+        (WebCore::KCanvasFEGaussianBlur::externalRepresentation):
+        (WebCore::KCanvasFEImage::externalRepresentation):
+        (WebCore::KCanvasFEMerge::externalRepresentation):
+        (WebCore::KCanvasFEMorphology::externalRepresentation):
+        (WebCore::KCanvasFEOffset::externalRepresentation):
+        (WebCore::KCanvasFESpecularLighting::externalRepresentation):
+        (WebCore::KCanvasFETile::externalRepresentation):
+        (WebCore::KCanvasFETurbulence::externalRepresentation):
+        * kcanvas/KCanvasFilters.h:
+        (WebCore::KCanvasFEDiffuseLighting::lightSource):
+        (WebCore::KCanvasFESpecularLighting::lightSource):
+        * kcanvas/KCanvasImage.h:
+        * kcanvas/KCanvasMarker.cpp:
+        (WebCore::KCanvasMarker::externalRepresentation):
+        * kcanvas/KCanvasMarker.h:
+        * kcanvas/KCanvasResource.cpp:
+        (WebCore::operator<<):
+        * kcanvas/KCanvasResource.h:
+        * kcanvas/KCanvasTreeDebug.cpp:
+        (WebCore::operator<<):
+        (WebCore::writeIndent):
+        (WebCore::writeStyle):
+        (WebCore::write):
+        (WebCore::writeRenderResources):
+        * kcanvas/KCanvasTreeDebug.h:
+        (WebCore::operator<<):
+        * kcanvas/RenderForeignObject.cpp:
+        (WebCore::RenderForeignObject::paint):
+        * kcanvas/RenderPath.cpp:
+        (WebCore::RenderPath::paint):
+        (WebCore::drawStartAndMidMarkers):
+        * kcanvas/RenderSVGContainer.cpp:
+        (WebCore::RenderSVGContainer::paint):
+        * kcanvas/RenderSVGImage.cpp:
+        (WebCore::RenderSVGImage::translateForAttributes):
+        * kcanvas/RenderSVGImage.h:
+        * kcanvas/device/KRenderingDevice.cpp:
+        (WebCore::KRenderingDevice::currentContext):
+        (WebCore::KRenderingDevice::popContext):
+        (WebCore::KRenderingDevice::pushContext):
+        * kcanvas/device/KRenderingDevice.h:
+        * kcanvas/device/KRenderingFillPainter.h:
+        * kcanvas/device/KRenderingPaintServer.h:
+        (WebCore::KRenderingPaintServer::KRenderingPaintServer):
+        (WebCore::KRenderingPaintServer::activeClient):
+        (WebCore::KRenderingPaintServer::setActiveClient):
+        * kcanvas/device/KRenderingPaintServerGradient.cpp:
+        (WebCore::operator<<):
+        (WebCore::KRenderingPaintServerGradient::externalRepresentation):
+        (WebCore::KRenderingPaintServerLinearGradient::externalRepresentation):
+        (WebCore::KRenderingPaintServerGradient::listener):
+        (WebCore::KRenderingPaintServerGradient::setListener):
+        (WebCore::KRenderingPaintServerRadialGradient::externalRepresentation):
+        * kcanvas/device/KRenderingPaintServerGradient.h:
+        * kcanvas/device/KRenderingPaintServerPattern.cpp:
+        (WebCore::KRenderingPaintServerPattern::tile):
+        (WebCore::KRenderingPaintServerPattern::setTile):
+        (WebCore::KRenderingPaintServerPattern::listener):
+        (WebCore::KRenderingPaintServerPattern::setListener):
+        (WebCore::KRenderingPaintServerPattern::externalRepresentation):
+        * kcanvas/device/KRenderingPaintServerPattern.h:
+        * kcanvas/device/KRenderingPaintServerSolid.cpp:
+        (WebCore::KRenderingPaintServerSolid::externalRepresentation):
+        * kcanvas/device/KRenderingPaintServerSolid.h:
+        * kcanvas/device/KRenderingStrokePainter.cpp:
+        (WebCore::KRenderingStrokePainter::strokeMiterLimit):
+        (WebCore::KRenderingStrokePainter::setStrokeMiterLimit):
+        * kcanvas/device/KRenderingStrokePainter.h:
+        * kcanvas/device/quartz/KCanvasFilterQuartz.h:
+        * kcanvas/device/quartz/KCanvasFilterQuartz.mm:
+        (WebCore::KCanvasFilterQuartz::prepareFilter):
+        * kcanvas/device/quartz/KCanvasItemQuartz.h: Removed.
+        * kcanvas/device/quartz/KCanvasMaskerQuartz.mm:
+        (WebCore::KCanvasMaskerQuartz::applyMask):
+        * kcanvas/device/quartz/KCanvasResourcesQuartz.h:
+        (WebCore::KCanvasImageQuartz::init):
+        * kcanvas/device/quartz/KCanvasResourcesQuartz.mm:
+        (WebCore::KCanvasClipperQuartz::applyClip):
+        * kcanvas/device/quartz/KRenderingDeviceQuartz.h:
+        * kcanvas/device/quartz/KRenderingDeviceQuartz.mm:
+        (WebCore::KRenderingDeviceQuartz::quartzContext):
+        (WebCore::KRenderingDeviceQuartz::contextForImage):
+        (WebCore::KRenderingDeviceQuartz::createPaintServer):
+        (WebCore::KRenderingDeviceQuartz::createResource):
+        (WebCore::KRenderingDeviceQuartz::createFilterEffect):
+        * kcanvas/device/quartz/KRenderingPaintServerGradientQuartz.mm:
+        (WebCore::CGShadingRefForLinearGradient):
+        (WebCore::CGShadingRefForRadialGradient):
+        (WebCore::KRenderingPaintServerGradientQuartz::updateQuartzGradientCache):
+        (WebCore::KRenderingPaintServerGradientQuartz::teardown):
+        * kcanvas/device/quartz/KRenderingPaintServerQuartz.h:
+        * kcanvas/device/quartz/KRenderingPaintServerQuartz.mm:
+        (WebCore::KRenderingPaintServerQuartzHelper::strokePath):
+        (WebCore::KRenderingPaintServerQuartzHelper::clipToStrokePath):
+        (WebCore::KRenderingPaintServerQuartzHelper::fillPath):
+        (WebCore::KRenderingPaintServerQuartzHelper::clipToFillPath):
+        (WebCore::KRenderingPaintServerSolidQuartz::draw):
+        (WebCore::KRenderingPaintServerSolidQuartz::setup):
+        (WebCore::KRenderingPaintServerSolidQuartz::renderPath):
+        (WebCore::KRenderingPaintServerPatternQuartz::setup):
+        (WebCore::KRenderingPaintServerPatternQuartz::renderPath):
+        (WebCore::KRenderingPaintServerPatternQuartz::teardown):
+        * kcanvas/device/quartz/QuartzSupport.h:
+        * kcanvas/device/quartz/QuartzSupport.mm:
+        (WebCore::applyStrokeStyleToContext):
+
 2006-09-20  Anders Carlsson  <acarlsson@apple.com>
 
         Reviewed by Dave Hyatt.
index 0c26708d44588e15d6cc8846937a29663342e1a5..9d1d88fa9d33dcf7a201b05fdb571d2441591a62 100644 (file)
                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 */; };
-               A88AD3AC0952486D001DD196 /* KCanvasItemQuartz.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C0FB6B089701F800BA5114 /* KCanvasItemQuartz.h */; };
                A88AD3AD0952486D001DD196 /* KCanvasItemQuartz.mm in Sources */ = {isa = PBXBuildFile; fileRef = A8C0FB6C089701F800BA5114 /* KCanvasItemQuartz.mm */; };
                A88AD3AE0952486D001DD196 /* KCanvasResourcesQuartz.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C0FB6D089701F800BA5114 /* KCanvasResourcesQuartz.h */; };
                A88AD3AF0952486D001DD196 /* KCanvasResourcesQuartz.mm in Sources */ = {isa = PBXBuildFile; fileRef = A8C0FB6E089701F800BA5114 /* KCanvasResourcesQuartz.mm */; };
                A8C0FB65089701F700BA5114 /* KRenderingStrokePainter.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KRenderingStrokePainter.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; };
-               A8C0FB6B089701F800BA5114 /* KCanvasItemQuartz.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KCanvasItemQuartz.h; 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; };
                A8C0FB6D089701F800BA5114 /* KCanvasResourcesQuartz.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KCanvasResourcesQuartz.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                A8C0FB6E089701F800BA5114 /* KCanvasResourcesQuartz.mm */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = KCanvasResourcesQuartz.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                                A8C3291F093BB732000B9CAC /* filters */,
                                A8C0FB69089701F800BA5114 /* KCanvasFilterQuartz.h */,
                                A8C0FB6A089701F800BA5114 /* KCanvasFilterQuartz.mm */,
-                               A8C0FB6B089701F800BA5114 /* KCanvasItemQuartz.h */,
                                A8C0FB6C089701F800BA5114 /* KCanvasItemQuartz.mm */,
                                A81655D2096BBEAC00601058 /* KCanvasMaskerQuartz.h */,
                                A81655D3096BBEAC00601058 /* KCanvasMaskerQuartz.mm */,
                                A88AD3A50952486D001DD196 /* WKSpecularLightingFilter.h in Headers */,
                                A88AD3A80952486D001DD196 /* WKSpotLightFilter.h in Headers */,
                                A88AD3AA0952486D001DD196 /* KCanvasFilterQuartz.h in Headers */,
-                               A88AD3AC0952486D001DD196 /* KCanvasItemQuartz.h in Headers */,
                                A88AD3AE0952486D001DD196 /* KCanvasResourcesQuartz.h in Headers */,
                                A88AD3B00952486E001DD196 /* KRenderingDeviceQuartz.h in Headers */,
                                A88AD3B30952486E001DD196 /* KRenderingPaintServerQuartz.h in Headers */,
index 2a9feb939878955e4ed3cbce528de73f139ad203..feeffc836108222ce149d603f5770a73402e4e54 100644 (file)
@@ -29,7 +29,7 @@
 
 namespace WebCore {
 
-TextStream &operator<<(TextStream &ts, WindRule rule)
+TextStream& operator<<(TextStream& ts, WindRule rule)
 {
     switch (rule) {
         case RULE_NONZERO:
@@ -40,7 +40,7 @@ TextStream &operator<<(TextStream &ts, WindRule rule)
     return ts;
 }
 
-TextStream &operator<<(TextStream &ts, const KCClipData &d)
+TextStream& operator<<(TextStream& ts, const KCClipData &d)
 {
     ts << "[winding=" << d.windRule() << "]";
     if (d.bboxUnits)
@@ -72,7 +72,7 @@ KCClipDataList KCanvasClipper::clipData() const
     return m_clipData;
 }
 
-TextStream& KCanvasClipper::externalRepresentation(TextStream &ts) const
+TextStream& KCanvasClipper::externalRepresentation(TextStreamts) const
 {
     ts << "[type=CLIPPER]";
     ts << " [clip data=" << clipData() << "]";
@@ -83,7 +83,7 @@ KCanvasClipper *getClipperById(Document *document, const AtomicString &id)
 {
     KCanvasResource *resource = getResourceById(document, id);
     if (resource && resource->isClipper())
-        return static_cast<KCanvasClipper *>(resource);
+        return static_cast<KCanvasClipper*>(resource);
     return 0;
 }
 
index a6526577ad9c0c6dd8b35b04c0028e31ef9fa73d..b55c78bf359f11cc697a302d52ed7df11e37aa6b 100644 (file)
@@ -28,7 +28,7 @@
 
 namespace WebCore {
 
-typedef DeprecatedValueList<const RenderPath *> RenderPathList;
+typedef DeprecatedValueList<const RenderPath*> RenderPathList;
 
 class TextStream;
 
@@ -70,7 +70,7 @@ public:
 
     KCClipDataList clipData() const;
 
-    TextStream& externalRepresentation(TextStream &) const; 
+    TextStream& externalRepresentation(TextStream&) const; 
 protected:
     KCClipDataList m_clipData;
 };
index e35ce96756b073f7532f4a5c3e57a96a3742b598..a55c32397efc9fe00047000f754faea3bb9ff070 100644 (file)
@@ -67,7 +67,7 @@ FloatRect KCanvasFilter::filterBBoxForItemBBox(FloatRect itemBBox) const
     return filterBBox;
 }
 
-TextStream &KCanvasFilter::externalRepresentation(TextStream &ts) const
+TextStream& KCanvasFilter::externalRepresentation(TextStream& ts) const
 {
     ts << "[type=FILTER] ";
     FloatRect bbox = filterRect();
@@ -94,11 +94,11 @@ KCanvasFilter *getFilterById(Document *document, const AtomicString &id)
 {
     KCanvasResource *resource = getResourceById(document, id);
     if (resource && resource->isFilter())
-        return static_cast<KCanvasFilter *>(resource);
+        return static_cast<KCanvasFilter*>(resource);
     return 0;
 }
 
-TextStream &operator<<(TextStream &ts, const KCanvasFilterEffect &e)
+TextStream& operator<<(TextStream& ts, const KCanvasFilterEffect &e)
 {
     return e.externalRepresentation(ts);
 }
@@ -133,13 +133,13 @@ void KCanvasFilterEffect::setResult(const String &result)
     m_result = result;
 }
 
-static TextStream &operator<<(TextStream &ts, const KCanvasPoint3F p)
+static TextStream& operator<<(TextStream& ts, const KCanvasPoint3F p)
 {
     ts << "x=" << p.x() << " y=" << p.y() << " z=" << p.z();
     return ts;  
 }
 
-TextStream &KCanvasFilterEffect::externalRepresentation(TextStream &ts) const
+TextStream& KCanvasFilterEffect::externalRepresentation(TextStream& ts) const
 {
     if (!in().isEmpty())
         ts << "[in=\"" << in() << "\"]";
@@ -150,14 +150,14 @@ TextStream &KCanvasFilterEffect::externalRepresentation(TextStream &ts) const
     return ts;    
 }
 
-TextStream &KCPointLightSource::externalRepresentation(TextStream &ts) const
+TextStream& KCPointLightSource::externalRepresentation(TextStream& ts) const
 {
     ts << "[type=POINT-LIGHT] ";
     ts << "[position=\"" << position() << "\"]";
     return ts;  
 }
 
-TextStream &KCSpotLightSource::externalRepresentation(TextStream &ts) const
+TextStream& KCSpotLightSource::externalRepresentation(TextStream& ts) const
 {
     ts << "[type=SPOT-LIGHT] ";
     ts << "[position=\"" << position() << "\"]";
@@ -167,7 +167,7 @@ TextStream &KCSpotLightSource::externalRepresentation(TextStream &ts) const
     return ts;
 }
 
-TextStream &KCDistantLightSource::externalRepresentation(TextStream &ts) const
+TextStream& KCDistantLightSource::externalRepresentation(TextStream& ts) const
 {
     ts << "[type=DISTANT-LIGHT] ";
     ts << "[azimuth=\"" << azimuth() << "\"]";
@@ -175,7 +175,7 @@ TextStream &KCDistantLightSource::externalRepresentation(TextStream &ts) const
     return ts;  
 }
 
-static TextStream &operator<<(TextStream &ts, KCBlendModeType t)
+static TextStream& operator<<(TextStream& ts, KCBlendModeType t)
 {
     switch (t) 
     {
@@ -193,7 +193,7 @@ static TextStream &operator<<(TextStream &ts, KCBlendModeType t)
     return ts;        
 }
 
-TextStream &KCanvasFEBlend::externalRepresentation(TextStream &ts) const
+TextStream& KCanvasFEBlend::externalRepresentation(TextStream& ts) const
 {
     ts << "[type=BLEND] ";
     KCanvasFilterEffect::externalRepresentation(ts);
@@ -203,7 +203,7 @@ TextStream &KCanvasFEBlend::externalRepresentation(TextStream &ts) const
     return ts;
 }
 
-static TextStream &operator<<(TextStream &ts, KCColorMatrixType t)
+static TextStream& operator<<(TextStream& ts, KCColorMatrixType t)
 {
     switch (t) 
     {
@@ -219,7 +219,7 @@ static TextStream &operator<<(TextStream &ts, KCColorMatrixType t)
     return ts;        
 }
 
-TextStream &KCanvasFEColorMatrix::externalRepresentation(TextStream &ts) const
+TextStream& KCanvasFEColorMatrix::externalRepresentation(TextStream& ts) const
 {
     ts << "[type=COLOR-MATRIX] "; 
     KCanvasFilterEffect::externalRepresentation(ts);
@@ -228,7 +228,7 @@ TextStream &KCanvasFEColorMatrix::externalRepresentation(TextStream &ts) const
     return ts;
 }
 
-static TextStream &operator<<(TextStream &ts, KCComponentTransferType t)
+static TextStream& operator<<(TextStream& ts, KCComponentTransferType t)
 {
     switch (t) 
     {
@@ -246,7 +246,7 @@ static TextStream &operator<<(TextStream &ts, KCComponentTransferType t)
     return ts;
 }
 
-static TextStream &operator<<(TextStream &ts, const KCComponentTransferFunction &func)
+static TextStream& operator<<(TextStream& ts, const KCComponentTransferFunction &func)
 {
     ts << "[type=" << func.type << "]"; 
     switch (func.type) {
@@ -279,7 +279,7 @@ static TextStream &operator<<(TextStream &ts, const KCComponentTransferFunction
     return ts;        
 }
 
-TextStream &KCanvasFEComponentTransfer::externalRepresentation(TextStream &ts) const
+TextStream& KCanvasFEComponentTransfer::externalRepresentation(TextStream& ts) const
 {
     ts << "[type=COMPONENT-TRANSFER] ";
     KCanvasFilterEffect::externalRepresentation(ts);
@@ -290,7 +290,7 @@ TextStream &KCanvasFEComponentTransfer::externalRepresentation(TextStream &ts) c
     return ts;  
 }
 
-TextStream &KCanvasFEComposite::externalRepresentation(TextStream &ts) const
+TextStream& KCanvasFEComposite::externalRepresentation(TextStream& ts) const
 {
     ts << "[type=COMPOSITE] ";
     KCanvasFilterEffect::externalRepresentation(ts);
@@ -300,7 +300,7 @@ TextStream &KCanvasFEComposite::externalRepresentation(TextStream &ts) const
     return ts;
 }
 
-static TextStream &operator<<(TextStream &ts, KCEdgeModeType t)
+static TextStream& operator<<(TextStream& ts, KCEdgeModeType t)
 {   
     switch (t) 
     {
@@ -314,7 +314,7 @@ static TextStream &operator<<(TextStream &ts, KCEdgeModeType t)
     return ts;
 }
 
-TextStream &KCanvasFEConvolveMatrix::externalRepresentation(TextStream &ts) const
+TextStream& KCanvasFEConvolveMatrix::externalRepresentation(TextStream& ts) const
 {
     ts << "[type=CONVOLVE-MATRIX] ";
     KCanvasFilterEffect::externalRepresentation(ts);
@@ -345,7 +345,7 @@ void KCanvasFESpecularLighting::setLightSource(KCLightSource *lightSource)
     }
 }
 
-TextStream &KCanvasFEDiffuseLighting::externalRepresentation(TextStream &ts) const
+TextStream& KCanvasFEDiffuseLighting::externalRepresentation(TextStream& ts) const
 {
     ts << "[type=DIFFUSE-LIGHTING] ";
     KCanvasFilterEffect::externalRepresentation(ts);
@@ -355,7 +355,7 @@ TextStream &KCanvasFEDiffuseLighting::externalRepresentation(TextStream &ts) con
    return ts;
 }
 
-static TextStream &operator<<(TextStream &ts, KCChannelSelectorType t)
+static TextStream& operator<<(TextStream& ts, KCChannelSelectorType t)
 {
     switch (t)
     {
@@ -371,7 +371,7 @@ static TextStream &operator<<(TextStream &ts, KCChannelSelectorType t)
     return ts;
 }
 
-TextStream &KCanvasFEDisplacementMap::externalRepresentation(TextStream &ts) const
+TextStream& KCanvasFEDisplacementMap::externalRepresentation(TextStream& ts) const
 {
     ts << "[type=DISPLACEMENT-MAP] "; 
     KCanvasFilterEffect::externalRepresentation(ts);
@@ -383,7 +383,7 @@ TextStream &KCanvasFEDisplacementMap::externalRepresentation(TextStream &ts) con
    return ts;
 }
 
-TextStream &KCanvasFEFlood::externalRepresentation(TextStream &ts) const
+TextStream& KCanvasFEFlood::externalRepresentation(TextStream& ts) const
 {
     ts << "[type=FLOOD] "; 
     KCanvasFilterEffect::externalRepresentation(ts);
@@ -412,7 +412,7 @@ void KCanvasFEGaussianBlur::setStdDeviationY(float y)
     m_y = y;
 }
 
-TextStream &KCanvasFEGaussianBlur::externalRepresentation(TextStream &ts) const
+TextStream& KCanvasFEGaussianBlur::externalRepresentation(TextStream& ts) const
 {
     ts << "[type=GAUSSIAN-BLUR] "; 
     KCanvasFilterEffect::externalRepresentation(ts);
@@ -420,7 +420,7 @@ TextStream &KCanvasFEGaussianBlur::externalRepresentation(TextStream &ts) const
     return ts;
 }
 
-TextStream &KCanvasFEImage::externalRepresentation(TextStream &ts) const
+TextStream& KCanvasFEImage::externalRepresentation(TextStream& ts) const
 {
     ts << "[type=IMAGE] "; 
     KCanvasFilterEffect::externalRepresentation(ts);
@@ -428,7 +428,7 @@ TextStream &KCanvasFEImage::externalRepresentation(TextStream &ts) const
     return ts;
 }
 
-TextStream &KCanvasFEMerge::externalRepresentation(TextStream &ts) const
+TextStream& KCanvasFEMerge::externalRepresentation(TextStream& ts) const
 {
     ts << "[type=MERGE] ";
     KCanvasFilterEffect::externalRepresentation(ts);
@@ -445,7 +445,7 @@ TextStream &KCanvasFEMerge::externalRepresentation(TextStream &ts) const
     return ts;
 }
 
-static TextStream &operator<<(TextStream &ts, KCMorphologyOperatorType t)
+static TextStream& operator<<(TextStream& ts, KCMorphologyOperatorType t)
 {
     switch (t)
     {
@@ -457,7 +457,7 @@ static TextStream &operator<<(TextStream &ts, KCMorphologyOperatorType t)
     return ts;
 }
 
-TextStream &KCanvasFEMorphology::externalRepresentation(TextStream &ts) const
+TextStream& KCanvasFEMorphology::externalRepresentation(TextStream& ts) const
 {
     ts << "[type=MORPHOLOGY-OPERATOR] "; 
     KCanvasFilterEffect::externalRepresentation(ts);
@@ -466,14 +466,14 @@ TextStream &KCanvasFEMorphology::externalRepresentation(TextStream &ts) const
    return ts;
 }
 
-TextStream &KCanvasFEOffset::externalRepresentation(TextStream &ts) const
+TextStream& KCanvasFEOffset::externalRepresentation(TextStream& ts) const
 {
     ts << "[type=OFFSET] "; KCanvasFilterEffect::externalRepresentation(ts)
         << " [dx=" << dx() << " dy=" << dy() << "]";    
    return ts;
 }
 
-TextStream &KCanvasFESpecularLighting::externalRepresentation(TextStream &ts) const
+TextStream& KCanvasFESpecularLighting::externalRepresentation(TextStream& ts) const
 {
     ts << "[type=SPECULAR-LIGHTING] ";
     KCanvasFilterEffect::externalRepresentation(ts);
@@ -485,14 +485,14 @@ TextStream &KCanvasFESpecularLighting::externalRepresentation(TextStream &ts) co
 
 #if 0
 ///FIXME: KCanvasFETile doesn't have any properties
-TextStream &KCanvasFETile::externalRepresentation(TextStream &ts) const
+TextStream& KCanvasFETile::externalRepresentation(TextStream& ts) const
 {
    KCanvasFilterEffect::externalRepresentation(ts);
    return ts;
 }
 #endif
 
-static TextStream &operator<<(TextStream &ts, KCTurbulanceType t)
+static TextStream& operator<<(TextStream& ts, KCTurbulanceType t)
 {
     switch (t)
     {
@@ -504,7 +504,7 @@ static TextStream &operator<<(TextStream &ts, KCTurbulanceType t)
     return ts;
 }
 
-TextStream &KCanvasFETurbulence::externalRepresentation(TextStream &ts) const
+TextStream& KCanvasFETurbulence::externalRepresentation(TextStream& ts) const
 {
     ts << "[type=TURBULENCE] "; 
     KCanvasFilterEffect::externalRepresentation(ts);
index e4fb72a56c1eea463bfdca066e72f99bc6235124..71c2a27a55f79b285923231c6c33af680c28d827 100644 (file)
@@ -115,21 +115,21 @@ public:
     FloatRect filterBBoxForItemBBox(FloatRect itemBBox) const;
 
     void clearEffects();
-    void addFilterEffect(KCanvasFilterEffect *effect);
+    void addFilterEffect(KCanvasFilterEffect*);
 
     virtual void prepareFilter(const FloatRect &bbox) = 0;
     virtual void applyFilter(const FloatRect &bbox) = 0;
 
-    TextStream &externalRepresentation(TextStream &) const;
+    TextStream& externalRepresentation(TextStream&) const;
 
 protected:
     FloatRect m_filterRect;
-    DeprecatedValueList<KCanvasFilterEffect *> m_effects;
+    DeprecatedValueList<KCanvasFilterEffect> m_effects;
     bool m_filterBBoxMode;
     bool m_effectBBoxMode;
 };
 
-KCanvasFilter *getFilterById(Document *document, const AtomicString &id);
+KCanvasFilter* getFilterById(Document*, const AtomicString&);
 
 class KCanvasFilterEffect {
 public:
@@ -140,19 +140,19 @@ public:
     virtual KCFilterEffectType effectType() const { return FE_TURBULENCE; }
 
     FloatRect subRegion() const;
-    void setSubRegion(const FloatRect &subregion);
+    void setSubRegion(const FloatRect&);
 
     String in() const;
-    void setIn(const String &in);
+    void setIn(const String&);
 
     String result() const;
-    void setResult(const String &result);
+    void setResult(const String&);
 
 #if __APPLE__
     virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const = 0;
 #endif
 
-    virtual TextStream &externalRepresentation(TextStream &) const;
+    virtual TextStream& externalRepresentation(TextStream&) const;
 
 private:
     FloatRect m_subregion;
@@ -160,7 +160,7 @@ private:
     String m_result;
 };
 
-TextStream &operator<<(TextStream &, const KCanvasFilterEffect &);
+TextStream& operator<<(TextStream&, const KCanvasFilterEffect&);
 
 typedef enum {
     BM_NORMAL = 0,
@@ -178,7 +178,7 @@ public:
     KCBlendModeType blendMode() const { return m_mode; }
     void setBlendMode(KCBlendModeType mode) { m_mode = mode; }
 
-    TextStream &externalRepresentation(TextStream &) const;
+    TextStream& externalRepresentation(TextStream&) const;
 
 private:
     KCBlendModeType m_mode;
@@ -200,7 +200,7 @@ public:
     DeprecatedValueList<float> values() const { return m_values; }
     void setValues(const DeprecatedValueList<float> &values) { m_values = values; };
 
-    TextStream &externalRepresentation(TextStream &) const;
+    TextStream& externalRepresentation(TextStream&) const;
 
 private:
     KCColorMatrixType m_type;
@@ -279,7 +279,7 @@ public:
     float k4() const { return m_k4; }
     void setK4(float k4) { m_k4 = k4; }
 
-    TextStream &externalRepresentation(TextStream &) const;
+    TextStream& externalRepresentation(TextStream&) const;
 
 private:
     String m_in2;
@@ -324,7 +324,7 @@ public:
     bool preserveAlpha() const { return m_preserveAlpha; }
     void setPreserveAlpha(bool preserveAlpha) { m_preserveAlpha = preserveAlpha; }
 
-    TextStream &externalRepresentation(TextStream &) const;
+    TextStream& externalRepresentation(TextStream&) const;
 
 private:
     FloatSize m_kernelSize;
@@ -355,7 +355,7 @@ public:
     
     KCLightType type() const { return m_type; }
     
-    virtual TextStream &externalRepresentation(TextStream &) const = 0;
+    virtual TextStream& externalRepresentation(TextStream&) const = 0;
     
 private:
     KCLightType m_type;
@@ -373,7 +373,7 @@ public:
     float azimuth() const{ return m_azimuth; }
     float elevation() const{ return m_elevation; }
     
-    virtual TextStream &externalRepresentation(TextStream &) const;
+    virtual TextStream& externalRepresentation(TextStream&) const;
     
 private:
     float m_azimuth;
@@ -444,10 +444,10 @@ public:
     float kernelUnitLengthY() const { return m_kernelUnitLengthY; }
     void setKernelUnitLengthY(float kernelUnitLengthY) { m_kernelUnitLengthY = kernelUnitLengthY; }
 
-    const KCLightSource *lightSource() const { return m_lightSource; }
-    void setLightSource(KCLightSource *lightSource);
+    const KCLightSourcelightSource() const { return m_lightSource; }
+    void setLightSource(KCLightSource*);
     
-    TextStream &externalRepresentation(TextStream &) const;
+    TextStream& externalRepresentation(TextStream&) const;
 
 private:
     Color m_lightingColor;
@@ -455,7 +455,7 @@ private:
     float m_diffuseConstant;
     float m_kernelUnitLengthX;
     float m_kernelUnitLengthY;
-    KCLightSource *m_lightSource;
+    KCLightSourcem_lightSource;
 };
 
 typedef enum {
@@ -486,7 +486,7 @@ public:
     float scale() const { return m_scale; }
     void setScale(float scale) { m_scale = scale; }
     
-    TextStream &externalRepresentation(TextStream &) const;
+    TextStream& externalRepresentation(TextStream&) const;
     
 private:
     String m_in2;
@@ -503,7 +503,7 @@ public:
     float floodOpacity() const { return m_floodOpacity; }
     void setFloodOpacity(float floodOpacity) { m_floodOpacity = floodOpacity; }
 
-    TextStream &externalRepresentation(TextStream &) const;
+    TextStream& externalRepresentation(TextStream&) const;
 
 private:
     Color m_floodColor;
@@ -513,12 +513,12 @@ private:
 class KCanvasFEGaussianBlur : public KCanvasFilterEffect {
 public:
     float stdDeviationX() const;
-    void setStdDeviationX(float x);
+    void setStdDeviationX(float);
 
     float stdDeviationY() const;
-    void setStdDeviationY(float y);
+    void setStdDeviationY(float);
 
-    TextStream &externalRepresentation(TextStream &) const;
+    TextStream& externalRepresentation(TextStream&) const;
 
 private:
     float m_x;
@@ -534,12 +534,12 @@ public:
 
     virtual ~KCanvasFEImage();
     
-    // FIXME: Eventually we need to support <svg> (RenderObject *) as well as image data.
+    // FIXME: Eventually we need to support <svg> (RenderObject*) as well as image data.
     
     CachedImage* cachedImage() const { return m_cachedImage; }
-    void setCachedImage(CachedImage* image);
+    void setCachedImage(CachedImage*);
 
-    TextStream &externalRepresentation(TextStream &) const;
+    TextStream& externalRepresentation(TextStream&) const;
     
 private:
     CachedImage* m_cachedImage;
@@ -550,7 +550,7 @@ public:
     const Vector<String>& mergeInputs() const { return m_mergeInputs; }
     void setMergeInputs(const Vector<String>& mergeInputs) { m_mergeInputs = mergeInputs; }
 
-    TextStream &externalRepresentation(TextStream &) const;
+    TextStream& externalRepresentation(TextStream&) const;
     
 private:
     Vector<String> m_mergeInputs;
@@ -572,7 +572,7 @@ public:
     float radiusY() const { return m_radiusY; }
     void setRadiusY(float radiusY) { m_radiusY = radiusY; }
     
-    TextStream &externalRepresentation(TextStream &) const;
+    TextStream& externalRepresentation(TextStream&) const;
     
 private:
     KCMorphologyOperatorType m_operator;
@@ -588,7 +588,7 @@ public:
     float dy() const { return m_dy; }
     void setDy(float dy) { m_dy = dy; }
     
-    TextStream &externalRepresentation(TextStream &) const;
+    TextStream& externalRepresentation(TextStream&) const;
     
 private:
     float m_dx;
@@ -621,10 +621,10 @@ public:
     float kernelUnitLengthY() const { return m_kernelUnitLengthY; }
     void setKernelUnitLengthY(float kernelUnitLengthY) { m_kernelUnitLengthY = kernelUnitLengthY; }
     
-    const KCLightSource *lightSource() const { return m_lightSource; }
-    void setLightSource(KCLightSource *lightSource);
+    const KCLightSourcelightSource() const { return m_lightSource; }
+    void setLightSource(KCLightSource*);
     
-    TextStream &externalRepresentation(TextStream &) const;
+    TextStream& externalRepresentation(TextStream&) const;
     
 private:
     Color m_lightingColor;
@@ -633,7 +633,7 @@ private:
     float m_specularExponent;
     float m_kernelUnitLengthX;
     float m_kernelUnitLengthY;
-    KCLightSource *m_lightSource;
+    KCLightSourcem_lightSource;
 };
 
 class KCanvasFETile : public KCanvasFilterEffect { };
@@ -663,7 +663,7 @@ public:
     bool stitchTiles() const { return m_stitchTiles; }
     void setStitchTiles(bool stitch) { m_stitchTiles = stitch; }
 
-    TextStream &externalRepresentation(TextStream &) const;
+    TextStream& externalRepresentation(TextStream&) const;
     
 private:
     float m_baseFrequencyX;
index 7e1e6bd91a5c1982259a66df5147f3edf8fd0470..822a4c9dc237239e6b93c178b86693ec7c385de2 100644 (file)
@@ -36,7 +36,7 @@ public:
     KCanvasImage() { };
     virtual ~KCanvasImage() { };
 
-    virtual void init(const Image &) = 0;
+    virtual void init(const Image&) = 0;
     virtual void init(IntSize) = 0;
 
     virtual IntSize size() = 0;
index 4c08432fbd87ce91780ebeffa1b8866c1f429705..df33dde0f38246690d88064ad3303a2526860a87 100644 (file)
@@ -126,7 +126,7 @@ void KCanvasMarker::draw(GraphicsContext* context, const FloatRect& rect, double
     context->restore();
 }
 
-TextStream& KCanvasMarker::externalRepresentation(TextStream &ts) const
+TextStream& KCanvasMarker::externalRepresentation(TextStreamts) const
 {
     ts << "[type=MARKER]"
        << " [angle=";
@@ -142,7 +142,7 @@ KCanvasMarker *getMarkerById(Document *document, const AtomicString &id)
 {
     KCanvasResource *resource = getResourceById(document, id);
     if (resource && resource->isMarker())
-        return static_cast<KCanvasMarker *>(resource);
+        return static_cast<KCanvasMarker*>(resource);
     return 0;
 }
 
index e01031dfcffce27168eca4b5ed0846d078ae2c85..716a9e03be8930c50618b4e30bf487098dc22c9e 100644 (file)
@@ -51,7 +51,7 @@ public:
 
     void draw(GraphicsContext*, const FloatRect&, double x, double y, double strokeWidth = 1, double angle = 0);
 
-    TextStream& externalRepresentation(TextStream &) const; 
+    TextStream& externalRepresentation(TextStream&) const; 
 
 private:
     double m_refX, m_refY;
index f407a6fc79eafb3085a24a5541c0673678ac31b0..79e6289dfb9abc0fa8dadfb8d8018b71e2901761 100644 (file)
@@ -30,7 +30,7 @@
 
 namespace WebCore {
 
-TextStream &operator<<(TextStream& ts, const KCanvasResource& r) 
+TextStreamoperator<<(TextStream& ts, const KCanvasResource& r) 
 { 
     return r.externalRepresentation(ts); 
 }
index b2bdd1744327323ee3e1803eeb999a97da39c1df..2f4b88f6c29f0d30c6870bad8c74512a050e2cae 100644 (file)
@@ -31,7 +31,7 @@
 
 namespace WebCore {
 
-typedef DeprecatedValueList<const RenderPath *> RenderPathList;
+typedef DeprecatedValueList<const RenderPath*> RenderPathList;
 
 class TextStream;
 
@@ -67,7 +67,7 @@ public:
     virtual bool isMarker() const { return false; }
     virtual bool isMasker() const { return false; }
     
-    virtual TextStream& externalRepresentation(TextStream &) const; 
+    virtual TextStream& externalRepresentation(TextStream&) const; 
 private:
     RenderPathList m_clients;
     String m_registryId;
@@ -76,7 +76,7 @@ private:
 KCanvasResource* getResourceById(Document*, const AtomicString&);
 KRenderingPaintServer* getPaintServerById(Document*, const AtomicString&);
 
-TextStream &operator<<(TextStream&, const KCanvasResource&);
+TextStreamoperator<<(TextStream&, const KCanvasResource&);
 
 }
 
index e338f3bb3ca096b0b4808380465adf33d9d8f727..8203b055b235fa4543f91fcc14516b5011044aeb 100644 (file)
@@ -54,14 +54,14 @@ class TextStreamSeparator
 public:
     TextStreamSeparator(const DeprecatedString &s) : m_separator(s), m_needToSeparate(false) {}
 private:
-    friend TextStream& operator<<(TextStream &ts, TextStreamSeparator &sep);
+    friend TextStream& operator<<(TextStreamts, TextStreamSeparator &sep);
     
 private:
     DeprecatedString m_separator;
     bool m_needToSeparate;
 };
 
-TextStream& operator<<(TextStream &ts, TextStreamSeparator &sep)
+TextStream& operator<<(TextStreamts, TextStreamSeparator &sep)
 {
     if (sep.m_needToSeparate)
         ts << sep.m_separator;
@@ -70,12 +70,12 @@ TextStream& operator<<(TextStream &ts, TextStreamSeparator &sep)
     return ts;
 }
 
-TextStream &operator<<(TextStream &ts, const IntPoint &p)
+TextStream& operator<<(TextStream& ts, const IntPoint &p)
 {
     return ts << "(" << p.x() << "," << p.y() << ")";
 }
 
-TextStream &operator<<(TextStream &ts, const IntRect &r)
+TextStream& operator<<(TextStream& ts, const IntRect &r)
 {
     return ts << "at (" << r.x() << "," << r.y() << ") size " << r.width() << "x" << r.height();
 }
@@ -88,7 +88,7 @@ bool hasFractions(double val)
     return (fabs(val-dval) > epsilon);
 }
 
-TextStream &operator<<(TextStream &ts, const FloatRect &r)
+TextStream& operator<<(TextStream& ts, const FloatRect &r)
 {
     ts << "at ("; 
     if (hasFractions(r.x())) 
@@ -113,7 +113,7 @@ TextStream &operator<<(TextStream &ts, const FloatRect &r)
     return ts;
 }
 
-TextStream &operator<<(TextStream &ts, const FloatPoint &p)
+TextStream& operator<<(TextStream& ts, const FloatPoint &p)
 {
     ts << "(";    
     if (hasFractions(p.x()))
@@ -128,7 +128,7 @@ TextStream &operator<<(TextStream &ts, const FloatPoint &p)
     return ts << ")";
 }
 
-TextStream &operator<<(TextStream &ts, const FloatSize &s)
+TextStream& operator<<(TextStream& ts, const FloatSize &s)
 {   
     ts << "width=";
     if (hasFractions(s.width()))
@@ -144,7 +144,7 @@ TextStream &operator<<(TextStream &ts, const FloatSize &s)
 }
 
 
-TextStream &operator<<(TextStream &ts, const AffineTransform &m)
+TextStream& operator<<(TextStream& ts, const AffineTransform &m)
 {
     if (m.isIdentity())
         ts << "identity";
@@ -156,12 +156,12 @@ TextStream &operator<<(TextStream &ts, const AffineTransform &m)
     return ts;
 }
 
-TextStream &operator<<(TextStream &ts, const Color &c)
+TextStream& operator<<(TextStream& ts, const Color &c)
 {
     return ts << c.name();
 }
 
-static void writeIndent(TextStream &ts, int indent)
+static void writeIndent(TextStreamts, int indent)
 {
     for (int i = 0; i != indent; ++i) {
         ts << "  ";
@@ -169,7 +169,7 @@ static void writeIndent(TextStream &ts, int indent)
 }
 
 //FIXME: This should be in KRenderingStyle.cpp
-static TextStream &operator<<(TextStream &ts, const KCDashArray &a)
+static TextStream& operator<<(TextStream& ts, const KCDashArray &a)
 {
     ts << "{";
     for (KCDashArray::ConstIterator it = a.begin(); it != a.end(); ++it) {
@@ -182,7 +182,7 @@ static TextStream &operator<<(TextStream &ts, const KCDashArray &a)
 }
 
 //FIXME: This should be in KRenderingStyle.cpp
-static TextStream &operator<<(TextStream &ts, KCCapStyle style)
+static TextStream& operator<<(TextStream& ts, KCCapStyle style)
 {
     switch (style) {
     case CAP_BUTT:
@@ -196,7 +196,7 @@ static TextStream &operator<<(TextStream &ts, KCCapStyle style)
 }
 
 //FIXME: This should be in KRenderingStyle.cpp
-static TextStream &operator<<(TextStream &ts, KCJoinStyle style)
+static TextStream& operator<<(TextStream& ts, KCJoinStyle style)
 {
     switch (style) {
     case JOIN_MITER:
@@ -214,10 +214,10 @@ static TextStream &operator<<(TextStream &ts, KCJoinStyle style)
 // for the parent object
 #define DIFFERS_FROM_PARENT_AVOID_TEST_IF_FALSE(pred, path) (!parentStyle || ((!parentStyle->pred) || (parentStyle->path != childStyle->path)))
 
-static void writeStyle(TextStream &ts, const RenderObject &object)
+static void writeStyle(TextStreamts, const RenderObject &object)
 {
-    const RenderStyle *style = object.style();
-    const SVGRenderStyle *svgStyle = style->svgStyle();
+    const RenderStylestyle = object.style();
+    const SVGRenderStylesvgStyle = style->svgStyle();
     
     if (!object.localTransform().isIdentity())
         ts << " [transform=" << object.localTransform() << "]";
@@ -286,7 +286,7 @@ static void writeStyle(TextStream &ts, const RenderObject &object)
 #undef DIFFERS_FROM_PARENT
 #undef DIFFERS_FROM_PARENT_AVOID_TEST_IF_FALSE
 
-static TextStream &operator<<(TextStream &ts, const RenderPath &o)
+static TextStream& operator<<(TextStream& ts, const RenderPath &o)
 {
     ts << " " << o.absoluteTransform().mapRect(o.relativeBBox());
     
@@ -297,7 +297,7 @@ static TextStream &operator<<(TextStream &ts, const RenderPath &o)
     return ts;
 }
 
-static TextStream &operator<<(TextStream &ts, const RenderSVGContainer &o)
+static TextStream& operator<<(TextStream& ts, const RenderSVGContainer &o)
 {
     ts << " " << o.absoluteTransform().mapRect(o.relativeBBox());
     
@@ -308,13 +308,13 @@ static TextStream &operator<<(TextStream &ts, const RenderSVGContainer &o)
 
 static DeprecatedString getTagName(void *node)
 {
-    SVGStyledElement *elem = static_cast<SVGStyledElement *>(node);
+    SVGStyledElement *elem = static_cast<SVGStyledElement*>(node);
     if (elem)
         return String(elem->nodeName()).deprecatedString();
     return DeprecatedString();
 }
 
-void write(TextStream &ts, const RenderSVGContainer &container, int indent)
+void write(TextStreamts, const RenderSVGContainer &container, int indent)
 {
     writeIndent(ts, indent);
     ts << container.renderName();
@@ -331,7 +331,7 @@ void write(TextStream &ts, const RenderSVGContainer &container, int indent)
         write(ts, *child, indent + 1);
 }
 
-void write(TextStream &ts, const RenderPath &path, int indent)
+void write(TextStreamts, const RenderPath &path, int indent)
 {
     writeIndent(ts, indent);
     ts << path.renderName();
@@ -345,31 +345,31 @@ void write(TextStream &ts, const RenderPath &path, int indent)
     ts << path << endl;
 }
 
-void writeRenderResources(TextStream &ts, Node *parent)
+void writeRenderResources(TextStreamts, Node *parent)
 {
     ASSERT(parent);
     Node *node = parent;
     do {
         if (!node->isSVGElement())
             continue;
-        SVGElement *svgElement = static_cast<SVGElement *>(node);
+        SVGElement *svgElement = static_cast<SVGElement*>(node);
         if (!svgElement->isStyled())
             continue;
 
-        SVGStyledElement *styled = static_cast<SVGStyledElement *>(svgElement);
+        SVGStyledElement *styled = static_cast<SVGStyledElement*>(svgElement);
         KCanvasResource *resource = styled->canvasResource();
         if (!resource)
             continue;
         
         DeprecatedString elementId = svgElement->getAttribute(HTMLNames::idAttr).deprecatedString();
         if (resource->isPaintServer())
-            ts << "KRenderingPaintServer {id=\"" << elementId << "\" " << *static_cast<KRenderingPaintServer *>(resource) << "}" << endl;
+            ts << "KRenderingPaintServer {id=\"" << elementId << "\" " << *static_cast<KRenderingPaintServer*>(resource) << "}" << endl;
         else
             ts << "KCanvasResource {id=\"" << elementId << "\" " << *resource << "}" << endl;
     } while ((node = node->traverseNextNode(parent)));
 }
 
-TextStream &operator<<(TextStream &ts, const DeprecatedStringList &l)
+TextStream& operator<<(TextStream& ts, const DeprecatedStringList &l)
 {
     ts << "[";
     DeprecatedStringList::ConstIterator it = l.begin();
index 937500071ebe0fbf696beee9155c0d610e6a9148..54f8994ac525c21ad112e8ca8427d3f799b33d8b 100644 (file)
@@ -44,32 +44,31 @@ namespace WebCore {
     class RenderSVGContainer;
 
 // functions used by the main RenderTreeAsText code
-void write(TextStream &ts, const RenderSVGContainer &container, int indent = 0);
-void write(TextStream &ts, const RenderPath &path, int indent = 0);
-void writeRenderResources(TextStream &ts, Node *parent);
+void write(TextStream&, const RenderSVGContainer&, int indent = 0);
+void write(TextStream&, const RenderPath&, int indent = 0);
+void writeRenderResources(TextStream&, Node* parent);
 
 // helper operators defined used in various classes to dump the render tree. 
-TextStream &operator<<(TextStream &ts, const AffineTransform &);
-TextStream &operator<<(TextStream &ts, const IntRect &);
-TextStream &operator<<(TextStream &ts, const Color &);
-TextStream &operator<<(TextStream &ts, const IntPoint &);
-TextStream &operator<<(TextStream &ts, const FloatSize &);
-TextStream &operator<<(TextStream &ts, const FloatRect &);
-TextStream &operator<<(TextStream &ts, const FloatPoint &);
+TextStream& operator<<(TextStream&, const AffineTransform&);
+TextStream& operator<<(TextStream&, const IntRect&);
+TextStream& operator<<(TextStream&, const Color&);
+TextStream& operator<<(TextStream&, const IntPoint&);
+TextStream& operator<<(TextStream&, const FloatSize&);
+TextStream& operator<<(TextStream&, const FloatRect&);
+TextStream& operator<<(TextStream&, const FloatPoint&);
 
 // helper operators specific to dumping the render tree. these are used in various classes to dump the render tree
 // these could be defined in separate namespace to avoid matching these generic signatures unintentionally.
     
-TextStream &operator<<(TextStream &ts, const DeprecatedStringList &l);
+TextStream& operator<<(TextStream&, const DeprecatedStringList&);
     
 template<typename Item>
-TextStream &operator<<(TextStream &ts, const DeprecatedValueList<Item*> &l)
+TextStream& operator<<(TextStream& ts, const DeprecatedValueList<Item*>& l)
 {
     ts << "[";
     typename DeprecatedValueList<Item*>::ConstIterator it = l.begin();
     typename DeprecatedValueList<Item*>::ConstIterator it_e = l.end();
-    while (it != it_e)
-    {
+    while (it != it_e) {
         ts << *(*it);
         ++it;
         if (it != it_e) ts << ", ";
@@ -80,13 +79,12 @@ TextStream &operator<<(TextStream &ts, const DeprecatedValueList<Item*> &l)
 }
 
 template<typename Item>
-TextStream &operator<<(TextStream &ts, const DeprecatedValueList<Item> &l)
+TextStream& operator<<(TextStream& ts, const DeprecatedValueList<Item>& l)
 {
     ts << "[";
     typename DeprecatedValueList<Item>::ConstIterator it = l.begin();
     typename DeprecatedValueList<Item>::ConstIterator it_e = l.end();
-    while (it != it_e)
-    {
+    while (it != it_e) {
         ts << *it;
         ++it;
         if (it != it_e) ts << ", ";
index 45e59156f17464c07d7af81d5875b98828c88639..da305d3e94217653fa2455dde94eca68de7f5f55 100644 (file)
@@ -38,7 +38,7 @@ RenderForeignObject::RenderForeignObject(SVGForeignObjectElement *node)
 
 AffineTransform RenderForeignObject::translationForAttributes()
 {
-    SVGForeignObjectElement* foreign = static_cast<SVGForeignObjectElement *>(element());
+    SVGForeignObjectElement* foreign = static_cast<SVGForeignObjectElement*>(element());
     return AffineTransform().translate(foreign->x()->value(), foreign->y()->value());
 }
 
@@ -48,7 +48,7 @@ void RenderForeignObject::paint(PaintInfo& paintInfo, int parentX, int parentY)
         return;
 
     KRenderingDevice *device = renderingDevice();
-    KRenderingDeviceContext *context = device->currentContext();
+    KRenderingDeviceContextcontext = device->currentContext();
     bool shouldPopContext = false;
     if (!context) {
         // Only need to setup for KCanvas rendering if it hasn't already been done.
index bd903fb6a1708d5705b0e5d8f72fb4b1f27862c4..15fcb53601f7a54c018c9c2f25c3a4a186134183 100644 (file)
@@ -175,7 +175,7 @@ void RenderPath::paint(PaintInfo &paintInfo, int parentX, int parentY)
         return;
     
     KRenderingDevice* device = renderingDevice();
-    KRenderingDeviceContext *context = device->currentContext();
+    KRenderingDeviceContextcontext = device->currentContext();
     bool shouldPopContext = false;
     if (context)
         paintInfo.p->save();
@@ -392,7 +392,7 @@ static inline void updateMarkerDataForElement(MarkerData &previousMarkerData, co
 
 static void drawStartAndMidMarkers(void *info, const PathElement *element)
 {
-    DrawMarkersData &data = *(DrawMarkersData *)info;
+    DrawMarkersData& data = *reinterpret_cast<DrawMarkersData*>(info);
 
     int elementIndex = data.elementIndex;
     MarkerData &previousMarkerData = data.previousMarkerData;
@@ -422,7 +422,7 @@ static void drawStartAndMidMarkers(void *info, const PathElement *element)
 void RenderPath::drawMarkersIfNeeded(GraphicsContext* context, const FloatRect& rect, const Path& path) const
 {
     Document *doc = document();
-    const SVGRenderStyle *svgStyle = style()->svgStyle();
+    const SVGRenderStylesvgStyle = style()->svgStyle();
 
     KCanvasMarker* startMarker = getMarkerById(doc, svgStyle->startMarker().substring(1));
     KCanvasMarker* midMarker = getMarkerById(doc, svgStyle->midMarker().substring(1));
index 579cd533c78e3099eccfb672fa54ec7c7c2b9368..1098c55b93308f748731b0e58f5629877aff6a59 100644 (file)
@@ -43,7 +43,7 @@ class RenderSVGContainer;
 class RenderPath : public RenderObject
 {
 public:
-    RenderPath(RenderStyle *style, SVGStyledElement *node);
+    RenderPath(RenderStylestyle, SVGStyledElement *node);
     virtual ~RenderPath();
 
     // Hit-detection seperated for the fill and the stroke
index bfc5445eb11b83179f62677e97b6afb3c847826f..6cbf52e12afec1a4aeb1c1be0b3020f30729e50e 100644 (file)
@@ -143,7 +143,7 @@ void RenderSVGContainer::paint(PaintInfo& paintInfo, int parentX, int parentY)
         return; // Spec: groups w/o children still may render filter content.
     
     KRenderingDevice* device = renderingDevice();
-    KRenderingDeviceContext *deviceContext = device->currentContext();
+    KRenderingDeviceContextdeviceContext = device->currentContext();
     bool shouldPopContext = false;
     if (!deviceContext) {
         // I only need to setup for KCanvas rendering if it hasn't already been done.
@@ -277,7 +277,7 @@ bool RenderSVGContainer::fillContains(const FloatPoint& p) const
 {
     RenderObject *current = firstChild();
     while (current != 0) {
-        if (current->isRenderPath() && static_cast<RenderPath *>(current)->fillContains(p))
+        if (current->isRenderPath() && static_cast<RenderPath*>(current)->fillContains(p))
             return true;
         current = current->nextSibling();
     }
@@ -289,7 +289,7 @@ bool RenderSVGContainer::strokeContains(const FloatPoint& p) const
 {
     RenderObject *current = firstChild();
     while (current != 0) {
-        if (current->isRenderPath() && static_cast<RenderPath *>(current)->strokeContains(p))
+        if (current->isRenderPath() && static_cast<RenderPath*>(current)->strokeContains(p))
             return true;
         current = current->nextSibling();
     }
index 8e3b801f0585b3786357b7aaec732d476601224f..3131175ccb2da971f862fb9b5ff51d9169f1167f 100644 (file)
@@ -145,7 +145,7 @@ void RenderSVGImage::paint(PaintInfo& paintInfo, int parentX, int parentY)
     translateForAttributes();
     
     FloatRect boundingBox = FloatRect(0, 0, width(), height());
-    const SVGRenderStyle *svgStyle = style()->svgStyle();
+    const SVGRenderStylesvgStyle = style()->svgStyle();
             
     if (KCanvasClipper* clipper = getClipperById(document(), svgStyle->clipPath().substring(1)))
         clipper->applyClip(boundingBox);
@@ -169,7 +169,7 @@ void RenderSVGImage::paint(PaintInfo& paintInfo, int parentX, int parentY)
 
     int x = 0, y = 0;
     if (shouldPaint(pi, x, y)) {
-        SVGImageElement *imageElt = static_cast<SVGImageElement *>(node());
+        SVGImageElement *imageElt = static_cast<SVGImageElement*>(node());
         
         if (imageElt->preserveAspectRatio()->align() == SVGPreserveAspectRatio::SVG_PRESERVEASPECTRATIO_NONE)
             RenderImage::paint(pi, 0, 0);
@@ -244,7 +244,7 @@ void RenderSVGImage::layout()
 
 FloatRect RenderSVGImage::relativeBBox(bool includeStroke) const
 {
-    SVGImageElement *image = static_cast<SVGImageElement *>(node());
+    SVGImageElement *image = static_cast<SVGImageElement*>(node());
     return FloatRect(image->x()->value(), image->y()->value(), width(), height());
 }
 
@@ -257,7 +257,7 @@ void RenderSVGImage::imageChanged(CachedImage* image)
 
 IntRect RenderSVGImage::getAbsoluteRepaintRect()
 {
-    SVGImageElement *image = static_cast<SVGImageElement *>(node());
+    SVGImageElement *image = static_cast<SVGImageElement*>(node());
     FloatRect repaintRect = absoluteTransform().mapRect(FloatRect(image->x()->value(), image->y()->value(), width(), height()));
 
     // Filters can expand the bounding box
@@ -276,13 +276,13 @@ void RenderSVGImage::absoluteRects(Vector<IntRect>& rects, int tx, int ty)
 
 AffineTransform RenderSVGImage::translationForAttributes()
 {
-    SVGImageElement *image = static_cast<SVGImageElement *>(node());
+    SVGImageElement *image = static_cast<SVGImageElement*>(node());
     return AffineTransform().translate(image->x()->value(), image->y()->value());
 }
 
 void RenderSVGImage::translateForAttributes()
 {
-    KRenderingDeviceContext *context = renderingDevice()->currentContext();
+    KRenderingDeviceContextcontext = renderingDevice()->currentContext();
     context->concatCTM(translationForAttributes());
 }
 
index b5b5e0ea43aa45331c1b92f728a16563a84c1147..65f1090a85560e2039a78e69c6e6f49fa6f9af65 100644 (file)
@@ -34,7 +34,7 @@ namespace WebCore {
 
     class RenderSVGImage : public RenderImage {
     public:
-        RenderSVGImage(SVGImageElement *impl);
+        RenderSVGImage(SVGImageElement*);
         virtual ~RenderSVGImage();
         
         virtual AffineTransform localTransform() const { return m_transform; }
@@ -46,15 +46,15 @@ namespace WebCore {
         virtual void absoluteRects(Vector<IntRect>&, int tx, int ty);
 
         virtual void imageChanged(CachedImage*);
-        void adjustRectsForAspectRatio(FloatRect& destRect, FloatRect& srcRect, SVGPreserveAspectRatio *aspectRatio);
-        virtual void paint(PaintInfo& paintInfo, int parentX, int parentY);
+        void adjustRectsForAspectRatio(FloatRect& destRect, FloatRect& srcRect, SVGPreserveAspectRatio*);
+        virtual void paint(PaintInfo&, int parentX, int parentY);
         virtual void layout();
 
         bool requiresLayer();
 
-        virtual void computeAbsoluteRepaintRect(IntRect& r, bool f);
+        virtual void computeAbsoluteRepaintRect(IntRect&, bool f);
 
-        virtual bool nodeAtPoint(NodeInfo& info, int _x, int _y, int _tx, int _ty, HitTestAction hitTestAction);
+        virtual bool nodeAtPoint(NodeInfo&, int _x, int _y, int _tx, int _ty, HitTestAction);
 
     private:
         void translateForAttributes();
index fc1dc36719b9525dff21ce02de5329f07c2ba73b..9cfb8cbc5ce1a46eb969cca178a0022acd25d4c0 100644 (file)
@@ -49,7 +49,7 @@ AffineTransform RenderSVGText::translationTopToBaseline()
 
 AffineTransform RenderSVGText::translationForAttributes()
 {
-    SVGTextElement *text = static_cast<SVGTextElement *>(element());
+    SVGTextElement *text = static_cast<SVGTextElement*>(element());
 
     SVGLength* xOffset = text->x()->getFirst().get();
     SVGLength* yOffset = text->y()->getFirst().get();
@@ -81,7 +81,7 @@ void RenderSVGText::paint(PaintInfo& paintInfo, int parentX, int parentY)
     context->concatCTM(translationTopToBaseline());
     
     FloatRect boundingBox(0, 0, width(), height());
-    const SVGRenderStyle *svgStyle = style()->svgStyle();
+    const SVGRenderStylesvgStyle = style()->svgStyle();
             
     if (KCanvasClipper* clipper = getClipperById(document(), svgStyle->clipPath().substring(1)))
         clipper->applyClip(boundingBox);
index 4ed54769617d12e2c1ce721f6aeba0b99a4a11f1..445e82171e899adb99672df9d2aad46573a2ed00 100644 (file)
@@ -35,21 +35,21 @@ KRenderingDevice::~KRenderingDevice()
 {
 }
 
-KRenderingDeviceContext *KRenderingDevice::currentContext() const
+KRenderingDeviceContextKRenderingDevice::currentContext() const
 {
     if (m_contextStack.isEmpty())
         return 0;
     return m_contextStack.last();
 }
 
-KRenderingDeviceContext *KRenderingDevice::popContext()
+KRenderingDeviceContextKRenderingDevice::popContext()
 {
-    KRenderingDeviceContext *result = m_contextStack.last();
+    KRenderingDeviceContextresult = m_contextStack.last();
     m_contextStack.removeLast();
     return result;
 }
 
-void KRenderingDevice::pushContext(KRenderingDeviceContext *context)
+void KRenderingDevice::pushContext(KRenderingDeviceContextcontext)
 {
     m_contextStack.append(context);
 }
index 248a549d3904cad79bb45ce61ec2ec71e3e93b3b..3f3e9cf28ba2acf36c4aa5d0125434fcceec0d79 100644 (file)
@@ -24,8 +24,8 @@
 #define KRenderingDevice_H
 #ifdef SVG_SUPPORT
 
-#include <kcanvas/KCanvasFilters.h>
-#include <kcanvas/device/KRenderingPaintServer.h>
+#include "KCanvasFilters.h"
+#include "KRenderingPaintServer.h"
 
 namespace WebCore {
 
@@ -58,17 +58,17 @@ public:
     virtual bool isBuffered() const = 0;
 
     // Global rendering device context
-    KRenderingDeviceContext *currentContext() const;
+    KRenderingDeviceContextcurrentContext() const;
 
-    virtual KRenderingDeviceContext *popContext();
-    virtual void pushContext(KRenderingDeviceContext *context);
+    virtual KRenderingDeviceContextpopContext();
+    virtual void pushContext(KRenderingDeviceContext*);
     
-    virtual KRenderingDeviceContext *contextForImage(KCanvasImage *image) const = 0;
+    virtual KRenderingDeviceContext* contextForImage(KCanvasImage*) const = 0;
 
     // Creation tools
-    virtual KCanvasResource *createResource(const KCResourceType &type) const = 0;
-    virtual KCanvasFilterEffect *createFilterEffect(const KCFilterEffectType &type) const = 0;
-    virtual KRenderingPaintServer *createPaintServer(const KCPaintServerType &type) const = 0;
+    virtual KCanvasResource* createResource(const KCResourceType&) const = 0;
+    virtual KCanvasFilterEffect* createFilterEffect(const KCFilterEffectType&) const = 0;
+    virtual KRenderingPaintServer* createPaintServer(const KCPaintServerType&) const = 0;
 
 private:
     Vector<KRenderingDeviceContext*> m_contextStack;
index 3ce01019a73f8ff31e6c5873397f1a8c7ab37f2f..f9eef77c6ebae28da3b1172eb16e94cd3351bbff 100644 (file)
@@ -37,10 +37,10 @@ public:
     virtual ~KRenderingFillPainter();
 
     WindRule fillRule() const;
-    void setFillRule(WindRule rule);
+    void setFillRule(WindRule);
 
     float opacity() const;
-    void setOpacity(float opacity);
+    void setOpacity(float);
 
 private:
     float m_opacity;
index 45e7b7bf4fc85c017e519f56750b8a64196234ba..55dc6a42a034d960220671c7f3781bfc9b614191 100644 (file)
@@ -52,13 +52,17 @@ enum KCPaintTargetType {
 class KRenderingPaintServer : public KCanvasResource
 {
 public:
-    KRenderingPaintServer() : KCanvasResource(), m_activeClient(0), m_paintingText(false) { }
+    KRenderingPaintServer()
+        : KCanvasResource()
+        , m_activeClient(0)
+        , m_paintingText(false)
+    { }
     virtual ~KRenderingPaintServer() { }
     
     virtual bool isPaintServer() const { return true; }
 
-    const RenderPath *activeClient() const { return m_activeClient;}
-    void setActiveClient(const RenderPath *client) { m_activeClient = client; }
+    const RenderPathactiveClient() const { return m_activeClient;}
+    void setActiveClient(const RenderPathclient) { m_activeClient = client; }
 
     String idInRegistry() const {  return m_registryId; }
     void setIdInRegistry(const String& newId) { m_registryId = newId; } 
@@ -66,7 +70,7 @@ public:
     virtual KCPaintServerType type() const = 0;
     
     // Actual rendering function
-    virtual void draw(KRenderingDeviceContext*, const RenderPath* renderPath, KCPaintTargetType) const = 0;
+    virtual void draw(KRenderingDeviceContext*, const RenderPath*, KCPaintTargetType) const = 0;
 
     virtual bool setup(KRenderingDeviceContext*, const RenderObject*, KCPaintTargetType) const = 0;
     virtual void teardown(KRenderingDeviceContext*, const RenderObject*, KCPaintTargetType) const = 0;
@@ -74,16 +78,16 @@ public:
     bool isPaintingText() const { return m_paintingText; }
     void setPaintingText(bool paintingText) { m_paintingText = paintingText; }
 
-    virtual TextStream &externalRepresentation(TextStream &) const = 0;
+    virtual TextStream& externalRepresentation(TextStream&) const = 0;
 
     virtual void renderPath(KRenderingDeviceContext*, const RenderPath*, KCPaintTargetType) const = 0;
 private:
-    const RenderPath *m_activeClient;
+    const RenderPathm_activeClient;
     String m_registryId;
     bool m_paintingText;
 };
 
-TextStream &operator<<(TextStream &, const KRenderingPaintServer &);
+TextStream& operator<<(TextStream&, const KRenderingPaintServer&);
 
 KRenderingPaintServer* getPaintServerById(Document*, const AtomicString&);
 
index 402b7e0e4a093f1af7abbe885cf295f6e69f1b98..bd62344490c11effbb2806e20a791e6c6b37cddf 100644 (file)
@@ -33,7 +33,7 @@
 namespace WebCore {
 
 //KCGradientSpreadMethod
-TextStream &operator<<(TextStream &ts, KCGradientSpreadMethod m)
+TextStream& operator<<(TextStream& ts, KCGradientSpreadMethod m)
 {
     switch (m) 
     {
@@ -47,7 +47,7 @@ TextStream &operator<<(TextStream &ts, KCGradientSpreadMethod m)
     return ts;
 }
 
-TextStream &operator<<(TextStream &ts, const Vector<KCGradientStop>& l)
+TextStream& operator<<(TextStream& ts, const Vector<KCGradientStop>& l)
 {
     ts << "[";
     for (Vector<KCGradientStop>::const_iterator it = l.begin(); it != l.end(); ++it) { 
@@ -123,7 +123,7 @@ void KRenderingPaintServerGradient::setGradientTransform(const AffineTransform&
     m_gradientTransform = mat;
 }
 
-TextStream &KRenderingPaintServerGradient::externalRepresentation(TextStream &ts) const
+TextStream& KRenderingPaintServerGradient::externalRepresentation(TextStream& ts) const
 {
     // abstract, don't stream type
     ts  << "[stops=" << gradientStops() << "]";
@@ -172,7 +172,7 @@ KCPaintServerType KRenderingPaintServerLinearGradient::type() const
     return PS_LINEAR_GRADIENT;
 }
 
-TextStream &KRenderingPaintServerLinearGradient::externalRepresentation(TextStream &ts) const
+TextStream& KRenderingPaintServerLinearGradient::externalRepresentation(TextStream& ts) const
 {
     ts << "[type=LINEAR-GRADIENT] ";    
     KRenderingPaintServerGradient::externalRepresentation(ts);
@@ -226,17 +226,17 @@ KCPaintServerType KRenderingPaintServerRadialGradient::type() const
     return PS_RADIAL_GRADIENT;
 }
 
-KCanvasResourceListener *KRenderingPaintServerGradient::listener() const
+KCanvasResourceListenerKRenderingPaintServerGradient::listener() const
 {
     return m_listener;
 }
 
-void KRenderingPaintServerGradient::setListener(KCanvasResourceListener *listener)
+void KRenderingPaintServerGradient::setListener(KCanvasResourceListenerlistener)
 {
     m_listener = listener;
 }
 
-TextStream &KRenderingPaintServerRadialGradient::externalRepresentation(TextStream &ts) const
+TextStream& KRenderingPaintServerRadialGradient::externalRepresentation(TextStream& ts) const
 {
     ts << "[type=RADIAL-GRADIENT] "; 
     KRenderingPaintServerGradient::externalRepresentation(ts);
index cbbe323c7f2c2668646cdb24a323faeb682e98d1..21dcf4d8ddce9557a0857e29ec667712cf5de393 100644 (file)
@@ -24,7 +24,7 @@
 #define KRenderingPaintServerGradient_H
 #ifdef SVG_SUPPORT
 
-#include <kcanvas/device/KRenderingPaintServer.h>
+#include "KRenderingPaintServer.h"
 
 namespace WebCore {
 
@@ -51,7 +51,7 @@ public:
     void setGradientStops(KRenderingPaintServerGradient*);
 
     KCGradientSpreadMethod spreadMethod() const;
-    void setGradientSpreadMethod(const KCGradientSpreadMethod &method);
+    void setGradientSpreadMethod(const KCGradientSpreadMethod&);
 
     // Gradient start and end points are percentages when used in boundingBox mode.
     // For instance start point with value (0,0) is top-left and end point with value (100, 100) is 
@@ -63,10 +63,10 @@ public:
     AffineTransform gradientTransform() const;
     void setGradientTransform(const AffineTransform&);
     
-    KCanvasResourceListener *listener() const;
-    void setListener(KCanvasResourceListener *listener);
+    KCanvasResourceListenerlistener() const;
+    void setListener(KCanvasResourceListener*);
 
-    TextStream &externalRepresentation(TextStream &) const;
+    TextStream& externalRepresentation(TextStream&) const;
 private:
     Vector<KCGradientStop> m_stops;
     KCGradientSpreadMethod m_spreadMethod;
@@ -85,12 +85,12 @@ public:
 
     // 'Linear Gradient' interface
     FloatPoint gradientStart() const;
-    void setGradientStart(const FloatPoint &start);
+    void setGradientStart(const FloatPoint&);
 
     FloatPoint gradientEnd() const;
-    void setGradientEnd(const FloatPoint &end);
+    void setGradientEnd(const FloatPoint&);
 
-    TextStream &externalRepresentation(TextStream &) const;
+    TextStream& externalRepresentation(TextStream&) const;
 private:
     FloatPoint m_start;
     FloatPoint m_end;
@@ -106,15 +106,15 @@ public:
 
     // 'Radial Gradient' interface
     FloatPoint gradientCenter() const;
-    void setGradientCenter(const FloatPoint &center);
+    void setGradientCenter(const FloatPoint&);
 
     FloatPoint gradientFocal() const;
-    void setGradientFocal(const FloatPoint &focal);
+    void setGradientFocal(const FloatPoint&);
 
     float gradientRadius() const;
-    void setGradientRadius(float radius);
+    void setGradientRadius(float);
 
-    TextStream &externalRepresentation(TextStream &) const;
+    TextStream& externalRepresentation(TextStream&) const;
 private:
     float m_radius;
     FloatPoint m_center;
index 73098a914a0477beb2b893ec6eb9f5544eb40049..36243f92b9e9794c6dffeea07295ba686a6a892f 100644 (file)
@@ -64,12 +64,12 @@ void KRenderingPaintServerPattern::setBoundingBoxMode(bool mode)
     m_useBoundingBoxMode = mode;
 }
 
-KCanvasImage *KRenderingPaintServerPattern::tile() const
+KCanvasImageKRenderingPaintServerPattern::tile() const
 {
     return m_tile;
 }
 
-void KRenderingPaintServerPattern::setTile(KCanvasImage *tile)
+void KRenderingPaintServerPattern::setTile(KCanvasImagetile)
 {
     m_tile = tile;
 }
@@ -89,17 +89,17 @@ KCPaintServerType KRenderingPaintServerPattern::type() const
     return PS_PATTERN;
 }
 
-KCanvasResourceListener *KRenderingPaintServerPattern::listener() const
+KCanvasResourceListenerKRenderingPaintServerPattern::listener() const
 {
     return m_listener;
 }
 
-void KRenderingPaintServerPattern::setListener(KCanvasResourceListener *listener)
+void KRenderingPaintServerPattern::setListener(KCanvasResourceListenerlistener)
 {
     m_listener = listener;
 }
 
-TextStream &KRenderingPaintServerPattern::externalRepresentation(TextStream &ts) const
+TextStream& KRenderingPaintServerPattern::externalRepresentation(TextStream& ts) const
 {
      ts << "[type=PATTERN]"
         << " [bbox=" << bbox() << "]";
index b28375bdbe82f6cd9d884f9b247cfdef338f4335..2bc166dd574a7f74b9eaf2f6044f7ad4a5c3173b 100644 (file)
@@ -24,7 +24,7 @@
 #define KRenderingPaintServerPattern_H
 #ifdef SVG_SUPPORT
 
-#include <kcanvas/device/KRenderingPaintServer.h>
+#include "KRenderingPaintServer.h"
 
 namespace WebCore {
 
@@ -39,7 +39,7 @@ public:
     virtual KCPaintServerType type() const;
 
     // Pattern bbox
-    void setBbox(const FloatRect& rect);
+    void setBbox(const FloatRect&);
     FloatRect bbox() const;
     
     // Pattern x,y phase points are relative when in boundingBoxMode
@@ -49,14 +49,14 @@ public:
     
     // 'Pattern' interface
     KCanvasImage* tile() const;
-    void setTile(KCanvasImage* tile);
+    void setTile(KCanvasImage*);
 
     AffineTransform patternTransform() const;
     void setPatternTransform(const AffineTransform&);
 
     KCanvasResourceListener* listener() const;
-    void setListener(KCanvasResourceListener* listener);
-    TextStream &externalRepresentation(TextStream&) const;
+    void setListener(KCanvasResourceListener*);
+    TextStreamexternalRepresentation(TextStream&) const;
 
 private:
     KCanvasImage* m_tile;
index 993ab3e3631b8489c15d0930486608412d60adb9..a2d9b68f7531aa711d6ceefa5597cf375f1278a2 100644 (file)
@@ -52,7 +52,7 @@ KCPaintServerType KRenderingPaintServerSolid::type() const
     return PS_SOLID;
 }
 
-TextStream &KRenderingPaintServerSolid::externalRepresentation(TextStream &ts) const
+TextStream& KRenderingPaintServerSolid::externalRepresentation(TextStream& ts) const
 {
     ts << "[type=SOLID]"
         << " [color="<< color() << "]";
index 8496728369477f8f2931a5a062bf810ba29fec7a..d30a2e32ff5e3ccce46ab613187dfe0510d0d944 100644 (file)
@@ -24,7 +24,7 @@
 #define KRenderingPaintServerSolid_H
 #ifdef SVG_SUPPORT
 
-#include <kcanvas/device/KRenderingPaintServer.h>
+#include "KRenderingPaintServer.h"
 
 namespace WebCore {
 
@@ -38,9 +38,9 @@ public:
 
     // 'Solid' interface
     Color color() const;
-    void setColor(const Color &color);
+    void setColor(const Color&);
 
-    TextStream &externalRepresentation(TextStream &) const;
+    TextStream& externalRepresentation(TextStream&) const;
 private:
     Color m_color;
 };
index 664d08d6d8a3dacdb74c355b550774cb0aa4cd25..be45d112b7e5b92eb62fceb5120f2ebf367fe2e2 100644 (file)
@@ -53,12 +53,12 @@ void KRenderingStrokePainter::setStrokeWidth(float width)
     m_strokeWidth = width;
 }
 
-unsigned int KRenderingStrokePainter::strokeMiterLimit() const
+unsigned KRenderingStrokePainter::strokeMiterLimit() const
 {
     return m_miterLimit;
 }
 
-void KRenderingStrokePainter::setStrokeMiterLimit(unsigned int limit)
+void KRenderingStrokePainter::setStrokeMiterLimit(unsigned limit)
 {
     setDirty();
     m_miterLimit = limit;
@@ -97,7 +97,7 @@ void KRenderingStrokePainter::setDashOffset(float offset)
     m_dashOffset = offset;
 }
 
-KCDashArray& KRenderingStrokePainter::dashArray() const
+const KCDashArray& KRenderingStrokePainter::dashArray() const
 {
     return m_dashArray;
 }
index 7a874607d553a4d48b8a596fe77f9bfe900808ea..7fdaf0113d090b5c16b507f13b0b442d5453f2eb 100644 (file)
@@ -38,25 +38,25 @@ public:
 
     // Common interface for fill and stroke parameters
     float strokeWidth() const;
-    void setStrokeWidth(float width);
+    void setStrokeWidth(float);
 
-    unsigned int strokeMiterLimit() const;
-    void setStrokeMiterLimit(unsigned int limit);
+    unsigned strokeMiterLimit() const;
+    void setStrokeMiterLimit(unsigned);
 
     KCCapStyle strokeCapStyle() const;
-    void setStrokeCapStyle(KCCapStyle style);
+    void setStrokeCapStyle(KCCapStyle);
 
     KCJoinStyle strokeJoinStyle() const;
-    void setStrokeJoinStyle(KCJoinStyle style);
+    void setStrokeJoinStyle(KCJoinStyle);
 
     float dashOffset() const;
     void setDashOffset(float offset);
 
-    KCDashArray& dashArray() const;
-    void setDashArray(const KCDashArray& dashArray);
+    const KCDashArray& dashArray() const;
+    void setDashArray(const KCDashArray&);
 
     float opacity() const;
-    void setOpacity(float opacity);
+    void setOpacity(float);
 
     // Helpers
     bool dirty() const;
@@ -67,13 +67,13 @@ private:
     float m_opacity;
 
     float m_strokeWidth;
-    unsigned int m_miterLimit;
+    unsigned m_miterLimit;
 
     KCCapStyle m_capStyle;
     KCJoinStyle m_joinStyle;
 
     float m_dashOffset;
-    mutable KCDashArray m_dashArray;
+    KCDashArray m_dashArray;
 };
 
 }
index 8367e3379279edd32e299e643e2e522e6b2e61df..25a08ded4036b5f4968dc785f10f4a5874da3592 100644 (file)
@@ -47,90 +47,90 @@ public:
     virtual void prepareFilter(const FloatRect& bbox);
     virtual void applyFilter(const FloatRect& bbox);
     
-    CIImage *imageForName(const String &name) const;
-    void setImageForName(CIImage *image, const String &name);
+    CIImage* imageForName(const String&) const;
+    void setImageForName(CIImage*, const String&);
     
-    void setOutputImage(const KCanvasFilterEffect *filterEffect, CIImage *output);
-    CIImage *inputImage(const KCanvasFilterEffect *filterEffect);
+    void setOutputImage(const KCanvasFilterEffect*, CIImage*);
+    CIImage* inputImage(const KCanvasFilterEffect*);
     
 private:
-    NSArray *getCIFilterStack(CIImage *inputImage);
+    NSArray* getCIFilterStack(CIImage* inputImage);
 
-    CIContext *m_filterCIContext;
+    CIContextm_filterCIContext;
     CGLayerRef m_filterCGLayer;
-    NSMutableDictionary *m_imagesByName;
+    NSMutableDictionarym_imagesByName;
 };
 
 class KCanvasFEBlendQuartz : public KCanvasFEBlend {
 public:
-    virtual CIFilter *getCIFilter(KCanvasFilterQuartz *quartzFilter) const;
+    virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
 };
 
 class KCanvasFEColorMatrixQuartz : public KCanvasFEColorMatrix {
 public:
-    virtual CIFilter *getCIFilter(KCanvasFilterQuartz *quartzFilter) const;
+    virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
 };
 
 class KCanvasFEComponentTransferQuartz : public KCanvasFEComponentTransfer {
 public:
-    virtual CIFilter *getCIFilter(KCanvasFilterQuartz *quartzFilter) const;
+    virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
 private:
-    CIFilter *getFunctionFilter(KCChannelSelectorType channel, CIImage *inputImage) const;
+    CIFilter* getFunctionFilter(KCChannelSelectorType, CIImage* inputImage) const;
 };
 
 class KCanvasFEConvolveMatrixQuartz : public KCanvasFEConvolveMatrix {
 public:
-    virtual CIFilter *getCIFilter(KCanvasFilterQuartz *quartzFilter) const;
+    virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
 };
 
 class KCanvasFECompositeQuartz : public KCanvasFEComposite {
 public:
-    virtual CIFilter *getCIFilter(KCanvasFilterQuartz *quartzFilter) const;
+    virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
 };
 
 class KCanvasFEDiffuseLightingQuartz : public KCanvasFEDiffuseLighting {
 public:
-    virtual CIFilter *getCIFilter(KCanvasFilterQuartz *quartzFilter) const;
+    virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
 };
 
 class KCanvasFEFloodQuartz : public KCanvasFEFlood {
 public:
-    virtual CIFilter *getCIFilter(KCanvasFilterQuartz *quartzFilter) const;
+    virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
 };
 
 class KCanvasFEGaussianBlurQuartz : public KCanvasFEGaussianBlur {
 public:
-    virtual CIFilter *getCIFilter(KCanvasFilterQuartz *quartzFilter) const;
+    virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
 };
 
 class KCanvasFEImageQuartz : public KCanvasFEImage {
 public:
-    virtual CIFilter *getCIFilter(KCanvasFilterQuartz *quartzFilter) const;
+    virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
 };
 
 class KCanvasFEDisplacementMapQuartz : public KCanvasFEDisplacementMap {
 public:
-    virtual CIFilter *getCIFilter(KCanvasFilterQuartz *quartzFilter) const;
+    virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
 };
 
 class KCanvasFEMergeQuartz : public KCanvasFEMerge {
 public:
-    virtual CIFilter *getCIFilter(KCanvasFilterQuartz *quartzFilter) const;
+    virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
 };
 
 class KCanvasFEOffsetQuartz : public KCanvasFEOffset {
 public:
-    virtual CIFilter *getCIFilter(KCanvasFilterQuartz *quartzFilter) const;
+    virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
 };
 
 class KCanvasFESpecularLightingQuartz : public KCanvasFESpecularLighting {
 public:
-    virtual CIFilter *getCIFilter(KCanvasFilterQuartz *quartzFilter) const;
+    virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
 };
 
 class KCanvasFETileQuartz : public KCanvasFETile {
 public:
-    virtual CIFilter *getCIFilter(KCanvasFilterQuartz *quartzFilter) const;
+    virtual CIFilter* getCIFilter(KCanvasFilterQuartz*) const;
 };
 
 }
index 9d5785499ddf3ffd8f4aa5949ea3631841ff46bd..fcb4de1fceaab473ea157af306b801384c80028f 100644 (file)
@@ -92,7 +92,9 @@ static inline CIVector *getVectorForChannel(KCChannelSelectorType channel)
     }
 }
 
-KCanvasFilterQuartz::KCanvasFilterQuartz() : m_filterCIContext(0), m_filterCGLayer(0)
+KCanvasFilterQuartz::KCanvasFilterQuartz()
+    : m_filterCIContext(0)
+    , m_filterCGLayer(0)
 {
     m_imagesByName = HardRetainWithNSRelease([[NSMutableDictionary alloc] init]);
 }
@@ -130,7 +132,7 @@ void KCanvasFilterQuartz::prepareFilter(const FloatRect &bbox)
     
     m_filterCGLayer = [m_filterCIContext createCGLayerWithSize:CGRect(bbox).size info:NULL];
     
-    KRenderingDeviceContext *filterContext = new KRenderingDeviceContextQuartz(CGLayerGetContext(m_filterCGLayer));
+    KRenderingDeviceContextfilterContext = new KRenderingDeviceContextQuartz(CGLayerGetContext(m_filterCGLayer));
     renderingDevice()->pushContext(filterContext);
     
     filterContext->concatCTM(AffineTransform().translate(-1.0f * bbox.x(), -1.0f * bbox.y()));
@@ -174,8 +176,8 @@ NSArray *KCanvasFilterQuartz::getCIFilterStack(CIImage *inputImage)
 {
     NSMutableArray *filterEffects = [NSMutableArray array];
 
-    DeprecatedValueListIterator<KCanvasFilterEffect *> it = m_effects.begin();
-    DeprecatedValueListIterator<KCanvasFilterEffect *> end = m_effects.end();
+    DeprecatedValueListIterator<KCanvasFilterEffect*> it = m_effects.begin();
+    DeprecatedValueListIterator<KCanvasFilterEffect*> end = m_effects.end();
 
     setImageForName(inputImage, "SourceGraphic"); // input
     for (;it != end; it++) {
@@ -270,7 +272,7 @@ CIImage *KCanvasFilterQuartz::inputImage(const KCanvasFilterEffect *filterEffect
         filter = crop; \
     }
 
-CIFilter *KCanvasFEBlendQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) const
+CIFilter *KCanvasFEBlendQuartz::getCIFilter(KCanvasFilterQuartzquartzFilter) const
 {
     CIFilter *filter = nil;
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
@@ -313,12 +315,12 @@ CIFilter *KCanvasFEBlendQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) c
 #define CMValuesCheck(expected, type) \
     if (values().count() != expected) { \
         NSLog(@"Error, incorrect number of values in ColorMatrix for type \"%s\", expected: %i actual: %i, ignoring filter.  Values:", type, expected, values().count()); \
-        for (unsigned int x=0; x < values().count(); x++) fprintf(stderr, " %f", values()[x]); \
+        for (unsigned x=0; x < values().count(); x++) fprintf(stderr, " %f", values()[x]); \
         fprintf(stderr, "\n"); \
         return nil; \
     }
 
-CIFilter *KCanvasFEColorMatrixQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) const
+CIFilter *KCanvasFEColorMatrixQuartz::getCIFilter(KCanvasFilterQuartzquartzFilter) const
 {
     CIFilter *filter = nil;
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
@@ -479,7 +481,7 @@ CIFilter *KCanvasFEComponentTransferQuartz::getFunctionFilter(KCChannelSelectorT
     
 }
 
-CIFilter *KCanvasFEComponentTransferQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) const
+CIFilter *KCanvasFEComponentTransferQuartz::getCIFilter(KCanvasFilterQuartzquartzFilter) const
 {
     [WKComponentMergeFilter class];
     [WKIdentityTransferFilter class];
@@ -506,7 +508,7 @@ CIFilter *KCanvasFEComponentTransferQuartz::getCIFilter(KCanvasFilterQuartz *qua
     return nil;
 }
 
-CIFilter *KCanvasFECompositeQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) const
+CIFilter *KCanvasFECompositeQuartz::getCIFilter(KCanvasFilterQuartzquartzFilter) const
 {
     CIFilter *filter = nil;
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
@@ -551,7 +553,7 @@ CIFilter *KCanvasFECompositeQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilte
     FE_QUARTZ_OUTPUT_RETURN;
 }
 
-CIFilter *KCanvasFEDisplacementMapQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) const
+CIFilter *KCanvasFEDisplacementMapQuartz::getCIFilter(KCanvasFilterQuartzquartzFilter) const
 {
     CIFilter *filter = nil;
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
@@ -598,7 +600,7 @@ static CIFilter *getLightVectors(CIFilter * normals, const KCLightSource * light
     switch (light->type()) {
     case LS_DISTANT:
     {
-        const KCDistantLightSource *dlight = static_cast<const KCDistantLightSource *>(light);
+        const KCDistantLightSource *dlight = static_cast<const KCDistantLightSource*>(light);
         
         filter = [CIFilter filterWithName:@"WKDistantLight"];
         if (!filter)
@@ -619,12 +621,12 @@ static CIFilter *getLightVectors(CIFilter * normals, const KCLightSource * light
     }
     case LS_POINT:
     {
-        const KCPointLightSource *plight = static_cast<const KCPointLightSource *>(light);
+        const KCPointLightSource *plight = static_cast<const KCPointLightSource*>(light);
         return getPointLightVectors(normals, [CIVector vectorWithX:plight->position().x() Y:plight->position().y() Z:plight->position().z()], surfaceScale);
     }
     case LS_SPOT:
     {
-        const KCSpotLightSource *slight = static_cast<const KCSpotLightSource *>(light);
+        const KCSpotLightSource *slight = static_cast<const KCSpotLightSource*>(light);
         filter = [CIFilter filterWithName:@"WKSpotLight"];
         if (!filter)
             return nil;
@@ -660,7 +662,7 @@ static CIFilter *getNormalMap(CIImage *bumpMap, float scale)
     return nil;
 }
 
-CIFilter *KCanvasFEDiffuseLightingQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) const
+CIFilter *KCanvasFEDiffuseLightingQuartz::getCIFilter(KCanvasFilterQuartzquartzFilter) const
 {
     const KCLightSource *light = lightSource();
     if (!light)
@@ -696,7 +698,7 @@ CIFilter *KCanvasFEDiffuseLightingQuartz::getCIFilter(KCanvasFilterQuartz *quart
     FE_QUARTZ_OUTPUT_RETURN;
 }
 
-CIFilter *KCanvasFEFloodQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) const
+CIFilter *KCanvasFEFloodQuartz::getCIFilter(KCanvasFilterQuartzquartzFilter) const
 {
     CIFilter *filter;
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
@@ -717,7 +719,7 @@ CIFilter *KCanvasFEFloodQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) c
     FE_QUARTZ_OUTPUT_RETURN;
 }
 
-CIFilter *KCanvasFEImageQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) const
+CIFilter *KCanvasFEImageQuartz::getCIFilter(KCanvasFilterQuartzquartzFilter) const
 {
     if (!cachedImage())
         return nil;
@@ -751,7 +753,7 @@ CIFilter *KCanvasFEImageQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) c
     FE_QUARTZ_OUTPUT_RETURN;
 }
 
-CIFilter *KCanvasFEGaussianBlurQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) const
+CIFilter *KCanvasFEGaussianBlurQuartz::getCIFilter(KCanvasFilterQuartzquartzFilter) const
 {
     FE_QUARTZ_SETUP_INPUT(@"CIGaussianPyramid");
 
@@ -766,7 +768,7 @@ CIFilter *KCanvasFEGaussianBlurQuartz::getCIFilter(KCanvasFilterQuartz *quartzFi
     FE_QUARTZ_OUTPUT_RETURN;
 }
 
-CIFilter *KCanvasFEMergeQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) const
+CIFilter *KCanvasFEMergeQuartz::getCIFilter(KCanvasFilterQuartzquartzFilter) const
 {
     CIFilter *filter = nil;
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
@@ -786,7 +788,7 @@ CIFilter *KCanvasFEMergeQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) c
     FE_QUARTZ_OUTPUT_RETURN;
 }
 
-CIFilter *KCanvasFEOffsetQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) const
+CIFilter *KCanvasFEOffsetQuartz::getCIFilter(KCanvasFilterQuartzquartzFilter) const
 {
     FE_QUARTZ_SETUP_INPUT(@"CIAffineTransform");
     NSAffineTransform *offsetTransform = [NSAffineTransform transform];
@@ -795,7 +797,7 @@ CIFilter *KCanvasFEOffsetQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter)
     FE_QUARTZ_OUTPUT_RETURN;
 }
 
-CIFilter *KCanvasFESpecularLightingQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) const
+CIFilter *KCanvasFESpecularLightingQuartz::getCIFilter(KCanvasFilterQuartzquartzFilter) const
 {  
     const KCLightSource *light = lightSource();
     if(!light)
@@ -827,7 +829,7 @@ CIFilter *KCanvasFESpecularLightingQuartz::getCIFilter(KCanvasFilterQuartz *quar
     FE_QUARTZ_OUTPUT_RETURN;
 }
 
-CIFilter *KCanvasFETileQuartz::getCIFilter(KCanvasFilterQuartz *quartzFilter) const
+CIFilter *KCanvasFETileQuartz::getCIFilter(KCanvasFilterQuartzquartzFilter) const
 {
     FE_QUARTZ_SETUP_INPUT(@"CIAffineTile");
     FE_QUARTZ_OUTPUT_RETURN;
index 6d758d440c46eba50cc85ec10ddf419112ada300..efecf8c93a7b6e19dbe09a287b9654ae19beeb5d 100644 (file)
@@ -99,7 +99,7 @@ void KCanvasMaskerQuartz::applyMask(const FloatRect& boundingBox) const
     CGColorSpaceRelease(grayColorSpace);
     CIContext *ciGrayscaleContext = [CIContext contextWithCGContext:grayscaleContext options:nil];
 
-    KCanvasImageQuartz *maskImage = static_cast<KCanvasImageQuartz *>(m_mask);
+    KCanvasImageQuartz* maskImage = static_cast<KCanvasImageQuartz*>(m_mask);
     CIImage *grayscaleMask = transformImageIntoGrayscaleMask([CIImage imageWithCGLayer:maskImage->cgLayer()]);
     [ciGrayscaleContext drawImage:grayscaleMask atPoint:CGPointZero fromRect:CGRectMake(0, 0, width, height)];
 
index d1c9c433e0e3cdbe8bc3659f1a25a49ab0b36eba..a7e9a2209262acac437a5ab81372ec634709a755 100644 (file)
@@ -48,7 +48,7 @@ class KCanvasImageQuartz : public KCanvasImage {
 public:
     KCanvasImageQuartz() : m_cgLayer(0) { }
     ~KCanvasImageQuartz();
-    void init(const Image &) { }
+    void init(const Image&) { }
     void init(IntSize size) { m_size = size; }
     
     CGLayerRef cgLayer();
index dd4b8e88a347f9d770acb6609e485d8ce8335598..4553fc71e3ac7da77b32ad4425cce84631277824 100644 (file)
@@ -39,7 +39,7 @@ namespace WebCore {
 
 void KCanvasClipperQuartz::applyClip(const FloatRect& boundingBox) const
 {
-    KRenderingDeviceContext *context = renderingDevice()->currentContext();
+    KRenderingDeviceContextcontext = renderingDevice()->currentContext();
     CGContextRef cgContext = static_cast<KRenderingDeviceContextQuartz*>(context)->cgContext();
     if (m_clipData.count() < 1)
         return;
@@ -51,7 +51,7 @@ void KCanvasClipperQuartz::applyClip(const FloatRect& boundingBox) const
 
     CGAffineTransform bboxTransform = CGAffineTransformMakeMapBetweenRects(CGRectMake(0,0,1,1), CGRect(boundingBox));
 
-    for (unsigned int x = 0; x < m_clipData.count(); x++) {
+    for (unsigned x = 0; x < m_clipData.count(); x++) {
         KCClipData data = m_clipData[x];
         if (data.windRule() != clipRule)
             heterogenousClipRules = YES;
index d01a796ab04ebdf5b89bfebc7124c5883edcb379..b53d4ba6e5de8761f03ad61bbe7da65897bdbb7c 100644 (file)
@@ -29,7 +29,7 @@
 #define KRenderingDeviceQuartz_H
 #ifdef SVG_SUPPORT
 
-#import <kcanvas/device/KRenderingDevice.h>
+#import "KRenderingDevice.h"
 
 typedef struct CGRect CGRect;
 typedef struct CGContext *CGContextRef;
@@ -38,10 +38,10 @@ namespace WebCore {
 
 class KRenderingDeviceContextQuartz : public KRenderingDeviceContext {
 public:
-    KRenderingDeviceContextQuartz(CGContextRef context);
+    KRenderingDeviceContextQuartz(CGContextRef);
     virtual ~KRenderingDeviceContextQuartz();
     
-    virtual AffineTransform concatCTM(const AffineTransform &);
+    virtual AffineTransform concatCTM(const AffineTransform&);
     virtual AffineTransform ctm() const;
     
     virtual void clearPath();
@@ -63,20 +63,20 @@ public:
     virtual bool isBuffered() const { return false; }
 
     // context management.
-    KRenderingDeviceContextQuartz *quartzContext() const;
+    KRenderingDeviceContextQuartzquartzContext() const;
     CGContextRef currentCGContext() const;
-    virtual KRenderingDeviceContext *contextForImage(KCanvasImage *) const;
+    virtual KRenderingDeviceContext* contextForImage(KCanvasImage*) const;
 
     // Resource creation
-    virtual KCanvasResource *createResource(const KCResourceType &type) const;
-    virtual KRenderingPaintServer *createPaintServer(const KCPaintServerType &type) const;
-    virtual KCanvasFilterEffect *createFilterEffect(const KCFilterEffectType &type) const;
+    virtual KCanvasResource *createResource(const KCResourceType&) const;
+    virtual KRenderingPaintServer *createPaintServer(const KCPaintServerType&) const;
+    virtual KCanvasFilterEffect *createFilterEffect(const KCFilterEffectType&) const;
     
     // filters (mostly debugging)
     static bool filtersEnabled();
-    static void setFiltersEnabled(bool enabled);
+    static void setFiltersEnabled(bool);
     static bool hardwareRenderingEnabled();
-    static void setHardwareRenderingEnabled(bool enabled);
+    static void setHardwareRenderingEnabled(bool);
 };
 
 } // namespace WebCore
index e30b9a3252a6577f11c569faefc86e6da43ed97c..4de0f3c131d58440242ded8d87ea9f8cd3831d8b 100644 (file)
@@ -109,9 +109,9 @@ void KRenderingDeviceQuartz::setHardwareRenderingEnabled(bool enabled)
 #pragma mark -
 #pragma mark Context Management
 
-KRenderingDeviceContextQuartz *KRenderingDeviceQuartz::quartzContext() const
+KRenderingDeviceContextQuartzKRenderingDeviceQuartz::quartzContext() const
 {
-    return static_cast<KRenderingDeviceContextQuartz *>(currentContext());
+    return static_cast<KRenderingDeviceContextQuartz*>(currentContext());
 }
 
 CGContextRef KRenderingDeviceQuartz::currentCGContext() const
@@ -120,9 +120,9 @@ CGContextRef KRenderingDeviceQuartz::currentCGContext() const
     return quartzContext()->cgContext();
 }
 
-KRenderingDeviceContext *KRenderingDeviceQuartz::contextForImage(KCanvasImage *image) const
+KRenderingDeviceContextKRenderingDeviceQuartz::contextForImage(KCanvasImage *image) const
 {
-    KCanvasImageQuartz *quartzImage = static_cast<KCanvasImageQuartz *>(image);
+    KCanvasImageQuartz* quartzImage = static_cast<KCanvasImageQuartz*>(image);
     CGLayerRef cgLayer = quartzImage->cgLayer();
     if (!cgLayer) {
         // FIXME: we might not get back a layer if this is a loaded image
@@ -138,7 +138,7 @@ KRenderingDeviceContext *KRenderingDeviceQuartz::contextForImage(KCanvasImage *i
 #pragma mark -
 #pragma mark Resource Creation
 
-KRenderingPaintServer *KRenderingDeviceQuartz::createPaintServer(const KCPaintServerType &type) const
+KRenderingPaintServer *KRenderingDeviceQuartz::createPaintServer(const KCPaintServerTypetype) const
 {
     KRenderingPaintServer *newServer = NULL;
     switch(type) {
@@ -158,7 +158,7 @@ KRenderingPaintServer *KRenderingDeviceQuartz::createPaintServer(const KCPaintSe
     return newServer;
 }
 
-KCanvasResource *KRenderingDeviceQuartz::createResource(const KCResourceType &type) const
+KCanvasResource *KRenderingDeviceQuartz::createResource(const KCResourceTypetype) const
 {
     switch (type) {
     case RS_CLIPPER:
@@ -176,7 +176,7 @@ KCanvasResource *KRenderingDeviceQuartz::createResource(const KCResourceType &ty
     return 0;
 }
 
-KCanvasFilterEffect *KRenderingDeviceQuartz::createFilterEffect(const KCFilterEffectType &type) const
+KCanvasFilterEffect *KRenderingDeviceQuartz::createFilterEffect(const KCFilterEffectTypetype) const
 {
     switch(type)
     {
index 9928c70d9fe1ee20dcefb2f73e4c953bda445750..09713af0367943e25c33edf53ce936881a73b78d 100644 (file)
@@ -48,7 +48,7 @@ namespace WebCore {
     
 static void cgGradientCallback(void* info, const CGFloat* inValues, CGFloat* outColor)
 {
-    const KRenderingPaintServerGradientQuartz *server = (const KRenderingPaintServerGradientQuartz *)info;
+    const KRenderingPaintServerGradientQuartz* server = (const KRenderingPaintServerGradientQuartz*)info;
     QuartzGradientStop *stops = server->m_stopsCache;
     int stopsCount = server->m_stopsCount;
     
@@ -65,15 +65,14 @@ static void cgGradientCallback(void* info, const CGFloat* inValues, CGFloat* out
         return;
     }
     
-    if (!(inValue > stops[0].offset)) {
+    if (!(inValue > stops[0].offset))
         memcpy(outColor, stops[0].colorArray, 4 * sizeof(CGFloat));
-    } else if (!(inValue < stops[stopsCount-1].offset)) {
+    else if (!(inValue < stops[stopsCount-1].offset))
         memcpy(outColor, stops[stopsCount-1].colorArray, 4 * sizeof(CGFloat));
-    else {
+    else {
         int nextStopIndex = 0;
-        while ( (nextStopIndex < stopsCount) && (stops[nextStopIndex].offset < inValue) ) {
+        while ((nextStopIndex < stopsCount) && (stops[nextStopIndex].offset < inValue))
             nextStopIndex++;
-        }
         
         //float nextOffset = stops[nextStopIndex].offset;
         CGFloat *nextColorArray = stops[nextStopIndex].colorArray;
@@ -91,7 +90,7 @@ static void cgGradientCallback(void* info, const CGFloat* inValues, CGFloat* out
     // FIXME: have to handle the spreadMethod()s here SPREADMETHOD_REPEAT, etc.
 }
 
-static CGShadingRef CGShadingRefForLinearGradient(const KRenderingPaintServerLinearGradientQuartz *server)
+static CGShadingRef CGShadingRefForLinearGradient(const KRenderingPaintServerLinearGradientQuartzserver)
 {
     CGPoint start = CGPoint(server->gradientStart());
     CGPoint end = CGPoint(server->gradientEnd());
@@ -99,7 +98,7 @@ static CGShadingRef CGShadingRefForLinearGradient(const KRenderingPaintServerLin
     CGFunctionCallbacks callbacks = {0, cgGradientCallback, NULL};
     CGFloat domainLimits[2] = {0, 1};
     CGFloat rangeLimits[8] = {0, 1, 0, 1, 0, 1, 0, 1};
-    const KRenderingPaintServerGradientQuartz *castServer = static_cast<const KRenderingPaintServerGradientQuartz *>(server);
+    const KRenderingPaintServerGradientQuartz* castServer = static_cast<const KRenderingPaintServerGradientQuartz*>(server);
     CGFunctionRef shadingFunction = CGFunctionCreate((void *)castServer, 1, domainLimits, 4, rangeLimits, &callbacks);
     
     CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
@@ -109,7 +108,7 @@ static CGShadingRef CGShadingRefForLinearGradient(const KRenderingPaintServerLin
     return shading;
 }
 
-static CGShadingRef CGShadingRefForRadialGradient(const KRenderingPaintServerRadialGradientQuartz *server)
+static CGShadingRef CGShadingRefForRadialGradient(const KRenderingPaintServerRadialGradientQuartzserver)
 {
     CGPoint center = CGPoint(server->gradientCenter());
     CGPoint focus = CGPoint(server->gradientFocal());
@@ -120,8 +119,7 @@ static CGShadingRef CGShadingRefForRadialGradient(const KRenderingPaintServerRad
     
     // Spec: If (fx, fy) lies outside the circle defined by (cx, cy) and r, set (fx, fy)
     // to the point of intersection of the line through (fx, fy) and the circle.
-    if(sqrt(fdx*fdx + fdy*fdy) > radius)
-    {
+    if (sqrt(fdx*fdx + fdy*fdy) > radius) {
         double angle = atan2(focus.y, focus.x);
         focus.x = int(cos(angle) * radius) - 1;
         focus.y = int(sin(angle) * radius) - 1;
@@ -130,7 +128,7 @@ static CGShadingRef CGShadingRefForRadialGradient(const KRenderingPaintServerRad
     CGFunctionCallbacks callbacks = {0, cgGradientCallback, NULL};
     CGFloat domainLimits[2] = {0, 1};
     CGFloat rangeLimits[8] = {0, 1, 0, 1, 0, 1, 0, 1};
-    const KRenderingPaintServerGradientQuartz *castServer = static_cast<const KRenderingPaintServerGradientQuartz *>(server);
+    const KRenderingPaintServerGradientQuartz* castServer = static_cast<const KRenderingPaintServerGradientQuartz*>(server);
     CGFunctionRef shadingFunction = CGFunctionCreate((void *)castServer, 1, domainLimits, 4, rangeLimits, &callbacks);
     
     CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
@@ -140,8 +138,11 @@ static CGShadingRef CGShadingRefForRadialGradient(const KRenderingPaintServerRad
     return shading;
 }
 
-KRenderingPaintServerGradientQuartz::KRenderingPaintServerGradientQuartz() :
-m_stopsCache(0), m_stopsCount(0), m_shadingCache(0), m_maskImage(0)
+KRenderingPaintServerGradientQuartz::KRenderingPaintServerGradientQuartz()
+    : m_stopsCache(0)
+    , m_stopsCount(0)
+    , m_shadingCache(0)
+    , m_maskImage(0)
 {
 }
 
@@ -165,10 +166,10 @@ void KRenderingPaintServerGradientQuartz::updateQuartzGradientCache(const KRende
     if (m_shadingCache)
         CGShadingRelease(m_shadingCache);
     if (server->type() == PS_RADIAL_GRADIENT) {
-        const KRenderingPaintServerRadialGradientQuartz *radial = static_cast<const KRenderingPaintServerRadialGradientQuartz *>(server);
+        const KRenderingPaintServerRadialGradientQuartz* radial = static_cast<const KRenderingPaintServerRadialGradientQuartz*>(server);
         m_shadingCache = CGShadingRefForRadialGradient(radial);
     } else if (server->type() == PS_LINEAR_GRADIENT) {
-        const KRenderingPaintServerLinearGradientQuartz *linear = static_cast<const KRenderingPaintServerLinearGradientQuartz *>(server);
+        const KRenderingPaintServerLinearGradientQuartz* linear = static_cast<const KRenderingPaintServerLinearGradientQuartz*>(server);
         m_shadingCache = CGShadingRefForLinearGradient(linear);
     }
 }
@@ -250,7 +251,7 @@ bool KRenderingPaintServerGradientQuartz::setup(const KRenderingPaintServerGradi
         CGContextSaveGState(context);
         applyStrokeStyleToContext(context, renderStyle, renderObject); // FIXME: this seems like the wrong place for this.
         if (server->isPaintingText()) {
-            m_maskImage = static_cast<KCanvasImage *>(quartzDevice->createResource(RS_IMAGE));
+            m_maskImage = static_cast<KCanvasImage*>(quartzDevice->createResource(RS_IMAGE));
             int width  = 2048;
             int height = 2048; // FIXME???
             IntSize size = IntSize(width, height);
@@ -319,7 +320,7 @@ void KRenderingPaintServerGradientQuartz::teardown(const KRenderingPaintServerGr
             CGColorSpaceRef grayColorSpace = CGColorSpaceCreateDeviceGray();
             CGContextRef grayscaleContext = CGBitmapContextCreate(imageBuffer, width, height, 8, width, grayColorSpace, kCGImageAlphaNone);
             CGColorSpaceRelease(grayColorSpace);
-            KCanvasImageQuartz* qMaskImage = static_cast<KCanvasImageQuartz *>(maskImage);
+            KCanvasImageQuartz* qMaskImage = static_cast<KCanvasImageQuartz*>(maskImage);
             CGContextDrawLayerAtPoint(grayscaleContext, CGPointMake(0, 0), qMaskImage->cgLayer());
             CGImageRef grayscaleImage = CGBitmapContextCreateImage(grayscaleContext);
             CGContextClipToMask(context, CGRectMake(0, 0, width, height), grayscaleImage);
index 02527a6df303699bc76d5a7e3944f26435e9ad14..891f40225b12b03bc90f66b3387e6c2d7b64a256 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
-#import <kcanvas/device/KRenderingDevice.h>
-#import <kcanvas/device/KRenderingPaintServerSolid.h>
-#import <kcanvas/device/KRenderingPaintServerPattern.h>
-#import <kcanvas/device/KRenderingPaintServerGradient.h>
+#import "KRenderingDevice.h"
+#import "KRenderingPaintServerSolid.h"
+#import "KRenderingPaintServerPattern.h"
+#import "KRenderingPaintServerGradient.h"
 
 namespace WebCore {
 
@@ -35,10 +35,10 @@ class KCanvasImage;
 
 class KRenderingPaintServerQuartzHelper {
 public:
-    static void strokePath(CGContextRef, const RenderPath *renderPath);
-    static void clipToStrokePath(CGContextRef, const RenderPath *renderPath);
-    static void fillPath(CGContextRef, const RenderPath *renderPath);
-    static void clipToFillPath(CGContextRef, const RenderPath *renderPath);
+    static void strokePath(CGContextRef, const RenderPath*);
+    static void clipToStrokePath(CGContextRef, const RenderPath*);
+    static void fillPath(CGContextRef, const RenderPath*);
+    static void clipToFillPath(CGContextRef, const RenderPath*);
 };
 
 class KRenderingPaintServerSolidQuartz : public KRenderingPaintServerSolid {
index ab34e0614c7d23b0b999fb86ef849d640837581e..57c578c8c738a301a737fe9e9d04f4d54245a669 100644 (file)
 
 namespace WebCore {
 
-void KRenderingPaintServerQuartzHelper::strokePath(CGContextRef context, const RenderPath *renderPath)
+void KRenderingPaintServerQuartzHelper::strokePath(CGContextRef context, const RenderPathrenderPath)
 {
     CGContextStrokePath(context);
 }
 
-void KRenderingPaintServerQuartzHelper::clipToStrokePath(CGContextRef context, const RenderPath *renderPath)
+void KRenderingPaintServerQuartzHelper::clipToStrokePath(CGContextRef context, const RenderPathrenderPath)
 {
     CGContextReplacePathWithStrokedPath(context);
     CGContextClip(context);
 }    
 
-void KRenderingPaintServerQuartzHelper::fillPath(CGContextRef context, const RenderPath *renderPath)
+void KRenderingPaintServerQuartzHelper::fillPath(CGContextRef context, const RenderPathrenderPath)
 {
     if (KSVGPainterFactory::fillPainter(renderPath->style(), renderPath).fillRule() == RULE_EVENODD)
         CGContextEOFillPath(context);
@@ -62,7 +62,7 @@ void KRenderingPaintServerQuartzHelper::fillPath(CGContextRef context, const Ren
         CGContextFillPath(context);
 }
 
-void KRenderingPaintServerQuartzHelper::clipToFillPath(CGContextRef context, const RenderPath *renderPath)
+void KRenderingPaintServerQuartzHelper::clipToFillPath(CGContextRef context, const RenderPathrenderPath)
 {
     if (KSVGPainterFactory::fillPainter(renderPath->style(), renderPath).fillRule() == RULE_EVENODD)
         CGContextEOClip(context);
@@ -70,7 +70,7 @@ void KRenderingPaintServerQuartzHelper::clipToFillPath(CGContextRef context, con
         CGContextClip(context);
 }    
 
-void KRenderingPaintServerSolidQuartz::draw(KRenderingDeviceContext *renderingContext, const RenderPath* path, KCPaintTargetType type) const
+void KRenderingPaintServerSolidQuartz::draw(KRenderingDeviceContextrenderingContext, const RenderPath* path, KCPaintTargetType type) const
 {
     if (!setup(renderingContext, path, type))
         return;
@@ -78,11 +78,11 @@ void KRenderingPaintServerSolidQuartz::draw(KRenderingDeviceContext *renderingCo
     teardown(renderingContext, path, type);
 }
 
-bool KRenderingPaintServerSolidQuartz::setup(KRenderingDeviceContext *renderingContext, const RenderObject* renderObject, KCPaintTargetType type) const
+bool KRenderingPaintServerSolidQuartz::setup(KRenderingDeviceContextrenderingContext, const RenderObject* renderObject, KCPaintTargetType type) const
 {
-    KRenderingDeviceContextQuartz *quartzContext = static_cast<KRenderingDeviceContextQuartz *>(renderingContext);
+    KRenderingDeviceContextQuartz* quartzContext = static_cast<KRenderingDeviceContextQuartz*>(renderingContext);
     CGContextRef context = quartzContext->cgContext();
-    RenderStyle *renderStyle = renderObject->style();
+    RenderStylerenderStyle = renderObject->style();
 
     CGContextSetAlpha(context, renderStyle->opacity());
         
@@ -93,7 +93,7 @@ bool KRenderingPaintServerSolidQuartz::setup(KRenderingDeviceContext *renderingC
         CGColorRelease(colorCG);
         CGColorRelease(withAlpha);
         if (isPaintingText()) {
-            const_cast<RenderObject *>(renderObject)->style()->setColor(color());
+            const_cast<RenderObject*>(renderObject)->style()->setColor(color());
             CGContextSetTextDrawingMode(context, kCGTextFill);
         }
     }
@@ -106,7 +106,7 @@ bool KRenderingPaintServerSolidQuartz::setup(KRenderingDeviceContext *renderingC
         CGColorRelease(withAlpha);
         applyStrokeStyleToContext(context, renderStyle, renderObject);
         if (isPaintingText()) {
-            const_cast<RenderObject *>(renderObject)->style()->setColor(color());
+            const_cast<RenderObject*>(renderObject)->style()->setColor(color());
             CGContextSetTextDrawingMode(context, kCGTextStroke);
         }
     }
@@ -116,8 +116,8 @@ bool KRenderingPaintServerSolidQuartz::setup(KRenderingDeviceContext *renderingC
 
 void KRenderingPaintServerSolidQuartz::renderPath(KRenderingDeviceContext* renderingContext, const RenderPath* renderPath, KCPaintTargetType type) const
 {
-    RenderStyle *renderStyle = renderPath->style();
-    KRenderingDeviceContextQuartz *quartzContext = static_cast<KRenderingDeviceContextQuartz *>(renderingContext);
+    RenderStylerenderStyle = renderPath->style();
+    KRenderingDeviceContextQuartz* quartzContext = static_cast<KRenderingDeviceContextQuartz*>(renderingContext);
     CGContextRef context = quartzContext->cgContext();    
     if ((type & APPLY_TO_FILL) && KSVGPainterFactory::isFilled(renderStyle))
         KRenderingPaintServerQuartzHelper::fillPath(context, renderPath);
@@ -131,8 +131,7 @@ void KRenderingPaintServerSolidQuartz::teardown(KRenderingDeviceContext* renderi
 
 void patternCallback(void *info, CGContextRef context)
 {
-    KCanvasImageQuartz *image = (KCanvasImageQuartz *)info;
-    CGLayerRef layer = image->cgLayer();
+    CGLayerRef layer = reinterpret_cast<KCanvasImageQuartz*>(info)->cgLayer();
     CGContextDrawLayerAtPoint(context, CGPointZero, layer);
 }
 
@@ -149,12 +148,12 @@ bool KRenderingPaintServerPatternQuartz::setup(KRenderingDeviceContext* renderin
     if(listener()) // this seems like bad design to me, should be in a common baseclass. -- ecs 8/6/05
         listener()->resourceNotification();
 
-    RenderStyle *renderStyle = renderObject->style();
+    RenderStylerenderStyle = renderObject->style();
 
-    KRenderingDeviceContextQuartz *quartzContext = static_cast<KRenderingDeviceContextQuartz *>(renderingContext);
+    KRenderingDeviceContextQuartz* quartzContext = static_cast<KRenderingDeviceContextQuartz*>(renderingContext);
     CGContextRef context = quartzContext->cgContext();
 
-    KCanvasImage *cell = tile();
+    KCanvasImagecell = tile();
     if (!cell)
         return false;
 
@@ -175,7 +174,7 @@ bool KRenderingPaintServerPatternQuartz::setup(KRenderingDeviceContext* renderin
     CGPatternCallbacks callbacks = {0, patternCallback, NULL};
     m_pattern = CGPatternCreate(
         tile(),
-        CGRectMake(0,0,cellSize.width,cellSize.height),
+        CGRectMake(0, 0, cellSize.width, cellSize.height),
         transform,
         bbox().width(), //cellSize.width,
         bbox().height(), //cellSize.height,
@@ -191,7 +190,7 @@ bool KRenderingPaintServerPatternQuartz::setup(KRenderingDeviceContext* renderin
         CGContextSetFillColorSpace(context, m_patternSpace);
         CGContextSetFillPattern(context, m_pattern, &alpha);
         if (isPaintingText()) {
-            const_cast<RenderObject *>(renderObject)->style()->setColor(Color());
+            const_cast<RenderObject*>(renderObject)->style()->setColor(Color());
             CGContextSetTextDrawingMode(context, kCGTextFill);
         }
     }
@@ -201,7 +200,7 @@ bool KRenderingPaintServerPatternQuartz::setup(KRenderingDeviceContext* renderin
         CGContextSetStrokePattern(context, m_pattern, &alpha);
         applyStrokeStyleToContext(context, renderStyle, renderObject);
         if (isPaintingText()) {
-            const_cast<RenderObject *>(renderObject)->style()->setColor(Color());
+            const_cast<RenderObject*>(renderObject)->style()->setColor(Color());
             CGContextSetTextDrawingMode(context, kCGTextStroke);
         }
     }
@@ -211,9 +210,9 @@ bool KRenderingPaintServerPatternQuartz::setup(KRenderingDeviceContext* renderin
 
 void KRenderingPaintServerPatternQuartz::renderPath(KRenderingDeviceContext* renderingContext, const RenderPath* renderPath, KCPaintTargetType type) const
 {
-    RenderStyle *renderStyle = renderPath->style();
+    RenderStylerenderStyle = renderPath->style();
 
-    KRenderingDeviceContextQuartz *quartzContext = static_cast<KRenderingDeviceContextQuartz *>(renderingContext);
+    KRenderingDeviceContextQuartz* quartzContext = static_cast<KRenderingDeviceContextQuartz*>(renderingContext);
     CGContextRef context = quartzContext->cgContext();
 
     if ((type & APPLY_TO_FILL) && KSVGPainterFactory::isFilled(renderStyle))
@@ -225,7 +224,7 @@ void KRenderingPaintServerPatternQuartz::renderPath(KRenderingDeviceContext* ren
 
 void KRenderingPaintServerPatternQuartz::teardown(KRenderingDeviceContext* renderingContext, const RenderObject* renderObject, KCPaintTargetType type) const
 {
-    KRenderingDeviceContextQuartz *quartzContext = static_cast<KRenderingDeviceContextQuartz *>(renderingContext);
+    KRenderingDeviceContextQuartz* quartzContext = static_cast<KRenderingDeviceContextQuartz*>(renderingContext);
     CGContextRef context = quartzContext->cgContext();
     CGPatternRelease(m_pattern);
     CGColorSpaceRelease(m_patternSpace);
index cab9a5473d434469668d49534b45671fc013ac40..943bf1d52ea9dd92aa0b6c9749c25068c3f8c4eb 100644 (file)
@@ -39,21 +39,15 @@ class RenderStyle;
 class RenderObject;
 class KRenderingStrokePainter;
 
-#ifndef NDEBUG
-void debugDumpCGImageToFile(NSString *filename, CGImageRef image, int width, int height);
-void debugDumpCGLayerToFile(NSString *filename, CGLayerRef layer, int width, int height);
-void debugDumpCIImageToFile(NSString *filename, CIImage *ciImage, int width, int height);
-#endif
-
-CFStringRef CFStringFromCGPath(CGPathRef path);
-CFStringRef CFStringFromCGAffineTransform(CGAffineTransform t);
+CFStringRef CFStringFromCGPath(CGPathRef);
+CFStringRef CFStringFromCGAffineTransform(CGAffineTransform);
 CGAffineTransform CGAffineTransformMakeMapBetweenRects(CGRect source, CGRect dest);
 
 void applyStrokeStyleToContext(CGContextRef, const KRenderingStrokePainter&);
 void applyStrokeStyleToContext(CGContextRef, RenderStyle*, const RenderObject*);
 
-FloatRect strokeBoundingBox(const Path& path, const KRenderingStrokePainter& strokePainter);
-bool pathContainsPoint(CGMutablePathRef cgPath, const FloatPoint& point, CGPathDrawingMode drawMode);
+FloatRect strokeBoundingBox(const Path&, const KRenderingStrokePainter&);
+bool pathContainsPoint(CGMutablePathRef, const FloatPoint&, CGPathDrawingMode);
 
 static inline CGLineCap CGLineCapFromKC(KCCapStyle cap)
 {
index 5ec89fb293513a166359d73670b4e1aec84b1b24..860e4ef102c6bfcf3d44be823ad00861d7aa43ab 100644 (file)
@@ -72,7 +72,7 @@ void applyStrokeStyleToContext(CGContextRef context, const KRenderingStrokePaint
     if (dashes.count()) {
         size_t dashCount = dashes.count();
         CGFloat *lengths = (CGFloat *)malloc(dashCount * sizeof(CGFloat));
-        for (unsigned int x = 0; x < dashCount; x++)
+        for (unsigned x = 0; x < dashCount; x++)
             lengths[x] = dashes[x];
         CGContextSetLineDash(context, strokePainter.dashOffset(), lengths, dashes.count());
         free(lengths);