Changeset 12166 in webkit

Timestamp:

Jan 17, 2006 10:41:46 PM (18 years ago)

Author:

darin

Message:

Reviewed by Maciej.

• Remove the now-unused KRenderingPaintServerImage[Quartz].

• WebCore.xcodeproj/project.pbxproj:
• kcanvas/KCanvasTreeDebug.cpp:
• kcanvas/device/KRenderingPaintServer.h:
• kcanvas/device/KRenderingPaintServerImage.cpp: Removed.
• kcanvas/device/KRenderingPaintServerImage.h: Removed.
• kcanvas/device/quartz/KRenderingDeviceQuartz.mm:
• kcanvas/device/quartz/KRenderingPaintServerQuartz.h:
• kcanvas/device/quartz/KRenderingPaintServerQuartz.mm:
• ksvg2/svg/SVGFEImageElementImpl.cpp:
• kwq/KWQPainter.mm:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.xcodeproj/project.pbxproj (modified) (5 diffs)
• kcanvas/KCanvasTreeDebug.cpp (modified) (1 diff)
• kcanvas/device/KRenderingPaintServer.h (modified) (1 diff)
• kcanvas/device/KRenderingPaintServerImage.cpp (deleted)
• kcanvas/device/KRenderingPaintServerImage.h (deleted)
• kcanvas/device/quartz/KRenderingDeviceQuartz.mm (modified) (1 diff)
• kcanvas/device/quartz/KRenderingPaintServerQuartz.h (modified) (2 diffs)
• kcanvas/device/quartz/KRenderingPaintServerQuartz.mm (modified) (1 diff)
• ksvg2/svg/SVGFEImageElementImpl.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-01-17  Alexander Kellett  <lypanov@kde.org>
+
+        Reviewed by Maciej.
+
+        - Remove the now-unused KRenderingPaintServerImage[Quartz].
+
+        * WebCore.xcodeproj/project.pbxproj:
+        * kcanvas/KCanvasTreeDebug.cpp:
+        * kcanvas/device/KRenderingPaintServer.h:
+        * kcanvas/device/KRenderingPaintServerImage.cpp: Removed.
+        * kcanvas/device/KRenderingPaintServerImage.h: Removed.
+        * kcanvas/device/quartz/KRenderingDeviceQuartz.mm:
+        * kcanvas/device/quartz/KRenderingPaintServerQuartz.h:
+        * kcanvas/device/quartz/KRenderingPaintServerQuartz.mm:
+        * ksvg2/svg/SVGFEImageElementImpl.cpp:
+        * kwq/KWQPainter.mm:
+
 2006-01-17  Darin Adler  <darin@apple.com>
 

trunk/WebCore/WebCore.xcodeproj/project.pbxproj

@@ -1005 +1005 @@
                 A88AD38B0952486D001DD196 /* KRenderingPaintServerGradient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C0FB5C089701F700BA5114 /* KRenderingPaintServerGradient.cpp */; };
                 A88AD38C0952486D001DD196 /* KRenderingPaintServerGradient.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C0FB5D089701F700BA5114 /* KRenderingPaintServerGradient.h */; };
-                A88AD38D0952486D001DD196 /* KRenderingPaintServerImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C0FB5E089701F700BA5114 /* KRenderingPaintServerImage.cpp */; };
-                A88AD38E0952486D001DD196 /* KRenderingPaintServerImage.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C0FB5F089701F700BA5114 /* KRenderingPaintServerImage.h */; };
                 A88AD38F0952486D001DD196 /* KRenderingPaintServerPattern.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A8C0FB60089701F700BA5114 /* KRenderingPaintServerPattern.cpp */; };
                 A88AD3900952486D001DD196 /* KRenderingPaintServerPattern.h in Headers */ = {isa = PBXBuildFile; fileRef = A8C0FB61089701F700BA5114 /* KRenderingPaintServerPattern.h */; };
@@ -2356 +2354 @@
                 A8C0FB5C089701F700BA5114 /* KRenderingPaintServerGradient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KRenderingPaintServerGradient.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                 A8C0FB5D089701F700BA5114 /* KRenderingPaintServerGradient.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KRenderingPaintServerGradient.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-                A8C0FB5E089701F700BA5114 /* KRenderingPaintServerImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KRenderingPaintServerImage.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-                A8C0FB5F089701F700BA5114 /* KRenderingPaintServerImage.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KRenderingPaintServerImage.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                 A8C0FB60089701F700BA5114 /* KRenderingPaintServerPattern.cpp */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KRenderingPaintServerPattern.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                 A8C0FB61089701F700BA5114 /* KRenderingPaintServerPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = KRenderingPaintServerPattern.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
@@ -3601 +3597 @@
                                 A8C0FB5C089701F700BA5114 /* KRenderingPaintServerGradient.cpp */,
                                 A8C0FB5D089701F700BA5114 /* KRenderingPaintServerGradient.h */,
