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

Unified Diff: third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.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/HTMLFrameOwnerElement.h
diff --git a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h
index 5ffd5d257ad7381ee7befd17bb9dbe77a13e424b..045f2e86ff2223c30f45611e037c0412329ce84f 100644
--- a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h
+++ b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h
@@ -59,8 +59,6 @@ public:
Document* getSVGDocument(ExceptionState&) const;
- virtual ScrollbarMode scrollingMode() const { return ScrollbarAuto; }
-
virtual bool loadedNonEmptyDocument() const { return false; }
virtual void didLoadNonEmptyDocument() { }
@@ -83,6 +81,9 @@ public:
void dispatchLoad() override;
SandboxFlags sandboxFlags() const override { return m_sandboxFlags; }
void renderFallbackContent() override { }
+ ScrollbarMode scrollingMode() const override { return ScrollbarAuto; }
+ int marginWidth() const override { return -1; }
+ int marginHeight() const override { return -1; }
DECLARE_VIRTUAL_TRACE();

Powered by Google App Engine
This is Rietveld 408576698