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

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

Issue 53373003: Remove display:run-in as per https://groups.google.com/a/chromium.org/forum/#!topic/blink-dev/_tHSX… (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix test Created 7 years, 1 month 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
« no previous file with comments | « Source/core/rendering/RenderMenuList.h ('k') | Source/core/rendering/RenderObject.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 ASSERT(element->hasTagName(HTMLNames::selectTag)); 67 ASSERT(element->hasTagName(HTMLNames::selectTag));
68 } 68 }
69 69
70 RenderMenuList::~RenderMenuList() 70 RenderMenuList::~RenderMenuList()
71 { 71 {
72 if (m_popup) 72 if (m_popup)
73 m_popup->disconnectClient(); 73 m_popup->disconnectClient();
74 m_popup = 0; 74 m_popup = 0;
75 } 75 }
76 76
77 bool RenderMenuList::canBeReplacedWithInlineRunIn() const
78 {
79 return false;
80 }
81
82 void RenderMenuList::createInnerBlock() 77 void RenderMenuList::createInnerBlock()
83 { 78 {
84 if (m_innerBlock) { 79 if (m_innerBlock) {
85 ASSERT(firstChild() == m_innerBlock); 80 ASSERT(firstChild() == m_innerBlock);
86 ASSERT(!m_innerBlock->nextSibling()); 81 ASSERT(!m_innerBlock->nextSibling());
87 return; 82 return;
88 } 83 }
89 84
90 // Create an anonymous block. 85 // Create an anonymous block.
91 ASSERT(!firstChild()); 86 ASSERT(!firstChild());
(...skipping 518 matching lines...) Expand 10 before | Expand all | Expand 10 after
610 { 605 {
611 setTextFromOption(selectElement()->listToOptionIndex(listIndex)); 606 setTextFromOption(selectElement()->listToOptionIndex(listIndex));
612 } 607 }
613 608
614 FontSelector* RenderMenuList::fontSelector() const 609 FontSelector* RenderMenuList::fontSelector() const
615 { 610 {
616 return document().styleResolver()->fontSelector(); 611 return document().styleResolver()->fontSelector();
617 } 612 }
618 613
619 } 614 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderMenuList.h ('k') | Source/core/rendering/RenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698