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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutView.cpp

Issue 2513153002: Don't create boxes for the contents of display: none iframes. (Closed)
Patch Set: Handle dynamic changes properly. Created 4 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutView.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc.
4 * All rights reserved. 4 * All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 181
182 void LayoutView::updateLogicalWidth() { 182 void LayoutView::updateLogicalWidth() {
183 setLogicalWidth(LayoutUnit(viewLogicalWidthForBoxSizing())); 183 setLogicalWidth(LayoutUnit(viewLogicalWidthForBoxSizing()));
184 } 184 }
185 185
186 bool LayoutView::isChildAllowed(LayoutObject* child, 186 bool LayoutView::isChildAllowed(LayoutObject* child,
187 const ComputedStyle&) const { 187 const ComputedStyle&) const {
188 return child->isBox(); 188 return child->isBox();
189 } 189 }
190 190
191 bool LayoutView::canHaveChildren() const {
192 // TODO(esprehn): This doesn't work for OOPIF, we need to replicate the
193 // display state for remote frames to support that.
194 HTMLFrameOwnerElement* owner = frame()->deprecatedLocalOwner();
195 if (!owner)
196 return true;
197 return owner->layoutObject();
198 }
199
191 void LayoutView::layoutContent() { 200 void LayoutView::layoutContent() {
192 ASSERT(needsLayout()); 201 ASSERT(needsLayout());
193 202
194 LayoutBlockFlow::layout(); 203 LayoutBlockFlow::layout();
195 204
196 #if ENABLE(ASSERT) 205 #if ENABLE(ASSERT)
197 checkLayoutState(); 206 checkLayoutState();
198 #endif 207 #endif
199 } 208 }
200 209
(...skipping 837 matching lines...) Expand 10 before | Expand all | Expand 10 after
1038 if (block) 1047 if (block)
1039 block->adjustChildDebugRect(rect); 1048 block->adjustChildDebugRect(rect);
1040 1049
1041 rect.setWidth(LayoutUnit(viewWidth(IncludeScrollbars))); 1050 rect.setWidth(LayoutUnit(viewWidth(IncludeScrollbars)));
1042 rect.setHeight(LayoutUnit(viewHeight(IncludeScrollbars))); 1051 rect.setHeight(LayoutUnit(viewHeight(IncludeScrollbars)));
1043 1052
1044 return rect; 1053 return rect;
1045 } 1054 }
1046 1055
1047 } // namespace blink 1056 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutView.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698