diff options
author | ssid <ssid@chromium.org> | 2015-03-12 12:46:26 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-12 19:47:34 +0000 |
commit | 2d70efc4dca3c4d3ee074ca45f1bc50a09220f3c (patch) | |
tree | 8b363bda31bef66dc675fade2cd91b5c8e738792 /content | |
parent | 84f19a154350b85295a5e1cba9a129957f1be973 (diff) | |
download | chromium_src-2d70efc4dca3c4d3ee074ca45f1bc50a09220f3c.zip chromium_src-2d70efc4dca3c4d3ee074ca45f1bc50a09220f3c.tar.gz chromium_src-2d70efc4dca3c4d3ee074ca45f1bc50a09220f3c.tar.bz2 |
Making synthetic gesture API accept float inputs.
The points on the screen actually float values. So fixing synthetic
gestures to accept float values.
BUG=461825
Review URL: https://codereview.chromium.org/990903006
Cr-Commit-Position: refs/heads/master@{#320349}
Diffstat (limited to 'content')
8 files changed, 41 insertions, 43 deletions
diff --git a/content/browser/renderer_host/input/synthetic_smooth_scroll_gesture.cc b/content/browser/renderer_host/input/synthetic_smooth_scroll_gesture.cc index 5a91d6f..de52659 100644 --- a/content/browser/renderer_host/input/synthetic_smooth_scroll_gesture.cc +++ b/content/browser/renderer_host/input/synthetic_smooth_scroll_gesture.cc @@ -43,9 +43,7 @@ bool SyntheticSmoothScrollGesture::InitializeMoveGesture( gesture_type == SyntheticGestureParams::MOUSE_INPUT) { SyntheticSmoothMoveGestureParams move_params; move_params.start_point = params_.anchor; - // TODO(ssid): Remove this when params for scroll is changed to float - for (size_t i = 0; i < params_.distances.size(); i++) - move_params.distances.push_back(params_.distances[i]); + move_params.distances = params_.distances; move_params.speed_in_pixels_s = params_.speed_in_pixels_s; move_params.prevent_fling = params_.prevent_fling; move_params.input_type = GetInputSourceType(gesture_type); diff --git a/content/common/input/synthetic_pinch_gesture_params.h b/content/common/input/synthetic_pinch_gesture_params.h index 194dba4..1294249 100644 --- a/content/common/input/synthetic_pinch_gesture_params.h +++ b/content/common/input/synthetic_pinch_gesture_params.h @@ -22,8 +22,8 @@ struct CONTENT_EXPORT SyntheticPinchGestureParams GestureType GetGestureType() const override; float scale_factor; - gfx::Point anchor; - int relative_pointer_speed_in_pixels_s; + gfx::PointF anchor; + float relative_pointer_speed_in_pixels_s; static const SyntheticPinchGestureParams* Cast( const SyntheticGestureParams* gesture_params); diff --git a/content/common/input/synthetic_smooth_drag_gesture_params.cc b/content/common/input/synthetic_smooth_drag_gesture_params.cc index f713649..f5adc46 100644 --- a/content/common/input/synthetic_smooth_drag_gesture_params.cc +++ b/content/common/input/synthetic_smooth_drag_gesture_params.cc @@ -9,7 +9,7 @@ namespace content { namespace { -const int kDefaultSpeedInPixelsPerSec = 800; +const float kDefaultSpeedInPixelsPerSec = 800; } // namespace diff --git a/content/common/input/synthetic_smooth_drag_gesture_params.h b/content/common/input/synthetic_smooth_drag_gesture_params.h index 0448c8e..11387d8 100644 --- a/content/common/input/synthetic_smooth_drag_gesture_params.h +++ b/content/common/input/synthetic_smooth_drag_gesture_params.h @@ -26,7 +26,7 @@ struct CONTENT_EXPORT SyntheticSmoothDragGestureParams gfx::PointF start_point; std::vector<gfx::Vector2dF> distances; - int speed_in_pixels_s; + float speed_in_pixels_s; static const SyntheticSmoothDragGestureParams* Cast( const SyntheticGestureParams* gesture_params); diff --git a/content/common/input/synthetic_smooth_scroll_gesture_params.cc b/content/common/input/synthetic_smooth_scroll_gesture_params.cc index 35c78c1..8e1c974 100644 --- a/content/common/input/synthetic_smooth_scroll_gesture_params.cc +++ b/content/common/input/synthetic_smooth_scroll_gesture_params.cc @@ -9,7 +9,7 @@ namespace content { namespace { -const int kDefaultSpeedInPixelsS = 800; +const float kDefaultSpeedInPixelsS = 800; } // namespace diff --git a/content/common/input/synthetic_smooth_scroll_gesture_params.h b/content/common/input/synthetic_smooth_scroll_gesture_params.h index 1fd0b30..34d0f61 100644 --- a/content/common/input/synthetic_smooth_scroll_gesture_params.h +++ b/content/common/input/synthetic_smooth_scroll_gesture_params.h @@ -24,10 +24,10 @@ struct CONTENT_EXPORT SyntheticSmoothScrollGestureParams GestureType GetGestureType() const override; - gfx::Point anchor; - std::vector<gfx::Vector2d> distances; // Positive X/Y to scroll left/up. + gfx::PointF anchor; + std::vector<gfx::Vector2dF> distances; // Positive X/Y to scroll left/up. bool prevent_fling; // Defaults to true. - int speed_in_pixels_s; + float speed_in_pixels_s; static const SyntheticSmoothScrollGestureParams* Cast( const SyntheticGestureParams* gesture_params); diff --git a/content/common/input/synthetic_tap_gesture_params.h b/content/common/input/synthetic_tap_gesture_params.h index f60cc88..6011094 100644 --- a/content/common/input/synthetic_tap_gesture_params.h +++ b/content/common/input/synthetic_tap_gesture_params.h @@ -20,8 +20,8 @@ struct CONTENT_EXPORT SyntheticTapGestureParams GestureType GetGestureType() const override; - gfx::Point position; - int duration_ms; + gfx::PointF position; + float duration_ms; static const SyntheticTapGestureParams* Cast( const SyntheticGestureParams* gesture_params); diff --git a/content/renderer/gpu/gpu_benchmarking_extension.cc b/content/renderer/gpu/gpu_benchmarking_extension.cc index 591cd45..2345995 100644 --- a/content/renderer/gpu/gpu_benchmarking_extension.cc +++ b/content/renderer/gpu/gpu_benchmarking_extension.cc @@ -321,14 +321,14 @@ void OnSyntheticGestureCompleted(CallbackAndContext* callback_and_context) { } bool BeginSmoothScroll(v8::Isolate* isolate, - int pixels_to_scroll, + float pixels_to_scroll, v8::Handle<v8::Function> callback, int gesture_source_type, const std::string& direction, - int speed_in_pixels_s, + float speed_in_pixels_s, bool prevent_fling, - int start_x, - int start_y) { + float start_x, + float start_y) { GpuBenchmarkingContext context; if (!context.Init(false)) return false; @@ -357,8 +357,8 @@ bool BeginSmoothScroll(v8::Isolate* isolate, gesture_params->anchor.SetPoint(start_x * page_scale_factor, start_y * page_scale_factor); - int distance_length = pixels_to_scroll * page_scale_factor; - gfx::Vector2d distance; + float distance_length = pixels_to_scroll * page_scale_factor; + gfx::Vector2dF distance; if (direction == "down") distance.set_y(-distance_length); else if (direction == "up") @@ -389,7 +389,7 @@ bool BeginSmoothDrag(v8::Isolate* isolate, float end_y, v8::Handle<v8::Function> callback, int gesture_source_type, - int speed_in_pixels_s) { + float speed_in_pixels_s) { GpuBenchmarkingContext context; if (!context.Init(false)) return false; @@ -544,13 +544,13 @@ bool GpuBenchmarking::SmoothScrollBy(gin::Arguments* args) { float page_scale_factor = context.web_view()->pageScaleFactor(); blink::WebRect rect = context.render_view_impl()->windowRect(); - int pixels_to_scroll = 0; + float pixels_to_scroll = 0; v8::Handle<v8::Function> callback; - int start_x = rect.width / (page_scale_factor * 2); - int start_y = rect.height / (page_scale_factor * 2); - int gesture_source_type = 0; // DEFAULT_INPUT + float start_x = rect.width / (page_scale_factor * 2); + float start_y = rect.height / (page_scale_factor * 2); + int gesture_source_type = SyntheticGestureParams::DEFAULT_INPUT; std::string direction = "down"; - int speed_in_pixels_s = 800; + float speed_in_pixels_s = 800; if (!GetOptionalArg(args, &pixels_to_scroll) || !GetOptionalArg(args, &callback) || @@ -584,7 +584,7 @@ bool GpuBenchmarking::SmoothDrag(gin::Arguments* args) { float end_y; v8::Handle<v8::Function> callback; int gesture_source_type = SyntheticGestureParams::DEFAULT_INPUT; - int speed_in_pixels_s = 800; + float speed_in_pixels_s = 800; if (!GetArg(args, &start_x) || !GetArg(args, &start_y) || @@ -615,11 +615,11 @@ bool GpuBenchmarking::Swipe(gin::Arguments* args) { blink::WebRect rect = context.render_view_impl()->windowRect(); std::string direction = "up"; - int pixels_to_scroll = 0; + float pixels_to_scroll = 0; v8::Handle<v8::Function> callback; - int start_x = rect.width / (page_scale_factor * 2); - int start_y = rect.height / (page_scale_factor * 2); - int speed_in_pixels_s = 800; + float start_x = rect.width / (page_scale_factor * 2); + float start_y = rect.height / (page_scale_factor * 2); + float speed_in_pixels_s = 800; if (!GetOptionalArg(args, &direction) || !GetOptionalArg(args, &pixels_to_scroll) || @@ -650,13 +650,13 @@ bool GpuBenchmarking::ScrollBounce(gin::Arguments* args) { blink::WebRect rect = context.render_view_impl()->windowRect(); std::string direction = "down"; - int distance_length = 0; - int overscroll_length = 0; + float distance_length = 0; + float overscroll_length = 0; int repeat_count = 1; v8::Handle<v8::Function> callback; - int start_x = rect.width / (page_scale_factor * 2); - int start_y = rect.height / (page_scale_factor * 2); - int speed_in_pixels_s = 800; + float start_x = rect.width / (page_scale_factor * 2); + float start_y = rect.height / (page_scale_factor * 2); + float speed_in_pixels_s = 800; if (!GetOptionalArg(args, &direction) || !GetOptionalArg(args, &distance_length) || @@ -684,8 +684,8 @@ bool GpuBenchmarking::ScrollBounce(gin::Arguments* args) { distance_length *= page_scale_factor; overscroll_length *= page_scale_factor; - gfx::Vector2d distance; - gfx::Vector2d overscroll; + gfx::Vector2dF distance; + gfx::Vector2dF overscroll; if (direction == "down") { distance.set_y(-distance_length); overscroll.set_y(overscroll_length); @@ -723,10 +723,10 @@ bool GpuBenchmarking::PinchBy(gin::Arguments* args) { return false; float scale_factor; - int anchor_x; - int anchor_y; + float anchor_x; + float anchor_y; v8::Handle<v8::Function> callback; - int relative_pointer_speed_in_pixels_s = 800; + float relative_pointer_speed_in_pixels_s = 800; if (!GetArg(args, &scale_factor) || @@ -770,11 +770,11 @@ bool GpuBenchmarking::Tap(gin::Arguments* args) { if (!context.Init(false)) return false; - int position_x; - int position_y; + float position_x; + float position_y; v8::Handle<v8::Function> callback; int duration_ms = 50; - int gesture_source_type = 0; // DEFAULT_INPUT + int gesture_source_type = SyntheticGestureParams::DEFAULT_INPUT; if (!GetArg(args, &position_x) || !GetArg(args, &position_y) || |