third_party/WebKit/Source/core/html/HTMLFrameElementBase.h - 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/HTMLFrameElementBase.h

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

Patch Set: Address comments for tests + merge blink/cr changes. Created 5 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:

View side-by-side diff with in-line comments

Download patch

« content/renderer/render_frame_impl.cc ('K') | « third_party/WebKit/Source/core/html/HTMLBodyElement.cpp ('k') | third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp » ('j') | third_party/WebKit/public/web/WebFrame.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/html/HTMLFrameElementBase.h

diff --git a/third_party/WebKit/Source/core/html/HTMLFrameElementBase.h b/third_party/WebKit/Source/core/html/HTMLFrameElementBase.h

index cac0f27c2cc58ae0125b5c3ed18f129fad98c2c1..0f3e1b6d82c2222d54a02bd2840df217ce26044d 100644

--- a/third_party/WebKit/Source/core/html/HTMLFrameElementBase.h

+++ b/third_party/WebKit/Source/core/html/HTMLFrameElementBase.h

@@ -25,17 +25,11 @@

#define HTMLFrameElementBase_h

#include "core/html/HTMLFrameOwnerElement.h"

-#include "platform/scroll/ScrollTypes.h"

namespace blink {

class HTMLFrameElementBase : public HTMLFrameOwnerElement {

public:

- ScrollbarMode scrollingMode() const final { return m_scrolling; }

- int marginWidth() const { return m_marginWidth; }

- int marginHeight() const { return m_marginHeight; }

bool canContainRangeEndPoint() const final { return false; }

protected:

@@ -68,11 +62,6 @@ private:

AtomicString m_URL;

AtomicString m_frameName;

- ScrollbarMode m_scrolling;

- int m_marginWidth;

- int m_marginHeight;

};

inline bool isHTMLFrameElementBase(const HTMLElement& element)