content/browser/renderer_host/render_widget_host_view_win.cc - Issue 19676008: Import windows WebInputEvent factory to content

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/render_widget_host_view_win.cc

Issue 19676008: Import windows WebInputEvent factory to content (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 years, 5 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

« content/browser/renderer_host/input/web_input_event_builders_win.h ('K') | « content/browser/renderer_host/native_web_keyboard_event_win.cc ('k') | content/browser/renderer_host/web_input_event_aurawin.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_view_win.cc

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 8916d05db08a8d8b62de94cdb48d10cdfc1f133f..abc1996145d52d17edaa8177254b3db20577e460 100644

--- a/content/browser/renderer_host/render_widget_host_view_win.cc

+++ b/content/browser/renderer_host/render_widget_host_view_win.cc

@@ -34,6 +34,7 @@

#include "content/browser/gpu/gpu_process_host_ui_shim.h"

#include "content/browser/renderer_host/backing_store.h"

#include "content/browser/renderer_host/backing_store_win.h"

+#include "content/browser/renderer_host/input/web_input_event_builders_win.h"

#include "content/browser/renderer_host/render_process_host_impl.h"

#include "content/browser/renderer_host/render_widget_host_impl.h"

#include "content/browser/renderer_host/ui_events_helper.h"

@@ -54,7 +55,6 @@

#include "skia/ext/skia_utils_win.h"

#include "third_party/WebKit/public/web/WebCompositionUnderline.h"

#include "third_party/WebKit/public/web/WebInputEvent.h"

-#include "third_party/WebKit/public/web/win/WebInputEventFactory.h"

#include "third_party/skia/include/core/SkRegion.h"

#include "ui/base/events/event.h"

#include "ui/base/events/event_utils.h"

@@ -80,7 +80,6 @@ using base::TimeDelta;

using base::TimeTicks;

using ui::ViewProp;

using WebKit::WebInputEvent;

-using WebKit::WebInputEventFactory;

using WebKit::WebMouseEvent;

using WebKit::WebTextDirection;

@@ -2008,7 +2007,7 @@ LRESULT RenderWidgetHostViewWin::OnWheelEvent(UINT message, WPARAM wparam,

if (render_widget_host_) {

WebKit::WebMouseWheelEvent wheel_event =

- WebInputEventFactory::mouseWheelEvent(m_hWnd, message, wparam, lparam);

+ WebMouseWheelEventBuilder::Build(m_hWnd, message, wparam, lparam);

float scale = ui::win::GetDeviceScaleFactor();

wheel_event.x /= scale;

wheel_event.y /= scale;

@@ -2903,7 +2902,7 @@ void RenderWidgetHostViewWin::ForwardMouseEventToRenderer(UINT message,

lparam = MAKELPARAM(point.x(), point.y());

WebMouseEvent event(

- WebInputEventFactory::mouseEvent(m_hWnd, message, wparam, lparam));

+ WebMouseEventBuilder::Build(m_hWnd, message, wparam, lparam));

if (mouse_locked_) {

event.movementX = event.globalX - last_mouse_position_.locked_global.x();