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

Side by Side Diff: third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp

Issue 2012823003: Move IME related functions from WebFrame to WebLocalFrame (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sync Created 4 years, 6 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2014 Google Inc. All rights reserved. 2 * Copyright (C) 2014 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 891 matching lines...) Expand 10 before | Expand all | Expand 10 after
902 if (event.windowsKeyCode == VKEY_SPACE) { 902 if (event.windowsKeyCode == VKEY_SPACE) {
903 int keyCode = ((event.modifiers & WebInputEvent::ShiftKey) ? VKEY_PR IOR : VKEY_NEXT); 903 int keyCode = ((event.modifiers & WebInputEvent::ShiftKey) ? VKEY_PR IOR : VKEY_NEXT);
904 return scrollViewWithKeyboard(keyCode, event.modifiers); 904 return scrollViewWithKeyboard(keyCode, event.modifiers);
905 } 905 }
906 break; 906 break;
907 case WebInputEvent::RawKeyDown: 907 case WebInputEvent::RawKeyDown:
908 if (event.modifiers == WebInputEvent::ControlKey) { 908 if (event.modifiers == WebInputEvent::ControlKey) {
909 switch (event.windowsKeyCode) { 909 switch (event.windowsKeyCode) {
910 #if !OS(MACOSX) 910 #if !OS(MACOSX)
911 case 'A': 911 case 'A':
912 WebFrame::fromFrame(focusedCoreFrame())->executeCommand(WebStrin g::fromUTF8("SelectAll")); 912 WebFrame::fromFrame(focusedCoreFrame())->toWebLocalFrame()->exec uteCommand(WebString::fromUTF8("SelectAll"));
913 return WebInputEventResult::HandledSystem; 913 return WebInputEventResult::HandledSystem;
914 case VKEY_INSERT: 914 case VKEY_INSERT:
915 case 'C': 915 case 'C':
916 WebFrame::fromFrame(focusedCoreFrame())->executeCommand(WebStrin g::fromUTF8("Copy")); 916 WebFrame::fromFrame(focusedCoreFrame())->toWebLocalFrame()->exec uteCommand(WebString::fromUTF8("Copy"));
917 return WebInputEventResult::HandledSystem; 917 return WebInputEventResult::HandledSystem;
918 #endif 918 #endif
919 // Match FF behavior in the sense that Ctrl+home/end are the only Ct rl 919 // Match FF behavior in the sense that Ctrl+home/end are the only Ct rl
920 // key combinations which affect scrolling. Safari is buggy in the 920 // key combinations which affect scrolling. Safari is buggy in the
921 // sense that it scrolls the page for all Ctrl+scrolling key 921 // sense that it scrolls the page for all Ctrl+scrolling key
922 // combinations. For e.g. Ctrl+pgup/pgdn/up/down, etc. 922 // combinations. For e.g. Ctrl+pgup/pgdn/up/down, etc.
923 case VKEY_HOME: 923 case VKEY_HOME:
924 case VKEY_END: 924 case VKEY_END:
925 break; 925 break;
926 default: 926 default:
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
1127 1127
1128 HitTestResult WebFrameWidgetImpl::hitTestResultForRootFramePos(const IntPoint& p osInRootFrame) 1128 HitTestResult WebFrameWidgetImpl::hitTestResultForRootFramePos(const IntPoint& p osInRootFrame)
1129 { 1129 {
1130 IntPoint docPoint(m_localRoot->frame()->view()->rootFrameToContents(posInRoo tFrame)); 1130 IntPoint docPoint(m_localRoot->frame()->view()->rootFrameToContents(posInRoo tFrame));
1131 HitTestResult result = m_localRoot->frame()->eventHandler().hitTestResultAtP oint(docPoint, HitTestRequest::ReadOnly | HitTestRequest::Active); 1131 HitTestResult result = m_localRoot->frame()->eventHandler().hitTestResultAtP oint(docPoint, HitTestRequest::ReadOnly | HitTestRequest::Active);
1132 result.setToShadowHostIfInUserAgentShadowRoot(); 1132 result.setToShadowHostIfInUserAgentShadowRoot();
1133 return result; 1133 return result;
1134 } 1134 }
1135 1135
1136 } // namespace blink 1136 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698