Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(812)

Unified Diff: third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp

Issue 2564633002: Don't create layout objects for children of display-none iframes. (Closed)
Patch Set: Rebaseline. Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp
diff --git a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp
index 64a0f46f576167b5defd7685ef767f4dbece0894..71cbfeb52cd1ff8a4b58e2ab18f31658ff52ba5f 100644
--- a/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp
+++ b/third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp
@@ -221,6 +221,13 @@ void HTMLFrameOwnerElement::disposeWidgetSoon(Widget* widget) {
widget->dispose();
}
+void HTMLFrameOwnerElement::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 HTMLFrameOwnerElement::dispatchLoad() {
dispatchScopedEvent(Event::create(EventTypeNames::load));
}
@@ -243,6 +250,15 @@ void HTMLFrameOwnerElement::setWidget(Widget* widget) {
if (widget == m_widget)
return;
+ Document* doc = contentDocument();
+ if (doc && doc->frame()) {
+ bool willBeDisplayNone = !widget;
+ if (isDisplayNone() != willBeDisplayNone) {
+ doc->willChangeFrameOwnerProperties(marginWidth(), marginHeight(),
+ scrollingMode(), willBeDisplayNone);
+ }
+ }
+
if (m_widget) {
if (m_widget->parent())
moveWidgetToParentSoon(m_widget.get(), 0);
@@ -250,6 +266,7 @@ void HTMLFrameOwnerElement::setWidget(Widget* widget) {
}
m_widget = widget;
+ frameOwnerPropertiesChanged();
LayoutPart* layoutPart = toLayoutPart(layoutObject());
LayoutPartItem layoutPartItem = LayoutPartItem(layoutPart);
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.h ('k') | third_party/WebKit/Source/core/layout/LayoutView.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698