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

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

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Simon Hausmann (hausmann@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
@@ skipping 101 matching lines @@
     return;
   if (!contentFrame() || scriptURL.isEmpty() || !contentFrame()->isLocalFrame())
     return;
   if (contentFrame()->owner()->getSandboxFlags() & SandboxOrigin)
     return;
   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(
     const AttributeModificationParams& params) {
   const QualifiedName& name = params.name;
   const AtomicString& value = params.newValue;
   if (name == srcdocAttr) {
     if (!value.isNull()) {
       setLocation(srcdocURL().getString());
     } else {
       const AtomicString& srcValue = fastGetAttribute(srcAttr);
       if (!srcValue.isNull())
@@ skipping 105 matching lines @@
   return attribute.name() == srcdocAttr ||
          HTMLFrameOwnerElement::isHTMLContentAttribute(attribute);
 }
 
 void HTMLFrameElementBase::setScrollingMode(ScrollbarMode scrollbarMode) {
   if (m_scrollingMode == scrollbarMode)
     return;
 
   if (contentDocument()) {
     contentDocument()->willChangeFrameOwnerProperties(
-        m_marginWidth, m_marginHeight, scrollbarMode);
+        m_marginWidth, m_marginHeight, scrollbarMode, isDisplayNone());
   }
   m_scrollingMode = scrollbarMode;
   frameOwnerPropertiesChanged();
 }
 
 void HTMLFrameElementBase::setMarginWidth(int marginWidth) {
   if (m_marginWidth == marginWidth)
     return;
 
   if (contentDocument()) {
     contentDocument()->willChangeFrameOwnerProperties(
-        marginWidth, m_marginHeight, m_scrollingMode);
+        marginWidth, m_marginHeight, m_scrollingMode, isDisplayNone());
   }
   m_marginWidth = marginWidth;
   frameOwnerPropertiesChanged();
 }
 
 void HTMLFrameElementBase::setMarginHeight(int marginHeight) {
   if (m_marginHeight == marginHeight)
     return;
 
   if (contentDocument()) {
     contentDocument()->willChangeFrameOwnerProperties(
-        m_marginWidth, marginHeight, m_scrollingMode);
+        m_marginWidth, marginHeight, m_scrollingMode, isDisplayNone());
   }
   m_marginHeight = marginHeight;
   frameOwnerPropertiesChanged();
 }
 
 }  // namespace blink