third_party/WebKit/Source/core/input/TouchEventManager.cpp - Issue 2229743003: add HitTestCanvasResult Class instend of std::pair<Element*, String>

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: third_party/WebKit/Source/core/input/TouchEventManager.cpp

Issue 2229743003: add HitTestCanvasResult Class instend of std::pair<Element*, String> (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: add HitTestCanvasResult Class instend of std::pair<Element*, String> Created 4 years, 4 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

« no previous file with comments | « third_party/WebKit/Source/core/input/PointerEventManager.cpp ('k') | third_party/WebKit/Source/core/layout/HitTestCanvasResult.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/core/input/TouchEventManager.cpp

diff --git a/third_party/WebKit/Source/core/input/TouchEventManager.cpp b/third_party/WebKit/Source/core/input/TouchEventManager.cpp

index 9fca18a95a4d5d3ac7968d5686257643c42f8736..61ebef8989021452b932a75a8e6e700476b0ee2a 100644

--- a/third_party/WebKit/Source/core/input/TouchEventManager.cpp

+++ b/third_party/WebKit/Source/core/input/TouchEventManager.cpp

@@ -13,6 +13,7 @@

#include "core/html/HTMLCanvasElement.h"

#include "core/input/EventHandler.h"

#include "core/input/TouchActionUtil.h"

+#include "core/layout/HitTestCanvasResult.h"

#include "core/page/ChromeClient.h"

#include "core/page/Page.h"

#include "platform/Histogram.h"

@@ -250,10 +251,10 @@ void TouchEventManager::updateTargetAndRegionMapsForTouchStarts(

if (!node)

continue;

if (isHTMLCanvasElement(node)) {

- std::pair<Element*, String> regionInfo = toHTMLCanvasElement(node)->getControlAndIdIfHitRegionExists(result.pointInInnerNodeFrame());

- if (regionInfo.first)

- node = regionInfo.first;

- touchInfo.region = regionInfo.second;

+ HitTestCanvasResult* hitTestCanvasResult = toHTMLCanvasElement(node)->getControlAndIdIfHitRegionExists(result.pointInInnerNodeFrame());

+ if (hitTestCanvasResult->getControl())

+ node = hitTestCanvasResult->getControl();

+ touchInfo.region = hitTestCanvasResult->getId();

}

// Touch events should not go to text nodes.

if (node->isTextNode())