Source/WebCore/rendering/RenderBoxModelObject.h - Issue 12712011: Merge 145726 "Fix body background image geometry calculation"

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

Issue 12712011: Merge 145726 "Fix body background image geometry calculation" (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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « LayoutTests/svg/as-background-image/svg-as-background-body-expected.html ('k') | Source/WebCore/rendering/RenderBoxModelObject.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: Source/WebCore/rendering/RenderBoxModelObject.h

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

--- Source/WebCore/rendering/RenderBoxModelObject.h (revision 145949)

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

@@ -230,7 +230,7 @@

LayoutPoint adjustedPositionRelativeToOffsetParent(const LayoutPoint&) const;

- void calculateBackgroundImageGeometry(const FillLayer*, const LayoutRect& paintRect, BackgroundImageGeometry&);

+ void calculateBackgroundImageGeometry(const FillLayer*, const LayoutRect& paintRect, BackgroundImageGeometry&, RenderObject* = 0);

void getBorderEdgeInfo(class BorderEdge[], const RenderStyle*, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true) const;

bool borderObscuresBackgroundEdge(const FloatSize& contextScale) const;

bool borderObscuresBackground() const;