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

Side by Side Diff: Source/web/ExternalPopupMenu.cpp

Issue 415343003: Option Groups with display: none should not show the children option elements (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Adding changes to ExternalPopupMenu 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010 Google Inc. All rights reserved. 2 * Copyright (C) 2010 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
47 using namespace blink; 47 using namespace blink;
48 48
49 namespace blink { 49 namespace blink {
50 50
51 ExternalPopupMenu::ExternalPopupMenu(LocalFrame& frame, PopupMenuClient* popupMe nuClient, WebViewImpl& webView) 51 ExternalPopupMenu::ExternalPopupMenu(LocalFrame& frame, PopupMenuClient* popupMe nuClient, WebViewImpl& webView)
52 : m_popupMenuClient(popupMenuClient) 52 : m_popupMenuClient(popupMenuClient)
53 , m_frameView(frame.view()) 53 , m_frameView(frame.view())
54 , m_webView(webView) 54 , m_webView(webView)
55 , m_dispatchEventTimer(this, &ExternalPopupMenu::dispatchEvent) 55 , m_dispatchEventTimer(this, &ExternalPopupMenu::dispatchEvent)
56 , m_webExternalPopupMenu(0) 56 , m_webExternalPopupMenu(0)
57 , m_itemCount(0)
57 { 58 {
58 } 59 }
59 60
60 ExternalPopupMenu::~ExternalPopupMenu() 61 ExternalPopupMenu::~ExternalPopupMenu()
61 { 62 {
62 } 63 }
63 64
64 void ExternalPopupMenu::show(const FloatQuad& controlPosition, const IntSize&, i nt index) 65 void ExternalPopupMenu::show(const FloatQuad& controlPosition, const IntSize&, i nt index)
65 { 66 {
66 IntRect rect(controlPosition.enclosingBoundingBox()); 67 IntRect rect(controlPosition.enclosingBoundingBox());
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 120
120 void ExternalPopupMenu::disconnectClient() 121 void ExternalPopupMenu::disconnectClient()
121 { 122 {
122 hide(); 123 hide();
123 m_popupMenuClient = 0; 124 m_popupMenuClient = 0;
124 } 125 }
125 126
126 void ExternalPopupMenu::didChangeSelection(int index) 127 void ExternalPopupMenu::didChangeSelection(int index)
127 { 128 {
128 if (m_popupMenuClient) 129 if (m_popupMenuClient)
129 m_popupMenuClient->selectionChanged(index); 130 m_popupMenuClient->selectionChanged(toPopupMenuItemIndex(index));
130 } 131 }
131 132
132 void ExternalPopupMenu::didAcceptIndex(int index) 133 void ExternalPopupMenu::didAcceptIndex(int index)
133 { 134 {
134 // Calling methods on the PopupMenuClient might lead to this object being 135 // Calling methods on the PopupMenuClient might lead to this object being
135 // derefed. This ensures it does not get deleted while we are running this 136 // derefed. This ensures it does not get deleted while we are running this
136 // method. 137 // method.
138 index = toPopupMenuItemIndex(index);
137 RefPtr<ExternalPopupMenu> guard(this); 139 RefPtr<ExternalPopupMenu> guard(this);
138 140
139 if (m_popupMenuClient) { 141 if (m_popupMenuClient) {
140 m_popupMenuClient->popupDidHide(); 142 m_popupMenuClient->popupDidHide();
141 m_popupMenuClient->valueChanged(index); 143 m_popupMenuClient->valueChanged(index);
142 } 144 }
143 m_webExternalPopupMenu = 0; 145 m_webExternalPopupMenu = 0;
144 } 146 }
145 147
146 void ExternalPopupMenu::didAcceptIndices(const WebVector<int>& indices) 148 void ExternalPopupMenu::didAcceptIndices(const WebVector<int>& indices)
147 { 149 {
148 if (!m_popupMenuClient) { 150 if (!m_popupMenuClient) {
149 m_webExternalPopupMenu = 0; 151 m_webExternalPopupMenu = 0;
150 return; 152 return;
151 } 153 }
152 154
153 // Calling methods on the PopupMenuClient might lead to this object being 155 // Calling methods on the PopupMenuClient might lead to this object being
154 // derefed. This ensures it does not get deleted while we are running this 156 // derefed. This ensures it does not get deleted while we are running this
155 // method. 157 // method.
156 RefPtr<ExternalPopupMenu> protect(this); 158 RefPtr<ExternalPopupMenu> protect(this);
157 159
158 if (!indices.size()) 160 if (!indices.size())
159 m_popupMenuClient->valueChanged(static_cast<unsigned>(-1), true); 161 m_popupMenuClient->valueChanged(static_cast<unsigned>(-1), true);
160 else { 162 else {
161 for (size_t i = 0; i < indices.size(); ++i) 163 for (size_t i = 0; i < indices.size(); ++i)
162 m_popupMenuClient->listBoxSelectItem(indices[i], (i > 0), false, (i == indices.size() - 1)); 164 m_popupMenuClient->listBoxSelectItem(toPopupMenuItemIndex(indices[i] ), (i > 0), false, (i == indices.size() - 1));
163 } 165 }
164 166
165 // The call to valueChanged above might have lead to a call to 167 // The call to valueChanged above might have lead to a call to
166 // disconnectClient, so we might not have a PopupMenuClient anymore. 168 // disconnectClient, so we might not have a PopupMenuClient anymore.
167 if (m_popupMenuClient) 169 if (m_popupMenuClient)
168 m_popupMenuClient->popupDidHide(); 170 m_popupMenuClient->popupDidHide();
169 171
170 m_webExternalPopupMenu = 0; 172 m_webExternalPopupMenu = 0;
171 } 173 }
172 174
173 void ExternalPopupMenu::didCancel() 175 void ExternalPopupMenu::didCancel()
174 { 176 {
175 // See comment in didAcceptIndex on why we need this. 177 // See comment in didAcceptIndex on why we need this.
176 RefPtr<ExternalPopupMenu> guard(this); 178 RefPtr<ExternalPopupMenu> guard(this);
177 179
178 if (m_popupMenuClient) 180 if (m_popupMenuClient)
179 m_popupMenuClient->popupDidHide(); 181 m_popupMenuClient->popupDidHide();
180 m_webExternalPopupMenu = 0; 182 m_webExternalPopupMenu = 0;
181 } 183 }
182 184
183 void ExternalPopupMenu::getPopupMenuInfo(WebPopupMenuInfo* info) 185 void ExternalPopupMenu::getPopupMenuInfo(WebPopupMenuInfo* info)
184 { 186 {
185 int itemCount = m_popupMenuClient->listSize(); 187 int itemCount = m_popupMenuClient->listSize();
188 m_itemCount = 0;
186 WebVector<WebMenuItemInfo> items(static_cast<size_t>(itemCount)); 189 WebVector<WebMenuItemInfo> items(static_cast<size_t>(itemCount));
187 for (int i = 0; i < itemCount; ++i) { 190 for (int i = 0; i < itemCount; ++i) {
188 WebMenuItemInfo& popupItem = items[i]; 191 WebMenuItemInfo& popupItem = items[i];
189 popupItem.label = m_popupMenuClient->itemText(i); 192 popupItem.label = m_popupMenuClient->itemText(i);
190 popupItem.toolTip = m_popupMenuClient->itemToolTip(i); 193 popupItem.toolTip = m_popupMenuClient->itemToolTip(i);
191 if (m_popupMenuClient->itemIsSeparator(i)) 194 if (m_popupMenuClient->itemIsSeparator(i))
192 popupItem.type = WebMenuItemInfo::Separator; 195 popupItem.type = WebMenuItemInfo::Separator;
193 else if (m_popupMenuClient->itemIsLabel(i)) 196 else if (m_popupMenuClient->itemIsLabel(i))
194 popupItem.type = WebMenuItemInfo::Group; 197 popupItem.type = WebMenuItemInfo::Group;
195 else 198 else
196 popupItem.type = WebMenuItemInfo::Option; 199 popupItem.type = WebMenuItemInfo::Option;
197 popupItem.enabled = m_popupMenuClient->itemIsEnabled(i); 200 popupItem.enabled = m_popupMenuClient->itemIsEnabled(i);
198 popupItem.checked = m_popupMenuClient->itemIsSelected(i); 201 popupItem.checked = m_popupMenuClient->itemIsSelected(i);
199 PopupMenuStyle style = m_popupMenuClient->itemStyle(i); 202 PopupMenuStyle style = m_popupMenuClient->itemStyle(i);
200 if (style.textDirection() == blink::RTL) 203 if (style.textDirection() == blink::RTL)
201 popupItem.textDirection = WebTextDirectionRightToLeft; 204 popupItem.textDirection = WebTextDirectionRightToLeft;
202 else 205 else
203 popupItem.textDirection = WebTextDirectionLeftToRight; 206 popupItem.textDirection = WebTextDirectionLeftToRight;
204 popupItem.hasTextDirectionOverride = style.hasTextDirectionOverride(); 207 popupItem.hasTextDirectionOverride = style.hasTextDirectionOverride();
208 popupItem.displayNone = style.isDisplayNone();
209
210 if (!popupItem.displayNone)
211 ++m_itemCount;
205 } 212 }
206 213
207 info->itemHeight = m_popupMenuClient->menuStyle().font().fontMetrics().heigh t(); 214 info->itemHeight = m_popupMenuClient->menuStyle().font().fontMetrics().heigh t();
208 info->itemFontSize = static_cast<int>(m_popupMenuClient->menuStyle().font(). fontDescription().computedSize()); 215 info->itemFontSize = static_cast<int>(m_popupMenuClient->menuStyle().font(). fontDescription().computedSize());
209 info->selectedIndex = m_popupMenuClient->selectedIndex(); 216 info->selectedIndex = toExternalPopupMenuItemIndex(m_popupMenuClient->select edIndex());
210 info->rightAligned = m_popupMenuClient->menuStyle().textDirection() == blink ::RTL; 217 info->rightAligned = m_popupMenuClient->menuStyle().textDirection() == blink ::RTL;
211 info->allowMultipleSelection = m_popupMenuClient->multiple(); 218 info->allowMultipleSelection = m_popupMenuClient->multiple();
212 info->items.swap(items); 219 info->items.swap(items);
213 } 220 }
214 221
222 int ExternalPopupMenu::toPopupMenuItemIndex(int index)
223 {
224 int itemCount = m_popupMenuClient->listSize();
225 if (itemCount == m_itemCount || index < 0)
226 return index;
227
228 int indexTracker = 0;
229 for (int i = 0; i < itemCount ; ++i) {
230 if (m_popupMenuClient->itemStyle(i).isDisplayNone())
231 continue;
232 if (indexTracker++ == index)
233 return i;
234 }
235 return -1;
215 } 236 }
237
238 int ExternalPopupMenu::toExternalPopupMenuItemIndex(int index)
239 {
240 int itemCount = m_popupMenuClient->listSize();
241 if (itemCount == m_itemCount || index < 0)
242 return index;
243
244 int indexTracker = 0;
245 for (int i = 0; i < itemCount ; ++i) {
246 if (m_popupMenuClient->itemStyle(i).isDisplayNone())
247 continue;
248 if (index == i)
249 return indexTracker;
250 ++indexTracker;
251 }
252 return -1;
253 }
254
255 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698