| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). | 2 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
| 3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 3 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 4 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 4 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 5 * (C) 2001 Dirk Mueller (mueller@kde.org) | 5 * (C) 2001 Dirk Mueller (mueller@kde.org) |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2011 Apple Inc. All rights |
| 7 * reserved. | 7 * reserved. |
| 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) | 8 * (C) 2006 Alexey Proskuryakov (ap@nypop.com) |
| 9 * Copyright (C) 2010 Google Inc. All rights reserved. | 9 * Copyright (C) 2010 Google Inc. All rights reserved. |
| 10 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. | 10 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. |
| (...skipping 1268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1279 if (!m_activeSelectionState) | 1279 if (!m_activeSelectionState) |
| 1280 return; | 1280 return; |
| 1281 } | 1281 } |
| 1282 | 1282 |
| 1283 // The key handling below shouldn't be used for non spatial navigation | 1283 // The key handling below shouldn't be used for non spatial navigation |
| 1284 // mode Mac | 1284 // mode Mac |
| 1285 if (LayoutTheme::theme().popsMenuByArrowKeys() && | 1285 if (LayoutTheme::theme().popsMenuByArrowKeys() && |
| 1286 !isSpatialNavigationEnabled(document().frame())) | 1286 !isSpatialNavigationEnabled(document().frame())) |
| 1287 return; | 1287 return; |
| 1288 | 1288 |
| 1289 int ignoreModifiers = PlatformEvent::ShiftKey | PlatformEvent::CtrlKey | | 1289 int ignoreModifiers = WebInputEvent::ShiftKey | WebInputEvent::ControlKey | |
| 1290 PlatformEvent::AltKey | PlatformEvent::MetaKey; | 1290 WebInputEvent::AltKey | WebInputEvent::MetaKey; |
| 1291 if (keyEvent->modifiers() & ignoreModifiers) | 1291 if (keyEvent->modifiers() & ignoreModifiers) |
| 1292 return; | 1292 return; |
| 1293 | 1293 |
| 1294 const String& key = keyEvent->key(); | 1294 const String& key = keyEvent->key(); |
| 1295 bool handled = true; | 1295 bool handled = true; |
| 1296 const ListItems& listItems = this->listItems(); | 1296 const ListItems& listItems = this->listItems(); |
| 1297 HTMLOptionElement* option = selectedOption(); | 1297 HTMLOptionElement* option = selectedOption(); |
| 1298 int listIndex = option ? option->listIndex() : -1; | 1298 int listIndex = option ? option->listIndex() : -1; |
| 1299 | 1299 |
| 1300 if (key == "ArrowDown" || key == "ArrowRight") | 1300 if (key == "ArrowDown" || key == "ArrowRight") |
| (...skipping 740 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2041 m_popupUpdater = nullptr; | 2041 m_popupUpdater = nullptr; |
| 2042 } | 2042 } |
| 2043 | 2043 |
| 2044 void HTMLSelectElement::didMutateSubtree() { | 2044 void HTMLSelectElement::didMutateSubtree() { |
| 2045 DCHECK(popupIsVisible()); | 2045 DCHECK(popupIsVisible()); |
| 2046 DCHECK(m_popup); | 2046 DCHECK(m_popup); |
| 2047 m_popup->updateFromElement(PopupMenu::ByDOMChange); | 2047 m_popup->updateFromElement(PopupMenu::ByDOMChange); |
| 2048 } | 2048 } |
| 2049 | 2049 |
| 2050 } // namespace blink | 2050 } // namespace blink |
| OLD | NEW |