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

Side by Side Diff: third_party/WebKit/Source/core/layout/ClipPathOperation.h

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2012 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 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 14 matching lines...) Expand all
25 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF 25 * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
26 * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 26 * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
27 * SUCH DAMAGE. 27 * SUCH DAMAGE.
28 */ 28 */
29 29
30 #ifndef ClipPathOperation_h 30 #ifndef ClipPathOperation_h
31 #define ClipPathOperation_h 31 #define ClipPathOperation_h
32 32
33 #include "core/style/BasicShapes.h" 33 #include "core/style/BasicShapes.h"
34 #include "platform/graphics/Path.h" 34 #include "platform/graphics/Path.h"
35 #include "wtf/PtrUtil.h" 35 #include "wtf/OwnPtr.h"
36 #include "wtf/PassOwnPtr.h"
36 #include "wtf/RefCounted.h" 37 #include "wtf/RefCounted.h"
37 #include "wtf/text/WTFString.h" 38 #include "wtf/text/WTFString.h"
38 #include <memory>
39 39
40 namespace blink { 40 namespace blink {
41 41
42 class ClipPathOperation : public RefCounted<ClipPathOperation> { 42 class ClipPathOperation : public RefCounted<ClipPathOperation> {
43 public: 43 public:
44 enum OperationType { 44 enum OperationType {
45 REFERENCE, 45 REFERENCE,
46 SHAPE 46 SHAPE
47 }; 47 };
48 48
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 { 98 {
99 return adoptRef(new ShapeClipPathOperation(shape)); 99 return adoptRef(new ShapeClipPathOperation(shape));
100 } 100 }
101 101
102 const BasicShape* basicShape() const { return m_shape.get(); } 102 const BasicShape* basicShape() const { return m_shape.get(); }
103 bool isValid() const { return m_shape.get(); } 103 bool isValid() const { return m_shape.get(); }
104 const Path& path(const FloatRect& boundingRect) 104 const Path& path(const FloatRect& boundingRect)
105 { 105 {
106 ASSERT(m_shape); 106 ASSERT(m_shape);
107 m_path.reset(); 107 m_path.reset();
108 m_path = wrapUnique(new Path); 108 m_path = adoptPtr(new Path);
109 m_shape->path(*m_path, boundingRect); 109 m_shape->path(*m_path, boundingRect);
110 m_path->setWindRule(m_shape->getWindRule()); 110 m_path->setWindRule(m_shape->getWindRule());
111 return *m_path; 111 return *m_path;
112 } 112 }
113 113
114 private: 114 private:
115 bool operator==(const ClipPathOperation&) const override; 115 bool operator==(const ClipPathOperation&) const override;
116 116
117 ShapeClipPathOperation(PassRefPtr<BasicShape> shape) 117 ShapeClipPathOperation(PassRefPtr<BasicShape> shape)
118 : ClipPathOperation(SHAPE) 118 : ClipPathOperation(SHAPE)
119 , m_shape(shape) 119 , m_shape(shape)
120 { 120 {
121 } 121 }
122 122
123 RefPtr<BasicShape> m_shape; 123 RefPtr<BasicShape> m_shape;
124 std::unique_ptr<Path> m_path; 124 OwnPtr<Path> m_path;
125 }; 125 };
126 126
127 DEFINE_TYPE_CASTS(ShapeClipPathOperation, ClipPathOperation, op, op->type() == C lipPathOperation::SHAPE, op.type() == ClipPathOperation::SHAPE); 127 DEFINE_TYPE_CASTS(ShapeClipPathOperation, ClipPathOperation, op, op->type() == C lipPathOperation::SHAPE, op.type() == ClipPathOperation::SHAPE);
128 128
129 inline bool ShapeClipPathOperation::operator==(const ClipPathOperation& o) const 129 inline bool ShapeClipPathOperation::operator==(const ClipPathOperation& o) const
130 { 130 {
131 if (!isSameType(o)) 131 if (!isSameType(o))
132 return false; 132 return false;
133 BasicShape* otherShape = toShapeClipPathOperation(o).m_shape.get(); 133 BasicShape* otherShape = toShapeClipPathOperation(o).m_shape.get();
134 if (!m_shape.get() || !otherShape) 134 if (!m_shape.get() || !otherShape)
135 return static_cast<bool>(m_shape.get()) == static_cast<bool>(otherShape) ; 135 return static_cast<bool>(m_shape.get()) == static_cast<bool>(otherShape) ;
136 return *m_shape == *otherShape; 136 return *m_shape == *otherShape;
137 } 137 }
138 138
139 } // namespace blink 139 } // namespace blink
140 140
141 #endif // ClipPathOperation_h 141 #endif // ClipPathOperation_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698