Source/WebCore/rendering/svg/RenderSVGRoot.cpp - Issue 8390012: Merge 98263 - <svg> fails to use explicit width and height inside <html> inside IFRAME

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/svg/RenderSVGRoot.cpp

Issue 8390012: Merge 98263 - <svg> fails to use explicit width and height inside <html> inside IFRAME (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/912/

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

Index: Source/WebCore/rendering/svg/RenderSVGRoot.cpp

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

--- Source/WebCore/rendering/svg/RenderSVGRoot.cpp (revision 98369)

+++ Source/WebCore/rendering/svg/RenderSVGRoot.cpp (working copy)

@@ -130,6 +130,15 @@

return static_cast<int>(ceilf(replacedHeight * style()->effectiveZoom()));

}

+static inline bool isEmbeddedThroughFrameContainingSVGDocument(const Frame* frame)

+ ASSERT(frame);

+ ASSERT(frame->document());

+ // If our frame has an owner renderer, we're embedded through eg. object/embed/iframe,

+ // but we only negotiate if we're in an SVG document.

+ return !frame->ownerRenderer() || !frame->document()->isSVGDocument();

LayoutUnit RenderSVGRoot::computeReplacedLogicalWidth(bool includeMaxWidth) const

{

LayoutUnit replacedWidth = RenderBox::computeReplacedLogicalWidth(includeMaxWidth);

@@ -137,11 +146,10 @@

if (!frame)

return computeIntrinsicWidth(replacedWidth);

- // If our frame has an owner renderer, we're embedded through eg. object/embed.

- RenderPart* ownerRenderer = frame->ownerRenderer();

- if (!ownerRenderer)

+ if (isEmbeddedThroughFrameContainingSVGDocument(frame))

return computeIntrinsicWidth(replacedWidth);

+ RenderPart* ownerRenderer = frame->ownerRenderer();

RenderStyle* ownerRendererStyle = ownerRenderer->style();

ASSERT(ownerRendererStyle);

ASSERT(frame->contentRenderer());

@@ -179,11 +187,10 @@