Source/WebCore/rendering/RenderInline.h - Issue 12641003: Merge 144350

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/WebCore/rendering/RenderInline.h

Issue 12641003: Merge 144350 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/

Patch Set: Created 7 years, 9 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:

Index: Source/WebCore/rendering/RenderInline.h

===================================================================

--- Source/WebCore/rendering/RenderInline.h (revision 145114)

+++ Source/WebCore/rendering/RenderInline.h (working copy)

@@ -81,8 +81,8 @@

LayoutSize offsetForInFlowPositionedInline(const RenderBox* child) const;

- virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint&);

- void paintOutline(GraphicsContext*, const LayoutPoint&);

+ virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& additionalOffset, const RenderLayerModelObject* paintContainer = 0) OVERRIDE;

+ void paintOutline(PaintInfo&, const LayoutPoint&);

using RenderBoxModelObject::continuation;

using RenderBoxModelObject::setContinuation;

« no previous file with comments | « Source/WebCore/rendering/RenderBox.cpp ('k') | Source/WebCore/rendering/RenderInline.cpp » ('j') | no next file with comments »