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

Side by Side Diff: third_party/WebKit/Source/core/input/EventHandler.cpp

Issue 2646163002: Remove PlatformTouchEvent/Point and use WebTouchEvent/Point instead (Closed)
Patch Set: Fix nit Created 3 years, 10 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights
3 * reserved. 3 * reserved.
4 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) 4 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org)
5 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) 5 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies)
6 * 6 *
7 * Redistribution and use in source and binary forms, with or without 7 * Redistribution and use in source and binary forms, with or without
8 * modification, are permitted provided that the following conditions 8 * modification, are permitted provided that the following conditions
9 * are met: 9 * are met:
10 * 1. Redistributions of source code must retain the above copyright 10 * 1. Redistributions of source code must retain the above copyright
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 #include "core/page/DragState.h" 80 #include "core/page/DragState.h"
81 #include "core/page/FocusController.h" 81 #include "core/page/FocusController.h"
82 #include "core/page/FrameTree.h" 82 #include "core/page/FrameTree.h"
83 #include "core/page/Page.h" 83 #include "core/page/Page.h"
84 #include "core/page/TouchAdjustment.h" 84 #include "core/page/TouchAdjustment.h"
85 #include "core/page/scrolling/ScrollState.h" 85 #include "core/page/scrolling/ScrollState.h"
86 #include "core/paint/PaintLayer.h" 86 #include "core/paint/PaintLayer.h"
87 #include "core/style/ComputedStyle.h" 87 #include "core/style/ComputedStyle.h"
88 #include "core/style/CursorData.h" 88 #include "core/style/CursorData.h"
89 #include "core/svg/SVGDocumentExtensions.h" 89 #include "core/svg/SVGDocumentExtensions.h"
90 #include "platform/PlatformTouchEvent.h"
91 #include "platform/RuntimeEnabledFeatures.h" 90 #include "platform/RuntimeEnabledFeatures.h"
92 #include "platform/WindowsKeyboardCodes.h" 91 #include "platform/WindowsKeyboardCodes.h"
93 #include "platform/geometry/FloatPoint.h" 92 #include "platform/geometry/FloatPoint.h"
94 #include "platform/graphics/Image.h" 93 #include "platform/graphics/Image.h"
95 #include "platform/heap/Handle.h" 94 #include "platform/heap/Handle.h"
96 #include "platform/instrumentation/tracing/TraceEvent.h" 95 #include "platform/instrumentation/tracing/TraceEvent.h"
97 #include "platform/scroll/ScrollAnimatorBase.h" 96 #include "platform/scroll/ScrollAnimatorBase.h"
98 #include "platform/scroll/Scrollbar.h" 97 #include "platform/scroll/Scrollbar.h"
99 #include "public/platform/WebInputEvent.h" 98 #include "public/platform/WebInputEvent.h"
100 #include "public/platform/WebMouseWheelEvent.h" 99 #include "public/platform/WebMouseWheelEvent.h"
(...skipping 1974 matching lines...) Expand 10 before | Expand all | Expand 10 after
2075 2074
2076 // Send mouse entered if we're setting a new scrollbar. 2075 // Send mouse entered if we're setting a new scrollbar.
2077 if (scrollbar && setLast) 2076 if (scrollbar && setLast)
2078 scrollbar->mouseEntered(); 2077 scrollbar->mouseEntered();
2079 2078
2080 m_lastScrollbarUnderMouse = setLast ? scrollbar : nullptr; 2079 m_lastScrollbarUnderMouse = setLast ? scrollbar : nullptr;
2081 } 2080 }
2082 } 2081 }
2083 2082
2084 WebInputEventResult EventHandler::handleTouchEvent( 2083 WebInputEventResult EventHandler::handleTouchEvent(
2085 const PlatformTouchEvent& event, 2084 const WebTouchEvent& event,
2086 const Vector<PlatformTouchEvent>& coalescedEvents) { 2085 const Vector<WebTouchEvent>& coalescedEvents) {
2087 TRACE_EVENT0("blink", "EventHandler::handleTouchEvent"); 2086 TRACE_EVENT0("blink", "EventHandler::handleTouchEvent");
2088 return m_pointerEventManager->handleTouchEvents(event, coalescedEvents); 2087 return m_pointerEventManager->handleTouchEvents(event, coalescedEvents);
2089 } 2088 }
2090 2089
2091 WebInputEventResult EventHandler::passMousePressEventToSubframe( 2090 WebInputEventResult EventHandler::passMousePressEventToSubframe(
2092 MouseEventWithHitTestResults& mev, 2091 MouseEventWithHitTestResults& mev,
2093 LocalFrame* subframe) { 2092 LocalFrame* subframe) {
2094 selectionController().passMousePressEventToSubframe(mev); 2093 selectionController().passMousePressEventToSubframe(mev);
2095 WebInputEventResult result = 2094 WebInputEventResult result =
2096 subframe->eventHandler().handleMousePressEvent(mev.event()); 2095 subframe->eventHandler().handleMousePressEvent(mev.event());
(...skipping 28 matching lines...) Expand all
2125 } 2124 }
2126 2125
2127 FrameHost* EventHandler::frameHost() const { 2126 FrameHost* EventHandler::frameHost() const {
2128 if (!m_frame->page()) 2127 if (!m_frame->page())
2129 return nullptr; 2128 return nullptr;
2130 2129
2131 return &m_frame->page()->frameHost(); 2130 return &m_frame->page()->frameHost();
2132 } 2131 }
2133 2132
2134 } // namespace blink 2133 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/input/EventHandler.h ('k') | third_party/WebKit/Source/core/input/PointerEventManager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698