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

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

Issue 1033943002: Rename LayoutStyle to papayawhip (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ensureComputedStyle Created 5 years, 8 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/css/CSSGradientValue.cpp ('k') | Source/core/css/CSSPrimitiveValue.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 17 matching lines...) Expand all
28 28
29 #include "bindings/core/v8/ExceptionState.h" 29 #include "bindings/core/v8/ExceptionState.h"
30 #include "core/CSSPropertyNames.h" 30 #include "core/CSSPropertyNames.h"
31 #include "core/CSSValueKeywords.h" 31 #include "core/CSSValueKeywords.h"
32 #include "core/css/CSSToLengthConversionData.h" 32 #include "core/css/CSSToLengthConversionData.h"
33 #include "core/css/StylePropertySet.h" 33 #include "core/css/StylePropertySet.h"
34 #include "core/css/parser/CSSParser.h" 34 #include "core/css/parser/CSSParser.h"
35 #include "core/css/resolver/TransformBuilder.h" 35 #include "core/css/resolver/TransformBuilder.h"
36 #include "core/dom/ExceptionCode.h" 36 #include "core/dom/ExceptionCode.h"
37 #include "core/frame/UseCounter.h" 37 #include "core/frame/UseCounter.h"
38 #include "core/layout/style/LayoutStyle.h" 38 #include "core/layout/style/ComputedStyle.h"
39 #include "core/layout/style/StyleInheritedData.h" 39 #include "core/layout/style/StyleInheritedData.h"
40 #include "wtf/MathExtras.h" 40 #include "wtf/MathExtras.h"
41 41
42 namespace blink { 42 namespace blink {
43 43
44 PassRefPtrWillBeRawPtr<CSSMatrix> CSSMatrix::create(ExecutionContext* executionC ontext, const String& s, ExceptionState& exceptionState) 44 PassRefPtrWillBeRawPtr<CSSMatrix> CSSMatrix::create(ExecutionContext* executionC ontext, const String& s, ExceptionState& exceptionState)
45 { 45 {
46 UseCounter::count(executionContext, UseCounter::WebKitCSSMatrix); 46 UseCounter::count(executionContext, UseCounter::WebKitCSSMatrix);
47 return adoptRefWillBeNoop(new CSSMatrix(s, exceptionState)); 47 return adoptRefWillBeNoop(new CSSMatrix(s, exceptionState));
48 } 48 }
49 49
50 CSSMatrix::CSSMatrix(const TransformationMatrix& m) 50 CSSMatrix::CSSMatrix(const TransformationMatrix& m)
51 : m_matrix(m) 51 : m_matrix(m)
52 { 52 {
53 } 53 }
54 54
55 CSSMatrix::CSSMatrix(const String& s, ExceptionState& exceptionState) 55 CSSMatrix::CSSMatrix(const String& s, ExceptionState& exceptionState)
56 { 56 {
57 setMatrixValue(s, exceptionState); 57 setMatrixValue(s, exceptionState);
58 } 58 }
59 59
60 static inline PassRefPtr<LayoutStyle> createInitialStyle() 60 static inline PassRefPtr<ComputedStyle> createInitialStyle()
61 { 61 {
62 RefPtr<LayoutStyle> initialStyle = LayoutStyle::create(); 62 RefPtr<ComputedStyle> initialStyle = ComputedStyle::create();
63 initialStyle->font().update(nullptr); 63 initialStyle->font().update(nullptr);
64 return initialStyle; 64 return initialStyle;
65 } 65 }
66 66
67 void CSSMatrix::setMatrixValue(const String& string, ExceptionState& exceptionSt ate) 67 void CSSMatrix::setMatrixValue(const String& string, ExceptionState& exceptionSt ate)
68 { 68 {
69 if (string.isEmpty()) 69 if (string.isEmpty())
70 return; 70 return;
71 71
72 // FIXME: crbug.com/154772 - should this continue to use legacy style parsin g? 72 // FIXME: crbug.com/154772 - should this continue to use legacy style parsin g?
73 if (RefPtrWillBeRawPtr<CSSValue> value = CSSParser::parseSingleValue(CSSProp ertyWebkitTransform, string)) { 73 if (RefPtrWillBeRawPtr<CSSValue> value = CSSParser::parseSingleValue(CSSProp ertyWebkitTransform, string)) {
74 // Check for a "none" transform. In these cases we can use the default i dentity matrix. 74 // Check for a "none" transform. In these cases we can use the default i dentity matrix.
75 if (value->isPrimitiveValue() && (toCSSPrimitiveValue(value.get()))->get ValueID() == CSSValueNone) 75 if (value->isPrimitiveValue() && (toCSSPrimitiveValue(value.get()))->get ValueID() == CSSValueNone)
76 return; 76 return;
77 77
78 DEFINE_STATIC_REF(LayoutStyle, initialStyle, createInitialStyle()); 78 DEFINE_STATIC_REF(ComputedStyle, initialStyle, createInitialStyle());
79 TransformOperations operations; 79 TransformOperations operations;
80 TransformBuilder::createTransformOperations(*value, CSSToLengthConversio nData(initialStyle, initialStyle, nullptr, 1.0f), operations); 80 TransformBuilder::createTransformOperations(*value, CSSToLengthConversio nData(initialStyle, initialStyle, nullptr, 1.0f), operations);
81 81
82 // Convert transform operations to a TransformationMatrix. This can fail 82 // Convert transform operations to a TransformationMatrix. This can fail
83 // if a param has a percentage ('%') 83 // if a param has a percentage ('%')
84 if (operations.dependsOnBoxSize()) 84 if (operations.dependsOnBoxSize())
85 exceptionState.throwDOMException(SyntaxError, "The transformation de pends on the box size, which is not supported."); 85 exceptionState.throwDOMException(SyntaxError, "The transformation de pends on the box size, which is not supported.");
86 TransformationMatrix t; 86 TransformationMatrix t;
87 operations.apply(FloatSize(0, 0), t); 87 operations.apply(FloatSize(0, 0), t);
88 88
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 if (m_matrix.isAffine()) 187 if (m_matrix.isAffine())
188 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()); 188 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());
189 return String::format("matrix3d(%f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f)", 189 return String::format("matrix3d(%f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f)",
190 m_matrix.m11(), m_matrix.m12(), m_matrix.m13(), m_matrix.m14(), 190 m_matrix.m11(), m_matrix.m12(), m_matrix.m13(), m_matrix.m14(),
191 m_matrix.m21(), m_matrix.m22(), m_matrix.m23(), m_matrix.m24(), 191 m_matrix.m21(), m_matrix.m22(), m_matrix.m23(), m_matrix.m24(),
192 m_matrix.m31(), m_matrix.m32(), m_matrix.m33(), m_matrix.m34(), 192 m_matrix.m31(), m_matrix.m32(), m_matrix.m33(), m_matrix.m34(),
193 m_matrix.m41(), m_matrix.m42(), m_matrix.m43(), m_matrix.m44()); 193 m_matrix.m41(), m_matrix.m42(), m_matrix.m43(), m_matrix.m44());
194 } 194 }
195 195
196 } // namespace blink 196 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/CSSGradientValue.cpp ('k') | Source/core/css/CSSPrimitiveValue.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698