| 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 473 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 484 m_path.addPath(src.skPath(), affineTransformToSkMatrix(transform)); | 484 m_path.addPath(src.skPath(), affineTransformToSkMatrix(transform)); |
| 485 } | 485 } |
| 486 | 486 |
| 487 void Path::translate(const FloatSize& size) | 487 void Path::translate(const FloatSize& size) |
| 488 { | 488 { |
| 489 m_path.offset(WebCoreFloatToSkScalar(size.width()), WebCoreFloatToSkScalar(s
ize.height())); | 489 m_path.offset(WebCoreFloatToSkScalar(size.width()), WebCoreFloatToSkScalar(s
ize.height())); |
| 490 } | 490 } |
| 491 | 491 |
| 492 bool Path::subtractPath(const Path& other) | 492 bool Path::subtractPath(const Path& other) |
| 493 { | 493 { |
| 494 return Op(m_path, other.m_path, kDifference_PathOp, &m_path); | 494 return Op(m_path, other.m_path, kDifference_SkPathOp, &m_path); |
| 495 } | 495 } |
| 496 | 496 |
| 497 bool Path::intersectPath(const Path& other) | 497 bool Path::intersectPath(const Path& other) |
| 498 { | 498 { |
| 499 return Op(m_path, other.m_path, kIntersect_PathOp, &m_path); | 499 return Op(m_path, other.m_path, kIntersect_SkPathOp, &m_path); |
| 500 } | 500 } |
| 501 | 501 |
| 502 bool Path::unionPath(const Path& other) | 502 bool Path::unionPath(const Path& other) |
| 503 { | 503 { |
| 504 return Op(m_path, other.m_path, kUnion_PathOp, &m_path); | 504 return Op(m_path, other.m_path, kUnion_SkPathOp, &m_path); |
| 505 } | 505 } |
| 506 | 506 |
| 507 #if ENABLE(ASSERT) | 507 #if ENABLE(ASSERT) |
| 508 bool ellipseIsRenderable(float startAngle, float endAngle) | 508 bool ellipseIsRenderable(float startAngle, float endAngle) |
| 509 { | 509 { |
| 510 return (std::abs(endAngle - startAngle) < twoPiFloat) | 510 return (std::abs(endAngle - startAngle) < twoPiFloat) |
| 511 || WebCoreFloatNearlyEqual(std::abs(endAngle - startAngle), twoPiFloat); | 511 || WebCoreFloatNearlyEqual(std::abs(endAngle - startAngle), twoPiFloat); |
| 512 } | 512 } |
| 513 #endif | 513 #endif |
| 514 | 514 |
| 515 } // namespace blink | 515 } // namespace blink |
| OLD | NEW |