| Index: Source/WebCore/platform/graphics/Path.h
|
| diff --git a/Source/WebCore/platform/graphics/Path.h b/Source/WebCore/platform/graphics/Path.h
|
| index 008c0e6ef894e1fb383c5ae46379ad53c25cd949..f7fd76784ff22a399aed05dd1820bba501138498 100644
|
| --- a/Source/WebCore/platform/graphics/Path.h
|
| +++ b/Source/WebCore/platform/graphics/Path.h
|
| @@ -35,14 +35,6 @@
|
|
|
| #if USE(CG)
|
| typedef struct CGPath PlatformPath;
|
| -#elif PLATFORM(OPENVG)
|
| -namespace WebCore {
|
| -class PlatformPathOpenVG;
|
| -}
|
| -typedef WebCore::PlatformPathOpenVG PlatformPath;
|
| -#elif PLATFORM(QT)
|
| -#include <qpainterpath.h>
|
| -typedef QPainterPath PlatformPath;
|
| #elif USE(SKIA)
|
| class SkPath;
|
| typedef SkPath PlatformPath;
|
| @@ -55,12 +47,7 @@ typedef WebCore::PlatformPath PlatformPath;
|
| typedef void PlatformPath;
|
| #endif
|
|
|
| -#if PLATFORM(QT)
|
| -/* QPainterPath is valued based */
|
| -typedef PlatformPath PlatformPathPtr;
|
| -#else
|
| typedef PlatformPath* PlatformPathPtr;
|
| -#endif
|
|
|
| namespace WebCore {
|
|
|
| @@ -111,11 +98,7 @@ namespace WebCore {
|
| float normalAngleAtLength(float length, bool& ok) const;
|
|
|
| void clear();
|
| -#if PLATFORM(QT)
|
| - bool isNull() const { return false; }
|
| -#else
|
| bool isNull() const { return !m_path; }
|
| -#endif
|
| bool isEmpty() const;
|
| // Gets the current point of the current path, which is conceptually the final point reached by the path so far.
|
| // Note the Path can be empty (isEmpty() == true) and still have a current point.
|
| @@ -145,14 +128,10 @@ namespace WebCore {
|
| void translate(const FloatSize&);
|
|
|
| // To keep Path() cheap, it does not allocate a PlatformPath immediately
|
| - // meaning Path::platformPath() can return null (except on Qt).
|
| + // meaning Path::platformPath() can return null.
|
| PlatformPathPtr platformPath() const { return m_path; }
|
| -#if PLATFORM(QT)
|
| - PlatformPathPtr ensurePlatformPath() { return platformPath(); }
|
| -#else
|
| // ensurePlatformPath() will allocate a PlatformPath if it has not yet been and will never return null.
|
| PlatformPathPtr ensurePlatformPath();
|
| -#endif
|
|
|
| void apply(void* info, PathApplierFunction) const;
|
| void transform(const AffineTransform&);
|
| @@ -164,10 +143,6 @@ namespace WebCore {
|
| void platformAddPathForRoundedRect(const FloatRect&, const FloatSize& topLeftRadius, const FloatSize& topRightRadius, const FloatSize& bottomLeftRadius, const FloatSize& bottomRightRadius);
|
| #endif
|
|
|
| -#if PLATFORM(BLACKBERRY)
|
| - Path(const SkPath&);
|
| -#endif
|
| -
|
| private:
|
| PlatformPathPtr m_path;
|
| };
|
|
|