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

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

Issue 463633002: Revert "Cleanup deadcode in Rendering" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderListMarker.cpp ('k') | Source/core/rendering/RenderMenuList.cpp » ('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 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 virtual PopupMenuStyle menuStyle() const OVERRIDE; 88 virtual PopupMenuStyle menuStyle() const OVERRIDE;
89 virtual LayoutUnit clientPaddingLeft() const OVERRIDE; 89 virtual LayoutUnit clientPaddingLeft() const OVERRIDE;
90 virtual LayoutUnit clientPaddingRight() const OVERRIDE; 90 virtual LayoutUnit clientPaddingRight() const OVERRIDE;
91 virtual int listSize() const OVERRIDE; 91 virtual int listSize() const OVERRIDE;
92 virtual int selectedIndex() const OVERRIDE; 92 virtual int selectedIndex() const OVERRIDE;
93 virtual void popupDidHide() OVERRIDE; 93 virtual void popupDidHide() OVERRIDE;
94 virtual bool itemIsSeparator(unsigned listIndex) const OVERRIDE; 94 virtual bool itemIsSeparator(unsigned listIndex) const OVERRIDE;
95 virtual bool itemIsLabel(unsigned listIndex) const OVERRIDE; 95 virtual bool itemIsLabel(unsigned listIndex) const OVERRIDE;
96 virtual bool itemIsSelected(unsigned listIndex) const OVERRIDE; 96 virtual bool itemIsSelected(unsigned listIndex) const OVERRIDE;
97 virtual void setTextFromItem(unsigned listIndex) OVERRIDE; 97 virtual void setTextFromItem(unsigned listIndex) OVERRIDE;
98 virtual void listBoxSelectItem(int listIndex, bool allowMultiplySelections, bool shift, bool fireOnChangeNow = true) OVERRIDE;
98 virtual bool multiple() const OVERRIDE; 99 virtual bool multiple() const OVERRIDE;
99 100
100 virtual bool hasLineIfEmpty() const OVERRIDE { return true; } 101 virtual bool hasLineIfEmpty() const OVERRIDE { return true; }
101 102
102 // Flexbox defines baselines differently than regular blocks. 103 // Flexbox defines baselines differently than regular blocks.
103 // For backwards compatibility, menulists need to do the regular block behav ior. 104 // For backwards compatibility, menulists need to do the regular block behav ior.
104 virtual int baselinePosition(FontBaseline baseline, bool firstLine, LineDire ctionMode direction, LinePositionMode position) const OVERRIDE 105 virtual int baselinePosition(FontBaseline baseline, bool firstLine, LineDire ctionMode direction, LinePositionMode position) const OVERRIDE
105 { 106 {
106 return RenderBlock::baselinePosition(baseline, firstLine, direction, pos ition); 107 return RenderBlock::baselinePosition(baseline, firstLine, direction, pos ition);
107 } 108 }
(...skipping 22 matching lines...) Expand all
130 131
131 RefPtr<PopupMenu> m_popup; 132 RefPtr<PopupMenu> m_popup;
132 bool m_popupIsVisible; 133 bool m_popupIsVisible;
133 }; 134 };
134 135
135 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMenuList, isMenuList()); 136 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMenuList, isMenuList());
136 137
137 } 138 }
138 139
139 #endif 140 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderListMarker.cpp ('k') | Source/core/rendering/RenderMenuList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698