third_party/WebKit/Source/core/html/HTMLBodyElement.cpp - Issue 1307013004: 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: third_party/WebKit/Source/core/html/HTMLBodyElement.cpp

Issue 1307013004: Propagate scrolling/marginwidth/marginheight property values to child frame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: content_unittests compile fix Created 5 years, 1 month 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

« no previous file with comments | « third_party/WebKit/Source/core/frame/LocalFrame.cpp ('k') | third_party/WebKit/Source/core/html/HTMLFrameElementBase.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/HTMLBodyElement.cpp

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

index add8f16a6bb66d79e151ba983d2a664a053642a0..64f599f3be1ff19bb607a4fa27e8eb86bada0f7c 100644

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

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

@@ -159,16 +159,14 @@ 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>.

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

- if (!isHTMLFrameElementBase(ownerElement))

- return;

- HTMLFrameElementBase& ownerFrameElement = toHTMLFrameElementBase(*ownerElement);

- int marginWidth = ownerFrameElement.marginWidth();

- int marginHeight = ownerFrameElement.marginHeight();

- if (marginWidth != -1)

- setIntegralAttribute(marginwidthAttr, marginWidth);

- if (marginHeight != -1)

- setIntegralAttribute(marginheightAttr, marginHeight);

+ if (document().frame() && document().frame()->owner()) {

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

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

+ if (marginWidth != -1)

+ setIntegralAttribute(marginwidthAttr, marginWidth);

+ if (marginHeight != -1)

+ setIntegralAttribute(marginheightAttr, marginHeight);

+ }

}

bool HTMLBodyElement::isURLAttribute(const Attribute& attribute) const

« no previous file with comments | « third_party/WebKit/Source/core/frame/LocalFrame.cpp ('k') | third_party/WebKit/Source/core/html/HTMLFrameElementBase.h » ('j') | no next file with comments »