| 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)
|
|
|