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

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

Issue 351213002: Change RenderObject::style(bool) to accept an enum instead (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Renamed enum to OwnOrFirstLineStyle, rebased and got rid of duplicate state on the stack in RootInl… Created 6 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
« no previous file with comments | « Source/core/rendering/RenderListMarker.cpp ('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 * 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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 virtual bool itemIsLabel(unsigned listIndex) const OVERRIDE; 93 virtual bool itemIsLabel(unsigned listIndex) const OVERRIDE;
94 virtual bool itemIsSelected(unsigned listIndex) const OVERRIDE; 94 virtual bool itemIsSelected(unsigned listIndex) const OVERRIDE;
95 virtual void setTextFromItem(unsigned listIndex) OVERRIDE; 95 virtual void setTextFromItem(unsigned listIndex) OVERRIDE;
96 virtual void listBoxSelectItem(int listIndex, bool allowMultiplySelections, bool shift, bool fireOnChangeNow = true) OVERRIDE; 96 virtual void listBoxSelectItem(int listIndex, bool allowMultiplySelections, bool shift, bool fireOnChangeNow = true) OVERRIDE;
97 virtual bool multiple() const OVERRIDE; 97 virtual bool multiple() const OVERRIDE;
98 98
99 virtual bool hasLineIfEmpty() const OVERRIDE { return true; } 99 virtual bool hasLineIfEmpty() const OVERRIDE { return true; }
100 100
101 // Flexbox defines baselines differently than regular blocks. 101 // Flexbox defines baselines differently than regular blocks.
102 // For backwards compatibility, menulists need to do the regular block behav ior. 102 // For backwards compatibility, menulists need to do the regular block behav ior.
103 virtual int baselinePosition(FontBaseline baseline, bool firstLine, LineDire ctionMode direction, LinePositionMode position) const OVERRIDE 103 virtual int baselinePosition(FontBaseline baseline, OwnOrFirstLineStyle firs tLine, LineDirectionMode direction, LinePositionMode position) const OVERRIDE
104 { 104 {
105 return RenderBlock::baselinePosition(baseline, firstLine, direction, pos ition); 105 return RenderBlock::baselinePosition(baseline, firstLine, direction, pos ition);
106 } 106 }
107 virtual int firstLineBoxBaseline() const OVERRIDE { return RenderBlock::firs tLineBoxBaseline(); } 107 virtual int firstLineBoxBaseline() const OVERRIDE { return RenderBlock::firs tLineBoxBaseline(); }
108 virtual int inlineBlockBaseline(LineDirectionMode direction) const OVERRIDE { return RenderBlock::inlineBlockBaseline(direction); } 108 virtual int inlineBlockBaseline(LineDirectionMode direction) const OVERRIDE { return RenderBlock::inlineBlockBaseline(direction); }
109 109
110 void getItemBackgroundColor(unsigned listIndex, Color&, bool& itemHasCustomB ackgroundColor) const; 110 void getItemBackgroundColor(unsigned listIndex, Color&, bool& itemHasCustomB ackgroundColor) const;
111 111
112 void createInnerBlock(); 112 void createInnerBlock();
113 void adjustInnerStyle(); 113 void adjustInnerStyle();
(...skipping 15 matching lines...) Expand all
129 129
130 RefPtr<PopupMenu> m_popup; 130 RefPtr<PopupMenu> m_popup;
131 bool m_popupIsVisible; 131 bool m_popupIsVisible;
132 }; 132 };
133 133
134 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMenuList, isMenuList()); 134 DEFINE_RENDER_OBJECT_TYPE_CASTS(RenderMenuList, isMenuList());
135 135
136 } 136 }
137 137
138 #endif 138 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderListMarker.cpp ('k') | Source/core/rendering/RenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698