OLD | NEW |
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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 { | 65 { |
66 IntRect rect(controlPosition.enclosingBoundingBox()); | 66 IntRect rect(controlPosition.enclosingBoundingBox()); |
67 // WebCore reuses the PopupMenu of an element. | 67 // WebCore reuses the PopupMenu of an element. |
68 // For simplicity, we do recreate the actual external popup everytime. | 68 // For simplicity, we do recreate the actual external popup everytime. |
69 if (m_webExternalPopupMenu) { | 69 if (m_webExternalPopupMenu) { |
70 m_webExternalPopupMenu->close(); | 70 m_webExternalPopupMenu->close(); |
71 m_webExternalPopupMenu = 0; | 71 m_webExternalPopupMenu = 0; |
72 } | 72 } |
73 | 73 |
74 WebPopupMenuInfo info; | 74 WebPopupMenuInfo info; |
75 getPopupMenuInfo(&info); | 75 getPopupMenuInfo(&info, m_popupMenuClient); |
76 if (info.items.isEmpty()) | 76 if (info.items.isEmpty()) |
77 return; | 77 return; |
78 m_webExternalPopupMenu = m_webView.client()->createExternalPopupMenu(info, t
his); | 78 m_webExternalPopupMenu = m_webView.client()->createExternalPopupMenu(info, t
his); |
79 if (m_webExternalPopupMenu) { | 79 if (m_webExternalPopupMenu) { |
80 m_webExternalPopupMenu->show(m_frameView->contentsToWindow(rect)); | 80 m_webExternalPopupMenu->show(m_frameView->contentsToWindow(rect)); |
81 #if OS(MACOSX) | 81 #if OS(MACOSX) |
82 const WebInputEvent* currentEvent = WebViewImpl::currentInputEvent(); | 82 const WebInputEvent* currentEvent = WebViewImpl::currentInputEvent(); |
83 if (currentEvent && currentEvent->type == WebInputEvent::MouseDown) { | 83 if (currentEvent && currentEvent->type == WebInputEvent::MouseDown) { |
84 m_syntheticEvent = adoptPtr(new WebMouseEvent); | 84 m_syntheticEvent = adoptPtr(new WebMouseEvent); |
85 *m_syntheticEvent = *static_cast<const WebMouseEvent*>(currentEvent)
; | 85 *m_syntheticEvent = *static_cast<const WebMouseEvent*>(currentEvent)
; |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
119 | 119 |
120 void ExternalPopupMenu::disconnectClient() | 120 void ExternalPopupMenu::disconnectClient() |
121 { | 121 { |
122 hide(); | 122 hide(); |
123 m_popupMenuClient = 0; | 123 m_popupMenuClient = 0; |
124 } | 124 } |
125 | 125 |
126 void ExternalPopupMenu::didChangeSelection(int index) | 126 void ExternalPopupMenu::didChangeSelection(int index) |
127 { | 127 { |
128 if (m_popupMenuClient) | 128 if (m_popupMenuClient) |
129 m_popupMenuClient->selectionChanged(toPopupMenuItemIndex(index)); | 129 m_popupMenuClient->selectionChanged(toPopupMenuItemIndex(index, m_popupM
enuClient)); |
130 } | 130 } |
131 | 131 |
132 void ExternalPopupMenu::didAcceptIndex(int index) | 132 void ExternalPopupMenu::didAcceptIndex(int index) |
133 { | 133 { |
134 // Calling methods on the PopupMenuClient might lead to this object being | 134 // 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 | 135 // derefed. This ensures it does not get deleted while we are running this |
136 // method. | 136 // method. |
137 int popupMenuItemIndex = toPopupMenuItemIndex(index); | 137 int popupMenuItemIndex = toPopupMenuItemIndex(index, m_popupMenuClient); |
138 RefPtr<ExternalPopupMenu> guard(this); | 138 RefPtr<ExternalPopupMenu> guard(this); |
139 | 139 |
140 if (m_popupMenuClient) { | 140 if (m_popupMenuClient) { |
141 m_popupMenuClient->popupDidHide(); | 141 m_popupMenuClient->popupDidHide(); |
142 m_popupMenuClient->valueChanged(popupMenuItemIndex); | 142 m_popupMenuClient->valueChanged(popupMenuItemIndex); |
143 } | 143 } |
144 m_webExternalPopupMenu = 0; | 144 m_webExternalPopupMenu = 0; |
145 } | 145 } |
146 | 146 |
147 void ExternalPopupMenu::didAcceptIndices(const WebVector<int>& indices) | 147 void ExternalPopupMenu::didAcceptIndices(const WebVector<int>& indices) |
148 { | 148 { |
149 if (!m_popupMenuClient) { | 149 if (!m_popupMenuClient) { |
150 m_webExternalPopupMenu = 0; | 150 m_webExternalPopupMenu = 0; |
151 return; | 151 return; |
152 } | 152 } |
153 | 153 |
154 // Calling methods on the PopupMenuClient might lead to this object being | 154 // Calling methods on the PopupMenuClient might lead to this object being |
155 // derefed. This ensures it does not get deleted while we are running this | 155 // derefed. This ensures it does not get deleted while we are running this |
156 // method. | 156 // method. |
157 RefPtr<ExternalPopupMenu> protect(this); | 157 RefPtr<ExternalPopupMenu> protect(this); |
158 | 158 |
159 if (!indices.size()) | 159 if (!indices.size()) |
160 m_popupMenuClient->valueChanged(static_cast<unsigned>(-1), true); | 160 m_popupMenuClient->valueChanged(static_cast<unsigned>(-1), true); |
161 else { | 161 else { |
162 for (size_t i = 0; i < indices.size(); ++i) | 162 for (size_t i = 0; i < indices.size(); ++i) |
163 m_popupMenuClient->listBoxSelectItem(toPopupMenuItemIndex(indices[i]
), (i > 0), false, (i == indices.size() - 1)); | 163 m_popupMenuClient->listBoxSelectItem(toPopupMenuItemIndex(indices[i]
, m_popupMenuClient), (i > 0), false, (i == indices.size() - 1)); |
164 } | 164 } |
165 | 165 |
166 // The call to valueChanged above might have lead to a call to | 166 // The call to valueChanged above might have lead to a call to |
167 // disconnectClient, so we might not have a PopupMenuClient anymore. | 167 // disconnectClient, so we might not have a PopupMenuClient anymore. |
168 if (m_popupMenuClient) | 168 if (m_popupMenuClient) |
169 m_popupMenuClient->popupDidHide(); | 169 m_popupMenuClient->popupDidHide(); |
170 | 170 |
171 m_webExternalPopupMenu = 0; | 171 m_webExternalPopupMenu = 0; |
172 } | 172 } |
173 | 173 |
174 void ExternalPopupMenu::didCancel() | 174 void ExternalPopupMenu::didCancel() |
175 { | 175 { |
176 // See comment in didAcceptIndex on why we need this. | 176 // See comment in didAcceptIndex on why we need this. |
177 RefPtr<ExternalPopupMenu> guard(this); | 177 RefPtr<ExternalPopupMenu> guard(this); |
178 | 178 |
179 if (m_popupMenuClient) | 179 if (m_popupMenuClient) |
180 m_popupMenuClient->popupDidHide(); | 180 m_popupMenuClient->popupDidHide(); |
181 m_webExternalPopupMenu = 0; | 181 m_webExternalPopupMenu = 0; |
182 } | 182 } |
183 | 183 |
184 void ExternalPopupMenu::getPopupMenuInfo(WebPopupMenuInfo* info) | 184 void ExternalPopupMenu::getPopupMenuInfo(WebPopupMenuInfo* info, PopupMenuClient
* popupMenuClient) |
185 { | 185 { |
186 int itemCount = m_popupMenuClient->listSize(); | 186 ASSERT(popupMenuClient); |
| 187 int itemCount = popupMenuClient->listSize(); |
187 int count = 0; | 188 int count = 0; |
188 Vector<WebMenuItemInfo> items(static_cast<size_t>(itemCount)); | 189 Vector<WebMenuItemInfo> items(static_cast<size_t>(itemCount)); |
189 for (int i = 0; i < itemCount; ++i) { | 190 for (int i = 0; i < itemCount; ++i) { |
190 PopupMenuStyle style = m_popupMenuClient->itemStyle(i); | 191 PopupMenuStyle style = popupMenuClient->itemStyle(i); |
191 if (style.isDisplayNone()) | 192 if (style.isDisplayNone()) |
192 continue; | 193 continue; |
193 | 194 |
194 WebMenuItemInfo& popupItem = items[count++]; | 195 WebMenuItemInfo& popupItem = items[count++]; |
195 popupItem.label = m_popupMenuClient->itemText(i); | 196 popupItem.label = popupMenuClient->itemText(i); |
196 popupItem.toolTip = m_popupMenuClient->itemToolTip(i); | 197 popupItem.toolTip = popupMenuClient->itemToolTip(i); |
197 if (m_popupMenuClient->itemIsSeparator(i)) | 198 if (popupMenuClient->itemIsSeparator(i)) |
198 popupItem.type = WebMenuItemInfo::Separator; | 199 popupItem.type = WebMenuItemInfo::Separator; |
199 else if (m_popupMenuClient->itemIsLabel(i)) | 200 else if (popupMenuClient->itemIsLabel(i)) |
200 popupItem.type = WebMenuItemInfo::Group; | 201 popupItem.type = WebMenuItemInfo::Group; |
201 else | 202 else |
202 popupItem.type = WebMenuItemInfo::Option; | 203 popupItem.type = WebMenuItemInfo::Option; |
203 popupItem.enabled = m_popupMenuClient->itemIsEnabled(i); | 204 popupItem.enabled = popupMenuClient->itemIsEnabled(i); |
204 popupItem.checked = m_popupMenuClient->itemIsSelected(i); | 205 popupItem.checked = popupMenuClient->itemIsSelected(i); |
205 if (style.textDirection() == blink::RTL) | 206 if (style.textDirection() == blink::RTL) |
206 popupItem.textDirection = WebTextDirectionRightToLeft; | 207 popupItem.textDirection = WebTextDirectionRightToLeft; |
207 else | 208 else |
208 popupItem.textDirection = WebTextDirectionLeftToRight; | 209 popupItem.textDirection = WebTextDirectionLeftToRight; |
209 popupItem.hasTextDirectionOverride = style.hasTextDirectionOverride(); | 210 popupItem.hasTextDirectionOverride = style.hasTextDirectionOverride(); |
210 } | 211 } |
211 | 212 |
212 info->itemHeight = m_popupMenuClient->menuStyle().font().fontMetrics().heigh
t(); | 213 info->itemHeight = popupMenuClient->menuStyle().font().fontMetrics().height(
); |
213 info->itemFontSize = static_cast<int>(m_popupMenuClient->menuStyle().font().
fontDescription().computedSize()); | 214 info->itemFontSize = static_cast<int>(popupMenuClient->menuStyle().font().fo
ntDescription().computedSize()); |
214 info->selectedIndex = toExternalPopupMenuItemIndex(m_popupMenuClient->select
edIndex()); | 215 info->selectedIndex = toExternalPopupMenuItemIndex(popupMenuClient->selected
Index(), popupMenuClient); |
215 info->rightAligned = m_popupMenuClient->menuStyle().textDirection() == blink
::RTL; | 216 info->rightAligned = popupMenuClient->menuStyle().textDirection() == blink::
RTL; |
216 info->allowMultipleSelection = m_popupMenuClient->multiple(); | 217 info->allowMultipleSelection = popupMenuClient->multiple(); |
| 218 if (count < itemCount) |
| 219 items.shrink(count); |
217 info->items = items; | 220 info->items = items; |
218 } | 221 } |
219 | 222 |
220 int ExternalPopupMenu::toPopupMenuItemIndex(int externalPopupMenuItemIndex) | 223 int ExternalPopupMenu::toPopupMenuItemIndex(int externalPopupMenuItemIndex, Popu
pMenuClient* popupMenuClient) |
221 { | 224 { |
222 ASSERT(m_popupMenuClient); | 225 ASSERT(popupMenuClient); |
223 if (externalPopupMenuItemIndex < 0) | 226 if (externalPopupMenuItemIndex < 0) |
224 return externalPopupMenuItemIndex; | 227 return externalPopupMenuItemIndex; |
225 | 228 |
226 int itemCount = m_popupMenuClient->listSize(); | 229 int itemCount = popupMenuClient->listSize(); |
227 int indexTracker = 0; | 230 int indexTracker = 0; |
228 for (int i = 0; i < itemCount ; ++i) { | 231 for (int i = 0; i < itemCount ; ++i) { |
229 if (m_popupMenuClient->itemStyle(i).isDisplayNone()) | 232 if (popupMenuClient->itemStyle(i).isDisplayNone()) |
230 continue; | 233 continue; |
231 if (indexTracker++ == externalPopupMenuItemIndex) | 234 if (indexTracker++ == externalPopupMenuItemIndex) |
232 return i; | 235 return i; |
233 } | 236 } |
234 return -1; | 237 return -1; |
235 } | 238 } |
236 | 239 |
237 int ExternalPopupMenu::toExternalPopupMenuItemIndex(int popupMenuItemIndex) | 240 int ExternalPopupMenu::toExternalPopupMenuItemIndex(int popupMenuItemIndex, Popu
pMenuClient* popupMenuClient) |
238 { | 241 { |
239 ASSERT(m_popupMenuClient); | 242 ASSERT(popupMenuClient); |
240 if (popupMenuItemIndex < 0) | 243 if (popupMenuItemIndex < 0) |
241 return popupMenuItemIndex; | 244 return popupMenuItemIndex; |
242 | 245 |
243 int itemCount = m_popupMenuClient->listSize(); | 246 int itemCount = popupMenuClient->listSize(); |
244 int indexTracker = 0; | 247 int indexTracker = 0; |
245 for (int i = 0; i < itemCount; ++i) { | 248 for (int i = 0; i < itemCount; ++i) { |
246 if (m_popupMenuClient->itemStyle(i).isDisplayNone()) | 249 if (popupMenuClient->itemStyle(i).isDisplayNone()) |
247 continue; | 250 continue; |
248 if (popupMenuItemIndex == i) | 251 if (popupMenuItemIndex == i) |
249 return indexTracker; | 252 return indexTracker; |
250 ++indexTracker; | 253 ++indexTracker; |
251 } | 254 } |
252 return -1; | 255 return -1; |
253 } | 256 } |
254 | 257 |
255 } | 258 } |
OLD | NEW |