-                                A8C0FB5E089701F700BA5114 /* KRenderingPaintServerImage.cpp */,
-                                A8C0FB5F089701F700BA5114 /* KRenderingPaintServerImage.h */,
                                 A8C0FB60089701F700BA5114 /* KRenderingPaintServerPattern.cpp */,
                                 A8C0FB61089701F700BA5114 /* KRenderingPaintServerPattern.h */,
@@ -4720 +4714 @@
                                 A88AD38A0952486D001DD196 /* KRenderingPaintServer.h in Headers */,
                                 A88AD38C0952486D001DD196 /* KRenderingPaintServerGradient.h in Headers */,
-                                A88AD38E0952486D001DD196 /* KRenderingPaintServerImage.h in Headers */,
                                 A88AD3900952486D001DD196 /* KRenderingPaintServerPattern.h in Headers */,
                                 A88AD3920952486D001DD196 /* KRenderingPaintServerSolid.h in Headers */,
@@ -6634 +6627 @@
                                 A88AD3880952486D001DD196 /* KRenderingFillPainter.cpp in Sources */,
                                 A88AD38B0952486D001DD196 /* KRenderingPaintServerGradient.cpp in Sources */,
-                                A88AD38D0952486D001DD196 /* KRenderingPaintServerImage.cpp in Sources */,
                                 A88AD38F0952486D001DD196 /* KRenderingPaintServerPattern.cpp in Sources */,
                                 A88AD3910952486D001DD196 /* KRenderingPaintServerSolid.cpp in Sources */,

trunk/WebCore/kcanvas/KCanvasTreeDebug.cpp

@@ -41 +41 @@
 #include <kcanvas/device/KRenderingPaintServerPattern.h>
 #include <kcanvas/device/KRenderingPaintServerGradient.h>
-#include <kcanvas/device/KRenderingPaintServerImage.h>
 #include <kcanvas/KCanvasResources.h>
 #include <kcanvas/KCanvasFilters.h>

trunk/WebCore/kcanvas/device/KRenderingPaintServer.h

@@ -33 +33 @@
     PS_PATTERN = 1,
     PS_LINEAR_GRADIENT = 2,
-    PS_RADIAL_GRADIENT = 3,
-    PS_IMAGE = 4
+    PS_RADIAL_GRADIENT = 3
 } KCPaintServerType;
 

trunk/WebCore/kcanvas/device/quartz/KRenderingDeviceQuartz.mm

@@ -199 +199 @@
     case PS_PATTERN:
         newServer = new KRenderingPaintServerPatternQuartz();
-        break;
-    case PS_IMAGE:
-        newServer = new KRenderingPaintServerImageQuartz();
         break;
     case PS_LINEAR_GRADIENT:

trunk/WebCore/kcanvas/device/quartz/KRenderingPaintServerQuartz.h

@@ -28 +28 @@
 #import <kcanvas/device/KRenderingPaintServerSolid.h>
 #import <kcanvas/device/KRenderingPaintServerPattern.h>
-#import <kcanvas/device/KRenderingPaintServerImage.h>
 #import <kcanvas/device/KRenderingPaintServerGradient.h>
 
@@ -40 +39 @@
 public:
     KRenderingPaintServerPatternQuartz() {};
-    virtual void draw(KRenderingDeviceContext *context, const RenderPath *renderPath, KCPaintTargetType type) const;
-};
-
-class KRenderingPaintServerImageQuartz : public KRenderingPaintServerImage {
-public:
-    KRenderingPaintServerImageQuartz() {};
     virtual void draw(KRenderingDeviceContext *context, const RenderPath *renderPath, KCPaintTargetType type) const;
 };

trunk/WebCore/kcanvas/device/quartz/KRenderingPaintServerQuartz.mm

@@ -146 +146 @@
     CGContextRestoreGState(context);
 }
-
-void KRenderingPaintServerImageQuartz::draw(KRenderingDeviceContext *renderingContext, const RenderPath *renderPath, KCPaintTargetType type) const
-{
-    // FIXME: total hack
-    KRenderingDeviceContextQuartz *quartzContext = static_cast<KRenderingDeviceContextQuartz *>(renderingContext);
-    CGContextRef context = quartzContext->cgContext();
-    IntRect bbox = IntRect(CGContextGetPathBoundingBox(context));
-    QPainter p;
-    IntRect imageRect = image().rect();
-    p.drawScaledAndTiledPixmap(bbox.x(), bbox.y(), bbox.width(), bbox.height(), image(), imageRect.x(), imageRect.y(), imageRect.width(), imageRect.height());
-}

trunk/WebCore/ksvg2/svg/SVGFEImageElementImpl.cpp

@@ -43 +43 @@
 #include <kcanvas/device/KRenderingDevice.h>
 #include <kcanvas/device/KRenderingFillPainter.h>
-#include <kcanvas/device/KRenderingPaintServerImage.h>
 
 using namespace KSVG;