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

Unified Diff: sky/engine/web/WebInputEventConversion.cpp

Issue 646273006: Get rid of ScrollView. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: merge to ToT Created 6 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
Index: sky/engine/web/WebInputEventConversion.cpp
diff --git a/sky/engine/web/WebInputEventConversion.cpp b/sky/engine/web/WebInputEventConversion.cpp
index 49bd195acbee738d3574f1bcfcf5d00752b5fcef..8535c170aec400fe18deedc2e0457714690272f9 100644
--- a/sky/engine/web/WebInputEventConversion.cpp
+++ b/sky/engine/web/WebInputEventConversion.cpp
@@ -45,7 +45,6 @@
#include "core/rendering/RenderObject.h"
#include "platform/KeyboardCodes.h"
#include "platform/Widget.h"
-#include "platform/scroll/ScrollView.h"
namespace blink {
@@ -56,7 +55,7 @@ static float widgetInputEventsScaleFactor(const Widget* widget)
if (!widget)
return 1;
- ScrollView* rootView = toScrollView(widget->root());
+ FrameView* rootView = toFrameView(widget->root());
if (!rootView)
return 1;
@@ -67,7 +66,7 @@ static IntSize widgetInputEventsOffset(const Widget* widget)
{
if (!widget)
return IntSize();
- ScrollView* rootView = toScrollView(widget->root());
+ FrameView* rootView = toFrameView(widget->root());
if (!rootView)
return IntSize();
@@ -489,7 +488,7 @@ static void updateWebMouseEventFromCoreMouseEvent(const MouseRelatedEvent& event
webEvent.timeStampSeconds = event.timeStamp() / millisPerSecond;
webEvent.modifiers = getWebInputModifiers(event);
- ScrollView* view = toScrollView(widget.parent());
+ FrameView* view = toFrameView(widget.parent());
IntPoint windowPoint = IntPoint(event.absoluteLocation().x(), event.absoluteLocation().y());
if (view)
windowPoint = view->contentsToWindow(windowPoint);
@@ -577,7 +576,7 @@ WebMouseEventBuilder::WebMouseEventBuilder(const Widget* widget, const RenderObj
modifiers = getWebInputModifiers(event);
// The mouse event co-ordinates should be generated from the co-ordinates of the touch point.
- ScrollView* view = toScrollView(widget->parent());
+ FrameView* view = toFrameView(widget->parent());
IntPoint windowPoint = roundedIntPoint(touch->absoluteLocation());
if (view)
windowPoint = view->contentsToWindow(windowPoint);

Powered by Google App Engine
This is Rietveld 408576698