Source/WebKit/chromium/src/WebViewImpl.h - Issue 12315056: Merge 142913

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: Source/WebKit/chromium/src/WebViewImpl.h

Issue 12315056: Merge 142913 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/

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

Index: Source/WebKit/chromium/src/WebViewImpl.h

===================================================================

--- Source/WebKit/chromium/src/WebViewImpl.h (revision 143774)

+++ Source/WebKit/chromium/src/WebViewImpl.h (working copy)

@@ -577,8 +577,8 @@

#if ENABLE(GESTURE_EVENTS)

void computeScaleAndScrollForHitRect(const WebRect& hitRect, AutoZoomType, float& scale, WebPoint& scroll, bool& isAnchor);

- WebCore::Node* bestTouchLinkNode(const WebGestureEvent& touchEvent);

- void enableTouchHighlight(const WebGestureEvent& touchEvent);

+ WebCore::Node* bestTapNode(const WebCore::PlatformGestureEvent& tapEvent);

+ void enableTapHighlight(const WebCore::PlatformGestureEvent& tapEvent);

void computeScaleAndScrollForFocusedNode(WebCore::Node* focusedNode, float& scale, WebCore::IntPoint& scroll, bool& needAnimation);

#endif

void animateZoomAroundPoint(const WebCore::IntPoint&, AutoZoomType);

« no previous file with comments | « Source/WebKit/chromium/ChangeLog ('k') | Source/WebKit/chromium/src/WebViewImpl.cpp » ('j') | no next file with comments »