| Index: Source/WebCore/html/canvas/CanvasStyle.cpp
|
| diff --git a/Source/WebCore/html/canvas/CanvasStyle.cpp b/Source/WebCore/html/canvas/CanvasStyle.cpp
|
| index 9309ec61544933a3effde462e26fe39e15d7d756..1b272076593e57ab316a1edbdb0ea9bfa1f03f81 100644
|
| --- a/Source/WebCore/html/canvas/CanvasStyle.cpp
|
| +++ b/Source/WebCore/html/canvas/CanvasStyle.cpp
|
| @@ -43,13 +43,6 @@
|
| #include <CoreGraphics/CGContext.h>
|
| #endif
|
|
|
| -#if PLATFORM(QT)
|
| -#include <QPainter>
|
| -#include <QBrush>
|
| -#include <QPen>
|
| -#include <QColor>
|
| -#endif
|
| -
|
| namespace WebCore {
|
|
|
| enum ColorParseResult { ParsedRGBA, ParsedCurrentColor, ParsedSystemColor, ParseFailed };
|
| @@ -241,12 +234,6 @@ void CanvasStyle::applyStrokeColor(GraphicsContext* context)
|
| // We'll need a fancier Color abstraction to support CMYKA correctly
|
| #if USE(CG)
|
| CGContextSetCMYKStrokeColor(context->platformContext(), m_cmyka.c, m_cmyka.m, m_cmyka.y, m_cmyka.k, m_cmyka.a);
|
| -#elif PLATFORM(QT)
|
| - QPen currentPen = context->platformContext()->pen();
|
| - QColor clr;
|
| - clr.setCmykF(m_cmyka.c, m_cmyka.m, m_cmyka.y, m_cmyka.k, m_cmyka.a);
|
| - currentPen.setColor(clr);
|
| - context->platformContext()->setPen(currentPen);
|
| #else
|
| context->setStrokeColor(m_rgba, ColorSpaceDeviceRGB);
|
| #endif
|
| @@ -278,12 +265,6 @@ void CanvasStyle::applyFillColor(GraphicsContext* context)
|
| // We'll need a fancier Color abstraction to support CMYKA correctly
|
| #if USE(CG)
|
| CGContextSetCMYKFillColor(context->platformContext(), m_cmyka.c, m_cmyka.m, m_cmyka.y, m_cmyka.k, m_cmyka.a);
|
| -#elif PLATFORM(QT)
|
| - QBrush currentBrush = context->platformContext()->brush();
|
| - QColor clr;
|
| - clr.setCmykF(m_cmyka.c, m_cmyka.m, m_cmyka.y, m_cmyka.k, m_cmyka.a);
|
| - currentBrush.setColor(clr);
|
| - context->platformContext()->setBrush(currentBrush);
|
| #else
|
| context->setFillColor(m_rgba, ColorSpaceDeviceRGB);
|
| #endif
|
|
|