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

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

Issue 945803004: Merge back LayoutLayerModelObject into RenderBoxModelObject (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Better rebasing. Created 5 years, 10 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/layout/svg/LayoutSVGInlineText.h ('k') | Source/core/layout/svg/LayoutSVGModelObject.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/svg/LayoutSVGInlineText.cpp
diff --git a/Source/core/layout/svg/LayoutSVGInlineText.cpp b/Source/core/layout/svg/LayoutSVGInlineText.cpp
index 914b423d939be92bf19eae81558bb9116b64e581..0ce57d28276d529424a79d697ffd00a841c630cc 100644
--- a/Source/core/layout/svg/LayoutSVGInlineText.cpp
+++ b/Source/core/layout/svg/LayoutSVGInlineText.cpp
@@ -234,7 +234,7 @@ void LayoutSVGInlineText::computeNewScaledFontForStyle(LayoutObject* renderer, c
scaledFont.update(document.styleEngine()->fontSelector());
}
-LayoutRect LayoutSVGInlineText::clippedOverflowRectForPaintInvalidation(const LayoutLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* paintInvalidationState) const
+LayoutRect LayoutSVGInlineText::clippedOverflowRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* paintInvalidationState) const
{
// FIXME: The following works because LayoutSVGBlock has forced slow rect mapping of the paintInvalidationState.
// Should let this really work with paintInvalidationState's fast mapping and remove the assert.
« no previous file with comments | « Source/core/layout/svg/LayoutSVGInlineText.h ('k') | Source/core/layout/svg/LayoutSVGModelObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698