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

Side by Side Diff: Source/core/css/CSSMatrix.cpp

Issue 540283003: bindings: Retires ScriptWrappable::init, etc. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Addressed a review comment. Created 6 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/clipboard/DataTransferItemList.cpp ('k') | Source/core/css/CSSRuleList.h » ('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) 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 25 matching lines...) Expand all
36 #include "core/dom/ExceptionCode.h" 36 #include "core/dom/ExceptionCode.h"
37 #include "core/rendering/style/RenderStyle.h" 37 #include "core/rendering/style/RenderStyle.h"
38 #include "core/rendering/style/StyleInheritedData.h" 38 #include "core/rendering/style/StyleInheritedData.h"
39 #include "wtf/MathExtras.h" 39 #include "wtf/MathExtras.h"
40 40
41 namespace blink { 41 namespace blink {
42 42
43 CSSMatrix::CSSMatrix(const TransformationMatrix& m) 43 CSSMatrix::CSSMatrix(const TransformationMatrix& m)
44 : m_matrix(m) 44 : m_matrix(m)
45 { 45 {
46 ScriptWrappable::init(this);
47 } 46 }
48 47
49 CSSMatrix::CSSMatrix(const String& s, ExceptionState& exceptionState) 48 CSSMatrix::CSSMatrix(const String& s, ExceptionState& exceptionState)
50 { 49 {
51 ScriptWrappable::init(this);
52 setMatrixValue(s, exceptionState); 50 setMatrixValue(s, exceptionState);
53 } 51 }
54 52
55 void CSSMatrix::setMatrixValue(const String& string, ExceptionState& exceptionSt ate) 53 void CSSMatrix::setMatrixValue(const String& string, ExceptionState& exceptionSt ate)
56 { 54 {
57 if (string.isEmpty()) 55 if (string.isEmpty())
58 return; 56 return;
59 57
60 // FIXME: crbug.com/154722 - should this continue to use legacy style parsin g? 58 // FIXME: crbug.com/154722 - should this continue to use legacy style parsin g?
61 RefPtrWillBeRawPtr<MutableStylePropertySet> styleDeclaration = MutableStyleP ropertySet::create(); 59 RefPtrWillBeRawPtr<MutableStylePropertySet> styleDeclaration = MutableStyleP ropertySet::create();
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 if (m_matrix.isAffine()) 181 if (m_matrix.isAffine())
184 return String::format("matrix(%f, %f, %f, %f, %f, %f)", m_matrix.a(), m_ matrix.b(), m_matrix.c(), m_matrix.d(), m_matrix.e(), m_matrix.f()); 182 return String::format("matrix(%f, %f, %f, %f, %f, %f)", m_matrix.a(), m_ matrix.b(), m_matrix.c(), m_matrix.d(), m_matrix.e(), m_matrix.f());
185 return String::format("matrix3d(%f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f)", 183 return String::format("matrix3d(%f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f)",
186 m_matrix.m11(), m_matrix.m12(), m_matrix.m13(), m_matrix.m14(), 184 m_matrix.m11(), m_matrix.m12(), m_matrix.m13(), m_matrix.m14(),
187 m_matrix.m21(), m_matrix.m22(), m_matrix.m23(), m_matrix.m24(), 185 m_matrix.m21(), m_matrix.m22(), m_matrix.m23(), m_matrix.m24(),
188 m_matrix.m31(), m_matrix.m32(), m_matrix.m33(), m_matrix.m34(), 186 m_matrix.m31(), m_matrix.m32(), m_matrix.m33(), m_matrix.m34(),
189 m_matrix.m41(), m_matrix.m42(), m_matrix.m43(), m_matrix.m44()); 187 m_matrix.m41(), m_matrix.m42(), m_matrix.m43(), m_matrix.m44());
190 } 188 }
191 189
192 } // namespace blink 190 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/clipboard/DataTransferItemList.cpp ('k') | Source/core/css/CSSRuleList.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698