Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(67)

Side by Side Diff: Source/core/html/canvas/Path2D.h

Issue 178673002: Rename Path to Path2D (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@path
Patch Set: Merge to head which includes isPoint and addPath changes. Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/html/canvas/Path.idl ('k') | Source/core/html/canvas/Path2D.idl » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER "AS IS" AND ANY 14 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER "AS IS" AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE
18 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, 18 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
19 * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 19 * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR 22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
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 Path2D_h
29 #define DOMPath_h 29 #define Path2D_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/SVGMatrixTearOff.h" 33 #include "core/svg/SVGMatrixTearOff.h"
34 #include "core/svg/SVGPathUtilities.h" 34 #include "core/svg/SVGPathUtilities.h"
35 #include "platform/transforms/AffineTransform.h" 35 #include "platform/transforms/AffineTransform.h"
36 #include "wtf/PassRefPtr.h" 36 #include "wtf/PassRefPtr.h"
37 #include "wtf/RefCounted.h" 37 #include "wtf/RefCounted.h"
38 38
39 namespace WebCore { 39 namespace WebCore {
40 40
41 class DOMPath FINAL : public RefCounted<DOMPath>, public CanvasPathMethods, publ ic ScriptWrappable { 41 class Path2D FINAL : public RefCounted<Path2D>, public CanvasPathMethods, public ScriptWrappable {
42 WTF_MAKE_NONCOPYABLE(DOMPath); WTF_MAKE_FAST_ALLOCATED; 42 WTF_MAKE_NONCOPYABLE(Path2D); WTF_MAKE_FAST_ALLOCATED;
43 public: 43 public:
44 static PassRefPtr<DOMPath> create() { return adoptRef(new DOMPath); } 44 static PassRefPtr<Path2D> create() { return adoptRef(new Path2D); }
45 static PassRefPtr<DOMPath> create(const String& pathData) { return adoptRef( new DOMPath(pathData)); } 45 static PassRefPtr<Path2D> create(const String& pathData) { return adoptRef(n ew Path2D(pathData)); }
46 static PassRefPtr<DOMPath> create(DOMPath* path) { return adoptRef(new DOMPa th(path)); } 46 static PassRefPtr<Path2D> create(Path2D* path) { return adoptRef(new Path2D( path)); }
47 47
48 static PassRefPtr<DOMPath> create(const Path& path) { return adoptRef(new DO MPath(path)); } 48 static PassRefPtr<Path2D> create(const Path& path) { return adoptRef(new Pat h2D(path)); }
49 49
50 const Path& path() const { return m_path; } 50 const Path& path() const { return m_path; }
51 51
52 virtual ~DOMPath() { }
53 52
54 void addPath(DOMPath* path, SVGMatrixTearOff* transform, ExceptionState& exc eptionState) 53 void addPath(Path2D* path, SVGMatrixTearOff* transform, ExceptionState& exce ptionState)
55 { 54 {
56 if (!path) { 55 if (!path) {
57 exceptionState.throwDOMException(TypeMismatchError, ExceptionMessage s::argumentNullOrIncorrectType(1, "Path")); 56 exceptionState.throwDOMException(TypeMismatchError, ExceptionMessage s::argumentNullOrIncorrectType(1, "Path"));
58 return; 57 return;
59 } 58 }
60 Path src = path->path(); 59 Path src = path->path();
61 m_path.addPath(src, transform ? transform->value() : AffineTransform(1, 0, 0, 1, 0, 0)); 60 m_path.addPath(src, transform ? transform->value() : AffineTransform(1, 0, 0, 1, 0, 0));
62 } 61 }
62 virtual ~Path2D() { }
63 private: 63 private:
64 DOMPath() : CanvasPathMethods() 64 Path2D() : CanvasPathMethods()
65 { 65 {
66 ScriptWrappable::init(this); 66 ScriptWrappable::init(this);
67 } 67 }
68 68
69 DOMPath(const Path& path) 69 Path2D(const Path& path)
70 : CanvasPathMethods(path) 70 : CanvasPathMethods(path)
71 { 71 {
72 ScriptWrappable::init(this); 72 ScriptWrappable::init(this);
73 } 73 }
74 74
75 DOMPath(DOMPath* path) 75 Path2D(Path2D* path)
76 : CanvasPathMethods(path->path()) 76 : CanvasPathMethods(path->path())
77 { 77 {
78 ScriptWrappable::init(this); 78 ScriptWrappable::init(this);
79 } 79 }
80 80
81 DOMPath(const String& pathData) 81 Path2D(const String& pathData)
82 : CanvasPathMethods() 82 : CanvasPathMethods()
83 { 83 {
84 ScriptWrappable::init(this); 84 ScriptWrappable::init(this);
85 buildPathFromString(pathData, m_path); 85 buildPathFromString(pathData, m_path);
86 } 86 }
87 }; 87 };
88 88
89 } 89 }
90 #endif 90 #endif
OLDNEW
« no previous file with comments | « Source/core/html/canvas/Path.idl ('k') | Source/core/html/canvas/Path2D.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698