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

Side by Side Diff: third_party/WebKit/Source/core/css/CSSMatrix.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) 2008 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008 Apple Inc. 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 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 11 matching lines...) Expand all
22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #ifndef CSSMatrix_h 26 #ifndef CSSMatrix_h
27 #define CSSMatrix_h 27 #define CSSMatrix_h
28 28
29 #include "bindings/core/v8/ScriptWrappable.h" 29 #include "bindings/core/v8/ScriptWrappable.h"
30 #include "platform/transforms/TransformationMatrix.h" 30 #include "platform/transforms/TransformationMatrix.h"
31 #include "wtf/text/WTFString.h" 31 #include "wtf/text/WTFString.h"
32 #include <memory>
33 32
34 namespace blink { 33 namespace blink {
35 34
36 class ExceptionState; 35 class ExceptionState;
37 class ExecutionContext; 36 class ExecutionContext;
38 37
39 class CSSMatrix final : public GarbageCollectedFinalized<CSSMatrix>, public Scri ptWrappable { 38 class CSSMatrix final : public GarbageCollectedFinalized<CSSMatrix>, public Scri ptWrappable {
40 DEFINE_WRAPPERTYPEINFO(); 39 DEFINE_WRAPPERTYPEINFO();
41 public: 40 public:
42 static CSSMatrix* create(const TransformationMatrix& m) 41 static CSSMatrix* create(const TransformationMatrix& m)
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 145
147 String toString() const; 146 String toString() const;
148 147
149 DEFINE_INLINE_TRACE() { } 148 DEFINE_INLINE_TRACE() { }
150 149
151 protected: 150 protected:
152 CSSMatrix(const TransformationMatrix&); 151 CSSMatrix(const TransformationMatrix&);
153 CSSMatrix(const String&, ExceptionState&); 152 CSSMatrix(const String&, ExceptionState&);
154 153
155 // TransformationMatrix needs to be 16-byte aligned. PartitionAlloc 154 // TransformationMatrix needs to be 16-byte aligned. PartitionAlloc
156 // supports 16-byte alignment but Oilpan doesn't. So we use an std::unique_p tr 155 // supports 16-byte alignment but Oilpan doesn't. So we use an OwnPtr
157 // to allocate TransformationMatrix on PartitionAlloc. 156 // to allocate TransformationMatrix on PartitionAlloc.
158 // TODO(oilpan): Oilpan should support 16-byte aligned allocations. 157 // TODO(oilpan): Oilpan should support 16-byte aligned allocations.
159 std::unique_ptr<TransformationMatrix> m_matrix; 158 OwnPtr<TransformationMatrix> m_matrix;
160 }; 159 };
161 160
162 } // namespace blink 161 } // namespace blink
163 162
164 #endif // CSSMatrix_h 163 #endif // CSSMatrix_h
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/CSSKeyframesRule.cpp ('k') | third_party/WebKit/Source/core/css/CSSPathValue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698