Submitted by: eseidel
Reviewed by: darin
* kcanvas/device/quartz/KCanvasItemQuartz.mm:
(getSharedContext): moved from QPainter -> CG
* kcanvas/device/quartz/KRenderingPaintServerGradientQuartz.mm:
(CGShadingRefForLinearGradient): removed comment
(CGShadingRefForRadialGradient): removed comment
* khtml/ecma/kjs_html.cpp:
(KJS::KJS::Context2DFunction::call): moved from QPainter -> CG
(KJS::colorRefFromValue): moved from QPainter -> CG
(KJS::Gradient::getShading): moved from QPainter -> CG
* khtml/rendering/render_canvasimage.cpp:
(RenderCanvasImage::createDrawingContext):moved from QPainter -> CG
* kwq/KWQColor.mm:
(CGColorFromNSColor): moved from QPainter -> CG
* kwq/KWQPainter.h: removed colorspace calls
* kwq/KWQPainter.mm: removed colorspace calls
(QPainter::clearFocusRing): moved from QPainter -> CG
Removed use of WebKitGraphicsBridge Colorspace SPIs, as well
as corresponding QPainter colorspace "choke-point" methods.
This fixes colors for WebCore+SVG (since it wasn't linking in
webkit). WebKit code removal in separate commit.
http://bugzilla.opendarwin.org/show_bug.cgi?id=4211
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9993
268f45cc-cd09-0410-ab3c-
d52691b4dbfc
+2005-08-01 Eric Seidel <eseidel@apple.com>
+
+ Reviewed by darin.
+
+ * kcanvas/device/quartz/KCanvasItemQuartz.mm:
+ (getSharedContext): moved from QPainter -> CG
+ * kcanvas/device/quartz/KRenderingPaintServerGradientQuartz.mm:
+ (CGShadingRefForLinearGradient): removed comment
+ (CGShadingRefForRadialGradient): removed comment
+ * khtml/ecma/kjs_html.cpp:
+ (KJS::KJS::Context2DFunction::call): moved from QPainter -> CG
+ (KJS::colorRefFromValue): moved from QPainter -> CG
+ (KJS::Gradient::getShading): moved from QPainter -> CG
+ * khtml/rendering/render_canvasimage.cpp:
+ (RenderCanvasImage::createDrawingContext):moved from QPainter -> CG
+ * kwq/KWQColor.mm:
+ (CGColorFromNSColor): moved from QPainter -> CG
+ * kwq/KWQPainter.h: removed colorspace calls
+ * kwq/KWQPainter.mm: removed colorspace calls
+ (QPainter::clearFocusRing): moved from QPainter -> CG
+ Removed use of WebKitGraphicsBridge Colorspace SPIs, as well
+ as corresponding QPainter colorspace "choke-point" methods.
+ This fixes colors for WebCore+SVG (since it wasn't linking in
+ webkit). WebKit code removal in separate commit.
+ http://bugzilla.opendarwin.org/show_bug.cgi?id=4211
+
2005-07-31 Darin Adler <darin@apple.com>
Reviewed by Maciej.
CGDataConsumerRef consumer = CGDataConsumerCreateWithCFData(empty);
sharedContext = CGPDFContextCreate(consumer, NULL, NULL);
- // CGColorSpaceRef colorspace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
+ // CGColorSpaceRef colorspace = CGColorSpaceCreateDeviceRGB();
// CGContextRef context = CGGLContextCreate(NULL, CGSizeMake(canvas->canvasWidth(), canvas->canvasHeight()), colorspace);
// CGColorSpaceRelease(colorspace);
float black[4] = {0,0,0,1};
const KRenderingPaintServerGradientQuartz *castServer = static_cast<const KRenderingPaintServerGradientQuartz *>(server);
CGFunctionRef shadingFunction = CGFunctionCreate((void *)castServer, 1, domainLimits, 4, rangeLimits, &callbacks);
- //CGColorSpaceRef colorSpace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
CGShadingRef shading = CGShadingCreateAxial(colorSpace, start, end, shadingFunction, true, true);
CGColorSpaceRelease(colorSpace);
const KRenderingPaintServerGradientQuartz *castServer = static_cast<const KRenderingPaintServerGradientQuartz *>(server);
CGFunctionRef shadingFunction = CGFunctionCreate((void *)castServer, 1, domainLimits, 4, rangeLimits, &callbacks);
- //CGColorSpaceRef colorSpace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGB);
CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
CGShadingRef shading = CGShadingCreateRadial(colorSpace, focus, 0, center, radius, shadingFunction, true, true);
CGColorSpaceRelease(colorSpace);
components[1] = qc.green()/255.;
components[2] = qc.blue()/255.;
components[3] = 1.0f;
- colorSpace = QPainter::rgbColorSpace();
+ colorSpace = CGColorSpaceCreateDeviceRGB();
}
else {
components[0] = (float)args[3].toNumber(exec);
components[1] = 1.0f;
- colorSpace = QPainter::grayColorSpace();
+ colorSpace = CGColorSpaceCreateDeviceGray();
}
}
break;
components[1] = qc.green()/255.;
components[2] = qc.blue()/255.;
components[3] = a;
- colorSpace = QPainter::rgbColorSpace();
+ colorSpace = CGColorSpaceCreateDeviceRGB();
}
else {
components[0] = (float)args[3].toNumber(exec);
components[1] = a;
- colorSpace = QPainter::grayColorSpace();
+ colorSpace = CGColorSpaceCreateDeviceGray();
}
}
break;
components[1] = (float)args[4].toNumber(exec); // g
components[2] = (float)args[5].toNumber(exec); // b
components[3] = (float)args[6].toNumber(exec); // a
- colorSpace = QPainter::rgbColorSpace();
+ colorSpace = CGColorSpaceCreateDeviceRGB();
}
break;
case 5: {
components[3] = (float)args[6].toNumber(exec); // k
components[4] = (float)args[7].toNumber(exec); // a
- colorSpace = QPainter::cmykColorSpace();
+ colorSpace = CGColorSpaceCreateDeviceCMYK();
}
break;
default: {
size_t csw = (size_t)sw;
size_t csh = (size_t)sh;
- CGColorSpaceRef colorSpace = QPainter::rgbColorSpace();
+ CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
size_t numComponents = CGColorSpaceGetNumberOfComponents(colorSpace);
size_t bytesPerRow = BYTES_PER_ROW(csw,BITS_PER_COMPONENT,(numComponents+1)); // + 1 for alpha
void *_drawingContextData = malloc(csh * bytesPerRow);
components[1] = qc.green()/255.;
components[2] = qc.blue()/255.;
components[3] = qc.alpha();
- colorSpace = QPainter::rgbColorSpace();
+ colorSpace = CGColorSpaceCreateDeviceRGB();
}
else
return 0;
CGShadingRelease (_shadingRef);
CGFunctionRef _colorFunction = CGFunctionCreate((void *)this, 1, intervalRangeDomin, 4, colorComponentRangeDomains, &gradientCallbacks);
- CGColorSpaceRef colorSpace = QPainter::rgbColorSpace();
+ CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
if (_gradientType == Gradient::Radial) {
_shadingRef = CGShadingCreateRadial(colorSpace, CGPointMake(_x0,_y0), _r0, CGPointMake(_x1,_y1), _r1, _colorFunction, true, true);
_drawingContext = 0;
}
free (_drawingContextData);
- CGColorSpaceRef colorSpace = QPainter::rgbColorSpace();
+ CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
int cWidth = contentWidth();
int cHeight = contentHeight();
float alpha = [deviceColor alphaComponent];
const float components[] = { red, green, blue, alpha };
- CGColorSpaceRef colorSpace = QPainter::rgbColorSpace();
+ CGColorSpaceRef colorSpace = CGColorSpaceCreateDeviceRGB();
CGColorRef cgColor = CGColorCreate(colorSpace, components);
CGColorSpaceRelease(colorSpace);
return cgColor;
static void setCompositeOperation (CGContextRef context, QString operation);
static void setCompositeOperation (CGContextRef context, int operation);
- static CGColorSpaceRef rgbColorSpace();
- static CGColorSpaceRef grayColorSpace();
- static CGColorSpaceRef cmykColorSpace();
-
private:
// no copying or assignment
QPainter(const QPainter &);
data->focusRingPath = nil;
}
}
-
-CGColorSpaceRef QPainter::rgbColorSpace()
-{
- return [[WebCoreGraphicsBridge sharedBridge] createRGBColorSpace];
-}
-
-CGColorSpaceRef QPainter::grayColorSpace()
-{
- return [[WebCoreGraphicsBridge sharedBridge] createGrayColorSpace];
-}
-
-CGColorSpaceRef QPainter::cmykColorSpace()
-{
- return [[WebCoreGraphicsBridge sharedBridge] createCMYKColorSpace];
-}
-
-