Source/core/rendering/RenderText.cpp - Issue 945803004: Merge back LayoutLayerModelObject into RenderBoxModelObject

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/core/rendering/RenderText.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

Index: Source/core/rendering/RenderText.cpp

diff --git a/Source/core/rendering/RenderText.cpp b/Source/core/rendering/RenderText.cpp

index 987de75e2fa8e37db1b2bd078c0634d8156f1eb4..cf43317a87140f98ddc8b798005bb97f1095c974 100644

--- a/Source/core/rendering/RenderText.cpp

+++ b/Source/core/rendering/RenderText.cpp

@@ -1594,7 +1594,7 @@ LayoutRect RenderText::linesVisualOverflowBoundingBox() const

return rect;

}

-LayoutRect RenderText::clippedOverflowRectForPaintInvalidation(const LayoutLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* paintInvalidationState) const

+LayoutRect RenderText::clippedOverflowRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer, const PaintInvalidationState* paintInvalidationState) const

{

if (style()->visibility() != VISIBLE)

return LayoutRect();

@@ -1604,7 +1604,7 @@ LayoutRect RenderText::clippedOverflowRectForPaintInvalidation(const LayoutLayer

return paintInvalidationRect;

}

-LayoutRect RenderText::selectionRectForPaintInvalidation(const LayoutLayerModelObject* paintInvalidationContainer) const

+LayoutRect RenderText::selectionRectForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer) const

{

ASSERT(!needsLayout());

« no previous file with comments | « Source/core/rendering/RenderText.h ('k') | Source/core/rendering/RenderView.h » ('j') | no next file with comments »