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

Unified Diff: Source/core/svg/SVGElement.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/SVGElement.h ('k') | Source/core/svg/SVGElementRareData.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/svg/SVGElement.cpp
diff --git a/Source/core/svg/SVGElement.cpp b/Source/core/svg/SVGElement.cpp
index b73a0e6d79993ba563a7a2563b580e517f21065c..e81ae352461e0da89729408ad93de27bbb3c3753 100644
--- a/Source/core/svg/SVGElement.cpp
+++ b/Source/core/svg/SVGElement.cpp
@@ -906,12 +906,12 @@ void SVGElement::synchronizeAnimatedSVGAttribute(const QualifiedName& name) cons
}
}
-PassRefPtr<LayoutStyle> SVGElement::customStyleForLayoutObject()
+PassRefPtr<ComputedStyle> SVGElement::customStyleForLayoutObject()
{
if (!correspondingElement())
return document().ensureStyleResolver().styleForElement(this);
- const LayoutStyle* style = 0;
+ const ComputedStyle* style = 0;
if (Element* parent = parentOrShadowHostElement()) {
if (LayoutObject* renderer = parent->layoutObject())
style = renderer->style();
@@ -938,12 +938,12 @@ void SVGElement::setUseOverrideComputedStyle(bool value)
svgRareData()->setUseOverrideComputedStyle(value);
}
-const LayoutStyle* SVGElement::computedStyle(PseudoId pseudoElementSpecifier)
+const ComputedStyle* SVGElement::ensureComputedStyle(PseudoId pseudoElementSpecifier)
{
if (!hasSVGRareData() || !svgRareData()->useOverrideComputedStyle())
- return Element::computedStyle(pseudoElementSpecifier);
+ return Element::ensureComputedStyle(pseudoElementSpecifier);
- LayoutStyle* parentStyle = 0;
+ ComputedStyle* parentStyle = 0;
if (Element* parent = parentOrShadowHostElement()) {
if (LayoutObject* renderer = parent->layoutObject())
parentStyle = renderer->style();
« no previous file with comments | « Source/core/svg/SVGElement.h ('k') | Source/core/svg/SVGElementRareData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698