| OLD | NEW |
| 1 // Copyright (c) 2007-2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2007-2009 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "config.h" | 5 #include "config.h" |
| 6 #include "build/build_config.h" | 6 #include "build/build_config.h" |
| 7 | 7 |
| 8 #include "base/compiler_specific.h" | 8 #include "base/compiler_specific.h" |
| 9 MSVC_PUSH_WARNING_LEVEL(0); | 9 MSVC_PUSH_WARNING_LEVEL(0); |
| 10 #include "CSSStyleSelector.h" | 10 #include "CSSStyleSelector.h" |
| (...skipping 589 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 600 if (((event.modifiers == 0) && (event.windowsKeyCode == VKEY_APPS)) || | 600 if (((event.modifiers == 0) && (event.windowsKeyCode == VKEY_APPS)) || |
| 601 ((event.modifiers == WebInputEvent::ShiftKey) && | 601 ((event.modifiers == WebInputEvent::ShiftKey) && |
| 602 (event.windowsKeyCode == VKEY_F10))) { | 602 (event.windowsKeyCode == VKEY_F10))) { |
| 603 SendContextMenuEvent(event); | 603 SendContextMenuEvent(event); |
| 604 return true; | 604 return true; |
| 605 } | 605 } |
| 606 #endif | 606 #endif |
| 607 | 607 |
| 608 // It's not clear if we should continue after detecting a capslock keypress. | 608 // It's not clear if we should continue after detecting a capslock keypress. |
| 609 // I'll err on the side of continuing, which is the pre-existing behaviour. | 609 // I'll err on the side of continuing, which is the pre-existing behaviour. |
| 610 if (event.windowsKeyCode == base::VKEY_CAPITAL && | 610 if (event.windowsKeyCode == base::VKEY_CAPITAL) |
| 611 (event.type == WebInputEvent::KeyUp || | |
| 612 event.type == WebInputEvent::KeyDown)) { | |
| 613 handler->capsLockStateMayHaveChanged(); | 611 handler->capsLockStateMayHaveChanged(); |
| 614 } | |
| 615 | 612 |
| 616 MakePlatformKeyboardEvent evt(event); | 613 MakePlatformKeyboardEvent evt(event); |
| 617 | 614 |
| 618 if (WebInputEvent::RawKeyDown == event.type) { | 615 if (WebInputEvent::RawKeyDown == event.type) { |
| 619 if (handler->keyEvent(evt) && !evt.isSystemKey()) { | 616 if (handler->keyEvent(evt) && !evt.isSystemKey()) { |
| 620 suppress_next_keypress_event_ = true; | 617 suppress_next_keypress_event_ = true; |
| 621 return true; | 618 return true; |
| 622 } | 619 } |
| 623 } else { | 620 } else { |
| 624 if (handler->keyEvent(evt)) { | 621 if (handler->keyEvent(evt)) { |
| (...skipping 1325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1950 | 1947 |
| 1951 return document->focusedNode(); | 1948 return document->focusedNode(); |
| 1952 } | 1949 } |
| 1953 | 1950 |
| 1954 HitTestResult WebViewImpl::HitTestResultForWindowPos(const IntPoint& pos) { | 1951 HitTestResult WebViewImpl::HitTestResultForWindowPos(const IntPoint& pos) { |
| 1955 IntPoint doc_point( | 1952 IntPoint doc_point( |
| 1956 page_->mainFrame()->view()->windowToContents(pos)); | 1953 page_->mainFrame()->view()->windowToContents(pos)); |
| 1957 return page_->mainFrame()->eventHandler()-> | 1954 return page_->mainFrame()->eventHandler()-> |
| 1958 hitTestResultAtPoint(doc_point, false); | 1955 hitTestResultAtPoint(doc_point, false); |
| 1959 } | 1956 } |
| OLD | NEW |