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

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

Issue 2038363002: Make CSSPropertyParser::parseSingleValue return a const CSSValue* (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@_remove_const_cast_in_interpolation_type
Patch Set: Rebase Created 4 years, 5 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 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 RefPtr<ComputedStyle> initialStyle = ComputedStyle::create(); 63 RefPtr<ComputedStyle> initialStyle = ComputedStyle::create();
64 initialStyle->font().update(nullptr); 64 initialStyle->font().update(nullptr);
65 return initialStyle; 65 return initialStyle;
66 } 66 }
67 67
68 void CSSMatrix::setMatrixValue(const String& string, ExceptionState& exceptionSt ate) 68 void CSSMatrix::setMatrixValue(const String& string, ExceptionState& exceptionSt ate)
69 { 69 {
70 if (string.isEmpty()) 70 if (string.isEmpty())
71 return; 71 return;
72 72
73 if (CSSValue* value = CSSParser::parseSingleValue(CSSPropertyTransform, stri ng)) { 73 if (const CSSValue* value = CSSParser::parseSingleValue(CSSPropertyTransform , 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))->getValueI D() == CSSValueNone) 75 if (value->isPrimitiveValue() && (toCSSPrimitiveValue(value))->getValueI D() == CSSValueNone)
76 return; 76 return;
77 77
78 DEFINE_STATIC_REF(ComputedStyle, initialStyle, createInitialStyle()); 78 DEFINE_STATIC_REF(ComputedStyle, initialStyle, createInitialStyle());
79 TransformOperations operations; 79 TransformOperations operations;
80 TransformBuilder::createTransformOperations(*value, CSSToLengthConversio nData(initialStyle, initialStyle, LayoutViewItem(nullptr), 1.0f), operations); 80 TransformBuilder::createTransformOperations(*value, CSSToLengthConversio nData(initialStyle, initialStyle, LayoutViewItem(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 ('%')
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 if (m_matrix->isAffine()) 184 if (m_matrix->isAffine())
185 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("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());
186 return String::format("matrix3d(%f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f)", 186 return String::format("matrix3d(%f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f, %f)",
187 m_matrix->m11(), m_matrix->m12(), m_matrix->m13(), m_matrix->m14(), 187 m_matrix->m11(), m_matrix->m12(), m_matrix->m13(), m_matrix->m14(),
188 m_matrix->m21(), m_matrix->m22(), m_matrix->m23(), m_matrix->m24(), 188 m_matrix->m21(), m_matrix->m22(), m_matrix->m23(), m_matrix->m24(),
189 m_matrix->m31(), m_matrix->m32(), m_matrix->m33(), m_matrix->m34(), 189 m_matrix->m31(), m_matrix->m32(), m_matrix->m33(), m_matrix->m34(),
190 m_matrix->m41(), m_matrix->m42(), m_matrix->m43(), m_matrix->m44()); 190 m_matrix->m41(), m_matrix->m42(), m_matrix->m43(), m_matrix->m44());
191 } 191 }
192 192
193 } // namespace blink 193 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698