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 11 matching lines @@
  */
 
 #include "core/html/HTMLFrameElementBase.h"
 
 #include "bindings/core/v8/BindingSecurity.h"
 #include "bindings/core/v8/ScriptController.h"
 #include "bindings/core/v8/ScriptEventListener.h"
 #include "core/HTMLNames.h"
 #include "core/dom/Attribute.h"
 #include "core/dom/Document.h"
+#include "core/dom/StyleChangeReason.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/RemoteFrame.h"
 #include "core/frame/RemoteFrameView.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "core/html/parser/HTMLParserIdioms.h"
 #include "core/loader/FrameLoader.h"
 #include "core/loader/FrameLoaderClient.h"
 #include "core/page/FocusController.h"
 #include "core/page/Page.h"
@@ skipping 74 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 QualifiedName& name,
                                           const AtomicString& oldValue,
                                           const AtomicString& value) {
   if (name == srcdocAttr) {
     if (!value.isNull()) {
       setLocation(srcdocURL().getString());
     } else {
       const AtomicString& srcValue = fastGetAttribute(srcAttr);
       if (!srcValue.isNull())
         setLocation(stripLeadingAndTrailingHTMLSpaces(srcValue));
@@ skipping 49 matching lines @@
   // We should never have a content frame at the point where we got inserted
   // into a tree.
   SECURITY_CHECK(!contentFrame());
 
   setNameAndOpenURL();
 }
 
 void HTMLFrameElementBase::attachLayoutTree(const AttachContext& context) {
   HTMLFrameOwnerElement::attachLayoutTree(context);
 
-  if (layoutPart()) {
-    if (Frame* frame = contentFrame()) {
-      if (frame->isLocalFrame())
-        setWidget(toLocalFrame(frame)->view());
-      else if (frame->isRemoteFrame())
+  // TODO(esprehn): Why do we only call setWidget() if the frame is
+  // displayed?
+
+  if (Frame* frame = contentFrame()) {
+    if (frame->isLocalFrame()) {
+      LocalFrame* localFrame = toLocalFrame(frame);
+      if (layoutPart())
+        setWidget(localFrame->view());
+      if (Element* documentElement =
+              localFrame->document()->documentElement()) {
+        if (static_cast<bool>(layoutPart()) !=
+            static_cast<bool>(documentElement->layoutObject())) {
+          documentElement->lazyReattachIfAttached();
+        }
+      }
+    } else {
+      if (layoutPart())
         setWidget(toRemoteFrame(frame)->view());
     }
   }
 }
 
 void HTMLFrameElementBase::setLocation(const String& str) {
   m_URL = AtomicString(str);
 
   if (isConnected())
     openURL(false);
@@ skipping 40 matching lines @@
   }
   HTMLFrameOwnerElement::defaultEventHandler(event);
 }
 
 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