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

Side by Side Diff: Source/core/html/HTMLSelectElementWin.cpp

Issue 14519003: Absolutify paths to dom/. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix testrunner Created 7 years, 8 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
« no previous file with comments | « Source/core/html/HTMLSelectElement.cpp ('k') | Source/core/html/HTMLSourceElement.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 10 matching lines...) Expand all
21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 21 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF 22 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
23 * THE POSSIBILITY OF SUCH DAMAGE. 23 * THE POSSIBILITY OF SUCH DAMAGE.
24 */ 24 */
25 25
26 #include "config.h" 26 #include "config.h"
27 #include "HTMLSelectElement.h" 27 #include "HTMLSelectElement.h"
28 28
29 #if OS(WINDOWS) 29 #if OS(WINDOWS)
30 30
31 #include "Element.h" 31 #include "core/dom/Element.h"
32 #include "KeyboardEvent.h" 32 #include "core/dom/KeyboardEvent.h"
33 #include "core/rendering/RenderMenuList.h" 33 #include "core/rendering/RenderMenuList.h"
34 34
35 namespace WebCore { 35 namespace WebCore {
36 36
37 bool HTMLSelectElement::platformHandleKeydownEvent(KeyboardEvent* event) 37 bool HTMLSelectElement::platformHandleKeydownEvent(KeyboardEvent* event)
38 { 38 {
39 // Allow (Shift) F4 and (Ctrl/Shift) Alt/AltGr + Up/Down arrow to pop the me nu, matching Firefox. 39 // Allow (Shift) F4 and (Ctrl/Shift) Alt/AltGr + Up/Down arrow to pop the me nu, matching Firefox.
40 bool eventShowsMenu = (!event->altKey() && !event->ctrlKey() && event->keyId entifier() == "F4") 40 bool eventShowsMenu = (!event->altKey() && !event->ctrlKey() && event->keyId entifier() == "F4")
41 || ((event->altGraphKey() || event->altKey()) && (event->keyIdentifier() == "Down" || event->keyIdentifier() == "Up")); 41 || ((event->altGraphKey() || event->altKey()) && (event->keyIdentifier() == "Down" || event->keyIdentifier() == "Up"));
42 if (!eventShowsMenu) 42 if (!eventShowsMenu)
43 return false; 43 return false;
44 44
45 // Save the selection so it can be compared to the new selection when dispat ching change events during setSelectedIndex, 45 // Save the selection so it can be compared to the new selection when dispat ching change events during setSelectedIndex,
46 // which gets called from RenderMenuList::valueChanged, which gets called af ter the user makes a selection from the menu. 46 // which gets called from RenderMenuList::valueChanged, which gets called af ter the user makes a selection from the menu.
47 saveLastSelection(); 47 saveLastSelection();
48 if (RenderMenuList* menuList = toRenderMenuList(renderer())) 48 if (RenderMenuList* menuList = toRenderMenuList(renderer()))
49 menuList->showPopup(); 49 menuList->showPopup();
50 50
51 int index = selectedIndex(); 51 int index = selectedIndex();
52 ASSERT(index >= 0); 52 ASSERT(index >= 0);
53 ASSERT_WITH_SECURITY_IMPLICATION(index < static_cast<int>(listItems().size() )); 53 ASSERT_WITH_SECURITY_IMPLICATION(index < static_cast<int>(listItems().size() ));
54 setSelectedIndex(index); 54 setSelectedIndex(index);
55 event->setDefaultHandled(); 55 event->setDefaultHandled();
56 return true; 56 return true;
57 } 57 }
58 58
59 } 59 }
60 60
61 #endif 61 #endif
OLDNEW
« no previous file with comments | « Source/core/html/HTMLSelectElement.cpp ('k') | Source/core/html/HTMLSourceElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698