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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutMenuList.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 * 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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 } 61 }
62 62
63 LayoutMenuList::~LayoutMenuList() 63 LayoutMenuList::~LayoutMenuList()
64 { 64 {
65 } 65 }
66 66
67 // FIXME: Instead of this hack we should add a ShadowRoot to <select> with no in sertion point 67 // FIXME: Instead of this hack we should add a ShadowRoot to <select> with no in sertion point
68 // to prevent children from rendering. 68 // to prevent children from rendering.
69 bool LayoutMenuList::isChildAllowed(LayoutObject* object, const ComputedStyle&) const 69 bool LayoutMenuList::isChildAllowed(LayoutObject* object, const ComputedStyle&) const
70 { 70 {
71 return object->isAnonymous(); 71 return object->isAnonymous() && !object->isLayoutFullScreen();
72 } 72 }
73 73
74 void LayoutMenuList::createInnerBlock() 74 void LayoutMenuList::createInnerBlock()
75 { 75 {
76 if (m_innerBlock) { 76 if (m_innerBlock) {
77 ASSERT(firstChild() == m_innerBlock); 77 ASSERT(firstChild() == m_innerBlock);
78 ASSERT(!m_innerBlock->nextSibling()); 78 ASSERT(!m_innerBlock->nextSibling());
79 return; 79 return;
80 } 80 }
81 81
(...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 // space appear on the side of the popup menu. 358 // space appear on the side of the popup menu.
359 return endOfLinePadding; 359 return endOfLinePadding;
360 } 360 }
361 361
362 // If the appearance isn't MenulistPart, then the select is styled (non-nati ve), so 362 // If the appearance isn't MenulistPart, then the select is styled (non-nati ve), so
363 // we want to return the user specified padding. 363 // we want to return the user specified padding.
364 return paddingRight() + m_innerBlock->paddingRight(); 364 return paddingRight() + m_innerBlock->paddingRight();
365 } 365 }
366 366
367 } // namespace blink 367 } // 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