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

Unified Diff: Source/core/svg/SVGElement.cpp

Issue 1118133003: Rename rendering in core/svg. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 8 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/SVGClipPathElement.cpp ('k') | Source/core/svg/SVGEllipseElement.cpp » ('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 f5b0584cc27b2ae6b5291cd41248eb87738c1f21..c3e1e220fba2765be4ffafe1048dde5d442b76da 100644
--- a/Source/core/svg/SVGElement.cpp
+++ b/Source/core/svg/SVGElement.cpp
@@ -418,12 +418,12 @@ void SVGElement::invalidateRelativeLengthClients(SubtreeLayoutScope* layoutScope
TemporaryChange<bool> inRelativeLengthClientsInvalidationChange(m_inRelativeLengthClientsInvalidation, true);
#endif
- LayoutObject* renderer = this->layoutObject();
- if (renderer && selfHasRelativeLengths()) {
- if (renderer->isSVGResourceContainer())
- toLayoutSVGResourceContainer(renderer)->invalidateCacheAndMarkForLayout(layoutScope);
+ LayoutObject* layoutObject = this->layoutObject();
+ if (layoutObject && selfHasRelativeLengths()) {
+ if (layoutObject->isSVGResourceContainer())
+ toLayoutSVGResourceContainer(layoutObject)->invalidateCacheAndMarkForLayout(layoutScope);
else
- renderer->setNeedsLayoutAndFullPaintInvalidation(LayoutInvalidationReason::Unknown, MarkContainerChain, layoutScope);
+ layoutObject->setNeedsLayoutAndFullPaintInvalidation(LayoutInvalidationReason::Unknown, MarkContainerChain, layoutScope);
}
for (SVGElement* element : m_elementsWithRelativeLengths) {
@@ -913,8 +913,8 @@ PassRefPtr<ComputedStyle> SVGElement::customStyleForLayoutObject()
const ComputedStyle* style = nullptr;
if (Element* parent = parentOrShadowHostElement()) {
- if (LayoutObject* renderer = parent->layoutObject())
- style = renderer->style();
+ if (LayoutObject* layoutObject = parent->layoutObject())
+ style = layoutObject->style();
}
return document().ensureStyleResolver().styleForElement(correspondingElement(), style, DisallowStyleSharing);
@@ -945,8 +945,8 @@ const ComputedStyle* SVGElement::ensureComputedStyle(PseudoId pseudoElementSpeci
const ComputedStyle* parentStyle = nullptr;
if (Element* parent = parentOrShadowHostElement()) {
- if (LayoutObject* renderer = parent->layoutObject())
- parentStyle = renderer->style();
+ if (LayoutObject* layoutObject = parent->layoutObject())
+ parentStyle = layoutObject->style();
}
return svgRareData()->overrideComputedStyle(this, parentStyle);
@@ -958,10 +958,10 @@ bool SVGElement::hasFocusEventListeners() const
|| hasEventListeners(EventTypeNames::focus) || hasEventListeners(EventTypeNames::blur);
}
-void SVGElement::markForLayoutAndParentResourceInvalidation(LayoutObject* renderer)
+void SVGElement::markForLayoutAndParentResourceInvalidation(LayoutObject* layoutObject)
{
- ASSERT(renderer);
- LayoutSVGResourceContainer::markForLayoutAndParentResourceInvalidation(renderer, true);
+ ASSERT(layoutObject);
+ LayoutSVGResourceContainer::markForLayoutAndParentResourceInvalidation(layoutObject, true);
}
void SVGElement::invalidateInstances()
« no previous file with comments | « Source/core/svg/SVGClipPathElement.cpp ('k') | Source/core/svg/SVGEllipseElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698