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

Unified Diff: third_party/WebKit/Source/web/InspectorOverlay.cpp

Issue 2646163002: Remove PlatformTouchEvent/Point and use WebTouchEvent/Point instead (Closed)
Patch Set: Fix nit Created 3 years, 11 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: third_party/WebKit/Source/web/InspectorOverlay.cpp
diff --git a/third_party/WebKit/Source/web/InspectorOverlay.cpp b/third_party/WebKit/Source/web/InspectorOverlay.cpp
index 85e7b65889d329691fc33f4475308d442a0c9466..210ddea33e7fcfc903729736e466685c7be89a87 100644
--- a/third_party/WebKit/Source/web/InspectorOverlay.cpp
+++ b/third_party/WebKit/Source/web/InspectorOverlay.cpp
@@ -95,12 +95,12 @@ Node* hoveredNodeForEvent(LocalFrame* frame,
}
Node* hoveredNodeForEvent(LocalFrame* frame,
- const PlatformTouchEvent& event,
+ const WebTouchEvent& event,
bool ignorePointerEventsNone) {
- const Vector<PlatformTouchPoint>& points = event.touchPoints();
- if (!points.size())
+ if (!event.touchesLength)
return nullptr;
- return hoveredNodeForPoint(frame, roundedIntPoint(points[0].pos()),
+ WebTouchPoint transformedPoint = event.touchPointInRootFrame(0);
+ return hoveredNodeForPoint(frame, roundedIntPoint(transformedPoint.position),
ignorePointerEventsNone);
}
} // namespace
@@ -277,16 +277,14 @@ bool InspectorOverlay::handleInputEvent(const WebInputEvent& inputEvent) {
}
if (WebInputEvent::isTouchEventType(inputEvent.type())) {
- PlatformTouchEvent touchEvent = PlatformTouchEventBuilder(
- m_frameImpl->frameView(),
- static_cast<const WebTouchEvent&>(inputEvent));
- handled = handleTouchEvent(touchEvent);
+ WebTouchEvent transformedEvent =
+ TransformWebTouchEvent(m_frameImpl->frameView(),
+ static_cast<const WebTouchEvent&>(inputEvent));
+ handled = handleTouchEvent(transformedEvent);
if (handled)
return true;
overlayMainFrame()->eventHandler().handleTouchEvent(
- touchEvent,
- createPlatformTouchEventVector(m_frameImpl->frameView(),
- std::vector<const WebInputEvent*>()));
+ transformedEvent, Vector<WebTouchEvent>());
}
if (WebInputEvent::isKeyboardEventType(inputEvent.type())) {
overlayMainFrame()->eventHandler().keyEvent(
@@ -770,7 +768,7 @@ bool InspectorOverlay::handleGestureEvent(const WebGestureEvent& event) {
return false;
}
-bool InspectorOverlay::handleTouchEvent(const PlatformTouchEvent& event) {
+bool InspectorOverlay::handleTouchEvent(const WebTouchEvent& event) {
if (!shouldSearchForNode())
return false;
Node* node = hoveredNodeForEvent(m_frameImpl->frame(), event, false);
« no previous file with comments | « third_party/WebKit/Source/web/InspectorOverlay.h ('k') | third_party/WebKit/Source/web/PageWidgetDelegate.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698