| OLD | NEW |
| 1 /* | 1 /* |
| 2 * This file is part of the select element layoutObject in WebCore. | 2 * This file is part of the select element layoutObject 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 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 121 void setTextFromOption(int optionIndex); | 121 void setTextFromOption(int optionIndex); |
| 122 void updateOptionsWidth(); | 122 void updateOptionsWidth(); |
| 123 void updateText(); | 123 void updateText(); |
| 124 void setIndexToSelectOnCancel(int listIndex); | 124 void setIndexToSelectOnCancel(int listIndex); |
| 125 | 125 |
| 126 void didUpdateActiveOption(int optionIndex); | 126 void didUpdateActiveOption(int optionIndex); |
| 127 | 127 |
| 128 LayoutText* m_buttonText; | 128 LayoutText* m_buttonText; |
| 129 LayoutBlock* m_innerBlock; | 129 LayoutBlock* m_innerBlock; |
| 130 | 130 |
| 131 bool m_optionsChanged; | 131 bool m_optionsChanged : 1; |
| 132 bool m_isEmpty : 1; |
| 133 bool m_hasUpdatedActiveOption : 1; |
| 134 bool m_popupIsVisible : 1; |
| 132 int m_optionsWidth; | 135 int m_optionsWidth; |
| 133 | 136 |
| 134 int m_lastActiveIndex; | 137 int m_lastActiveIndex; |
| 135 | 138 |
| 136 RefPtr<ComputedStyle> m_optionStyle; | 139 RefPtr<ComputedStyle> m_optionStyle; |
| 137 | 140 |
| 138 RefPtrWillBePersistent<PopupMenu> m_popup; | 141 RefPtrWillBePersistent<PopupMenu> m_popup; |
| 139 bool m_popupIsVisible; | |
| 140 int m_indexToSelectOnCancel; | 142 int m_indexToSelectOnCancel; |
| 141 | 143 |
| 142 // TODO(tkent): Use FRIEND_TEST macro provided by gtest_prod.h | 144 // TODO(tkent): Use FRIEND_TEST macro provided by gtest_prod.h |
| 143 friend class LayoutMenuListTest_ElementRectRelativeToViewport_Test; | 145 friend class LayoutMenuListTest_ElementRectRelativeToViewport_Test; |
| 144 }; | 146 }; |
| 145 | 147 |
| 146 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutMenuList, isMenuList()); | 148 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutMenuList, isMenuList()); |
| 147 | 149 |
| 148 } | 150 } |
| 149 | 151 |
| 150 #endif | 152 #endif |
| OLD | NEW |