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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 { | 64 { |
65 IntRect rect(controlPosition.enclosingBoundingBox()); | 65 IntRect rect(controlPosition.enclosingBoundingBox()); |
66 // WebCore reuses the PopupMenu of an element. | 66 // WebCore reuses the PopupMenu of an element. |
67 // For simplicity, we do recreate the actual external popup everytime. | 67 // For simplicity, we do recreate the actual external popup everytime. |
68 if (m_webExternalPopupMenu) { | 68 if (m_webExternalPopupMenu) { |
69 m_webExternalPopupMenu->close(); | 69 m_webExternalPopupMenu->close(); |
70 m_webExternalPopupMenu = 0; | 70 m_webExternalPopupMenu = 0; |
71 } | 71 } |
72 | 72 |
73 WebPopupMenuInfo info; | 73 WebPopupMenuInfo info; |
74 getPopupMenuInfo(&info); | 74 getPopupMenuInfo(info, *m_popupMenuClient); |
75 if (info.items.isEmpty()) | 75 if (info.items.isEmpty()) |
76 return; | 76 return; |
77 WebLocalFrameImpl* webframe = WebLocalFrameImpl::fromFrame(m_localFrame.get(
)); | 77 WebLocalFrameImpl* webframe = WebLocalFrameImpl::fromFrame(m_localFrame.get(
)); |
78 m_webExternalPopupMenu = webframe->client()->createExternalPopupMenu(info, t
his); | 78 m_webExternalPopupMenu = webframe->client()->createExternalPopupMenu(info, t
his); |
79 if (m_webExternalPopupMenu) { | 79 if (m_webExternalPopupMenu) { |
80 m_webExternalPopupMenu->show(m_localFrame->view()->contentsToWindow(rect
)); | 80 m_webExternalPopupMenu->show(m_localFrame->view()->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); |
(...skipping 34 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_popup
MenuClient)); |
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 int itemCount = popupMenuClient.listSize(); |
187 int count = 0; | 187 int count = 0; |
188 Vector<WebMenuItemInfo> items(static_cast<size_t>(itemCount)); | 188 Vector<WebMenuItemInfo> items(static_cast<size_t>(itemCount)); |
189 for (int i = 0; i < itemCount; ++i) { | 189 for (int i = 0; i < itemCount; ++i) { |
190 PopupMenuStyle style = m_popupMenuClient->itemStyle(i); | 190 PopupMenuStyle style = popupMenuClient.itemStyle(i); |
191 if (style.isDisplayNone()) | 191 if (style.isDisplayNone()) |
192 continue; | 192 continue; |
193 | 193 |
194 WebMenuItemInfo& popupItem = items[count++]; | 194 WebMenuItemInfo& popupItem = items[count++]; |
195 popupItem.label = m_popupMenuClient->itemText(i); | 195 popupItem.label = popupMenuClient.itemText(i); |
196 popupItem.toolTip = m_popupMenuClient->itemToolTip(i); | 196 popupItem.toolTip = popupMenuClient.itemToolTip(i); |
197 if (m_popupMenuClient->itemIsSeparator(i)) | 197 if (popupMenuClient.itemIsSeparator(i)) |
198 popupItem.type = WebMenuItemInfo::Separator; | 198 popupItem.type = WebMenuItemInfo::Separator; |
199 else if (m_popupMenuClient->itemIsLabel(i)) | 199 else if (popupMenuClient.itemIsLabel(i)) |
200 popupItem.type = WebMenuItemInfo::Group; | 200 popupItem.type = WebMenuItemInfo::Group; |
201 else | 201 else |
202 popupItem.type = WebMenuItemInfo::Option; | 202 popupItem.type = WebMenuItemInfo::Option; |
203 popupItem.enabled = m_popupMenuClient->itemIsEnabled(i); | 203 popupItem.enabled = popupMenuClient.itemIsEnabled(i); |
204 popupItem.checked = m_popupMenuClient->itemIsSelected(i); | 204 popupItem.checked = popupMenuClient.itemIsSelected(i); |
205 popupItem.textDirection = toWebTextDirection(style.textDirection()); | 205 popupItem.textDirection = toWebTextDirection(style.textDirection()); |
206 popupItem.hasTextDirectionOverride = style.hasTextDirectionOverride(); | 206 popupItem.hasTextDirectionOverride = style.hasTextDirectionOverride(); |
207 } | 207 } |
208 | 208 |
209 info->itemHeight = m_popupMenuClient->menuStyle().font().fontMetrics().heigh
t(); | 209 info.itemHeight = popupMenuClient.menuStyle().font().fontMetrics().height(); |
210 info->itemFontSize = static_cast<int>(m_popupMenuClient->menuStyle().font().
fontDescription().computedSize()); | 210 info.itemFontSize = static_cast<int>(popupMenuClient.menuStyle().font().font
Description().computedSize()); |
211 info->selectedIndex = toExternalPopupMenuItemIndex(m_popupMenuClient->select
edIndex()); | 211 info.selectedIndex = toExternalPopupMenuItemIndex(popupMenuClient.selectedIn
dex(), popupMenuClient); |
212 info->rightAligned = m_popupMenuClient->menuStyle().textDirection() == RTL; | 212 info.rightAligned = popupMenuClient.menuStyle().textDirection() == RTL; |
213 info->allowMultipleSelection = m_popupMenuClient->multiple(); | 213 info.allowMultipleSelection = popupMenuClient.multiple(); |
214 info->items = items; | 214 if (count < itemCount) |
| 215 items.shrink(count); |
| 216 info.items = items; |
| 217 |
215 } | 218 } |
216 | 219 |
217 int ExternalPopupMenu::toPopupMenuItemIndex(int externalPopupMenuItemIndex) | 220 int ExternalPopupMenu::toPopupMenuItemIndex(int externalPopupMenuItemIndex, Popu
pMenuClient& popupMenuClient) |
218 { | 221 { |
219 ASSERT(m_popupMenuClient); | |
220 if (externalPopupMenuItemIndex < 0) | 222 if (externalPopupMenuItemIndex < 0) |
221 return externalPopupMenuItemIndex; | 223 return externalPopupMenuItemIndex; |
222 | 224 |
223 int itemCount = m_popupMenuClient->listSize(); | 225 int itemCount = popupMenuClient.listSize(); |
224 int indexTracker = 0; | 226 int indexTracker = 0; |
225 for (int i = 0; i < itemCount ; ++i) { | 227 for (int i = 0; i < itemCount ; ++i) { |
226 if (m_popupMenuClient->itemStyle(i).isDisplayNone()) | 228 if (popupMenuClient.itemStyle(i).isDisplayNone()) |
227 continue; | 229 continue; |
228 if (indexTracker++ == externalPopupMenuItemIndex) | 230 if (indexTracker++ == externalPopupMenuItemIndex) |
229 return i; | 231 return i; |
230 } | 232 } |
231 return -1; | 233 return -1; |
232 } | 234 } |
233 | 235 |
234 int ExternalPopupMenu::toExternalPopupMenuItemIndex(int popupMenuItemIndex) | 236 int ExternalPopupMenu::toExternalPopupMenuItemIndex(int popupMenuItemIndex, Popu
pMenuClient& popupMenuClient) |
235 { | 237 { |
236 ASSERT(m_popupMenuClient); | |
237 if (popupMenuItemIndex < 0) | 238 if (popupMenuItemIndex < 0) |
238 return popupMenuItemIndex; | 239 return popupMenuItemIndex; |
239 | 240 |
240 int itemCount = m_popupMenuClient->listSize(); | 241 int itemCount = popupMenuClient.listSize(); |
241 int indexTracker = 0; | 242 int indexTracker = 0; |
242 for (int i = 0; i < itemCount; ++i) { | 243 for (int i = 0; i < itemCount; ++i) { |
243 if (m_popupMenuClient->itemStyle(i).isDisplayNone()) | 244 if (popupMenuClient.itemStyle(i).isDisplayNone()) |
244 continue; | 245 continue; |
245 if (popupMenuItemIndex == i) | 246 if (popupMenuItemIndex == i) |
246 return indexTracker; | 247 return indexTracker; |
247 ++indexTracker; | 248 ++indexTracker; |
248 } | 249 } |
249 return -1; | 250 return -1; |
250 } | 251 } |
251 | 252 |
252 } // namespace blink | 253 } // namespace blink |
OLD | NEW |