summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorgirard@chromium.org <girard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-22 06:16:33 +0000
committergirard@chromium.org <girard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-09-22 06:16:33 +0000
commitcdd3a2d1424e2aace96232450c0dc8cba5c870ac (patch)
tree3501ee7002450ddbfbc9d0efe87cdb8b2b99e46a /content
parent914907b974d1183496ab570d3400435e4ed69536 (diff)
downloadchromium_src-cdd3a2d1424e2aace96232450c0dc8cba5c870ac.zip
chromium_src-cdd3a2d1424e2aace96232450c0dc8cba5c870ac.tar.gz
chromium_src-cdd3a2d1424e2aace96232450c0dc8cba5c870ac.tar.bz2
Disable force focus call from pointer events in Chrome/Win/Desktop
This code was added in an attempt to make the on-screen-keyboard function in desktop chrome. By coincidence, it messes up popup menus/drop-down boxes. Removing the code. Issue 105637 tracks the OSK issue. We'll need to revisit/re-enable this code when we work on that. BUG=139420 Review URL: https://chromiumcodereview.appspot.com/10825233 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158173 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/renderer_host/render_widget_host_view_win.cc26
-rw-r--r--content/browser/renderer_host/render_widget_host_view_win.h5
2 files changed, 0 insertions, 31 deletions
diff --git a/content/browser/renderer_host/render_widget_host_view_win.cc b/content/browser/renderer_host/render_widget_host_view_win.cc
index 955c49c..e850512 100644
--- a/content/browser/renderer_host/render_widget_host_view_win.cc
+++ b/content/browser/renderer_host/render_widget_host_view_win.cc
@@ -2681,32 +2681,6 @@ LRESULT RenderWidgetHostViewWin::OnParentNotify(UINT message, WPARAM wparam,
return 0;
}
-LRESULT RenderWidgetHostViewWin::OnPointerMessage(
- UINT message, WPARAM wparam, LPARAM lparam, BOOL& handled) {
- TRACE_EVENT0("browser", "RenderWidgetHostViewWin::OnPointerMessage");
- POINT point = {0};
-
- point.x = GET_X_LPARAM(lparam);
- point.y = GET_Y_LPARAM(lparam);
- ScreenToClient(&point);
-
- lparam = MAKELPARAM(point.x, point.y);
-
- if (message == WM_POINTERDOWN) {
- if (!base::win::IsMetroProcess()) {
- pointer_down_context_ = true;
- SetFocus();
- received_focus_change_after_pointer_down_ = false;
- MessageLoop::current()->PostDelayedTask(FROM_HERE,
- base::Bind(&RenderWidgetHostViewWin::ResetPointerDownContext,
- weak_factory_.GetWeakPtr()),
- base::TimeDelta::FromMilliseconds(kPointerDownContextResetDelay));
- }
- }
- handled = FALSE;
- return 0;
-}
-
void RenderWidgetHostViewWin::OnFinalMessage(HWND window) {
TRACE_EVENT0("browser", "RenderWidgetHostViewWin::OnFinalMessage");
// When the render widget host is being destroyed, it ends up calling
diff --git a/content/browser/renderer_host/render_widget_host_view_win.h b/content/browser/renderer_host/render_widget_host_view_win.h
index 2bdfb95e..af406de 100644
--- a/content/browser/renderer_host/render_widget_host_view_win.h
+++ b/content/browser/renderer_host/render_widget_host_view_win.h
@@ -141,8 +141,6 @@ class RenderWidgetHostViewWin
MESSAGE_HANDLER(WM_MOUSEACTIVATE, OnMouseActivate)
MESSAGE_HANDLER(WM_GETOBJECT, OnGetObject)
MESSAGE_HANDLER(WM_PARENTNOTIFY, OnParentNotify)
- MESSAGE_HANDLER(WM_POINTERDOWN, OnPointerMessage)
- MESSAGE_HANDLER(WM_POINTERUP, OnPointerMessage)
MESSAGE_HANDLER(WM_GESTURE, OnGestureEvent)
END_MSG_MAP()
@@ -327,9 +325,6 @@ class RenderWidgetHostViewWin
LRESULT OnParentNotify(UINT message, WPARAM wparam, LPARAM lparam,
BOOL& handled);
- // Handle the new pointer messages
- LRESULT OnPointerMessage(UINT message, WPARAM wparam, LPARAM lparam,
- BOOL& handled);
// Handle high-level touch events.
LRESULT OnGestureEvent(UINT message, WPARAM wparam, LPARAM lparam,
BOOL& handled);