Source/WebCore/rendering/style/RenderStyle.h - Issue 10383285: Merge 116174

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/style/RenderStyle.h

Issue 10383285: Merge 116174 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/

Patch Set: Created 8 years, 7 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/style/RenderStyle.h

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

--- Source/WebCore/rendering/style/RenderStyle.h (revision 118007)

+++ Source/WebCore/rendering/style/RenderStyle.h (working copy)

@@ -390,7 +390,7 @@

public:

static PassRefPtr<RenderStyle> create();

static PassRefPtr<RenderStyle> createDefaultStyle();

- static PassRefPtr<RenderStyle> createAnonymousStyle(const RenderStyle* parentStyle);

+ static PassRefPtr<RenderStyle> createAnonymousStyleWithDisplay(const RenderStyle* parentStyle, EDisplay);

static PassRefPtr<RenderStyle> clone(const RenderStyle*);

void inheritFrom(const RenderStyle* inheritParent);