From 95b4d31479e4d3774fde3f3a3a7eb7197f204d0c Mon Sep 17 00:00:00 2001 From: Chandan Padhi Date: Wed, 8 May 2019 11:01:54 +0530 Subject: [PATCH] [M73 Dev][EFL] Move MessagePumpForUIEfl from efl_integration to chromium_impl This commit moves message_pump_for_ui_efl.cc|h files to chromium_impl/base/message_loop/ to align with upstream folder structure. Change-Id: I94badba3b7efd6387cf96d9af1d231ad4cc720ab Signed-off-by: Chandan Padhi --- tizen_src/chromium_impl/base/base_efl.gni | 2 ++ .../base/message_loop}/message_pump_for_ui_efl.cc | 8 ++++---- .../base/message_loop}/message_pump_for_ui_efl.h | 14 ++++++++------ tizen_src/ewk/efl_integration/BUILD.gn | 2 -- tizen_src/ewk/efl_integration/ewk_global_data.cc | 2 +- 5 files changed, 15 insertions(+), 13 deletions(-) rename tizen_src/{ewk/efl_integration => chromium_impl/base/message_loop}/message_pump_for_ui_efl.cc (97%) rename tizen_src/{ewk/efl_integration => chromium_impl/base/message_loop}/message_pump_for_ui_efl.h (81%) diff --git a/tizen_src/chromium_impl/base/base_efl.gni b/tizen_src/chromium_impl/base/base_efl.gni index 10ce612..aabb73b 100644 --- a/tizen_src/chromium_impl/base/base_efl.gni +++ b/tizen_src/chromium_impl/base/base_efl.gni @@ -11,6 +11,8 @@ external_base_configs = [ external_base_sources = [ "//tizen_src/chromium_impl/base/message_loop/message_pump_ecore.cc", "//tizen_src/chromium_impl/base/message_loop/message_pump_ecore.h", + "//tizen_src/chromium_impl/base/message_loop/message_pump_for_ui_efl.cc", + "//tizen_src/chromium_impl/base/message_loop/message_pump_for_ui_efl.h", ] if (use_glib) { diff --git a/tizen_src/ewk/efl_integration/message_pump_for_ui_efl.cc b/tizen_src/chromium_impl/base/message_loop/message_pump_for_ui_efl.cc similarity index 97% rename from tizen_src/ewk/efl_integration/message_pump_for_ui_efl.cc rename to tizen_src/chromium_impl/base/message_loop/message_pump_for_ui_efl.cc index 198175a..486fd01 100644 --- a/tizen_src/ewk/efl_integration/message_pump_for_ui_efl.cc +++ b/tizen_src/chromium_impl/base/message_loop/message_pump_for_ui_efl.cc @@ -2,21 +2,21 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "message_pump_for_ui_efl.h" +#include "base/message_loop/message_pump_for_ui_efl.h" #include "base/command_line.h" #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/time/time.h" #include "cc/base/switches.h" -#include "common/content_switches_efl.h" +#include "ewk/efl_integration/common/content_switches_efl.h" namespace base { namespace { static const char dummy_pipe_message[] = "W"; static const int dummy_pipe_message_size = 1; -} +} // namespace MessagePumpForUIEfl::MessagePumpForUIEfl() : pipe_(ecore_pipe_add(&PipeCallback, this)), @@ -201,4 +201,4 @@ void MessagePumpForUIEfl::DoDelayedWork() { ScheduleDelayedWork(next_delayed_work_time); #endif } -} +} // namespace base diff --git a/tizen_src/ewk/efl_integration/message_pump_for_ui_efl.h b/tizen_src/chromium_impl/base/message_loop/message_pump_for_ui_efl.h similarity index 81% rename from tizen_src/ewk/efl_integration/message_pump_for_ui_efl.h rename to tizen_src/chromium_impl/base/message_loop/message_pump_for_ui_efl.h index b8d5498..fab5ccd 100644 --- a/tizen_src/ewk/efl_integration/message_pump_for_ui_efl.h +++ b/tizen_src/chromium_impl/base/message_loop/message_pump_for_ui_efl.h @@ -5,16 +5,17 @@ #ifndef MESSAGE_PUMP_FOR_UI_EFL #define MESSAGE_PUMP_FOR_UI_EFL -#include "base/message_loop/message_pump.h" -#include "base/synchronization/lock.h" #include #include +#include "base/message_loop/message_pump.h" +#include "base/synchronization/lock.h" namespace base { class RunLoop; class TimeTicks; -// TODO(g.czajkowski): two lines below are needless for limit-memory-allocation-in-schedule-delayed-work. +// TODO(g.czajkowski): two lines below are needless for +// limit-memory-allocation-in-schedule-delayed-work. class MessagePumpForUIEfl; typedef std::pair TimerPair; @@ -23,7 +24,7 @@ class BASE_EXPORT MessagePumpForUIEfl : public base::MessagePump { MessagePumpForUIEfl(); virtual ~MessagePumpForUIEfl(); - virtual void Run(Delegate *) override; + virtual void Run(Delegate*) override; virtual void Quit() override; virtual void ScheduleWork() override; virtual void ScheduleDelayedWork(const base::TimeTicks&) override; @@ -34,7 +35,8 @@ class BASE_EXPORT MessagePumpForUIEfl : public base::MessagePump { void DoWork(); void DoDelayedWork(); - // TODO(g.czajkowski): needless if limit-memory-allocation-in-schedule-delayed-work gets accepted. + // TODO(g.czajkowski): needless if + // limit-memory-allocation-in-schedule-delayed-work gets accepted. std::unordered_set pending_timers_; Ecore_Pipe* pipe_; Ecore_Timer* schedule_delayed_work_timer_; @@ -47,6 +49,6 @@ class BASE_EXPORT MessagePumpForUIEfl : public base::MessagePump { DISALLOW_COPY_AND_ASSIGN(MessagePumpForUIEfl); }; -} +} // namespace base #endif diff --git a/tizen_src/ewk/efl_integration/BUILD.gn b/tizen_src/ewk/efl_integration/BUILD.gn index e2c28a3..7740682 100644 --- a/tizen_src/ewk/efl_integration/BUILD.gn +++ b/tizen_src/ewk/efl_integration/BUILD.gn @@ -251,8 +251,6 @@ shared_library("chromium-ewk") { "http_user_agent_settings_efl.h", "locale_efl.cc", "locale_efl.h", - "message_pump_for_ui_efl.cc", - "message_pump_for_ui_efl.h", "network_delegate_efl.cc", "network_delegate_efl.h", "notification_permission_popup.cc", diff --git a/tizen_src/ewk/efl_integration/ewk_global_data.cc b/tizen_src/ewk/efl_integration/ewk_global_data.cc index a947a39..7a8f271 100644 --- a/tizen_src/ewk/efl_integration/ewk_global_data.cc +++ b/tizen_src/ewk/efl_integration/ewk_global_data.cc @@ -9,6 +9,7 @@ #include "base/feature_list.h" #include "base/logging.h" #include "base/message_loop/message_loop.h" +#include "base/message_loop/message_pump_for_ui_efl.h" #include "base/path_service.h" #include "browser/autofill/personal_data_manager_factory.h" #include "content/browser/gpu/gpu_process_host.h" @@ -33,7 +34,6 @@ #include "command_line_efl.h" #include "content_main_delegate_efl.h" -#include "message_pump_for_ui_efl.h" #include "ui/display/screen_efl.h" #include "content/browser/gpu/gpu_main_thread_factory.h" -- 2.7.4