Index: third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp |
diff --git a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp |
index 4d8f1db9327786edd03c01988480403e0e49f1bd..7b7ac6c56f99abd063ac7f6ac1a64be08dd9e55b 100644 |
--- a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp |
+++ b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp |
@@ -221,6 +221,13 @@ void HTMLFrameOwnerElement::disposeWidgetSoon(Widget* widget) { |
widget->dispose(); |
} |
+void HTMLFrameOwnerElement::frameOwnerPropertiesChanged() { |
+ // Don't notify about updates if contentFrame() is null, for example when |
+ // the subframe hasn't been created yet. |
+ if (contentFrame()) |
+ document().frame()->loader().client()->didChangeFrameOwnerProperties(this); |
+} |
+ |
void HTMLFrameOwnerElement::dispatchLoad() { |
dispatchScopedEvent(Event::create(EventTypeNames::load)); |
} |
@@ -243,6 +250,15 @@ void HTMLFrameOwnerElement::setWidget(Widget* widget) { |
if (widget == m_widget) |
return; |
+ Document* doc = contentDocument(); |
+ if (doc && doc->frame()) { |
+ bool willBeDisplayNone = !widget; |
+ if (isDisplayNone() != willBeDisplayNone) { |
+ doc->willChangeFrameOwnerProperties(marginWidth(), marginHeight(), |
+ scrollingMode(), willBeDisplayNone); |
+ } |
+ } |
+ |
if (m_widget) { |
if (m_widget->parent()) |
moveWidgetToParentSoon(m_widget.get(), 0); |
@@ -250,6 +266,7 @@ void HTMLFrameOwnerElement::setWidget(Widget* widget) { |
} |
m_widget = widget; |
+ frameOwnerPropertiesChanged(); |
LayoutPart* layoutPart = toLayoutPart(layoutObject()); |
LayoutPartItem layoutPartItem = LayoutPartItem(layoutPart); |