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

Unified Diff: chrome/browser/ui/input_method/input_method_engine.cc

Issue 2077783002: Make limitations for input.ime.sendKeyEvents API. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed Devlin's comments. 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/input_method/input_method_engine.cc
diff --git a/chrome/browser/ui/input_method/input_method_engine.cc b/chrome/browser/ui/input_method/input_method_engine.cc
index 81a8f4cac492fad5ae3dff8a4eca70e5d67a154e..934cb64c193c5de0a6fc3d2b071f5d1cc53ea175 100644
--- a/chrome/browser/ui/input_method/input_method_engine.cc
+++ b/chrome/browser/ui/input_method/input_method_engine.cc
@@ -4,7 +4,16 @@
#include "chrome/browser/ui/input_method/input_method_engine.h"
+#include "chrome/browser/ui/browser_finder.h"
+#include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/common/url_constants.h"
+#include "content/public/browser/navigation_entry.h"
#include "content/public/browser/render_frame_host.h"
+#include "content/public/common/url_constants.h"
+#include "extensions/common/constants.h"
+#include "ui/aura/window.h"
+#include "ui/aura/window_tree_host.h"
#include "ui/base/ime/composition_text.h"
#include "ui/base/ime/ime_bridge.h"
#include "ui/base/ime/ime_input_context_handler_interface.h"
@@ -185,6 +194,11 @@ ui::ImeWindow* InputMethodEngine::FindWindowById(int window_id) const {
bool InputMethodEngine::SendKeyEvent(ui::KeyEvent* event,
const std::string& code) {
DCHECK(event);
+
+ // input.ime.sendKeyEvents API is only allowed to work on text fields.
+ if (current_input_type_ == ui::TEXT_INPUT_TYPE_NONE)
+ return false;
+
if (event->key_code() == ui::VKEY_UNKNOWN)
event->set_key_code(ui::DomCodeToUsLayoutKeyboardCode(event->code()));
@@ -192,9 +206,70 @@ bool InputMethodEngine::SendKeyEvent(ui::KeyEvent* event,
ui::IMEBridge::Get()->GetInputContextHandler();
if (!input_context)
return false;
+
+ Browser* browser = chrome::FindLastActive();
+ DCHECK(browser);
+ content::WebContents* web_contents =
+ browser->tab_strip_model()->GetActiveWebContents();
+ ui::InputMethod* input_method =
+ browser->window()->GetNativeWindow()->GetHost()->GetInputMethod();
+ // If |input_context->GetInputMethod() != input_method|, treats |url| as
+ // special page no mater what it is.
+ if (web_contents &&
+ !IsValidKeyForSpecialPage(web_contents->GetLastCommittedURL(),
+ input_context->GetInputMethod() == input_method,
+ event))
+ return false;
+
input_context->SendKeyEvent(event);
return true;
}
+bool InputMethodEngine::IsValidKeyForSpecialPage(const GURL& url,
+ bool url_trustable,
Devlin 2016/06/28 20:56:44 The more I look at the "url_trustable" bool, the m
Azure Wei 2016/06/29 02:53:46 Do you mean put all the logic of checking the url
Devlin 2016/06/29 16:07:23 Ah, right, because otherwise we send all key event
+ ui::KeyEvent* ui_event) {
+ // input.ime.sendKeyEvents API is not allowed to send ENTER et al. keys on
+ // some special pages (like chrome://).
+ std::vector<const char*> whitelist_schemes{url::kFtpScheme, url::kHttpScheme,
+ url::kHttpsScheme};
+ std::vector<GURL> whitelist_urls{GURL(url::kAboutBlankURL),
+ GURL(chrome::kChromeUINewTabURL)};
+
+ // Checks if the current url is special url.
+ if (url_trustable) {
+ for (auto scheme : whitelist_schemes) {
+ if (url.SchemeIs(scheme))
+ return true;
+ }
+ for (auto whitelist_url : whitelist_urls) {
+ if (url == whitelist_url || url.GetOrigin() == whitelist_url)
+ return true;
+ }
+ }
+
+ std::vector<ui::KeyboardCode> whitelist_keycodes{
+ ui::VKEY_BACK, ui::VKEY_LEFT, ui::VKEY_RIGHT, ui::VKEY_UP, ui::VKEY_DOWN};
+ std::vector<ui::KeyboardCode> invalid_character_keycodes{ui::VKEY_TAB,
+ ui::VKEY_RETURN};
+
+ // Whitelists all character keys.
+ if (ui_event->GetDomKey().IsCharacter() && !ui_event->IsControlDown() &&
+ !ui_event->IsCommandDown()) {
+ for (auto invalid_key : invalid_character_keycodes) {
Devlin 2016/06/28 20:56:44 nit: I find it slightly more readable to make keyc
Azure Wei 2016/06/29 02:53:46 Done.
+ if (ui_event->key_code() == invalid_key)
+ return false;
+ }
+ return true;
+ }
+
+ // Checks if the key event is white listed key.
Devlin 2016/06/28 20:56:44 and here return whitelist_keycodes.count(ui_event-
Azure Wei 2016/06/29 02:53:46 Done.
+ for (auto key : whitelist_keycodes) {
+ if (ui_event->key_code() == key)
+ return true;
+ }
+
+ return false;
+}
+
} // namespace input_method

Powered by Google App Engine
This is Rietveld 408576698