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

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

Issue 1152623003: Revert of [Reland] Setup LayoutMenuList to not modify layout tree outside style recalc. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Add rebaseline Created 5 years, 7 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
OLDNEW
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
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 : 1; 131 bool m_optionsChanged;
132 bool m_isEmpty : 1;
133 bool m_hasUpdatedActiveOption : 1;
134 bool m_popupIsVisible : 1;
135 int m_optionsWidth; 132 int m_optionsWidth;
136 133
137 int m_lastActiveIndex; 134 int m_lastActiveIndex;
138 135
139 RefPtr<ComputedStyle> m_optionStyle; 136 RefPtr<ComputedStyle> m_optionStyle;
140 137
141 RefPtrWillBePersistent<PopupMenu> m_popup; 138 RefPtrWillBePersistent<PopupMenu> m_popup;
139 bool m_popupIsVisible;
142 int m_indexToSelectOnCancel; 140 int m_indexToSelectOnCancel;
143 141
144 // TODO(tkent): Use FRIEND_TEST macro provided by gtest_prod.h 142 // TODO(tkent): Use FRIEND_TEST macro provided by gtest_prod.h
145 friend class LayoutMenuListTest_ElementRectRelativeToViewport_Test; 143 friend class LayoutMenuListTest_ElementRectRelativeToViewport_Test;
146 }; 144 };
147 145
148 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutMenuList, isMenuList()); 146 DEFINE_LAYOUT_OBJECT_TYPE_CASTS(LayoutMenuList, isMenuList());
149 147
150 } 148 }
151 149
152 #endif 150 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698