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

Unified Diff: Source/core/svg/SVGGraphicsElement.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/svg/SVGGraphicsElement.h ('k') | Source/core/svg/SVGImageElement.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/svg/SVGGraphicsElement.cpp
diff --git a/Source/core/svg/SVGGraphicsElement.cpp b/Source/core/svg/SVGGraphicsElement.cpp
index 6cfce7ffb78c7e8ac90bc07021eef84eac20add0..96fd6f5d37e85eb481dcac1f63c416d8181b4314 100644
--- a/Source/core/svg/SVGGraphicsElement.cpp
+++ b/Source/core/svg/SVGGraphicsElement.cpp
@@ -131,7 +131,7 @@ PassRefPtrWillBeRawPtr<SVGMatrixTearOff> SVGGraphicsElement::getScreenCTMFromJav
bool SVGGraphicsElement::hasAnimatedLocalTransform() const
{
- const LayoutStyle* style = layoutObject() ? layoutObject()->style() : nullptr;
+ const ComputedStyle* style = layoutObject() ? layoutObject()->style() : nullptr;
// Each of these is used in SVGGraphicsElement::calculateAnimatedLocalTransform to create an animated local transform.
return (style && style->hasTransform()) || !m_transform->currentValue()->isEmpty() || hasSVGRareData();
@@ -140,7 +140,7 @@ bool SVGGraphicsElement::hasAnimatedLocalTransform() const
AffineTransform SVGGraphicsElement::calculateAnimatedLocalTransform() const
{
AffineTransform matrix;
- const LayoutStyle* style = layoutObject() ? layoutObject()->style() : nullptr;
+ const ComputedStyle* style = layoutObject() ? layoutObject()->style() : nullptr;
// If CSS property was set, use that, otherwise fallback to attribute (if set).
if (style && style->hasTransform()) {
@@ -150,7 +150,7 @@ AffineTransform SVGGraphicsElement::calculateAnimatedLocalTransform() const
// SVGTextElements need special handling for the text positioning code.
if (isSVGTextElement(this)) {
// Do not take into account SVG's zoom rules, transform-origin, or percentage values.
- style->applyTransform(transform, LayoutSize(0, 0), LayoutStyle::ExcludeTransformOrigin);
+ style->applyTransform(transform, LayoutSize(0, 0), ComputedStyle::ExcludeTransformOrigin);
} else {
// CSS transforms operate with pre-scaled lengths. To make this work with SVG
// (which applies the zoom factor globally, at the root level) we
@@ -261,7 +261,7 @@ PassRefPtrWillBeRawPtr<SVGRectTearOff> SVGGraphicsElement::getBBoxFromJavascript
return SVGRectTearOff::create(SVGRect::create(getBBox()), 0, PropertyIsNotAnimVal);
}
-LayoutObject* SVGGraphicsElement::createLayoutObject(const LayoutStyle&)
+LayoutObject* SVGGraphicsElement::createLayoutObject(const ComputedStyle&)
{
// By default, any subclass is expected to do path-based drawing
return new LayoutSVGPath(this);
« no previous file with comments | « Source/core/svg/SVGGraphicsElement.h ('k') | Source/core/svg/SVGImageElement.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698