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

Side by Side Diff: Source/core/rendering/RenderBlock.cpp

Issue 788073004: Replace RenderFullscreen with top layer - Take II (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Updated after review comments. Created 6 years 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 | Annotate | Revision Log
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 795 matching lines...) Expand 10 before | Expand all | Expand 10 after
806 if (beforeChild && beforeChild->parent() != this) { 806 if (beforeChild && beforeChild->parent() != this) {
807 RenderObject* beforeChildContainer = beforeChild->parent(); 807 RenderObject* beforeChildContainer = beforeChild->parent();
808 while (beforeChildContainer->parent() != this) 808 while (beforeChildContainer->parent() != this)
809 beforeChildContainer = beforeChildContainer->parent(); 809 beforeChildContainer = beforeChildContainer->parent();
810 ASSERT(beforeChildContainer); 810 ASSERT(beforeChildContainer);
811 811
812 if (beforeChildContainer->isAnonymous()) { 812 if (beforeChildContainer->isAnonymous()) {
813 // If the requested beforeChild is not one of our children, then thi s is because 813 // If the requested beforeChild is not one of our children, then thi s is because
814 // there is an anonymous container within this object that contains the beforeChild. 814 // there is an anonymous container within this object that contains the beforeChild.
815 RenderObject* beforeChildAnonymousContainer = beforeChildContainer; 815 RenderObject* beforeChildAnonymousContainer = beforeChildContainer;
816 if (beforeChildAnonymousContainer->isAnonymousBlock() 816 if (beforeChildAnonymousContainer->isAnonymousBlock()) {
817 // Full screen renderers and full screen placeholders act as ano nymous blocks, not tables:
818 || beforeChildAnonymousContainer->isRenderFullScreen()
819 || beforeChildAnonymousContainer->isRenderFullScreenPlaceholder( )
820 ) {
821 // Insert the child into the anonymous block box instead of here . 817 // Insert the child into the anonymous block box instead of here .
822 if (newChild->isInline() || newChild->isFloatingOrOutOfFlowPosit ioned() || beforeChild->parent()->slowFirstChild() != beforeChild) 818 if (newChild->isInline() || newChild->isFloatingOrOutOfFlowPosit ioned() || beforeChild->parent()->slowFirstChild() != beforeChild)
823 beforeChild->parent()->addChild(newChild, beforeChild); 819 beforeChild->parent()->addChild(newChild, beforeChild);
824 else 820 else
825 addChild(newChild, beforeChild->parent()); 821 addChild(newChild, beforeChild->parent());
826 return; 822 return;
827 } 823 }
828 824
829 ASSERT(beforeChildAnonymousContainer->isTable()); 825 ASSERT(beforeChildAnonymousContainer->isTable());
830 if (newChild->isTablePart()) { 826 if (newChild->isTablePart()) {
(...skipping 3079 matching lines...) Expand 10 before | Expand all | Expand 10 after
3910 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const 3906 void RenderBlock::showLineTreeAndMark(const InlineBox* markedBox1, const char* m arkedLabel1, const InlineBox* markedBox2, const char* markedLabel2, const Render Object* obj) const
3911 { 3907 {
3912 showRenderObject(); 3908 showRenderObject();
3913 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box()) 3909 for (const RootInlineBox* root = firstRootBox(); root; root = root->nextRoot Box())
3914 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1); 3910 root->showLineTreeAndMark(markedBox1, markedLabel1, markedBox2, markedLa bel2, obj, 1);
3915 } 3911 }
3916 3912
3917 #endif 3913 #endif
3918 3914
3919 } // namespace blink 3915 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698