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

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

Issue 1410833004: Revert "Implement FullScreen using top layer." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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 unified diff | Download patch
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 363 matching lines...) Expand 10 before | Expand all | Expand 10 after
374 if (beforeChild && beforeChild->parent() != this) { 374 if (beforeChild && beforeChild->parent() != this) {
375 LayoutObject* beforeChildContainer = beforeChild->parent(); 375 LayoutObject* beforeChildContainer = beforeChild->parent();
376 while (beforeChildContainer->parent() != this) 376 while (beforeChildContainer->parent() != this)
377 beforeChildContainer = beforeChildContainer->parent(); 377 beforeChildContainer = beforeChildContainer->parent();
378 ASSERT(beforeChildContainer); 378 ASSERT(beforeChildContainer);
379 379
380 if (beforeChildContainer->isAnonymous()) { 380 if (beforeChildContainer->isAnonymous()) {
381 // If the requested beforeChild is not one of our children, then thi s is because 381 // If the requested beforeChild is not one of our children, then thi s is because
382 // there is an anonymous container within this object that contains the beforeChild. 382 // there is an anonymous container within this object that contains the beforeChild.
383 LayoutObject* beforeChildAnonymousContainer = beforeChildContainer; 383 LayoutObject* beforeChildAnonymousContainer = beforeChildContainer;
384 if (beforeChildAnonymousContainer->isAnonymousBlock()) { 384 if (beforeChildAnonymousContainer->isAnonymousBlock()
385 // Full screen layoutObjects and full screen placeholders act as anonymous blocks, not tables:
386 || beforeChildAnonymousContainer->isLayoutFullScreen()
387 || beforeChildAnonymousContainer->isLayoutFullScreenPlaceholder( )
388 ) {
385 // Insert the child into the anonymous block box instead of here . 389 // Insert the child into the anonymous block box instead of here .
386 if (newChild->isInline() || newChild->isFloatingOrOutOfFlowPosit ioned() || beforeChild->parent()->slowFirstChild() != beforeChild) 390 if (newChild->isInline() || newChild->isFloatingOrOutOfFlowPosit ioned() || beforeChild->parent()->slowFirstChild() != beforeChild)
387 beforeChild->parent()->addChild(newChild, beforeChild); 391 beforeChild->parent()->addChild(newChild, beforeChild);
388 else 392 else
389 addChild(newChild, beforeChild->parent()); 393 addChild(newChild, beforeChild->parent());
390 return; 394 return;
391 } 395 }
392 396
393 ASSERT(beforeChildAnonymousContainer->isTable()); 397 ASSERT(beforeChildAnonymousContainer->isTable());
394 if (newChild->isTablePart()) { 398 if (newChild->isTablePart()) {
(...skipping 2481 matching lines...) Expand 10 before | Expand all | Expand 10 after
2876 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const 2880 void LayoutBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Layout Object* obj) const
2877 { 2881 {
2878 showLayoutObject(); 2882 showLayoutObject();
2879 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 2883 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
2880 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 2884 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
2881 } 2885 }
2882 2886
2883 #endif 2887 #endif
2884 2888
2885 } // namespace blink 2889 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/dom/LayoutTreeBuilder.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698