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

Unified Diff: Source/core/html/HTMLFrameOwnerElement.h

Issue 1319863006: (blink) Propagate scrolling/marginwidth/marginheight property values to child frame. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: address comments + static_cast for enum conversion 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
Index: Source/core/html/HTMLFrameOwnerElement.h
diff --git a/Source/core/html/HTMLFrameOwnerElement.h b/Source/core/html/HTMLFrameOwnerElement.h
index 87ad3856ec50b56c797c85a6dd4ef71339d38373..07bb8655a568b5b2323cf4a40e42dad3d3d00381 100644
--- a/Source/core/html/HTMLFrameOwnerElement.h
+++ b/Source/core/html/HTMLFrameOwnerElement.h
@@ -58,8 +58,6 @@ public:
Document* getSVGDocument(ExceptionState&) const;
- virtual ScrollbarMode scrollingMode() const { return ScrollbarAuto; }
-
virtual bool loadedNonEmptyDocument() const { return false; }
virtual void didLoadNonEmptyDocument() { }
@@ -81,12 +79,18 @@ public:
void dispatchLoad() override;
SandboxFlags sandboxFlags() const override { return m_sandboxFlags; }
void renderFallbackContent() override { }
+ ScrollbarMode scrollingMode() const override { return m_scrollingMode; }
+ int marginWidth() const { return m_marginWidth; }
alexmos 2015/09/02 21:37:05 override? (same for marginHeight)
lazyboy 2015/09/15 01:40:32 Done.
+ int marginHeight() const { return m_marginHeight; }
DECLARE_VIRTUAL_TRACE();
protected:
HTMLFrameOwnerElement(const QualifiedName& tagName, Document&);
void setSandboxFlags(SandboxFlags);
+ void setScrollingMode(ScrollbarMode);
+ void setMarginWidth(int);
+ void setMarginHeight(int);
bool loadOrRedirectSubframe(const KURL&, const AtomicString& frameName, bool replaceCurrentItem);
@@ -97,6 +101,9 @@ private:
RawPtrWillBeMember<Frame> m_contentFrame;
RefPtrWillBeMember<Widget> m_widget;
SandboxFlags m_sandboxFlags;
+ ScrollbarMode m_scrollingMode;
+ int m_marginWidth;
+ int m_marginHeight;
};
DEFINE_ELEMENT_TYPE_CASTS(HTMLFrameOwnerElement, isFrameOwnerElement());

Powered by Google App Engine
This is Rietveld 408576698