Chromium Code Reviews

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

Issue 2168373002: Revert of Reland "Implement FullScreen using top layer." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: resolve WebFrameTest.cpp conflict and appease presubmit Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 240 matching lines...)
251 while (beforeDescendantContainer->parent() != this) 251 while (beforeDescendantContainer->parent() != this)
252 beforeDescendantContainer = beforeDescendantContainer->parent(); 252 beforeDescendantContainer = beforeDescendantContainer->parent();
253 ASSERT(beforeDescendantContainer); 253 ASSERT(beforeDescendantContainer);
254 254
255 // We really can't go on if what we have found isn't anonymous. We're not su pposed to use some 255 // We really can't go on if what we have found isn't anonymous. We're not su pposed to use some
256 // random non-anonymous object and put the child there. That's a recipe for security issues. 256 // random non-anonymous object and put the child there. That's a recipe for security issues.
257 RELEASE_ASSERT(beforeDescendantContainer->isAnonymous()); 257 RELEASE_ASSERT(beforeDescendantContainer->isAnonymous());
258 258
259 // If the requested insertion point is not one of our children, then this is because 259 // If the requested insertion point is not one of our children, then this is because
260 // there is an anonymous container within this object that contains the befo reDescendant. 260 // there is an anonymous container within this object that contains the befo reDescendant.
261 if (beforeDescendantContainer->isAnonymousBlock()) { 261 if (beforeDescendantContainer->isAnonymousBlock()
262 // Full screen layoutObjects and full screen placeholders act as anonymo us blocks, not tables:
263 || beforeDescendantContainer->isLayoutFullScreen()
264 || beforeDescendantContainer->isLayoutFullScreenPlaceholder()) {
262 // Insert the child into the anonymous block box instead of here. 265 // Insert the child into the anonymous block box instead of here.
263 if (newChild->isInline() || newChild->isFloatingOrOutOfFlowPositioned() || beforeDescendant->parent()->slowFirstChild() != beforeDescendant) 266 if (newChild->isInline() || newChild->isFloatingOrOutOfFlowPositioned() || beforeDescendant->parent()->slowFirstChild() != beforeDescendant)
264 beforeDescendant->parent()->addChild(newChild, beforeDescendant); 267 beforeDescendant->parent()->addChild(newChild, beforeDescendant);
265 else 268 else
266 addChild(newChild, beforeDescendant->parent()); 269 addChild(newChild, beforeDescendant->parent());
267 return; 270 return;
268 } 271 }
269 272
270 ASSERT(beforeDescendantContainer->isTable()); 273 ASSERT(beforeDescendantContainer->isTable());
271 if (newChild->isTablePart()) { 274 if (newChild->isTablePart()) {
(...skipping 1592 matching lines...)
1864 for (TrackedLayoutBoxListHashSet::const_iterator it = positionedDescenda ntSet->begin(); it != end; ++it) { 1867 for (TrackedLayoutBoxListHashSet::const_iterator it = positionedDescenda ntSet->begin(); it != end; ++it) {
1865 LayoutBox* currBox = *it; 1868 LayoutBox* currBox = *it;
1866 ASSERT(!currBox->needsLayout()); 1869 ASSERT(!currBox->needsLayout());
1867 } 1870 }
1868 } 1871 }
1869 } 1872 }
1870 1873
1871 #endif 1874 #endif
1872 1875
1873 } // namespace blink 1876 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameView.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutBox.h » ('j') | no next file with comments »

Powered by Google App Engine