| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2003, 2006 Apple Computer, Inc. All rights reserved. | 2 * Copyright (C) 2003, 2006 Apple Computer, Inc. All rights reserved. |
| 3 * 2006 Rob Buis <buis@kde.org> | 3 * 2006 Rob Buis <buis@kde.org> |
| 4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> | 4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> |
| 5 * Copyright (C) 2013 Google Inc. All rights reserved. | 5 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 6 * Copyright (C) 2013 Intel Corporation. All rights reserved. | 6 * Copyright (C) 2013 Intel Corporation. All rights reserved. |
| 7 * | 7 * |
| 8 * Redistribution and use in source and binary forms, with or without | 8 * Redistribution and use in source and binary forms, with or without |
| 9 * modification, are permitted provided that the following conditions | 9 * modification, are permitted provided that the following conditions |
| 10 * are met: | 10 * are met: |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 24 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 25 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 25 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 26 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 27 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 27 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 28 */ | 28 */ |
| 29 | 29 |
| 30 #include "config.h" | 30 #include "config.h" |
| 31 #include "core/platform/graphics/Path.h" | 31 #include "core/platform/graphics/Path.h" |
| 32 | 32 |
| 33 #include <math.h> | 33 #include <math.h> |
| 34 #include "core/platform/graphics/FloatPoint.h" | |
| 35 #include "core/platform/graphics/FloatRect.h" | |
| 36 #include "core/platform/graphics/GraphicsContext.h" | 34 #include "core/platform/graphics/GraphicsContext.h" |
| 37 #include "core/platform/graphics/skia/SkiaUtils.h" | 35 #include "core/platform/graphics/skia/SkiaUtils.h" |
| 38 #include "core/platform/graphics/transforms/AffineTransform.h" | 36 #include "platform/geometry/FloatPoint.h" |
| 37 #include "platform/geometry/FloatRect.h" |
| 38 #include "platform/transforms/AffineTransform.h" |
| 39 #include "third_party/skia/include/core/SkPath.h" | 39 #include "third_party/skia/include/core/SkPath.h" |
| 40 #include "third_party/skia/include/core/SkPathMeasure.h" | 40 #include "third_party/skia/include/core/SkPathMeasure.h" |
| 41 #include "third_party/skia/include/pathops/SkPathOps.h" | 41 #include "third_party/skia/include/pathops/SkPathOps.h" |
| 42 #include "wtf/MathExtras.h" | 42 #include "wtf/MathExtras.h" |
| 43 | 43 |
| 44 namespace WebCore { | 44 namespace WebCore { |
| 45 | 45 |
| 46 Path::Path() | 46 Path::Path() |
| 47 : m_path() | 47 : m_path() |
| 48 { | 48 { |
| (...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 447 { | 447 { |
| 448 m_path.offset(WebCoreFloatToSkScalar(size.width()), WebCoreFloatToSkScalar(s
ize.height())); | 448 m_path.offset(WebCoreFloatToSkScalar(size.width()), WebCoreFloatToSkScalar(s
ize.height())); |
| 449 } | 449 } |
| 450 | 450 |
| 451 bool Path::unionPath(const Path& other) | 451 bool Path::unionPath(const Path& other) |
| 452 { | 452 { |
| 453 return Op(m_path, other.m_path, kUnion_PathOp, &m_path); | 453 return Op(m_path, other.m_path, kUnion_PathOp, &m_path); |
| 454 } | 454 } |
| 455 | 455 |
| 456 } | 456 } |
| OLD | NEW |