third_party/WebKit/WebCore/rendering/RenderSVGInlineText.cpp - Issue 21165: Revert the merge. Mac build is mysteriously broken.

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: third_party/WebKit/WebCore/rendering/RenderSVGInlineText.cpp

Issue 21165: Revert the merge. Mac build is mysteriously broken. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: Created 11 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:

Index: third_party/WebKit/WebCore/rendering/RenderSVGInlineText.cpp

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

--- third_party/WebKit/WebCore/rendering/RenderSVGInlineText.cpp (revision 9383)

+++ third_party/WebKit/WebCore/rendering/RenderSVGInlineText.cpp (working copy)

@@ -76,7 +76,7 @@

quads.append(FloatRect(computeRepaintRectForRange(0, 0, textLength())));

}

-IntRect RenderSVGInlineText::selectionRectForRepaint(RenderBoxModelObject* repaintContainer, bool /*clipToVisibleContent*/)

+IntRect RenderSVGInlineText::selectionRectForRepaint(RenderBox* repaintContainer, bool /*clipToVisibleContent*/)

{

ASSERT(!needsLayout());

@@ -108,7 +108,7 @@

return computeRepaintRectForRange(repaintContainer, startPos, endPos);

}

-IntRect RenderSVGInlineText::computeRepaintRectForRange(RenderBoxModelObject* /*repaintContainer*/, int startPos, int endPos)

+IntRect RenderSVGInlineText::computeRepaintRectForRange(RenderBox* /*repaintContainer*/, int startPos, int endPos)

{

RenderBlock* cb = containingBlock();

if (!cb || !cb->container())