Source/WebCore/rendering/RenderQuote.h - Issue 10914111: Merge 125737

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

Issue 10914111: Merge 125737 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1229/

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

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

--- Source/WebCore/rendering/RenderQuote.h (revision 127654)

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

@@ -44,6 +44,11 @@

virtual PassRefPtr<StringImpl> originalText() const OVERRIDE;

virtual void computePreferredLogicalWidths(float leadWidth) OVERRIDE;

+ // We don't override insertedIntoTree to call attachQuote() as it would be attached

+ // too early and get the wrong depth since generated content is inserted into anonymous

+ // renderers before going into the main render tree. Once we can ensure that insertIntoTree,

+ // is called on an attached tree, we should override it here.

const QuotesData* quotesData() const;

void updateDepth();

bool isAttached() { return m_attached; }