[Reland #1] Don't create layout objects for children of display-none iframes.

third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp

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 fe4435bff7c2d4c84e504079100ef7440d2b169c..27fd2158049a0f54985a3efb3fe3c6454312ae44 100644
--- a/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp
@@ -119,13 +119,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 AttributeModificationParams& params) {
   const QualifiedName& name = params.name;
@@ -251,7 +244,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();
@@ -263,7 +256,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();
@@ -275,7 +268,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();