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

Side by Side Diff: Source/core/rendering/RenderMenuList.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 * This file is part of the select element renderer in WebCore. 2 * This file is part of the select element renderer 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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 visitor->trace(m_buttonText); 81 visitor->trace(m_buttonText);
82 visitor->trace(m_innerBlock); 82 visitor->trace(m_innerBlock);
83 visitor->trace(m_popup); 83 visitor->trace(m_popup);
84 RenderFlexibleBox::trace(visitor); 84 RenderFlexibleBox::trace(visitor);
85 } 85 }
86 86
87 // FIXME: Instead of this hack we should add a ShadowRoot to <select> with no in sertion point 87 // FIXME: Instead of this hack we should add a ShadowRoot to <select> with no in sertion point
88 // to prevent children from rendering. 88 // to prevent children from rendering.
89 bool RenderMenuList::isChildAllowed(RenderObject* object, RenderStyle*) const 89 bool RenderMenuList::isChildAllowed(RenderObject* object, RenderStyle*) const
90 { 90 {
91 return object->isAnonymous() && !object->isRenderFullScreen(); 91 return object->isAnonymous();
92 } 92 }
93 93
94 void RenderMenuList::createInnerBlock() 94 void RenderMenuList::createInnerBlock()
95 { 95 {
96 if (m_innerBlock) { 96 if (m_innerBlock) {
97 ASSERT(firstChild() == m_innerBlock); 97 ASSERT(firstChild() == m_innerBlock);
98 ASSERT(!m_innerBlock->nextSibling()); 98 ASSERT(!m_innerBlock->nextSibling());
99 return; 99 return;
100 } 100 }
101 101
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 HTMLElement* element = listItems[listIndex]; 585 HTMLElement* element = listItems[listIndex];
586 return isHTMLOptionElement(*element) && toHTMLOptionElement(*element).select ed(); 586 return isHTMLOptionElement(*element) && toHTMLOptionElement(*element).select ed();
587 } 587 }
588 588
589 void RenderMenuList::setTextFromItem(unsigned listIndex) 589 void RenderMenuList::setTextFromItem(unsigned listIndex)
590 { 590 {
591 setTextFromOption(selectElement()->listToOptionIndex(listIndex)); 591 setTextFromOption(selectElement()->listToOptionIndex(listIndex));
592 } 592 }
593 593
594 } // namespace blink 594 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698