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 c479370067dd6921859c7bc62154420ba8735b8f..e4220b0b5b1494729f2daa86f1eb9b9e50c45ba1 100644 |
--- a/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp |
+++ b/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp |
@@ -121,6 +121,13 @@ |
toLocalFrame(contentFrame()) |
->script() |
.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( |
@@ -258,7 +265,7 @@ |
if (contentDocument()) { |
contentDocument()->willChangeFrameOwnerProperties( |
- m_marginWidth, m_marginHeight, scrollbarMode, isDisplayNone()); |
+ m_marginWidth, m_marginHeight, scrollbarMode); |
} |
m_scrollingMode = scrollbarMode; |
frameOwnerPropertiesChanged(); |
@@ -270,7 +277,7 @@ |
if (contentDocument()) { |
contentDocument()->willChangeFrameOwnerProperties( |
- marginWidth, m_marginHeight, m_scrollingMode, isDisplayNone()); |
+ marginWidth, m_marginHeight, m_scrollingMode); |
} |
m_marginWidth = marginWidth; |
frameOwnerPropertiesChanged(); |
@@ -282,7 +289,7 @@ |
if (contentDocument()) { |
contentDocument()->willChangeFrameOwnerProperties( |
- m_marginWidth, marginHeight, m_scrollingMode, isDisplayNone()); |
+ m_marginWidth, marginHeight, m_scrollingMode); |
} |
m_marginHeight = marginHeight; |
frameOwnerPropertiesChanged(); |