Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / ui / aura / test / aura_test_base.cc

diff --git a/src/ui/aura/test/aura_test_base.cc b/src/ui/aura/test/aura_test_base.cc
index d5263e4..67272bd 100644 (file)
--- a/src/ui/aura/test/aura_test_base.cc
+++ b/src/ui/aura/test/aura_test_base.cc
@@ -5,11 +5,14 @@
 #include "ui/aura/test/aura_test_base.h"
 
 #include "ui/aura/client/window_tree_client.h"
-#include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_helper.h"
 #include "ui/aura/test/test_window_delegate.h"
+#include "ui/aura/window.h"
 #include "ui/base/ime/input_method_initializer.h"
-#include "ui/events/gestures/gesture_configuration.h"
+#include "ui/compositor/test/context_factories_for_test.h"
+#include "ui/events/event_dispatcher.h"
+#include "ui/events/event_processor.h"
+#include "ui/events/gesture_detection/gesture_configuration.h"
 
 namespace aura {
 namespace test {
@@ -30,45 +33,31 @@ void AuraTestBase::SetUp() {
   setup_called_ = true;
   testing::Test::SetUp();
   ui::InitializeInputMethodForTesting();
-
+  ui::GestureConfiguration* gesture_config =
+      ui::GestureConfiguration::GetInstance();
   // Changing the parameters for gesture recognition shouldn't cause
   // tests to fail, so we use a separate set of parameters for unit
   // testing.
-  ui::GestureConfiguration::set_long_press_time_in_seconds(1.0);
-  ui::GestureConfiguration::set_semi_long_press_time_in_seconds(0.4);
-  ui::GestureConfiguration::set_show_press_delay_in_ms(5);
-  ui::GestureConfiguration::set_max_distance_for_two_finger_tap_in_pixels(300);
-  ui::GestureConfiguration::set_max_seconds_between_double_click(0.7);
-  ui::GestureConfiguration::
-      set_max_separation_for_gesture_touches_in_pixels(150);
-  ui::GestureConfiguration::
-      set_max_touch_down_duration_in_seconds_for_click(0.8);
-  ui::GestureConfiguration::set_max_touch_move_in_pixels_for_click(5);
-  ui::GestureConfiguration::set_max_distance_between_taps_for_double_tap(20);
-  ui::GestureConfiguration::set_min_distance_for_pinch_scroll_in_pixels(20);
-  ui::GestureConfiguration::set_min_flick_speed_squared(550.f * 550.f);
-  ui::GestureConfiguration::set_min_pinch_update_distance_in_pixels(5);
-  ui::GestureConfiguration::set_min_rail_break_velocity(200);
-  ui::GestureConfiguration::set_min_scroll_delta_squared(5 * 5);
-  ui::GestureConfiguration::
-      set_min_touch_down_duration_in_seconds_for_click(0.01);
-  ui::GestureConfiguration::set_points_buffered_for_velocity(10);
-  ui::GestureConfiguration::set_rail_break_proportion(15);
-  ui::GestureConfiguration::set_rail_start_proportion(2);
-  ui::GestureConfiguration::set_scroll_prediction_seconds(0);
-  ui::GestureConfiguration::set_default_radius(0);
-  ui::GestureConfiguration::set_fling_acceleration_curve_coefficients(
-      0, 0.0166667f);
-  ui::GestureConfiguration::set_fling_acceleration_curve_coefficients(
-      1, -0.0238095f);
-  ui::GestureConfiguration::set_fling_acceleration_curve_coefficients(
-      2, 0.0452381f);
-  ui::GestureConfiguration::set_fling_acceleration_curve_coefficients(
-      3, 0.8f);
-  ui::GestureConfiguration::set_fling_velocity_cap(15000.0f);
+  gesture_config->set_long_press_time_in_ms(1000);
+  gesture_config->set_semi_long_press_time_in_ms(400);
+  gesture_config->set_show_press_delay_in_ms(5);
+  gesture_config->set_max_distance_for_two_finger_tap_in_pixels(300);
+  gesture_config->set_max_time_between_double_click_in_ms(700);
+  gesture_config->set_max_separation_for_gesture_touches_in_pixels(150);
+  gesture_config->set_max_touch_down_duration_for_click_in_ms(800);
+  gesture_config->set_max_touch_move_in_pixels_for_click(5);
+  gesture_config->set_max_distance_between_taps_for_double_tap(20);
+  gesture_config->set_min_distance_for_pinch_scroll_in_pixels(20);
+  gesture_config->set_default_radius(0);
+  gesture_config->set_max_fling_velocity(15000);
+  gesture_config->set_min_swipe_velocity(10);
+  // The ContextFactory must exist before any Compositors are created.
+  bool enable_pixel_output = false;
+  ui::ContextFactory* context_factory =
+      ui::InitializeContextFactoryForTests(enable_pixel_output);
 
   helper_.reset(new AuraTestHelper(&message_loop_));
-  helper_->SetUp();
+  helper_->SetUp(context_factory);
 }
 
 void AuraTestBase::TearDown() {
@@ -79,6 +68,7 @@ void AuraTestBase::TearDown() {
   RunAllPendingInMessageLoop();
 
   helper_->TearDown();
+  ui::TerminateContextFactoryForTests();
   ui::ShutdownInputMethodForTesting();
   testing::Test::TearDown();
 }
@@ -89,23 +79,13 @@ Window* AuraTestBase::CreateNormalWindow(int id, Window* parent,
       delegate ? delegate :
       test::TestWindowDelegate::CreateSelfDestroyingDelegate());
   window->set_id(id);
-  window->Init(ui::LAYER_TEXTURED);
+  window->Init(aura::WINDOW_LAYER_TEXTURED);
   parent->AddChild(window);
   window->SetBounds(gfx::Rect(0, 0, 100, 100));
   window->Show();
   return window;
 }
 
-Window* AuraTestBase::CreateTransientChild(int id, Window* parent) {
-  Window* window = new Window(NULL);
-  window->set_id(id);
-  window->SetType(aura::client::WINDOW_TYPE_NORMAL);
-  window->Init(ui::LAYER_TEXTURED);
-  aura::client::ParentWindowWithContext(window, root_window(), gfx::Rect());
-  parent->AddTransientChild(window);
-  return window;
-}
-
 void AuraTestBase::RunAllPendingInMessageLoop() {
   helper_->RunAllPendingInMessageLoop();
 }
@@ -114,5 +94,12 @@ void AuraTestBase::ParentWindow(Window* window) {
   client::ParentWindowWithContext(window, root_window(), gfx::Rect());
 }
 
+bool AuraTestBase::DispatchEventUsingWindowDispatcher(ui::Event* event) {
+  ui::EventDispatchDetails details =
+      event_processor()->OnEventFromSource(event);
+  CHECK(!details.dispatcher_destroyed);
+  return event->handled();
+}
+
 }  // namespace test
 }  // namespace aura