projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 7.36.149.0
[platform/framework/web/crosswalk.git]
/
src
/
content
/
browser
/
renderer_host
/
input
/
touchpad_tap_suppression_controller.h
diff --git
a/src/content/browser/renderer_host/input/touchpad_tap_suppression_controller.h
b/src/content/browser/renderer_host/input/touchpad_tap_suppression_controller.h
index
64b2ed4
..
da74dfd
100644
(file)
--- a/
src/content/browser/renderer_host/input/touchpad_tap_suppression_controller.h
+++ b/
src/content/browser/renderer_host/input/touchpad_tap_suppression_controller.h
@@
-5,10
+5,10
@@
#ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_TOUCHPAD_TAP_SUPPRESSION_CONTROLLER_H_
#define CONTENT_BROWSER_RENDERER_HOST_INPUT_TOUCHPAD_TAP_SUPPRESSION_CONTROLLER_H_
#ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_TOUCHPAD_TAP_SUPPRESSION_CONTROLLER_H_
#define CONTENT_BROWSER_RENDERER_HOST_INPUT_TOUCHPAD_TAP_SUPPRESSION_CONTROLLER_H_
-#include "base/memory/scoped_ptr.h"
+#include "content/browser/renderer_host/event_with_latency_info.h"
+#include "content/browser/renderer_host/input/tap_suppression_controller.h"
#include "content/browser/renderer_host/input/tap_suppression_controller_client.h"
#include "content/common/content_export.h"
#include "content/browser/renderer_host/input/tap_suppression_controller_client.h"
#include "content/common/content_export.h"
-#include "content/port/browser/event_with_latency_info.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
namespace content {
#include "third_party/WebKit/public/web/WebInputEvent.h"
namespace content {
@@
-27,8
+27,9
@@
class CONTENT_EXPORT TouchpadTapSuppressionControllerClient {
class TouchpadTapSuppressionController : public TapSuppressionControllerClient {
public:
// The |client| must outlive the TouchpadTapSupressionController.
class TouchpadTapSuppressionController : public TapSuppressionControllerClient {
public:
// The |client| must outlive the TouchpadTapSupressionController.
- explicit TouchpadTapSuppressionController(
- TouchpadTapSuppressionControllerClient* client);
+ TouchpadTapSuppressionController(
+ TouchpadTapSuppressionControllerClient* client,
+ const TapSuppressionController::Config& config);
virtual ~TouchpadTapSuppressionController();
// Should be called on arrival of GestureFlingCancel events.
virtual ~TouchpadTapSuppressionController();
// Should be called on arrival of GestureFlingCancel events.
@@
-51,8
+52,6
@@
class TouchpadTapSuppressionController : public TapSuppressionControllerClient {
friend class MockRenderWidgetHost;
// TapSuppressionControllerClient implementation.
friend class MockRenderWidgetHost;
// TapSuppressionControllerClient implementation.
- virtual int MaxCancelToDownTimeInMs() OVERRIDE;
- virtual int MaxTapGapTimeInMs() OVERRIDE;
virtual void DropStashedTapDown() OVERRIDE;
virtual void ForwardStashedTapDown() OVERRIDE;
virtual void DropStashedTapDown() OVERRIDE;
virtual void ForwardStashedTapDown() OVERRIDE;
@@
-60,7
+59,7
@@
class TouchpadTapSuppressionController : public TapSuppressionControllerClient {
MouseEventWithLatencyInfo stashed_mouse_down_;
// The core controller of tap suppression.
MouseEventWithLatencyInfo stashed_mouse_down_;
// The core controller of tap suppression.
-
scoped_ptr<TapSuppressionController>
controller_;
+
TapSuppressionController
controller_;
DISALLOW_COPY_AND_ASSIGN(TouchpadTapSuppressionController);
};
DISALLOW_COPY_AND_ASSIGN(TouchpadTapSuppressionController);
};