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

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

Issue 2056303002: [Layout API] Use Document::layoutViewItem() in ViewportStyleResolver (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: changed both declarations to const ref as per rune 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 16 matching lines...) Expand all
27 27
28 #include "bindings/core/v8/ExceptionState.h" 28 #include "bindings/core/v8/ExceptionState.h"
29 #include "core/CSSPropertyNames.h" 29 #include "core/CSSPropertyNames.h"
30 #include "core/CSSValueKeywords.h" 30 #include "core/CSSValueKeywords.h"
31 #include "core/css/CSSToLengthConversionData.h" 31 #include "core/css/CSSToLengthConversionData.h"
32 #include "core/css/StylePropertySet.h" 32 #include "core/css/StylePropertySet.h"
33 #include "core/css/parser/CSSParser.h" 33 #include "core/css/parser/CSSParser.h"
34 #include "core/css/resolver/TransformBuilder.h" 34 #include "core/css/resolver/TransformBuilder.h"
35 #include "core/dom/ExceptionCode.h" 35 #include "core/dom/ExceptionCode.h"
36 #include "core/frame/UseCounter.h" 36 #include "core/frame/UseCounter.h"
37 #include "core/layout/api/LayoutViewItem.h"
37 #include "core/style/ComputedStyle.h" 38 #include "core/style/ComputedStyle.h"
38 #include "core/style/StyleInheritedData.h" 39 #include "core/style/StyleInheritedData.h"
39 #include "wtf/MathExtras.h" 40 #include "wtf/MathExtras.h"
40 41
41 namespace blink { 42 namespace blink {
42 43
43 CSSMatrix* CSSMatrix::create(ExecutionContext* executionContext, const String& s , ExceptionState& exceptionState) 44 CSSMatrix* CSSMatrix::create(ExecutionContext* executionContext, const String& s , ExceptionState& exceptionState)
44 { 45 {
45 UseCounter::count(executionContext, UseCounter::WebKitCSSMatrix); 46 UseCounter::count(executionContext, UseCounter::WebKitCSSMatrix);
46 return new CSSMatrix(s, exceptionState); 47 return new CSSMatrix(s, exceptionState);
(...skipping 22 matching lines...) Expand all
69 if (string.isEmpty()) 70 if (string.isEmpty())
70 return; 71 return;
71 72
72 if (CSSValue* value = CSSParser::parseSingleValue(CSSPropertyTransform, stri ng)) { 73 if (CSSValue* value = CSSParser::parseSingleValue(CSSPropertyTransform, stri ng)) {
73 // 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.
74 if (value->isPrimitiveValue() && (toCSSPrimitiveValue(value))->getValueI D() == CSSValueNone) 75 if (value->isPrimitiveValue() && (toCSSPrimitiveValue(value))->getValueI D() == CSSValueNone)
75 return; 76 return;
76 77
77 DEFINE_STATIC_REF(ComputedStyle, initialStyle, createInitialStyle()); 78 DEFINE_STATIC_REF(ComputedStyle, initialStyle, createInitialStyle());
78 TransformOperations operations; 79 TransformOperations operations;
79 TransformBuilder::createTransformOperations(*value, CSSToLengthConversio nData(initialStyle, initialStyle, nullptr, 1.0f), operations); 80 TransformBuilder::createTransformOperations(*value, CSSToLengthConversio nData(initialStyle, initialStyle, LayoutViewItem(nullptr), 1.0f), operations);
80 81
81 // Convert transform operations to a TransformationMatrix. This can fail 82 // Convert transform operations to a TransformationMatrix. This can fail
82 // if a param has a percentage ('%') 83 // if a param has a percentage ('%')
83 if (operations.dependsOnBoxSize()) 84 if (operations.dependsOnBoxSize())
84 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.");
85 m_matrix = TransformationMatrix::create(); 86 m_matrix = TransformationMatrix::create();
86 operations.apply(FloatSize(0, 0), *m_matrix); 87 operations.apply(FloatSize(0, 0), *m_matrix);
87 } else { // There is something there but parsing failed. 88 } else { // There is something there but parsing failed.
88 exceptionState.throwDOMException(SyntaxError, "Failed to parse '" + stri ng + "'."); 89 exceptionState.throwDOMException(SyntaxError, "Failed to parse '" + stri ng + "'.");
89 } 90 }
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 if (m_matrix->isAffine()) 184 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()); 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("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)",
186 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(),
187 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(),
188 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(),
189 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());
190 } 191 }
191 192
192 } // namespace blink 193 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698