Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84

1 files changed, 0 insertions, 312 deletions

diff --git a/WebCore/platform/graphics/cg/PathCG.cpp b/WebCore/platform/graphics/cg/PathCG.cpp
deleted file mode 100644
index b47ed02..0000000
--- a/WebCore/platform/graphics/cg/PathCG.cpp
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
- * Copyright (C) 2003, 2006 Apple Computer, Inc.  All rights reserved.
- *                     2006, 2008 Rob Buis <buis@kde.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
- */
-
-#include "config.h"
-#include "Path.h"
-
-#if PLATFORM(CG)
-
-#include "AffineTransform.h"
-#include "FloatRect.h"
-#include "GraphicsContext.h"
-#include "IntRect.h"
-#include "PlatformString.h"
-#include "StrokeStyleApplier.h"
-#include <ApplicationServices/ApplicationServices.h>
-#include <wtf/MathExtras.h>
-#include <wtf/RetainPtr.h>
-
-namespace WebCore {
-
-static size_t putBytesNowhere(void*, const void*, size_t count)
-{
-    return count;
-}
-
-static CGContextRef createScratchContext()
-{
-    CGDataConsumerCallbacks callbacks = { putBytesNowhere, 0 };
-    RetainPtr<CGDataConsumerRef> consumer(AdoptCF, CGDataConsumerCreate(0, &callbacks));
-    CGContextRef context = CGPDFContextCreate(consumer.get(), 0, 0);
-
-    CGFloat black[4] = { 0, 0, 0, 1 };
-    CGContextSetFillColor(context, black);
-    CGContextSetStrokeColor(context, black);
-
-    return context;
-}
-
-static inline CGContextRef scratchContext()
-{
-    static CGContextRef context = createScratchContext();
-    return context;
-}
-
-Path::Path()
-    : m_path(CGPathCreateMutable())
-{
-}
-
-Path::~Path()
-{
-    CGPathRelease(m_path);
-}
-
-Path::Path(const Path& other)
-    : m_path(CGPathCreateMutableCopy(other.m_path))
-{
-}
-
-Path& Path::operator=(const Path& other)
-{
-    CGMutablePathRef path = CGPathCreateMutableCopy(other.m_path);
-    CGPathRelease(m_path);
-    m_path = path;
-    return *this;
-}
-
-static void copyClosingSubpathsApplierFunction(void* info, const CGPathElement* element)
-{
-    CGMutablePathRef path = static_cast<CGMutablePathRef>(info);
-    CGPoint* points = element->points;
-    
-    switch (element->type) {
-    case kCGPathElementMoveToPoint:
-        if (!CGPathIsEmpty(path)) // to silence a warning when trying to close an empty path
-            CGPathCloseSubpath(path); // This is the only change from CGPathCreateMutableCopy
-        CGPathMoveToPoint(path, 0, points[0].x, points[0].y);
-        break;
-    case kCGPathElementAddLineToPoint:
-        CGPathAddLineToPoint(path, 0, points[0].x, points[0].y);
-        break;
-    case kCGPathElementAddQuadCurveToPoint:
-        CGPathAddQuadCurveToPoint(path, 0, points[0].x, points[0].y, points[1].x, points[1].y);
-        break;
-    case kCGPathElementAddCurveToPoint:
-        CGPathAddCurveToPoint(path, 0, points[0].x, points[0].y, points[1].x, points[1].y, points[2].x, points[2].y);
-        break;
-    case kCGPathElementCloseSubpath:
-        CGPathCloseSubpath(path);
-        break;
-    }
-}
-
-static CGMutablePathRef copyCGPathClosingSubpaths(CGPathRef originalPath)
-{
-    CGMutablePathRef path = CGPathCreateMutable();
-    CGPathApply(originalPath, path, copyClosingSubpathsApplierFunction);
-    CGPathCloseSubpath(path);
-    return path;
-}
-
-bool Path::contains(const FloatPoint &point, WindRule rule) const
-{
-    if (!boundingRect().contains(point))
-        return false;
-
-    // CGPathContainsPoint returns false for non-closed paths, as a work-around, we copy and close the path first.  Radar 4758998 asks for a better CG API to use
-    RetainPtr<CGMutablePathRef> path(AdoptCF, copyCGPathClosingSubpaths(m_path));
-    bool ret = CGPathContainsPoint(path.get(), 0, point, rule == RULE_EVENODD ? true : false);
-    return ret;
-}
-
-bool Path::strokeContains(StrokeStyleApplier* applier, const FloatPoint& point) const
-{
-    ASSERT(applier);
-
-    CGContextRef context = scratchContext();
-
-    CGContextSaveGState(context);
-    CGContextBeginPath(context);
-    CGContextAddPath(context, platformPath());
-
-    GraphicsContext gc(context);
-    applier->strokeStyle(&gc);
-
-    bool hitSuccess = CGContextPathContainsPoint(context, point, kCGPathStroke);
-    CGContextRestoreGState(context);
-    
-    return hitSuccess;
-}
-
-void Path::translate(const FloatSize& size)
-{
-    CGAffineTransform translation = CGAffineTransformMake(1, 0, 0, 1, size.width(), size.height());
-    CGMutablePathRef newPath = CGPathCreateMutable();
-    CGPathAddPath(newPath, &translation, m_path);
-    CGPathRelease(m_path);
-    m_path = newPath;
-}
-
-FloatRect Path::boundingRect() const
-{
-    return CGPathGetBoundingBox(m_path);
-}
-
-FloatRect Path::strokeBoundingRect(StrokeStyleApplier* applier)
-{
-    CGContextRef context = scratchContext();
-
-    CGContextSaveGState(context);
-    CGContextBeginPath(context);
-    CGContextAddPath(context, platformPath());
-
-    if (applier) {
-        GraphicsContext graphicsContext(context);
-        applier->strokeStyle(&graphicsContext);
-    }
-
-    CGContextReplacePathWithStrokedPath(context);
-    CGRect box = CGContextIsPathEmpty(context) ? CGRectZero : CGContextGetPathBoundingBox(context);
-    CGContextRestoreGState(context);
-
-    return box;
-}
-
-void Path::moveTo(const FloatPoint& point)
-{
-    CGPathMoveToPoint(m_path, 0, point.x(), point.y());
-}
-
-void Path::addLineTo(const FloatPoint& p)
-{
-    CGPathAddLineToPoint(m_path, 0, p.x(), p.y());
-}
-
-void Path::addQuadCurveTo(const FloatPoint& cp, const FloatPoint& p)
-{
-    CGPathAddQuadCurveToPoint(m_path, 0, cp.x(), cp.y(), p.x(), p.y());
-}
-
-void Path::addBezierCurveTo(const FloatPoint& cp1, const FloatPoint& cp2, const FloatPoint& p)
-{
-    CGPathAddCurveToPoint(m_path, 0, cp1.x(), cp1.y(), cp2.x(), cp2.y(), p.x(), p.y());
-}
-
-void Path::addArcTo(const FloatPoint& p1, const FloatPoint& p2, float radius)
-{
-    CGPathAddArcToPoint(m_path, 0, p1.x(), p1.y(), p2.x(), p2.y(), radius);
-}
-
-void Path::closeSubpath()
-{
-    CGPathCloseSubpath(m_path);
-}
-
-void Path::addArc(const FloatPoint& p, float r, float sa, float ea, bool clockwise)
-{
-    // Workaround for <rdar://problem/5189233> CGPathAddArc hangs or crashes when passed inf as start or end angle
-    if (isfinite(sa) && isfinite(ea))
-        CGPathAddArc(m_path, 0, p.x(), p.y(), r, sa, ea, clockwise);
-}
-
-void Path::addRect(const FloatRect& r)
-{
-    CGPathAddRect(m_path, 0, r);
-}
-
-void Path::addEllipse(const FloatRect& r)
-{
-    CGPathAddEllipseInRect(m_path, 0, r);
-}
-
-void Path::clear()
-{
-    CGPathRelease(m_path);
-    m_path = CGPathCreateMutable();
-}
-
-bool Path::isEmpty() const
-{
-    return CGPathIsEmpty(m_path);
-}
-
-bool Path::hasCurrentPoint() const
-{
-    return !isEmpty();
-}
-    
-FloatPoint Path::currentPoint() const 
-{
-    return CGPathGetCurrentPoint(m_path);
-}
-
-#pragma mark -
-#pragma mark Path Management
-
-struct PathApplierInfo {
-    void* info;
-    PathApplierFunction function;
-};
-
-static void CGPathApplierToPathApplier(void *info, const CGPathElement *element)
-{
-    PathApplierInfo* pinfo = (PathApplierInfo*)info;
-    FloatPoint points[3];
-    PathElement pelement;
-    pelement.type = (PathElementType)element->type;
-    pelement.points = points;
-    CGPoint* cgPoints = element->points;
-    switch (element->type) {
-    case kCGPathElementMoveToPoint:
-    case kCGPathElementAddLineToPoint:
-        points[0] = cgPoints[0];
-        break;
-    case kCGPathElementAddQuadCurveToPoint:
-        points[0] = cgPoints[0];
-        points[1] = cgPoints[1];
-        break;
-    case kCGPathElementAddCurveToPoint:
-        points[0] = cgPoints[0];
-        points[1] = cgPoints[1];
-        points[2] = cgPoints[2];
-        break;
-    case kCGPathElementCloseSubpath:
-        break;
-    }
-    pinfo->function(pinfo->info, &pelement);
-}
-
-void Path::apply(void* info, PathApplierFunction function) const
-{
-    PathApplierInfo pinfo;
-    pinfo.info = info;
-    pinfo.function = function;
-    CGPathApply(m_path, &pinfo, CGPathApplierToPathApplier);
-}
-
-void Path::transform(const AffineTransform& transform)
-{
-    CGMutablePathRef path = CGPathCreateMutable();
-    CGAffineTransform transformCG = transform;
-    CGPathAddPath(path, &transformCG, m_path);
-    CGPathRelease(m_path);
-    m_path = path;
-}
-
-}
-
-#endif // PLATFORM(CG)