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

Side by Side Diff: Source/core/layout/LayoutMenuList.h

Issue 1013303004: Fix issue on <select> style change when popup is visible (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed test expectation Created 5 years, 8 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/html/forms/PopupMenuClient.h ('k') | Source/core/layout/LayoutMenuList.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 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 virtual String itemText(unsigned listIndex) const override; 83 virtual String itemText(unsigned listIndex) const override;
84 virtual String itemToolTip(unsigned listIndex) const override; 84 virtual String itemToolTip(unsigned listIndex) const override;
85 virtual String itemAccessibilityText(unsigned listIndex) const override; 85 virtual String itemAccessibilityText(unsigned listIndex) const override;
86 virtual bool itemIsEnabled(unsigned listIndex) const override; 86 virtual bool itemIsEnabled(unsigned listIndex) const override;
87 virtual PopupMenuStyle menuStyle() const override; 87 virtual PopupMenuStyle menuStyle() const override;
88 virtual LayoutUnit clientPaddingLeft() const override; 88 virtual LayoutUnit clientPaddingLeft() const override;
89 virtual LayoutUnit clientPaddingRight() const override; 89 virtual LayoutUnit clientPaddingRight() const override;
90 virtual int listSize() const override; 90 virtual int listSize() const override;
91 virtual int selectedIndex() const override; 91 virtual int selectedIndex() const override;
92 virtual void popupDidHide() override; 92 virtual void popupDidHide() override;
93 virtual void popupDidCancel() override;
93 virtual bool itemIsSeparator(unsigned listIndex) const override; 94 virtual bool itemIsSeparator(unsigned listIndex) const override;
94 virtual bool itemIsLabel(unsigned listIndex) const override; 95 virtual bool itemIsLabel(unsigned listIndex) const override;
95 virtual bool itemIsSelected(unsigned listIndex) const override; 96 virtual bool itemIsSelected(unsigned listIndex) const override;
96 virtual void setTextFromItem(unsigned listIndex) override; 97 virtual void provisionalSelectionChanged(unsigned) override;
97 virtual void listBoxSelectItem(int listIndex, bool allowMultiplySelections, bool shift, bool fireOnChangeNow = true) 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 virtual IntRect elementRectRelativeToViewport() const override; 100 virtual IntRect elementRectRelativeToViewport() const override;
100 virtual Element& ownerElement() const override; 101 virtual Element& ownerElement() const override;
101 virtual const ComputedStyle* computedStyleForItem(Element&) const override; 102 virtual const ComputedStyle* computedStyleForItem(Element&) const override;
102 103
103 virtual bool hasLineIfEmpty() const override { return true; } 104 virtual bool hasLineIfEmpty() const override { return true; }
104 105
105 // Flexbox defines baselines differently than regular blocks. 106 // Flexbox defines baselines differently than regular blocks.
106 // For backwards compatibility, menulists need to do the regular block behav ior. 107 // For backwards compatibility, menulists need to do the regular block behav ior.
(...skipping 19 matching lines...) Expand all
126 127
127 bool m_optionsChanged; 128 bool m_optionsChanged;
128 int m_optionsWidth; 129 int m_optionsWidth;
129 130
130 int m_lastActiveIndex; 131 int m_lastActiveIndex;
131 132
132 RefPtr<ComputedStyle> m_optionStyle; 133 RefPtr<ComputedStyle> m_optionStyle;
133 134
134 RefPtrWillBePersistent<PopupMenu> m_popup; 135 RefPtrWillBePersistent<PopupMenu> m_popup;
135 bool m_popupIsVisible; 136 bool m_popupIsVisible;
137 int m_indexToSelectOnCancel;
136 138
137 // TODO(tkent): Use FRIEND_TEST macro provided by gtest_prod.h 139 // TODO(tkent): Use FRIEND_TEST macro provided by gtest_prod.h
138 friend class LayoutMenuListTest_ElementRectRelativeToViewport_Test; 140 friend class LayoutMenuListTest_ElementRectRelativeToViewport_Test;
139 }; 141 };
140 142
141 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutMenuList, isMenuList()); 143 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutMenuList, isMenuList());
142 144
143 } 145 }
144 146
145 #endif 147 #endif
OLDNEW
« no previous file with comments | « Source/core/html/forms/PopupMenuClient.h ('k') | Source/core/layout/LayoutMenuList.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698