| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012, 2013 Adobe Systems Incorporated. All rights reserved. | 2 * Copyright (C) 2012, 2013 Adobe Systems Incorporated. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF | 23 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF |
| 24 * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | 24 * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF |
| 25 * SUCH DAMAGE. | 25 * SUCH DAMAGE. |
| 26 */ | 26 */ |
| 27 | 27 |
| 28 #ifndef DOMPath_h | 28 #ifndef DOMPath_h |
| 29 #define DOMPath_h | 29 #define DOMPath_h |
| 30 | 30 |
| 31 #include "bindings/v8/ScriptWrappable.h" | 31 #include "bindings/v8/ScriptWrappable.h" |
| 32 #include "core/html/canvas/CanvasPathMethods.h" | 32 #include "core/html/canvas/CanvasPathMethods.h" |
| 33 #include "core/svg/SVGMatrix.h" |
| 33 #include "core/svg/SVGPathUtilities.h" | 34 #include "core/svg/SVGPathUtilities.h" |
| 34 #include "wtf/PassRefPtr.h" | 35 #include "wtf/PassRefPtr.h" |
| 35 #include "wtf/RefCounted.h" | 36 #include "wtf/RefCounted.h" |
| 36 | 37 |
| 37 namespace WebCore { | 38 namespace WebCore { |
| 38 | 39 |
| 39 class DOMPath FINAL : public RefCounted<DOMPath>, public CanvasPathMethods, publ
ic ScriptWrappable { | 40 class DOMPath FINAL : public RefCounted<DOMPath>, public CanvasPathMethods, publ
ic ScriptWrappable { |
| 40 WTF_MAKE_NONCOPYABLE(DOMPath); WTF_MAKE_FAST_ALLOCATED; | 41 WTF_MAKE_NONCOPYABLE(DOMPath); WTF_MAKE_FAST_ALLOCATED; |
| 41 public: | 42 public: |
| 42 static PassRefPtr<DOMPath> create() { return adoptRef(new DOMPath); } | 43 static PassRefPtr<DOMPath> create() { return adoptRef(new DOMPath); } |
| 43 static PassRefPtr<DOMPath> create(const String& pathData) { return adoptRef(
new DOMPath(pathData)); } | 44 static PassRefPtr<DOMPath> create(const String& pathData) { return adoptRef(
new DOMPath(pathData)); } |
| 44 static PassRefPtr<DOMPath> create(DOMPath* path) { return adoptRef(new DOMPa
th(path)); } | 45 static PassRefPtr<DOMPath> create(DOMPath* path) { return adoptRef(new DOMPa
th(path)); } |
| 45 | 46 |
| 46 static PassRefPtr<DOMPath> create(const Path& path) { return adoptRef(new DO
MPath(path)); } | 47 static PassRefPtr<DOMPath> create(const Path& path) { return adoptRef(new DO
MPath(path)); } |
| 47 | 48 |
| 48 const Path& path() const { return m_path; } | 49 const Path& path() const { return m_path; } |
| 49 | 50 |
| 50 virtual ~DOMPath() { } | 51 virtual ~DOMPath() { } |
| 52 |
| 53 void addPath(DOMPath* path, const SVGMatrix& transform) |
| 54 { |
| 55 Path src = path->path(); |
| 56 m_path.addPath(src, transform); |
| 57 } |
| 51 private: | 58 private: |
| 52 DOMPath() : CanvasPathMethods() | 59 DOMPath() : CanvasPathMethods() |
| 53 { | 60 { |
| 54 ScriptWrappable::init(this); | 61 ScriptWrappable::init(this); |
| 55 } | 62 } |
| 56 | 63 |
| 57 DOMPath(const Path& path) | 64 DOMPath(const Path& path) |
| 58 : CanvasPathMethods() | 65 : CanvasPathMethods(path) |
| 59 { | 66 { |
| 60 ScriptWrappable::init(this); | 67 ScriptWrappable::init(this); |
| 61 m_path = path; | |
| 62 } | 68 } |
| 63 | 69 |
| 64 DOMPath(DOMPath* path) | 70 DOMPath(DOMPath* path) |
| 65 : CanvasPathMethods() | 71 : CanvasPathMethods(path->path()) |
| 66 { | 72 { |
| 67 ScriptWrappable::init(this); | 73 ScriptWrappable::init(this); |
| 68 m_path = path->path(); | |
| 69 } | 74 } |
| 70 | 75 |
| 71 DOMPath(const String& pathData) | 76 DOMPath(const String& pathData) |
| 72 : CanvasPathMethods() | 77 : CanvasPathMethods() |
| 73 { | 78 { |
| 74 ScriptWrappable::init(this); | 79 ScriptWrappable::init(this); |
| 75 buildPathFromString(pathData, m_path); | 80 buildPathFromString(pathData, m_path); |
| 76 } | 81 } |
| 77 }; | 82 }; |
| 78 | 83 |
| 79 } | 84 } |
| 80 #endif | 85 #endif |
| OLD | NEW |