| Index: third_party/WebKit/Source/web/WebFrame.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebFrame.cpp b/third_party/WebKit/Source/web/WebFrame.cpp
|
| index c71218a4de653abefbe2a440e929a7b740810225..14fcc9be7037cb5d41bc4075986e9ad957008d2d 100644
|
| --- a/third_party/WebKit/Source/web/WebFrame.cpp
|
| +++ b/third_party/WebKit/Source/web/WebFrame.cpp
|
| @@ -23,7 +23,6 @@
|
| #include "web/WebLocalFrameImpl.h"
|
| #include "web/WebRemoteFrameImpl.h"
|
| #include <algorithm>
|
| -
|
| namespace blink {
|
|
|
| bool WebFrame::swap(WebFrame* frame) {
|
| @@ -146,13 +145,15 @@ void WebFrame::setFrameOwnerProperties(
|
| if (frame->isLocalFrame()) {
|
| toLocalFrame(frame)->document()->willChangeFrameOwnerProperties(
|
| properties.marginWidth, properties.marginHeight,
|
| - static_cast<ScrollbarMode>(properties.scrollingMode));
|
| + static_cast<ScrollbarMode>(properties.scrollingMode),
|
| + properties.isDisplayNone);
|
| }
|
|
|
| owner->setScrollingMode(properties.scrollingMode);
|
| owner->setMarginWidth(properties.marginWidth);
|
| owner->setMarginHeight(properties.marginHeight);
|
| owner->setAllowFullscreen(properties.allowFullscreen);
|
| + owner->setIsDisplayNone(properties.isDisplayNone);
|
| owner->setCsp(properties.requiredCsp);
|
| owner->setDelegatedpermissions(properties.delegatedPermissions);
|
| }
|
|
|