Source/core/html/HTMLBodyElement.cpp - Issue 1319863006: (blink) Propagate scrolling/marginwidth/marginheight property values to child frame.

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/core/html/HTMLBodyElement.cpp

Issue 1319863006: (blink) Propagate scrolling/marginwidth/marginheight property values to child frame. (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Update. Created 5 years, 4 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/core/html/HTMLBodyElement.cpp

diff --git a/Source/core/html/HTMLBodyElement.cpp b/Source/core/html/HTMLBodyElement.cpp

index add8f16a6bb66d79e151ba983d2a664a053642a0..7118e76cf0f55b353ff7a1e0b7788e259e2d8aee 100644

--- a/Source/core/html/HTMLBodyElement.cpp

+++ b/Source/core/html/HTMLBodyElement.cpp

@@ -159,12 +159,20 @@ void HTMLBodyElement::didNotifySubtreeInsertionsToDocument()

// FIXME: It's surprising this is web compatible since it means a

// marginwidth and marginheight attribute can magically appear on the <body>

// of all documents embedded through <iframe> or <frame>.

+ int marginWidth = -1;

+ int marginHeight = -1;

HTMLFrameOwnerElement* ownerElement = document().ownerElement();

- if (!isHTMLFrameElementBase(ownerElement))

- return;

- HTMLFrameElementBase& ownerFrameElement = toHTMLFrameElementBase(*ownerElement);

- int marginWidth = ownerFrameElement.marginWidth();

- int marginHeight = ownerFrameElement.marginHeight();

+ if (isHTMLFrameElementBase(ownerElement)) {

+ HTMLFrameElementBase& ownerFrameElement = toHTMLFrameElementBase(*ownerElement);

+ marginWidth = ownerFrameElement.marginWidth();

+ marginHeight = ownerFrameElement.marginHeight();

+ } else if (!ownerElement && document().frame()->owner()) {

+ // Our owner is a RemoteBridgeFrameOwner, not a FrameOwnerElement.

+ marginWidth = document().frame()->owner()->marginWidth();

+ marginHeight = document().frame()->owner()->marginHeight();

+ }

if (marginWidth != -1)

setIntegralAttribute(marginwidthAttr, marginWidth);

if (marginHeight != -1)

« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/html/HTMLFrameElementBase.h » ('j') | Source/core/html/HTMLIFrameElement.cpp » ('J')