Source/core/rendering/RenderBlock.h - 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/RenderBlock.h

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/RenderBlock.h

diff --git a/Source/core/rendering/RenderBlock.h b/Source/core/rendering/RenderBlock.h

index c2f00791a55a993265aa5317e67504038522be3f..6248563e5cb7a956eb2f9de1d50ef7d309648355 100644

--- a/Source/core/rendering/RenderBlock.h

+++ b/Source/core/rendering/RenderBlock.h

@@ -370,7 +370,7 @@ private:

// children.

virtual RenderBlock* firstLineBlock() const override;

- virtual LayoutRect rectWithOutlineForPaintInvalidation(const LayoutLayerModelObject* paintInvalidationContainer, LayoutUnit outlineWidth, const PaintInvalidationState* = 0) const override final;

+ virtual LayoutRect rectWithOutlineForPaintInvalidation(const LayoutBoxModelObject* paintInvalidationContainer, LayoutUnit outlineWidth, const PaintInvalidationState* = 0) const override final;

virtual LayoutObject* hoverAncestor() const override final;

virtual void updateDragState(bool dragOn) override final;

« no previous file with comments | « Source/core/paint/ViewDisplayListTest.cpp ('k') | Source/core/rendering/RenderBlock.cpp » ('j') | no next file with comments »