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

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

Issue 2107233002: Reland "Implement FullScreen using top layer." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: new untested DCHECK Created 4 years, 5 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 * This file is part of the select element layoutObject in WebCore. 2 * This file is part of the select element layoutObject in WebCore.
3 * 3 *
4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 4 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
5 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed. 5 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv ed.
6 * 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 6 * 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
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 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 } 49 }
50 50
51 LayoutMenuList::~LayoutMenuList() 51 LayoutMenuList::~LayoutMenuList()
52 { 52 {
53 } 53 }
54 54
55 // FIXME: Instead of this hack we should add a ShadowRoot to <select> with no in sertion point 55 // FIXME: Instead of this hack we should add a ShadowRoot to <select> with no in sertion point
56 // to prevent children from rendering. 56 // to prevent children from rendering.
57 bool LayoutMenuList::isChildAllowed(LayoutObject* object, const ComputedStyle&) const 57 bool LayoutMenuList::isChildAllowed(LayoutObject* object, const ComputedStyle&) const
58 { 58 {
59 return object->isAnonymous() && !object->isLayoutFullScreen(); 59 return object->isAnonymous();
60 } 60 }
61 61
62 void LayoutMenuList::createInnerBlock() 62 void LayoutMenuList::createInnerBlock()
63 { 63 {
64 if (m_innerBlock) { 64 if (m_innerBlock) {
65 ASSERT(firstChild() == m_innerBlock); 65 ASSERT(firstChild() == m_innerBlock);
66 ASSERT(!m_innerBlock->nextSibling()); 66 ASSERT(!m_innerBlock->nextSibling());
67 return; 67 return;
68 } 68 }
69 69
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
300 { 300 {
301 return paddingLeft() + m_innerBlock->paddingLeft(); 301 return paddingLeft() + m_innerBlock->paddingLeft();
302 } 302 }
303 303
304 LayoutUnit LayoutMenuList::clientPaddingRight() const 304 LayoutUnit LayoutMenuList::clientPaddingRight() const
305 { 305 {
306 return paddingRight() + m_innerBlock->paddingRight(); 306 return paddingRight() + m_innerBlock->paddingRight();
307 } 307 }
308 308
309 } // namespace blink 309 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutInline.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698