| Index: third_party/WebKit/Source/web/RemoteBridgeFrameOwner.cpp
|
| diff --git a/third_party/WebKit/Source/web/RemoteBridgeFrameOwner.cpp b/third_party/WebKit/Source/web/RemoteBridgeFrameOwner.cpp
|
| index 51afd66fa37a425ddd54e99086b26770d93273cb..8ce2deb0fadd0a1bac9310fac42397b7736dfb01 100644
|
| --- a/third_party/WebKit/Source/web/RemoteBridgeFrameOwner.cpp
|
| +++ b/third_party/WebKit/Source/web/RemoteBridgeFrameOwner.cpp
|
| @@ -9,9 +9,12 @@
|
|
|
| namespace blink {
|
|
|
| -RemoteBridgeFrameOwner::RemoteBridgeFrameOwner(PassRefPtrWillBeRawPtr<WebLocalFrameImpl> frame, SandboxFlags flags)
|
| +RemoteBridgeFrameOwner::RemoteBridgeFrameOwner(PassRefPtrWillBeRawPtr<WebLocalFrameImpl> frame, SandboxFlags flags, const WebFrameOwnerProperties& frameOwnerProperties)
|
| : m_frame(frame)
|
| , m_sandboxFlags(flags)
|
| + , m_scrolling(static_cast<ScrollbarMode>(frameOwnerProperties.scrollingMode))
|
| + , m_marginWidth(frameOwnerProperties.marginWidth)
|
| + , m_marginHeight(frameOwnerProperties.marginHeight)
|
| {
|
| }
|
|
|
| @@ -21,6 +24,11 @@ DEFINE_TRACE(RemoteBridgeFrameOwner)
|
| FrameOwner::trace(visitor);
|
| }
|
|
|
| +void RemoteBridgeFrameOwner::setScrollingMode(WebFrameOwnerProperties::ScrollingMode mode)
|
| +{
|
| + m_scrolling = static_cast<ScrollbarMode>(mode);
|
| +}
|
| +
|
| void RemoteBridgeFrameOwner::dispatchLoad()
|
| {
|
| if (m_frame->client())
|
|
|