Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(385)

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: 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
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..808d86c622e4175a336e644fae65f0f711f86451 100644
--- a/third_party/WebKit/Source/core/html/HTMLFrameElementBase.h
+++ b/third_party/WebKit/Source/core/html/HTMLFrameElementBase.h
@@ -25,19 +25,18 @@
#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; }
+ // FrameOwner overrides:
+ ScrollbarMode scrollingMode() const override { return m_scrollingMode; }
+ int marginWidth() const override { return m_marginWidth; }
+ int marginHeight() const override { return m_marginHeight; }
+
protected:
HTMLFrameElementBase(const QualifiedName&, Document&);
@@ -52,6 +51,10 @@ protected:
// process. See http://crbug.com/339659.
void defaultEventHandler(Event*) override;
+ void setScrollingMode(ScrollbarMode);
+ void setMarginWidth(int);
+ void setMarginHeight(int);
+
private:
bool supportsFocus() const final;
void setFocus(bool) final;
@@ -66,13 +69,14 @@ private:
void setNameAndOpenURL();
void openURL(bool replaceCurrentItem = true);
- AtomicString m_URL;
- AtomicString m_frameName;
-
- ScrollbarMode m_scrolling;
+ void frameOwnerPropertiesChanged();
+ ScrollbarMode m_scrollingMode;
int m_marginWidth;
int m_marginHeight;
+
+ AtomicString m_URL;
+ AtomicString m_frameName;
};
inline bool isHTMLFrameElementBase(const HTMLElement& element)
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLBodyElement.cpp ('k') | third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698