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

Unified Diff: chrome/renderer/render_view.cc

Issue 3474007: Forward textfield focus event to the browser. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Fixed merge conflict Created 10 years, 2 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
« no previous file with comments | « chrome/renderer/render_view.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/render_view.cc
diff --git a/chrome/renderer/render_view.cc b/chrome/renderer/render_view.cc
index 5f45e1dd648af592028133d690f22344db582791..94da99623ca8c08e0fe08e1970261fe23c9b6376 100644
--- a/chrome/renderer/render_view.cc
+++ b/chrome/renderer/render_view.cc
@@ -109,6 +109,7 @@
#include "third_party/WebKit/WebKit/chromium/public/WebDevToolsAgent.h"
#include "third_party/WebKit/WebKit/chromium/public/WebDocument.h"
#include "third_party/WebKit/WebKit/chromium/public/WebDragData.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebElement.h"
#include "third_party/WebKit/WebKit/chromium/public/WebFileChooserParams.h"
#include "third_party/WebKit/WebKit/chromium/public/WebFileSystem.h"
#include "third_party/WebKit/WebKit/chromium/public/WebFileSystemCallbacks.h"
@@ -203,6 +204,7 @@ using WebKit::WebDragData;
using WebKit::WebDragOperation;
using WebKit::WebDragOperationsMask;
using WebKit::WebEditingAction;
+using WebKit::WebElement;
using WebKit::WebExternalPopupMenu;
using WebKit::WebExternalPopupMenuClient;
using WebKit::WebFileChooserCompletion;
@@ -407,6 +409,21 @@ static std::string DetermineTextLanguage(const string16& text) {
return language;
}
+// Returns true if the parameter node is a textfield, text area or a content
+// editable div.
+static bool IsEditableNode(const WebNode& node) {
+ bool is_editable_node = false;
+ if (!node.isNull()) {
+ if (node.isContentEditable()) {
+ is_editable_node = true;
+ } else if (node.isElementNode()) {
+ is_editable_node =
+ node.toConst<WebElement>().isTextFormControlElement();
+ }
+ }
+ return is_editable_node;
+}
+
static bool WebAccessibilityNotificationToViewHostMsg(
WebAccessibilityNotification notification,
ViewHostMsg_AccessibilityNotification_Params::NotificationType* type) {
@@ -785,6 +802,8 @@ void RenderView::OnMessageReceived(const IPC::Message& message) {
IPC_MESSAGE_HANDLER(ViewMsg_DragSourceSystemDragEnded,
OnDragSourceSystemDragEnded)
IPC_MESSAGE_HANDLER(ViewMsg_SetInitialFocus, OnSetInitialFocus)
+ IPC_MESSAGE_HANDLER(ViewMsg_ScrollFocusedEditableNodeIntoView,
+ OnScrollFocusedEditableNodeIntoView)
IPC_MESSAGE_HANDLER(ViewMsg_UpdateTargetURL_ACK, OnUpdateTargetURLAck)
IPC_MESSAGE_HANDLER(ViewMsg_UpdateWebPreferences, OnUpdateWebPreferences)
IPC_MESSAGE_HANDLER(ViewMsg_SetAltErrorPageURL, OnSetAltErrorPageURL)
@@ -1358,6 +1377,22 @@ void RenderView::OnSetInitialFocus(bool reverse) {
webview()->setInitialFocus(reverse);
}
+void RenderView::OnScrollFocusedEditableNodeIntoView() {
+ if (!webview())
+ return;
+ WebFrame* focused_frame = webview()->focusedFrame();
+ if (focused_frame) {
+ WebDocument doc = focused_frame->document();
+ if (!doc.isNull()) {
+ WebNode node = doc.focusedNode();
+ if (IsEditableNode(node))
+ // TODO(varunjain): Change webkit API to scroll a particular node into
+ // view and use that API here instead.
+ webview()->scrollFocusedNodeIntoView();
+ }
+ }
+}
+
///////////////////////////////////////////////////////////////////////////////
void RenderView::SetContentSettings(const ContentSettings& settings) {
@@ -2311,7 +2346,7 @@ void RenderView::focusPrevious() {
}
void RenderView::focusedNodeChanged(const WebNode& node) {
- Send(new ViewHostMsg_FocusedNodeChanged(routing_id_));
+ Send(new ViewHostMsg_FocusedNodeChanged(routing_id_, IsEditableNode(node)));
if (WebAccessibilityCache::accessibilityEnabled() && node.isNull()) {
// TODO(ctguil): Make WebKit send this notification.
« no previous file with comments | « chrome/renderer/render_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698