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

Unified 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, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/css/CSSGradientValue.cpp ('k') | Source/core/css/CSSPrimitiveValue.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/CSSMatrix.cpp
diff --git a/Source/core/css/CSSMatrix.cpp b/Source/core/css/CSSMatrix.cpp
index 5fc476a3e86fc102a0ffd548a0feec8684dcf922..5d5a00ebab7ab46439ada922feb4bb1f75590390 100644
--- a/Source/core/css/CSSMatrix.cpp
+++ b/Source/core/css/CSSMatrix.cpp
@@ -35,7 +35,7 @@
#include "core/css/resolver/TransformBuilder.h"
#include "core/dom/ExceptionCode.h"
#include "core/frame/UseCounter.h"
-#include "core/layout/style/LayoutStyle.h"
+#include "core/layout/style/ComputedStyle.h"
#include "core/layout/style/StyleInheritedData.h"
#include "wtf/MathExtras.h"
@@ -57,9 +57,9 @@ CSSMatrix::CSSMatrix(const String& s, ExceptionState& exceptionState)
setMatrixValue(s, exceptionState);
}
-static inline PassRefPtr<LayoutStyle> createInitialStyle()
+static inline PassRefPtr<ComputedStyle> createInitialStyle()
{
- RefPtr<LayoutStyle> initialStyle = LayoutStyle::create();
+ RefPtr<ComputedStyle> initialStyle = ComputedStyle::create();
initialStyle->font().update(nullptr);
return initialStyle;
}
@@ -75,7 +75,7 @@ void CSSMatrix::setMatrixValue(const String& string, ExceptionState& exceptionSt
if (value->isPrimitiveValue() && (toCSSPrimitiveValue(value.get()))->getValueID() == CSSValueNone)
return;
- DEFINE_STATIC_REF(LayoutStyle, initialStyle, createInitialStyle());
+ DEFINE_STATIC_REF(ComputedStyle, initialStyle, createInitialStyle());
TransformOperations operations;
TransformBuilder::createTransformOperations(*value, CSSToLengthConversionData(initialStyle, initialStyle, nullptr, 1.0f), operations);
« 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