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

Unified Diff: Source/core/layout/svg/LayoutSVGInline.cpp

Issue 1308983006: Don't drop type information returned from locateRenderSVGTextAncestor (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Dedupe. Created 5 years, 4 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 | « no previous file | Source/core/layout/svg/LayoutSVGText.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/svg/LayoutSVGInline.cpp
diff --git a/Source/core/layout/svg/LayoutSVGInline.cpp b/Source/core/layout/svg/LayoutSVGInline.cpp
index f3b16f10a7ff716789873519727f9aa6554aa960..c8b0aad920fff437ccc51ec6a7f74fbdd965ad24 100644
--- a/Source/core/layout/svg/LayoutSVGInline.cpp
+++ b/Source/core/layout/svg/LayoutSVGInline.cpp
@@ -63,24 +63,24 @@ InlineFlowBox* LayoutSVGInline::createInlineFlowBox()
FloatRect LayoutSVGInline::objectBoundingBox() const
{
- if (const LayoutObject* object = LayoutSVGText::locateLayoutSVGTextAncestor(this))
- return object->objectBoundingBox();
+ if (const LayoutSVGText* textRoot = LayoutSVGText::locateLayoutSVGTextAncestor(this))
+ return textRoot->objectBoundingBox();
return FloatRect();
}
FloatRect LayoutSVGInline::strokeBoundingBox() const
{
- if (const LayoutObject* object = LayoutSVGText::locateLayoutSVGTextAncestor(this))
- return object->strokeBoundingBox();
+ if (const LayoutSVGText* textRoot = LayoutSVGText::locateLayoutSVGTextAncestor(this))
+ return textRoot->strokeBoundingBox();
return FloatRect();
}
FloatRect LayoutSVGInline::paintInvalidationRectInLocalCoordinates() const
{
- if (const LayoutObject* object = LayoutSVGText::locateLayoutSVGTextAncestor(this))
- return object->paintInvalidationRectInLocalCoordinates();
+ if (const LayoutSVGText* textRoot = LayoutSVGText::locateLayoutSVGTextAncestor(this))
+ return textRoot->paintInvalidationRectInLocalCoordinates();
return FloatRect();
}
@@ -102,11 +102,11 @@ const LayoutObject* LayoutSVGInline::pushMappingToContainer(const LayoutBoxModel
void LayoutSVGInline::absoluteQuads(Vector<FloatQuad>& quads, bool* wasFixed) const
{
- const LayoutObject* object = LayoutSVGText::locateLayoutSVGTextAncestor(this);
- if (!object)
+ const LayoutSVGText* textRoot = LayoutSVGText::locateLayoutSVGTextAncestor(this);
+ if (!textRoot)
return;
- FloatRect textBoundingBox = object->strokeBoundingBox();
+ FloatRect textBoundingBox = textRoot->strokeBoundingBox();
for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox())
quads.append(localToAbsoluteQuad(FloatRect(textBoundingBox.x() + box->x().toFloat(), textBoundingBox.y() + box->y().toFloat(), box->logicalWidth().toFloat(), box->logicalHeight().toFloat()), false, wasFixed));
}
« no previous file with comments | « no previous file | Source/core/layout/svg/LayoutSVGText.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698