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

Unified Diff: Source/web/RemoteBridgeFrameOwner.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 nits 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
« no previous file with comments | « Source/web/FrameLoaderClientImpl.cpp ('k') | Source/web/RemoteBridgeFrameOwner.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/RemoteBridgeFrameOwner.h
diff --git a/Source/web/RemoteBridgeFrameOwner.h b/Source/web/RemoteBridgeFrameOwner.h
index a022f820f100afb064a97e947597d6924aae8410..f3a32f7d1c6441b66a9b526302f4969380a904df 100644
--- a/Source/web/RemoteBridgeFrameOwner.h
+++ b/Source/web/RemoteBridgeFrameOwner.h
@@ -6,6 +6,7 @@
#define RemoteBridgeFrameOwner_h
#include "core/frame/FrameOwner.h"
+#include "platform/scroll/ScrollTypes.h"
#include "web/WebLocalFrameImpl.h"
namespace blink {
@@ -18,9 +19,9 @@ namespace blink {
class RemoteBridgeFrameOwner final : public NoBaseWillBeGarbageCollectedFinalized<RemoteBridgeFrameOwner>, public FrameOwner {
WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(RemoteBridgeFrameOwner);
public:
- static PassOwnPtrWillBeRawPtr<RemoteBridgeFrameOwner> create(PassRefPtrWillBeRawPtr<WebLocalFrameImpl> frame, SandboxFlags flags)
+ static PassOwnPtrWillBeRawPtr<RemoteBridgeFrameOwner> create(PassRefPtrWillBeRawPtr<WebLocalFrameImpl> frame, SandboxFlags flags, const WebFrameOwnerProperties& frameOwnerProperties)
{
- return adoptPtrWillBeNoop(new RemoteBridgeFrameOwner(frame, flags));
+ return adoptPtrWillBeNoop(new RemoteBridgeFrameOwner(frame, flags, frameOwnerProperties));
}
bool isLocal() const override
@@ -50,13 +51,24 @@ public:
// TODO(dcheng): Implement.
}
+ void setScrollingMode(ScrollbarMode mode) { m_scrolling = mode; }
+ void setMarginWidth(int marginWidth) { m_marginWidth = marginWidth; }
+ void setMarginHeight(int marginHeight) { m_marginHeight = marginHeight; }
+
+ ScrollbarMode scrollingMode() const override { return m_scrolling; }
+ int marginWidth() const override { return m_marginWidth; }
+ int marginHeight() const override { return m_marginHeight; }
+
DECLARE_VIRTUAL_TRACE();
private:
- RemoteBridgeFrameOwner(PassRefPtrWillBeRawPtr<WebLocalFrameImpl>, SandboxFlags);
+ RemoteBridgeFrameOwner(PassRefPtrWillBeRawPtr<WebLocalFrameImpl>, SandboxFlags, const WebFrameOwnerProperties&);
RefPtrWillBeMember<WebLocalFrameImpl> m_frame;
SandboxFlags m_sandboxFlags;
+ ScrollbarMode m_scrolling;
+ int m_marginWidth;
+ int m_marginHeight;
};
DEFINE_TYPE_CASTS(RemoteBridgeFrameOwner, FrameOwner, owner, !owner->isLocal(), !owner.isLocal());
« no previous file with comments | « Source/web/FrameLoaderClientImpl.cpp ('k') | Source/web/RemoteBridgeFrameOwner.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698