| Index: third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp b/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp
|
| index 05e28a7fc73ba85483de25684ad64ddd886be869..f52280856217bc98c4000a391f886a5e2656027d 100644
|
| --- a/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp
|
| +++ b/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp
|
| @@ -123,13 +123,6 @@ void HTMLFrameElementBase::openURL(bool replaceCurrentItem) {
|
| .executeScriptIfJavaScriptURL(scriptURL, this);
|
| }
|
|
|
| -void HTMLFrameElementBase::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 HTMLFrameElementBase::parseAttribute(const QualifiedName& name,
|
| const AtomicString& oldValue,
|
| const AtomicString& value) {
|
| @@ -264,7 +257,7 @@ void HTMLFrameElementBase::setScrollingMode(ScrollbarMode scrollbarMode) {
|
|
|
| if (contentDocument()) {
|
| contentDocument()->willChangeFrameOwnerProperties(
|
| - m_marginWidth, m_marginHeight, scrollbarMode);
|
| + m_marginWidth, m_marginHeight, scrollbarMode, isDisplayNone());
|
| }
|
| m_scrollingMode = scrollbarMode;
|
| frameOwnerPropertiesChanged();
|
| @@ -276,7 +269,7 @@ void HTMLFrameElementBase::setMarginWidth(int marginWidth) {
|
|
|
| if (contentDocument()) {
|
| contentDocument()->willChangeFrameOwnerProperties(
|
| - marginWidth, m_marginHeight, m_scrollingMode);
|
| + marginWidth, m_marginHeight, m_scrollingMode, isDisplayNone());
|
| }
|
| m_marginWidth = marginWidth;
|
| frameOwnerPropertiesChanged();
|
| @@ -288,7 +281,7 @@ void HTMLFrameElementBase::setMarginHeight(int marginHeight) {
|
|
|
| if (contentDocument()) {
|
| contentDocument()->willChangeFrameOwnerProperties(
|
| - m_marginWidth, marginHeight, m_scrollingMode);
|
| + m_marginWidth, marginHeight, m_scrollingMode, isDisplayNone());
|
| }
|
| m_marginHeight = marginHeight;
|
| frameOwnerPropertiesChanged();
|
|
|