Enable content shell with aura for desktop 16/284216/5
authorChandan Padhi <c.padhi@samsung.com>
Fri, 11 Nov 2022 15:12:21 +0000 (20:42 +0530)
committerChandan Padhi <c.padhi@samsung.com>
Wed, 16 Nov 2022 06:37:56 +0000 (12:07 +0530)
This commit does the following,
1. Enables aura for chromium-efl
2. Updates chromium-efl code as per upstream changes
3. Removes EFL port specific code
4. Enables onscreen Rendering based on Ozone X11(desktop)
   and brings up content_shell.

References:
https://review.tizen.org/gerrit/268664/
https://review.tizen.org/gerrit/280651/
https://review.tizen.org/gerrit/281414/

Build: $ ./tizen_src/build/build_desktop.sh
Launch: $ ./out.x64/content_shell --no-sandbox --ignore-gpu-blocklist
        --in-process-gpu --use-gl=egl

Change-Id: Iab7fa54c0cb7896bceee2a443707d603d67886fe
Signed-off-by: Chandan Padhi <c.padhi@samsung.com>
230 files changed:
build/config/clang/clang.gni
build/config/compiler/BUILD.gn
build/config/features.gni
build/config/linux/libdrm/BUILD.gn
cc/mojo_embedder/async_layer_tree_frame_sink.cc
cc/trees/layer_tree_host_impl.cc
cc/trees/layer_tree_host_impl.h
components/cbor/values.h
content/browser/BUILD.gn
content/browser/browser_interface_binders.cc
content/browser/browser_main_loop.cc
content/browser/browser_main_loop.h
content/browser/compositor/surface_utils.cc
content/browser/renderer_host/render_process_host_impl.cc
content/browser/renderer_host/render_widget_host_impl.cc
content/browser/renderer_host/render_widget_host_impl.h
content/browser/renderer_host/render_widget_host_view_base.h
content/public/browser/login_delegate.h
content/shell/BUILD.gn
content/shell/browser/shell.cc
content/shell/browser/shell_content_browser_client.cc
content/test/BUILD.gn
gpu/command_buffer/build_cmd_buffer_lib.py
gpu/command_buffer/build_gles2_cmd_buffer.py
gpu/command_buffer/client/gles2_implementation_efl_autogen.h [deleted file]
gpu/command_buffer/client/gles2_implementation_efl_header_autogen.h [deleted file]
gpu/ipc/service/gpu_channel_manager.cc
media/BUILD.gn
media/gpu/args.gni
media/learning/common/labelled_example.cc
media/media_options.gni
third_party/blink/renderer/platform/heap/thread_local.h
third_party/libdrm/BUILD.gn
third_party/minigbm/BUILD.gn
third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
tizen_src/.gn
tizen_src/build/common.sh
tizen_src/build/config/tizen_features.gni
tizen_src/build/gn_chromiumefl.sh
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
tizen_src/chromium_impl/components/js_dialogs_efl/javascript_dialog_manager_efl.h
tizen_src/chromium_impl/components/js_dialogs_efl/javascript_modal_dialog_efl.cc
tizen_src/chromium_impl/content/browser/browser_efl.gni
tizen_src/chromium_impl/content/browser/compositor/evasgl_context_provider.cc [deleted file]
tizen_src/chromium_impl/content/browser/compositor/evasgl_context_provider.h [deleted file]
tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.cc [deleted file]
tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.h [deleted file]
tizen_src/chromium_impl/content/browser/compositor/evasgl_output_surface.cc [deleted file]
tizen_src/chromium_impl/content/browser/compositor/evasgl_output_surface.h [deleted file]
tizen_src/chromium_impl/content/browser/javascript_dialog/javascript_modal_dialog.cc
tizen_src/chromium_impl/content/browser/media/browser_mediapacket_manager.h
tizen_src/chromium_impl/content/browser/media/capture/mouse_cursor_overlay_controller_efl.cc [deleted file]
tizen_src/chromium_impl/content/browser/media/efl/browser_demuxer_efl.cc
tizen_src/chromium_impl/content/browser/media/efl/browser_demuxer_efl.h
tizen_src/chromium_impl/content/browser/media/efl/browser_media_player_manager_efl.h
tizen_src/chromium_impl/content/browser/media/media_web_contents_observer_efl.h
tizen_src/chromium_impl/content/browser/renderer_host/disambiguation_popup_efl.cc [deleted file]
tizen_src/chromium_impl/content/browser/renderer_host/disambiguation_popup_efl.h [deleted file]
tizen_src/chromium_impl/content/browser/renderer_host/event_resampler.cc [deleted file]
tizen_src/chromium_impl/content/browser/renderer_host/event_resampler.h [deleted file]
tizen_src/chromium_impl/content/browser/renderer_host/im_context_efl.cc [deleted file]
tizen_src/chromium_impl/content/browser/renderer_host/im_context_efl.h [deleted file]
tizen_src/chromium_impl/content/browser/renderer_host/native_web_keyboard_event_efl.cc [deleted file]
tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc [deleted file]
tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h [deleted file]
tizen_src/chromium_impl/content/browser/renderer_host/web_event_factory_efl.cc [deleted file]
tizen_src/chromium_impl/content/browser/renderer_host/web_event_factory_efl.h [deleted file]
tizen_src/chromium_impl/content/browser/screen_orientation/screen_orientation_delegate_efl.cc
tizen_src/chromium_impl/content/browser/screen_orientation/screen_orientation_delegate_efl.h
tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc
tizen_src/chromium_impl/content/browser/selection/selection_magnifier_efl.cc
tizen_src/chromium_impl/content/browser/speech/tts_message_filter_efl.h
tizen_src/chromium_impl/content/browser/tracing/tracing_controller_efl.h
tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.h
tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.cc [deleted file]
tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.h [deleted file]
tizen_src/chromium_impl/content/browser/web_contents/web_drag_dest_efl.cc
tizen_src/chromium_impl/content/browser/web_contents/web_drag_dest_efl.h
tizen_src/chromium_impl/content/browser/web_contents/web_drag_source_efl.cc
tizen_src/chromium_impl/content/browser/web_contents/web_drag_source_efl.h
tizen_src/chromium_impl/content/common/cursors/webcursor_efl.cc
tizen_src/chromium_impl/content/common/gpu/media/efl/tizen_video_decode_accelerator.h
tizen_src/chromium_impl/content/common/gpu/media/efl/tizen_video_encode_accelerator.h
tizen_src/chromium_impl/content/gpu/in_process_gpu_thread_efl.cc
tizen_src/chromium_impl/content/renderer/media/efl/renderer_demuxer_efl.h
tizen_src/chromium_impl/content/renderer/media/efl/renderer_media_player_manager_efl.h
tizen_src/chromium_impl/content/renderer/media/efl/webmediaplayer_efl.h
tizen_src/chromium_impl/content/renderer/media/tizen/audio_decoder_capi.cc
tizen_src/chromium_impl/content/renderer/tts_dispatcher_efl.h
tizen_src/chromium_impl/content/shell/browser/shell_efl.cc
tizen_src/chromium_impl/content/shell/browser/shell_web_contents_view_delegate_efl.cc
tizen_src/chromium_impl/device/battery/battery_status_manager_tizen.h
tizen_src/chromium_impl/efl/init.cc
tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.cc [deleted file]
tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.h [deleted file]
tizen_src/chromium_impl/gpu/config/gpu_info_collector_efl.cc [deleted file]
tizen_src/chromium_impl/gpu/config/scoped_restore_non_owned_egl_context.cc [deleted file]
tizen_src/chromium_impl/gpu/config/scoped_restore_non_owned_egl_context.h [deleted file]
tizen_src/chromium_impl/gpu/gpu_efl.gni
tizen_src/chromium_impl/media/audio/tizen/audio_manager_capi.h
tizen_src/chromium_impl/media/audio/tizen/capi_audio_input.h
tizen_src/chromium_impl/media/audio/tizen/capi_audio_output.h
tizen_src/chromium_impl/media/base/efl/media_player_efl.h
tizen_src/chromium_impl/media/base/tizen/media_player_bridge_capi.h
tizen_src/chromium_impl/media/base/tizen/media_source_player_capi.h
tizen_src/chromium_impl/media/base/tizen/webaudio_decoder_browser_capi.h
tizen_src/chromium_impl/media/capture/video/tizen/video_capture_device_factory_tizen.cc
tizen_src/chromium_impl/media/capture/video/tizen/video_capture_device_factory_tizen.h
tizen_src/chromium_impl/media/capture/video/tizen/video_capture_device_tizen.h
tizen_src/chromium_impl/ui/BUILD.gn [deleted file]
tizen_src/chromium_impl/ui/base/clipboard/clipboard_helper_efl.cc
tizen_src/chromium_impl/ui/base/clipboard/clipboard_helper_efl.h
tizen_src/chromium_impl/ui/base/resource/resource_bundle_efl.cc [deleted file]
tizen_src/chromium_impl/ui/display/device_display_info_efl.cc
tizen_src/chromium_impl/ui/display/device_display_info_efl.h
tizen_src/chromium_impl/ui/display/screen_efl.cc [deleted file]
tizen_src/chromium_impl/ui/display/screen_efl.h [deleted file]
tizen_src/chromium_impl/ui/events/gesture_detection/gesture_configuration_efl.cc [deleted file]
tizen_src/chromium_impl/ui/events/gestures/gesture_recognizer_impl_efl.cc [deleted file]
tizen_src/chromium_impl/ui/events/gestures/gesture_recognizer_impl_efl.h [deleted file]
tizen_src/chromium_impl/ui/events/gestures/gesture_recognizer_impl_override.cc [deleted file]
tizen_src/chromium_impl/ui/ozone/ozone_platform_efl.cc
tizen_src/chromium_impl/ui/ozone/surface_factory_efl.cc
tizen_src/chromium_impl/ui/ozone/surface_factory_efl.h
tizen_src/chromium_impl/ui/snapshot/snapshot_efl.cc [deleted file]
tizen_src/chromium_impl/ui/ui_efl.gni
tizen_src/chromium_impl/ui/ui_efl_injections.gni [deleted file]
tizen_src/ewk/efl_integration/browser/autofill/autofill_client_efl.h
tizen_src/ewk/efl_integration/browser/autofill/personal_data_manager_factory.h
tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.cc
tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.cc
tizen_src/ewk/efl_integration/browser/favicon/favicon_database.cc
tizen_src/ewk/efl_integration/browser/favicon/favicon_database.h
tizen_src/ewk/efl_integration/browser/favicon/favicon_database_p.cc
tizen_src/ewk/efl_integration/browser/favicon/favicon_database_p.h
tizen_src/ewk/efl_integration/browser/favicon/favicon_downloader.cc
tizen_src/ewk/efl_integration/browser/favicon/favicon_downloader.h
tizen_src/ewk/efl_integration/browser/geolocation/geolocation_permission_context_efl.cc
tizen_src/ewk/efl_integration/browser/geolocation/location_provider_efl.h
tizen_src/ewk/efl_integration/browser/javascript_dialog_manager_efl.h
tizen_src/ewk/efl_integration/browser/mime_override_manager_efl.h
tizen_src/ewk/efl_integration/browser/notification/notification_controller_efl.cc
tizen_src/ewk/efl_integration/browser/notification/notification_controller_efl.h
tizen_src/ewk/efl_integration/browser/password_manager/password_manager_client_efl.h
tizen_src/ewk/efl_integration/browser/password_manager/password_store_factory.h
tizen_src/ewk/efl_integration/browser/policy_response_delegate_efl.cc
tizen_src/ewk/efl_integration/browser/quota_permission_context_efl.cc
tizen_src/ewk/efl_integration/browser/render_message_filter_efl.cc
tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.cc
tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.cc
tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.h
tizen_src/ewk/efl_integration/browser/vibration/vibration_provider_client.h
tizen_src/ewk/efl_integration/browser/web_cache_efl/web_cache_manager_efl.h
tizen_src/ewk/efl_integration/browser/web_view_browser_message_filter.cc
tizen_src/ewk/efl_integration/browser/webdata/web_data_service.h
tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.h
tizen_src/ewk/efl_integration/browser_context_efl.h
tizen_src/ewk/efl_integration/browser_main_parts_efl.h
tizen_src/ewk/efl_integration/command_line_efl.cc
tizen_src/ewk/efl_integration/common/version_info.h
tizen_src/ewk/efl_integration/content_browser_client_efl.cc
tizen_src/ewk/efl_integration/content_browser_client_efl.h
tizen_src/ewk/efl_integration/content_main_delegate_efl.cc
tizen_src/ewk/efl_integration/content_main_delegate_efl.h
tizen_src/ewk/efl_integration/context_menu_controller_efl.cc
tizen_src/ewk/efl_integration/cookie_manager.cc
tizen_src/ewk/efl_integration/cookie_manager.h
tizen_src/ewk/efl_integration/devtools_manager_delegate_efl.h
tizen_src/ewk/efl_integration/efl_webprocess_main.cc
tizen_src/ewk/efl_integration/eweb_context.cc
tizen_src/ewk/efl_integration/eweb_view.cc
tizen_src/ewk/efl_integration/eweb_view.h
tizen_src/ewk/efl_integration/ewk_global_data.cc
tizen_src/ewk/efl_integration/ewk_global_data.h
tizen_src/ewk/efl_integration/http_user_agent_settings_efl.h
tizen_src/ewk/efl_integration/network_delegate_efl.cc
tizen_src/ewk/efl_integration/network_delegate_efl.h
tizen_src/ewk/efl_integration/permission_controller_delegate_efl.cc
tizen_src/ewk/efl_integration/permission_controller_delegate_efl.h
tizen_src/ewk/efl_integration/private/ewk_context_private.h
tizen_src/ewk/efl_integration/private/ewk_frame_private.cc
tizen_src/ewk/efl_integration/private/ewk_hit_test_private.h
tizen_src/ewk/efl_integration/private/ewk_notification_private.h
tizen_src/ewk/efl_integration/private/ewk_policy_decision_private.cc
tizen_src/ewk/efl_integration/private/ewk_quota_permission_request_private.h
tizen_src/ewk/efl_integration/private/ewk_security_origin_private.h
tizen_src/ewk/efl_integration/private/ewk_settings_private.cc
tizen_src/ewk/efl_integration/private/ewk_view_private.cc
tizen_src/ewk/efl_integration/private/webview_delegate_ewk.h
tizen_src/ewk/efl_integration/public/ewk_dispatcher.cc
tizen_src/ewk/efl_integration/public/ewk_error.cc
tizen_src/ewk/efl_integration/public/ewk_ipc_message.cc
tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc
tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.h
tizen_src/ewk/efl_integration/renderer/content_settings_client_efl.h
tizen_src/ewk/efl_integration/renderer/plugins/plugin_placeholder_efl.h
tizen_src/ewk/efl_integration/renderer/print_web_view_helper_efl.cc
tizen_src/ewk/efl_integration/renderer/print_web_view_helper_efl.h
tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc
tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.cc [deleted file]
tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.h [deleted file]
tizen_src/ewk/efl_integration/shared_url_loader_factory_efl.h
tizen_src/ewk/efl_integration/url_request_context_getter_efl.cc
tizen_src/ewk/efl_integration/url_request_context_getter_efl.h
tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc
tizen_src/ewk/efl_integration/web_contents_delegate_efl.h
tizen_src/ewk/efl_integration/web_contents_efl_delegate_ewk.cc
tizen_src/ewk/efl_integration/web_contents_efl_delegate_ewk.h
tizen_src/ewk/efl_integration/web_contents_view_delegate_ewk.cc
tizen_src/ewk/efl_integration/web_contents_view_delegate_ewk.h
tizen_src/ewk/efl_integration/wrt/dynamicplugin.h
tizen_src/ewk/efl_integration/wrt/wrt_dynamicplugin.h
tizen_src/ewk/efl_integration/wrt/wrt_file_protocol_handler.h
tizen_src/ewk/efl_integration/wrt/wrt_widget_host.h
tizen_src/ewk/po_tizen/BUILD.gn
ui/base/BUILD.gn
ui/base/ime/linux/BUILD.gn
ui/events/BUILD.gn
ui/events/ozone/evdev/BUILD.gn
ui/gfx/BUILD.gn
ui/gfx/linux/BUILD.gn
ui/gfx/x/event.cc
ui/gl/BUILD.gn
ui/native_theme/BUILD.gn
ui/qt/qt.gni
ui/snapshot/BUILD.gn
ui/views/BUILD.gn

index 031c092..a97d64f 100644 (file)
@@ -11,7 +11,7 @@ declare_args() {
   # coding guidelines, etc. Only used when compiling with Chrome's Clang, not
   # Chrome OS's.
   clang_use_chrome_plugins =
-      is_clang && !is_tizen && !is_nacl && current_os != "zos" &&
+      is_clang && !use_efl && !is_nacl && current_os != "zos" &&
       default_toolchain != "//build/toolchain/cros:target"
 
   clang_base_path = default_clang_base_path
index 6b591d3..99167d9 100644 (file)
@@ -342,8 +342,8 @@ config("compiler") {
     }
 
     # Linker warnings.
-    if (fatal_linker_warnings && !is_apple && current_os != "aix" && !use_efl
-        && current_os != "zos") {
+    if (fatal_linker_warnings && !is_apple && current_os != "aix" && !use_efl &&
+        current_os != "zos") {
       ldflags += [ "-Wl,--fatal-warnings" ]
     }
     if (fatal_linker_warnings && is_apple) {
@@ -565,8 +565,8 @@ config("compiler") {
 
   # C11/C++11 compiler flags setup.
   # ---------------------------
-  if (is_linux || is_tizen || is_chromeos || is_android || (is_nacl && is_clang) ||
-      current_os == "aix") {
+  if (is_linux || is_tizen || is_chromeos || is_android ||
+      (is_nacl && is_clang) || current_os == "aix") {
     if (is_clang) {
       standard_prefix = "c"
 
@@ -1575,7 +1575,7 @@ config("default_warnings") {
         "-Wno-ignored-pragma-optimize",
       ]
 
-      if (!is_nacl) {
+      if (!is_nacl && !use_efl) {
         cflags += [
           # TODO(crbug.com/1343975) Evaluate and possibly enable.
           "-Wno-deprecated-builtins",
index f6d4f77..35fdcc2 100644 (file)
@@ -16,6 +16,7 @@
 
 import("//build/config/chrome_build.gni")
 import("//build/config/chromecast_build.gni")
+import("//tizen_src/build/config/tizen_features.gni")
 
 declare_args() {
   # Enables proprietary codecs and demuxers; e.g. H264, AAC, MP3, and MP4.
@@ -37,14 +38,9 @@ declare_args() {
 
   use_gio = is_linux && !is_castos
 }
-
 #
 # =============================================
 #   PLEASE DO NOT ADD MORE FLAGS TO THIS FILE
 # =============================================
 #
 # See comment at the top.
-
-if (use_efl) {
-  import("//tizen_src/build/config/tizen_features.gni")
-}
index 211a5a2..f4d2177 100644 (file)
@@ -5,7 +5,7 @@ import("//build/config/chromecast_build.gni")
 import("//build/config/chromeos/args.gni")
 import("//build/config/linux/pkg_config.gni")
 
-assert(is_linux || is_chromeos)
+assert(is_linux || is_chromeos || is_tizen)
 
 declare_args() {
   # Controls whether the build should use the version of libdrm library shipped
index be691c1..029471a 100644 (file)
 #include "components/viz/common/hit_test/hit_test_region_list.h"
 #include "components/viz/common/quads/compositor_frame.h"
 
-#if defined(USE_EFL)
-#include "gpu/command_buffer/client/gles2_interface.h"
-#endif
-
 namespace cc {
 namespace mojo_embedder {
 
@@ -151,11 +147,6 @@ void AsyncLayerTreeFrameSink::SubmitCompositorFrame(
       "SubmitCompositorFrame", "local_surface_id",
       local_surface_id_.ToString());
 
-#if defined(USE_EFL)
-  local_surface_id_ = viz::LocalSurfaceId(viz::kInitialParentSequenceNumber,
-                                          viz::kInitialChildSequenceNumber,
-                                          base::UnguessableToken::Create());
-#else
   if (local_surface_id_ == last_submitted_local_surface_id_) {
     DCHECK_EQ(last_submitted_device_scale_factor_, frame.device_scale_factor());
     DCHECK_EQ(last_submitted_size_in_pixels_.height(),
@@ -163,7 +154,6 @@ void AsyncLayerTreeFrameSink::SubmitCompositorFrame(
     DCHECK_EQ(last_submitted_size_in_pixels_.width(),
               frame.size_in_pixels().width());
   }
-#endif
 
   absl::optional<viz::HitTestRegionList> hit_test_region_list =
       client_->BuildHitTestData();
@@ -224,13 +214,6 @@ void AsyncLayerTreeFrameSink::SubmitCompositorFrame(
   power_mode_voter_.OnFrameProduced(frame.render_pass_list.back()->damage_rect,
                                     frame.device_scale_factor());
 
-#if defined(USE_EFL)
-  if (auto* compositor_context_provider = context_provider()) {
-    compositor_context_provider->ContextGL()->Flush();
-    compositor_context_provider->ContextGL()->GetError();
-  }
-#endif
-
   compositor_frame_sink_ptr_->SubmitCompositorFrame(
       local_surface_id_, std::move(frame), std::move(hit_test_region_list), 0);
 }
index 86f1bbb..e4db813 100644 (file)
@@ -369,7 +369,8 @@ LayerTreeHostImpl::FrameData::FrameData() = default;
 LayerTreeHostImpl::FrameData::~FrameData() = default;
 LayerTreeHostImpl::UIResourceData::UIResourceData() = default;
 LayerTreeHostImpl::UIResourceData::~UIResourceData() = default;
-LayerTreeHostImpl::UIResourceData::UIResourceData(UIResourceData&&) = default;
+LayerTreeHostImpl::UIResourceData::UIResourceData(UIResourceData&&) noexcept =
+    default;
 LayerTreeHostImpl::UIResourceData& LayerTreeHostImpl::UIResourceData::operator=(
     UIResourceData&&) = default;
 
index 0f8fcb1..907909d 100644 (file)
@@ -241,7 +241,7 @@ class CC_EXPORT LayerTreeHostImpl : public TileManagerClient,
   struct CC_EXPORT UIResourceData {
     UIResourceData();
     UIResourceData(const UIResourceData&) = delete;
-    UIResourceData(UIResourceData&&);
+    UIResourceData(UIResourceData&&) noexcept;
     ~UIResourceData();
 
     UIResourceData& operator=(const UIResourceData&) = delete;
index 32ae071..a443cd6 100644 (file)
@@ -123,12 +123,7 @@ class CBOR_EXPORT Value {
   Value() noexcept;  // A NONE value.
 
   explicit Value(Type type);
-#if defined(EWK_BRINGUP)
-  // gcc compiler is implicitely generating a deleted copy constructor
-  // and build fails when deleted copy constructor is used hence
-  // explicitely added here to avoid implicit gcc compiler generation.
-  Value(const Value&) {}
-#endif
+
   explicit Value(SimpleValue in_simple);
   explicit Value(bool boolean_value);
 
index a48f2e5..ae8f94a 100644 (file)
@@ -3123,21 +3123,6 @@ source_set("browser") {
     ]
   }
 
-  if (use_efl) {
-    sources -= [
-      "speech/audio_encoder.cc",
-      "speech/audio_encoder.h",
-      "speech/speech_recognition_dispatcher_host.cc",
-      "speech/speech_recognition_dispatcher_host.h",
-      "speech/speech_recognition_engine.cc",
-      "speech/speech_recognition_engine.h",
-      "speech/speech_recognition_manager_impl.cc",
-      "speech/speech_recognition_manager_impl.h",
-      "speech/speech_recognizer_impl.cc",
-      "speech/speech_recognizer_impl.h",
-    ]
-  }
-
   if (is_mac) {
     deps += [
       "//media",
index 7164adb..ba1ffe3 100644 (file)
@@ -723,12 +723,10 @@ void PopulateFrameBinders(RenderFrameHostImpl* host, mojo::BinderMap* map) {
   map->Add<blink::mojom::SharedWorkerConnector>(
       base::BindRepeating(&BindSharedWorkerConnector, base::Unretained(host)));
 
-#if !defined(USE_EFL)
   map->Add<blink::mojom::SpeechRecognizer>(
       base::BindRepeating(&SpeechRecognitionDispatcherHost::Create,
                           host->GetProcess()->GetID(), host->GetRoutingID()),
       GetIOThreadTaskRunner({}));
-#endif
 
   map->Add<blink::mojom::SpeechSynthesis>(base::BindRepeating(
       &RenderFrameHostImpl::GetSpeechSynthesis, base::Unretained(host)));
index 25913c0..28a7e2b 100644 (file)
 #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h"
 #endif
 
-#if defined(USE_EFL)
-#include "components/viz/service/display_embedder/server_shared_bitmap_manager.h"
-#include "components/viz/service/frame_sinks/frame_sink_manager_impl.h"
-#endif
-
 // One of the linux specific headers defines this as a macro.
 #ifdef DestroyAll
 #undef DestroyAll
@@ -1103,14 +1098,12 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
     midi_service_->Shutdown();
   }
 
-#if !defined(USE_EFL)
   {
     TRACE_EVENT0("shutdown",
                  "BrowserMainLoop::Subsystem:SpeechRecognitionManager");
     io_thread_->task_runner()->DeleteSoon(
         FROM_HERE, speech_recognition_manager_.release());
   }
-#endif
 
   TtsControllerImpl::GetInstance()->Shutdown();
 
@@ -1143,9 +1136,6 @@ void BrowserMainLoop::ShutdownThreadsAndCleanUp() {
 
 #if !BUILDFLAG(IS_ANDROID)
   host_frame_sink_manager_.reset();
-#endif
-
-#if !defined(OS_ANDROID) && !defined(USE_EFL)
   compositing_mode_reporter_impl_.reset();
 #endif
 
@@ -1279,16 +1269,6 @@ void BrowserMainLoop::PostCreateThreadsImpl() {
   established_gpu_channel = false;
   always_uses_gpu = ShouldStartGpuProcessOnBrowserStartup();
   BrowserGpuChannelHostFactory::Initialize(established_gpu_channel);
-#elif defined(USE_EFL)
-  shared_bitmap_manager_ = std::make_unique<viz::ServerSharedBitmapManager>();
-  frame_sink_manager_ =
-      std::make_unique<viz::FrameSinkManagerImpl>(shared_bitmap_manager_.get());
-  host_frame_sink_manager_ = std::make_unique<viz::HostFrameSinkManager>();
-  BrowserGpuChannelHostFactory::Initialize(established_gpu_channel);
-
-  // Directly connect without using Mojo.
-  frame_sink_manager_->SetLocalClient(host_frame_sink_manager_.get());
-  host_frame_sink_manager_->SetLocalManager(frame_sink_manager_.get());
 #else
   established_gpu_channel = true;
   if (parsed_command_line_.HasSwitch(switches::kDisableGpu) ||
@@ -1364,14 +1344,14 @@ void BrowserMainLoop::PostCreateThreadsImpl() {
     media_stream_manager_ =
         std::make_unique<MediaStreamManager>(audio_system_.get());
   }
-#if !defined(USE_EFL)
+
   {
     TRACE_EVENT0("startup",
                  "BrowserMainLoop::PostCreateThreads:InitSpeechRecognition");
     speech_recognition_manager_.reset(new SpeechRecognitionManagerImpl(
         audio_system_.get(), media_stream_manager_.get()));
   }
-#endif
+
   {
     TRACE_EVENT0("startup",
                  "BrowserMainLoop::PostCreateThreads::InitUserInputMonitor");
index 8f0a2aa..b2660cd 100644 (file)
@@ -82,10 +82,6 @@ class NetworkChangeNotifier;
 namespace viz {
 class CompositingModeReporterImpl;
 class HostFrameSinkManager;
-#if defined(USE_EFL)
-class FrameSinkManagerImpl;
-class ServerSharedBitmapManager;
-#endif
 }  // namespace viz
 
 namespace content {
@@ -371,10 +367,8 @@ class CONTENT_EXPORT BrowserMainLoop {
 
   std::unique_ptr<midi::MidiService> midi_service_;
 
-#if !defined(USE_EFL)
   // Must be deleted on the IO thread.
   std::unique_ptr<SpeechRecognitionManagerImpl> speech_recognition_manager_;
-#endif
 
 #if BUILDFLAG(IS_WIN)
   std::unique_ptr<media::SystemMessageWindowWin> system_message_window_;
@@ -389,9 +383,7 @@ class CONTENT_EXPORT BrowserMainLoop {
   std::unique_ptr<content::TracingControllerImpl> tracing_controller_;
 #if !BUILDFLAG(IS_ANDROID)
   std::unique_ptr<viz::HostFrameSinkManager> host_frame_sink_manager_;
-#endif
 
-#if !defined(OS_ANDROID) && !defined(USE_EFL)
   // Reports on the compositing mode in the system for clients to submit
   // resources of the right type. This is null if the display compositor
   // is not in this process.
index f83e8c8..3b87163 100644 (file)
 #include "ui/compositor/compositor.h"  // nogncheck
 #endif
 
-#if defined(USE_EFL)
-#include "content/browser/browser_main_loop.h"
-#endif
-
 namespace content {
 
 viz::FrameSinkId AllocateFrameSinkId() {
 #if BUILDFLAG(IS_ANDROID)
   return CompositorDependenciesAndroid::Get().AllocateFrameSinkId();
-#elif defined(USE_EFL)
-  return viz::FrameSinkId();
 #else
   ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
   return factory->GetContextFactory()->AllocateFrameSinkId();
@@ -34,8 +28,6 @@ viz::FrameSinkId AllocateFrameSinkId() {
 viz::HostFrameSinkManager* GetHostFrameSinkManager() {
 #if BUILDFLAG(IS_ANDROID)
   return CompositorDependenciesAndroid::Get().host_frame_sink_manager();
-#elif defined(USE_EFL)
-  return BrowserMainLoop::GetInstance()->host_frame_sink_manager();
 #else
   ImageTransportFactory* factory = ImageTransportFactory::GetInstance();
   if (!factory)
index 5b6e2be..f27ca36 100644 (file)
@@ -3458,7 +3458,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLineToRenderer(
   if (browser_cmd.HasSwitch(switches::kDisableGpuCompositing)) {
     renderer_cmd->AppendSwitch(switches::kDisableGpuCompositing);
   }
-#elif !BUILDFLAG(IS_CHROMEOS_ASH) && !defined(USE_EFL)
+#elif !BUILDFLAG(IS_CHROMEOS_ASH)
   // If gpu compositing is not being used, tell the renderer at startup. This
   // is inherently racey, as it may change while the renderer is being
   // launched, but the renderer will hear about the correct state eventually.
index 57c6f2e..0133090 100644 (file)
@@ -571,16 +571,6 @@ void RenderWidgetHostImpl::SetView(RenderWidgetHostViewBase* view) {
 
   if (view) {
     view_ = view->GetWeakPtr();
-#if defined(USE_EFL)
-    if (renderer_compositor_frame_sink_.is_bound()) {
-      view->DidCreateNewRendererCompositorFrameSink(
-          renderer_compositor_frame_sink_.get());
-    }
-    // Views start out not needing begin frames, so only update its state
-    // if the value has changed.
-    if (needs_begin_frames_)
-      view_->SetNeedsBeginFrames(needs_begin_frames_);
-#else
     if (!create_frame_sink_callback_.is_null())
       std::move(create_frame_sink_callback_).Run(view_->GetFrameSinkId());
 
@@ -597,7 +587,6 @@ void RenderWidgetHostImpl::SetView(RenderWidgetHostViewBase* view) {
     // because it will start hidden, and will send them when shown.
     // TODO(crbug.com/1161585): Once RendererWidgetCreated() is always called
     // with a non-null `view` then this comment can go away. :)
-#endif
   } else {
     view_.reset();
   }
@@ -3544,22 +3533,6 @@ void RenderWidgetHostImpl::CreateFrameSink(
         compositor_frame_sink_receiver,
     mojo::PendingRemote<viz::mojom::CompositorFrameSinkClient>
         compositor_frame_sink_client) {
-#if defined(USE_EFL)
-  compositor_frame_sink_receiver_.reset();
-  compositor_frame_sink_receiver_.Bind(
-      std::move(compositor_frame_sink_receiver),
-      BrowserMainLoop::GetInstance()->GetResizeTaskRunner());
-
-  renderer_compositor_frame_sink_.reset();
-  renderer_compositor_frame_sink_.Bind(std::move(compositor_frame_sink_client));
-  auto* compositor_frame_sink_client_ptr =
-      renderer_compositor_frame_sink_.get();
-
-  if (view_) {
-    view_->DidCreateNewRendererCompositorFrameSink(
-        compositor_frame_sink_client_ptr);
-  }
-#else
   // Connects the viz process end of CompositorFrameSink message pipes. The
   // renderer compositor may request a new CompositorFrameSink on context
   // loss, which will destroy the existing CompositorFrameSink.
@@ -3577,7 +3550,6 @@ void RenderWidgetHostImpl::CreateFrameSink(
     std::move(callback).Run(view_->GetFrameSinkId());
   else
     create_frame_sink_callback_ = std::move(callback);
-#endif
 }
 
 void RenderWidgetHostImpl::RegisterRenderFrameMetadataObserver(
@@ -3611,54 +3583,6 @@ bool RenderWidgetHostImpl::HasGestureStopped() {
   return true;
 }
 
-#if defined(USE_EFL)
-void RenderWidgetHostImpl::SetNeedsBeginFrame(bool needs_begin_frames) {
-  if (needs_begin_frames_ == needs_begin_frames)
-    return;
-
-  needs_begin_frames_ = needs_begin_frames;
-  if (view_)
-    view_->SetNeedsBeginFrames(needs_begin_frames_);
-}
-
-void RenderWidgetHostImpl::SetWantsAnimateOnlyBeginFrames() {}
-
-void RenderWidgetHostImpl::SubmitCompositorFrame(
-    const viz::LocalSurfaceId& local_surface_id,
-    viz::CompositorFrame frame,
-    absl::optional<viz::HitTestRegionList> hit_test_region_list,
-    uint64_t submit_time) {
-  if (view_) {
-    view_->SubmitCompositorFrame(local_surface_id, std::move(frame),
-                                 std::move(hit_test_region_list));
-  } else {
-    std::vector<viz::ReturnedResource> resources =
-        viz::TransferableResource::ReturnResources(frame.resource_list);
-    renderer_compositor_frame_sink_->DidReceiveCompositorFrameAck(
-        std::move(resources));
-  }
-}
-
-void RenderWidgetHostImpl::SubmitCompositorFrameSync(
-    const viz::LocalSurfaceId& local_surface_id,
-    viz::CompositorFrame frame,
-    absl::optional<viz::HitTestRegionList> hit_test_region_list,
-    uint64_t submit_time,
-    const SubmitCompositorFrameSyncCallback callback) {}
-
-void RenderWidgetHostImpl::DidNotProduceFrame(const viz::BeginFrameAck& ack) {}
-
-void RenderWidgetHostImpl::DidAllocateSharedBitmap(
-    base::ReadOnlySharedMemoryRegion region,
-    const viz::SharedBitmapId& id) {}
-
-void RenderWidgetHostImpl::DidDeleteSharedBitmap(
-    const viz::SharedBitmapId& id) {}
-
-void RenderWidgetHostImpl::InitializeCompositorFrameSinkType(
-    viz::mojom::CompositorFrameSinkType type) {}
-#endif
-
 void RenderWidgetHostImpl::DidProcessFrame(uint32_t frame_token,
                                            base::TimeTicks activation_time) {
   frame_token_message_queue_->DidProcessFrame(frame_token, activation_time);
index 12687d4..688c6b2 100644 (file)
@@ -146,9 +146,6 @@ class CONTENT_EXPORT RenderWidgetHostImpl
       public RenderProcessHostObserver,
       public RenderProcessHostPriorityClient,
       public SyntheticGestureController::Delegate,
-#if defined(USE_EFL)
-      public viz::mojom::CompositorFrameSink,
-#endif
       public RenderFrameMetadataProvider::Observer,
       public blink::mojom::FrameWidgetHost,
       public blink::mojom::PopupWidgetHost,
@@ -754,29 +751,6 @@ class CONTENT_EXPORT RenderWidgetHostImpl
 
   bool HasGestureStopped() override;
 
-#if defined(USE_EFL)
-  // viz::mojom::CompositorFrameSink implementation.
-  void SetNeedsBeginFrame(bool needs_begin_frame) override;
-  void SetWantsAnimateOnlyBeginFrames() override;
-  void SubmitCompositorFrame(
-      const viz::LocalSurfaceId& local_surface_id,
-      viz::CompositorFrame frame,
-      absl::optional<viz::HitTestRegionList> hit_test_region_list,
-      uint64_t submit_time) override;
-  void SubmitCompositorFrameSync(
-      const viz::LocalSurfaceId& local_surface_id,
-      viz::CompositorFrame frame,
-      absl::optional<viz::HitTestRegionList> hit_test_region_list,
-      uint64_t submit_time,
-      const SubmitCompositorFrameSyncCallback callback) override;
-  void DidNotProduceFrame(const viz::BeginFrameAck& ack) override;
-  void DidAllocateSharedBitmap(base::ReadOnlySharedMemoryRegion region,
-                               const viz::SharedBitmapId& id) override;
-  void DidDeleteSharedBitmap(const viz::SharedBitmapId& id) override;
-  void InitializeCompositorFrameSinkType(
-      viz::mojom::CompositorFrameSinkType type) override;
-#endif
-
   // Signals that a frame with token |frame_token| was finished processing. If
   // there are any queued messages belonging to it, they will be processed.
   void DidProcessFrame(uint32_t frame_token, base::TimeTicks activation_time);
@@ -1423,17 +1397,9 @@ class CONTENT_EXPORT RenderWidgetHostImpl
   mojo::Remote<device::mojom::WakeLock> wake_lock_;
 #endif
 
-#if defined(USE_EFL)
-  bool needs_begin_frames_ = false;
-  mojo::Receiver<viz::mojom::CompositorFrameSink>
-      compositor_frame_sink_receiver_{this};
-  mojo::Remote<viz::mojom::CompositorFrameSinkClient>
-      renderer_compositor_frame_sink_;
-#else
   // Stash a request to create a CompositorFrameSink if it arrives before we
   // have a view.
   base::OnceCallback<void(const viz::FrameSinkId&)> create_frame_sink_callback_;
-#endif
 
   std::unique_ptr<FrameTokenMessageQueue> frame_token_message_queue_;
 
index 9dccdfe..467eaa3 100644 (file)
 #include "ui/gfx/range/range.h"
 #include "ui/surface/transport_dib.h"
 
-#if defined(USE_EFL)
-#include "components/viz/common/quads/compositor_frame.h"
-#include "services/viz/public/mojom/compositing/compositor_frame_sink.mojom.h"
-#endif
-
 namespace blink {
 class WebMouseEvent;
 class WebMouseWheelEvent;
index 50e097c..d60c923 100644 (file)
@@ -8,6 +8,7 @@
 #include "base/callback.h"
 #include "content/common/content_export.h"
 #include "net/base/auth.h"
+#include "third_party/abseil-cpp/absl/types/optional.h"
 
 namespace content {
 
index 1f5f3c9..f537cbf 100644 (file)
@@ -31,7 +31,7 @@ if (is_android) {
   import("//third_party/fuchsia-sdk/sdk/build/component.gni")
   import("//third_party/fuchsia-sdk/sdk/build/package.gni")
 }
-if (use_efl) {
+if (use_efl && !use_aura) {
   import("//tizen_src/chromium_impl/content/shell/shell_efl.gni")
 }
 
@@ -209,7 +209,7 @@ static_library("content_shell_lib") {
     ":content_shell_lib_warnings",
     "//build/config:precompiled_headers",
   ]
-  if (use_efl) {
+  if (use_efl && !use_aura) {
     configs += external_content_shell_efl_configs
   }
 
@@ -304,7 +304,7 @@ static_library("content_shell_lib") {
       "//components/crash/core/app",
     ]
   }
-  if (use_efl) {
+  if (use_efl && !use_aura) {
     deps += external_content_shell_efl_deps
   }
 
@@ -406,7 +406,7 @@ static_library("content_shell_lib") {
     deps += [ "//ui/ozone" ]
   }
 
-  if (use_efl) {
+  if (use_efl && !use_aura) {
     sources += external_content_shell_lib_efl_sources
   }
 }
@@ -593,14 +593,13 @@ if (is_android) {
       configs += [ "//build/config/gcc:rpath_for_built_shared_libraries" ]
     }
 
-    if (use_efl) {
+    if (use_efl && !use_aura) {
       deps += external_content_shell_efl_deps
       configs += external_content_shell_efl_configs
 
       sources += external_content_shell_efl_sources
       sources -= external_exclude_content_shell_efl_sources
     }
-
   }
 
   if (is_fuchsia) {
index 64389b0..3439cc8 100644 (file)
@@ -579,7 +579,6 @@ void Shell::NavigationStateChanged(WebContents* source,
     g_platform->SetAddressBarURL(this, source->GetVisibleURL());
 }
 
-#if !defined(USE_EFL)
 JavaScriptDialogManager* Shell::GetJavaScriptDialogManager(
     WebContents* source) {
   if (!dialog_manager_)
@@ -588,7 +587,6 @@ JavaScriptDialogManager* Shell::GetJavaScriptDialogManager(
     dialog_manager_ = std::make_unique<ShellJavaScriptDialogManager>();
   return dialog_manager_.get();
 }
-#endif
 
 #if BUILDFLAG(IS_MAC)
 void Shell::DidNavigatePrimaryMainFramePostCommit(WebContents* contents) {
index c22566e..996b0bf 100644 (file)
@@ -582,7 +582,7 @@ void ShellContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
       kShellPakDescriptor,
       base::GlobalDescriptors::GetInstance()->Get(kShellPakDescriptor),
       base::GlobalDescriptors::GetInstance()->GetRegion(kShellPakDescriptor));
-#elif !defined(USE_EFL)
+#elif !defined(OS_TIZEN)
   int crash_signal_fd = GetCrashSignalFD(command_line);
   if (crash_signal_fd >= 0) {
     mappings->Share(kCrashDumpSignal, crash_signal_fd);
index db3351a..7d9808c 100644 (file)
@@ -822,8 +822,7 @@ if (is_fuchsia) {
   }
 }
 
-if (!use_efl) {
-  group("telemetry_gpu_integration_test_scripts_only") {
+group("telemetry_gpu_integration_test_scripts_only") {
   testonly = true
   deps = [
     "//tools/perf/chrome_telemetry_build:telemetry_chrome_test_without_chrome",
@@ -834,7 +833,6 @@ if (!use_efl) {
     ":telemetry_gpu_integration_test_data",
     "//testing:test_scripts_shared",
   ]
-  }
 }
 
 group("telemetry_gpu_integration_test_support") {
index af04c9a..736bf55 100644 (file)
@@ -1416,12 +1416,6 @@ TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
                (func.return_type, func.original_name,
                 func.MakeTypedOriginalArgString("")))
 
-  def WriteGLES2ImplementationEflHeader(self, func, f):
-    """Writes the GLES2 Implementation Efl header."""
-    f.write("%s %s(%s) override;\n" %
-               (func.return_type, func.original_name,
-                func.MakeTypedOriginalArgString("")))
-
   def WriteGLES2InterfaceStubImpl(self, func, f):
     """Writes the GLES2 Interface stub declaration."""
     args = func.GetOriginalArgs()
@@ -1433,40 +1427,6 @@ TEST_P(%(test_name)s, %(name)sInvalidArgs%(arg_index)d_%(value_index)d) {
       f.write("  return 0;\n")
     f.write("}\n")
 
-  def WriteGLES2ImplementationEfl(self, func, f):
-    """Writes the GLES2 Implementation Efl."""
-    args = func.GetOriginalArgs()
-    if ((not func.IsCoreGLFunction()) and (not func.HasEvasGLImplementation())):
-      arg_string = ", ".join(
-          ["%s /* %s */" % (arg.type, arg.name) for arg in args])
-    else:
-      arg_string = ", ".join(
-          ["%s %s" % (arg.type, arg.name) for arg in args])
-    arg_pass_string = ", ".join(
-      ["%s" % (arg.name) for arg in args])
-    f.write("%s GLES2ImplementationEfl::%s(%s) {\n" %
-               (func.return_type, func.original_name, arg_string))
-    if func.HasEvasGLImplementation():
-      if func.return_type != "void":
-        f.write("  return ")
-      else:
-        f.write("  ")
-      f.write("Do%s(%s);\n" %
-                 (func.original_name, arg_pass_string))
-    else:
-      if not func.IsCoreGLFunction():
-        f.write("  NOTIMPLEMENTED();\n")
-        if func.return_type != "void":
-          f.write("  return 0;\n")
-      else:
-        if func.return_type != "void":
-          f.write("  return ")
-        else:
-          f.write("  ")
-        f.write("evas_gl_api_->gl%s(%s);\n" %
-                   (func.original_name, arg_pass_string))
-    f.write("}\n\n")
-
   def WriteGLES2ImplementationUnitTest(self, func, f):
     """Writes the GLES2 Implemention unit test."""
     client_test = func.GetInfo('client_test', True)
@@ -5681,9 +5641,6 @@ class Function():
             not self.IsES3() and
             not self.IsES31())
 
-  def HasEvasGLImplementation(self):
-    return self.GetInfo('evasgl_impl_func')
-
   def InPepperInterface(self, interface):
     ext = self.GetInfo('pepper_interface')
     if not interface.GetName():
@@ -6009,14 +5966,6 @@ class Function():
     """Writes the GLES2 Interface Stub declaration."""
     self.type_handler.WriteGLES2InterfaceStubImpl(self, f)
 
-  def WriteGLES2ImplementationEflHeader(self, f):
-    """Writes the GLES2 Implementation Efl header."""
-    self.type_handler.WriteGLES2ImplementationEflHeader(self, f)
-
-  def WriteGLES2ImplementationEfl(self, f):
-    """Writes the GLES2 Implementation Efl."""
-    self.type_handler.WriteGLES2ImplementationEfl(self, f)
-
   def WriteGLES2ImplementationHeader(self, f):
     """Writes the GLES2 Implemention declaration."""
     self.type_handler.WriteGLES2ImplementationHeader(self, f)
@@ -7125,22 +7074,6 @@ extern const NameToFunc g_gles2_function_table[] = {
         func.WriteGLES2InterfaceStubImpl(f)
     self.generated_cpp_filenames.append(filename)
 
-  def WriteGLES2ImplementationEflHeader(self, filename):
-    """Writes the GLES2 implementation Efl header."""
-    comment =  "// This file is included by gles2_implementation_efl.h.\n"
-    with CHeaderWriter(filename, self.year, comment) as f:
-      for func in self.original_functions:
-        func.WriteGLES2ImplementationEflHeader(f)
-    self.generated_cpp_filenames.append(filename)
-
-  def WriteGLES2ImplementationEfl(self, filename):
-    """Writes the GLES2 interface header."""
-    comment = "// This file is included by gles2_implementation_efl.cc.\n"
-    with CHeaderWriter(filename, self.year, comment) as f:
-      for func in self.original_functions:
-        func.WriteGLES2ImplementationEfl(f)
-    self.generated_cpp_filenames.append(filename)
-
   def WriteGLES2ImplementationHeader(self, filename):
     """Writes the GLES2 Implementation header."""
     comment = \
index c8bee0a..453d713 100755 (executable)
@@ -1669,11 +1669,6 @@ _NAMED_TYPE_INFO = {
 # not_shared:   For GENn types, True if objects can't be shared between contexts
 # es31:         ES31 API. True if the function requires an WebGL2Compute
 #               context.
-# evasgl_impl_func: If True a function need to be implemented manually in the
-#               Evas GL implementation. (Generated with calling DoXXXX function
-#               and developer need to implement the function body.)
-#               Otherwise a function body is auto generated with calling a
-#               suitable Evas GL API.
 
 _FUNCTION_INFO = {
   'ActiveTexture': {
@@ -1737,7 +1732,6 @@ _FUNCTION_INFO = {
     'es3': True,
   },
   'BindTexture': {
-    'evasgl_impl_func': True,
     'type': 'Bind',
     'decoder_func': 'DoBindTexture',
     'gen_func': 'GenTextures',
@@ -1882,7 +1876,6 @@ _FUNCTION_INFO = {
     'extension_flag': 'chromium_framebuffer_mixed_samples',
   },
   'CreateAndConsumeTextureCHROMIUM': {
-    'evasgl_impl_func': True,
     'type': 'NoCommand',
     'extension': "CHROMIUM_texture_mailbox",
     'trace_level': 2,
@@ -1957,7 +1950,6 @@ _FUNCTION_INFO = {
     'trace_level': 1,
   },
   'CreateProgram': {
-    'evasgl_impl_func': True,
     'type': 'Create',
     'client_test': False,
   },
@@ -2081,7 +2073,6 @@ _FUNCTION_INFO = {
     'trace_level': 2,
   },
   'DeleteProgram': {
-   'evasgl_impl_func': True,
    'type': 'Delete',
    'decoder_func': 'DoDeleteProgram'
    },
@@ -2106,7 +2097,6 @@ _FUNCTION_INFO = {
     'es3': True,
   },
   'DeleteTextures': {
-    'evasgl_impl_func': True,
     'type': 'DELn',
     'resource_type': 'Texture',
     'resource_types': 'Textures',
@@ -2294,7 +2284,6 @@ _FUNCTION_INFO = {
     'es3': True,
   },
   'GenTextures': {
-    'evasgl_impl_func': True,
     'type': 'GENn',
     'gl_test_func': 'glGenTextures',
     'resource_type': 'Texture',
@@ -3333,23 +3322,19 @@ _FUNCTION_INFO = {
     'es3': True,
   },
   'Uniform1f': {
-  'evasgl_impl_func': True,
   'type': 'PUTXn',
   'count': 1
   },
   'Uniform1fv': {
-    'evasgl_impl_func': True,
     'type': 'PUTn',
     'count': 1,
     'decoder_func': 'DoUniform1fv',
   },
   'Uniform1i': {
-  'evasgl_impl_func': True,
   'decoder_func': 'DoUniform1i',
   'unit_test': False
   },
   'Uniform1iv': {
-    'evasgl_impl_func': True,
     'type': 'PUTn',
     'count': 1,
     'decoder_func': 'DoUniform1iv',
@@ -3369,23 +3354,19 @@ _FUNCTION_INFO = {
     'es3': True,
   },
   'Uniform2i': {
-  'evasgl_impl_func': True,
   'type': 'PUTXn',
   'count': 2
   },
   'Uniform2f': {
-  'evasgl_impl_func': True,
   'type': 'PUTXn',
   'count': 2
   },
   'Uniform2fv': {
-    'evasgl_impl_func': True,
     'type': 'PUTn',
     'count': 2,
     'decoder_func': 'DoUniform2fv',
   },
   'Uniform2iv': {
-    'evasgl_impl_func': True,
     'type': 'PUTn',
     'count': 2,
     'decoder_func': 'DoUniform2iv',
@@ -3404,23 +3385,19 @@ _FUNCTION_INFO = {
     'es3': True,
   },
   'Uniform3i': {
-  'evasgl_impl_func': True,
   'type': 'PUTXn',
   'count': 3
   },
   'Uniform3f': {
-  'evasgl_impl_func': True,
   'type': 'PUTXn',
   'count': 3
   },
   'Uniform3fv': {
-    'evasgl_impl_func': True,
     'type': 'PUTn',
     'count': 3,
     'decoder_func': 'DoUniform3fv',
   },
   'Uniform3iv': {
-    'evasgl_impl_func': True,
     'type': 'PUTn',
     'count': 3,
     'decoder_func': 'DoUniform3iv',
@@ -3439,23 +3416,19 @@ _FUNCTION_INFO = {
     'es3': True,
   },
   'Uniform4i': {
-  'evasgl_impl_func': True,
   'type': 'PUTXn',
   'count': 4
   },
   'Uniform4f': {
-  'evasgl_impl_func': True,
   'type': 'PUTXn',
   'count': 4
   },
   'Uniform4fv': {
-    'evasgl_impl_func': True,
     'type': 'PUTn',
     'count': 4,
     'decoder_func': 'DoUniform4fv',
   },
   'Uniform4iv': {
-    'evasgl_impl_func': True,
     'type': 'PUTn',
     'count': 4,
     'decoder_func': 'DoUniform4iv',
@@ -3474,7 +3447,6 @@ _FUNCTION_INFO = {
     'es3': True,
   },
   'UniformMatrix2fv': {
-    'evasgl_impl_func': True,
     'type': 'PUTn',
     'count': 4,
     'decoder_func': 'DoUniformMatrix2fv',
@@ -3493,7 +3465,6 @@ _FUNCTION_INFO = {
     'es3': True,
   },
   'UniformMatrix3fv': {
-    'evasgl_impl_func': True,
     'type': 'PUTn',
     'count': 9,
     'decoder_func': 'DoUniformMatrix3fv',
@@ -3512,7 +3483,6 @@ _FUNCTION_INFO = {
     'es3': True,
   },
   'UniformMatrix4fv': {
-    'evasgl_impl_func': True,
     'type': 'PUTn',
     'count': 16,
     'decoder_func': 'DoUniformMatrix4fv',
@@ -3558,7 +3528,6 @@ _FUNCTION_INFO = {
     'trace_level': 1,
   },
   'UseProgram': {
-    'evasgl_impl_func': True,
     'type': 'Bind',
     'decoder_func': 'DoUseProgram',
   },
@@ -3862,7 +3831,6 @@ _FUNCTION_INFO = {
     'extension_flag': 'ext_blend_func_extended',
   },
   'BindUniformLocationCHROMIUM': {
-    'evasgl_impl_func': True,
     'type': 'GLchar',
     'extension': 'CHROMIUM_bind_uniform_location',
     'data_transfer_methods': ['bucket'],
@@ -4183,10 +4151,6 @@ def main(argv):
     "gpu/command_buffer/client/gles2_interface_stub_autogen.h")
   gen.WriteGLES2InterfaceStubImpl(
       "gpu/command_buffer/client/gles2_interface_stub_impl_autogen.h")
-  gen.WriteGLES2ImplementationEflHeader(
-    "gpu/command_buffer/client/gles2_implementation_efl_header_autogen.h")
-  gen.WriteGLES2ImplementationEfl(
-    "gpu/command_buffer/client/gles2_implementation_efl_autogen.h")
   gen.WriteGLES2ImplementationHeader(
     "gpu/command_buffer/client/gles2_implementation_autogen.h")
   gen.WriteGLES2Implementation(
diff --git a/gpu/command_buffer/client/gles2_implementation_efl_autogen.h b/gpu/command_buffer/client/gles2_implementation_efl_autogen.h
deleted file mode 100644 (file)
index 34d0184..0000000
+++ /dev/null
@@ -1,2295 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// This file is auto-generated from
-// gpu/command_buffer/build_gles2_cmd_buffer.py
-// It's formatted by clang-format using chromium coding style:
-//    clang-format -i -style=chromium filename
-// DO NOT EDIT!
-
-// This file is included by gles2_implementation_efl.cc.
-#ifndef GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_EFL_AUTOGEN_H_
-#define GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_EFL_AUTOGEN_H_
-
-void GLES2ImplementationEfl::ActiveTexture(GLenum texture) {
-  evas_gl_api_->glActiveTexture(texture);
-}
-
-void GLES2ImplementationEfl::AttachShader(GLuint program, GLuint shader) {
-  evas_gl_api_->glAttachShader(program, shader);
-}
-
-void GLES2ImplementationEfl::BindAttribLocation(GLuint program,
-                                                GLuint index,
-                                                const char* name) {
-  evas_gl_api_->glBindAttribLocation(program, index, name);
-}
-
-void GLES2ImplementationEfl::BindBuffer(GLenum target, GLuint buffer) {
-  evas_gl_api_->glBindBuffer(target, buffer);
-}
-
-void GLES2ImplementationEfl::BindBufferBase(GLenum /* target */,
-                                            GLuint /* index */,
-                                            GLuint /* buffer */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::BindBufferRange(GLenum /* target */,
-                                             GLuint /* index */,
-                                             GLuint /* buffer */,
-                                             GLintptr /* offset */,
-                                             GLsizeiptr /* size */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::BindFramebuffer(GLenum target,
-                                             GLuint framebuffer) {
-  evas_gl_api_->glBindFramebuffer(target, framebuffer);
-}
-
-void GLES2ImplementationEfl::BindRenderbuffer(GLenum target,
-                                              GLuint renderbuffer) {
-  evas_gl_api_->glBindRenderbuffer(target, renderbuffer);
-}
-
-void GLES2ImplementationEfl::BindSampler(GLuint /* unit */,
-                                         GLuint /* sampler */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::BindTexture(GLenum target, GLuint texture) {
-  DoBindTexture(target, texture);
-}
-
-void GLES2ImplementationEfl::BindTransformFeedback(
-    GLenum /* target */,
-    GLuint /* transformfeedback */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::BlendColor(GLclampf red,
-                                        GLclampf green,
-                                        GLclampf blue,
-                                        GLclampf alpha) {
-  evas_gl_api_->glBlendColor(red, green, blue, alpha);
-}
-
-void GLES2ImplementationEfl::BlendEquation(GLenum mode) {
-  evas_gl_api_->glBlendEquation(mode);
-}
-
-void GLES2ImplementationEfl::BlendEquationSeparate(GLenum modeRGB,
-                                                   GLenum modeAlpha) {
-  evas_gl_api_->glBlendEquationSeparate(modeRGB, modeAlpha);
-}
-
-void GLES2ImplementationEfl::BlendFunc(GLenum sfactor, GLenum dfactor) {
-  evas_gl_api_->glBlendFunc(sfactor, dfactor);
-}
-
-void GLES2ImplementationEfl::BlendFuncSeparate(GLenum srcRGB,
-                                               GLenum dstRGB,
-                                               GLenum srcAlpha,
-                                               GLenum dstAlpha) {
-  evas_gl_api_->glBlendFuncSeparate(srcRGB, dstRGB, srcAlpha, dstAlpha);
-}
-
-void GLES2ImplementationEfl::BufferData(GLenum target,
-                                        GLsizeiptr size,
-                                        const void* data,
-                                        GLenum usage) {
-  evas_gl_api_->glBufferData(target, size, data, usage);
-}
-
-void GLES2ImplementationEfl::BufferSubData(GLenum target,
-                                           GLintptr offset,
-                                           GLsizeiptr size,
-                                           const void* data) {
-  evas_gl_api_->glBufferSubData(target, offset, size, data);
-}
-
-GLenum GLES2ImplementationEfl::CheckFramebufferStatus(GLenum target) {
-  return evas_gl_api_->glCheckFramebufferStatus(target);
-}
-
-void GLES2ImplementationEfl::Clear(GLbitfield mask) {
-  evas_gl_api_->glClear(mask);
-}
-
-void GLES2ImplementationEfl::ClearBufferfi(GLenum /* buffer */,
-                                           GLint /* drawbuffers */,
-                                           GLfloat /* depth */,
-                                           GLint /* stencil */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::ClearBufferfv(GLenum /* buffer */,
-                                           GLint /* drawbuffers */,
-                                           const GLfloat* /* value */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::ClearBufferiv(GLenum /* buffer */,
-                                           GLint /* drawbuffers */,
-                                           const GLint* /* value */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::ClearBufferuiv(GLenum /* buffer */,
-                                            GLint /* drawbuffers */,
-                                            const GLuint* /* value */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::ClearColor(GLclampf red,
-                                        GLclampf green,
-                                        GLclampf blue,
-                                        GLclampf alpha) {
-  evas_gl_api_->glClearColor(red, green, blue, alpha);
-}
-
-void GLES2ImplementationEfl::ClearDepthf(GLclampf depth) {
-  evas_gl_api_->glClearDepthf(depth);
-}
-
-void GLES2ImplementationEfl::ClearStencil(GLint s) {
-  evas_gl_api_->glClearStencil(s);
-}
-
-GLenum GLES2ImplementationEfl::ClientWaitSync(GLsync /* sync */,
-                                              GLbitfield /* flags */,
-                                              GLuint64 /* timeout */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-void GLES2ImplementationEfl::ColorMask(GLboolean red,
-                                       GLboolean green,
-                                       GLboolean blue,
-                                       GLboolean alpha) {
-  evas_gl_api_->glColorMask(red, green, blue, alpha);
-}
-
-void GLES2ImplementationEfl::CompileShader(GLuint shader) {
-  evas_gl_api_->glCompileShader(shader);
-}
-
-void GLES2ImplementationEfl::CompressedTexImage2D(GLenum target,
-                                                  GLint level,
-                                                  GLenum internalformat,
-                                                  GLsizei width,
-                                                  GLsizei height,
-                                                  GLint border,
-                                                  GLsizei imageSize,
-                                                  const void* data) {
-  evas_gl_api_->glCompressedTexImage2D(target, level, internalformat, width,
-                                       height, border, imageSize, data);
-}
-
-void GLES2ImplementationEfl::CompressedTexSubImage2D(GLenum target,
-                                                     GLint level,
-                                                     GLint xoffset,
-                                                     GLint yoffset,
-                                                     GLsizei width,
-                                                     GLsizei height,
-                                                     GLenum format,
-                                                     GLsizei imageSize,
-                                                     const void* data) {
-  evas_gl_api_->glCompressedTexSubImage2D(
-      target, level, xoffset, yoffset, width, height, format, imageSize, data);
-}
-
-void GLES2ImplementationEfl::CompressedTexImage3D(GLenum /* target */,
-                                                  GLint /* level */,
-                                                  GLenum /* internalformat */,
-                                                  GLsizei /* width */,
-                                                  GLsizei /* height */,
-                                                  GLsizei /* depth */,
-                                                  GLint /* border */,
-                                                  GLsizei /* imageSize */,
-                                                  const void* /* data */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::CompressedTexSubImage3D(GLenum /* target */,
-                                                     GLint /* level */,
-                                                     GLint /* xoffset */,
-                                                     GLint /* yoffset */,
-                                                     GLint /* zoffset */,
-                                                     GLsizei /* width */,
-                                                     GLsizei /* height */,
-                                                     GLsizei /* depth */,
-                                                     GLenum /* format */,
-                                                     GLsizei /* imageSize */,
-                                                     const void* /* data */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::CopyBufferSubData(GLenum /* readtarget */,
-                                               GLenum /* writetarget */,
-                                               GLintptr /* readoffset */,
-                                               GLintptr /* writeoffset */,
-                                               GLsizeiptr /* size */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::CopyTexImage2D(GLenum target,
-                                            GLint level,
-                                            GLenum internalformat,
-                                            GLint x,
-                                            GLint y,
-                                            GLsizei width,
-                                            GLsizei height,
-                                            GLint border) {
-  evas_gl_api_->glCopyTexImage2D(target, level, internalformat, x, y, width,
-                                 height, border);
-}
-
-void GLES2ImplementationEfl::CopyTexSubImage2D(GLenum target,
-                                               GLint level,
-                                               GLint xoffset,
-                                               GLint yoffset,
-                                               GLint x,
-                                               GLint y,
-                                               GLsizei width,
-                                               GLsizei height) {
-  evas_gl_api_->glCopyTexSubImage2D(target, level, xoffset, yoffset, x, y,
-                                    width, height);
-}
-
-void GLES2ImplementationEfl::CopyTexSubImage3D(GLenum /* target */,
-                                               GLint /* level */,
-                                               GLint /* xoffset */,
-                                               GLint /* yoffset */,
-                                               GLint /* zoffset */,
-                                               GLint /* x */,
-                                               GLint /* y */,
-                                               GLsizei /* width */,
-                                               GLsizei /* height */) {
-  NOTIMPLEMENTED();
-}
-
-GLuint GLES2ImplementationEfl::CreateProgram() {
-  return DoCreateProgram();
-}
-
-GLuint GLES2ImplementationEfl::CreateShader(GLenum type) {
-  return evas_gl_api_->glCreateShader(type);
-}
-
-void GLES2ImplementationEfl::CullFace(GLenum mode) {
-  evas_gl_api_->glCullFace(mode);
-}
-
-void GLES2ImplementationEfl::DeleteBuffers(GLsizei n, const GLuint* buffers) {
-  evas_gl_api_->glDeleteBuffers(n, buffers);
-}
-
-void GLES2ImplementationEfl::DeleteFramebuffers(GLsizei n,
-                                                const GLuint* framebuffers) {
-  evas_gl_api_->glDeleteFramebuffers(n, framebuffers);
-}
-
-void GLES2ImplementationEfl::DeleteProgram(GLuint program) {
-  DoDeleteProgram(program);
-}
-
-void GLES2ImplementationEfl::DeleteRenderbuffers(GLsizei n,
-                                                 const GLuint* renderbuffers) {
-  evas_gl_api_->glDeleteRenderbuffers(n, renderbuffers);
-}
-
-void GLES2ImplementationEfl::DeleteSamplers(GLsizei /* n */,
-                                            const GLuint* /* samplers */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::DeleteSync(GLsync /* sync */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::DeleteShader(GLuint shader) {
-  evas_gl_api_->glDeleteShader(shader);
-}
-
-void GLES2ImplementationEfl::DeleteTextures(GLsizei n, const GLuint* textures) {
-  DoDeleteTextures(n, textures);
-}
-
-void GLES2ImplementationEfl::DeleteTransformFeedbacks(GLsizei /* n */,
-                                                      const GLuint* /* ids */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::DepthFunc(GLenum func) {
-  evas_gl_api_->glDepthFunc(func);
-}
-
-void GLES2ImplementationEfl::DepthMask(GLboolean flag) {
-  evas_gl_api_->glDepthMask(flag);
-}
-
-void GLES2ImplementationEfl::DepthRangef(GLclampf zNear, GLclampf zFar) {
-  evas_gl_api_->glDepthRangef(zNear, zFar);
-}
-
-void GLES2ImplementationEfl::DetachShader(GLuint program, GLuint shader) {
-  evas_gl_api_->glDetachShader(program, shader);
-}
-
-void GLES2ImplementationEfl::Disable(GLenum cap) {
-  evas_gl_api_->glDisable(cap);
-}
-
-void GLES2ImplementationEfl::DisableVertexAttribArray(GLuint index) {
-  evas_gl_api_->glDisableVertexAttribArray(index);
-}
-
-void GLES2ImplementationEfl::DrawArrays(GLenum mode,
-                                        GLint first,
-                                        GLsizei count) {
-  evas_gl_api_->glDrawArrays(mode, first, count);
-}
-
-void GLES2ImplementationEfl::DrawElements(GLenum mode,
-                                          GLsizei count,
-                                          GLenum type,
-                                          const void* indices) {
-  evas_gl_api_->glDrawElements(mode, count, type, indices);
-}
-
-void GLES2ImplementationEfl::DrawRangeElements(GLenum /* mode */,
-                                               GLuint /* start */,
-                                               GLuint /* end */,
-                                               GLsizei /* count */,
-                                               GLenum /* type */,
-                                               const void* /* indices */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::Enable(GLenum cap) {
-  evas_gl_api_->glEnable(cap);
-}
-
-void GLES2ImplementationEfl::EnableVertexAttribArray(GLuint index) {
-  evas_gl_api_->glEnableVertexAttribArray(index);
-}
-
-GLsync GLES2ImplementationEfl::FenceSync(GLenum /* condition */,
-                                         GLbitfield /* flags */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-void GLES2ImplementationEfl::Finish() {
-  evas_gl_api_->glFinish();
-}
-
-void GLES2ImplementationEfl::Flush() {
-  evas_gl_api_->glFlush();
-}
-
-void GLES2ImplementationEfl::FramebufferRenderbuffer(GLenum target,
-                                                     GLenum attachment,
-                                                     GLenum renderbuffertarget,
-                                                     GLuint renderbuffer) {
-  evas_gl_api_->glFramebufferRenderbuffer(target, attachment,
-                                          renderbuffertarget, renderbuffer);
-}
-
-void GLES2ImplementationEfl::FramebufferTexture2D(GLenum target,
-                                                  GLenum attachment,
-                                                  GLenum textarget,
-                                                  GLuint texture,
-                                                  GLint level) {
-  evas_gl_api_->glFramebufferTexture2D(target, attachment, textarget, texture,
-                                       level);
-}
-
-void GLES2ImplementationEfl::FramebufferTextureLayer(GLenum /* target */,
-                                                     GLenum /* attachment */,
-                                                     GLuint /* texture */,
-                                                     GLint /* level */,
-                                                     GLint /* layer */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::FrontFace(GLenum mode) {
-  evas_gl_api_->glFrontFace(mode);
-}
-
-void GLES2ImplementationEfl::GenBuffers(GLsizei n, GLuint* buffers) {
-  evas_gl_api_->glGenBuffers(n, buffers);
-}
-
-void GLES2ImplementationEfl::GenerateMipmap(GLenum target) {
-  evas_gl_api_->glGenerateMipmap(target);
-}
-
-void GLES2ImplementationEfl::GenFramebuffers(GLsizei n, GLuint* framebuffers) {
-  evas_gl_api_->glGenFramebuffers(n, framebuffers);
-}
-
-void GLES2ImplementationEfl::GenRenderbuffers(GLsizei n,
-                                              GLuint* renderbuffers) {
-  evas_gl_api_->glGenRenderbuffers(n, renderbuffers);
-}
-
-void GLES2ImplementationEfl::GenSamplers(GLsizei /* n */,
-                                         GLuint* /* samplers */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GenTextures(GLsizei n, GLuint* textures) {
-  DoGenTextures(n, textures);
-}
-
-void GLES2ImplementationEfl::GenTransformFeedbacks(GLsizei /* n */,
-                                                   GLuint* /* ids */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetActiveAttrib(GLuint program,
-                                             GLuint index,
-                                             GLsizei bufsize,
-                                             GLsizei* length,
-                                             GLint* size,
-                                             GLenum* type,
-                                             char* name) {
-  evas_gl_api_->glGetActiveAttrib(program, index, bufsize, length, size, type,
-                                  name);
-}
-
-void GLES2ImplementationEfl::GetActiveUniform(GLuint program,
-                                              GLuint index,
-                                              GLsizei bufsize,
-                                              GLsizei* length,
-                                              GLint* size,
-                                              GLenum* type,
-                                              char* name) {
-  evas_gl_api_->glGetActiveUniform(program, index, bufsize, length, size, type,
-                                   name);
-}
-
-void GLES2ImplementationEfl::GetActiveUniformBlockiv(GLuint /* program */,
-                                                     GLuint /* index */,
-                                                     GLenum /* pname */,
-                                                     GLint* /* params */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetActiveUniformBlockName(GLuint /* program */,
-                                                       GLuint /* index */,
-                                                       GLsizei /* bufsize */,
-                                                       GLsizei* /* length */,
-                                                       char* /* name */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetActiveUniformsiv(GLuint /* program */,
-                                                 GLsizei /* count */,
-                                                 const GLuint* /* indices */,
-                                                 GLenum /* pname */,
-                                                 GLint* /* params */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetAttachedShaders(GLuint program,
-                                                GLsizei maxcount,
-                                                GLsizei* count,
-                                                GLuint* shaders) {
-  evas_gl_api_->glGetAttachedShaders(program, maxcount, count, shaders);
-}
-
-GLint GLES2ImplementationEfl::GetAttribLocation(GLuint program,
-                                                const char* name) {
-  return evas_gl_api_->glGetAttribLocation(program, name);
-}
-
-void GLES2ImplementationEfl::GetBooleanv(GLenum pname, GLboolean* params) {
-  evas_gl_api_->glGetBooleanv(pname, params);
-}
-
-void GLES2ImplementationEfl::GetBooleani_v(GLenum /* pname */,
-                                           GLuint /* index */,
-                                           GLboolean* /* data */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetBufferParameteri64v(GLenum /* target */,
-                                                    GLenum /* pname */,
-                                                    GLint64* /* params */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetBufferParameteriv(GLenum target,
-                                                  GLenum pname,
-                                                  GLint* params) {
-  evas_gl_api_->glGetBufferParameteriv(target, pname, params);
-}
-
-GLenum GLES2ImplementationEfl::GetError() {
-  return evas_gl_api_->glGetError();
-}
-
-void GLES2ImplementationEfl::GetFloatv(GLenum pname, GLfloat* params) {
-  evas_gl_api_->glGetFloatv(pname, params);
-}
-
-GLint GLES2ImplementationEfl::GetFragDataLocation(GLuint /* program */,
-                                                  const char* /* name */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-void GLES2ImplementationEfl::GetFramebufferAttachmentParameteriv(
-    GLenum target,
-    GLenum attachment,
-    GLenum pname,
-    GLint* params) {
-  evas_gl_api_->glGetFramebufferAttachmentParameteriv(target, attachment, pname,
-                                                      params);
-}
-
-void GLES2ImplementationEfl::GetInteger64v(GLenum /* pname */,
-                                           GLint64* /* params */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetIntegeri_v(GLenum /* pname */,
-                                           GLuint /* index */,
-                                           GLint* /* data */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetInteger64i_v(GLenum /* pname */,
-                                             GLuint /* index */,
-                                             GLint64* /* data */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetIntegerv(GLenum pname, GLint* params) {
-  evas_gl_api_->glGetIntegerv(pname, params);
-}
-
-void GLES2ImplementationEfl::GetInternalformativ(GLenum /* target */,
-                                                 GLenum /* format */,
-                                                 GLenum /* pname */,
-                                                 GLsizei /* bufSize */,
-                                                 GLint* /* params */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetProgramiv(GLuint program,
-                                          GLenum pname,
-                                          GLint* params) {
-  evas_gl_api_->glGetProgramiv(program, pname, params);
-}
-
-void GLES2ImplementationEfl::GetProgramInfoLog(GLuint program,
-                                               GLsizei bufsize,
-                                               GLsizei* length,
-                                               char* infolog) {
-  evas_gl_api_->glGetProgramInfoLog(program, bufsize, length, infolog);
-}
-
-void GLES2ImplementationEfl::GetRenderbufferParameteriv(GLenum target,
-                                                        GLenum pname,
-                                                        GLint* params) {
-  evas_gl_api_->glGetRenderbufferParameteriv(target, pname, params);
-}
-
-void GLES2ImplementationEfl::GetSamplerParameterfv(GLuint /* sampler */,
-                                                   GLenum /* pname */,
-                                                   GLfloat* /* params */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetSamplerParameteriv(GLuint /* sampler */,
-                                                   GLenum /* pname */,
-                                                   GLint* /* params */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetShaderiv(GLuint shader,
-                                         GLenum pname,
-                                         GLint* params) {
-  evas_gl_api_->glGetShaderiv(shader, pname, params);
-}
-
-void GLES2ImplementationEfl::GetShaderInfoLog(GLuint shader,
-                                              GLsizei bufsize,
-                                              GLsizei* length,
-                                              char* infolog) {
-  evas_gl_api_->glGetShaderInfoLog(shader, bufsize, length, infolog);
-}
-
-void GLES2ImplementationEfl::GetShaderPrecisionFormat(GLenum shadertype,
-                                                      GLenum precisiontype,
-                                                      GLint* range,
-                                                      GLint* precision) {
-  evas_gl_api_->glGetShaderPrecisionFormat(shadertype, precisiontype, range,
-                                           precision);
-}
-
-void GLES2ImplementationEfl::GetShaderSource(GLuint shader,
-                                             GLsizei bufsize,
-                                             GLsizei* length,
-                                             char* source) {
-  evas_gl_api_->glGetShaderSource(shader, bufsize, length, source);
-}
-
-const GLubyte* GLES2ImplementationEfl::GetString(GLenum name) {
-  return evas_gl_api_->glGetString(name);
-}
-
-const GLubyte* GLES2ImplementationEfl::GetStringi(GLenum /* name */,
-                                                  GLuint /* index */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-void GLES2ImplementationEfl::GetSynciv(GLsync /* sync */,
-                                       GLenum /* pname */,
-                                       GLsizei /* bufsize */,
-                                       GLsizei* /* length */,
-                                       GLint* /* values */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetTexParameterfv(GLenum target,
-                                               GLenum pname,
-                                               GLfloat* params) {
-  evas_gl_api_->glGetTexParameterfv(target, pname, params);
-}
-
-void GLES2ImplementationEfl::GetTexParameteriv(GLenum target,
-                                               GLenum pname,
-                                               GLint* params) {
-  evas_gl_api_->glGetTexParameteriv(target, pname, params);
-}
-
-void GLES2ImplementationEfl::GetTransformFeedbackVarying(GLuint /* program */,
-                                                         GLuint /* index */,
-                                                         GLsizei /* bufsize */,
-                                                         GLsizei* /* length */,
-                                                         GLsizei* /* size */,
-                                                         GLenum* /* type */,
-                                                         char* /* name */) {
-  NOTIMPLEMENTED();
-}
-
-GLuint GLES2ImplementationEfl::GetUniformBlockIndex(GLuint /* program */,
-                                                    const char* /* name */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-void GLES2ImplementationEfl::GetUniformfv(GLuint program,
-                                          GLint location,
-                                          GLfloat* params) {
-  evas_gl_api_->glGetUniformfv(program, location, params);
-}
-
-void GLES2ImplementationEfl::GetUniformiv(GLuint program,
-                                          GLint location,
-                                          GLint* params) {
-  evas_gl_api_->glGetUniformiv(program, location, params);
-}
-
-void GLES2ImplementationEfl::GetUniformuiv(GLuint /* program */,
-                                           GLint /* location */,
-                                           GLuint* /* params */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetUniformIndices(GLuint /* program */,
-                                               GLsizei /* count */,
-                                               const char* const* /* names */,
-                                               GLuint* /* indices */) {
-  NOTIMPLEMENTED();
-}
-
-GLint GLES2ImplementationEfl::GetUniformLocation(GLuint program,
-                                                 const char* name) {
-  return evas_gl_api_->glGetUniformLocation(program, name);
-}
-
-void GLES2ImplementationEfl::GetVertexAttribfv(GLuint index,
-                                               GLenum pname,
-                                               GLfloat* params) {
-  evas_gl_api_->glGetVertexAttribfv(index, pname, params);
-}
-
-void GLES2ImplementationEfl::GetVertexAttribiv(GLuint index,
-                                               GLenum pname,
-                                               GLint* params) {
-  evas_gl_api_->glGetVertexAttribiv(index, pname, params);
-}
-
-void GLES2ImplementationEfl::GetVertexAttribIiv(GLuint /* index */,
-                                                GLenum /* pname */,
-                                                GLint* /* params */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetVertexAttribIuiv(GLuint /* index */,
-                                                 GLenum /* pname */,
-                                                 GLuint* /* params */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetVertexAttribPointerv(GLuint index,
-                                                     GLenum pname,
-                                                     void** pointer) {
-  evas_gl_api_->glGetVertexAttribPointerv(index, pname, pointer);
-}
-
-void GLES2ImplementationEfl::Hint(GLenum target, GLenum mode) {
-  evas_gl_api_->glHint(target, mode);
-}
-
-void GLES2ImplementationEfl::InvalidateFramebuffer(
-    GLenum /* target */,
-    GLsizei /* count */,
-    const GLenum* /* attachments */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::InvalidateSubFramebuffer(
-    GLenum /* target */,
-    GLsizei /* count */,
-    const GLenum* /* attachments */,
-    GLint /* x */,
-    GLint /* y */,
-    GLsizei /* width */,
-    GLsizei /* height */) {
-  NOTIMPLEMENTED();
-}
-
-GLboolean GLES2ImplementationEfl::IsBuffer(GLuint buffer) {
-  return evas_gl_api_->glIsBuffer(buffer);
-}
-
-GLboolean GLES2ImplementationEfl::IsEnabled(GLenum cap) {
-  return evas_gl_api_->glIsEnabled(cap);
-}
-
-GLboolean GLES2ImplementationEfl::IsFramebuffer(GLuint framebuffer) {
-  return evas_gl_api_->glIsFramebuffer(framebuffer);
-}
-
-GLboolean GLES2ImplementationEfl::IsProgram(GLuint program) {
-  return evas_gl_api_->glIsProgram(program);
-}
-
-GLboolean GLES2ImplementationEfl::IsRenderbuffer(GLuint renderbuffer) {
-  return evas_gl_api_->glIsRenderbuffer(renderbuffer);
-}
-
-GLboolean GLES2ImplementationEfl::IsSampler(GLuint /* sampler */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-GLboolean GLES2ImplementationEfl::IsShader(GLuint shader) {
-  return evas_gl_api_->glIsShader(shader);
-}
-
-GLboolean GLES2ImplementationEfl::IsSync(GLsync /* sync */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-GLboolean GLES2ImplementationEfl::IsTexture(GLuint texture) {
-  return evas_gl_api_->glIsTexture(texture);
-}
-
-GLboolean GLES2ImplementationEfl::IsTransformFeedback(
-    GLuint /* transformfeedback */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-void GLES2ImplementationEfl::LineWidth(GLfloat width) {
-  evas_gl_api_->glLineWidth(width);
-}
-
-void GLES2ImplementationEfl::LinkProgram(GLuint program) {
-  evas_gl_api_->glLinkProgram(program);
-}
-
-void GLES2ImplementationEfl::PauseTransformFeedback() {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::PixelStorei(GLenum pname, GLint param) {
-  evas_gl_api_->glPixelStorei(pname, param);
-}
-
-void GLES2ImplementationEfl::PolygonOffset(GLfloat factor, GLfloat units) {
-  evas_gl_api_->glPolygonOffset(factor, units);
-}
-
-void GLES2ImplementationEfl::ReadBuffer(GLenum /* src */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::ReadPixels(GLint x,
-                                        GLint y,
-                                        GLsizei width,
-                                        GLsizei height,
-                                        GLenum format,
-                                        GLenum type,
-                                        void* pixels) {
-  evas_gl_api_->glReadPixels(x, y, width, height, format, type, pixels);
-}
-
-void GLES2ImplementationEfl::ReleaseShaderCompiler() {
-  evas_gl_api_->glReleaseShaderCompiler();
-}
-
-void GLES2ImplementationEfl::RenderbufferStorage(GLenum target,
-                                                 GLenum internalformat,
-                                                 GLsizei width,
-                                                 GLsizei height) {
-  evas_gl_api_->glRenderbufferStorage(target, internalformat, width, height);
-}
-
-void GLES2ImplementationEfl::ResumeTransformFeedback() {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::SampleCoverage(GLclampf value, GLboolean invert) {
-  evas_gl_api_->glSampleCoverage(value, invert);
-}
-
-void GLES2ImplementationEfl::SamplerParameterf(GLuint /* sampler */,
-                                               GLenum /* pname */,
-                                               GLfloat /* param */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::SamplerParameterfv(GLuint /* sampler */,
-                                                GLenum /* pname */,
-                                                const GLfloat* /* params */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::SamplerParameteri(GLuint /* sampler */,
-                                               GLenum /* pname */,
-                                               GLint /* param */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::SamplerParameteriv(GLuint /* sampler */,
-                                                GLenum /* pname */,
-                                                const GLint* /* params */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::Scissor(GLint x,
-                                     GLint y,
-                                     GLsizei width,
-                                     GLsizei height) {
-  evas_gl_api_->glScissor(x, y, width, height);
-}
-
-void GLES2ImplementationEfl::ShaderBinary(GLsizei n,
-                                          const GLuint* shaders,
-                                          GLenum binaryformat,
-                                          const void* binary,
-                                          GLsizei length) {
-  evas_gl_api_->glShaderBinary(n, shaders, binaryformat, binary, length);
-}
-
-void GLES2ImplementationEfl::ShaderSource(GLuint shader,
-                                          GLsizei count,
-                                          const GLchar* const* str,
-                                          const GLint* length) {
-  evas_gl_api_->glShaderSource(shader, count, str, length);
-}
-
-void GLES2ImplementationEfl::ShallowFinishCHROMIUM() {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::OrderingBarrierCHROMIUM() {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::MultiDrawArraysWEBGL(GLenum /* mode */,
-                                                  const GLint* /* firsts */,
-                                                  const GLsizei* /* counts */,
-                                                  GLsizei /* drawcount */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::MultiDrawArraysInstancedWEBGL(
-    GLenum /* mode */,
-    const GLint* /* firsts */,
-    const GLsizei* /* counts */,
-    const GLsizei* /* instance_counts */,
-    GLsizei /* drawcount */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::MultiDrawArraysInstancedBaseInstanceWEBGL(
-    GLenum /* mode */,
-    const GLint* /* firsts */,
-    const GLsizei* /* counts */,
-    const GLsizei* /* instance_counts */,
-    const GLuint* /* baseinstances */,
-    GLsizei /* drawcount */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::MultiDrawElementsWEBGL(
-    GLenum /* mode */,
-    const GLsizei* /* counts */,
-    GLenum /* type */,
-    const GLsizei* /* offsets */,
-    GLsizei /* drawcount */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::MultiDrawElementsInstancedWEBGL(
-    GLenum /* mode */,
-    const GLsizei* /* counts */,
-    GLenum /* type */,
-    const GLsizei* /* offsets */,
-    const GLsizei* /* instance_counts */,
-    GLsizei /* drawcount */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::
-    MultiDrawElementsInstancedBaseVertexBaseInstanceWEBGL(
-        GLenum /* mode */,
-        const GLsizei* /* counts */,
-        GLenum /* type */,
-        const GLsizei* /* offsets */,
-        const GLsizei* /* instance_counts */,
-        const GLint* /* basevertices */,
-        const GLuint* /* baseinstances */,
-        GLsizei /* drawcount */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::StencilFunc(GLenum func, GLint ref, GLuint mask) {
-  evas_gl_api_->glStencilFunc(func, ref, mask);
-}
-
-void GLES2ImplementationEfl::StencilFuncSeparate(GLenum face,
-                                                 GLenum func,
-                                                 GLint ref,
-                                                 GLuint mask) {
-  evas_gl_api_->glStencilFuncSeparate(face, func, ref, mask);
-}
-
-void GLES2ImplementationEfl::StencilMask(GLuint mask) {
-  evas_gl_api_->glStencilMask(mask);
-}
-
-void GLES2ImplementationEfl::StencilMaskSeparate(GLenum face, GLuint mask) {
-  evas_gl_api_->glStencilMaskSeparate(face, mask);
-}
-
-void GLES2ImplementationEfl::StencilOp(GLenum fail,
-                                       GLenum zfail,
-                                       GLenum zpass) {
-  evas_gl_api_->glStencilOp(fail, zfail, zpass);
-}
-
-void GLES2ImplementationEfl::StencilOpSeparate(GLenum face,
-                                               GLenum fail,
-                                               GLenum zfail,
-                                               GLenum zpass) {
-  evas_gl_api_->glStencilOpSeparate(face, fail, zfail, zpass);
-}
-
-void GLES2ImplementationEfl::TexImage2D(GLenum target,
-                                        GLint level,
-                                        GLint internalformat,
-                                        GLsizei width,
-                                        GLsizei height,
-                                        GLint border,
-                                        GLenum format,
-                                        GLenum type,
-                                        const void* pixels) {
-  evas_gl_api_->glTexImage2D(target, level, internalformat, width, height,
-                             border, format, type, pixels);
-}
-
-void GLES2ImplementationEfl::TexImage3D(GLenum /* target */,
-                                        GLint /* level */,
-                                        GLint /* internalformat */,
-                                        GLsizei /* width */,
-                                        GLsizei /* height */,
-                                        GLsizei /* depth */,
-                                        GLint /* border */,
-                                        GLenum /* format */,
-                                        GLenum /* type */,
-                                        const void* /* pixels */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::TexParameterf(GLenum target,
-                                           GLenum pname,
-                                           GLfloat param) {
-  evas_gl_api_->glTexParameterf(target, pname, param);
-}
-
-void GLES2ImplementationEfl::TexParameterfv(GLenum target,
-                                            GLenum pname,
-                                            const GLfloat* params) {
-  evas_gl_api_->glTexParameterfv(target, pname, params);
-}
-
-void GLES2ImplementationEfl::TexParameteri(GLenum target,
-                                           GLenum pname,
-                                           GLint param) {
-  evas_gl_api_->glTexParameteri(target, pname, param);
-}
-
-void GLES2ImplementationEfl::TexParameteriv(GLenum target,
-                                            GLenum pname,
-                                            const GLint* params) {
-  evas_gl_api_->glTexParameteriv(target, pname, params);
-}
-
-void GLES2ImplementationEfl::TexStorage3D(GLenum /* target */,
-                                          GLsizei /* levels */,
-                                          GLenum /* internalFormat */,
-                                          GLsizei /* width */,
-                                          GLsizei /* height */,
-                                          GLsizei /* depth */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::TexSubImage2D(GLenum target,
-                                           GLint level,
-                                           GLint xoffset,
-                                           GLint yoffset,
-                                           GLsizei width,
-                                           GLsizei height,
-                                           GLenum format,
-                                           GLenum type,
-                                           const void* pixels) {
-  evas_gl_api_->glTexSubImage2D(target, level, xoffset, yoffset, width, height,
-                                format, type, pixels);
-}
-
-void GLES2ImplementationEfl::TexSubImage3D(GLenum /* target */,
-                                           GLint /* level */,
-                                           GLint /* xoffset */,
-                                           GLint /* yoffset */,
-                                           GLint /* zoffset */,
-                                           GLsizei /* width */,
-                                           GLsizei /* height */,
-                                           GLsizei /* depth */,
-                                           GLenum /* format */,
-                                           GLenum /* type */,
-                                           const void* /* pixels */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::TransformFeedbackVaryings(
-    GLuint /* program */,
-    GLsizei /* count */,
-    const char* const* /* varyings */,
-    GLenum /* buffermode */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::Uniform1f(GLint location, GLfloat x) {
-  DoUniform1f(location, x);
-}
-
-void GLES2ImplementationEfl::Uniform1fv(GLint location,
-                                        GLsizei count,
-                                        const GLfloat* v) {
-  DoUniform1fv(location, count, v);
-}
-
-void GLES2ImplementationEfl::Uniform1i(GLint location, GLint x) {
-  DoUniform1i(location, x);
-}
-
-void GLES2ImplementationEfl::Uniform1iv(GLint location,
-                                        GLsizei count,
-                                        const GLint* v) {
-  DoUniform1iv(location, count, v);
-}
-
-void GLES2ImplementationEfl::Uniform1ui(GLint /* location */, GLuint /* x */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::Uniform1uiv(GLint /* location */,
-                                         GLsizei /* count */,
-                                         const GLuint* /* v */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::Uniform2f(GLint location, GLfloat x, GLfloat y) {
-  DoUniform2f(location, x, y);
-}
-
-void GLES2ImplementationEfl::Uniform2fv(GLint location,
-                                        GLsizei count,
-                                        const GLfloat* v) {
-  DoUniform2fv(location, count, v);
-}
-
-void GLES2ImplementationEfl::Uniform2i(GLint location, GLint x, GLint y) {
-  DoUniform2i(location, x, y);
-}
-
-void GLES2ImplementationEfl::Uniform2iv(GLint location,
-                                        GLsizei count,
-                                        const GLint* v) {
-  DoUniform2iv(location, count, v);
-}
-
-void GLES2ImplementationEfl::Uniform2ui(GLint /* location */,
-                                        GLuint /* x */,
-                                        GLuint /* y */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::Uniform2uiv(GLint /* location */,
-                                         GLsizei /* count */,
-                                         const GLuint* /* v */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::Uniform3f(GLint location,
-                                       GLfloat x,
-                                       GLfloat y,
-                                       GLfloat z) {
-  DoUniform3f(location, x, y, z);
-}
-
-void GLES2ImplementationEfl::Uniform3fv(GLint location,
-                                        GLsizei count,
-                                        const GLfloat* v) {
-  DoUniform3fv(location, count, v);
-}
-
-void GLES2ImplementationEfl::Uniform3i(GLint location,
-                                       GLint x,
-                                       GLint y,
-                                       GLint z) {
-  DoUniform3i(location, x, y, z);
-}
-
-void GLES2ImplementationEfl::Uniform3iv(GLint location,
-                                        GLsizei count,
-                                        const GLint* v) {
-  DoUniform3iv(location, count, v);
-}
-
-void GLES2ImplementationEfl::Uniform3ui(GLint /* location */,
-                                        GLuint /* x */,
-                                        GLuint /* y */,
-                                        GLuint /* z */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::Uniform3uiv(GLint /* location */,
-                                         GLsizei /* count */,
-                                         const GLuint* /* v */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::Uniform4f(GLint location,
-                                       GLfloat x,
-                                       GLfloat y,
-                                       GLfloat z,
-                                       GLfloat w) {
-  DoUniform4f(location, x, y, z, w);
-}
-
-void GLES2ImplementationEfl::Uniform4fv(GLint location,
-                                        GLsizei count,
-                                        const GLfloat* v) {
-  DoUniform4fv(location, count, v);
-}
-
-void GLES2ImplementationEfl::Uniform4i(GLint location,
-                                       GLint x,
-                                       GLint y,
-                                       GLint z,
-                                       GLint w) {
-  DoUniform4i(location, x, y, z, w);
-}
-
-void GLES2ImplementationEfl::Uniform4iv(GLint location,
-                                        GLsizei count,
-                                        const GLint* v) {
-  DoUniform4iv(location, count, v);
-}
-
-void GLES2ImplementationEfl::Uniform4ui(GLint /* location */,
-                                        GLuint /* x */,
-                                        GLuint /* y */,
-                                        GLuint /* z */,
-                                        GLuint /* w */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::Uniform4uiv(GLint /* location */,
-                                         GLsizei /* count */,
-                                         const GLuint* /* v */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::UniformBlockBinding(GLuint /* program */,
-                                                 GLuint /* index */,
-                                                 GLuint /* binding */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::UniformMatrix2fv(GLint location,
-                                              GLsizei count,
-                                              GLboolean transpose,
-                                              const GLfloat* value) {
-  DoUniformMatrix2fv(location, count, transpose, value);
-}
-
-void GLES2ImplementationEfl::UniformMatrix2x3fv(GLint /* location */,
-                                                GLsizei /* count */,
-                                                GLboolean /* transpose */,
-                                                const GLfloat* /* value */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::UniformMatrix2x4fv(GLint /* location */,
-                                                GLsizei /* count */,
-                                                GLboolean /* transpose */,
-                                                const GLfloat* /* value */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::UniformMatrix3fv(GLint location,
-                                              GLsizei count,
-                                              GLboolean transpose,
-                                              const GLfloat* value) {
-  DoUniformMatrix3fv(location, count, transpose, value);
-}
-
-void GLES2ImplementationEfl::UniformMatrix3x2fv(GLint /* location */,
-                                                GLsizei /* count */,
-                                                GLboolean /* transpose */,
-                                                const GLfloat* /* value */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::UniformMatrix3x4fv(GLint /* location */,
-                                                GLsizei /* count */,
-                                                GLboolean /* transpose */,
-                                                const GLfloat* /* value */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::UniformMatrix4fv(GLint location,
-                                              GLsizei count,
-                                              GLboolean transpose,
-                                              const GLfloat* value) {
-  DoUniformMatrix4fv(location, count, transpose, value);
-}
-
-void GLES2ImplementationEfl::UniformMatrix4x2fv(GLint /* location */,
-                                                GLsizei /* count */,
-                                                GLboolean /* transpose */,
-                                                const GLfloat* /* value */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::UniformMatrix4x3fv(GLint /* location */,
-                                                GLsizei /* count */,
-                                                GLboolean /* transpose */,
-                                                const GLfloat* /* value */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::UseProgram(GLuint program) {
-  DoUseProgram(program);
-}
-
-void GLES2ImplementationEfl::ValidateProgram(GLuint program) {
-  evas_gl_api_->glValidateProgram(program);
-}
-
-void GLES2ImplementationEfl::VertexAttrib1f(GLuint indx, GLfloat x) {
-  evas_gl_api_->glVertexAttrib1f(indx, x);
-}
-
-void GLES2ImplementationEfl::VertexAttrib1fv(GLuint indx,
-                                             const GLfloat* values) {
-  evas_gl_api_->glVertexAttrib1fv(indx, values);
-}
-
-void GLES2ImplementationEfl::VertexAttrib2f(GLuint indx, GLfloat x, GLfloat y) {
-  evas_gl_api_->glVertexAttrib2f(indx, x, y);
-}
-
-void GLES2ImplementationEfl::VertexAttrib2fv(GLuint indx,
-                                             const GLfloat* values) {
-  evas_gl_api_->glVertexAttrib2fv(indx, values);
-}
-
-void GLES2ImplementationEfl::VertexAttrib3f(GLuint indx,
-                                            GLfloat x,
-                                            GLfloat y,
-                                            GLfloat z) {
-  evas_gl_api_->glVertexAttrib3f(indx, x, y, z);
-}
-
-void GLES2ImplementationEfl::VertexAttrib3fv(GLuint indx,
-                                             const GLfloat* values) {
-  evas_gl_api_->glVertexAttrib3fv(indx, values);
-}
-
-void GLES2ImplementationEfl::VertexAttrib4f(GLuint indx,
-                                            GLfloat x,
-                                            GLfloat y,
-                                            GLfloat z,
-                                            GLfloat w) {
-  evas_gl_api_->glVertexAttrib4f(indx, x, y, z, w);
-}
-
-void GLES2ImplementationEfl::VertexAttrib4fv(GLuint indx,
-                                             const GLfloat* values) {
-  evas_gl_api_->glVertexAttrib4fv(indx, values);
-}
-
-void GLES2ImplementationEfl::VertexAttribI4i(GLuint /* indx */,
-                                             GLint /* x */,
-                                             GLint /* y */,
-                                             GLint /* z */,
-                                             GLint /* w */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::VertexAttribI4iv(GLuint /* indx */,
-                                              const GLint* /* values */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::VertexAttribI4ui(GLuint /* indx */,
-                                              GLuint /* x */,
-                                              GLuint /* y */,
-                                              GLuint /* z */,
-                                              GLuint /* w */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::VertexAttribI4uiv(GLuint /* indx */,
-                                               const GLuint* /* values */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::VertexAttribIPointer(GLuint /* indx */,
-                                                  GLint /* size */,
-                                                  GLenum /* type */,
-                                                  GLsizei /* stride */,
-                                                  const void* /* ptr */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::VertexAttribPointer(GLuint indx,
-                                                 GLint size,
-                                                 GLenum type,
-                                                 GLboolean normalized,
-                                                 GLsizei stride,
-                                                 const void* ptr) {
-  evas_gl_api_->glVertexAttribPointer(indx, size, type, normalized, stride,
-                                      ptr);
-}
-
-void GLES2ImplementationEfl::Viewport(GLint x,
-                                      GLint y,
-                                      GLsizei width,
-                                      GLsizei height) {
-  evas_gl_api_->glViewport(x, y, width, height);
-}
-
-void GLES2ImplementationEfl::WaitSync(GLsync /* sync */,
-                                      GLbitfield /* flags */,
-                                      GLuint64 /* timeout */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::BlitFramebufferCHROMIUM(GLint /* srcX0 */,
-                                                     GLint /* srcY0 */,
-                                                     GLint /* srcX1 */,
-                                                     GLint /* srcY1 */,
-                                                     GLint /* dstX0 */,
-                                                     GLint /* dstY0 */,
-                                                     GLint /* dstX1 */,
-                                                     GLint /* dstY1 */,
-                                                     GLbitfield /* mask */,
-                                                     GLenum /* filter */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::RenderbufferStorageMultisampleCHROMIUM(
-    GLenum /* target */,
-    GLsizei /* samples */,
-    GLenum /* internalformat */,
-    GLsizei /* width */,
-    GLsizei /* height */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::RenderbufferStorageMultisampleAdvancedAMD(
-    GLenum /* target */,
-    GLsizei /* samples */,
-    GLsizei /* storageSamples */,
-    GLenum /* internalformat */,
-    GLsizei /* width */,
-    GLsizei /* height */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::RenderbufferStorageMultisampleEXT(
-    GLenum /* target */,
-    GLsizei /* samples */,
-    GLenum /* internalformat */,
-    GLsizei /* width */,
-    GLsizei /* height */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::FramebufferTexture2DMultisampleEXT(
-    GLenum /* target */,
-    GLenum /* attachment */,
-    GLenum /* textarget */,
-    GLuint /* texture */,
-    GLint /* level */,
-    GLsizei /* samples */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::TexStorage2DEXT(GLenum /* target */,
-                                             GLsizei /* levels */,
-                                             GLenum /* internalFormat */,
-                                             GLsizei /* width */,
-                                             GLsizei /* height */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GenQueriesEXT(GLsizei /* n */,
-                                           GLuint* /* queries */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::DeleteQueriesEXT(GLsizei /* n */,
-                                              const GLuint* /* queries */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::QueryCounterEXT(GLuint /* id */,
-                                             GLenum /* target */) {
-  NOTIMPLEMENTED();
-}
-
-GLboolean GLES2ImplementationEfl::IsQueryEXT(GLuint /* id */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-void GLES2ImplementationEfl::BeginQueryEXT(GLenum /* target */,
-                                           GLuint /* id */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::BeginTransformFeedback(
-    GLenum /* primitivemode */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::EndQueryEXT(GLenum /* target */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::EndTransformFeedback() {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetQueryivEXT(GLenum /* target */,
-                                           GLenum /* pname */,
-                                           GLint* /* params */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetQueryObjectivEXT(GLuint /* id */,
-                                                 GLenum /* pname */,
-                                                 GLint* /* params */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetQueryObjectuivEXT(GLuint /* id */,
-                                                  GLenum /* pname */,
-                                                  GLuint* /* params */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetQueryObjecti64vEXT(GLuint /* id */,
-                                                   GLenum /* pname */,
-                                                   GLint64* /* params */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetQueryObjectui64vEXT(GLuint /* id */,
-                                                    GLenum /* pname */,
-                                                    GLuint64* /* params */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::SetDisjointValueSyncCHROMIUM() {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::InsertEventMarkerEXT(GLsizei /* length */,
-                                                  const GLchar* /* marker */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::PushGroupMarkerEXT(GLsizei /* length */,
-                                                const GLchar* /* marker */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::PopGroupMarkerEXT() {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GenVertexArraysOES(GLsizei /* n */,
-                                                GLuint* /* arrays */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::DeleteVertexArraysOES(GLsizei /* n */,
-                                                   const GLuint* /* arrays */) {
-  NOTIMPLEMENTED();
-}
-
-GLboolean GLES2ImplementationEfl::IsVertexArrayOES(GLuint /* array */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-void GLES2ImplementationEfl::BindVertexArrayOES(GLuint /* array */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::FramebufferParameteri(GLenum /* target */,
-                                                   GLenum /* pname */,
-                                                   GLint /* param */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::BindImageTexture(GLuint /* unit */,
-                                              GLuint /* texture */,
-                                              GLint /* level */,
-                                              GLboolean /* layered */,
-                                              GLint /* layer */,
-                                              GLenum /* access */,
-                                              GLenum /* format */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::DispatchCompute(GLuint /* num_groups_x */,
-                                             GLuint /* num_groups_y */,
-                                             GLuint /* num_groups_z */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::DispatchComputeIndirect(GLintptr /* offset */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::DrawArraysIndirect(GLenum /* mode */,
-                                                const void* /* offset */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::DrawElementsIndirect(GLenum /* mode */,
-                                                  GLenum /* type */,
-                                                  const void* /* offset */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetProgramInterfaceiv(
-    GLuint /* program */,
-    GLenum /* program_interface */,
-    GLenum /* pname */,
-    GLint* /* params */) {
-  NOTIMPLEMENTED();
-}
-
-GLuint GLES2ImplementationEfl::GetProgramResourceIndex(
-    GLuint /* program */,
-    GLenum /* program_interface */,
-    const char* /* name */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-void GLES2ImplementationEfl::GetProgramResourceName(
-    GLuint /* program */,
-    GLenum /* program_interface */,
-    GLuint /* index */,
-    GLsizei /* bufsize */,
-    GLsizei* /* length */,
-    char* /* name */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetProgramResourceiv(
-    GLuint /* program */,
-    GLenum /* program_interface */,
-    GLuint /* index */,
-    GLsizei /* prop_count */,
-    const GLenum* /* props */,
-    GLsizei /* bufsize */,
-    GLsizei* /* length */,
-    GLint* /* params */) {
-  NOTIMPLEMENTED();
-}
-
-GLint GLES2ImplementationEfl::GetProgramResourceLocation(
-    GLuint /* program */,
-    GLenum /* program_interface */,
-    const char* /* name */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-void GLES2ImplementationEfl::MemoryBarrierEXT(GLbitfield /* barriers */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::MemoryBarrierByRegion(GLbitfield /* barriers */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::SwapBuffers(GLuint64 /* swap_id */,
-                                         GLbitfield /* flags */) {
-  NOTIMPLEMENTED();
-}
-
-GLuint GLES2ImplementationEfl::GetMaxValueInBufferCHROMIUM(
-    GLuint /* buffer_id */,
-    GLsizei /* count */,
-    GLenum /* type */,
-    GLuint /* offset */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-GLboolean GLES2ImplementationEfl::EnableFeatureCHROMIUM(
-    const char* /* feature */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-void* GLES2ImplementationEfl::MapBufferCHROMIUM(GLuint /* target */,
-                                                GLenum /* access */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-GLboolean GLES2ImplementationEfl::UnmapBufferCHROMIUM(GLuint /* target */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-void* GLES2ImplementationEfl::MapBufferSubDataCHROMIUM(GLuint /* target */,
-                                                       GLintptr /* offset */,
-                                                       GLsizeiptr /* size */,
-                                                       GLenum /* access */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-void GLES2ImplementationEfl::UnmapBufferSubDataCHROMIUM(const void* /* mem */) {
-  NOTIMPLEMENTED();
-}
-
-void* GLES2ImplementationEfl::MapBufferRange(GLenum /* target */,
-                                             GLintptr /* offset */,
-                                             GLsizeiptr /* size */,
-                                             GLbitfield /* access */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-GLboolean GLES2ImplementationEfl::UnmapBuffer(GLenum /* target */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-void GLES2ImplementationEfl::FlushMappedBufferRange(GLenum /* target */,
-                                                    GLintptr /* offset */,
-                                                    GLsizeiptr /* size */) {
-  NOTIMPLEMENTED();
-}
-
-void* GLES2ImplementationEfl::MapTexSubImage2DCHROMIUM(GLenum /* target */,
-                                                       GLint /* level */,
-                                                       GLint /* xoffset */,
-                                                       GLint /* yoffset */,
-                                                       GLsizei /* width */,
-                                                       GLsizei /* height */,
-                                                       GLenum /* format */,
-                                                       GLenum /* type */,
-                                                       GLenum /* access */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-void GLES2ImplementationEfl::UnmapTexSubImage2DCHROMIUM(const void* /* mem */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::ResizeCHROMIUM(GLuint /* width */,
-                                            GLuint /* height */,
-                                            GLfloat /* scale_factor */,
-                                            GLcolorSpace /* color_space */,
-                                            GLboolean /* alpha */) {
-  NOTIMPLEMENTED();
-}
-
-const GLchar* GLES2ImplementationEfl::GetRequestableExtensionsCHROMIUM() {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-void GLES2ImplementationEfl::RequestExtensionCHROMIUM(
-    const char* /* extension */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetProgramInfoCHROMIUM(GLuint /* program */,
-                                                    GLsizei /* bufsize */,
-                                                    GLsizei* /* size */,
-                                                    void* /* info */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetUniformBlocksCHROMIUM(GLuint /* program */,
-                                                      GLsizei /* bufsize */,
-                                                      GLsizei* /* size */,
-                                                      void* /* info */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetTransformFeedbackVaryingsCHROMIUM(
-    GLuint /* program */,
-    GLsizei /* bufsize */,
-    GLsizei* /* size */,
-    void* /* info */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetUniformsES3CHROMIUM(GLuint /* program */,
-                                                    GLsizei /* bufsize */,
-                                                    GLsizei* /* size */,
-                                                    void* /* info */) {
-  NOTIMPLEMENTED();
-}
-
-GLuint GLES2ImplementationEfl::CreateImageCHROMIUM(
-    ClientBuffer /* buffer */,
-    GLsizei /* width */,
-    GLsizei /* height */,
-    GLenum /* internalformat */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-void GLES2ImplementationEfl::DestroyImageCHROMIUM(GLuint /* image_id */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::DescheduleUntilFinishedCHROMIUM() {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::GetTranslatedShaderSourceANGLE(
-    GLuint /* shader */,
-    GLsizei /* bufsize */,
-    GLsizei* /* length */,
-    char* /* source */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::PostSubBufferCHROMIUM(GLuint64 /* swap_id */,
-                                                   GLint /* x */,
-                                                   GLint /* y */,
-                                                   GLint /* width */,
-                                                   GLint /* height */,
-                                                   GLbitfield /* flags */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::CopyTextureCHROMIUM(
-    GLuint /* source_id */,
-    GLint /* source_level */,
-    GLenum /* dest_target */,
-    GLuint /* dest_id */,
-    GLint /* dest_level */,
-    GLint /* internalformat */,
-    GLenum /* dest_type */,
-    GLboolean /* unpack_flip_y */,
-    GLboolean /* unpack_premultiply_alpha */,
-    GLboolean /* unpack_unmultiply_alpha */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::CopySubTextureCHROMIUM(
-    GLuint /* source_id */,
-    GLint /* source_level */,
-    GLenum /* dest_target */,
-    GLuint /* dest_id */,
-    GLint /* dest_level */,
-    GLint /* xoffset */,
-    GLint /* yoffset */,
-    GLint /* x */,
-    GLint /* y */,
-    GLsizei /* width */,
-    GLsizei /* height */,
-    GLboolean /* unpack_flip_y */,
-    GLboolean /* unpack_premultiply_alpha */,
-    GLboolean /* unpack_unmultiply_alpha */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::DrawArraysInstancedANGLE(GLenum /* mode */,
-                                                      GLint /* first */,
-                                                      GLsizei /* count */,
-                                                      GLsizei /* primcount */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::DrawArraysInstancedBaseInstanceANGLE(
-    GLenum /* mode */,
-    GLint /* first */,
-    GLsizei /* count */,
-    GLsizei /* primcount */,
-    GLuint /* baseinstance */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::DrawElementsInstancedANGLE(
-    GLenum /* mode */,
-    GLsizei /* count */,
-    GLenum /* type */,
-    const void* /* indices */,
-    GLsizei /* primcount */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::DrawElementsInstancedBaseVertexBaseInstanceANGLE(
-    GLenum /* mode */,
-    GLsizei /* count */,
-    GLenum /* type */,
-    const void* /* indices */,
-    GLsizei /* primcount */,
-    GLint /* basevertex */,
-    GLuint /* baseinstance */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::VertexAttribDivisorANGLE(GLuint /* index */,
-                                                      GLuint /* divisor */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::ProduceTextureDirectCHROMIUM(
-    GLuint /* texture */,
-    GLbyte* /* mailbox */) {
-  NOTIMPLEMENTED();
-}
-
-GLuint GLES2ImplementationEfl::CreateAndConsumeTextureCHROMIUM(
-    const GLbyte* mailbox) {
-  return DoCreateAndConsumeTextureCHROMIUM(mailbox);
-}
-
-void GLES2ImplementationEfl::BindUniformLocationCHROMIUM(GLuint program,
-                                                         GLint location,
-                                                         const char* name) {
-  DoBindUniformLocationCHROMIUM(program, location, name);
-}
-
-void GLES2ImplementationEfl::BindTexImage2DCHROMIUM(GLenum /* target */,
-                                                    GLint /* imageId */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::BindTexImage2DWithInternalformatCHROMIUM(
-    GLenum /* target */,
-    GLenum /* internalformat */,
-    GLint /* imageId */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::ReleaseTexImage2DCHROMIUM(GLenum /* target */,
-                                                       GLint /* imageId */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::TraceBeginCHROMIUM(const char* /* category_name */,
-                                                const char* /* trace_name */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::TraceEndCHROMIUM() {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::DiscardFramebufferEXT(
-    GLenum /* target */,
-    GLsizei /* count */,
-    const GLenum* /* attachments */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::LoseContextCHROMIUM(GLenum /* current */,
-                                                 GLenum /* other */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::UnpremultiplyAndDitherCopyCHROMIUM(
-    GLuint /* source_id */,
-    GLuint /* dest_id */,
-    GLint /* x */,
-    GLint /* y */,
-    GLsizei /* width */,
-    GLsizei /* height */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::DrawBuffersEXT(GLsizei /* count */,
-                                            const GLenum* /* bufs */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::DiscardBackbufferCHROMIUM() {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::ScheduleOverlayPlaneCHROMIUM(
-    GLint /* plane_z_order */,
-    GLenum /* plane_transform */,
-    GLuint /* overlay_texture_id */,
-    GLint /* bounds_x */,
-    GLint /* bounds_y */,
-    GLint /* bounds_width */,
-    GLint /* bounds_height */,
-    GLfloat /* uv_x */,
-    GLfloat /* uv_y */,
-    GLfloat /* uv_width */,
-    GLfloat /* uv_height */,
-    GLboolean /* enable_blend */,
-    GLuint /* gpu_fence_id */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::ScheduleCALayerSharedStateCHROMIUM(
-    GLfloat /* opacity */,
-    GLboolean /* is_clipped */,
-    const GLfloat* /* clip_rect */,
-    const GLfloat* /* rounded_corner_bounds */,
-    GLint /* sorting_context_id */,
-    const GLfloat* /* transform */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::ScheduleCALayerCHROMIUM(
-    GLuint /* contents_texture_id */,
-    const GLfloat* /* contents_rect */,
-    GLuint /* background_color */,
-    GLuint /* edge_aa_mask */,
-    const GLfloat* /* bounds_rect */,
-    GLuint /* filter */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::ScheduleCALayerInUseQueryCHROMIUM(
-    GLsizei /* count */,
-    const GLuint* /* textures */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::CommitOverlayPlanesCHROMIUM(
-    GLuint64 /* swap_id */,
-    GLbitfield /* flags */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::FlushDriverCachesCHROMIUM() {
-  NOTIMPLEMENTED();
-}
-
-GLuint GLES2ImplementationEfl::GetLastFlushIdCHROMIUM() {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-void GLES2ImplementationEfl::ScheduleDCLayerCHROMIUM(
-    GLuint /* texture_0 */,
-    GLuint /* texture_1 */,
-    GLint /* z_order */,
-    GLint /* content_x */,
-    GLint /* content_y */,
-    GLint /* content_width */,
-    GLint /* content_height */,
-    GLint /* quad_x */,
-    GLint /* quad_y */,
-    GLint /* quad_width */,
-    GLint /* quad_height */,
-    GLfloat /* transform_c1r1 */,
-    GLfloat /* transform_c2r1 */,
-    GLfloat /* transform_c1r2 */,
-    GLfloat /* transform_c2r2 */,
-    GLfloat /* transform_tx */,
-    GLfloat /* transform_ty */,
-    GLboolean /* is_clipped */,
-    GLint /* clip_x */,
-    GLint /* clip_y */,
-    GLint /* clip_width */,
-    GLint /* clip_height */,
-    GLuint /* protected_video_type */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::SetActiveURLCHROMIUM(const char* /* url */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::ContextVisibilityHintCHROMIUM(
-    GLboolean /* visibility */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::CoverageModulationCHROMIUM(
-    GLenum /* components */) {
-  NOTIMPLEMENTED();
-}
-
-GLenum GLES2ImplementationEfl::GetGraphicsResetStatusKHR() {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-void GLES2ImplementationEfl::BlendBarrierKHR() {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::BindFragDataLocationIndexedEXT(
-    GLuint /* program */,
-    GLuint /* colorNumber */,
-    GLuint /* index */,
-    const char* /* name */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::BindFragDataLocationEXT(GLuint /* program */,
-                                                     GLuint /* colorNumber */,
-                                                     const char* /* name */) {
-  NOTIMPLEMENTED();
-}
-
-GLint GLES2ImplementationEfl::GetFragDataIndexEXT(GLuint /* program */,
-                                                  const char* /* name */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-void GLES2ImplementationEfl::SwapBuffersWithBoundsCHROMIUM(
-    GLuint64 /* swap_id */,
-    GLsizei /* count */,
-    const GLint* /* rects */,
-    GLbitfield /* flags */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::SetDrawRectangleCHROMIUM(GLint /* x */,
-                                                      GLint /* y */,
-                                                      GLint /* width */,
-                                                      GLint /* height */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::SetEnableDCLayersCHROMIUM(
-    GLboolean /* enabled */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::InitializeDiscardableTextureCHROMIUM(
-    GLuint /* texture_id */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::UnlockDiscardableTextureCHROMIUM(
-    GLuint /* texture_id */) {
-  NOTIMPLEMENTED();
-}
-
-bool GLES2ImplementationEfl::LockDiscardableTextureCHROMIUM(
-    GLuint /* texture_id */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-void GLES2ImplementationEfl::TexStorage2DImageCHROMIUM(
-    GLenum /* target */,
-    GLenum /* internalFormat */,
-    GLenum /* bufferUsage */,
-    GLsizei /* width */,
-    GLsizei /* height */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::SetColorSpaceMetadataCHROMIUM(
-    GLuint /* texture_id */,
-    GLcolorSpace /* color_space */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::WindowRectanglesEXT(GLenum /* mode */,
-                                                 GLsizei /* count */,
-                                                 const GLint* /* box */) {
-  NOTIMPLEMENTED();
-}
-
-GLuint GLES2ImplementationEfl::CreateGpuFenceCHROMIUM() {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-GLuint GLES2ImplementationEfl::CreateClientGpuFenceCHROMIUM(
-    ClientGpuFence /* source */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-void GLES2ImplementationEfl::WaitGpuFenceCHROMIUM(GLuint /* gpu_fence_id */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::DestroyGpuFenceCHROMIUM(
-    GLuint /* gpu_fence_id */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::InvalidateReadbackBufferShadowDataCHROMIUM(
-    GLuint /* buffer_id */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::FramebufferTextureMultiviewOVR(
-    GLenum /* target */,
-    GLenum /* attachment */,
-    GLuint /* texture */,
-    GLint /* level */,
-    GLint /* baseViewIndex */,
-    GLsizei /* numViews */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::MaxShaderCompilerThreadsKHR(GLuint /* count */) {
-  NOTIMPLEMENTED();
-}
-
-GLuint GLES2ImplementationEfl::CreateAndTexStorage2DSharedImageCHROMIUM(
-    const GLbyte* /* mailbox */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-GLuint GLES2ImplementationEfl::
-    CreateAndTexStorage2DSharedImageWithInternalFormatCHROMIUM(
-        const GLbyte* /* mailbox */,
-        GLenum /* internalformat */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-void GLES2ImplementationEfl::BeginSharedImageAccessDirectCHROMIUM(
-    GLuint /* texture */,
-    GLenum /* mode */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::EndSharedImageAccessDirectCHROMIUM(
-    GLuint /* texture */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::BeginBatchReadAccessSharedImageCHROMIUM() {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::EndBatchReadAccessSharedImageCHROMIUM() {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::EnableiOES(GLenum /* target */,
-                                        GLuint /* index */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::DisableiOES(GLenum /* target */,
-                                         GLuint /* index */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::BlendEquationiOES(GLuint /* buf */,
-                                               GLenum /* mode */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::BlendEquationSeparateiOES(GLuint /* buf */,
-                                                       GLenum /* modeRGB */,
-                                                       GLenum /* modeAlpha */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::BlendFunciOES(GLuint /* buf */,
-                                           GLenum /* src */,
-                                           GLenum /* dst */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::BlendFuncSeparateiOES(GLuint /* buf */,
-                                                   GLenum /* srcRGB */,
-                                                   GLenum /* dstRGB */,
-                                                   GLenum /* srcAlpha */,
-                                                   GLenum /* dstAlpha */) {
-  NOTIMPLEMENTED();
-}
-
-void GLES2ImplementationEfl::ColorMaskiOES(GLuint /* buf */,
-                                           GLboolean /* r */,
-                                           GLboolean /* g */,
-                                           GLboolean /* b */,
-                                           GLboolean /* a */) {
-  NOTIMPLEMENTED();
-}
-
-GLboolean GLES2ImplementationEfl::IsEnablediOES(GLenum /* target */,
-                                                GLuint /* index */) {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-#endif  // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_EFL_AUTOGEN_H_
diff --git a/gpu/command_buffer/client/gles2_implementation_efl_header_autogen.h b/gpu/command_buffer/client/gles2_implementation_efl_header_autogen.h
deleted file mode 100644 (file)
index e105e8e..0000000
+++ /dev/null
@@ -1,948 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// This file is auto-generated from
-// gpu/command_buffer/build_gles2_cmd_buffer.py
-// It's formatted by clang-format using chromium coding style:
-//    clang-format -i -style=chromium filename
-// DO NOT EDIT!
-
-// This file is included by gles2_implementation_efl.h.
-#ifndef GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_EFL_HEADER_AUTOGEN_H_
-#define GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_EFL_HEADER_AUTOGEN_H_
-
-void ActiveTexture(GLenum texture) override;
-void AttachShader(GLuint program, GLuint shader) override;
-void BindAttribLocation(GLuint program,
-                        GLuint index,
-                        const char* name) override;
-void BindBuffer(GLenum target, GLuint buffer) override;
-void BindBufferBase(GLenum target, GLuint index, GLuint buffer) override;
-void BindBufferRange(GLenum target,
-                     GLuint index,
-                     GLuint buffer,
-                     GLintptr offset,
-                     GLsizeiptr size) override;
-void BindFramebuffer(GLenum target, GLuint framebuffer) override;
-void BindRenderbuffer(GLenum target, GLuint renderbuffer) override;
-void BindSampler(GLuint unit, GLuint sampler) override;
-void BindTexture(GLenum target, GLuint texture) override;
-void BindTransformFeedback(GLenum target, GLuint transformfeedback) override;
-void BlendColor(GLclampf red,
-                GLclampf green,
-                GLclampf blue,
-                GLclampf alpha) override;
-void BlendEquation(GLenum mode) override;
-void BlendEquationSeparate(GLenum modeRGB, GLenum modeAlpha) override;
-void BlendFunc(GLenum sfactor, GLenum dfactor) override;
-void BlendFuncSeparate(GLenum srcRGB,
-                       GLenum dstRGB,
-                       GLenum srcAlpha,
-                       GLenum dstAlpha) override;
-void BufferData(GLenum target,
-                GLsizeiptr size,
-                const void* data,
-                GLenum usage) override;
-void BufferSubData(GLenum target,
-                   GLintptr offset,
-                   GLsizeiptr size,
-                   const void* data) override;
-GLenum CheckFramebufferStatus(GLenum target) override;
-void Clear(GLbitfield mask) override;
-void ClearBufferfi(GLenum buffer,
-                   GLint drawbuffers,
-                   GLfloat depth,
-                   GLint stencil) override;
-void ClearBufferfv(GLenum buffer,
-                   GLint drawbuffers,
-                   const GLfloat* value) override;
-void ClearBufferiv(GLenum buffer,
-                   GLint drawbuffers,
-                   const GLint* value) override;
-void ClearBufferuiv(GLenum buffer,
-                    GLint drawbuffers,
-                    const GLuint* value) override;
-void ClearColor(GLclampf red,
-                GLclampf green,
-                GLclampf blue,
-                GLclampf alpha) override;
-void ClearDepthf(GLclampf depth) override;
-void ClearStencil(GLint s) override;
-GLenum ClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout) override;
-void ColorMask(GLboolean red,
-               GLboolean green,
-               GLboolean blue,
-               GLboolean alpha) override;
-void CompileShader(GLuint shader) override;
-void CompressedTexImage2D(GLenum target,
-                          GLint level,
-                          GLenum internalformat,
-                          GLsizei width,
-                          GLsizei height,
-                          GLint border,
-                          GLsizei imageSize,
-                          const void* data) override;
-void CompressedTexSubImage2D(GLenum target,
-                             GLint level,
-                             GLint xoffset,
-                             GLint yoffset,
-                             GLsizei width,
-                             GLsizei height,
-                             GLenum format,
-                             GLsizei imageSize,
-                             const void* data) override;
-void CompressedTexImage3D(GLenum target,
-                          GLint level,
-                          GLenum internalformat,
-                          GLsizei width,
-                          GLsizei height,
-                          GLsizei depth,
-                          GLint border,
-                          GLsizei imageSize,
-                          const void* data) override;
-void CompressedTexSubImage3D(GLenum target,
-                             GLint level,
-                             GLint xoffset,
-                             GLint yoffset,
-                             GLint zoffset,
-                             GLsizei width,
-                             GLsizei height,
-                             GLsizei depth,
-                             GLenum format,
-                             GLsizei imageSize,
-                             const void* data) override;
-void CopyBufferSubData(GLenum readtarget,
-                       GLenum writetarget,
-                       GLintptr readoffset,
-                       GLintptr writeoffset,
-                       GLsizeiptr size) override;
-void CopyTexImage2D(GLenum target,
-                    GLint level,
-                    GLenum internalformat,
-                    GLint x,
-                    GLint y,
-                    GLsizei width,
-                    GLsizei height,
-                    GLint border) override;
-void CopyTexSubImage2D(GLenum target,
-                       GLint level,
-                       GLint xoffset,
-                       GLint yoffset,
-                       GLint x,
-                       GLint y,
-                       GLsizei width,
-                       GLsizei height) override;
-void CopyTexSubImage3D(GLenum target,
-                       GLint level,
-                       GLint xoffset,
-                       GLint yoffset,
-                       GLint zoffset,
-                       GLint x,
-                       GLint y,
-                       GLsizei width,
-                       GLsizei height) override;
-GLuint CreateProgram() override;
-GLuint CreateShader(GLenum type) override;
-void CullFace(GLenum mode) override;
-void DeleteBuffers(GLsizei n, const GLuint* buffers) override;
-void DeleteFramebuffers(GLsizei n, const GLuint* framebuffers) override;
-void DeleteProgram(GLuint program) override;
-void DeleteRenderbuffers(GLsizei n, const GLuint* renderbuffers) override;
-void DeleteSamplers(GLsizei n, const GLuint* samplers) override;
-void DeleteSync(GLsync sync) override;
-void DeleteShader(GLuint shader) override;
-void DeleteTextures(GLsizei n, const GLuint* textures) override;
-void DeleteTransformFeedbacks(GLsizei n, const GLuint* ids) override;
-void DepthFunc(GLenum func) override;
-void DepthMask(GLboolean flag) override;
-void DepthRangef(GLclampf zNear, GLclampf zFar) override;
-void DetachShader(GLuint program, GLuint shader) override;
-void Disable(GLenum cap) override;
-void DisableVertexAttribArray(GLuint index) override;
-void DrawArrays(GLenum mode, GLint first, GLsizei count) override;
-void DrawElements(GLenum mode,
-                  GLsizei count,
-                  GLenum type,
-                  const void* indices) override;
-void DrawRangeElements(GLenum mode,
-                       GLuint start,
-                       GLuint end,
-                       GLsizei count,
-                       GLenum type,
-                       const void* indices) override;
-void Enable(GLenum cap) override;
-void EnableVertexAttribArray(GLuint index) override;
-GLsync FenceSync(GLenum condition, GLbitfield flags) override;
-void Finish() override;
-void Flush() override;
-void FramebufferRenderbuffer(GLenum target,
-                             GLenum attachment,
-                             GLenum renderbuffertarget,
-                             GLuint renderbuffer) override;
-void FramebufferTexture2D(GLenum target,
-                          GLenum attachment,
-                          GLenum textarget,
-                          GLuint texture,
-                          GLint level) override;
-void FramebufferTextureLayer(GLenum target,
-                             GLenum attachment,
-                             GLuint texture,
-                             GLint level,
-                             GLint layer) override;
-void FrontFace(GLenum mode) override;
-void GenBuffers(GLsizei n, GLuint* buffers) override;
-void GenerateMipmap(GLenum target) override;
-void GenFramebuffers(GLsizei n, GLuint* framebuffers) override;
-void GenRenderbuffers(GLsizei n, GLuint* renderbuffers) override;
-void GenSamplers(GLsizei n, GLuint* samplers) override;
-void GenTextures(GLsizei n, GLuint* textures) override;
-void GenTransformFeedbacks(GLsizei n, GLuint* ids) override;
-void GetActiveAttrib(GLuint program,
-                     GLuint index,
-                     GLsizei bufsize,
-                     GLsizei* length,
-                     GLint* size,
-                     GLenum* type,
-                     char* name) override;
-void GetActiveUniform(GLuint program,
-                      GLuint index,
-                      GLsizei bufsize,
-                      GLsizei* length,
-                      GLint* size,
-                      GLenum* type,
-                      char* name) override;
-void GetActiveUniformBlockiv(GLuint program,
-                             GLuint index,
-                             GLenum pname,
-                             GLint* params) override;
-void GetActiveUniformBlockName(GLuint program,
-                               GLuint index,
-                               GLsizei bufsize,
-                               GLsizei* length,
-                               char* name) override;
-void GetActiveUniformsiv(GLuint program,
-                         GLsizei count,
-                         const GLuint* indices,
-                         GLenum pname,
-                         GLint* params) override;
-void GetAttachedShaders(GLuint program,
-                        GLsizei maxcount,
-                        GLsizei* count,
-                        GLuint* shaders) override;
-GLint GetAttribLocation(GLuint program, const char* name) override;
-void GetBooleanv(GLenum pname, GLboolean* params) override;
-void GetBooleani_v(GLenum pname, GLuint index, GLboolean* data) override;
-void GetBufferParameteri64v(GLenum target,
-                            GLenum pname,
-                            GLint64* params) override;
-void GetBufferParameteriv(GLenum target, GLenum pname, GLint* params) override;
-GLenum GetError() override;
-void GetFloatv(GLenum pname, GLfloat* params) override;
-GLint GetFragDataLocation(GLuint program, const char* name) override;
-void GetFramebufferAttachmentParameteriv(GLenum target,
-                                         GLenum attachment,
-                                         GLenum pname,
-                                         GLint* params) override;
-void GetInteger64v(GLenum pname, GLint64* params) override;
-void GetIntegeri_v(GLenum pname, GLuint index, GLint* data) override;
-void GetInteger64i_v(GLenum pname, GLuint index, GLint64* data) override;
-void GetIntegerv(GLenum pname, GLint* params) override;
-void GetInternalformativ(GLenum target,
-                         GLenum format,
-                         GLenum pname,
-                         GLsizei bufSize,
-                         GLint* params) override;
-void GetProgramiv(GLuint program, GLenum pname, GLint* params) override;
-void GetProgramInfoLog(GLuint program,
-                       GLsizei bufsize,
-                       GLsizei* length,
-                       char* infolog) override;
-void GetRenderbufferParameteriv(GLenum target,
-                                GLenum pname,
-                                GLint* params) override;
-void GetSamplerParameterfv(GLuint sampler,
-                           GLenum pname,
-                           GLfloat* params) override;
-void GetSamplerParameteriv(GLuint sampler,
-                           GLenum pname,
-                           GLint* params) override;
-void GetShaderiv(GLuint shader, GLenum pname, GLint* params) override;
-void GetShaderInfoLog(GLuint shader,
-                      GLsizei bufsize,
-                      GLsizei* length,
-                      char* infolog) override;
-void GetShaderPrecisionFormat(GLenum shadertype,
-                              GLenum precisiontype,
-                              GLint* range,
-                              GLint* precision) override;
-void GetShaderSource(GLuint shader,
-                     GLsizei bufsize,
-                     GLsizei* length,
-                     char* source) override;
-const GLubyte* GetString(GLenum name) override;
-const GLubyte* GetStringi(GLenum name, GLuint index) override;
-void GetSynciv(GLsync sync,
-               GLenum pname,
-               GLsizei bufsize,
-               GLsizei* length,
-               GLint* values) override;
-void GetTexParameterfv(GLenum target, GLenum pname, GLfloat* params) override;
-void GetTexParameteriv(GLenum target, GLenum pname, GLint* params) override;
-void GetTransformFeedbackVarying(GLuint program,
-                                 GLuint index,
-                                 GLsizei bufsize,
-                                 GLsizei* length,
-                                 GLsizei* size,
-                                 GLenum* type,
-                                 char* name) override;
-GLuint GetUniformBlockIndex(GLuint program, const char* name) override;
-void GetUniformfv(GLuint program, GLint location, GLfloat* params) override;
-void GetUniformiv(GLuint program, GLint location, GLint* params) override;
-void GetUniformuiv(GLuint program, GLint location, GLuint* params) override;
-void GetUniformIndices(GLuint program,
-                       GLsizei count,
-                       const char* const* names,
-                       GLuint* indices) override;
-GLint GetUniformLocation(GLuint program, const char* name) override;
-void GetVertexAttribfv(GLuint index, GLenum pname, GLfloat* params) override;
-void GetVertexAttribiv(GLuint index, GLenum pname, GLint* params) override;
-void GetVertexAttribIiv(GLuint index, GLenum pname, GLint* params) override;
-void GetVertexAttribIuiv(GLuint index, GLenum pname, GLuint* params) override;
-void GetVertexAttribPointerv(GLuint index,
-                             GLenum pname,
-                             void** pointer) override;
-void Hint(GLenum target, GLenum mode) override;
-void InvalidateFramebuffer(GLenum target,
-                           GLsizei count,
-                           const GLenum* attachments) override;
-void InvalidateSubFramebuffer(GLenum target,
-                              GLsizei count,
-                              const GLenum* attachments,
-                              GLint x,
-                              GLint y,
-                              GLsizei width,
-                              GLsizei height) override;
-GLboolean IsBuffer(GLuint buffer) override;
-GLboolean IsEnabled(GLenum cap) override;
-GLboolean IsFramebuffer(GLuint framebuffer) override;
-GLboolean IsProgram(GLuint program) override;
-GLboolean IsRenderbuffer(GLuint renderbuffer) override;
-GLboolean IsSampler(GLuint sampler) override;
-GLboolean IsShader(GLuint shader) override;
-GLboolean IsSync(GLsync sync) override;
-GLboolean IsTexture(GLuint texture) override;
-GLboolean IsTransformFeedback(GLuint transformfeedback) override;
-void LineWidth(GLfloat width) override;
-void LinkProgram(GLuint program) override;
-void PauseTransformFeedback() override;
-void PixelStorei(GLenum pname, GLint param) override;
-void PolygonOffset(GLfloat factor, GLfloat units) override;
-void ReadBuffer(GLenum src) override;
-void ReadPixels(GLint x,
-                GLint y,
-                GLsizei width,
-                GLsizei height,
-                GLenum format,
-                GLenum type,
-                void* pixels) override;
-void ReleaseShaderCompiler() override;
-void RenderbufferStorage(GLenum target,
-                         GLenum internalformat,
-                         GLsizei width,
-                         GLsizei height) override;
-void ResumeTransformFeedback() override;
-void SampleCoverage(GLclampf value, GLboolean invert) override;
-void SamplerParameterf(GLuint sampler, GLenum pname, GLfloat param) override;
-void SamplerParameterfv(GLuint sampler,
-                        GLenum pname,
-                        const GLfloat* params) override;
-void SamplerParameteri(GLuint sampler, GLenum pname, GLint param) override;
-void SamplerParameteriv(GLuint sampler,
-                        GLenum pname,
-                        const GLint* params) override;
-void Scissor(GLint x, GLint y, GLsizei width, GLsizei height) override;
-void ShaderBinary(GLsizei n,
-                  const GLuint* shaders,
-                  GLenum binaryformat,
-                  const void* binary,
-                  GLsizei length) override;
-void ShaderSource(GLuint shader,
-                  GLsizei count,
-                  const GLchar* const* str,
-                  const GLint* length) override;
-void ShallowFinishCHROMIUM() override;
-void OrderingBarrierCHROMIUM() override;
-void MultiDrawArraysWEBGL(GLenum mode,
-                          const GLint* firsts,
-                          const GLsizei* counts,
-                          GLsizei drawcount) override;
-void MultiDrawArraysInstancedWEBGL(GLenum mode,
-                                   const GLint* firsts,
-                                   const GLsizei* counts,
-                                   const GLsizei* instance_counts,
-                                   GLsizei drawcount) override;
-void MultiDrawArraysInstancedBaseInstanceWEBGL(GLenum mode,
-                                               const GLint* firsts,
-                                               const GLsizei* counts,
-                                               const GLsizei* instance_counts,
-                                               const GLuint* baseinstances,
-                                               GLsizei drawcount) override;
-void MultiDrawElementsWEBGL(GLenum mode,
-                            const GLsizei* counts,
-                            GLenum type,
-                            const GLsizei* offsets,
-                            GLsizei drawcount) override;
-void MultiDrawElementsInstancedWEBGL(GLenum mode,
-                                     const GLsizei* counts,
-                                     GLenum type,
-                                     const GLsizei* offsets,
-                                     const GLsizei* instance_counts,
-                                     GLsizei drawcount) override;
-void MultiDrawElementsInstancedBaseVertexBaseInstanceWEBGL(
-    GLenum mode,
-    const GLsizei* counts,
-    GLenum type,
-    const GLsizei* offsets,
-    const GLsizei* instance_counts,
-    const GLint* basevertices,
-    const GLuint* baseinstances,
-    GLsizei drawcount) override;
-void StencilFunc(GLenum func, GLint ref, GLuint mask) override;
-void StencilFuncSeparate(GLenum face,
-                         GLenum func,
-                         GLint ref,
-                         GLuint mask) override;
-void StencilMask(GLuint mask) override;
-void StencilMaskSeparate(GLenum face, GLuint mask) override;
-void StencilOp(GLenum fail, GLenum zfail, GLenum zpass) override;
-void StencilOpSeparate(GLenum face,
-                       GLenum fail,
-                       GLenum zfail,
-                       GLenum zpass) override;
-void TexImage2D(GLenum target,
-                GLint level,
-                GLint internalformat,
-                GLsizei width,
-                GLsizei height,
-                GLint border,
-                GLenum format,
-                GLenum type,
-                const void* pixels) override;
-void TexImage3D(GLenum target,
-                GLint level,
-                GLint internalformat,
-                GLsizei width,
-                GLsizei height,
-                GLsizei depth,
-                GLint border,
-                GLenum format,
-                GLenum type,
-                const void* pixels) override;
-void TexParameterf(GLenum target, GLenum pname, GLfloat param) override;
-void TexParameterfv(GLenum target,
-                    GLenum pname,
-                    const GLfloat* params) override;
-void TexParameteri(GLenum target, GLenum pname, GLint param) override;
-void TexParameteriv(GLenum target, GLenum pname, const GLint* params) override;
-void TexStorage3D(GLenum target,
-                  GLsizei levels,
-                  GLenum internalFormat,
-                  GLsizei width,
-                  GLsizei height,
-                  GLsizei depth) override;
-void TexSubImage2D(GLenum target,
-                   GLint level,
-                   GLint xoffset,
-                   GLint yoffset,
-                   GLsizei width,
-                   GLsizei height,
-                   GLenum format,
-                   GLenum type,
-                   const void* pixels) override;
-void TexSubImage3D(GLenum target,
-                   GLint level,
-                   GLint xoffset,
-                   GLint yoffset,
-                   GLint zoffset,
-                   GLsizei width,
-                   GLsizei height,
-                   GLsizei depth,
-                   GLenum format,
-                   GLenum type,
-                   const void* pixels) override;
-void TransformFeedbackVaryings(GLuint program,
-                               GLsizei count,
-                               const char* const* varyings,
-                               GLenum buffermode) override;
-void Uniform1f(GLint location, GLfloat x) override;
-void Uniform1fv(GLint location, GLsizei count, const GLfloat* v) override;
-void Uniform1i(GLint location, GLint x) override;
-void Uniform1iv(GLint location, GLsizei count, const GLint* v) override;
-void Uniform1ui(GLint location, GLuint x) override;
-void Uniform1uiv(GLint location, GLsizei count, const GLuint* v) override;
-void Uniform2f(GLint location, GLfloat x, GLfloat y) override;
-void Uniform2fv(GLint location, GLsizei count, const GLfloat* v) override;
-void Uniform2i(GLint location, GLint x, GLint y) override;
-void Uniform2iv(GLint location, GLsizei count, const GLint* v) override;
-void Uniform2ui(GLint location, GLuint x, GLuint y) override;
-void Uniform2uiv(GLint location, GLsizei count, const GLuint* v) override;
-void Uniform3f(GLint location, GLfloat x, GLfloat y, GLfloat z) override;
-void Uniform3fv(GLint location, GLsizei count, const GLfloat* v) override;
-void Uniform3i(GLint location, GLint x, GLint y, GLint z) override;
-void Uniform3iv(GLint location, GLsizei count, const GLint* v) override;
-void Uniform3ui(GLint location, GLuint x, GLuint y, GLuint z) override;
-void Uniform3uiv(GLint location, GLsizei count, const GLuint* v) override;
-void Uniform4f(GLint location,
-               GLfloat x,
-               GLfloat y,
-               GLfloat z,
-               GLfloat w) override;
-void Uniform4fv(GLint location, GLsizei count, const GLfloat* v) override;
-void Uniform4i(GLint location, GLint x, GLint y, GLint z, GLint w) override;
-void Uniform4iv(GLint location, GLsizei count, const GLint* v) override;
-void Uniform4ui(GLint location,
-                GLuint x,
-                GLuint y,
-                GLuint z,
-                GLuint w) override;
-void Uniform4uiv(GLint location, GLsizei count, const GLuint* v) override;
-void UniformBlockBinding(GLuint program, GLuint index, GLuint binding) override;
-void UniformMatrix2fv(GLint location,
-                      GLsizei count,
-                      GLboolean transpose,
-                      const GLfloat* value) override;
-void UniformMatrix2x3fv(GLint location,
-                        GLsizei count,
-                        GLboolean transpose,
-                        const GLfloat* value) override;
-void UniformMatrix2x4fv(GLint location,
-                        GLsizei count,
-                        GLboolean transpose,
-                        const GLfloat* value) override;
-void UniformMatrix3fv(GLint location,
-                      GLsizei count,
-                      GLboolean transpose,
-                      const GLfloat* value) override;
-void UniformMatrix3x2fv(GLint location,
-                        GLsizei count,
-                        GLboolean transpose,
-                        const GLfloat* value) override;
-void UniformMatrix3x4fv(GLint location,
-                        GLsizei count,
-                        GLboolean transpose,
-                        const GLfloat* value) override;
-void UniformMatrix4fv(GLint location,
-                      GLsizei count,
-                      GLboolean transpose,
-                      const GLfloat* value) override;
-void UniformMatrix4x2fv(GLint location,
-                        GLsizei count,
-                        GLboolean transpose,
-                        const GLfloat* value) override;
-void UniformMatrix4x3fv(GLint location,
-                        GLsizei count,
-                        GLboolean transpose,
-                        const GLfloat* value) override;
-void UseProgram(GLuint program) override;
-void ValidateProgram(GLuint program) override;
-void VertexAttrib1f(GLuint indx, GLfloat x) override;
-void VertexAttrib1fv(GLuint indx, const GLfloat* values) override;
-void VertexAttrib2f(GLuint indx, GLfloat x, GLfloat y) override;
-void VertexAttrib2fv(GLuint indx, const GLfloat* values) override;
-void VertexAttrib3f(GLuint indx, GLfloat x, GLfloat y, GLfloat z) override;
-void VertexAttrib3fv(GLuint indx, const GLfloat* values) override;
-void VertexAttrib4f(GLuint indx,
-                    GLfloat x,
-                    GLfloat y,
-                    GLfloat z,
-                    GLfloat w) override;
-void VertexAttrib4fv(GLuint indx, const GLfloat* values) override;
-void VertexAttribI4i(GLuint indx, GLint x, GLint y, GLint z, GLint w) override;
-void VertexAttribI4iv(GLuint indx, const GLint* values) override;
-void VertexAttribI4ui(GLuint indx,
-                      GLuint x,
-                      GLuint y,
-                      GLuint z,
-                      GLuint w) override;
-void VertexAttribI4uiv(GLuint indx, const GLuint* values) override;
-void VertexAttribIPointer(GLuint indx,
-                          GLint size,
-                          GLenum type,
-                          GLsizei stride,
-                          const void* ptr) override;
-void VertexAttribPointer(GLuint indx,
-                         GLint size,
-                         GLenum type,
-                         GLboolean normalized,
-                         GLsizei stride,
-                         const void* ptr) override;
-void Viewport(GLint x, GLint y, GLsizei width, GLsizei height) override;
-void WaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout) override;
-void BlitFramebufferCHROMIUM(GLint srcX0,
-                             GLint srcY0,
-                             GLint srcX1,
-                             GLint srcY1,
-                             GLint dstX0,
-                             GLint dstY0,
-                             GLint dstX1,
-                             GLint dstY1,
-                             GLbitfield mask,
-                             GLenum filter) override;
-void RenderbufferStorageMultisampleCHROMIUM(GLenum target,
-                                            GLsizei samples,
-                                            GLenum internalformat,
-                                            GLsizei width,
-                                            GLsizei height) override;
-void RenderbufferStorageMultisampleAdvancedAMD(GLenum target,
-                                               GLsizei samples,
-                                               GLsizei storageSamples,
-                                               GLenum internalformat,
-                                               GLsizei width,
-                                               GLsizei height) override;
-void RenderbufferStorageMultisampleEXT(GLenum target,
-                                       GLsizei samples,
-                                       GLenum internalformat,
-                                       GLsizei width,
-                                       GLsizei height) override;
-void FramebufferTexture2DMultisampleEXT(GLenum target,
-                                        GLenum attachment,
-                                        GLenum textarget,
-                                        GLuint texture,
-                                        GLint level,
-                                        GLsizei samples) override;
-void TexStorage2DEXT(GLenum target,
-                     GLsizei levels,
-                     GLenum internalFormat,
-                     GLsizei width,
-                     GLsizei height) override;
-void GenQueriesEXT(GLsizei n, GLuint* queries) override;
-void DeleteQueriesEXT(GLsizei n, const GLuint* queries) override;
-void QueryCounterEXT(GLuint id, GLenum target) override;
-GLboolean IsQueryEXT(GLuint id) override;
-void BeginQueryEXT(GLenum target, GLuint id) override;
-void BeginTransformFeedback(GLenum primitivemode) override;
-void EndQueryEXT(GLenum target) override;
-void EndTransformFeedback() override;
-void GetQueryivEXT(GLenum target, GLenum pname, GLint* params) override;
-void GetQueryObjectivEXT(GLuint id, GLenum pname, GLint* params) override;
-void GetQueryObjectuivEXT(GLuint id, GLenum pname, GLuint* params) override;
-void GetQueryObjecti64vEXT(GLuint id, GLenum pname, GLint64* params) override;
-void GetQueryObjectui64vEXT(GLuint id, GLenum pname, GLuint64* params) override;
-void SetDisjointValueSyncCHROMIUM() override;
-void InsertEventMarkerEXT(GLsizei length, const GLchar* marker) override;
-void PushGroupMarkerEXT(GLsizei length, const GLchar* marker) override;
-void PopGroupMarkerEXT() override;
-void GenVertexArraysOES(GLsizei n, GLuint* arrays) override;
-void DeleteVertexArraysOES(GLsizei n, const GLuint* arrays) override;
-GLboolean IsVertexArrayOES(GLuint array) override;
-void BindVertexArrayOES(GLuint array) override;
-void FramebufferParameteri(GLenum target, GLenum pname, GLint param) override;
-void BindImageTexture(GLuint unit,
-                      GLuint texture,
-                      GLint level,
-                      GLboolean layered,
-                      GLint layer,
-                      GLenum access,
-                      GLenum format) override;
-void DispatchCompute(GLuint num_groups_x,
-                     GLuint num_groups_y,
-                     GLuint num_groups_z) override;
-void DispatchComputeIndirect(GLintptr offset) override;
-void DrawArraysIndirect(GLenum mode, const void* offset) override;
-void DrawElementsIndirect(GLenum mode,
-                          GLenum type,
-                          const void* offset) override;
-void GetProgramInterfaceiv(GLuint program,
-                           GLenum program_interface,
-                           GLenum pname,
-                           GLint* params) override;
-GLuint GetProgramResourceIndex(GLuint program,
-                               GLenum program_interface,
-                               const char* name) override;
-void GetProgramResourceName(GLuint program,
-                            GLenum program_interface,
-                            GLuint index,
-                            GLsizei bufsize,
-                            GLsizei* length,
-                            char* name) override;
-void GetProgramResourceiv(GLuint program,
-                          GLenum program_interface,
-                          GLuint index,
-                          GLsizei prop_count,
-                          const GLenum* props,
-                          GLsizei bufsize,
-                          GLsizei* length,
-                          GLint* params) override;
-GLint GetProgramResourceLocation(GLuint program,
-                                 GLenum program_interface,
-                                 const char* name) override;
-void MemoryBarrierEXT(GLbitfield barriers) override;
-void MemoryBarrierByRegion(GLbitfield barriers) override;
-void SwapBuffers(GLuint64 swap_id, GLbitfield flags) override;
-GLuint GetMaxValueInBufferCHROMIUM(GLuint buffer_id,
-                                   GLsizei count,
-                                   GLenum type,
-                                   GLuint offset) override;
-GLboolean EnableFeatureCHROMIUM(const char* feature) override;
-void* MapBufferCHROMIUM(GLuint target, GLenum access) override;
-GLboolean UnmapBufferCHROMIUM(GLuint target) override;
-void* MapBufferSubDataCHROMIUM(GLuint target,
-                               GLintptr offset,
-                               GLsizeiptr size,
-                               GLenum access) override;
-void UnmapBufferSubDataCHROMIUM(const void* mem) override;
-void* MapBufferRange(GLenum target,
-                     GLintptr offset,
-                     GLsizeiptr size,
-                     GLbitfield access) override;
-GLboolean UnmapBuffer(GLenum target) override;
-void FlushMappedBufferRange(GLenum target,
-                            GLintptr offset,
-                            GLsizeiptr size) override;
-void* MapTexSubImage2DCHROMIUM(GLenum target,
-                               GLint level,
-                               GLint xoffset,
-                               GLint yoffset,
-                               GLsizei width,
-                               GLsizei height,
-                               GLenum format,
-                               GLenum type,
-                               GLenum access) override;
-void UnmapTexSubImage2DCHROMIUM(const void* mem) override;
-void ResizeCHROMIUM(GLuint width,
-                    GLuint height,
-                    GLfloat scale_factor,
-                    GLcolorSpace color_space,
-                    GLboolean alpha) override;
-const GLchar* GetRequestableExtensionsCHROMIUM() override;
-void RequestExtensionCHROMIUM(const char* extension) override;
-void GetProgramInfoCHROMIUM(GLuint program,
-                            GLsizei bufsize,
-                            GLsizei* size,
-                            void* info) override;
-void GetUniformBlocksCHROMIUM(GLuint program,
-                              GLsizei bufsize,
-                              GLsizei* size,
-                              void* info) override;
-void GetTransformFeedbackVaryingsCHROMIUM(GLuint program,
-                                          GLsizei bufsize,
-                                          GLsizei* size,
-                                          void* info) override;
-void GetUniformsES3CHROMIUM(GLuint program,
-                            GLsizei bufsize,
-                            GLsizei* size,
-                            void* info) override;
-GLuint CreateImageCHROMIUM(ClientBuffer buffer,
-                           GLsizei width,
-                           GLsizei height,
-                           GLenum internalformat) override;
-void DestroyImageCHROMIUM(GLuint image_id) override;
-void DescheduleUntilFinishedCHROMIUM() override;
-void GetTranslatedShaderSourceANGLE(GLuint shader,
-                                    GLsizei bufsize,
-                                    GLsizei* length,
-                                    char* source) override;
-void PostSubBufferCHROMIUM(GLuint64 swap_id,
-                           GLint x,
-                           GLint y,
-                           GLint width,
-                           GLint height,
-                           GLbitfield flags) override;
-void CopyTextureCHROMIUM(GLuint source_id,
-                         GLint source_level,
-                         GLenum dest_target,
-                         GLuint dest_id,
-                         GLint dest_level,
-                         GLint internalformat,
-                         GLenum dest_type,
-                         GLboolean unpack_flip_y,
-                         GLboolean unpack_premultiply_alpha,
-                         GLboolean unpack_unmultiply_alpha) override;
-void CopySubTextureCHROMIUM(GLuint source_id,
-                            GLint source_level,
-                            GLenum dest_target,
-                            GLuint dest_id,
-                            GLint dest_level,
-                            GLint xoffset,
-                            GLint yoffset,
-                            GLint x,
-                            GLint y,
-                            GLsizei width,
-                            GLsizei height,
-                            GLboolean unpack_flip_y,
-                            GLboolean unpack_premultiply_alpha,
-                            GLboolean unpack_unmultiply_alpha) override;
-void DrawArraysInstancedANGLE(GLenum mode,
-                              GLint first,
-                              GLsizei count,
-                              GLsizei primcount) override;
-void DrawArraysInstancedBaseInstanceANGLE(GLenum mode,
-                                          GLint first,
-                                          GLsizei count,
-                                          GLsizei primcount,
-                                          GLuint baseinstance) override;
-void DrawElementsInstancedANGLE(GLenum mode,
-                                GLsizei count,
-                                GLenum type,
-                                const void* indices,
-                                GLsizei primcount) override;
-void DrawElementsInstancedBaseVertexBaseInstanceANGLE(
-    GLenum mode,
-    GLsizei count,
-    GLenum type,
-    const void* indices,
-    GLsizei primcount,
-    GLint basevertex,
-    GLuint baseinstance) override;
-void VertexAttribDivisorANGLE(GLuint index, GLuint divisor) override;
-void ProduceTextureDirectCHROMIUM(GLuint texture, GLbyte* mailbox) override;
-GLuint CreateAndConsumeTextureCHROMIUM(const GLbyte* mailbox) override;
-void BindUniformLocationCHROMIUM(GLuint program,
-                                 GLint location,
-                                 const char* name) override;
-void BindTexImage2DCHROMIUM(GLenum target, GLint imageId) override;
-void BindTexImage2DWithInternalformatCHROMIUM(GLenum target,
-                                              GLenum internalformat,
-                                              GLint imageId) override;
-void ReleaseTexImage2DCHROMIUM(GLenum target, GLint imageId) override;
-void TraceBeginCHROMIUM(const char* category_name,
-                        const char* trace_name) override;
-void TraceEndCHROMIUM() override;
-void DiscardFramebufferEXT(GLenum target,
-                           GLsizei count,
-                           const GLenum* attachments) override;
-void LoseContextCHROMIUM(GLenum current, GLenum other) override;
-void UnpremultiplyAndDitherCopyCHROMIUM(GLuint source_id,
-                                        GLuint dest_id,
-                                        GLint x,
-                                        GLint y,
-                                        GLsizei width,
-                                        GLsizei height) override;
-void DrawBuffersEXT(GLsizei count, const GLenum* bufs) override;
-void DiscardBackbufferCHROMIUM() override;
-void ScheduleOverlayPlaneCHROMIUM(GLint plane_z_order,
-                                  GLenum plane_transform,
-                                  GLuint overlay_texture_id,
-                                  GLint bounds_x,
-                                  GLint bounds_y,
-                                  GLint bounds_width,
-                                  GLint bounds_height,
-                                  GLfloat uv_x,
-                                  GLfloat uv_y,
-                                  GLfloat uv_width,
-                                  GLfloat uv_height,
-                                  GLboolean enable_blend,
-                                  GLuint gpu_fence_id) override;
-void ScheduleCALayerSharedStateCHROMIUM(GLfloat opacity,
-                                        GLboolean is_clipped,
-                                        const GLfloat* clip_rect,
-                                        const GLfloat* rounded_corner_bounds,
-                                        GLint sorting_context_id,
-                                        const GLfloat* transform) override;
-void ScheduleCALayerCHROMIUM(GLuint contents_texture_id,
-                             const GLfloat* contents_rect,
-                             GLuint background_color,
-                             GLuint edge_aa_mask,
-                             const GLfloat* bounds_rect,
-                             GLuint filter) override;
-void ScheduleCALayerInUseQueryCHROMIUM(GLsizei count,
-                                       const GLuint* textures) override;
-void CommitOverlayPlanesCHROMIUM(GLuint64 swap_id, GLbitfield flags) override;
-void FlushDriverCachesCHROMIUM() override;
-GLuint GetLastFlushIdCHROMIUM() override;
-void ScheduleDCLayerCHROMIUM(GLuint texture_0,
-                             GLuint texture_1,
-                             GLint z_order,
-                             GLint content_x,
-                             GLint content_y,
-                             GLint content_width,
-                             GLint content_height,
-                             GLint quad_x,
-                             GLint quad_y,
-                             GLint quad_width,
-                             GLint quad_height,
-                             GLfloat transform_c1r1,
-                             GLfloat transform_c2r1,
-                             GLfloat transform_c1r2,
-                             GLfloat transform_c2r2,
-                             GLfloat transform_tx,
-                             GLfloat transform_ty,
-                             GLboolean is_clipped,
-                             GLint clip_x,
-                             GLint clip_y,
-                             GLint clip_width,
-                             GLint clip_height,
-                             GLuint protected_video_type) override;
-void SetActiveURLCHROMIUM(const char* url) override;
-void ContextVisibilityHintCHROMIUM(GLboolean visibility) override;
-void CoverageModulationCHROMIUM(GLenum components) override;
-GLenum GetGraphicsResetStatusKHR() override;
-void BlendBarrierKHR() override;
-void BindFragDataLocationIndexedEXT(GLuint program,
-                                    GLuint colorNumber,
-                                    GLuint index,
-                                    const char* name) override;
-void BindFragDataLocationEXT(GLuint program,
-                             GLuint colorNumber,
-                             const char* name) override;
-GLint GetFragDataIndexEXT(GLuint program, const char* name) override;
-void SwapBuffersWithBoundsCHROMIUM(GLuint64 swap_id,
-                                   GLsizei count,
-                                   const GLint* rects,
-                                   GLbitfield flags) override;
-void SetDrawRectangleCHROMIUM(GLint x,
-                              GLint y,
-                              GLint width,
-                              GLint height) override;
-void SetEnableDCLayersCHROMIUM(GLboolean enabled) override;
-void InitializeDiscardableTextureCHROMIUM(GLuint texture_id) override;
-void UnlockDiscardableTextureCHROMIUM(GLuint texture_id) override;
-bool LockDiscardableTextureCHROMIUM(GLuint texture_id) override;
-void TexStorage2DImageCHROMIUM(GLenum target,
-                               GLenum internalFormat,
-                               GLenum bufferUsage,
-                               GLsizei width,
-                               GLsizei height) override;
-void SetColorSpaceMetadataCHROMIUM(GLuint texture_id,
-                                   GLcolorSpace color_space) override;
-void WindowRectanglesEXT(GLenum mode, GLsizei count, const GLint* box) override;
-GLuint CreateGpuFenceCHROMIUM() override;
-GLuint CreateClientGpuFenceCHROMIUM(ClientGpuFence source) override;
-void WaitGpuFenceCHROMIUM(GLuint gpu_fence_id) override;
-void DestroyGpuFenceCHROMIUM(GLuint gpu_fence_id) override;
-void InvalidateReadbackBufferShadowDataCHROMIUM(GLuint buffer_id) override;
-void FramebufferTextureMultiviewOVR(GLenum target,
-                                    GLenum attachment,
-                                    GLuint texture,
-                                    GLint level,
-                                    GLint baseViewIndex,
-                                    GLsizei numViews) override;
-void MaxShaderCompilerThreadsKHR(GLuint count) override;
-GLuint CreateAndTexStorage2DSharedImageCHROMIUM(const GLbyte* mailbox) override;
-GLuint CreateAndTexStorage2DSharedImageWithInternalFormatCHROMIUM(
-    const GLbyte* mailbox,
-    GLenum internalformat) override;
-void BeginSharedImageAccessDirectCHROMIUM(GLuint texture, GLenum mode) override;
-void EndSharedImageAccessDirectCHROMIUM(GLuint texture) override;
-void BeginBatchReadAccessSharedImageCHROMIUM() override;
-void EndBatchReadAccessSharedImageCHROMIUM() override;
-void EnableiOES(GLenum target, GLuint index) override;
-void DisableiOES(GLenum target, GLuint index) override;
-void BlendEquationiOES(GLuint buf, GLenum mode) override;
-void BlendEquationSeparateiOES(GLuint buf,
-                               GLenum modeRGB,
-                               GLenum modeAlpha) override;
-void BlendFunciOES(GLuint buf, GLenum src, GLenum dst) override;
-void BlendFuncSeparateiOES(GLuint buf,
-                           GLenum srcRGB,
-                           GLenum dstRGB,
-                           GLenum srcAlpha,
-                           GLenum dstAlpha) override;
-void ColorMaskiOES(GLuint buf,
-                   GLboolean r,
-                   GLboolean g,
-                   GLboolean b,
-                   GLboolean a) override;
-GLboolean IsEnablediOES(GLenum target, GLuint index) override;
-#endif  // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_EFL_HEADER_AUTOGEN_H_
index ff2bf2f..a4bd4a0 100644 (file)
@@ -334,9 +334,7 @@ GpuChannelManager::GpuChannelManager(
           gpu_feature_info.enabled_gpu_driver_bug_workarounds),
       delegate_(delegate),
       watchdog_(watchdog),
-#if !defined(USE_EFL)
       share_group_(new gl::GLShareGroup()),
-#endif
       mailbox_manager_(gles2::CreateMailboxManager(gpu_preferences)),
       scheduler_(scheduler),
       sync_point_manager_(sync_point_manager),
index 32eeec4..77fa873 100644 (file)
@@ -13,9 +13,7 @@ import("//media/media_options.gni")
 import("//testing/libfuzzer/fuzzer_test.gni")
 import("//testing/test.gni")
 import("//third_party/ffmpeg/ffmpeg_options.gni")
-if (use_efl) {
-  import("//tizen_src/chromium_impl/media/media_efl.gni")
-}
+import("//tizen_src/chromium_impl/media/media_efl.gni")
 
 if (enable_library_cdms) {
   import("//media/cdm/library_cdm/cdm_paths.gni")
index 813657a..decacc5 100644 (file)
@@ -8,8 +8,9 @@ import("//build/config/ozone.gni")
 declare_args() {
   # Indicates if X11 VA-API-based hardware acceleration is to be used.
   # See also the comment near the |use_vaapi| arg.
-  use_vaapi_x11 = is_linux && ozone_platform_x11 &&
-                  (target_cpu == "x86" || target_cpu == "x64") && !is_castos
+  use_vaapi_x11 =
+      is_linux && ozone_platform_x11 &&
+      (target_cpu == "x86" || target_cpu == "x64") && !is_castos && !use_efl
 }
 
 declare_args() {
index 556c8a7..e84585c 100644 (file)
@@ -21,7 +21,7 @@ LabelledExample::LabelledExample(std::initializer_list<FeatureValue> init_list,
 
 LabelledExample::LabelledExample(const LabelledExample& rhs) = default;
 
-LabelledExample::LabelledExample(LabelledExample&& rhs) = default;
+LabelledExample::LabelledExample(LabelledExample&& rhs) noexcept = default;
 
 LabelledExample::~LabelledExample() = default;
 
index 8b76e0c..26f6604 100644 (file)
@@ -25,7 +25,7 @@ declare_args() {
   # Enable usage of FFmpeg within the media library. Used for most software
   # based decoding, demuxing, and sometimes optimized FFTs. If disabled,
   # implementors must provide their own demuxers and decoders.
-  media_use_ffmpeg = true && !use_efl
+  media_use_ffmpeg = true && !is_tizen
 
   # Enable usage of libvpx within the media library. Used for software based
   # decoding of VP9 and VP8A type content.
index 6993877..ea3d13b 100644 (file)
@@ -36,7 +36,7 @@
 #if BLINK_HEAP_HIDE_THREAD_LOCAL_IN_LIBRARY
 #define BLINK_HEAP_THREAD_LOCAL_MODEL "local-dynamic"
 #else
-#if BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_WIN) || defined(USE_EFL)
 #define BLINK_HEAP_THREAD_LOCAL_MODEL "initial-exec"
 #elif BUILDFLAG(IS_ANDROID)
 #define BLINK_HEAP_THREAD_LOCAL_MODEL "local-dynamic"
index ce943e1..0bbf6d6 100644 (file)
@@ -1,7 +1,7 @@
 # Copyright 2016 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-assert(is_linux || is_chromeos)
+assert(is_linux || is_chromeos || is_tizen)
 
 generated_static_table_fourcc_file =
     "$target_gen_dir/src/generated_static_table_fourcc.h"
index 739e278..fb472de 100644 (file)
@@ -6,7 +6,7 @@ import("//build/config/chromecast_build.gni")
 import("//build/config/chromeos/ui_mode.gni")
 import("//build/config/linux/pkg_config.gni")
 
-assert(is_linux || is_chromeos)
+assert(is_linux || is_chromeos || is_tizen)
 
 declare_args() {
   # Controls whether the build should use the version of minigbm library shipped
index 392b6b4..525ae4a 100644 (file)
@@ -19,7 +19,7 @@ limitations under the License.
 #include <cstdio>
 
 #include "absl/strings/string_view.h"  // from @com_google_absl
-#include "contrib/minizip/ioapi.h"
+#include "third_party/zlib/contrib/minizip/ioapi.h"
 
 namespace tflite {
 namespace metadata {
index e9343dc..dd41125 100644 (file)
@@ -38,8 +38,6 @@ default_args = {
   # also needs to be defined to src/ios/BUILD.gn (respectively removed from both
   # location when it is removed).
 
-  v8_extra_library_files = []
-  v8_experimental_extra_library_files = []
   v8_enable_gdbjit = false
   v8_imminent_deprecation_warnings = false
 
@@ -61,6 +59,13 @@ default_args = {
   angle_vulkan_tools_dir = "//third_party/vulkan-deps/vulkan-tools/src"
   angle_vulkan_validation_layers_dir =
       "//third_party/vulkan-deps/vulkan-validation-layers/src"
+
+  # Overwrite default args declared in the Fuchsia sdk
+  fuchsia_sdk_readelf_exec =
+      "//third_party/llvm-build/Release+Asserts/bin/llvm-readelf"
+  fuchsia_target_api_level = 9
+
+  devtools_visibility = [ "*" ]
 }
 
 # These are the targets to skip header checking by default. The files in targets
@@ -68,18 +73,23 @@ default_args = {
 # their includes checked for proper dependencies when you run either
 # "gn check" or "gn gen --check".
 no_check_targets = [
-  "//extensions:*",  # 28 errors
-  "//headless:*",  # 107 errors
-
-  "//third_party/icu/*",
-  "//third_party/libwebp:*",  # 7 errors, https://crbug.com/800762
+  # crbug.com/1158989
+  "//headless:headless_renderer",  # 12 errors
+  "//headless:headless_shared_sources",  # 2 errors
 
   # //v8, https://crbug.com/v8/7330
   "//v8/src/inspector:inspector",  # 20 errors
-  "//v8/test/cctest:cctest_sources",  # 2 errors
+  "//v8/test/cctest:cctest_sources",  # 15 errors
+  "//v8/test/unittests:inspector_unittests_sources",  # 2 errors
   "//v8:cppgc_base",  # 1 error
   "//v8:v8_internal_headers",  # 11 errors
   "//v8:v8_libplatform",  # 2 errors
+
+  # After making partition_alloc a standalone library, remove partition_alloc
+  # target from the skip list, because partition_aloc will depend on its own
+  # base.
+  # partition alloc standalone library bug is https://crbug.com/1151236.
+  "//base/allocator/partition_allocator:partition_alloc",  # 292 errors
 ]
 
 # These are the list of GN files that run exec_script. This whitelist exists
@@ -148,6 +158,7 @@ exec_script_whitelist =
       "//build_overrides/build.gni",
 
       "//chrome/android/webapk/shell_apk/prepare_upload_dir/BUILD.gn",
+      "//chrome/version.gni",
 
       # TODO(dgn): Layer violation but breaks the build otherwise, see
       # https://crbug.com/474506.
index aa7fd08..669c40a 100755 (executable)
@@ -181,7 +181,7 @@ function hostGnChromiumEfl() {
 
 function hostNinja() {
   if [[ $SKIP_NINJA == 0 ]]; then
-    TARGETS="chromium-ewk efl_webprocess efl_webview_app ubrowser"
+    TARGETS="chromium-ewk efl_webprocess efl_webview_app ubrowser content_shell"
     if [[ $BUILD_EWK_UNITTESTS == 1 ]]; then
       TARGETS="$TARGETS ewk_unittests"
     fi
index 5268b95..cb07e28 100644 (file)
@@ -56,8 +56,6 @@ werror = false
 
 use_gstreamer_fft = false
 
-use_aura = false
-
 ewk_bringup = true
 wayland_bringup = use_wayland
 
@@ -66,8 +64,6 @@ compile_credentials = true
 
 edje_compiler = "edje_cc"
 
-grit_additional_defines = "-Duse_aura"
-
 if (use_ozone) {
   # Declared from the //build/config/ui.gni
   #use_glib = true
index e4ef237..38f8ef1 100755 (executable)
@@ -103,14 +103,13 @@ if [ "$ORIGINAL_GN_DEFINES" != "$GN_DEFINES" ]; then
 fi
 
 COMMON_GN_PARAMETERS="use_libjpeg_turbo=true
-                      proprietary_codecs=true
+                      proprietary_codecs=false
                       rtc_enable_sctp=false
                       use_alsa=false
-                      use_aura=false
+                      use_aura=true
                       use_kerberos=false
                       use_ozone=true
-                      ozone_auto_platforms=false
-                      ozone_platform_wayland=false
+                      toolkit_views=true
                       use_pango=false
                       use_cairo=false
                       enable_plugins=true
@@ -119,7 +118,6 @@ COMMON_GN_PARAMETERS="use_libjpeg_turbo=true
                       use_allocator=\"none\"
                       depth=\"${TOPDIR}\"
                       use_libpci=false
-                      use_x11=false
                      "
 
 add_desktop_flags() {
@@ -139,6 +137,8 @@ add_desktop_flags() {
                              use_wayland=false
                              werror=false
                              dcheck_always_on=false
+                             enable_extensions=true
+                             enable_nacl=false
                             "
 }
 
@@ -171,6 +171,7 @@ add_tizen_flags() {
                              enable_basic_printing=false
                              enable_print_preview=false
                              tizen_multimedia_eme_support=false
+                             use_xkbcommon=true
                              target_os="\"tizen\""
                              target_sysroot=\"/\"
                              current_cpu=\"${host_arch}\"
index ea79d76..612c6bd 100644 (file)
@@ -99,8 +99,9 @@ void MessagePumpEcore::ScheduleWork() {
   }
 }
 
-void MessagePumpEcore::ScheduleDelayedWork(const TimeTicks& delayed_work_time) {
-  delayed_work_time_ = delayed_work_time;
+void MessagePumpEcore::ScheduleDelayedWork(
+    const Delegate::NextWorkInfo& next_work_info) {
+  delayed_work_time_ = next_work_info.delayed_run_time;
   ScheduleWork();
 }
 
index 51b1d28..b0cce84 100644 (file)
@@ -23,7 +23,8 @@ class BASE_EXPORT MessagePumpEcore : public MessagePump {
   void Run(Delegate* delegate) override;
   void Quit() override;
   void ScheduleWork() override;
-  void ScheduleDelayedWork(const TimeTicks& delayed_work_time) override;
+  void ScheduleDelayedWork(
+      const Delegate::NextWorkInfo& next_work_info) override;
 
   void HandleScheduledWork();
 
index 0f6702d..8fa2964 100644 (file)
@@ -98,12 +98,12 @@ void MessagePumpForUIEfl::ScheduleWork() {
 }
 
 void MessagePumpForUIEfl::ScheduleDelayedWork(
-    const base::TimeTicks& delayed_work_time) {
+    const Delegate::NextWorkInfo& next_work_info) {
   base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess();
   base::TimeTicks now = base::TimeTicks::Now();
   double delay = 0;
-  if (delayed_work_time > now)
-    delay = base::TimeDelta(delayed_work_time - now).InSecondsF();
+  if (next_work_info.delayed_run_time > now)
+    delay = base::TimeDelta(next_work_info.delayed_run_time - now).InSecondsF();
 
   if (!cmdline->HasSwitch(
           switches::kLimitMemoryAllocationInScheduleDelayedWork)) {
@@ -173,13 +173,13 @@ void MessagePumpForUIEfl::DoWork() {
   }
 
   if (!next_work_info.delayed_run_time.is_max())
-    ScheduleDelayedWork(next_work_info.delayed_run_time);
+    ScheduleDelayedWork(next_work_info);
 }
 
 void MessagePumpForUIEfl::DoDelayedWork() {
   Delegate::NextWorkInfo next_work_info = delegate_->DoWork();
   if (!next_work_info.delayed_run_time.is_max())
-    ScheduleDelayedWork(next_work_info.delayed_run_time);
+    ScheduleDelayedWork(next_work_info);
 }
 
 }  // namespace base
index 66c2154..5e75bcd 100644 (file)
@@ -27,7 +27,7 @@ class BASE_EXPORT MessagePumpForUIEfl : public base::MessagePump {
   void Run(Delegate*) override;
   void Quit() override;
   void ScheduleWork() override;
-  void ScheduleDelayedWork(const base::TimeTicks&) override;
+  void ScheduleDelayedWork(const Delegate::NextWorkInfo&) override;
 
   void Attach(Delegate* delegate);
 
@@ -52,7 +52,7 @@ class BASE_EXPORT MessagePumpForUIEfl : public base::MessagePump {
   bool keep_running_;
   bool work_scheduled_;
 
-  DISALLOW_COPY_AND_ASSIGN(MessagePumpForUIEfl);
+  // DISALLOW_COPY_AND_ASSIGN(MessagePumpForUIEfl);
 };
 
 }  // namespace base
index 12348d6..42343c2 100644 (file)
@@ -57,7 +57,7 @@ class JavaScriptDialogManagerEfl: public JavaScriptDialogManager {
  private:
   std::map<WebContents*, JavaScriptModalDialogEfl*> open_dialogs_;
 
-  DISALLOW_COPY_AND_ASSIGN(JavaScriptDialogManagerEfl);
+  // DISALLOW_COPY_AND_ASSIGN(JavaScriptDialogManagerEfl);
 };
 
 } // namespace content
index 209c9b4..17fff4e 100644 (file)
@@ -40,6 +40,7 @@ JavaScriptModalDialogEfl::JavaScriptModalDialogEfl(
       callback_(std::move(callback)),
       prompt_entry_(NULL),
       imf_context_(NULL) {
+#if !defined(USE_AURA)
   Evas_Object *parent_view = static_cast<Evas_Object *>(
       web_contents->GetNativeView());
   popup_ = elm_popup_add(parent_view);
@@ -57,6 +58,7 @@ JavaScriptModalDialogEfl::JavaScriptModalDialogEfl(
 #endif
 
   evas_object_show(popup_);
+#endif
 }
 
 JavaScriptModalDialogEfl::~JavaScriptModalDialogEfl() {
index c15aebe..c7dafea 100644 (file)
@@ -66,30 +66,12 @@ external_content_browser_efl_deps = [
 # Source
 ##############################################################################
 external_content_browser_efl_sources = [
-  "//tizen_src/chromium_impl/content/browser/compositor/evasgl_context_provider.cc",
-  "//tizen_src/chromium_impl/content/browser/compositor/evasgl_context_provider.h",
-  "//tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.cc",
-  "//tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.h",
-  "//tizen_src/chromium_impl/content/browser/compositor/evasgl_output_surface.cc",
-  "//tizen_src/chromium_impl/content/browser/compositor/evasgl_output_surface.h",
   "//tizen_src/chromium_impl/content/browser/javascript_dialog/javascript_modal_dialog.cc",
   "//tizen_src/chromium_impl/content/browser/javascript_dialog/javascript_modal_dialog.h",
-  "//tizen_src/chromium_impl/content/browser/media/capture/mouse_cursor_overlay_controller_efl.cc",
   "//tizen_src/chromium_impl/content/browser/public/browser/web_contents_efl_delegate.h",
   "//tizen_src/chromium_impl/content/browser/public/browser/web_contents_view_efl_delegate.h",
-  "//tizen_src/chromium_impl/content/browser/renderer_host/disambiguation_popup_efl.cc",
-  "//tizen_src/chromium_impl/content/browser/renderer_host/disambiguation_popup_efl.h",
   "//tizen_src/chromium_impl/content/browser/renderer_host/edge_effect.cc",
   "//tizen_src/chromium_impl/content/browser/renderer_host/edge_effect.h",
-  "//tizen_src/chromium_impl/content/browser/renderer_host/event_resampler.cc",
-  "//tizen_src/chromium_impl/content/browser/renderer_host/event_resampler.h",
-  "//tizen_src/chromium_impl/content/browser/renderer_host/im_context_efl.cc",
-  "//tizen_src/chromium_impl/content/browser/renderer_host/im_context_efl.h",
-  "//tizen_src/chromium_impl/content/browser/renderer_host/native_web_keyboard_event_efl.cc",
-  "//tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc",
-  "//tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h",
-  "//tizen_src/chromium_impl/content/browser/renderer_host/web_event_factory_efl.cc",
-  "//tizen_src/chromium_impl/content/browser/renderer_host/web_event_factory_efl.h",
   "//tizen_src/chromium_impl/content/browser/screen_orientation/screen_orientation_delegate_efl.cc",
   "//tizen_src/chromium_impl/content/browser/screen_orientation/screen_orientation_delegate_efl.h",
   "//tizen_src/chromium_impl/content/browser/selection/selection_box_efl.cc",
@@ -104,8 +86,6 @@ external_content_browser_efl_sources = [
   "//tizen_src/chromium_impl/content/browser/tracing/tracing_controller_efl.h",
   "//tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc",
   "//tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.h",
-  "//tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.cc",
-  "//tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.h",
   "//tizen_src/chromium_impl/content/browser/web_contents/web_drag_dest_efl.cc",
   "//tizen_src/chromium_impl/content/browser/web_contents/web_drag_dest_efl.h",
   "//tizen_src/chromium_impl/content/browser/web_contents/web_drag_source_efl.cc",
diff --git a/tizen_src/chromium_impl/content/browser/compositor/evasgl_context_provider.cc b/tizen_src/chromium_impl/content/browser/compositor/evasgl_context_provider.cc
deleted file mode 100644 (file)
index 88ea063..0000000
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2015 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "content/browser/compositor/evasgl_context_provider.h"
-
-namespace content {
-
-EvasGLContextProvider::EvasGLContextProvider(Evas_GL_API* evas_gl_api)
-    : evasgl_implementation_(evas_gl_api) {
-  cache_controller_.reset(
-      new viz::ContextCacheController(&evasgl_implementation_, nullptr));
-}
-
-EvasGLContextProvider::~EvasGLContextProvider() {}
-
-void EvasGLContextProvider::AddRef() const {
-  base::RefCountedThreadSafe<EvasGLContextProvider>::AddRef();
-}
-
-void EvasGLContextProvider::Release() const {
-  base::RefCountedThreadSafe<EvasGLContextProvider>::Release();
-}
-
-gpu::ContextResult EvasGLContextProvider::BindToCurrentThread() {
-  return gpu::ContextResult::kSuccess;
-}
-
-gpu::gles2::GLES2Interface* EvasGLContextProvider::ContextGL() {
-  return &evasgl_implementation_;
-}
-
-gpu::ContextSupport* EvasGLContextProvider::ContextSupport() {
-  return &evasgl_implementation_;
-}
-
-class GrDirectContext* EvasGLContextProvider::GrContext() {
-  return nullptr;
-}
-
-gpu::SharedImageInterface* EvasGLContextProvider::SharedImageInterface() {
-  return nullptr;
-}
-
-viz::ContextCacheController* EvasGLContextProvider::CacheController() {
-  return cache_controller_.get();
-}
-
-base::Lock* EvasGLContextProvider::GetLock() {
-  return nullptr;
-}
-
-const gpu::Capabilities& EvasGLContextProvider::ContextCapabilities() const {
-  return capabilities_;
-}
-
-const gpu::GpuFeatureInfo& EvasGLContextProvider::GetGpuFeatureInfo() const {
-  return gpu_feature_info_;
-}
-
-}  // namespace content
diff --git a/tizen_src/chromium_impl/content/browser/compositor/evasgl_context_provider.h b/tizen_src/chromium_impl/content/browser/compositor/evasgl_context_provider.h
deleted file mode 100644 (file)
index 9d6aad7..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2015 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CONTENT_BROWSER_COMPOSITOR_EVASGL_CONTEXT_PROVIDER_H_
-#define CONTENT_BROWSER_COMPOSITOR_EVASGL_CONTEXT_PROVIDER_H_
-
-#include "gpu/command_buffer/client/gles2_implementation_efl.h"
-
-#include "base/compiler_specific.h"
-#include "components/viz/common/gpu/context_provider.h"
-#include "content/common/content_export.h"
-#include "gpu/command_buffer/common/capabilities.h"
-#include "gpu/config/gpu_feature_info.h"
-
-namespace content {
-
-class CONTENT_EXPORT EvasGLContextProvider
-    : public base::RefCountedThreadSafe<EvasGLContextProvider>,
-      public viz::ContextProvider {
- public:
-  EvasGLContextProvider(Evas_GL_API* evas_gl_api);
-
-  // viz::ContextProvider implementation.
-  void AddRef() const override;
-  void Release() const override;
-  gpu::ContextResult BindToCurrentThread() override;
-  gpu::gles2::GLES2Interface* ContextGL() override;
-  gpu::ContextSupport* ContextSupport() override;
-  class GrDirectContext* GrContext() override;
-  gpu::SharedImageInterface* SharedImageInterface() override;
-  viz::ContextCacheController* CacheController() override;
-  base::Lock* GetLock() override;
-  const gpu::Capabilities& ContextCapabilities() const override;
-  const gpu::GpuFeatureInfo& GetGpuFeatureInfo() const override;
-  void AddObserver(viz::ContextLostObserver* obs) override {}
-  void RemoveObserver(viz::ContextLostObserver* obs) override {}
-
- private:
-  friend class base::RefCountedThreadSafe<EvasGLContextProvider>;
-  ~EvasGLContextProvider() override;
-
-  gpu::Capabilities capabilities_;
-  gpu::GpuFeatureInfo gpu_feature_info_;
-  gpu::gles2::GLES2ImplementationEfl evasgl_implementation_;
-  std::unique_ptr<viz::ContextCacheController> cache_controller_;
-
-  DISALLOW_COPY_AND_ASSIGN(EvasGLContextProvider);
-};
-
-}  // namespace content
-
-#endif  // CONTENT_BROWSER_COMPOSITOR_EVASGL_CONTEXT_PROVIDER_H_
diff --git a/tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.cc b/tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.cc
deleted file mode 100644 (file)
index 3960b7f..0000000
+++ /dev/null
@@ -1,276 +0,0 @@
-// Copyright 2015 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "content/browser/compositor/evasgl_delegated_frame_host.h"
-
-#include "base/logging.h"
-#include "components/viz/common/quads/compositor_render_pass.h"
-#include "components/viz/common/quads/draw_quad.h"
-#include "components/viz/service/display/display_resource_provider_gl.h"
-#include "components/viz/service/display/gl_renderer.h"
-#include "content/browser/compositor/evasgl_output_surface.h"
-#include "ui/display/device_display_info_efl.h"
-
-namespace content {
-
-EvasGLDelegatedFrameHost::EvasGLDelegatedFrameHost(
-    EvasGLDelegatedFrameHostClient* client)
-    : client_(client),
-      is_initialized_(false),
-      child_id_(0),
-      weak_ptr_factory_(this) {}
-
-EvasGLDelegatedFrameHost::~EvasGLDelegatedFrameHost() {
-  if (!is_initialized_)
-    return;
-  ClearRenderPasses();
-  ClearChildId();
-}
-
-void EvasGLDelegatedFrameHost::Initialize() {
-  DCHECK(!renderer_);
-  context_provider_ = scoped_refptr<EvasGLContextProvider>(
-      new EvasGLContextProvider(client_->GetEvasGLAPI()));
-
-  output_surface_ = std::make_unique<EvasGLOutputSurface>(context_provider_);
-
-  auto resource_provider = std::make_unique<viz::DisplayResourceProviderGL>(
-      output_surface_->context_provider(), false /* enable_shared_images */);
-
-  child_id_ = resource_provider->CreateChild(
-      base::BindRepeating(&EvasGLDelegatedFrameHost::UnrefResources,
-                          weak_ptr_factory_.GetWeakPtr()),
-      viz::SurfaceId());
-
-  renderer_ = std::make_unique<viz::GLRenderer>(
-      &settings_, &debug_settings_, output_surface_.get(),
-      resource_provider.get(), nullptr, nullptr);
-  resource_provider_ = std::move(resource_provider);
-  renderer_->Initialize();
-  renderer_->SetVisible(true);
-  is_initialized_ = true;
-}
-
-void EvasGLDelegatedFrameHost::CreateAggregatedRenderPassList(
-    const viz::CompositorRenderPassList& source_pass_list) {
-  render_pass_list_.clear();
-  for (const auto& source : source_pass_list) {
-    size_t sqs_size = source->shared_quad_state_list.size();
-    size_t dq_size = source->quad_list.size();
-    auto copy_pass =
-        std::make_unique<viz::AggregatedRenderPass>(sqs_size, dq_size);
-    copy_pass->SetAll(
-        viz::AggregatedRenderPassId(uint64_t{source->id}), source->output_rect,
-        source->damage_rect, source->transform_to_root_target, source->filters,
-        source->backdrop_filters, source->backdrop_filter_bounds,
-        gfx::ContentColorUsage::kSRGB, source->has_transparent_background,
-        source->cache_render_pass, source->has_damage_from_contributing_content,
-        source->generate_mipmap);
-
-    if (source->shared_quad_state_list.empty()) {
-      DCHECK(source->quad_list.empty());
-      render_pass_list_.push_back(std::move(copy_pass));
-      continue;
-    }
-
-    viz::SharedQuadStateList::ConstIterator sqs_iter =
-        source->shared_quad_state_list.begin();
-    viz::SharedQuadState* copy_shared_quad_state =
-        copy_pass->CreateAndAppendSharedQuadState();
-    *copy_shared_quad_state = **sqs_iter;
-    for (auto* quad : source->quad_list) {
-      while (quad->shared_quad_state != *sqs_iter) {
-        ++sqs_iter;
-        DCHECK(sqs_iter != source->shared_quad_state_list.end());
-        copy_shared_quad_state = copy_pass->CreateAndAppendSharedQuadState();
-        *copy_shared_quad_state = **sqs_iter;
-      }
-      DCHECK(quad->shared_quad_state == *sqs_iter);
-      if (quad->material == viz::DrawQuad::Material::kCompositorRenderPass) {
-        const auto* pass_quad =
-            viz::CompositorRenderPassDrawQuad::MaterialCast(quad);
-        copy_pass->CopyFromAndAppendRenderPassDrawQuad(
-            pass_quad,
-            viz::AggregatedRenderPassId(uint64_t{pass_quad->render_pass_id}));
-      } else
-        copy_pass->CopyFromAndAppendDrawQuad(quad);
-    }
-    render_pass_list_.push_back(std::move(copy_pass));
-  }
-}
-
-void EvasGLDelegatedFrameHost::SwapDelegatedFrame(
-    const viz::LocalSurfaceId& local_surface_id,
-    viz::CompositorFrame frame) {
-  if (!is_initialized_)
-    return;
-
-  DCHECK(renderer_);
-  DCHECK(resource_provider_);
-  DCHECK(!frame.render_pass_list.empty());
-
-  // Remap resource ids for the new resource provider.
-  const auto& resource_map = resource_provider_->GetChildToParentMap(child_id_);
-
-  resource_provider_->ReceiveFromChild(child_id_, frame.resource_list);
-
-  bool invalid_frame = false;
-  viz::ResourceIdSet resources_in_frame;
-  size_t reserve_size = frame.resource_list.size();
-  resources_in_frame.reserve(reserve_size);
-  for (const auto& pass : frame.render_pass_list) {
-    for (auto* quad : pass->quad_list) {
-      for (viz::ResourceId& resource_id : quad->resources) {
-        auto it = resource_map.find(resource_id);
-        if (it == resource_map.end()) {
-          LOG(ERROR) << "EvasGLDelegatedFrameHost > Resource is invalid!";
-          invalid_frame = true;
-          break;
-        }
-        DCHECK_EQ(it->first, resource_id);
-        viz::ResourceId remapped_id = it->second;
-        resources_in_frame.insert(resource_id);
-        resource_id = remapped_id;
-      }
-    }
-  }
-
-  // Drop new frame data if resource is invalid. Keep the previous frame.
-  // [TODO] it does not need to invoke evas_object_image_pixels_dirty_set()
-  // when |invalid_frame| is true.
-  if (!invalid_frame)
-    CreateAggregatedRenderPassList(std::move(frame.render_pass_list));
-
-  ClearRenderPasses(resources_in_frame);
-
-  DCHECK(!invalid_frame);
-  client_->DidReceiveCompositorFrameAck(local_surface_id,
-                                        std::move(returned_resources_));
-  returned_resources_.clear();
-}
-
-void EvasGLDelegatedFrameHost::RenderDelegatedFrame(const gfx::Rect& bounds) {
-  if (!is_initialized_)
-    return;
-
-  DCHECK(renderer_);
-
-  if (render_pass_list_.empty())
-    return;
-
-  display::DeviceDisplayInfoEfl display_info;
-
-  viz::AggregatedRenderPassList render_pass_list;
-  for (const auto& source : render_pass_list_)
-    render_pass_list.push_back(source->DeepCopy());
-
-  gfx::Size device_viewport_size = gfx::Size(bounds.width(), bounds.height());
-
-  viz::AggregatedRenderPass* root_render_pass = render_pass_list.back().get();
-  root_render_pass->output_rect.set_width(bounds.width());
-  root_render_pass->output_rect.set_height(bounds.height());
-
-  int rotation = evas_gl_rotation_get(client_->GetEvasGL());
-  // Transform root render pass if rotation is 90 or 180 or 270.
-  if (ShouldTransformRootRenderPass(rotation)) {
-    if (rotation != 180) {
-      root_render_pass->output_rect.set_height(bounds.width());
-      root_render_pass->output_rect.set_width(bounds.height());
-    }
-    TransformRootRenderPass(root_render_pass, bounds, rotation);
-  }
-
-  renderer_->DecideRenderPassAllocationsForFrame(render_pass_list);
-  // Draw frame by compositing render passes.
-  renderer_->DrawFrame(&render_pass_list, display_info.GetDIPScale(),
-                       device_viewport_size, gfx::DisplayColorSpaces(),
-                       viz::SurfaceDamageRectList());
-}
-
-void EvasGLDelegatedFrameHost::UnrefResources(
-    std::vector<viz::ReturnedResource> resources) {
-  std::move(resources.begin(), resources.end(),
-            std::back_inserter(returned_resources_));
-}
-
-bool EvasGLDelegatedFrameHost::ShouldTransformRootRenderPass(int rotation) {
-  return (rotation != 0);
-}
-
-void EvasGLDelegatedFrameHost::TransformRootRenderPass(
-    viz::AggregatedRenderPass* root_render_pass,
-    const gfx::Rect& bounds,
-    int rotation) {
-  double scale_x, scale_y, m01, m10, translate_x, translate_y, new_scale_x,
-      new_scale_y, new_m01, new_m10, new_translate_x, new_translate_y;
-
-  for (const auto* shared_quad_state :
-       root_render_pass->shared_quad_state_list) {
-    // Rotate model by matrix transformation
-    skia::Matrix44 matrix =
-        shared_quad_state->quad_to_target_transform.matrix();
-
-    // Normalize the matrix
-    double m33 = matrix.getDouble(3, 3);
-    if ((m33 != 0.0) && (m33 != 1.0)) {
-      SkScalar scale = SK_Scalar1 / m33;
-      for (int i = 0; i < 4; i++)
-        for (int j = 0; j < 4; j++)
-          matrix.setDouble(i, j, matrix.getDouble(i, j) * scale);
-    }
-
-    scale_x = matrix.getDouble(0, 0);
-    scale_y = matrix.getDouble(1, 1);
-    m01 = matrix.getDouble(0, 1);
-    m10 = matrix.getDouble(1, 0);
-    translate_x = matrix.getDouble(0, 3);
-    translate_y = matrix.getDouble(1, 3);
-
-    if (rotation == 90) {
-      new_scale_x = m10;
-      new_scale_y = -m01;
-      new_m01 = scale_y;
-      new_m10 = -scale_x;
-      new_translate_x = translate_y;
-      new_translate_y = bounds.width() - translate_x;
-    } else if (rotation == 180) {
-      new_scale_x = -scale_x;
-      new_scale_y = -scale_y;
-      new_m01 = -m01;
-      new_m10 = -m10;
-      new_translate_x = bounds.width() - translate_x;
-      new_translate_y = bounds.height() - translate_y;
-    } else {  // 270
-      new_scale_x = -m10;
-      new_scale_y = m01;
-      new_m01 = -scale_y;
-      new_m10 = scale_x;
-      new_translate_x = bounds.height() - translate_y;
-      new_translate_y = translate_x;
-    }
-    matrix.setDouble(0, 0, new_scale_x);
-    matrix.setDouble(1, 1, new_scale_y);
-    matrix.setDouble(0, 1, new_m01);
-    matrix.setDouble(1, 0, new_m10);
-    matrix.setDouble(0, 3, new_translate_x);
-    matrix.setDouble(1, 3, new_translate_y);
-  }
-}
-
-void EvasGLDelegatedFrameHost::ClearRenderPasses(
-    const viz::ResourceIdSet& resources_in_frame) {
-  resource_provider_->DeclareUsedResourcesFromChild(child_id_,
-                                                    resources_in_frame);
-}
-
-void EvasGLDelegatedFrameHost::ClearChildId() {
-  if (!child_id_)
-    return;
-
-  resource_provider_->DestroyChild(child_id_);
-  resources_in_frame_.clear();
-  child_id_ = 0;
-}
-
-}  // namespace content
diff --git a/tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.h b/tizen_src/chromium_impl/content/browser/compositor/evasgl_delegated_frame_host.h
deleted file mode 100644 (file)
index a25430c..0000000
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2015 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CONTENT_BROWSER_COMPOSITOR_EVASGL_DELEGATED_FRAME_HOST_H_
-#define CONTENT_BROWSER_COMPOSITOR_EVASGL_DELEGATED_FRAME_HOST_H_
-
-#include <Evas_GL.h>
-
-#include "base/memory/weak_ptr.h"
-#include "components/viz/common/display/renderer_settings.h"
-#include "components/viz/common/quads/aggregated_render_pass.h"
-#include "components/viz/common/quads/compositor_frame.h"
-#include "components/viz/service/display/direct_renderer.h"
-#include "content/common/content_export.h"
-
-// TODO(prashant.n): Include gl_renderer.h in evasgl_delegated_frame_host.cc
-// file and forward declare required classes here.
-
-namespace viz {
-class DisplayResourceProvider;
-}
-
-namespace content {
-
-class EvasGLContextProvider;
-
-class CONTENT_EXPORT EvasGLDelegatedFrameHostClient {
- public:
-  // TODO(prashant.n): Remove GetEvasGLAPI() after decoupling context provider
-  // and surface from EvasGLDelegatedFrameHost.
-  virtual Evas_GL_API* GetEvasGLAPI() = 0;
-  virtual Evas_GL* GetEvasGL() = 0;
-  virtual void DidReceiveCompositorFrameAck(
-      const viz::LocalSurfaceId& local_surface_id,
-      std::vector<viz::ReturnedResource> resources) = 0;
-};
-
-class CONTENT_EXPORT EvasGLDelegatedFrameHost
-    : public base::SupportsWeakPtr<EvasGLDelegatedFrameHost> {
- public:
-  explicit EvasGLDelegatedFrameHost(EvasGLDelegatedFrameHostClient* client);
-  ~EvasGLDelegatedFrameHost();
-  void Initialize();
-  void SwapDelegatedFrame(const viz::LocalSurfaceId& local_surface_id,
-                          viz::CompositorFrame frame);
-  void RenderDelegatedFrame(const gfx::Rect& bounds);
-
- private:
-  void CreateAggregatedRenderPassList(
-      const viz::CompositorRenderPassList& source_pass_list);
-  void UnrefResources(std::vector<viz::ReturnedResource> resources);
-  bool ShouldTransformRootRenderPass(int rotation);
-  void TransformRootRenderPass(viz::AggregatedRenderPass* root_render_pass,
-                               const gfx::Rect& bounds,
-                               int rotation);
-  void ClearRenderPasses(
-      const viz::ResourceIdSet& resources_in_frame = viz::ResourceIdSet());
-  void ClearChildId();
-
-  EvasGLDelegatedFrameHostClient* client_;
-  bool is_initialized_;
-  // TODO(prashant.n): Decouple context provider and surface from this class.
-  scoped_refptr<EvasGLContextProvider> context_provider_;
-  std::unique_ptr<viz::OutputSurface> output_surface_;
-  viz::RendererSettings settings_;
-  viz::DebugRendererSettings debug_settings_;
-  std::unique_ptr<viz::DisplayResourceProvider> resource_provider_;
-  int child_id_;
-  viz::AggregatedRenderPassList render_pass_list_;
-  viz::ResourceIdSet resources_in_frame_;
-  std::vector<viz::ReturnedResource> returned_resources_;
-  std::unique_ptr<viz::DirectRenderer> renderer_;
-
-  base::WeakPtrFactory<EvasGLDelegatedFrameHost> weak_ptr_factory_;
-};
-
-}  // namespace content
-
-#endif  // CONTENT_BROWSER_COMPOSITOR_EVASGL_DELEGATED_FRAME_HOST_H_
diff --git a/tizen_src/chromium_impl/content/browser/compositor/evasgl_output_surface.cc b/tizen_src/chromium_impl/content/browser/compositor/evasgl_output_surface.cc
deleted file mode 100644 (file)
index a3df6fa..0000000
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2015 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "content/browser/compositor/evasgl_output_surface.h"
-#include "components/viz/service/display/output_surface_frame.h"
-
-namespace content {
-
-EvasGLOutputSurface::EvasGLOutputSurface(
-    const scoped_refptr<viz::ContextProvider>& context_provider)
-    : OutputSurface(context_provider) {}
-
-EvasGLOutputSurface::~EvasGLOutputSurface() {}
-
-void EvasGLOutputSurface::BindToClient(viz::OutputSurfaceClient* client) {}
-
-void EvasGLOutputSurface::EnsureBackbuffer() {}
-
-void EvasGLOutputSurface::DiscardBackbuffer() {}
-
-void EvasGLOutputSurface::BindFramebuffer() {
-  context_provider_->ContextGL()->BindFramebuffer(GL_FRAMEBUFFER, 0);
-}
-
-void EvasGLOutputSurface::SetDrawRectangle(const gfx::Rect& rect) {}
-
-void EvasGLOutputSurface::Reshape(const gfx::Size& size,
-                                  float device_scale_factor,
-                                  const gfx::ColorSpace& color_space,
-                                  gfx::BufferFormat format,
-                                  bool use_stencil) {}
-
-bool EvasGLOutputSurface::HasExternalStencilTest() const {
-  return false;
-}
-
-void EvasGLOutputSurface::ApplyExternalStencil() {}
-
-void EvasGLOutputSurface::SwapBuffers(viz::OutputSurfaceFrame frame) {}
-
-bool EvasGLOutputSurface::IsDisplayedAsOverlayPlane() const {
-  return false;
-}
-
-unsigned EvasGLOutputSurface::GetOverlayTextureId() const {
-  return 0;
-}
-
-uint32_t EvasGLOutputSurface::GetFramebufferCopyTextureFormat() {
-  return 0;
-}
-
-unsigned EvasGLOutputSurface::UpdateGpuFence() {
-  return 0;
-}
-
-gfx::OverlayTransform EvasGLOutputSurface::GetDisplayTransform() {
-  return gfx::OVERLAY_TRANSFORM_NONE;
-}
-
-}  // namespace content
diff --git a/tizen_src/chromium_impl/content/browser/compositor/evasgl_output_surface.h b/tizen_src/chromium_impl/content/browser/compositor/evasgl_output_surface.h
deleted file mode 100644 (file)
index e7edc6f..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2015 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CONTENT_BROWSER_COMPOSITOR_EVASGL_OUTPUT_SURFACE_H_
-#define CONTENT_BROWSER_COMPOSITOR_EVASGL_OUTPUT_SURFACE_H_
-
-#include "base/memory/ref_counted.h"
-#include "components/viz/service/display/output_surface.h"
-#include "content/browser/compositor/evasgl_context_provider.h"
-#include "content/common/content_export.h"
-#include "ui/gfx/geometry/size.h"
-
-namespace content {
-class CONTENT_EXPORT EvasGLOutputSurface : public viz::OutputSurface {
- public:
-  EvasGLOutputSurface(
-      const scoped_refptr<viz::ContextProvider>& context_provider);
-  ~EvasGLOutputSurface() override;
-
-  // viz::OutputSurface implementation.
-  void BindToClient(viz::OutputSurfaceClient* client) override;
-  void EnsureBackbuffer() override;
-  void DiscardBackbuffer() override;
-  void BindFramebuffer() override;
-  void SetDrawRectangle(const gfx::Rect& rect) override;
-  void Reshape(const gfx::Size& size,
-               float device_scale_factor,
-               const gfx::ColorSpace& color_space,
-               gfx::BufferFormat format,
-               bool use_stencil) override;
-  bool HasExternalStencilTest() const override;
-  void ApplyExternalStencil() override;
-  void SwapBuffers(viz::OutputSurfaceFrame frame) override;
-  bool IsDisplayedAsOverlayPlane() const override;
-  unsigned GetOverlayTextureId() const override;
-  uint32_t GetFramebufferCopyTextureFormat() override;
-  unsigned UpdateGpuFence() override;
-  void SetUpdateVSyncParametersCallback(
-      viz::UpdateVSyncParametersCallback callback) override {}
-  void SetDisplayTransformHint(gfx::OverlayTransform transform) override {}
-  gfx::OverlayTransform GetDisplayTransform() override;
-};
-
-}  // namespace content
-
-#endif  // CONTENT_RENDERER_GPU_OUTPUT_SURFACE_Efl_H_
index 4e29476..4fdea18 100644 (file)
@@ -320,7 +320,7 @@ std::string JavaScriptModalDialog::GetTitle() {
   const GURL& url = web_contents_->GetVisibleURL();
   std::string text;
   if (url.SchemeIsFile() || url.is_empty()) {
-    if (web_contents_->GetMainFrame())
+    if (web_contents_->GetPrimaryMainFrame())
       text = base::UTF16ToUTF8(web_contents_->GetTitle());
   } else
     text = url.possibly_invalid_spec();
index 5250019..c6b0470 100644 (file)
@@ -22,7 +22,7 @@ class CONTENT_EXPORT BrowserMediaPacketManager : public BrowserMessageFilter {
  private:
   void ReleaseMediaPacket(gfx::TbmBufferHandle packet);
 
-  DISALLOW_COPY_AND_ASSIGN(BrowserMediaPacketManager);
+  // DISALLOW_COPY_AND_ASSIGN(BrowserMediaPacketManager);
 };
 
 }  // namespace content
diff --git a/tizen_src/chromium_impl/content/browser/media/capture/mouse_cursor_overlay_controller_efl.cc b/tizen_src/chromium_impl/content/browser/media/capture/mouse_cursor_overlay_controller_efl.cc
deleted file mode 100644 (file)
index ab7ae44..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2020 Samsung Electronics Inc. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "content/browser/media/capture/mouse_cursor_overlay_controller.h"
-
-#include "ui/base/cursor/cursor.h"
-#include "ui/base/cursor/cursor_loader.h"
-#include "ui/base/cursor/cursor_lookup.h"
-#include "ui/base/cursor/mojom/cursor_type.mojom-shared.h"
-#include "ui/wm/public/activation_client.h"
-
-namespace content {
-
-class MouseCursorOverlayController::Observer {
- public:
-  Observer() = default;
-  ~Observer() = default;
-
-  DISALLOW_COPY_AND_ASSIGN(Observer);
-};
-
-MouseCursorOverlayController::MouseCursorOverlayController()
-    : mouse_move_behavior_atomic_(kNotMoving) {
-  // MouseCursorOverlayController can be constructed on any thread, but
-  // thereafter must be used according to class-level comments.
-  DETACH_FROM_SEQUENCE(ui_sequence_checker_);
-}
-
-MouseCursorOverlayController::~MouseCursorOverlayController() {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(ui_sequence_checker_);
-
-  observer_.reset();
-  Stop();
-}
-
-void MouseCursorOverlayController::SetTargetView(gfx::NativeView view) {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(ui_sequence_checker_);
-
-  observer_.reset();
-  observer_ = std::make_unique<Observer>();
-}
-
-gfx::NativeCursor MouseCursorOverlayController::GetCurrentCursorOrDefault()
-    const {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(ui_sequence_checker_);
-
-  return ui::mojom::CursorType::kPointer;
-}
-
-gfx::RectF MouseCursorOverlayController::ComputeRelativeBoundsForOverlay(
-    const gfx::NativeCursor& cursor,
-    const gfx::PointF& location) const {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(ui_sequence_checker_);
-
-  return gfx::RectF();
-}
-
-void MouseCursorOverlayController::DisconnectFromToolkitForTesting() {
-  DCHECK_CALLED_ON_VALID_SEQUENCE(ui_sequence_checker_);
-}
-
-// static
-SkBitmap MouseCursorOverlayController::GetCursorImage(
-    const gfx::NativeCursor& cursor) {
-  return GetCursorBitmap(cursor);
-}
-
-}  // namespace content
index 11ed382..abb8811 100644 (file)
@@ -48,7 +48,7 @@ class BrowserDemuxerEfl::Internal : public media::DemuxerEfl {
   scoped_refptr<BrowserDemuxerEfl> demuxer_;
   int demuxer_client_id_;
 
-  DISALLOW_COPY_AND_ASSIGN(Internal);
+  // DISALLOW_COPY_AND_ASSIGN(Internal);
 };
 
 scoped_refptr<BrowserMessageFilter> CreateBrowserDemuxerEfl() {
index 77e7155..89bc8d3 100644 (file)
@@ -63,7 +63,7 @@ class CONTENT_EXPORT BrowserDemuxerEfl : public BrowserMessageFilter {
 
   IDMap<media::DemuxerEflClient> demuxer_clients_;
 
-  DISALLOW_COPY_AND_ASSIGN(BrowserDemuxerEfl);
+  // DISALLOW_COPY_AND_ASSIGN(BrowserDemuxerEfl);
 };
 
 }  // namespace content
index e0d06ba..4cf57aa 100644 (file)
@@ -110,7 +110,7 @@ class CONTENT_EXPORT BrowserMediaPlayerManagerEfl
   std::deque<int> init_queue_;
   std::deque<int> resumed_queue_;
 
-  DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManagerEfl);
+  // DISALLOW_COPY_AND_ASSIGN(BrowserMediaPlayerManagerEfl);
 };
 
 }  // namespace content
index e9b388b..ea87968 100644 (file)
@@ -41,7 +41,7 @@ class CONTENT_EXPORT MediaWebContentsObserver
       MediaPlayerManagerMap;
   MediaPlayerManagerMap media_player_managers_;
 
-  DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserver);
+  // DISALLOW_COPY_AND_ASSIGN(MediaWebContentsObserver);
 };
 
 }  // namespace content
diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/disambiguation_popup_efl.cc b/tizen_src/chromium_impl/content/browser/renderer_host/disambiguation_popup_efl.cc
deleted file mode 100644 (file)
index e6c6fa9..0000000
+++ /dev/null
@@ -1,215 +0,0 @@
-// Copyright 2014 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "content/browser/renderer_host/disambiguation_popup_efl.h"
-
-#include <Elementary.h>
-
-#include "base/path_service.h"
-#include "base/files/file_path.h"
-#include "content/browser/renderer_host/render_widget_host_view_efl.h"
-#include "content/browser/renderer_host/web_event_factory_efl.h"
-#include "content/common/paths_efl.h"
-#include "tizen/system_info.h"
-#include "ui/events/event.h"
-#include "ui/display/screen.h"
-
-#if defined(OS_TIZEN)
-#include <efl_extension.h>
-#endif
-
-namespace content {
-
-namespace {
-#if defined(OS_TIZEN)
-void DisambiguationPopupHWBackKey(void* data, Evas_Object* obj, void* event_info) {
-  if (IsMobileProfile() || IsWearableProfile()) {
-    DisambiguationPopupEfl* instance = static_cast<DisambiguationPopupEfl*>(data);
-    instance->Dismiss();
-  }
-}
-#endif
-
-void OnMouseUp(void* data, Evas*, Evas_Object* image, void* event_info) {
-  Evas_Event_Mouse_Up* up_event =
-      static_cast<Evas_Event_Mouse_Up*>(event_info);
-  DisambiguationPopupEfl* disambiguation_popup =
-      static_cast<DisambiguationPopupEfl*>(data);
-  disambiguation_popup->HandleMouseEventUp(up_event);
-}
-
-void OnMouseDown(void* data, Evas*, Evas_Object* image, void* event_info) {
-  Evas_Event_Mouse_Down* down_event =
-      static_cast<Evas_Event_Mouse_Down*>(event_info);
-  DisambiguationPopupEfl* disambiguation_popup =
-      static_cast<DisambiguationPopupEfl*>(data);
-  disambiguation_popup->HandleMouseEventDown(down_event);
-}
-
-void TouchedOnOutterArea(void* data, Evas*, Evas_Object* image, void* event_info) {
-  DisambiguationPopupEfl* disambiguation_popup =
-      static_cast<DisambiguationPopupEfl*>(data);
-  disambiguation_popup->Dismiss();
-}
-
-} // namespace
-
-DisambiguationPopupEfl::DisambiguationPopupEfl(Evas_Object* parent_view,
-                                               RenderWidgetHostViewEfl* rwhv)
-    : rwhv_(rwhv),
-      parent_view_(parent_view),
-      content_image_(nullptr),
-      popup_(nullptr),
-      height_(0),
-      width_(0) {
-  CHECK(parent_view);
-  CHECK(rwhv);
-
-  popup_ = elm_ctxpopup_add(parent_view);
-  Elm_Theme* theme = elm_theme_new();
-  base::FilePath edje_path;
-  base::FilePath link_magnifier_edj;
-  base::PathService::Get(PathsEfl::EDJE_RESOURCE_DIR, &edje_path);
-  link_magnifier_edj = edje_path.Append(FILE_PATH_LITERAL("DisambiguationPopup.edj"));
-  elm_theme_ref_set(theme, elm_theme_default_get());
-  elm_theme_extension_add(theme, link_magnifier_edj.AsUTF8Unsafe().c_str());
-  elm_object_theme_set(popup_, theme);
-  elm_theme_free(theme);
-
-  elm_ctxpopup_hover_parent_set(popup_, parent_view);
-  elm_ctxpopup_direction_priority_set(popup_, ELM_CTXPOPUP_DIRECTION_UP,
-      ELM_CTXPOPUP_DIRECTION_DOWN, ELM_CTXPOPUP_DIRECTION_UP,
-      ELM_CTXPOPUP_DIRECTION_DOWN);
-  evas_object_smart_callback_add(popup_, "dismissed", Dismissed, this);
-}
-
-DisambiguationPopupEfl::~DisambiguationPopupEfl() {
-  Clear();
-  evas_object_del(popup_);
-  popup_ = NULL;
-}
-
-void DisambiguationPopupEfl::Show(const gfx::Rect& target,
-                                  const SkBitmap& display_image) {
-  DCHECK(!IsVisible());
-  target_rect_ = target;
-
-  if (content_image_)
-    evas_object_del(content_image_);
-  content_image_ = evas_object_image_add(evas_object_evas_get(parent_view_));
-  elm_object_content_set(popup_, content_image_);
-
-  UpdateImage(display_image);
-
-  evas_object_event_callback_add(content_image_,
-      EVAS_CALLBACK_MOUSE_UP, OnMouseUp, this);
-  evas_object_event_callback_add(content_image_,
-      EVAS_CALLBACK_MOUSE_DOWN, OnMouseDown, this);
-
-  evas_object_event_callback_add(popup_,
-      EVAS_CALLBACK_MOUSE_UP, TouchedOnOutterArea, this);
-  evas_object_event_callback_add(popup_,
-      EVAS_CALLBACK_MULTI_DOWN, TouchedOnOutterArea, this);
-
-#if defined(OS_TIZEN)
-  if (IsMobileProfile() || IsWearableProfile()) {
-    eext_object_event_callback_add(
-        popup_, EEXT_CALLBACK_BACK, DisambiguationPopupHWBackKey, this);
-  }
-#endif
-
-  int parent_view_x = 0, parent_view_y = 0;
-  evas_object_geometry_get(parent_view_, &parent_view_x, &parent_view_y, 0, 0);
-
-  const gfx::Point position = target_rect_.CenterPoint();
-  evas_object_move(popup_, position.x() + parent_view_x,
-      position.y() + parent_view_y);
-
-  evas_object_show(popup_);
-}
-
-void DisambiguationPopupEfl::Dismiss() {
-  DCHECK(IsVisible());
-  rwhv_->DisambiguationPopupDismissed();
-
-  target_rect_ = gfx::Rect();
-  elm_ctxpopup_dismiss(popup_);
-  Clear();
-}
-
-void DisambiguationPopupEfl::UpdateImage(const SkBitmap& display_image) {
-  DCHECK(content_image_);
-
-  width_ = display_image.width();
-  height_ = display_image.height();
-
-  // TODO: should be set to same as display_image colorspace
-  evas_object_image_colorspace_set(content_image_, EVAS_COLORSPACE_ARGB8888);
-
-  evas_object_image_alpha_set(content_image_, EINA_TRUE);
-  evas_object_image_filled_set(content_image_, EINA_FALSE);
-
-  evas_object_image_size_set(content_image_, width_, height_);
-  evas_object_image_data_copy_set(content_image_, display_image.getPixels());
-
-  evas_object_image_fill_set(content_image_, 0, 0, width_, height_);
-  evas_object_size_hint_min_set(content_image_, width_, height_);
-  evas_object_size_hint_max_set(content_image_, width_, height_);
-  evas_object_size_hint_padding_set(content_image_, 0, 0, 0, 0);
-}
-
-void DisambiguationPopupEfl::Clear() {
-  evas_object_hide(popup_);
-  elm_object_content_unset(popup_);
-  if (content_image_) {
-    evas_object_del(content_image_);
-    content_image_ = NULL;
-  }
-}
-
-bool DisambiguationPopupEfl::IsVisible() {
-  return evas_object_visible_get(popup_);
-}
-
-void DisambiguationPopupEfl::HandleMouseEventUp(Evas_Event_Mouse_Up* up_event) {
-  PrepareMouseEventForForward(up_event);
-  rwhv_->HandleDisambiguationPopupMouseUpEvent(up_event);
-  Dismiss();
-}
-
-void DisambiguationPopupEfl::HandleMouseEventDown(Evas_Event_Mouse_Down* down_event) {
-  PrepareMouseEventForForward(down_event);
-  rwhv_->HandleDisambiguationPopupMouseDownEvent(down_event);
-}
-
-template<class T>
-void DisambiguationPopupEfl::PrepareMouseEventForForward(T* event) {
-
-  int image_x = 0, image_y = 0;
-  evas_object_geometry_get(content_image_, &image_x, &image_y, 0, 0);
-
-  int image_cord_x = event->canvas.x - image_x;
-  int image_cord_y = event->canvas.y - image_y;
-
-  // We have image cords, now we need to translate them to target_rect_.
-  float ratio = static_cast<float>(width_) / target_rect_.width();
-
-  int target_rect_x = target_rect_.x() + (image_cord_x / ratio);
-  int target_rect_y = target_rect_.y() + (image_cord_y / ratio);
-
-  int parent_view_x = 0, parent_view_y = 0;
-  evas_object_geometry_get(parent_view_, &parent_view_x, &parent_view_y, 0, 0);
-  float device_scale_factor = display::Screen::GetScreen()->
-      GetPrimaryDisplay().device_scale_factor();
-  event->canvas.x = target_rect_x + (parent_view_x * device_scale_factor);
-  event->canvas.y = target_rect_y + (parent_view_y * device_scale_factor);
-}
-
-void DisambiguationPopupEfl::Dismissed(void* data, Evas_Object*, void*) {
-  DisambiguationPopupEfl* disambiguation_popup =
-      static_cast<DisambiguationPopupEfl*>(data);
-  disambiguation_popup->Clear();
-}
-
-}
diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/disambiguation_popup_efl.h b/tizen_src/chromium_impl/content/browser/renderer_host/disambiguation_popup_efl.h
deleted file mode 100644 (file)
index fb4e804..0000000
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2014 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef DISAMBIGUATION_POPUP_EFL_H
-#define DISAMBIGUATION_POPUP_EFL_H
-
-#include <Evas.h>
-
-#include "base/macros.h"
-#include "ui/gfx/geometry/point.h"
-#include "ui/gfx/geometry/rect.h"
-
-class SkBitmap;
-
-namespace content {
-
-class RenderWidgetHostViewEfl;
-
-class DisambiguationPopupEfl {
- public:
-  DisambiguationPopupEfl(Evas_Object* parent_view, RenderWidgetHostViewEfl*);
-  ~DisambiguationPopupEfl();
-
-  void Show(const gfx::Rect& target, const SkBitmap& display_image);
-  void Dismiss();
-
-  bool IsVisible();
-
-  void SetImageSize(int&, int&, int, int, const gfx::Point&);
-  void UpdateImage(const SkBitmap& display_image);
-  void Clear();
-
-  void HandleMouseEventUp(Evas_Event_Mouse_Up* up_event);
-  void HandleMouseEventDown(Evas_Event_Mouse_Down* down_event);
-
- private:
-  template<class T>
-  void PrepareMouseEventForForward(T* event);
-
-  static void Dismissed(void*, Evas_Object*, void*);
-
-  gfx::Rect target_rect_;
-
-  RenderWidgetHostViewEfl* rwhv_;
-  Evas_Object* parent_view_;
-  Evas_Object* content_image_;
-  Evas_Object* popup_;
-
-  int height_;
-  int width_;
-
-  DISALLOW_COPY_AND_ASSIGN(DisambiguationPopupEfl);
-};
-
-} // namespace content
-
-#endif
diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/event_resampler.cc b/tizen_src/chromium_impl/content/browser/renderer_host/event_resampler.cc
deleted file mode 100644 (file)
index 9df97b8..0000000
+++ /dev/null
@@ -1,247 +0,0 @@
-// Copyright 2021 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "content/browser/renderer_host/event_resampler.h"
-
-#include "content/browser/renderer_host/render_widget_host_view_efl.h"
-#include "ui/events/event_constants.h"
-
-namespace {
-// Currently we can resample two fingers only.
-const int kIdentifiableTouchCount = 2;
-
-// Two latest touchmove events are used for resampling.
-const unsigned kTouchMoveEventQueueSize = 2;
-
-// Latency added during resampling.  A few milliseconds doesn't hurt much but
-// reduces the impact of mispredicted touch positions.
-const float kResampleLatency = 5;
-
-// Minimum time difference between consecutive samples before attempting to
-// resample.
-const float kResampleMinDelta = 2;
-
-// Maximum time to predict forward from the last known state, to avoid
-// predicting too far into the future.  This time is further bounded by 50% of
-// the last time delta.
-const float kResampleMaxPrediction = 8;
-}  // namespace
-
-namespace content {
-
-EventResampler::EventResampler(EventResamplerClient* client)
-    : client_(client) {}
-
-EventResampler::~EventResampler() {
-  if (!vsync_animator_)
-    return;
-
-  ecore_animator_del(vsync_animator_);
-  vsync_animator_ = nullptr;
-}
-
-bool EventResampler::HandleTouchEvent(ui::TouchEvent& event) {
-  if (event.type() == ui::EventType::ET_TOUCH_PRESSED)
-    return false;
-
-  int id = event.pointer_details().id;
-  if (id >= kIdentifiableTouchCount)
-    return false;
-
-  if (event.type() == ui::EventType::ET_TOUCH_RELEASED ||
-      event.type() == ui::EventType::ET_TOUCH_CANCELLED) {
-    if (has_pending_touch_move_event_[id])
-      ResampleTouchMove(id);
-    return false;
-  }
-
-  if (!vsync_animator_) {
-    vsync_animator_ = ecore_animator_add(VsyncAnimatorCallback, this);
-    return false;
-  }
-
-  touch_move_event_queue_[id].push(event);
-  if (touch_move_event_queue_[id].size() > kTouchMoveEventQueueSize)
-    touch_move_event_queue_[id].pop();
-
-  has_pending_touch_move_event_[id] = true;
-
-  return true;
-}
-
-bool EventResampler::HandleGestureEvent(blink::WebGestureEvent& event) {
-  switch (event.GetType()) {
-    case blink::WebInputEvent::Type::kGestureScrollBegin:
-      has_pending_scroll_event_ = false;
-      pending_scroll_delta_.SetPoint(0.0, 0.0);
-      break;
-    case blink::WebInputEvent::Type::kGestureScrollUpdate:
-      last_scroll_update_event_ = event;
-      pending_scroll_delta_.Offset(event.data.scroll_update.delta_x,
-                                   event.data.scroll_update.delta_y);
-      has_pending_scroll_event_ = true;
-      if (!is_scroll_processed_in_last_callback_) {
-        ResampleScrollUpdate();
-        is_scroll_processed_in_last_callback_ = true;
-      }
-      return true;
-    case blink::WebInputEvent::Type::kGesturePinchBegin:
-      has_pending_pinch_event_ = false;
-      pending_pinch_scale_ = 1.0;
-      break;
-    case blink::WebInputEvent::Type::kGesturePinchUpdate:
-      last_pinch_update_event_ = event;
-      pending_pinch_scale_ *= event.data.pinch_update.scale;
-      has_pending_pinch_event_ = true;
-
-      if (!is_pinch_processed_in_last_callback_) {
-        ResamplePinchUpdate();
-        is_pinch_processed_in_last_callback_ = true;
-      }
-      return true;
-    case blink::WebInputEvent::Type::kGestureFlingStart:
-      if (has_pending_scroll_event_)
-        ResampleScrollUpdate();
-      break;
-    default:
-      break;
-  }
-
-  return false;
-}
-
-// static
-Eina_Bool EventResampler::VsyncAnimatorCallback(void* data) {
-  auto resampler = static_cast<EventResampler*>(data);
-  for (unsigned i = 0; i < kIdentifiableTouchCount; i++) {
-    if (resampler->has_pending_touch_move_event_[i])
-      resampler->ResampleTouchMove(i);
-  }
-
-  resampler->is_scroll_processed_in_last_callback_ = false;
-  if (resampler->has_pending_scroll_event_) {
-    resampler->ResampleScrollUpdate();
-    resampler->is_scroll_processed_in_last_callback_ = true;
-  }
-
-  resampler->is_pinch_processed_in_last_callback_ = false;
-  if (resampler->has_pending_pinch_event_) {
-    resampler->ResamplePinchUpdate();
-    resampler->is_pinch_processed_in_last_callback_ = true;
-  }
-
-  if (resampler->CanDeleteAnimator()) {
-    resampler->ClearTouchMoveEventQueue();
-    resampler->vsync_animator_ = nullptr;
-    return ECORE_CALLBACK_CANCEL;
-  }
-
-  return ECORE_CALLBACK_RENEW;
-}
-
-bool EventResampler::CanDeleteAnimator() {
-  if (client_->TouchPointCount() > 0)
-    return false;
-
-  for (unsigned i = 0; i < kIdentifiableTouchCount; i++) {
-    if (has_pending_touch_move_event_[i])
-      return false;
-  }
-
-  return !has_pending_scroll_event_ && !has_pending_pinch_event_ &&
-         !is_scroll_processed_in_last_callback_ &&
-         !is_pinch_processed_in_last_callback_;
-}
-
-void EventResampler::ResampleTouchMove(int id) {
-  if (touch_move_event_queue_[id].empty())
-    return;
-
-  has_pending_touch_move_event_[id] = false;
-
-  ui::TouchEvent last_event = touch_move_event_queue_[id].back();
-  if (touch_move_event_queue_[id].size() < kTouchMoveEventQueueSize) {
-    client_->ForwardTouchEvent(&last_event);
-    return;
-  }
-
-  ui::TouchEvent first_event = touch_move_event_queue_[id].front();
-
-  float last_event_timestamp =
-      (last_event.time_stamp() - base::TimeTicks()).InMillisecondsF();
-  float first_event_timestamp =
-      (first_event.time_stamp() - base::TimeTicks()).InMillisecondsF();
-
-  float delta = last_event_timestamp - first_event_timestamp;
-  if (delta < kResampleMinDelta) {
-    client_->ForwardTouchEvent(&last_event);
-    return;
-  }
-
-  float x, y;
-  float sample_time = ecore_loop_time_get() * 1000 - kResampleLatency;
-  if (last_event_timestamp > sample_time) {
-    // Interpolation.
-    float alpha = (sample_time - first_event_timestamp) / delta;
-    x = first_event.location().x() +
-        (last_event.location().x() - first_event.location().x()) * alpha;
-    y = first_event.location().y() +
-        (last_event.location().y() - first_event.location().y()) * alpha;
-  } else {
-    // Extrapolation.
-    float max_predict =
-        last_event_timestamp + std::min(delta / 2, kResampleMaxPrediction);
-    sample_time = std::min(sample_time, max_predict);
-
-    float alpha = (last_event_timestamp - sample_time) / delta;
-    x = last_event.location().x() +
-        (first_event.location().x() - last_event.location().x()) * alpha;
-    y = last_event.location().y() +
-        (first_event.location().y() - last_event.location().y()) * alpha;
-  }
-
-  last_event.set_location_f(gfx::PointF(x, y));
-  client_->ForwardTouchEvent(&last_event);
-}
-
-void EventResampler::ResampleScrollUpdate() {
-  blink::WebGestureEvent event = last_scroll_update_event_;
-
-  double scroll_delta_x = pending_scroll_delta_.x();
-  double scroll_delta_y = pending_scroll_delta_.y();
-
-  // Convert delta type to Int for accuracy of top controls offset.
-  if (client_->TouchPointCount() == 1) {
-    scroll_delta_x = (scroll_delta_x > 0) ? std::floor(scroll_delta_x)
-                                          : std::ceil(scroll_delta_x);
-
-    scroll_delta_y = (scroll_delta_y > 0) ? std::floor(scroll_delta_y)
-                                          : std::ceil(scroll_delta_y);
-  }
-
-  pending_scroll_delta_.Offset(-scroll_delta_x, -scroll_delta_y);
-  event.data.scroll_update.delta_x = scroll_delta_x;
-  event.data.scroll_update.delta_y = scroll_delta_y;
-  has_pending_scroll_event_ = false;
-
-  client_->ForwardGestureEvent(event);
-}
-
-void EventResampler::ResamplePinchUpdate() {
-  blink::WebGestureEvent event = last_pinch_update_event_;
-  event.data.pinch_update.scale = pending_pinch_scale_;
-  pending_pinch_scale_ = 1.0;
-  has_pending_pinch_event_ = false;
-
-  client_->ForwardGestureEvent(event);
-}
-
-void EventResampler::ClearTouchMoveEventQueue() {
-  for (unsigned i = 0; i < kIdentifiableTouchCount; i++) {
-    std::queue<ui::TouchEvent> empty;
-    std::swap(touch_move_event_queue_[i], empty);
-  }
-}
-
-}  // namespace content
diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/event_resampler.h b/tizen_src/chromium_impl/content/browser/renderer_host/event_resampler.h
deleted file mode 100644 (file)
index 9d0c985..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2021 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef EVENT_RESAMPLER
-#define EVENT_RESAMPLER
-
-#include <Ecore.h>
-#include <queue>
-
-#include "third_party/blink/public/common/input/web_gesture_event.h"
-#include "ui/events/event.h"
-#include "ui/gfx/geometry/point_f.h"
-
-#define MAX_TOUCH_COUNT 2
-
-namespace content {
-
-class RenderWidgetHostViewEfl;
-
-class EventResamplerClient {
- public:
-  // Forward resampled touch event.
-  virtual void ForwardTouchEvent(ui::TouchEvent*) {}
-
-  // Forward resampled gesture event.
-  virtual void ForwardGestureEvent(blink::WebGestureEvent) {}
-
-  // Return number of touch point.
-  virtual unsigned TouchPointCount() const { return 0; }
-};
-
-class EventResampler {
- public:
-  explicit EventResampler(EventResamplerClient* client);
-  ~EventResampler();
-
-  bool HandleTouchEvent(ui::TouchEvent& event);
-  bool HandleGestureEvent(blink::WebGestureEvent& event);
-
- private:
-  static Eina_Bool VsyncAnimatorCallback(void* data);
-
-  void ResampleTouchMove(int id);
-  void ResampleScrollUpdate();
-  void ResamplePinchUpdate();
-
-  void ClearTouchMoveEventQueue();
-  bool CanDeleteAnimator();
-
-  EventResamplerClient* client_;
-
-  Ecore_Animator* vsync_animator_ = nullptr;
-  bool has_pending_touch_move_event_[MAX_TOUCH_COUNT] = {
-      false,
-  };
-  bool has_pending_scroll_event_ = false;
-  bool has_pending_pinch_event_ = false;
-
-  // To process without delay if event isn't processed in last callback.
-  bool is_scroll_processed_in_last_callback_ = false;
-  bool is_pinch_processed_in_last_callback_ = false;
-
-  std::queue<ui::TouchEvent> touch_move_event_queue_[MAX_TOUCH_COUNT];
-  blink::WebGestureEvent last_scroll_update_event_;
-  blink::WebGestureEvent last_pinch_update_event_;
-
-  gfx::PointF pending_scroll_delta_;
-  float pending_pinch_scale_ = 0.0;
-};
-
-}  // namespace content
-
-#endif  // EVENT_RESAMPLER
diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/im_context_efl.cc b/tizen_src/chromium_impl/content/browser/renderer_host/im_context_efl.cc
deleted file mode 100644 (file)
index 4d8a62f..0000000
+++ /dev/null
@@ -1,690 +0,0 @@
-// Copyright 2014 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "content/browser/renderer_host/im_context_efl.h"
-
-#include <Ecore_Evas.h>
-#include <Ecore_IMF_Evas.h>
-
-#include "base/logging.h"
-#include "base/strings/utf_string_conversions.h"
-#include "build/tizen_version.h"
-#include "content/browser/renderer_host/render_widget_host_impl.h"
-#include "content/browser/renderer_host/render_widget_host_view_efl.h"
-#include "third_party/icu/source/common/unicode/uchar.h"
-
-#ifdef IM_CTX_DEBUG
-#define IM_CTX_LOG_CHANNEL LOG(ERROR)
-#else
-#define IM_CTX_LOG_CHANNEL VLOG(1)
-#endif
-
-#define IM_CTX_LOG IM_CTX_LOG_CHANNEL << "## IMCTX ## " << __FUNCTION__ << " "
-
-// FIXME: we do not handle text compositing correctly yet.
-// Limit the functinality of this class to the handling of virtual keyboard for
-// now.
-#define USE_IM_COMPOSITING 1
-
-namespace {
-
-Ecore_IMF_Context* CreateIMFContext(Evas* evas) {
-  IM_CTX_LOG;
-  const char* default_context_id = ecore_imf_context_default_id_get();
-  if (!default_context_id) {
-    IM_CTX_LOG << "no default context id";
-    return NULL;
-  }
-  Ecore_IMF_Context* context = ecore_imf_context_add(default_context_id);
-  if (!context) {
-    IM_CTX_LOG << "cannot create context";
-    return NULL;
-  }
-
-  Ecore_Window window = ecore_evas_window_get(ecore_evas_ecore_evas_get(evas));
-  ecore_imf_context_client_window_set(context, reinterpret_cast<void*>(window));
-  ecore_imf_context_client_canvas_set(context, evas);
-
-  return context;
-}
-
-Eina_Bool IsIMFVisible(Ecore_IMF_Context* context_) {
-  return ecore_imf_context_input_panel_state_get(context_) ==
-         ECORE_IMF_INPUT_PANEL_STATE_SHOW;
-}
-
-}  // namespace
-
-namespace content {
-
-// static
-IMContextEfl* IMContextEfl::Create(RenderWidgetHostViewEfl* view) {
-  Ecore_IMF_Context* context = CreateIMFContext(view->evas());
-  if (!context)
-    return NULL;
-
-  return new IMContextEfl(view, context);
-}
-
-IMContextEfl::IMContextEfl(RenderWidgetHostViewEfl* view,
-                           Ecore_IMF_Context* context)
-    : view_(view),
-      context_(context),
-      is_focused_(false),
-      is_in_form_tag_(false),
-      current_mode_(ui::TEXT_INPUT_MODE_DEFAULT),
-      current_type_(ui::TEXT_INPUT_TYPE_NONE),
-      can_compose_inline_(false),
-      is_handling_keydown_(false),
-      is_ime_ctx_reset_(false) {
-  IM_CTX_LOG;
-  InitializeIMFContext(context_);
-}
-
-void IMContextEfl::InitializeIMFContext(Ecore_IMF_Context* context) {
-// FIXME: IME was not shown when this value was set as false on Wayland.
-// So temporarily block the code until find root cause.
-#if !defined(USE_WAYLAND)
-  ecore_imf_context_input_panel_enabled_set(context, false);
-#endif
-  ecore_imf_context_use_preedit_set(context, false);
-
-  ecore_imf_context_event_callback_add(context,
-                                       ECORE_IMF_CALLBACK_PREEDIT_CHANGED,
-                                       &IMFPreeditChangedCallback, this);
-  ecore_imf_context_event_callback_add(context, ECORE_IMF_CALLBACK_COMMIT,
-                                       &IMFCommitCallback, this);
-  ecore_imf_context_input_panel_event_callback_add(
-      context, ECORE_IMF_INPUT_PANEL_STATE_EVENT,
-      &IMFInputPanelStateChangedCallback, this);
-  ecore_imf_context_input_panel_event_callback_add(
-      context, ECORE_IMF_INPUT_PANEL_GEOMETRY_EVENT,
-      &IMFInputPanelGeometryChangedCallback, this);
-  ecore_imf_context_input_panel_event_callback_add(
-      context, ECORE_IMF_CANDIDATE_PANEL_STATE_EVENT,
-      &IMFCandidatePanelStateChangedCallback, this);
-  ecore_imf_context_input_panel_event_callback_add(
-      context, ECORE_IMF_CANDIDATE_PANEL_GEOMETRY_EVENT,
-      &IMFCandidatePanelGeometryChangedCallback, this);
-  ecore_imf_context_input_panel_event_callback_add(
-      context, ECORE_IMF_INPUT_PANEL_LANGUAGE_EVENT,
-      &IMFCandidatePanelLanguageChangedCallback, this);
-  ecore_imf_context_event_callback_add(context,
-                                       ECORE_IMF_CALLBACK_DELETE_SURROUNDING,
-                                       &IMFDeleteSurroundingCallback, this);
-  ecore_imf_context_retrieve_surrounding_callback_set(
-      context, &IMFRetrieveSurroundingCallback, this);
-}
-
-IMContextEfl::~IMContextEfl() {
-  ecore_imf_context_del(context_);
-}
-
-void IMContextEfl::HandleKeyDownEvent(const Evas_Event_Key_Down* event,
-                                      bool* wasFiltered,
-                                      std::string* utf8_key) {
-#if USE_IM_COMPOSITING
-  Ecore_IMF_Event im_event;
-  is_handling_keydown_ = true;
-  utf8_key_ = event->keyname;
-  ecore_imf_evas_event_key_down_wrap(const_cast<Evas_Event_Key_Down*>(event),
-                                     &im_event.key_down);
-  *wasFiltered = ecore_imf_context_filter_event(
-      context_, ECORE_IMF_EVENT_KEY_DOWN, &im_event);
-  // In November 2003, UTF-8 was restricted by RFC 3629 to end at U+10FFFF,
-  // in order to match the constraints of the UTF-16 character encoding.
-  // This removed all 5- and 6-byte sequences, and about half of the 4-byte
-  // sequences. So that we are copying 4 bytes to get first char data.
-  *utf8_key = utf8_key_.substr(0, 4);
-  is_handling_keydown_ = false;
-#endif
-}
-
-void IMContextEfl::HandleKeyUpEvent(const Evas_Event_Key_Up* event,
-                                    bool* wasFiltered) {
-#if USE_IM_COMPOSITING
-  Ecore_IMF_Event im_event;
-  ecore_imf_evas_event_key_up_wrap(const_cast<Evas_Event_Key_Up*>(event),
-                                   &im_event.key_up);
-  *wasFiltered = ecore_imf_context_filter_event(
-      context_, ECORE_IMF_EVENT_KEY_UP, &im_event);
-#endif
-}
-
-void IMContextEfl::UpdateInputMethodType(ui::TextInputType type,
-                                         ui::TextInputMode mode,
-                                         bool can_compose_inline) {
-  IM_CTX_LOG;
-
-  if (current_type_ == type && current_mode_ == mode &&
-      can_compose_inline_ == can_compose_inline) {
-    return;
-  }
-
-  Ecore_IMF_Input_Panel_Layout layout;
-  Ecore_IMF_Input_Panel_Return_Key_Type return_key_type =
-      ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT;
-  Ecore_IMF_Autocapital_Type cap_type = ECORE_IMF_AUTOCAPITAL_TYPE_NONE;
-  bool allow_prediction = true;
-
-  if (is_in_form_tag_)
-    return_key_type = ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_GO;
-
-  switch (type) {
-    case ui::TEXT_INPUT_TYPE_TEXT:
-      layout = ECORE_IMF_INPUT_PANEL_LAYOUT_NORMAL;
-      if (!is_in_form_tag_)
-        return_key_type = ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_DONE;
-      break;
-    case ui::TEXT_INPUT_TYPE_PASSWORD:
-      layout = ECORE_IMF_INPUT_PANEL_LAYOUT_PASSWORD;
-      allow_prediction = false;
-      break;
-    case ui::TEXT_INPUT_TYPE_SEARCH:
-      layout = ECORE_IMF_INPUT_PANEL_LAYOUT_NORMAL;
-      return_key_type = ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_SEARCH;
-      break;
-    case ui::TEXT_INPUT_TYPE_EMAIL:
-      layout = ECORE_IMF_INPUT_PANEL_LAYOUT_EMAIL;
-      break;
-    case ui::TEXT_INPUT_TYPE_NUMBER:
-      layout = ECORE_IMF_INPUT_PANEL_LAYOUT_NUMBER;
-      if (!is_in_form_tag_)
-        return_key_type = ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_DONE;
-      break;
-    case ui::TEXT_INPUT_TYPE_TELEPHONE:
-      layout = ECORE_IMF_INPUT_PANEL_LAYOUT_PHONENUMBER;
-      break;
-    case ui::TEXT_INPUT_TYPE_URL:
-      layout = ECORE_IMF_INPUT_PANEL_LAYOUT_URL;
-      break;
-    case ui::TEXT_INPUT_TYPE_MONTH:
-      layout = ECORE_IMF_INPUT_PANEL_LAYOUT_MONTH;
-      break;
-    case ui::TEXT_INPUT_TYPE_TEXT_AREA:
-      layout = ECORE_IMF_INPUT_PANEL_LAYOUT_NORMAL;
-      cap_type = ECORE_IMF_AUTOCAPITAL_TYPE_SENTENCE;
-      break;
-
-    // No direct mapping to Ecore_IMF API, use simple text layout.
-    case ui::TEXT_INPUT_TYPE_DATE:
-    case ui::TEXT_INPUT_TYPE_DATE_TIME:
-    case ui::TEXT_INPUT_TYPE_DATE_TIME_LOCAL:
-    case ui::TEXT_INPUT_TYPE_TIME:
-    case ui::TEXT_INPUT_TYPE_WEEK:
-    case ui::TEXT_INPUT_TYPE_CONTENT_EDITABLE:
-    case ui::TEXT_INPUT_TYPE_DATE_TIME_FIELD:
-      layout = ECORE_IMF_INPUT_PANEL_LAYOUT_NORMAL;
-      break;
-
-    case ui::TEXT_INPUT_TYPE_NONE:
-      return;
-
-    default:
-      NOTREACHED();
-      return;
-  }
-
-  Ecore_IMF_Input_Mode imf_mode;
-  switch (mode) {
-    case ui::TEXT_INPUT_MODE_NUMERIC:
-      imf_mode = ECORE_IMF_INPUT_MODE_NUMERIC;
-    default:
-      imf_mode = ECORE_IMF_INPUT_MODE_ALPHA;
-  }
-
-  ecore_imf_context_input_panel_layout_set(context_, layout);
-  ecore_imf_context_input_mode_set(context_, imf_mode);
-  ecore_imf_context_input_panel_return_key_type_set(context_, return_key_type);
-  ecore_imf_context_autocapital_type_set(context_, cap_type);
-  ecore_imf_context_prediction_allow_set(context_, allow_prediction);
-
-  // If the focused element supports inline rendering of composition text,
-  // we receive and send related events to it. Otherwise, the events related
-  // to the updates of composition text are directed to the candidate window.
-  ecore_imf_context_use_preedit_set(context_, can_compose_inline);
-
-  current_type_ = type;
-  current_mode_ = mode;
-  can_compose_inline_ = can_compose_inline;
-}
-
-void IMContextEfl::UpdateInputMethodState(ui::TextInputType type,
-                                          bool can_compose_inline,
-                                          bool show_if_needed) {
-  if (current_type_ != type || can_compose_inline_ != can_compose_inline) {
-    UpdateInputMethodType(type, ui::TEXT_INPUT_MODE_DEFAULT,
-                          can_compose_inline);
-    // Workaround on platform issue:
-    // http://107.108.218.239/bugzilla/show_bug.cgi?id=11494
-    // Keyboard layout doesn't update after change.
-    if (IsIMFVisible(context_) && type != ui::TEXT_INPUT_TYPE_NONE) {
-      HidePanel();
-      ShowPanel();
-    }
-  }
-
-  IM_CTX_LOG;
-
-  bool show = type != ui::TEXT_INPUT_TYPE_NONE;
-  if (show && !IsIMFVisible(context_) && show_if_needed) {
-    ShowPanel();
-    // TODO(youngsoo): workaround on tizen v3.0 platform issue
-    // Even if virtual keyboard is shown,
-    // the API 'ecore_imf_context_input_panel_state_get()'
-    // returns '1' which means the keyboard is not shown.
-    // It makes the 'HidePanel()' unreachable.
-  } else if (!show) {
-    HidePanel();
-  }
-}
-
-void IMContextEfl::ShowPanel() {
-  IM_CTX_LOG;
-  ecore_imf_context_focus_in(context_);
-  ecore_imf_context_input_panel_show(context_);
-}
-
-void IMContextEfl::HidePanel() {
-  IM_CTX_LOG;
-  ecore_imf_context_focus_out(context_);
-  ecore_imf_context_input_panel_hide(context_);
-}
-
-void IMContextEfl::UpdateCaretBounds(const gfx::Rect& caret_bounds) {
-  if (IsIMFVisible(context_)) {
-    int x = caret_bounds.x();
-    int y = caret_bounds.y();
-    int w = caret_bounds.width();
-    int h = caret_bounds.height();
-    ecore_imf_context_cursor_location_set(context_, x, y, w, h);
-  }
-}
-
-void IMContextEfl::OnFocusIn() {
-  CancelComposition();
-
-  if (is_focused_)
-    return;
-
-  IM_CTX_LOG;
-  is_focused_ = true;
-
-  ecore_imf_context_focus_in(context_);
-}
-
-void IMContextEfl::OnFocusOut() {
-  if (!is_focused_)
-    return;
-
-  IM_CTX_LOG;
-  is_focused_ = false;
-
-  CancelComposition();
-
-  ecore_imf_context_focus_out(context_);
-}
-
-void IMContextEfl::ResetIMFContext() {
-  is_ime_ctx_reset_ = true;
-  ecore_imf_context_reset(context_);
-  is_ime_ctx_reset_ = false;
-}
-
-void IMContextEfl::CancelComposition() {
-  IM_CTX_LOG;
-  ClearQueues();
-  ResetIMFContext();
-
-  if (composition_.text.length() > 0) {
-    std::u16string empty;
-    view_->ConfirmComposition(empty);
-#if !defined(EWK_BRINGUP)  // FIXME: m94 bringup
-    composition_.text = base::UTF8ToUTF16(u"");
-#endif
-  }
-}
-
-void IMContextEfl::ConfirmComposition() {
-  // Gtk use it to send the empty string as committed.
-  // I'm not sure we need it (kbalazs).
-}
-
-void IMContextEfl::SetIsInFormTag(bool is_in_form_tag) {
-  is_in_form_tag_ = is_in_form_tag;
-  if (!context_ || !IsIMFVisible(context_))
-    return;
-
-  if (ecore_imf_context_input_panel_return_key_type_get(context_) ==
-      ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_SEARCH)
-    return;
-
-  if (is_in_form_tag_)
-    ecore_imf_context_input_panel_return_key_type_set(
-        context_, ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_GO);
-  else {
-    if (current_type_ == ui::TEXT_INPUT_TYPE_TEXT ||
-        current_type_ == ui::TEXT_INPUT_TYPE_NUMBER)
-      ecore_imf_context_input_panel_return_key_type_set(
-          context_, ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_DONE);
-    else
-      ecore_imf_context_input_panel_return_key_type_set(
-          context_, ECORE_IMF_INPUT_PANEL_RETURN_KEY_TYPE_DEFAULT);
-  }
-}
-
-void IMContextEfl::OnCommit(void* event_info) {
-  if (is_ime_ctx_reset_) {
-    return;
-  }
-
-#if USE_IM_COMPOSITING
-  IM_CTX_LOG;
-#if !defined(EWK_BRINGUP)  // FIXME: m94 bringup
-  composition_.text = base::UTF8ToUTF16("");
-#endif
-
-  char* text = static_cast<char*>(event_info);
-
-  utf8_key_ = text;
-  std::u16string text16 = base::UTF8ToUTF16(text);
-  // Only add commit to queue, till we dont know if key event
-  // should be handled. It can be default prevented for exactly.
-  commit_queue_.push(text16);
-
-  // sending fake key event if hardware key is not handled as it is
-  // in Webkit.
-  SendFakeCompositionKeyEvent(text16);
-#endif
-}
-
-void IMContextEfl::SendFakeCompositionKeyEvent(const std::u16string& buf) {
-  if (is_handling_keydown_)
-    return;
-
-  if (!buf.length())
-    return;
-
-  std::string str = base::UTF16ToUTF8(buf.substr(buf.length() - 1));
-
-  Evas_Event_Key_Down downEvent;
-  memset(&downEvent, 0, sizeof(Evas_Event_Key_Down));
-  downEvent.key = str.c_str();
-  downEvent.string = str.c_str();
-
-  NativeWebKeyboardEvent n_event = MakeWebKeyboardEvent(true, &downEvent);
-  n_event.is_system_key = true;
-
-  if (!view_->GetRenderWidgetHost())
-    return;
-
-  PushToKeyUpEventQueue(n_event.windows_key_code);
-  view_->GetRenderWidgetHost()->ForwardKeyboardEvent(n_event);
-}
-
-void IMContextEfl::OnPreeditChanged(void* data,
-                                    Ecore_IMF_Context* context,
-                                    void* event_info) {
-  if (is_ime_ctx_reset_)
-    return;
-
-#if USE_IM_COMPOSITING
-#if !defined(EWK_BRINGUP)  // FIXME: m94 bringup
-  composition_.text = base::UTF8ToUTF16("");
-#endif
-  char* buffer = 0;
-
-  ecore_imf_context_preedit_string_get(context, &buffer, 0);
-
-  // Upon the BACK HW key press on Mobile, the preedit changed
-  // registered callback is being called with an empty preedit string.
-  // This bubbles down to the engine through RWHVEfl::SetComposition
-  // and ends up deleting selected text, if any. Check here prevents this
-  // from happening.
-  if (!buffer || !strcmp(buffer, ""))
-    return;
-
-  utf8_key_ = buffer;
-  // Add empty commit to stop processing commits.
-  commit_queue_.push(std::u16string());
-#if !defined(EWK_BRINGUP)  // FIXME: m94 bringup
-  composition_.text = base::UTF8ToUTF16("");
-#endif
-  std::u16string text16 = base::UTF8ToUTF16(buffer);
-  if (!text16.empty())
-    SendFakeCompositionKeyEvent(text16);
-  composition_.text = text16;
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  ui::ImeTextSpan text_underline(ui::ImeTextSpan::Type::kComposition, 0,
-                                 composition_.text.length(), SK_ColorBLACK,
-                                 false, SK_ColorTRANSPARENT);
-  composition_.ime_text_spans.push_back(text_underline);
-#endif
-  composition_.selection = gfx::Range(composition_.text.length());
-
-  // Only add preedit to queue, till we dont know if key event
-  // should be handled. It can be default prevented for exactly.
-  if (!text16.empty())
-    preedit_queue_.push(composition_);
-  else {
-    view_->SetComposition(composition_);
-  }
-
-  free(buffer);
-
-#endif
-}
-
-// TODO(kbalazs): figure out what do we need from these callbacks.
-// Tizen-WebKit-efl using all of them.
-
-void IMContextEfl::OnInputPanelStateChanged(int state) {
-  if (state == ECORE_IMF_INPUT_PANEL_STATE_SHOW) {
-    IM_CTX_LOG << ": show";
-    if (view_->smart_parent())
-      evas_object_smart_callback_call(view_->smart_parent(),
-                                      "editorclient,ime,opened", 0);
-    view_->ScrollFocusedEditableNode();
-  } else if (state == ECORE_IMF_INPUT_PANEL_STATE_HIDE) {
-    IM_CTX_LOG << ": hide";
-    if (view_->smart_parent())
-      evas_object_smart_callback_call(view_->smart_parent(),
-                                      "editorclient,ime,closed", 0);
-  }
-
-  // ignore ECORE_IMF_INPUT_PANEL_WILL_SHOW value
-}
-
-void IMContextEfl::OnInputPanelGeometryChanged() {
-  Eina_Rectangle rect;
-  ecore_imf_context_input_panel_geometry_get(context_, &rect.x, &rect.y,
-                                             &rect.w, &rect.h);
-  if (view_->smart_parent())
-    evas_object_smart_callback_call(view_->smart_parent(),
-                                    "inputmethod,changed",
-                                    static_cast<void*>(&rect));
-  // Scroll to focused editable node if virtual keyboard
-  // changed geometry
-  if (rect.w > 0 || rect.h > 0)
-    view_->ScrollFocusedEditableNode();
-  SetIMERect(gfx::Rect(rect.x, rect.y, rect.w, rect.h));
-}
-
-void IMContextEfl::OnCandidateInputPanelStateChanged(int state) {
-  if (state == ECORE_IMF_CANDIDATE_PANEL_SHOW) {
-    if (view_->smart_parent())
-      evas_object_smart_callback_call(view_->smart_parent(),
-                                      "editorclient,candidate,opened", 0);
-  } else {
-    if (view_->smart_parent())
-      evas_object_smart_callback_call(view_->smart_parent(),
-                                      "editorclient,candidate,closed", 0);
-  }
-}
-
-void IMContextEfl::OnCandidateInputPanelGeometryChanged() {}
-
-bool IMContextEfl::OnRetrieveSurrounding(char** text, int* offset) {
-  return false;
-}
-
-void IMContextEfl::OnDeleteSurrounding(void* event_info) {}
-
-void IMContextEfl::OnCandidateInputPanelLanguageChanged(Ecore_IMF_Context*,
-                                                        int) {
-  RenderWidgetHostImpl* rwhi = GetRenderWidgetHostImpl();
-
-  if (!rwhi || composition_.text.length() == 0)
-    return;
-
-  CancelComposition();
-}
-
-bool IMContextEfl::IsShow() {
-  return context_ && is_focused_ && IsIMFVisible(context_);
-}
-
-bool IMContextEfl::IsImePanelVisible() {
-  return context_ && IsIMFVisible(context_);
-}
-
-void IMContextEfl::ClearQueues() {
-  commit_queue_ = CommitQueue();
-  preedit_queue_ = PreeditQueue();
-  keyup_event_queue_ = KeyUpEventQueue();
-  keydown_event_queue_ = KeyDownEventQueue();
-}
-
-void IMContextEfl::IMFCommitCallback(void* data,
-                                     Ecore_IMF_Context*,
-                                     void* event_info) {
-  static_cast<IMContextEfl*>(data)->OnCommit(event_info);
-}
-
-void IMContextEfl::IMFPreeditChangedCallback(void* data,
-                                             Ecore_IMF_Context* context,
-                                             void* event_info) {
-  static_cast<IMContextEfl*>(data)->OnPreeditChanged(data, context, event_info);
-}
-
-void IMContextEfl::IMFInputPanelStateChangedCallback(void* data,
-                                                     Ecore_IMF_Context*,
-                                                     int state) {
-  static_cast<IMContextEfl*>(data)->OnInputPanelStateChanged(state);
-}
-
-void IMContextEfl::IMFInputPanelGeometryChangedCallback(void* data,
-                                                        Ecore_IMF_Context*,
-                                                        int state) {
-  static_cast<IMContextEfl*>(data)->OnInputPanelGeometryChanged();
-}
-
-void IMContextEfl::IMFCandidatePanelStateChangedCallback(void* data,
-                                                         Ecore_IMF_Context*,
-                                                         int state) {
-  static_cast<IMContextEfl*>(data)->OnCandidateInputPanelStateChanged(state);
-}
-
-void IMContextEfl::IMFCandidatePanelGeometryChangedCallback(void* data,
-                                                            Ecore_IMF_Context*,
-                                                            int state) {
-  static_cast<IMContextEfl*>(data)->OnCandidateInputPanelGeometryChanged();
-}
-
-Eina_Bool IMContextEfl::IMFRetrieveSurroundingCallback(void* data,
-                                                       Ecore_IMF_Context*,
-                                                       char** text,
-                                                       int* offset) {
-  return static_cast<IMContextEfl*>(data)->OnRetrieveSurrounding(text, offset);
-}
-
-void IMContextEfl::IMFDeleteSurroundingCallback(void* data,
-                                                Ecore_IMF_Context*,
-                                                void* event_info) {
-  static_cast<IMContextEfl*>(data)->OnDeleteSurrounding(event_info);
-}
-
-void IMContextEfl::IMFCandidatePanelLanguageChangedCallback(
-    void* data,
-    Ecore_IMF_Context* context,
-    int value) {
-  static_cast<IMContextEfl*>(data)->OnCandidateInputPanelLanguageChanged(
-      context, value);
-}
-
-void IMContextEfl::HandleKeyEvent(bool processed) {
-  ProcessNextCommitText(processed);
-  ProcessNextPreeditText(processed);
-  ProcessNextKeyDownEvent();
-  ProcessNextKeyUpEvent();
-}
-
-void IMContextEfl::ProcessNextCommitText(bool processed) {
-  while (!commit_queue_.empty()) {
-    if (!processed && !(commit_queue_.front().empty()))
-      view_->ConfirmComposition(commit_queue_.front());
-
-    commit_queue_.pop();
-  }
-}
-
-void IMContextEfl::ProcessNextPreeditText(bool processed) {
-  if (preedit_queue_.empty())
-    return;
-
-  if (!processed)
-    view_->SetComposition(preedit_queue_.front());
-  else
-    ResetIMFContext();
-
-  preedit_queue_.pop();
-}
-
-void IMContextEfl::ProcessNextKeyDownEvent() {
-  if (keydown_event_queue_.empty())
-    return;
-
-  GetRenderWidgetHostImpl()->ForwardKeyboardEvent(keydown_event_queue_.front());
-  keydown_event_queue_.pop();
-}
-
-void IMContextEfl::ProcessNextKeyUpEvent() {
-  if (keyup_event_queue_.empty())
-    return;
-
-  SendCompositionKeyUpEvent(keyup_event_queue_.front());
-  keyup_event_queue_.pop();
-}
-
-// #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-// TODO: Changes made for M63 bring-up. Check its working.
-void IMContextEfl::SendCompositionKeyUpEvent(int code) {
-#if !defined(EWK_BRINGUP)  // FIXME: m69 bringup
-  blink::WebKeyboardEvent keyboard_event(
-      blink::WebInputEvent::kKeyUp, blink::WebInputEvent::kNoModifiers, 0.0);
-#else
-  blink::WebKeyboardEvent keyboard_event;
-#endif
-  keyboard_event.windows_key_code = code;
-
-  gfx::NativeView native_view;
-  GetRenderWidgetHostImpl()->ForwardKeyboardEvent(
-      NativeWebKeyboardEvent(keyboard_event, native_view));
-}
-
-void IMContextEfl::PushToKeyUpEventQueue(int key) {
-  keyup_event_queue_.push(key);
-}
-
-void IMContextEfl::PushToKeyDownEventQueue(NativeWebKeyboardEvent key) {
-  keydown_event_queue_.push(key);
-}
-
-RenderWidgetHostImpl* IMContextEfl::GetRenderWidgetHostImpl() const {
-  RenderWidgetHost* rwh = view_->GetRenderWidgetHost();
-  if (!rwh)
-    return NULL;
-  return RenderWidgetHostImpl::From(rwh);
-}
-}  // namespace content
diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/im_context_efl.h b/tizen_src/chromium_impl/content/browser/renderer_host/im_context_efl.h
deleted file mode 100644 (file)
index 5f6eb6b..0000000
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright 2014 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef IM_CONTEXT_EFL
-#define IM_CONTEXT_EFL
-
-#include <Evas.h>
-
-#include "content/browser/renderer_host/web_event_factory_efl.h"
-#include "content/public/browser/native_web_keyboard_event.h"
-#include "ui/base/ime/composition_text.h"
-#include "ui/gfx/geometry/rect.h"
-
-typedef struct _Ecore_IMF_Context Ecore_IMF_Context;
-
-namespace content {
-
-class RenderWidgetHostViewEfl;
-
-class IMContextEfl {
- public:
-  // Returns NULL if there is no available backend.
-  static IMContextEfl* Create(RenderWidgetHostViewEfl*);
-
-  ~IMContextEfl();
-
-  void HandleKeyDownEvent(const Evas_Event_Key_Down* event,
-                          bool* wasFiltered,
-                          std::string* utf8_key);
-  void HandleKeyUpEvent(const Evas_Event_Key_Up* event, bool* wasFiltered);
-
-  void UpdateInputMethodType(ui::TextInputType,
-                             ui::TextInputMode,
-                             bool can_compose_inline);
-  void UpdateInputMethodState(ui::TextInputType,
-                              bool can_compose_inline,
-                              bool show_if_needed);
-  void UpdateCaretBounds(const gfx::Rect& caret_bounds);
-
-  void OnFocusIn();
-  void OnFocusOut();
-
-  void ShowPanel();
-  void HidePanel();
-
-  void ResetIMFContext();
-  void CancelComposition();
-  void ConfirmComposition();
-  void SetIsInFormTag(bool is_in_form_tag);
-  bool IsShow();
-  bool IsImePanelVisible();
-  gfx::Rect GetIMERect() const { return ime_rect_; }
-  void SetIMERect(const gfx::Rect& rect) { ime_rect_ = rect; }
-  bool IsPreeditQueueEmpty() const { return preedit_queue_.empty(); }
-  bool IsKeyUpQueueEmpty() const { return keyup_event_queue_.empty(); }
-  void PreeditQueuePop() { preedit_queue_.pop(); }
-  void ClearQueues();
-  void HandleKeyEvent(bool processed);
-
-  void PushToKeyUpEventQueue(int key);
-  void PushToKeyDownEventQueue(NativeWebKeyboardEvent key);
-
-  void SendFakeCompositionKeyEvent(const std::u16string& buf);
-
- private:
-  IMContextEfl(RenderWidgetHostViewEfl*, Ecore_IMF_Context*);
-
-  void InitializeIMFContext(Ecore_IMF_Context*);
-
-  // callbacks
-  static void IMFCommitCallback(void* data,
-                                Ecore_IMF_Context*,
-                                void* event_info);
-  static void IMFPreeditChangedCallback(void* data,
-                                        Ecore_IMF_Context* context,
-                                        void* event_info);
-  static void IMFInputPanelStateChangedCallback(void* data,
-                                                Ecore_IMF_Context*,
-                                                int state);
-  static void IMFInputPanelGeometryChangedCallback(void* data,
-                                                   Ecore_IMF_Context*,
-                                                   int state);
-  static void IMFCandidatePanelStateChangedCallback(void* data,
-                                                    Ecore_IMF_Context*,
-                                                    int state);
-  static void IMFCandidatePanelGeometryChangedCallback(void* data,
-                                                       Ecore_IMF_Context*,
-                                                       int state);
-  static Eina_Bool IMFRetrieveSurroundingCallback(void* data,
-                                                  Ecore_IMF_Context*,
-                                                  char** text,
-                                                  int* offset);
-  static void IMFDeleteSurroundingCallback(void* data,
-                                           Ecore_IMF_Context*,
-                                           void* event_info);
-  static void IMFCandidatePanelLanguageChangedCallback(
-      void* data,
-      Ecore_IMF_Context* context,
-      int value);
-
-  // callback handlers
-  void OnCommit(void* event_info);
-  void OnPreeditChanged(void* data,
-                        Ecore_IMF_Context* context,
-                        void* event_info);
-
-  void OnInputPanelStateChanged(int state);
-  void OnInputPanelGeometryChanged();
-
-  void OnCandidateInputPanelStateChanged(int state);
-  void OnCandidateInputPanelGeometryChanged();
-
-  bool OnRetrieveSurrounding(char** text, int* offset);
-  void OnDeleteSurrounding(void* event_info);
-  void OnCandidateInputPanelLanguageChanged(Ecore_IMF_Context* context,
-                                            int value);
-
-  void ProcessNextCommitText(bool processed);
-  void ProcessNextPreeditText(bool processed);
-  void ProcessNextKeyDownEvent();
-  void ProcessNextKeyUpEvent();
-  void SendCompositionKeyUpEvent(int code);
-
-  RenderWidgetHostImpl* GetRenderWidgetHostImpl() const;
-
-  RenderWidgetHostViewEfl* view_;
-
-  Ecore_IMF_Context* context_;
-
-  // Whether or not the associated widget is focused.
-  bool is_focused_;
-
-  // Whether or not is in form tag.
-  bool is_in_form_tag_;
-
-  // The current soft keyboard mode and layout
-  ui::TextInputMode current_mode_;
-  ui::TextInputType current_type_;
-  bool can_compose_inline_;
-
-  ui::CompositionText composition_;
-
-  gfx::Rect ime_rect_;
-
-  typedef std::queue<std::u16string> CommitQueue;
-  typedef std::queue<ui::CompositionText> PreeditQueue;
-  typedef std::queue<int> KeyUpEventQueue;
-  typedef std::queue<NativeWebKeyboardEvent> KeyDownEventQueue;
-
-  CommitQueue commit_queue_;
-  PreeditQueue preedit_queue_;
-  KeyUpEventQueue keyup_event_queue_;
-  KeyDownEventQueue keydown_event_queue_;
-
-  bool is_handling_keydown_;
-  bool is_ime_ctx_reset_;
-  std::string utf8_key_;
-};
-
-}  // namespace content
-
-#endif
diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/native_web_keyboard_event_efl.cc b/tizen_src/chromium_impl/content/browser/renderer_host/native_web_keyboard_event_efl.cc
deleted file mode 100644 (file)
index f6b9792..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Copyright 2014 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "content/public/browser/native_web_keyboard_event.h"
-
-#include "ui/events/base_event_utils.h"
-#include "ui/events/blink/web_input_event.h"
-#include "ui/events/event.h"
-#include "ui/events/keycodes/dom/keycode_converter.h"
-
-namespace content {
-
-ui::Event* CopyEvent(ui::Event* event) {
-  return event ? ui::Event::Clone(*event).release() : nullptr;
-}
-
-NativeWebKeyboardEvent::NativeWebKeyboardEvent(blink::WebInputEvent::Type type,
-                                               int modifiers,
-                                               base::TimeTicks timestamp)
-    : WebKeyboardEvent(type, modifiers, timestamp),
-      os_event(nullptr),
-      skip_in_browser(false) {}
-
-NativeWebKeyboardEvent::NativeWebKeyboardEvent(
-    const blink::WebKeyboardEvent& web_event,
-    gfx::NativeView native_view)
-    : WebKeyboardEvent(web_event), os_event(nullptr), skip_in_browser(false) {}
-
-NativeWebKeyboardEvent::NativeWebKeyboardEvent(gfx::NativeEvent native_event)
-    : NativeWebKeyboardEvent(static_cast<ui::KeyEvent&>(*native_event)) {}
-
-NativeWebKeyboardEvent::NativeWebKeyboardEvent(const ui::KeyEvent& key_event)
-    : WebKeyboardEvent(ui::MakeWebKeyboardEvent(key_event)),
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-      os_event(CopyEvent(&key_event)),
-#else
-      os_event(nullptr),
-#endif
-      skip_in_browser(false) {
-}
-
-NativeWebKeyboardEvent::NativeWebKeyboardEvent(
-    const NativeWebKeyboardEvent& other)
-    : WebKeyboardEvent(other),
-      os_event(CopyEvent(other.os_event)),
-      skip_in_browser(other.skip_in_browser) {}
-
-NativeWebKeyboardEvent& NativeWebKeyboardEvent::operator=(
-    const NativeWebKeyboardEvent& other) {
-  WebKeyboardEvent::operator=(other);
-  delete os_event;
-  os_event = CopyEvent(other.os_event);
-  skip_in_browser = other.skip_in_browser;
-
-  return *this;
-}
-
-NativeWebKeyboardEvent::~NativeWebKeyboardEvent() {
-  delete os_event;
-}
-
-}  // namespace content
diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.cc
deleted file mode 100644 (file)
index be9a00b..0000000
+++ /dev/null
@@ -1,1624 +0,0 @@
-// Copyright 2014-2015 Samsung Electronics. All rights reserved.
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "content/browser/renderer_host/render_widget_host_view_efl.h"
-
-#include <Ecore.h>
-#include <Ecore_Evas.h>
-#include <Ecore_Input.h>
-#include <Elementary.h>
-#include "ecore_x_wayland_wrapper.h"
-
-#include "base/auto_reset.h"
-#include "base/bind.h"
-#include "base/callback_helpers.h"
-#include "base/command_line.h"
-#include "base/logging.h"
-#include "base/memory/ptr_util.h"
-#include "base/strings/string_number_conversions.h"
-#include "base/strings/utf_string_conversions.h"
-#include "base/threading/thread_task_runner_handle.h"
-#include "base/trace_event/trace_event.h"
-#include "components/viz/host/host_frame_sink_manager.h"
-#include "content/browser/compositor/surface_utils.h"
-#include "content/browser/renderer_host/disambiguation_popup_efl.h"
-#include "content/browser/renderer_host/edge_effect.h"
-#include "content/browser/renderer_host/event_with_latency_info.h"
-#include "content/browser/renderer_host/im_context_efl.h"
-#include "content/browser/renderer_host/input/synthetic_gesture_target.h"
-#include "content/browser/renderer_host/render_view_host_impl.h"
-#include "content/browser/renderer_host/render_widget_host_impl.h"
-#include "content/browser/renderer_host/ui_events_helper.h"
-#include "content/browser/renderer_host/web_event_factory_efl.h"
-#include "content/common/cursors/webcursor_efl.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/browser/context_factory.h"
-#include "content/public/browser/render_process_host.h"
-#include "content/public/browser/web_contents_delegate.h"
-#include "content/public/common/content_switches.h"
-#include "gpu/command_buffer/service/mailbox_manager.h"
-#include "media/base/video_frame.h"
-#include "media/base/video_util.h"
-#include "skia/ext/image_operations.h"
-#include "third_party/blink/public/common/input/web_input_event.h"
-#include "third_party/blink/public/common/input/web_touch_point.h"
-#include "tizen/system_info.h"
-#include "ui/base/clipboard/clipboard_helper_efl.h"
-#include "ui/base/ime/mojom/text_input_state.mojom.h"
-#include "ui/base/layout.h"
-#include "ui/display/display_util.h"
-#include "ui/events/blink/blink_event_util.h"
-#include "ui/events/blink/did_overscroll_params.h"
-#include "ui/events/event_switches.h"
-#include "ui/events/event_utils.h"
-#define private public
-#include "ui/events/gestures/gesture_provider_aura.h"
-#undef private
-#include "components/viz/common/surfaces/parent_local_surface_id_allocator.h"
-#include "ui/display/device_display_info_efl.h"
-#include "ui/display/display.h"
-#include "ui/display/screen.h"
-#include "ui/events/gestures/gesture_recognizer_impl_efl.h"
-#include "ui/gfx/geometry/dip_util.h"
-#include "ui/gfx/geometry/rect.h"
-#include "ui/gfx/selection_bound.h"
-#include "ui/gl/gl_shared_context_efl.h"
-
-#if defined(OS_TIZEN)
-#include <efl_extension.h>
-#endif
-
-#define EFL_MAX_WIDTH 10000
-#define EFL_MAX_HEIGHT 10000  // borrowed from GTK+ port
-
-#define MAX_SURFACE_WIDTH_EGL 4096   // max supported Framebuffer width
-#define MAX_SURFACE_HEIGHT_EGL 4096  // max supported Framebuffer height
-
-// These two constants are redefinitions of the original constants defined
-// in evas_common.c. These are not supposed to be used directly by apps,
-// but we do this because of chromium uses fbo for direct rendering.
-#define EVAS_GL_OPTIONS_DIRECT_MEMORY_OPTIMIZE (1 << 12)
-#define EVAS_GL_OPTIONS_DIRECT_OVERRIDE (1 << 13)
-
-namespace content {
-
-namespace {
-
-bool IsShiftKey(const char* key) {
-  if (!key)
-    return false;
-  return !strcmp(key, "Shift_L") || !strcmp(key, "Shift_R");
-}
-
-// Creates a WebGestureEvent from a ui::GestureEvent. Note that it does not
-// populate the event coordinates (i.e. |x|, |y|, |globalX|, and |globalY|). So
-// the caller must populate these fields.
-blink::WebGestureEvent MakeWebGestureEventFromUIEvent(
-    const ui::GestureEvent& event) {
-  return ui::CreateWebGestureEvent(
-      event.details(), event.time_stamp(), event.location_f(),
-      event.root_location_f(), event.flags(), event.unique_touch_event_id());
-}
-
-}  // namespace
-
-class ScreenshotCapturedCallback {
- public:
-  ScreenshotCapturedCallback(Screenshot_Captured_Callback func, void* user_data)
-      : func_(func), user_data_(user_data) {}
-  void Run(Evas_Object* image) {
-    if (func_ != NULL)
-      (func_)(image, user_data_);
-  }
-
- private:
-  Screenshot_Captured_Callback func_;
-  void* user_data_;
-};
-
-RenderWidgetHostViewEfl::RenderWidgetHostViewEfl(RenderWidgetHost* widget_host,
-                                                 WebContents& web_contents)
-    : RenderWidgetHostViewBase(widget_host),
-      evasgl_delegated_frame_host_(new EvasGLDelegatedFrameHost(this)),
-      im_context_(NULL),
-      evas_(NULL),
-      parent_view_(NULL),
-      smart_parent_(NULL),
-      content_image_(NULL),
-      content_image_elm_host_(NULL),
-      evas_gl_initialized_(false),
-      device_scale_factor_(1.0f),
-      magnifier_(false),
-      is_loading_(false),
-      frame_sink_id_(host()->GetFrameSinkId()),
-      gesture_recognizer_(std::make_unique<ui::GestureRecognizerImpl>()),
-      current_orientation_(0),
-      evas_gl_(NULL),
-      evas_gl_api_(NULL),
-      evas_gl_config_(NULL),
-      evas_gl_context_(NULL),
-      evas_gl_surface_(NULL),
-      handling_disambiguation_popup_gesture_(false),
-      touch_events_enabled_(false),
-      background_color_(SK_ColorWHITE),
-      web_contents_(web_contents),
-      event_resampler_(new EventResampler(this)),
-      weak_factory_(this) {
-  parent_view_ = static_cast<Evas_Object*>(web_contents.GetNativeView());
-  evas_ = evas_object_evas_get(parent_view_);
-
-  InitializeDeviceDisplayInfo();
-
-  SetDoubleTapSupportEnabled(touch_events_enabled_);
-
-  device_scale_factor_ =
-      display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor();
-
-  host()->SetView(this);
-
-  static bool scale_factor_initialized = false;
-  if (!scale_factor_initialized) {
-    std::vector<ui::ResourceScaleFactor> supported_scale_factors;
-    supported_scale_factors.push_back(ui::SCALE_FACTOR_100P);
-    supported_scale_factors.push_back(ui::SCALE_FACTOR_200P);
-    ui::SetSupportedResourceScaleFactors(supported_scale_factors);
-    scale_factor_initialized = true;
-  }
-
-  gesture_recognizer_->AddGestureEventHelper(this);
-
-  GetHostFrameSinkManager()->RegisterFrameSinkId(
-      frame_sink_id_, this, viz::ReportFirstSurfaceActivation::kNo);
-}
-
-void RenderWidgetHostViewEfl::InitAsChild(gfx::NativeView /* parent_view */) {
-  content_image_elm_host_ = elm_bg_add(parent_view_);
-  elm_object_part_content_set(parent_view_, "content", content_image_elm_host_);
-  content_image_ = evas_object_image_filled_add(evas_);
-  elm_object_part_content_set(content_image_elm_host_, "overlay",
-                              content_image_);
-  elm_object_focus_allow_set(content_image_elm_host_, EINA_TRUE);
-
-  Evas_Object* smart_parent = evas_object_smart_parent_get(parent_view_);
-  if (smart_parent) {
-    // If our parent is a member of some smart object we also want
-    // to join that group.
-    smart_parent_ = smart_parent;
-    evas_object_smart_member_add(content_image_elm_host_, smart_parent);
-  }
-
-  int x, y, width = 0, height = 0;
-  evas_object_geometry_get(parent_view_, &x, &y, &width, &height);
-  if (width == 0 || height == 0)
-    width = height = 1;
-  evas_object_image_size_set(content_image_, width, height);
-  evas_object_geometry_set(content_image_elm_host_, x, y, width, height);
-
-  evas_object_event_callback_add(parent_view_, EVAS_CALLBACK_RESIZE,
-                                 OnParentViewResize, this);
-  evas_object_event_callback_add(content_image_, EVAS_CALLBACK_FOCUS_IN,
-                                 OnFocusIn, this);
-  evas_object_event_callback_add(content_image_, EVAS_CALLBACK_FOCUS_OUT,
-                                 OnFocusOut, this);
-  evas_object_smart_callback_add(content_image_elm_host_, "focused",
-                                 OnHostFocusIn, this);
-  evas_object_smart_callback_add(content_image_elm_host_, "unfocused",
-                                 OnHostFocusOut, this);
-
-  evas_object_event_callback_add(content_image_, EVAS_CALLBACK_MOUSE_DOWN,
-                                 OnMouseDown, this);
-  evas_object_event_callback_add(content_image_, EVAS_CALLBACK_MOUSE_UP,
-                                 OnMouseUp, this);
-  evas_object_event_callback_add(content_image_, EVAS_CALLBACK_MOUSE_MOVE,
-                                 OnMouseMove, this);
-  evas_object_event_callback_add(content_image_, EVAS_CALLBACK_MOUSE_OUT,
-                                 OnMouseOut, this);
-  evas_object_event_callback_add(content_image_, EVAS_CALLBACK_MOUSE_WHEEL,
-                                 OnMouseWheel, this);
-  evas_object_event_callback_add(content_image_, EVAS_CALLBACK_KEY_DOWN,
-                                 OnKeyDown, this);
-  evas_object_event_callback_add(content_image_, EVAS_CALLBACK_KEY_UP, OnKeyUp,
-                                 this);
-
-  evas_object_event_callback_add(content_image_, EVAS_CALLBACK_MULTI_DOWN,
-                                 OnMultiTouchDownEvent, this);
-  evas_object_event_callback_add(content_image_, EVAS_CALLBACK_MULTI_MOVE,
-                                 OnMultiTouchMoveEvent, this);
-  evas_object_event_callback_add(content_image_, EVAS_CALLBACK_MULTI_UP,
-                                 OnMultiTouchUpEvent, this);
-
-#if defined(OS_TIZEN)
-  if (IsMobileProfile() || IsWearableProfile()) {
-    eext_object_event_callback_add(content_image_, EEXT_CALLBACK_BACK,
-                                   OnHWBackEvent, this);
-  }
-#endif
-
-  // IMContext calls evas() getter on 'this' so it needs to be
-  // initialized after evas_ is valid
-  im_context_ = IMContextEfl::Create(this);
-  Init_EvasGL(width, height);
-}
-
-#if defined(NDEBUG)
-#define GL_CHECK_HELPER(code, msg) ((code), false)
-#else
-static GLenum g_gl_err;
-#define GL_CHECK_HELPER(code, msg)                                          \
-  (((void)(code), ((g_gl_err = evas_gl_api_->glGetError()) == GL_NO_ERROR)) \
-       ? false                                                              \
-       : ((LOG(ERROR) << "GL Error: " << g_gl_err << "    " << msg), true))
-#endif
-
-#define GL_CHECK(code) GL_CHECK_HELPER(code, "")
-#define GL_CHECK_STATUS(msg) GL_CHECK_HELPER(1, msg)
-
-RenderWidgetHostViewEfl::~RenderWidgetHostViewEfl() {
-  MakeCurrent();
-  evasgl_delegated_frame_host_.reset();
-  ClearCurrent();
-
-  if (im_context_)
-    delete im_context_;
-
-  evas_object_event_callback_del_full(parent_view_, EVAS_CALLBACK_RESIZE,
-                                      OnParentViewResize, this);
-  evas_object_event_callback_del(content_image_, EVAS_CALLBACK_FOCUS_IN,
-                                 OnFocusIn);
-  evas_object_event_callback_del(content_image_, EVAS_CALLBACK_FOCUS_OUT,
-                                 OnFocusOut);
-  evas_object_smart_callback_del(content_image_elm_host_, "focused",
-                                 OnHostFocusIn);
-  evas_object_smart_callback_del(content_image_elm_host_, "unfocused",
-                                 OnHostFocusOut);
-
-  evas_object_event_callback_del(content_image_, EVAS_CALLBACK_MOUSE_DOWN,
-                                 OnMouseDown);
-  evas_object_event_callback_del(content_image_, EVAS_CALLBACK_MOUSE_UP,
-                                 OnMouseUp);
-  evas_object_event_callback_del(content_image_, EVAS_CALLBACK_MOUSE_MOVE,
-                                 OnMouseMove);
-  evas_object_event_callback_del(content_image_, EVAS_CALLBACK_MOUSE_OUT,
-                                 OnMouseOut);
-  evas_object_event_callback_del(content_image_, EVAS_CALLBACK_MOUSE_WHEEL,
-                                 OnMouseWheel);
-  evas_object_event_callback_del(content_image_, EVAS_CALLBACK_KEY_DOWN,
-                                 OnKeyDown);
-  evas_object_event_callback_del(content_image_, EVAS_CALLBACK_KEY_UP, OnKeyUp);
-
-  evas_object_event_callback_del(content_image_, EVAS_CALLBACK_MULTI_DOWN,
-                                 OnMultiTouchDownEvent);
-  evas_object_event_callback_del(content_image_, EVAS_CALLBACK_MULTI_MOVE,
-                                 OnMultiTouchMoveEvent);
-  evas_object_event_callback_del(content_image_, EVAS_CALLBACK_MULTI_UP,
-                                 OnMultiTouchUpEvent);
-
-  evas_object_del(content_image_elm_host_);
-  content_image_elm_host_ = NULL;
-  content_image_ = NULL;
-  parent_view_ = NULL;
-}
-
-gfx::Point RenderWidgetHostViewEfl::ConvertPointInViewPix(gfx::Point point) {
-  return gfx::ToFlooredPoint(
-      gfx::ScalePoint(gfx::PointF(point), device_scale_factor_));
-}
-
-gfx::Rect RenderWidgetHostViewEfl::GetViewBoundsInPix() const {
-  int x, y, w, h;
-  evas_object_geometry_get(content_image_elm_host_, &x, &y, &w, &h);
-  return gfx::Rect(x, y, w, h);
-}
-
-bool RenderWidgetHostViewEfl::ClearCurrent() {
-  return evas_gl_make_current(evas_gl_, 0, 0);
-}
-
-bool RenderWidgetHostViewEfl::MakeCurrent() {
-  return evas_gl_make_current(evas_gl_, evas_gl_surface_, evas_gl_context_);
-}
-
-void RenderWidgetHostViewEfl::UpdateRotationDegrees(int rotation_degrees) {
-  display::DeviceDisplayInfoEfl display_info;
-  display_info.SetRotationDegrees(rotation_degrees);
-}
-
-Evas_GL_API* RenderWidgetHostViewEfl::GetEvasGLAPI() {
-  return evas_gl_api_;
-}
-
-Evas_GL* RenderWidgetHostViewEfl::GetEvasGL() {
-  return evas_gl_;
-}
-
-void RenderWidgetHostViewEfl::DidReceiveCompositorFrameAck(
-    const viz::LocalSurfaceId& local_surface_id,
-    std::vector<viz::ReturnedResource> resources) {
-  renderer_compositor_frame_sink_->DidReceiveCompositorFrameAck(
-      std::move(resources));
-  if (needs_begin_frames_)
-    host_->ProgressFlingIfNeeded(base::TimeTicks::Now());
-}
-
-void RenderWidgetHostViewEfl::InitializeDeviceDisplayInfo() {
-  static bool initialized = false;
-  if (initialized)
-    return;
-
-  initialized = true;
-
-  int display_width = 0, display_height = 0, dpi = 0;
-  const Ecore_Evas* ee = ecore_evas_ecore_evas_get(evas_);
-  ecore_evas_screen_geometry_get(ee, nullptr, nullptr, &display_width,
-                                 &display_height);
-  ecore_evas_screen_dpi_get(ee, &dpi, nullptr);
-
-  display::DeviceDisplayInfoEfl display_info;
-  display_info.Update(display_width, display_height,
-                      display_info.ComputeDIPScale(dpi),
-                      ecore_evas_rotation_get(ee));
-}
-
-void RenderWidgetHostViewEfl::Invalidate(bool immediate) {
-  if (immediate)
-    evas_render(evas_);
-  else
-    evas_object_image_pixels_dirty_set(content_image_, true);
-}
-
-void RenderWidgetHostViewEfl::SwapBrowserFrame(
-    const viz::LocalSurfaceId& local_surface_id,
-    viz::CompositorFrame frame) {
-  // Swap frame using evasgl delegated frame host.
-  DCHECK(evasgl_delegated_frame_host_);
-  evasgl_delegated_frame_host_->SwapDelegatedFrame(local_surface_id,
-                                                   std::move(frame));
-  web_contents_.GetDelegate()->DidRenderFrame();
-  Invalidate(false);
-}
-
-void RenderWidgetHostViewEfl::ClearBrowserFrame() {
-  DCHECK(evas_gl_api_);
-  GL_CHECK(evas_gl_api_->glClearColor(1.0, 1.0, 1.0, 1.0));
-  GL_CHECK(evas_gl_api_->glClear(GL_COLOR_BUFFER_BIT));
-}
-
-void RenderWidgetHostViewEfl::RenderBrowserFrame() {
-  if (!MakeCurrent()) {
-    LOG(ERROR) << "RenderWidgetHostViewEfl::MakeCurrent() failed. Frame"
-               << "cannot be rendered.";
-    return;
-  }
-
-  // TODO(prashant.n): Check if frame can be cleared only when frame_host
-  // does not render anything.
-  ClearBrowserFrame();
-
-  // Render frame using evasgl delegated frame host.
-  DCHECK(evasgl_delegated_frame_host_);
-  evasgl_delegated_frame_host_->RenderDelegatedFrame(GetViewBoundsInPix());
-
-  ClearCurrent();
-}
-
-void RenderWidgetHostViewEfl::EvasObjectImagePixelsGetCallback(
-    void* data,
-    Evas_Object* obj) {
-  RenderWidgetHostViewEfl* rwhv_efl =
-      reinterpret_cast<RenderWidgetHostViewEfl*>(data);
-  rwhv_efl->RenderBrowserFrame();
-}
-
-void RenderWidgetHostViewEfl::Init_EvasGL(int width, int height) {
-  CHECK(width > 0 && height > 0);
-
-  evas_gl_config_ = evas_gl_config_new();
-  evas_gl_config_->options_bits = (Evas_GL_Options_Bits)(
-      EVAS_GL_OPTIONS_DIRECT | EVAS_GL_OPTIONS_DIRECT_MEMORY_OPTIMIZE |
-      EVAS_GL_OPTIONS_DIRECT_OVERRIDE | EVAS_GL_OPTIONS_CLIENT_SIDE_ROTATION);
-  evas_gl_config_->color_format = EVAS_GL_RGBA_8888;
-  evas_gl_config_->depth_bits = EVAS_GL_DEPTH_BIT_24;
-  evas_gl_config_->stencil_bits = EVAS_GL_STENCIL_BIT_8;
-
-  evas_gl_ = evas_gl_new(evas_);
-  evas_gl_api_ = evas_gl_api_get(evas_gl_);
-  evas_gl_context_ =
-      evas_gl_context_create(evas_gl_, GLSharedContextEfl::GetEvasGLContext());
-  if (!evas_gl_context_)
-    LOG(FATAL) << "Failed to create evas gl context";
-
-  if (width > MAX_SURFACE_WIDTH_EGL)
-    width = MAX_SURFACE_WIDTH_EGL;
-
-  if (height > MAX_SURFACE_HEIGHT_EGL)
-    height = MAX_SURFACE_HEIGHT_EGL;
-
-  CreateNativeSurface(width, height);
-
-  MakeCurrent();
-  ClearBrowserFrame();
-  evasgl_delegated_frame_host_->Initialize();
-  ClearCurrent();
-
-  evas_gl_initialized_ = true;
-}
-
-void RenderWidgetHostViewEfl::CreateNativeSurface(int width, int height) {
-  if (width == 0 || height == 0) {
-    LOG(WARNING) << "Invalid surface size: " << width << "x" << height;
-    return;
-  }
-
-  if (evas_gl_surface_) {
-    evas_object_image_native_surface_set(content_image_, NULL);
-    evas_gl_surface_destroy(evas_gl_, evas_gl_surface_);
-    ClearCurrent();
-  }
-
-  evas_gl_surface_ =
-      evas_gl_surface_create(evas_gl_, evas_gl_config_, width, height);
-  if (!evas_gl_surface_)
-    LOG(FATAL) << "Failed to create evas gl surface";
-
-  Evas_Native_Surface nativeSurface;
-  if (evas_gl_native_surface_get(evas_gl_, evas_gl_surface_, &nativeSurface)) {
-    evas_object_image_native_surface_set(content_image_, &nativeSurface);
-    evas_object_image_pixels_get_callback_set(
-        content_image_, EvasObjectImagePixelsGetCallback, this);
-    evas_object_image_pixels_dirty_set(content_image_, true);
-  } else {
-    LOG(FATAL) << "Failed to get native surface";
-  }
-}
-
-void RenderWidgetHostViewEfl::SetEvasHandler(
-    scoped_refptr<EvasEventHandler> evas_event_handler) {
-  evas_event_handler_ = evas_event_handler;
-}
-
-bool RenderWidgetHostViewEfl::OnMessageReceived(const IPC::Message& message) {
-  bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(RenderWidgetHostViewEfl, message)
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-    IPC_MESSAGE_HANDLER(ViewHostMsg_TextInputInFormStateChanged,
-                        OnTextInputInFormStateChanged)
-    IPC_MESSAGE_HANDLER(ViewHostMsg_SnapshotDataReceived,
-                        OnSnapshotDataReceived)
-#endif
-    IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP()
-  return handled;
-}
-
-void RenderWidgetHostViewEfl::OnFirstSurfaceActivation(
-    const viz::SurfaceInfo& surface_info) {}
-
-void RenderWidgetHostViewEfl::OnFrameTokenChanged(
-    uint32_t frame_token,
-    base::TimeTicks activation_time) {}
-
-bool RenderWidgetHostViewEfl::Send(IPC::Message* message) {
-#if !defined(EWK_BRINGUP)  // FIXME: m94 bringup
-  return host_->Send(message);
-#else
-  return false;
-#endif
-}
-
-void RenderWidgetHostViewEfl::OnSnapshotDataReceived(SkBitmap bitmap,
-                                                     int snapshotId) {
-  Evas_Object* image = NULL;
-  if (!bitmap.empty()) {
-    image = evas_object_image_filled_add(evas_);
-    evas_object_image_size_set(image, bitmap.width(), bitmap.height());
-    evas_object_image_data_copy_set(image, bitmap.getPixels());
-  }
-
-  ScreenshotCapturedCallback* callback =
-      screen_capture_cb_map_.Lookup(snapshotId);
-  if (!callback) {
-    return;
-  }
-  callback->Run(image);
-  screen_capture_cb_map_.Remove(snapshotId);
-}
-
-void RenderWidgetHostViewEfl::InitAsPopup(RenderWidgetHostView*,
-                                          const gfx::Rect&) {
-  NOTIMPLEMENTED();
-}
-
-#if defined(USE_WAYLAND)
-#if TIZEN_VERSION_AT_LEAST(5, 0, 0)
-Ecore_Wl2_Window* RenderWidgetHostViewEfl::GetEcoreWlWindow() const {
-  const Ecore_Evas* ee = ecore_evas_ecore_evas_get(evas_);
-  return ecore_evas_wayland2_window_get(ee);
-}
-#else
-Ecore_Wl_Window* RenderWidgetHostViewEfl::GetEcoreWlWindow() const {
-  const Ecore_Evas* ee = ecore_evas_ecore_evas_get(evas_);
-  return ecore_evas_wayland_window_get(ee);
-}
-#endif  // TIZEN_VERSION_AT_LEAST(5, 0, 0)
-#else
-Ecore_X_Window RenderWidgetHostViewEfl::GetEcoreXWindow() const {
-  const Ecore_Evas* ee = ecore_evas_ecore_evas_get(evas_);
-  return ecore_evas_gl_x11_window_get(ee);
-}
-#endif  // USE_WAYLAND
-
-void RenderWidgetHostViewEfl::SetSize(const gfx::Size& size) {
-  // This is a hack. See WebContentsView::SizeContents
-  int width = std::min(size.width(), EFL_MAX_WIDTH);
-  int height = std::min(size.height(), EFL_MAX_HEIGHT);
-  if (widget_type_ == WidgetType::kPopup) {
-    // We're a popup, honor the size request.
-    Ecore_Evas* ee = ecore_evas_ecore_evas_get(evas_);
-    ecore_evas_resize(ee, width, height);
-  }
-
-  // Update the size of the RWH.
-  // if (requested_size_.width() != width ||
-  //    requested_size_.height() != height) {
-  // Disabled for now, will enable it while implementing InitAsPopUp (P1) API
-  host_->SendScreenRects();
-  host_->SynchronizeVisualProperties();
-  //}
-}
-
-void RenderWidgetHostViewEfl::SetBounds(const gfx::Rect& rect) {}
-
-gfx::NativeView RenderWidgetHostViewEfl::GetNativeView() {
-  return content_image_elm_host_;
-}
-
-gfx::NativeViewId RenderWidgetHostViewEfl::GetNativeViewId() const {
-  DCHECK(evas_gl_initialized_);
-  Ecore_Evas* ee = ecore_evas_ecore_evas_get(evas_);
-  return ecore_evas_window_get(ee);
-}
-
-gfx::NativeViewAccessible RenderWidgetHostViewEfl::GetNativeViewAccessible() {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-bool RenderWidgetHostViewEfl::IsSurfaceAvailableForCopy() {
-  return false;
-}
-
-void RenderWidgetHostViewEfl::EnsureSurfaceSynchronizedForWebTest() {
-  NOTIMPLEMENTED();
-}
-
-const viz::FrameSinkId& RenderWidgetHostViewEfl::GetFrameSinkId() const {
-  return frame_sink_id_;
-}
-
-void RenderWidgetHostViewEfl::UpdateBackgroundColor() {
-  NOTIMPLEMENTED();
-}
-
-void RenderWidgetHostViewEfl::GetScreenInfo(display::ScreenInfo* screen_info) {
-  display::DisplayUtil::GetDefaultScreenInfo(screen_info);
-}
-
-void RenderWidgetHostViewEfl::SetDisplayFeatureForTesting(
-    const DisplayFeature* display_feature) {
-  if (display_feature)
-    display_feature_ = *display_feature;
-  else
-    display_feature_ = absl::nullopt;
-}
-
-absl::optional<DisplayFeature> RenderWidgetHostViewEfl::GetDisplayFeature() {
-  return display_feature_;
-}
-
-void RenderWidgetHostViewEfl::Show() {
-  evas_object_show(content_image_elm_host_);
-  host_->WasShown({} /* record_tab_switch_time_request */);
-}
-
-void RenderWidgetHostViewEfl::Hide() {
-  evas_object_hide(content_image_elm_host_);
-  host_->WasHidden();
-}
-
-bool RenderWidgetHostViewEfl::IsShowing() {
-  return evas_object_visible_get(content_image_);
-}
-
-gfx::Rect RenderWidgetHostViewEfl::GetViewBounds() {
-  return gfx::ToEnclosingRect(
-      gfx::ConvertRectToDips(GetViewBoundsInPix(), device_scale_factor_));
-}
-
-blink::mojom::PointerLockResult RenderWidgetHostViewEfl::LockMouse(
-    bool request_unadjusted_movement) {
-  NOTIMPLEMENTED();
-  return blink::mojom::PointerLockResult::kUnsupportedOptions;
-}
-
-blink::mojom::PointerLockResult RenderWidgetHostViewEfl::ChangeMouseLock(
-    bool request_unadjusted_movement) {
-  NOTIMPLEMENTED();
-  return blink::mojom::PointerLockResult::kUnsupportedOptions;
-}
-
-void RenderWidgetHostViewEfl::UnlockMouse() {
-  NOTIMPLEMENTED();
-}
-
-void RenderWidgetHostViewEfl::Focus() {
-  elm_object_focus_set(content_image_elm_host_, EINA_TRUE);
-  evas_object_focus_set(content_image_, EINA_TRUE);
-}
-
-bool RenderWidgetHostViewEfl::HasFocus() {
-  return evas_object_focus_get(content_image_);
-}
-
-void RenderWidgetHostViewEfl::OnDidHandleKeyEvent(
-    const blink::WebInputEvent* input_event,
-    bool processed) {
-  if (!im_context_)
-    return;
-
-  if (input_event->GetType() == blink::WebInputEvent::Type::kKeyDown)
-    im_context_->HandleKeyEvent(processed);
-}
-
-void RenderWidgetHostViewEfl::UpdateCursor(const WebCursor& webcursor) {
-  if (is_loading_) {
-// Setting native Loading cursor
-#if defined(USE_WAYLAND)
-#if TIZEN_VERSION_AT_LEAST(5, 0, 0)
-    ecore_wl2_window_cursor_from_name_set(GetEcoreWlWindow(), "watch");
-#else
-    ecore_wl_window_cursor_from_name_set(GetEcoreWlWindow(), "watch");
-#endif  // TIZEN_VERSION_AT_LEAST(5, 0, 0)
-#else
-    ecore_x_window_cursor_set(GetEcoreXWindow(),
-                              ecore_x_cursor_shape_get(ECORE_X_CURSOR_CLOCK));
-#endif  // defined(USE_WAYLAND)
-  } else {
-    const ui::Cursor& cursor = webcursor.cursor();
-
-#if defined(USE_WAYLAND)
-#if TIZEN_VERSION_AT_LEAST(5, 0, 0)
-    ecore_wl2_window_cursor_from_name_set(GetEcoreWlWindow(),
-                                          GetCursorName(cursor.type()));
-#else
-    ecore_wl_window_cursor_from_name_set(GetEcoreWlWindow(),
-                                         GetCursorName(cursor.type()));
-#endif  // TIZEN_VERSION_AT_LEAST(5, 0, 0)
-#else
-    int cursor_type = GetCursorType(cursor.type());
-    ecore_x_window_cursor_set(GetEcoreXWindow(),
-                              ecore_x_cursor_shape_get(cursor_type));
-#endif  // defined(USE_WAYLAND)
-  }
-}
-
-void RenderWidgetHostViewEfl::SetIsLoading(bool is_loading) {
-  is_loading_ = is_loading;
-  UpdateCursor(WebCursor());
-  if (disambiguation_popup_)
-    disambiguation_popup_->Dismiss();
-}
-void RenderWidgetHostViewEfl::SetBackgroundColor(SkColor color) {
-  // The renderer will feed its color back to us with the first CompositorFrame.
-  // We short-cut here to show a sensible color before that happens.
-  UpdateBackgroundColorFromRenderer(color);
-
-  DCHECK(SkColorGetA(color) == SK_AlphaOPAQUE ||
-         SkColorGetA(color) == SK_AlphaTRANSPARENT);
-#if !defined(EWK_BRINGUP)  // FIXME: m73 bringup
-  host_->SetBackgroundOpaque(SkColorGetA(color) == SK_AlphaOPAQUE);
-#endif  // EWK_BRINGUP
-}
-
-SkColor RenderWidgetHostViewEfl::background_color() const {
-  return background_color_;
-}
-
-void RenderWidgetHostViewEfl::TakeFallbackContentFrom(
-    RenderWidgetHostView* view) {}
-
-const viz::LocalSurfaceId& RenderWidgetHostViewEfl::GetLocalSurfaceId() const {
-  return viz::ParentLocalSurfaceIdAllocator::InvalidLocalSurfaceId();
-}
-
-viz::SurfaceId RenderWidgetHostViewEfl::GetCurrentSurfaceId() const {
-  return viz::SurfaceId();
-}
-
-void RenderWidgetHostViewEfl::UpdateBackgroundColorFromRenderer(SkColor color) {
-  if (color == background_color())
-    return;
-  background_color_ = color;
-}
-
-void RenderWidgetHostViewEfl::TextInputStateChanged(
-    const ui::mojom::TextInputState& params) {
-  if (!params.show_ime_if_needed) {
-    WebContentsImpl* wci = static_cast<WebContentsImpl*>(&web_contents_);
-    WebContentsViewEfl* wcve = static_cast<WebContentsViewEfl*>(wci->GetView());
-    if (!wcve->UseKeyPadWithoutUserAction())
-      return;
-  } else {  // Prevent scroll and zoom for autofocus'ed elements.
-    ScrollFocusedEditableNode();
-  }
-
-  if (GetSelectionController())
-    GetSelectionController()->OnTextInputStateChanged();
-
-  if (im_context_)
-    im_context_->UpdateInputMethodState(params.type, params.can_compose_inline,
-                                        params.show_ime_if_needed);
-}
-
-void RenderWidgetHostViewEfl::OnTextInputInFormStateChanged(
-    bool is_in_form_tag) {
-  if (im_context_)
-    im_context_->SetIsInFormTag(is_in_form_tag);
-}
-
-void RenderWidgetHostViewEfl::ImeCancelComposition() {
-  if (im_context_)
-    im_context_->CancelComposition();
-}
-
-void RenderWidgetHostViewEfl::ImeCompositionRangeChanged(
-    const gfx::Range& range,
-    const std::vector<gfx::Rect>& character_bounds) {
-  NOTIMPLEMENTED();
-}
-
-void RenderWidgetHostViewEfl::FocusedNodeChanged(
-    bool is_editable_node,
-    const gfx::Rect& node_bounds_in_screen) {
-  if (GetSelectionController())
-    GetSelectionController()->HideHandleAndContextMenu();
-
-  if (im_context_ && im_context_->IsShow() &&
-      ClipboardHelperEfl::GetInstance()->IsClipboardWindowOpened()) {
-    ClipboardHelperEfl::GetInstance()->CloseClipboardWindow();
-  }
-}
-
-void RenderWidgetHostViewEfl::Destroy() {
-  delete this;
-}
-
-void RenderWidgetHostViewEfl::SelectionChanged(const std::u16string& text,
-                                               size_t offset,
-                                               const gfx::Range& range) {
-  RenderWidgetHostViewBase::SelectionChanged(text, offset, range);
-
-  if (!GetSelectionController())
-    return;
-
-  std::u16string selectedText;
-  if (!text.empty() && !range.is_empty())
-    selectedText = GetSelectedText();
-
-  GetSelectionController()->UpdateSelectionData(selectedText);
-}
-
-void RenderWidgetHostViewEfl::DidStopFlinging() {
-  EnsureEdgeEffect().Hide();
-
-  SelectionControllerEfl* controller = GetSelectionController();
-  if (!controller)
-    return;
-
-  // Show selection controls when scrolling with fling gesture ends.
-  controller->SetControlsTemporarilyHidden(false);
-}
-
-void RenderWidgetHostViewEfl::EvasToBlinkCords(int x,
-                                               int y,
-                                               int* view_x,
-                                               int* view_y) {
-  Evas_Coord tmpX, tmpY;
-  evas_object_geometry_get(smart_parent(), &tmpX, &tmpY, NULL, NULL);
-
-  if (view_x) {
-    *view_x = x - tmpX;
-    *view_x /= device_scale_factor_;
-  }
-
-  if (view_y) {
-    *view_y = y - tmpY;
-    *view_y /= device_scale_factor_;
-  }
-}
-
-void RenderWidgetHostViewEfl::SelectClosestWord(const gfx::Point& touch_point) {
-  int view_x, view_y;
-  EvasToBlinkCords(touch_point.x(), touch_point.y(), &view_x, &view_y);
-
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  // FIXME: The SelectClosestWord function was removed by
-  // commit 9720a4494c8bcd24d1f496feec5cfac7582103d2 in s-chromium
-  // It will be fixed by webview team.
-  // FIXME: http://suprem.sec.samsung.net/jira/browse/TWF-2122
-  Send(new ViewMsg_SelectClosestWord(host_->GetRoutingID(), view_x, view_y));
-#endif  // EWK_BRINGUP
-}
-
-void RenderWidgetHostViewEfl::ShowDisambiguationPopup(
-    const gfx::Rect& rect_pixels,
-    const SkBitmap& zoomed_bitmap) {
-  handling_disambiguation_popup_gesture_ = true;
-  if (!disambiguation_popup_)
-    disambiguation_popup_.reset(
-        new DisambiguationPopupEfl(content_image_, this));
-
-  disambiguation_popup_->Show(rect_pixels, zoomed_bitmap);
-}
-
-void RenderWidgetHostViewEfl::DisambiguationPopupDismissed() {
-  handling_disambiguation_popup_gesture_ = false;
-}
-
-void RenderWidgetHostViewEfl::HandleDisambiguationPopupMouseDownEvent(
-    Evas_Event_Mouse_Down* evas_event) {
-  blink::WebGestureEvent tap_down_event = MakeGestureEvent(
-      blink::WebInputEvent::Type::kGestureTapDown, content_image_, evas_event);
-  tap_down_event.data.tap.width = 0;
-  tap_down_event.data.tap.tap_count = 1;
-  SendGestureEvent(tap_down_event);
-}
-
-void RenderWidgetHostViewEfl::HandleDisambiguationPopupMouseUpEvent(
-    Evas_Event_Mouse_Up* evas_event) {
-  blink::WebGestureEvent tap_event = MakeGestureEvent(
-      blink::WebInputEvent::Type::kGestureTap, content_image_, evas_event);
-  tap_event.data.tap.width = 0;
-  tap_event.data.tap.tap_count = 1;
-  SendGestureEvent(tap_event);
-}
-
-bool RenderWidgetHostViewEfl::CanDispatchToConsumer(
-    ui::GestureConsumer* consumer) {
-  return this == consumer;
-}
-
-void RenderWidgetHostViewEfl::DispatchSyntheticTouchEvent(
-    ui::TouchEvent* event) {}
-
-void RenderWidgetHostViewEfl::DispatchGestureEvent(
-    GestureConsumer* raw_input_consumer,
-    ui::GestureEvent* event) {
-  HandleGesture(event);
-}
-
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-void RenderWidgetHostViewEfl::CopyOutputCallback(
-    int request_id,
-    std::unique_ptr<viz::CopyOutputResult> result) {
-  if (!result->HasBitmap())
-    return;
-
-  std::unique_ptr<SkBitmap> snapshot = result->TakeBitmap();
-
-  Evas_Object* image = NULL;
-  if (!snapshot.get()->empty()) {
-    image = evas_object_image_filled_add(evas_);
-    evas_object_image_size_set(image, snapshot.get()->width(),
-                               snapshot.get()->height());
-    evas_object_image_data_copy_set(image, snapshot.get()->getPixels());
-  }
-
-  ScreenshotCapturedCallback* callback =
-      screen_capture_cb_map_->Lookup(request_id);
-
-  if (!callback)
-    return;
-
-  callback->Run(image);
-  screen_capture_cb_map_->Remove(request_id);
-}
-#endif  // !defined(EWK_BRINGUP)
-
-void RenderWidgetHostViewEfl::GetSnapshotAsync(const gfx::Rect& snapshot_area,
-                                               int request_id) {
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  std::unique_ptr<viz::CopyOutputRequest> request =
-      viz::CopyOutputRequest::CreateBitmapRequest(
-          base::BindOnce(&RenderWidgetHostViewEfl::CopyOutputCallback,
-                         weak_factory_.GetWeakPtr(), request_id));
-  request->set_area(snapshot_area);
-#endif  // !defined(EWK_BRINGUP)
-}
-
-bool RenderWidgetHostViewEfl::RequestSnapshotAsync(
-    const Eina_Rectangle rect,
-    Screenshot_Captured_Callback callback,
-    void* user_data) {
-  int width = rect.w;
-  int height = rect.h;
-  int x = rect.x;
-  int y = rect.y;
-
-  int device_x, device_y;
-  int view_x, view_y;
-
-  evas_object_geometry_get(smart_parent(), &device_x, &device_y, NULL, NULL);
-
-  if (width > device_x + GetViewBoundsInPix().width() - rect.x)
-    width = device_x + GetViewBoundsInPix().width() - rect.x;
-  if (height > device_y + GetViewBoundsInPix().height() - rect.y)
-    height = device_y + GetViewBoundsInPix().height() - rect.y;
-
-  EvasToBlinkCords(x, y, &view_x, &view_y);
-
-  width /= device_scale_factor_;
-  height /= device_scale_factor_;
-
-  ScreenshotCapturedCallback* cb =
-      new ScreenshotCapturedCallback(callback, user_data);
-
-  int cbId = screen_capture_cb_map_.Add(base::WrapUnique(cb));
-
-  GetSnapshotAsync(gfx::Rect(view_x, view_y, width, height), cbId);
-  return true;
-}
-
-void RenderWidgetHostViewEfl::SetWantsAnimateOnlyBeginFrames() {}
-
-void RenderWidgetHostViewEfl::SetNeedsBeginFrames(bool needs_begin_frames) {
-  if (needs_begin_frames_ == needs_begin_frames)
-    return;
-
-  needs_begin_frames_ = needs_begin_frames;
-  if (needs_begin_frames_)
-    host_->ProgressFlingIfNeeded(base::TimeTicks::Now());
-}
-
-void RenderWidgetHostViewEfl::DidOverscroll(
-    const ui::DidOverscrollParams& params) {
-  auto* web_contents_impl = static_cast<WebContentsImpl*>(&web_contents_);
-  if (auto* wcve =
-          static_cast<WebContentsViewEfl*>(web_contents_impl->GetView())) {
-    wcve->OnOverscrolled(params.accumulated_overscroll,
-                         params.latest_overscroll_delta);
-  }
-
-  const gfx::Vector2dF& accumulated_overscroll = params.accumulated_overscroll;
-  const gfx::Vector2dF& latest_overscroll_delta =
-      params.latest_overscroll_delta;
-
-  if (!touch_events_enabled_)
-    return;
-
-  if (latest_overscroll_delta.x() < 0 && (int)accumulated_overscroll.x() < 0)
-    EnsureEdgeEffect().Show("edge,left");
-  if (latest_overscroll_delta.x() > 0 && (int)accumulated_overscroll.x() > 0)
-    EnsureEdgeEffect().Show("edge,right");
-  if (latest_overscroll_delta.y() < 0 && (int)accumulated_overscroll.y() < 0)
-    EnsureEdgeEffect().Show("edge,top");
-  if (latest_overscroll_delta.y() > 0 && (int)accumulated_overscroll.y() > 0)
-    EnsureEdgeEffect().Show("edge,bottom");
-}
-
-gfx::Rect RenderWidgetHostViewEfl::GetBoundsInRootWindow() {
-  Ecore_Evas* ee = ecore_evas_ecore_evas_get(evas_);
-  int x, y, w, h;
-  ecore_evas_geometry_get(ee, &x, &y, &w, &h);
-  if (current_orientation_ == 90 || current_orientation_ == 270)
-    return gfx::ToEnclosingRect(
-        gfx::ConvertRectToDips(gfx::Rect(x, y, h, w), device_scale_factor_));
-  return gfx::ToEnclosingRect(
-      gfx::ConvertRectToDips(gfx::Rect(x, y, w, h), device_scale_factor_));
-}
-
-void RenderWidgetHostViewEfl::RenderProcessGone() {
-  Destroy();
-}
-
-void RenderWidgetHostViewEfl::OnParentViewResize(void* data,
-                                                 Evas*,
-                                                 Evas_Object* obj,
-                                                 void*) {
-  RenderWidgetHostViewEfl* thiz = static_cast<RenderWidgetHostViewEfl*>(data);
-  int x, y, width, height;
-  evas_object_geometry_get(obj, &x, &y, &width, &height);
-  evas_object_geometry_set(thiz->content_image_elm_host_, x, y, width, height);
-  evas_object_image_size_set(thiz->content_image_, width, height);
-  thiz->CreateNativeSurface(width, height);
-  thiz->host_->SynchronizeVisualProperties();
-}
-
-void RenderWidgetHostViewEfl::OnFocusIn(void* data,
-                                        Evas*,
-                                        Evas_Object*,
-                                        void*) {
-  RenderWidgetHostViewEfl* thiz = static_cast<RenderWidgetHostViewEfl*>(data);
-  if (thiz->evas_event_handler_.get())
-    if (thiz->evas_event_handler_->HandleEvent_FocusIn())
-      return;
-
-  thiz->host_->SetActive(true);
-  thiz->host_->GotFocus();
-  thiz->host_->WasShown({} /* record_tab_switch_time_request */);
-
-  Eina_Bool r = EINA_TRUE;
-  r &= evas_object_key_grab(thiz->content_image_, "Left", 0, 0, EINA_TRUE);
-  r &= evas_object_key_grab(thiz->content_image_, "Right", 0, 0, EINA_TRUE);
-  r &= evas_object_key_grab(thiz->content_image_, "Up", 0, 0, EINA_TRUE);
-  r &= evas_object_key_grab(thiz->content_image_, "Down", 0, 0, EINA_TRUE);
-  DCHECK(r) << "Failed to grab arrow keys!";
-}
-
-void RenderWidgetHostViewEfl::OnFocusOut(void* data,
-                                         Evas*,
-                                         Evas_Object*,
-                                         void*) {
-  RenderWidgetHostViewEfl* thiz = static_cast<RenderWidgetHostViewEfl*>(data);
-  if (thiz->evas_event_handler_.get())
-    if (thiz->evas_event_handler_->HandleEvent_FocusOut())
-      return;
-
-  thiz->host_->SetActive(false);
-  thiz->host_->LostCapture();
-  thiz->host_->Blur();
-
-  evas_object_key_ungrab(thiz->content_image_, "Left", 0, 0);
-  evas_object_key_ungrab(thiz->content_image_, "Right", 0, 0);
-  evas_object_key_ungrab(thiz->content_image_, "Up", 0, 0);
-  evas_object_key_ungrab(thiz->content_image_, "Down", 0, 0);
-}
-
-void RenderWidgetHostViewEfl::OnHostFocusIn(void* data, Evas_Object*, void*) {
-  RenderWidgetHostViewEfl* thiz = static_cast<RenderWidgetHostViewEfl*>(data);
-  thiz->Focus();
-}
-
-void RenderWidgetHostViewEfl::OnHostFocusOut(void* data, Evas_Object*, void*) {
-  RenderWidgetHostViewEfl* thiz = static_cast<RenderWidgetHostViewEfl*>(data);
-  thiz->host_->Blur();
-}
-
-void RenderWidgetHostViewEfl::OnMouseDown(void* data,
-                                          Evas* evas,
-                                          Evas_Object* obj,
-                                          void* event_info) {
-  RenderWidgetHostViewEfl* rwhv = static_cast<RenderWidgetHostViewEfl*>(data);
-  if (rwhv->evas_event_handler_.get())
-    if (rwhv->evas_event_handler_->HandleEvent_MouseDown(
-            static_cast<Evas_Event_Mouse_Down*>(event_info)))
-      return;
-
-  rwhv->Focus();
-
-  if (!rwhv->touch_events_enabled_) {
-    blink::WebMouseEvent event =
-        MakeWebMouseEvent(blink::WebInputEvent::Type::kMouseDown, obj,
-                          static_cast<Evas_Event_Mouse_Down*>(event_info));
-    rwhv->host_->ForwardMouseEvent(event);
-  } else {
-    rwhv->ProcessTouchEvents(
-        static_cast<Evas_Event_Mouse_Down*>(event_info)->timestamp);
-  }
-}
-
-void RenderWidgetHostViewEfl::OnMouseUp(void* data,
-                                        Evas* evas,
-                                        Evas_Object* obj,
-                                        void* event_info) {
-  RenderWidgetHostViewEfl* rwhv = static_cast<RenderWidgetHostViewEfl*>(data);
-  if (rwhv->evas_event_handler_.get())
-    if (rwhv->evas_event_handler_->HandleEvent_MouseUp(
-            static_cast<Evas_Event_Mouse_Up*>(event_info)))
-      return;
-
-  if (!rwhv->touch_events_enabled_) {
-    blink::WebMouseEvent event =
-        MakeWebMouseEvent(blink::WebInputEvent::Type::kMouseUp, obj,
-                          static_cast<Evas_Event_Mouse_Up*>(event_info));
-    rwhv->host_->ForwardMouseEvent(event);
-  } else {
-    rwhv->ProcessTouchEvents(
-        static_cast<Evas_Event_Mouse_Up*>(event_info)->timestamp);
-  }
-}
-
-void RenderWidgetHostViewEfl::OnMouseMove(void* data,
-                                          Evas* evas,
-                                          Evas_Object* obj,
-                                          void* event_info) {
-  RenderWidgetHostViewEfl* rwhv = static_cast<RenderWidgetHostViewEfl*>(data);
-  if (rwhv->evas_event_handler_.get())
-    if (rwhv->evas_event_handler_->HandleEvent_MouseMove(
-            static_cast<Evas_Event_Mouse_Move*>(event_info)))
-      return;
-
-  if (!rwhv->touch_events_enabled_) {
-    blink::WebMouseEvent event =
-        MakeWebMouseEvent(obj, static_cast<Evas_Event_Mouse_Move*>(event_info));
-    rwhv->host_->ForwardMouseEvent(event);
-  } else {
-    rwhv->ProcessTouchEvents(
-        static_cast<Evas_Event_Mouse_Move*>(event_info)->timestamp);
-  }
-}
-
-void RenderWidgetHostViewEfl::OnMouseOut(void* data,
-                                         Evas* evas,
-                                         Evas_Object* obj,
-                                         void* event_info) {
-  RenderWidgetHostViewEfl* rwhv = static_cast<RenderWidgetHostViewEfl*>(data);
-  blink::WebMouseEvent event =
-      MakeWebMouseEvent(obj, static_cast<Evas_Event_Mouse_Out*>(event_info));
-  rwhv->host_->ForwardMouseEvent(event);
-}
-
-void RenderWidgetHostViewEfl::OnMultiTouchDownEvent(void* data,
-                                                    Evas* evas,
-                                                    Evas_Object* obj,
-                                                    void* event_info) {
-  RenderWidgetHostViewEfl* rwhv = static_cast<RenderWidgetHostViewEfl*>(data);
-  CHECK(rwhv->touch_events_enabled_);
-  rwhv->ProcessTouchEvents(
-      static_cast<Evas_Event_Multi_Down*>(event_info)->timestamp, true);
-}
-
-void RenderWidgetHostViewEfl::OnMultiTouchMoveEvent(void* data,
-                                                    Evas* evas,
-                                                    Evas_Object* obj,
-                                                    void* event_info) {
-  RenderWidgetHostViewEfl* rwhv = static_cast<RenderWidgetHostViewEfl*>(data);
-  CHECK(rwhv->touch_events_enabled_);
-  rwhv->ProcessTouchEvents(
-      static_cast<Evas_Event_Multi_Move*>(event_info)->timestamp, true);
-}
-
-void RenderWidgetHostViewEfl::OnMultiTouchUpEvent(void* data,
-                                                  Evas* evas,
-                                                  Evas_Object* obj,
-                                                  void* event_info) {
-  RenderWidgetHostViewEfl* rwhv = static_cast<RenderWidgetHostViewEfl*>(data);
-  CHECK(rwhv->touch_events_enabled_);
-  rwhv->ProcessTouchEvents(
-      static_cast<Evas_Event_Multi_Up*>(event_info)->timestamp, true);
-}
-
-void RenderWidgetHostViewEfl::OnKeyDown(void* data,
-                                        Evas* evas,
-                                        Evas_Object* obj,
-                                        void* event_info) {
-  if (!event_info)
-    return;
-
-  RenderWidgetHostViewEfl* rwhv = static_cast<RenderWidgetHostViewEfl*>(data);
-  if (rwhv->evas_event_handler_.get())
-    if (rwhv->evas_event_handler_->HandleEvent_KeyDown(
-            static_cast<Evas_Event_Key_Down*>(event_info)))
-      return;
-
-  // When upper case letter is entered there are two events
-  // Shift + letter key
-  // Do not forward shift key to prevent shift keydown event.
-  if (IsShiftKey(static_cast<Evas_Event_Key_Down*>(event_info)->key))
-    return;
-
-  NativeWebKeyboardEvent n_event =
-      MakeWebKeyboardEvent(true, static_cast<Evas_Event_Key_Down*>(event_info));
-
-  if (!rwhv->im_context_) {
-    rwhv->host_->ForwardKeyboardEvent(n_event);
-    return;
-  }
-
-  // Do not forward keyevent now if there is fake key event
-  // handling at the moment to preserve orders of events as in Webkit
-  if (rwhv->im_context_->IsPreeditQueueEmpty() ||
-      rwhv->im_context_->IsKeyUpQueueEmpty()) {
-    rwhv->host_->ForwardKeyboardEvent(n_event);
-    rwhv->im_context_->PushToKeyUpEventQueue(n_event.windows_key_code);
-    return;
-  }
-
-  rwhv->im_context_->PushToKeyDownEventQueue(n_event);
-  rwhv->im_context_->PushToKeyUpEventQueue(n_event.windows_key_code);
-}
-
-void RenderWidgetHostViewEfl::OnKeyUp(void* data,
-                                      Evas* evas,
-                                      Evas_Object* obj,
-                                      void* event_info) {
-  if (!event_info)
-    return;
-
-  RenderWidgetHostViewEfl* rwhv = static_cast<RenderWidgetHostViewEfl*>(data);
-  if (rwhv->evas_event_handler_.get())
-    if (rwhv->evas_event_handler_->HandleEvent_KeyUp(
-            static_cast<Evas_Event_Key_Up*>(event_info)))
-      return;
-
-  // When upper case letter is entered there are two events
-  // Shift + letter key
-  // Do not forward shift key to prevent shift keyup event.
-  if (IsShiftKey(static_cast<Evas_Event_Key_Up*>(event_info)->key))
-    return;
-
-  rwhv->host_->ForwardKeyboardEvent(
-      MakeWebKeyboardEvent(false, static_cast<Evas_Event_Key_Up*>(event_info)));
-}
-
-#if defined(OS_TIZEN)
-void RenderWidgetHostViewEfl::OnHWBackEvent(void* data,
-                                            Evas_Object* obj,
-                                            void* event_info) {
-  if (IsMobileProfile() || IsWearableProfile()) {
-    RenderWidgetHostViewEfl* rwhv = static_cast<RenderWidgetHostViewEfl*>(data);
-    rwhv->evas_event_handler_->HandleEvent_HWBack();
-  }
-}
-#endif
-
-void RenderWidgetHostViewEfl::OnMouseWheel(void* data,
-                                           Evas* evas,
-                                           Evas_Object* obj,
-                                           void* event_info) {
-  RenderWidgetHostViewEfl* rwhv = static_cast<RenderWidgetHostViewEfl*>(data);
-  if (rwhv->evas_event_handler_.get())
-    if (rwhv->evas_event_handler_->HandleEvent_MouseWheel(
-            static_cast<Evas_Event_Mouse_Wheel*>(event_info)))
-      return;
-
-  if (!rwhv->touch_events_enabled_) {
-    blink::WebMouseWheelEvent event = MakeWebMouseEvent(
-        obj, static_cast<Evas_Event_Mouse_Wheel*>(event_info));
-    rwhv->host_->ForwardWheelEvent(event);
-  }
-}
-
-void RenderWidgetHostViewEfl::ProcessTouchEvents(unsigned int timestamp,
-                                                 bool is_multi_touch) {
-  // These constants are used to map multi touch's touch id(s).
-  // The poorly-written Tizen API document says:
-  //  "0 for Mouse Event and device id for Multi Event."
-  //  "The point which comes from Mouse Event has id 0 and"
-  //  "The point which comes from Multi Event has id that is same as Multi
-  //  Event's device id."
-  // This constant is to map touch id 0 to 0, or [0] -> [0]
-  static const int kMultiTouchIDMapPart0SingleIndex = 0;
-  // This constant is to map [13, 23] -> [1, 11]
-  static const int kMultiTouchIDMapPart1StartIndex = 13;
-  // This constant is to map [13, 23] -> [1, 11]
-  static const int kMultiTouchIDMapPart1EndIndex = 23;
-  // 13 - 1 = 12, 23 - 11 = 12
-  static const int kMultiTouchIDMapPart1DiffValue = 12;
-
-  unsigned count = evas_touch_point_list_count(evas_);
-  if (!count) {
-    return;
-  }
-
-  int id;
-  Evas_Coord_Point pt;
-  Evas_Touch_Point_State state;
-  for (unsigned i = 0; i < count; ++i) {
-    // evas_touch_point_list_nth_id_get returns [0] or [13, )
-    // Multi touch's touch id [[0], [13, 23]] should be mapped to [[0], [1, 11]]
-    // Internet Blame URL:
-    //   https://groups.google.com/d/msg/mailing-enlightenment-devel/-R-ezCzpkTk/HJ0KBCdz6CgJ
-    id = evas_touch_point_list_nth_id_get(evas_, i);
-    if ((id == 0 && is_multi_touch) || (id == 1 && !is_multi_touch))
-      continue;
-
-    DCHECK(id == kMultiTouchIDMapPart0SingleIndex ||
-           id >= kMultiTouchIDMapPart1StartIndex);
-
-    if (id >= kMultiTouchIDMapPart1StartIndex &&
-        id <= kMultiTouchIDMapPart1EndIndex) {
-      id -= kMultiTouchIDMapPart1DiffValue;
-    } else if (id > kMultiTouchIDMapPart1EndIndex) {
-      LOG(WARNING) << "evas_touch_point_list_nth_id_get() returned a value "
-                      "greater than ("
-                   << kMultiTouchIDMapPart1EndIndex << ").";
-    }
-    evas_touch_point_list_nth_xy_get(evas_, i, &pt.x, &pt.y);
-    state = evas_touch_point_list_nth_state_get(evas_, i);
-
-    ui::TouchEvent touch_event =
-        MakeTouchEvent(pt, state, id, content_image_, timestamp);
-    if (event_resampler_->HandleTouchEvent(touch_event))
-      continue;
-
-    HandleTouchEvent(&touch_event);
-  }
-}
-
-void RenderWidgetHostViewEfl::SetDoubleTapSupportEnabled(bool enabled) {
-  ui::GestureRecognizerImplEfl* gesture_recognizer_efl =
-      static_cast<ui::GestureRecognizerImplEfl*>(gesture_recognizer_.get());
-  DCHECK(gesture_recognizer_efl);
-  ui::GestureProviderAura* gesture_provider_aura =
-      gesture_recognizer_efl->GetGestureProviderForConsumer(this);
-  gesture_provider_aura->filtered_gesture_provider_
-      .SetDoubleTapSupportForPlatformEnabled(enabled);
-}
-
-void RenderWidgetHostViewEfl::SetTouchEventsEnabled(bool enabled) {
-  if (enabled == touch_events_enabled_)
-    return;
-
-  touch_events_enabled_ = enabled;
-  SetDoubleTapSupportEnabled(enabled);
-
-  if (enabled) {
-    selection_controller_.reset(
-        new SelectionControllerEfl(smart_parent_, web_contents_));
-  } else {
-    selection_controller_.reset();
-  }
-}
-
-void RenderWidgetHostViewEfl::set_magnifier(bool status) {
-  magnifier_ = status;
-}
-
-ui::LatencyInfo CreateLatencyInfo(const blink::WebInputEvent& event) {
-  if (!event.TimeStamp().since_origin().InMicroseconds())
-    return ui::LatencyInfo();
-
-  // The latency number should only be added if the timestamp is valid.
-  ui::LatencyInfo latency_info;
-  const int64_t time_micros = event.TimeStamp().since_origin().InMicroseconds();
-  latency_info.AddLatencyNumberWithTimestamp(
-      ui::INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT,
-      base::TimeTicks() + base::TimeDelta::FromMicroseconds(time_micros));
-  return latency_info;
-}
-
-void RenderWidgetHostViewEfl::SendGestureEvent(blink::WebGestureEvent& event) {
-  HandleGesture(event);
-  blink::WebInputEvent::Type event_type = event.GetType();
-  if ((magnifier_ && event_type ==
-      blink::WebInputEvent::Type::kGestureScrollUpdate) ||
-      event_resampler_->HandleGestureEvent(event))
-    return;
-
-  if (host_ && event_type != blink::WebInputEvent::Type::kUndefined)
-    host_->ForwardGestureEventWithLatencyInfo(event, CreateLatencyInfo(event));
-}
-
-void RenderWidgetHostViewEfl::HandleGestureBegin() {
-  EnsureEdgeEffect().Enable();
-}
-
-void RenderWidgetHostViewEfl::HandleGestureEnd() {
-  // Edge effect should be disabled upon scroll end/fling start.
-  // Gesture end comes just after those events, so it's disabled here.
-  EnsureEdgeEffect().Disable();
-}
-
-void RenderWidgetHostViewEfl::HandleGesture(blink::WebGestureEvent& event) {
-  SelectionControllerEfl* controller = GetSelectionController();
-  if (controller)
-    controller->HandleGesture(event);
-
-  blink::WebInputEvent::Type event_type = event.GetType();
-  if (event_type == blink::WebInputEvent::Type::kGestureDoubleTap ||
-      event_type == blink::WebInputEvent::Type::kGesturePinchBegin ||
-      event_type == blink::WebInputEvent::Type::kGesturePinchEnd) {
-    WebContentsImpl* wci = static_cast<WebContentsImpl*>(&web_contents_);
-    WebContentsViewEfl* wcve = static_cast<WebContentsViewEfl*>(wci->GetView());
-    wcve->HandleZoomGesture(event);
-  }
-
-  if ((event_type == blink::WebInputEvent::Type::kGestureTap ||
-       event_type == blink::WebInputEvent::Type::kGestureTapCancel) &&
-      !handling_disambiguation_popup_gesture_) {
-    float size = 32.0f;  // Default value
-
-#if defined(OS_TIZEN)
-    if (IsMobileProfile() || IsWearableProfile()) {
-      size = elm_config_finger_size_get() / device_scale_factor_;
-    }
-#endif
-
-    event.data.tap.width = size;
-    event.data.tap.height = size;
-  }
-
-  if (event_type == blink::WebInputEvent::Type::kGestureTapDown) {
-    // Webkit does not stop a fling-scroll on tap-down. So explicitly send an
-    // event to stop any in-progress flings.
-    blink::WebGestureEvent fling_cancel = event;
-    fling_cancel.SetType(blink::WebInputEvent::Type::kGestureFlingCancel);
-    fling_cancel.SetSourceDevice(blink::WebGestureDevice::kTouchscreen);
-    SendGestureEvent(fling_cancel);
-  } else if (event_type == blink::WebInputEvent::Type::kGestureScrollUpdate) {
-    if (event.data.scroll_update.delta_x < 0)
-      EnsureEdgeEffect().Hide("edge,left");
-    else if (event.data.scroll_update.delta_x > 0)
-      EnsureEdgeEffect().Hide("edge,right");
-    if (event.data.scroll_update.delta_y < 0)
-      EnsureEdgeEffect().Hide("edge,top");
-    else if (event.data.scroll_update.delta_y > 0)
-      EnsureEdgeEffect().Hide("edge,bottom");
-  } else if (event_type == blink::WebInputEvent::Type::kGesturePinchBegin) {
-    EnsureEdgeEffect().Disable();
-  } else if (event_type == blink::WebInputEvent::Type::kGesturePinchEnd) {
-    EnsureEdgeEffect().Enable();
-  }
-}
-
-void RenderWidgetHostViewEfl::HandleGesture(ui::GestureEvent* event) {
-  if (event->type() == ui::ET_GESTURE_BEGIN)
-    HandleGestureBegin();
-  else if (event->type() == ui::ET_GESTURE_END)
-    HandleGestureEnd();
-
-  blink::WebGestureEvent gesture_event = MakeWebGestureEventFromUIEvent(*event);
-  gesture_event.SetPositionInWidget(event->location_f());
-  gesture_event.SetPositionInScreen(event->root_location_f());
-  SendGestureEvent(gesture_event);
-
-  event->SetHandled();
-}
-
-// Based on render_widget_host_view_aura.cc::OnTouchEvent
-void RenderWidgetHostViewEfl::HandleTouchEvent(ui::TouchEvent* event) {
-  if (!gesture_recognizer_->ProcessTouchEventPreDispatch(event, this)) {
-    event->StopPropagation();
-    return;
-  }
-
-  // Update the touch event first.
-  if (!pointer_state_.OnTouch(*event)) {
-    event->StopPropagation();
-    return;
-  }
-
-  blink::WebTouchEvent touch_event = ui::CreateWebTouchEventFromMotionEvent(
-      pointer_state_, event->may_cause_scrolling(), event->hovering());
-  pointer_state_.CleanupRemovedTouchPoints(*event);
-
-  event->StopPropagation();
-  host_->ForwardTouchEventWithLatencyInfo(touch_event, *event->latency());
-}
-
-void RenderWidgetHostViewEfl::ProcessAckedTouchEvent(
-    const TouchEventWithLatencyInfo& touch,
-    blink::mojom::InputEventResultState ack_result) {
-  ui::EventResult result =
-      (ack_result == blink::mojom::InputEventResultState::kConsumed)
-          ? ui::ER_HANDLED
-          : ui::ER_UNHANDLED;
-  ui::GestureRecognizer::Gestures gestures = gesture_recognizer_->AckTouchEvent(
-      touch.event.unique_touch_event_id, result,
-      false /* is_source_touch_event_set_non_blocking */, this);
-  for (const auto& event : gestures)
-    HandleGesture(event.get());
-}
-
-std::unique_ptr<SyntheticGestureTarget>
-RenderWidgetHostViewEfl::CreateSyntheticGestureTarget() {
-  NOTIMPLEMENTED();
-  return nullptr;
-}
-
-void RenderWidgetHostViewEfl::ForwardTouchEvent(ui::TouchEvent* event) {
-  HandleTouchEvent(event);
-}
-
-void RenderWidgetHostViewEfl::ForwardGestureEvent(
-    blink::WebGestureEvent event) {
-  if (host_ && event.GetType() != blink::WebInputEvent::Type::kUndefined)
-    host_->ForwardGestureEventWithLatencyInfo(event, CreateLatencyInfo(event));
-}
-
-unsigned RenderWidgetHostViewEfl::TouchPointCount() const {
-  return PointerStatePointerCount();
-}
-
-EdgeEffect& RenderWidgetHostViewEfl::EnsureEdgeEffect() {
-  if (!edge_effect_)
-    edge_effect_ = base::WrapUnique(new EdgeEffect(content_image_elm_host_));
-
-  return *edge_effect_.get();
-}
-
-void RenderWidgetHostViewEfl::OnOrientationChangeEvent(int orientation) {
-  current_orientation_ = orientation;
-}
-
-void RenderWidgetHostViewEfl::MoveCaret(const gfx::Point& point) {
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  host_->MoveCaret(gfx::Point(point.x() / device_scale_factor_,
-                              point.y() / device_scale_factor_));
-#endif  // !defined(EWK_BRINGUP)
-}
-
-void RenderWidgetHostViewEfl::SetComposition(
-    const ui::CompositionText& composition_text) {
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  const std::vector<blink::WebCompositionUnderline>& underlines =
-      reinterpret_cast<const std::vector<blink::WebCompositionUnderline>&>(
-          composition_text.underlines);
-
-  host_->ImeSetComposition(
-      composition_text.text, underlines, gfx::Range::InvalidRange(),
-      composition_text.selection.start(), composition_text.selection.end());
-#endif  // !defined(EWK_BRINGUP)
-}
-
-void RenderWidgetHostViewEfl::ConfirmComposition(std::u16string& text) {
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  // FIXME: EWK_BRINGUP definition should be removed.
-  //            ImeConfirmComposition was removed
-  host_->ImeConfirmComposition(text, gfx::Range::InvalidRange(), false);
-#endif  // !defined(EWK_BRINGUP)
-}
-
-void RenderWidgetHostViewEfl::DidCreateNewRendererCompositorFrameSink(
-    viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink) {
-  renderer_compositor_frame_sink_ = renderer_compositor_frame_sink;
-}
-
-void RenderWidgetHostViewEfl::SubmitCompositorFrame(
-    const viz::LocalSurfaceId& local_surface_id,
-    viz::CompositorFrame frame,
-    absl::optional<viz::HitTestRegionList> hit_test_region_list) {
-  last_scroll_offset_ = frame.metadata.root_scroll_offset;
-  if (GetSelectionController()) {
-#if !defined(EWK_BRINGUP)
-    GetSelectionController()->SetSelectionEditable(
-        frame.metadata.selection.is_editable);
-    GetSelectionController()->SetSelectionEmpty(
-        frame.metadata.selection.is_empty_text_form_control);
-    GetSelectionController()->OnSelectionChanged(frame.metadata.selection.start,
-                                                 frame.metadata.selection.end);
-#endif
-  }
-
-  SwapBrowserFrame(local_surface_id, std::move(frame));
-}
-
-void RenderWidgetHostViewEfl::ClearCompositorFrame() {}
-
-void RenderWidgetHostViewEfl::ResetFallbackToFirstNavigationSurface() {}
-
-void RenderWidgetHostViewEfl::ScrollFocusedEditableNode() {
-  // If long-pressing, do not perform zoom to focused element.
-  if (GetSelectionController() && !GetSelectionController()->GetLongPressed()) {
-// The empty rect is ignored by WebViewImpl::scrollFocusedNodeIntoRect().
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-    host_->ScrollFocusedEditableNodeIntoRect(gfx::Rect());
-#endif  // !defined(EWK_BRINGUP)
-  }
-}
-
-bool RenderWidgetHostViewEfl::IsLastAvailableTextEmpty() const {
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  return RenderWidgetHostViewBase::selection_text_.empty();
-#else
-  return false;
-#endif
-}
-
-bool RenderWidgetHostViewEfl::IsIMEShow() const {
-  if (im_context_)
-    return im_context_->IsShow();
-
-  return false;
-}
-
-gfx::Rect RenderWidgetHostViewEfl::GetIMERect() const {
-  if (im_context_)
-    return im_context_->GetIMERect();
-
-  return gfx::Rect();
-}
-
-}  // namespace content
diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h b/tizen_src/chromium_impl/content/browser/renderer_host/render_widget_host_view_efl.h
deleted file mode 100644 (file)
index fdbd287..0000000
+++ /dev/null
@@ -1,392 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef RENDER_WIDGET_HOST_VIEW_EFL
-#define RENDER_WIDGET_HOST_VIEW_EFL
-
-#include <Ecore_Evas.h>
-#include <Ecore_IMF_Evas.h>
-#include <Evas.h>
-#include <Evas_GL.h>
-
-#include "base/containers/id_map.h"
-#include "base/format_macros.h"
-#include "chromium_impl/build/tizen_version.h"
-#include "components/viz/common/frame_sinks/copy_output_request.h"
-#include "components/viz/common/frame_sinks/copy_output_result.h"
-#include "components/viz/common/quads/compositor_frame.h"
-#include "components/viz/host/host_frame_sink_client.h"
-#include "content/browser/accessibility/browser_accessibility_manager.h"
-#include "content/browser/compositor/evasgl_delegated_frame_host.h"
-#include "content/browser/renderer_host/evas_event_handler.h"
-#include "content/browser/renderer_host/event_resampler.h"
-#include "content/browser/renderer_host/render_widget_host_view_base.h"
-#include "content/browser/selection/selection_controller_efl.h"
-#include "content/browser/web_contents/web_contents_impl.h"
-#include "content/browser/web_contents/web_contents_view_efl.h"
-#include "content/common/content_export.h"
-#include "ipc/ipc_sender.h"
-#include "ui/base/ime/composition_text.h"
-#include "ui/base/ime/text_input_client.h"
-#include "ui/events/gestures/gesture_recognizer.h"
-#include "ui/events/gestures/gesture_types.h"
-#include "ui/events/gestures/motion_event_aura.h"
-
-// Before, it was separated by EVAS_GL_API_VERSION and each value was;
-// TV/DESKTOP = 1, MOBILE/WEARABLE = 4
-
-// After Desktop build EFL upversion to 1.18,
-// EVAS_GL_API_VERSION of DESKTOP is 5 and
-// it would be more legible to seperate by profiles.
-#if defined(OS_TIZEN)
-typedef EvasGLint64 GLint64;
-typedef EvasGLuint64 GLuint64;
-#else
-typedef struct __GLsync* GLsync;
-#endif
-
-namespace ui {
-class GestureEvent;
-class TouchEvent;
-struct DidOverscrollParams;
-}  // namespace ui
-
-namespace blink {
-struct WebScreenInfo;
-}
-
-namespace content {
-
-typedef void (*Screenshot_Captured_Callback)(Evas_Object* image,
-                                             void* user_data);
-
-class DisambiguationPopupEfl;
-class EdgeEffect;
-class IMContextEfl;
-class RenderWidgetHostImpl;
-class RenderWidgetHostView;
-class WebContents;
-class ScreenshotCapturedCallback;
-struct TextInputState;
-
-// RenderWidgetHostView class hierarchy described in render_widget_host_view.h.
-class CONTENT_EXPORT RenderWidgetHostViewEfl
-    : public RenderWidgetHostViewBase,
-      public EvasGLDelegatedFrameHostClient,
-      public EventResamplerClient,
-      public ui::GestureConsumer,
-      public ui::GestureEventHelper,
-      public base::SupportsWeakPtr<RenderWidgetHostViewEfl>,
-      public viz::HostFrameSinkClient,
-      public IPC::Sender {
- public:
-  explicit RenderWidgetHostViewEfl(RenderWidgetHost*,
-                                   WebContents& web_contents);
-
-  // RenderWidgetHostViewBase implementation.
-  void InitAsChild(gfx::NativeView) override;
-  void InitAsPopup(RenderWidgetHostView*, const gfx::Rect&) override;
-  void SetSize(const gfx::Size&) override;
-  void SetBounds(const gfx::Rect&) override;
-  gfx::NativeView GetNativeView() override;
-  gfx::NativeViewAccessible GetNativeViewAccessible() override;
-  bool IsSurfaceAvailableForCopy() override;
-  void EnsureSurfaceSynchronizedForWebTest() override;
-  void Show() override;
-  void Hide() override;
-  bool IsShowing() override;
-  gfx::Rect GetViewBounds() override;
-  blink::mojom::PointerLockResult LockMouse(
-      bool request_unadjusted_movement) override;
-  blink::mojom::PointerLockResult ChangeMouseLock(
-      bool request_unadjusted_movement) override;
-  void UnlockMouse() override;
-  void Focus() override;
-  bool HasFocus() override;
-  void UpdateCursor(const WebCursor&) override;
-  void SetIsLoading(bool) override;
-  void SetBackgroundColor(SkColor color) override;
-  SkColor background_color() const;
-  void TakeFallbackContentFrom(RenderWidgetHostView* view) override;
-  const viz::LocalSurfaceId& GetLocalSurfaceId() const override;
-  viz::SurfaceId GetCurrentSurfaceId() const override;
-  const viz::FrameSinkId& GetFrameSinkId() const override;
-  void UpdateBackgroundColor() override;
-  absl::optional<DisplayFeature> GetDisplayFeature() override;
-  void SetDisplayFeatureForTesting(
-      const DisplayFeature* display_feature) override;
-  void GetScreenInfo(display::ScreenInfo* screen_info) override;
-
-  void UpdateBackgroundColorFromRenderer(SkColor color);
-
-  // [M51_2704] TextInputStateChanged() should be removed and its functionality
-  //            should be moved/implemented in appropriate place based on
-  //            upstream commit : https://codereview.chromium.org/1652483002,
-  //            as it may introduce regression.
-  // Updates the state of the input method attached to the view.
-  void TextInputStateChanged(const ui::mojom::TextInputState& params) override;
-
-  void OnTextInputInFormStateChanged(bool is_in_form_tag);
-
-  void ImeCancelComposition() override;
-  void ImeCompositionRangeChanged(const gfx::Range&,
-                                  const std::vector<gfx::Rect>&) override;
-  void FocusedNodeChanged(bool is_editable_node,
-                          const gfx::Rect& node_bounds_in_screen) override;
-
-  void Destroy() override;
-  void SelectionChanged(const std::u16string&,
-                        size_t,
-                        const gfx::Range&) override;
-  void SetWantsAnimateOnlyBeginFrames();
-  void SetNeedsBeginFrames(bool needs_begin_frames) override;
-  void DidOverscroll(const ui::DidOverscrollParams& params) override;
-  gfx::Rect GetBoundsInRootWindow() override;
-  void RenderProcessGone() override;
-  bool OnMessageReceived(const IPC::Message&);
-
-  void OnFilteredMessageReceived(const IPC::Message&);
-
-  void ProcessAckedTouchEvent(
-      const TouchEventWithLatencyInfo& touch,
-      blink::mojom::InputEventResultState ack_result) override;
-  std::unique_ptr<SyntheticGestureTarget> CreateSyntheticGestureTarget()
-      override;
-  void DidStopFlinging() override;
-
-  void ShowDisambiguationPopup(const gfx::Rect& rect_pixels,
-                               const SkBitmap& zoomed_bitmap);
-  void DisambiguationPopupDismissed();
-  void HandleDisambiguationPopupMouseDownEvent(Evas_Event_Mouse_Down*);
-  void HandleDisambiguationPopupMouseUpEvent(Evas_Event_Mouse_Up*);
-
-  void DidCreateNewRendererCompositorFrameSink(
-      viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink)
-      override;
-  void SubmitCompositorFrame(
-      const viz::LocalSurfaceId& local_surface_id,
-      viz::CompositorFrame frame,
-      absl::optional<viz::HitTestRegionList> hit_test_region_list) override;
-  void ClearCompositorFrame();
-  void ResetFallbackToFirstNavigationSurface() override;
-
-  // ui::GestureEventHelper implementation.
-  bool CanDispatchToConsumer(ui::GestureConsumer* consumer) override;
-  void DispatchSyntheticTouchEvent(ui::TouchEvent* event) override;
-  void DispatchGestureEvent(GestureConsumer* raw_input_consumer,
-                            ui::GestureEvent*) override;
-
-  // viz::HostFrameSinkClient implementation.
-  void OnFirstSurfaceActivation(const viz::SurfaceInfo& surface_info) override;
-  void OnFrameTokenChanged(uint32_t frame_token,
-                           base::TimeTicks activation_time) override;
-
-  // IPC::Sender implementation:
-  bool Send(IPC::Message*) override;
-
-  // EventResamplerClient implementation.
-  void ForwardTouchEvent(ui::TouchEvent*) override;
-  void ForwardGestureEvent(blink::WebGestureEvent) override;
-  unsigned TouchPointCount() const override;
-
-  void FilterInputMotion(const blink::WebGestureEvent& gesture_event);
-
-  void EvasToBlinkCords(int x, int y, int* view_x, int* view_y);
-  void SelectClosestWord(const gfx::Point& touch_point);
-
-  Evas* evas() const {
-    DCHECK(evas_);
-    return evas_;
-  }
-
-  Evas_Object* smart_parent() const { return smart_parent_; }
-
-  void set_magnifier(bool status);
-
-  void Init_EvasGL(int width, int height);
-  void CreateNativeSurface(int width, int height);
-
-  void SetEvasHandler(scoped_refptr<EvasEventHandler> evas_event_handler);
-
-  void HandleGestureBegin();
-  void HandleGestureEnd();
-  void HandleGesture(ui::GestureEvent*);
-  void HandleGesture(blink::WebGestureEvent&);
-  void HandleTouchEvent(ui::TouchEvent*);
-
-  Evas_GL_API* evasGlApi() { return evas_gl_api_; }
-  gfx::Point ConvertPointInViewPix(gfx::Point point);
-  gfx::Rect GetViewBoundsInPix() const;
-
-  void MoveCaret(const gfx::Point& point);
-  void SetComposition(const ui::CompositionText& composition_text);
-  void ConfirmComposition(std::u16string& text);
-  void SendGestureEvent(blink::WebGestureEvent& event);
-
-  void SetTouchEventsEnabled(bool enabled);
-
-  void ScrollFocusedEditableNode();
-
-  bool IsLastAvailableTextEmpty() const;
-
-  bool IsIMEShow() const;
-  gfx::Rect GetIMERect() const;
-  void GetSnapshotAsync(const gfx::Rect& snapshot_area, int request_id);
-  bool RequestSnapshotAsync(const Eina_Rectangle rect,
-                            Screenshot_Captured_Callback callback,
-                            void* user_data);
-  void OnSnapshotDataReceived(SkBitmap bitmap, int snapshotId);
-#if !defined(EWK_BRINGUP)
-  void CopyOutputCallback(int request_id,
-                          std::unique_ptr<viz::CopyOutputResult> result);
-#endif
-  bool MakeCurrent();
-  bool ClearCurrent();
-
-  SelectionControllerEfl* GetSelectionController() const {
-    return selection_controller_.get();
-  }
-
-  unsigned PointerStatePointerCount() const {
-    return pointer_state_.GetPointerCount();
-  }
-
-  // Sets rotation degrees. Expected values are one of { 0, 90, 180, 270 }.
-  void UpdateRotationDegrees(int rotation_degrees);
-
-  // EvasGLDelegatedFrameHostClient implementation.
-  Evas_GL_API* GetEvasGLAPI() override;
-  void DidReceiveCompositorFrameAck(
-      const viz::LocalSurfaceId& local_surface_id,
-      std::vector<viz::ReturnedResource> resources) override;
-  Evas_GL* GetEvasGL() override;
-
- private:
-  ~RenderWidgetHostViewEfl() override;
-
-  void InitializeDeviceDisplayInfo();
-  gfx::NativeViewId GetNativeViewId() const;
-
-  static void OnParentViewResize(void* data, Evas*, Evas_Object*, void*);
-  static void OnFocusIn(void* data, Evas*, Evas_Object*, void*);
-  static void OnFocusOut(void* data, Evas*, Evas_Object*, void*);
-  static void OnHostFocusIn(void* data, Evas_Object*, void*);
-  static void OnHostFocusOut(void* data, Evas_Object*, void*);
-
-  static void OnMotionEnable(void* data, Evas_Object*, void*);
-  static void OnMotionMove(void* data, Evas_Object*, void*);
-  static void OnMotionZoom(void* data, Evas_Object*, void*);
-
-  static void OnMultiTouchDownEvent(void* data, Evas*, Evas_Object*, void*);
-  static void OnMultiTouchMoveEvent(void* data, Evas*, Evas_Object*, void*);
-  static void OnMultiTouchUpEvent(void* data, Evas*, Evas_Object*, void*);
-
-  static void OnMouseDown(void* data, Evas*, Evas_Object*, void*);
-  static void OnMouseUp(void* data, Evas*, Evas_Object*, void*);
-  static void OnMouseMove(void* data, Evas*, Evas_Object*, void*);
-  static void OnMouseOut(void* data, Evas*, Evas_Object*, void*);
-  static void OnMouseWheel(void* data, Evas*, Evas_Object*, void*);
-  static void OnKeyDown(void*, Evas*, Evas_Object*, void*);
-  static void OnKeyUp(void*, Evas*, Evas_Object*, void*);
-#if defined(OS_TIZEN)
-  static void OnHWBackEvent(void*, Evas_Object*, void*);
-#endif
-
-  void ProcessTouchEvents(unsigned int timestamp, bool is_multi_touch = false);
-  void SetDoubleTapSupportEnabled(bool enabled);
-
-  void OnOrientationChangeEvent(int);
-  void OnDidHandleKeyEvent(const blink::WebInputEvent* input_event,
-                           bool processed);
-
-  // With immediate = true, it calls evas_render().
-  void Invalidate(bool immediate);
-  // TODO(prashant.n): Implement delegate to handle multiple frame_hosts.
-  void SwapBrowserFrame(const viz::LocalSurfaceId& local_surface_id,
-                        viz::CompositorFrame frame);
-  void ClearBrowserFrame();
-  void RenderBrowserFrame();
-  static void EvasObjectImagePixelsGetCallback(void*, Evas_Object*);
-
-  EdgeEffect& EnsureEdgeEffect();
-
-#if defined(USE_WAYLAND)
-#if TIZEN_VERSION_AT_LEAST(5, 0, 0)
-  Ecore_Wl2_Window* GetEcoreWlWindow() const;
-#else
-  Ecore_Wl_Window* GetEcoreWlWindow() const;
-#endif  // TIZEN_VERSION_AT_LEAST(5, 0, 0)
-#else
-  Ecore_X_Window GetEcoreXWindow() const;
-#endif
-
-  std::unique_ptr<EvasGLDelegatedFrameHost> evasgl_delegated_frame_host_;
-  IMContextEfl* im_context_;
-  Evas* evas_;
-  Evas_Object* parent_view_;
-  Evas_Object* smart_parent_;
-  Evas_Object* content_image_;
-  Evas_Object* content_image_elm_host_;
-  bool evas_gl_initialized_;
-  float device_scale_factor_;
-
-  bool magnifier_;
-
-  // Whether we are currently loading.
-  bool is_loading_;
-
-  scoped_refptr<EvasEventHandler> evas_event_handler_;
-
-  const viz::FrameSinkId frame_sink_id_;
-
-  // Stores the current state of the active pointers targeting this
-  // object.
-  ui::MotionEventAura pointer_state_;
-
-  // The gesture recognizer for this view.
-  // In Aura GestureRecognizer is global. Should we follow that?
-  std::unique_ptr<ui::GestureRecognizer> gesture_recognizer_;
-
-  std::unique_ptr<DisambiguationPopupEfl> disambiguation_popup_;
-  std::unique_ptr<EdgeEffect> edge_effect_;
-
-  int current_orientation_;
-
-  Evas_GL* evas_gl_;
-  Evas_GL_API* evas_gl_api_;
-  Evas_GL_Config* evas_gl_config_;
-  Evas_GL_Context* evas_gl_context_;
-  Evas_GL_Surface* evas_gl_surface_;
-
-  bool handling_disambiguation_popup_gesture_;
-  bool touch_events_enabled_;
-  // The background color of the web content.
-  SkColor background_color_;
-
-  // The last scroll offset of the view.
-  gfx::Vector2dF last_scroll_offset_;
-
-  WebContents& web_contents_;
-
-  base::IDMap<std::unique_ptr<ScreenshotCapturedCallback>>
-      screen_capture_cb_map_;
-
-  std::unique_ptr<SelectionControllerEfl> selection_controller_;
-  std::unique_ptr<EventResampler> event_resampler_;
-
-  viz::mojom::CompositorFrameSinkClient* renderer_compositor_frame_sink_ =
-      nullptr;
-
-  bool needs_begin_frames_ = false;
-
-  absl::optional<DisplayFeature> display_feature_;
-
-  base::WeakPtrFactory<RenderWidgetHostViewEfl> weak_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewEfl);
-};
-
-}  // namespace content
-
-#endif
diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/web_event_factory_efl.cc b/tizen_src/chromium_impl/content/browser/renderer_host/web_event_factory_efl.cc
deleted file mode 100644 (file)
index 859d27d..0000000
+++ /dev/null
@@ -1,603 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Copyright 2014 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "content/browser/renderer_host/web_event_factory_efl.h"
-
-#include <Ecore.h>
-#include <unordered_map>
-
-#include "base/strings/utf_string_conversions.h"
-#include "base/time/time.h"
-#include "third_party/blink/public/platform/web_common.h"
-#include "ui/display/screen.h"
-#include "ui/events/base_event_utils.h"
-#include "ui/events/event_utils.h"
-#if !defined(EWK_BRINGUP)  // FIXME: m94 bringup
-#include "ui/events/keycodes/keyboard_code_conversion_x.h"
-#endif
-#include "ui/events/keycodes/keyboard_codes.h"
-
-using namespace blink;
-
-namespace content {
-
-namespace {
-
-static const float kDefaultScrollStep = 20;
-
-static void TranslateEvasCoordToWebKitCoord(Evas_Object* web_view,
-                                            gfx::PointF* point) {
-  Evas_Coord tmpX, tmpY;
-  evas_object_geometry_get(web_view, &tmpX, &tmpY, 0, 0);
-  point->Offset(-tmpX, -tmpY);
-}
-
-float GetDeviceScaleFactor() {
-  static float device_scale_factor = 0.0f;
-  if (!device_scale_factor) {
-    device_scale_factor =
-        display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor();
-  }
-  return device_scale_factor;
-}
-
-inline bool string_ends_with(std::string const& value,
-                             std::string const& match) {
-  if (match.size() > value.size()) {
-    return false;
-  }
-  return std::equal(match.rbegin(), match.rend(), value.rbegin());
-}
-
-inline bool string_starts_with(std::string const& value,
-                               std::string const& match) {
-  if (match.size() > value.size()) {
-    return false;
-  }
-  return std::equal(match.begin(), match.end(), value.begin());
-}
-
-static ui::KeyboardCode windows_key_codeFromEflKey(const char* key) {
-  static std::unordered_map<std::string, ui::KeyboardCode> code_from_key_map({
-      {"Shift_L", ui::VKEY_LSHIFT},
-      {"Shift_R", ui::VKEY_RSHIFT},
-      {"Control_L", ui::VKEY_LCONTROL},
-      {"Control_R", ui::VKEY_RCONTROL},
-      {"Alt_L", ui::VKEY_LMENU},
-      {"Alt_R", ui::VKEY_RMENU},
-      {"Meta_L", ui::VKEY_LMENU},
-      {"Meta_R", ui::VKEY_RMENU},
-
-      // comes from KeyboardCodeFromXKeysym
-      {"BackSpace", ui::VKEY_BACK},
-      {"Delete", ui::VKEY_DELETE},
-      {"Tab", ui::VKEY_TAB},
-      {"Return", ui::VKEY_RETURN},
-      {"KP_Enter", ui::VKEY_RETURN},
-      {"Clear", ui::VKEY_CLEAR},
-      {"space", ui::VKEY_SPACE},
-      {"Home", ui::VKEY_HOME},
-      {"KP_Home", ui::VKEY_HOME},
-      {"End", ui::VKEY_END},
-      {"KP_End", ui::VKEY_END},
-      {"Prior", ui::VKEY_PRIOR},
-      {"KP_Prior", ui::VKEY_PRIOR},
-      {"Next", ui::VKEY_NEXT},
-      {"KP_Next", ui::VKEY_NEXT},
-      {"Left", ui::VKEY_LEFT},
-      {"KP_Left", ui::VKEY_LEFT},
-      {"Right", ui::VKEY_RIGHT},
-      {"KP_Right", ui::VKEY_RIGHT},
-      {"Down", ui::VKEY_DOWN},
-      {"KP_Down", ui::VKEY_DOWN},
-      {"Up", ui::VKEY_UP},
-      {"KP_Up", ui::VKEY_UP},
-      {"Escape", ui::VKEY_ESCAPE},
-      {"Kana_Lock", ui::VKEY_KANA},
-      {"Kana_Shift", ui::VKEY_KANA},
-      {"Hangul", ui::VKEY_HANGUL},
-      {"Hangul_Hanja", ui::VKEY_HANJA},
-      {"Kanji", ui::VKEY_KANJI},
-      {"Henkan", ui::VKEY_CONVERT},
-      {"Muhenkan", ui::VKEY_NONCONVERT},
-      {"Zenkaku_Hankaku", ui::VKEY_DBE_DBCSCHAR},
-      {"KP_0", ui::VKEY_NUMPAD0},
-      {"KP_1", ui::VKEY_NUMPAD1},
-      {"KP_2", ui::VKEY_NUMPAD2},
-      {"KP_3", ui::VKEY_NUMPAD3},
-      {"KP_4", ui::VKEY_NUMPAD4},
-      {"KP_5", ui::VKEY_NUMPAD5},
-      {"KP_6", ui::VKEY_NUMPAD6},
-      {"KP_7", ui::VKEY_NUMPAD7},
-      {"KP_8", ui::VKEY_NUMPAD8},
-      {"KP_9", ui::VKEY_NUMPAD9},
-      {"KP_Multiply", ui::VKEY_MULTIPLY},
-      {"KP_Add", ui::VKEY_ADD},
-      {"KP_Separator", ui::VKEY_SEPARATOR},
-      {"KP_Subtract", ui::VKEY_SUBTRACT},
-      {"KP_Decimal", ui::VKEY_DECIMAL},
-      {"KP_Divide", ui::VKEY_DIVIDE},
-
-      {"ISO_Level5_Shift", ui::VKEY_OEM_8},
-      {"ISO_Level3_Shift", ui::VKEY_ALTGR},
-      {"Mode_switch", ui::VKEY_ALTGR},
-      {"Multi_key", ui::VKEY_COMPOSE},
-      {"Pause", ui::VKEY_PAUSE},
-      {"Caps_Lock", ui::VKEY_CAPITAL},
-      {"Num_Lock", ui::VKEY_NUMLOCK},
-      {"Scroll_Lock", ui::VKEY_SCROLL},
-      {"Select", ui::VKEY_SELECT},
-      {"Print", ui::VKEY_PRINT},
-      {"Execute", ui::VKEY_EXECUTE},
-      {"Insert", ui::VKEY_INSERT},
-      {"KP_Insert", ui::VKEY_INSERT},
-      {"Help", ui::VKEY_HELP},
-      {"Super_L", ui::VKEY_LWIN},
-      {"Super_R", ui::VKEY_RWIN},
-      {"Menu", ui::VKEY_APPS},
-      {"F1", ui::VKEY_F1},
-      {"KP_F1", ui::VKEY_F1},
-      {"F2", ui::VKEY_F2},
-      {"KP_F2", ui::VKEY_F2},
-      {"F3", ui::VKEY_F3},
-      {"KP_F3", ui::VKEY_F3},
-      {"F4", ui::VKEY_F4},
-      {"KP_F4", ui::VKEY_F4},
-      {"F5", ui::VKEY_F5},
-      {"F6", ui::VKEY_F6},
-      {"F7", ui::VKEY_F7},
-      {"F8", ui::VKEY_F8},
-      {"F9", ui::VKEY_F9},
-      {"F10", ui::VKEY_F10},
-      {"F11", ui::VKEY_F11},
-      {"F12", ui::VKEY_F12},
-      {"F13", ui::VKEY_F13},
-      {"F14", ui::VKEY_F14},
-      {"F15", ui::VKEY_F15},
-      {"F16", ui::VKEY_F16},
-      {"F17", ui::VKEY_F17},
-      {"F18", ui::VKEY_F18},
-      {"F19", ui::VKEY_F19},
-      {"F20", ui::VKEY_F20},
-      {"F21", ui::VKEY_F21},
-      {"F22", ui::VKEY_F22},
-      {"F23", ui::VKEY_F23},
-      {"F24", ui::VKEY_F24},
-      {"guillemotleft", ui::VKEY_OEM_102},
-      {"guillemotright", ui::VKEY_OEM_102},
-      {"degree", ui::VKEY_OEM_102},
-      {"ugrave", ui::VKEY_OEM_102},
-      {"Ugrave", ui::VKEY_OEM_102},
-      {"brokenbar", ui::VKEY_OEM_102},
-      {"XF86Back", ui::VKEY_BROWSER_BACK},
-      {"XF86Forward", ui::VKEY_BROWSER_FORWARD},
-      {"XF86Reload", ui::VKEY_BROWSER_REFRESH},
-      {"XF86Stop", ui::VKEY_BROWSER_STOP},
-      {"XF86Search", ui::VKEY_BROWSER_SEARCH},
-      {"XF86Favorites", ui::VKEY_BROWSER_FAVORITES},
-      {"XF86HomePage", ui::VKEY_BROWSER_HOME},
-      {"XF86AudioMute", ui::VKEY_VOLUME_MUTE},
-      {"XF86AudioLowerVolume", ui::VKEY_VOLUME_DOWN},
-      {"XF86AudioRaiseVolume", ui::VKEY_VOLUME_UP},
-      {"XF86AudioNext", ui::VKEY_MEDIA_NEXT_TRACK},
-      {"XF86AudioPrev", ui::VKEY_MEDIA_PREV_TRACK},
-      {"XF86AudioStop", ui::VKEY_MEDIA_STOP},
-      {"XF86AudioPlay", ui::VKEY_MEDIA_PLAY_PAUSE},
-      {"XF86Mail", ui::VKEY_MEDIA_LAUNCH_MAIL},
-      {"XF86LaunchA", ui::VKEY_MEDIA_LAUNCH_APP1},
-      {"XF86LaunchB", ui::VKEY_MEDIA_LAUNCH_APP2},
-      {"XF86Calculator", ui::VKEY_MEDIA_LAUNCH_APP2},
-      {"XF86WLAN", ui::VKEY_WLAN},
-      {"XF86PowerOff", ui::VKEY_POWER},
-      {"XF86Sleep", ui::VKEY_SLEEP},
-      {"XF86MonBrightnessDown", ui::VKEY_BRIGHTNESS_DOWN},
-      {"XF86MonBrightnessUp", ui::VKEY_BRIGHTNESS_UP},
-      {"XF86KbdBrightnessDown", ui::VKEY_KBD_BRIGHTNESS_DOWN},
-      {"XF86KbdBrightnessUp", ui::VKEY_KBD_BRIGHTNESS_UP},
-
-      // XXX: it won't work on all keyboard layouts
-      {"comma", ui::VKEY_OEM_COMMA},
-      {"less", ui::VKEY_OEM_COMMA},
-      {"minus", ui::VKEY_OEM_MINUS},
-      {"underscore", ui::VKEY_OEM_MINUS},
-      {"greater", ui::VKEY_OEM_PERIOD},
-      {"period", ui::VKEY_OEM_PERIOD},
-      {"semicolon", ui::VKEY_OEM_1},
-      {"colon", ui::VKEY_OEM_1},
-      {"question", ui::VKEY_OEM_2},
-      {"slash", ui::VKEY_OEM_2},
-      {"asciitilde", ui::VKEY_OEM_3},
-      {"quoteleft", ui::VKEY_OEM_3},
-      {"bracketleft", ui::VKEY_OEM_4},
-      {"braceleft", ui::VKEY_OEM_4},
-      {"backslash", ui::VKEY_OEM_5},
-      {"bar", ui::VKEY_OEM_5},
-      {"bracketright", ui::VKEY_OEM_6},
-      {"braceright", ui::VKEY_OEM_6},
-      {"quoteright", ui::VKEY_OEM_7},
-      {"quotedbl", ui::VKEY_OEM_7},
-
-      // XXX: handle accents and other characters
-      {"a", ui::VKEY_A},
-      {"A", ui::VKEY_A},
-      {"b", ui::VKEY_B},
-      {"B", ui::VKEY_B},
-      {"c", ui::VKEY_C},
-      {"C", ui::VKEY_C},
-      {"d", ui::VKEY_D},
-      {"D", ui::VKEY_D},
-      {"e", ui::VKEY_E},
-      {"E", ui::VKEY_E},
-      {"f", ui::VKEY_F},
-      {"F", ui::VKEY_F},
-      {"g", ui::VKEY_G},
-      {"G", ui::VKEY_G},
-      {"h", ui::VKEY_H},
-      {"H", ui::VKEY_H},
-      {"i", ui::VKEY_I},
-      {"I", ui::VKEY_I},
-      {"j", ui::VKEY_J},
-      {"J", ui::VKEY_J},
-      {"k", ui::VKEY_K},
-      {"K", ui::VKEY_K},
-      {"l", ui::VKEY_L},
-      {"L", ui::VKEY_L},
-      {"m", ui::VKEY_M},
-      {"M", ui::VKEY_M},
-      {"n", ui::VKEY_N},
-      {"N", ui::VKEY_N},
-      {"o", ui::VKEY_O},
-      {"O", ui::VKEY_O},
-      {"p", ui::VKEY_P},
-      {"P", ui::VKEY_P},
-      {"q", ui::VKEY_Q},
-      {"Q", ui::VKEY_Q},
-      {"r", ui::VKEY_R},
-      {"R", ui::VKEY_R},
-      {"s", ui::VKEY_S},
-      {"S", ui::VKEY_S},
-      {"t", ui::VKEY_T},
-      {"T", ui::VKEY_T},
-      {"u", ui::VKEY_U},
-      {"U", ui::VKEY_U},
-      {"v", ui::VKEY_V},
-      {"V", ui::VKEY_V},
-      {"w", ui::VKEY_W},
-      {"W", ui::VKEY_W},
-      {"x", ui::VKEY_X},
-      {"X", ui::VKEY_X},
-      {"y", ui::VKEY_Y},
-      {"Y", ui::VKEY_Y},
-      {"z", ui::VKEY_Z},
-      {"Z", ui::VKEY_Z},
-  });
-
-  auto uicode = code_from_key_map.find(key);
-  if (uicode == code_from_key_map.end()) {
-    return ui::VKEY_UNKNOWN;
-  }
-
-  return uicode->second;
-}
-
-static int ModifiersFromEflKey(const char* key) {
-  if (string_ends_with(key, "_L")) {
-    return WebInputEvent::kIsLeft;
-  } else if (string_ends_with(key, "_R")) {
-    return WebInputEvent::kIsRight;
-  } else if (string_starts_with(key, "KP_")) {
-    return WebInputEvent::kIsKeyPad;
-  }
-  return 0;
-}
-
-static int CharacterFromEflString(const char* string) {
-  if (string) {
-    std::u16string result;
-    base::UTF8ToUTF16(string, strlen(string), &result);
-    return result.length() == 1 ? result[0] : 0;
-  }
-
-  return 0;
-}
-
-// From
-// third_party/blink/Source/blink/chromium/src/gtk/WebInputEventFactory.cpp:
-static blink::WebUChar GetControlCharacter(int windows_key_code, bool shift) {
-  if (windows_key_code >= ui::VKEY_A && windows_key_code <= ui::VKEY_Z) {
-    // ctrl-A ~ ctrl-Z map to \x01 ~ \x1A
-    return windows_key_code - ui::VKEY_A + 1;
-  }
-  if (shift) {
-    // following graphics chars require shift key to input.
-    switch (windows_key_code) {
-      // ctrl-@ maps to \x00 (Null byte)
-      case ui::VKEY_2:
-        return 0;
-      // ctrl-^ maps to \x1E (Record separator, Information separator two)
-      case ui::VKEY_6:
-        return 0x1E;
-      // ctrl-_ maps to \x1F (Unit separator, Information separator one)
-      case ui::VKEY_OEM_MINUS:
-        return 0x1F;
-      // Returns 0 for all other keys to avoid inputting unexpected chars.
-      default:
-        break;
-    }
-  } else {
-    switch (windows_key_code) {
-      // ctrl-[ maps to \x1B (Escape)
-      case ui::VKEY_OEM_4:
-        return 0x1B;
-      // ctrl-\ maps to \x1C (File separator, Information separator four)
-      case ui::VKEY_OEM_5:
-        return 0x1C;
-      // ctrl-] maps to \x1D (Group separator, Information separator three)
-      case ui::VKEY_OEM_6:
-        return 0x1D;
-      // ctrl-Enter maps to \x0A (Line feed)
-      case ui::VKEY_RETURN:
-        return 0x0A;
-      // Returns 0 for all other keys to avoid inputting unexpected chars.
-      default:
-        break;
-    }
-  }
-  return 0;
-}
-
-enum { LeftButton = 1, MiddleButton = 2, RightButton = 3 };
-
-static WebMouseEvent::Button EvasToWebMouseButton(int button) {
-  if (button == LeftButton)
-    return WebMouseEvent::Button::kLeft;
-  if (button == MiddleButton)
-    return WebMouseEvent::Button::kMiddle;
-  if (button == RightButton)
-    return WebMouseEvent::Button::kRight;
-
-  return WebMouseEvent::Button::kNoButton;
-}
-
-enum { LeftButtonPressed = 1, MiddleButtonPressed = 2, RightButtonPressed = 4 };
-
-static WebInputEvent::Modifiers EvasToWebMouseButtonsPressed(int buttons) {
-  unsigned result = 0;
-
-  if (buttons & LeftButtonPressed)
-    result |= WebInputEvent::kLeftButtonDown;
-  if (buttons & MiddleButtonPressed)
-    result |= WebInputEvent::kMiddleButtonDown;
-  if (buttons & RightButtonPressed)
-    result |= WebInputEvent::kRightButtonDown;
-
-  return static_cast<WebInputEvent::Modifiers>(result);
-}
-
-static WebInputEvent::Modifiers EvasToWebModifiers(
-    const Evas_Modifier* modifiers) {
-  unsigned result = 0;
-
-  if (evas_key_modifier_is_set(modifiers, "Shift"))
-    result |= WebInputEvent::kShiftKey;
-  if (evas_key_modifier_is_set(modifiers, "Control"))
-    result |= WebInputEvent::kControlKey;
-  if (evas_key_modifier_is_set(modifiers, "Alt"))
-    result |= WebInputEvent::kAltKey;
-  if (evas_key_modifier_is_set(modifiers, "Meta"))
-    result |= WebInputEvent::kMetaKey;
-
-  return static_cast<WebInputEvent::Modifiers>(result);
-}
-
-}  // namespace
-
-template <class EVT>
-blink::WebMouseEvent MakeWebMouseEvent(WebInputEvent::Type type,
-                                       Evas_Object* view,
-                                       const EVT* ev) {
-  const float sf = GetDeviceScaleFactor();
-  gfx::PointF point(ev->canvas.x / sf, ev->canvas.y / sf);
-  TranslateEvasCoordToWebKitCoord(view, &point);
-  Evas* evas = evas_object_evas_get(view);
-  WebMouseEvent event(
-      type, point,
-      gfx::PointF(evas_coord_world_x_to_screen(evas, ev->canvas.x) / sf,
-                  evas_coord_world_y_to_screen(evas, ev->canvas.y) / sf),
-      EvasToWebMouseButton(ev->button), 1, EvasToWebModifiers(ev->modifiers),
-      ui::EventTimeStampFromSeconds(ev->timestamp / 1000));
-
-  return event;
-}
-
-template blink::WebMouseEvent MakeWebMouseEvent<Evas_Event_Mouse_Down>(
-    WebInputEvent::Type,
-    Evas_Object*,
-    const Evas_Event_Mouse_Down*);
-template blink::WebMouseEvent MakeWebMouseEvent<Evas_Event_Mouse_Up>(
-    WebInputEvent::Type,
-    Evas_Object*,
-    const Evas_Event_Mouse_Up*);
-
-blink::WebMouseEvent MakeWebMouseEvent(Evas_Object* view,
-                                       const Evas_Event_Mouse_Out* ev) {
-  WebMouseEvent event(WebInputEvent::Type::kMouseLeave,
-                      EvasToWebModifiers(ev->modifiers),
-                      ui::EventTimeStampFromSeconds(ev->timestamp / 1000));
-
-  event.button = EvasToWebMouseButton(ev->buttons);
-  event.SetModifiers(event.GetModifiers() |
-                     EvasToWebMouseButtonsPressed(ev->buttons));
-
-  const float sf = GetDeviceScaleFactor();
-  gfx::PointF point(ev->canvas.x / sf, ev->canvas.y / sf);
-  TranslateEvasCoordToWebKitCoord(view, &point);
-
-  Evas* evas = evas_object_evas_get(view);
-  event.SetPositionInScreen(
-      evas_coord_world_x_to_screen(evas, ev->canvas.x) / sf,
-      evas_coord_world_y_to_screen(evas, ev->canvas.y) / sf);
-  event.SetPositionInWidget(point);
-
-  return event;
-}
-
-blink::WebMouseEvent MakeWebMouseEvent(Evas_Object* view,
-                                       const Evas_Event_Mouse_Move* ev) {
-  WebMouseEvent event(WebInputEvent::Type::kMouseMove,
-                      EvasToWebModifiers(ev->modifiers),
-                      ui::EventTimeStampFromSeconds(ev->timestamp / 1000));
-
-  event.button = EvasToWebMouseButton(ev->buttons);
-  event.SetModifiers(event.GetModifiers() |
-                     EvasToWebMouseButtonsPressed(ev->buttons));
-
-  const float sf = GetDeviceScaleFactor();
-  gfx::PointF point(ev->cur.canvas.x / sf, ev->cur.canvas.y / sf);
-  TranslateEvasCoordToWebKitCoord(view, &point);
-
-  Evas* evas = evas_object_evas_get(view);
-  event.SetPositionInScreen(
-      evas_coord_world_x_to_screen(evas, ev->cur.canvas.x) / sf,
-      evas_coord_world_y_to_screen(evas, ev->cur.canvas.y) / sf);
-  event.SetPositionInWidget(point);
-
-  return event;
-}
-
-blink::WebMouseWheelEvent MakeWebMouseEvent(Evas_Object* view,
-                                            const Evas_Event_Mouse_Wheel* ev) {
-  WebMouseWheelEvent event(WebInputEvent::Type::kMouseWheel,
-                           EvasToWebModifiers(ev->modifiers),
-                           ui::EventTimeStampFromSeconds(ev->timestamp / 1000));
-
-  const float sf = GetDeviceScaleFactor();
-  gfx::PointF point((ev->canvas.x) / sf, (ev->canvas.y) / sf);
-  TranslateEvasCoordToWebKitCoord(view, &point);
-
-  Evas* evas = evas_object_evas_get(view);
-  event.SetPositionInScreen(
-      evas_coord_world_x_to_screen(evas, ev->canvas.x) / sf,
-      evas_coord_world_y_to_screen(evas, ev->canvas.y) / sf);
-
-  if (ev->direction) {
-    event.wheel_ticks_x = ev->z;
-    event.delta_x = ev->z * kDefaultScrollStep;
-  } else {
-    event.wheel_ticks_y = -(ev->z);
-    event.delta_y = -(ev->z * kDefaultScrollStep);
-  }
-
-  return event;
-}
-
-template <class EVT>
-NativeWebKeyboardEvent MakeWebKeyboardEvent(bool pressed, const EVT* evt) {
-  NativeWebKeyboardEvent event(
-      pressed ? WebInputEvent::Type::kKeyDown : WebInputEvent::Type::kKeyUp,
-      ModifiersFromEflKey(evt->key),
-      ui::EventTimeStampFromSeconds(evt->timestamp / 1000));
-
-  event.native_key_code = evt->keycode;
-  event.windows_key_code = windows_key_codeFromEflKey(evt->key);
-
-  if (event.windows_key_code == ui::VKEY_RETURN) {
-    event.unmodified_text[0] = '\r';
-  } else {
-    event.unmodified_text[0] = CharacterFromEflString(evt->string);
-  }
-
-  if (event.GetModifiers() & WebInputEvent::kControlKey) {
-    event.text[0] =
-        GetControlCharacter(event.windows_key_code,
-                            event.GetModifiers() & WebInputEvent::kShiftKey);
-  } else {
-    event.text[0] = event.unmodified_text[0];
-  }
-
-  return event;
-}
-
-template NativeWebKeyboardEvent MakeWebKeyboardEvent(
-    bool,
-    const Evas_Event_Key_Down*);
-template NativeWebKeyboardEvent MakeWebKeyboardEvent(bool,
-                                                     const Evas_Event_Key_Up*);
-
-static ui::EventType EvasTouchEventTypeToUI(Evas_Touch_Point_State evas_touch) {
-  switch (evas_touch) {
-    case EVAS_TOUCH_POINT_DOWN:
-      return ui::ET_TOUCH_PRESSED;
-    case EVAS_TOUCH_POINT_MOVE:
-      return ui::ET_TOUCH_MOVED;
-    case EVAS_TOUCH_POINT_UP:
-      return ui::ET_TOUCH_RELEASED;
-    case EVAS_TOUCH_POINT_CANCEL:
-      return ui::ET_TOUCH_CANCELLED;
-    case EVAS_TOUCH_POINT_STILL:
-    // Not handled by chromium, should not be passed here.
-    default:
-      NOTREACHED();
-      return ui::ET_UNKNOWN;
-  }
-}
-
-bool IsHardwareBackKey(const Evas_Event_Key_Down* event) {
-#if defined(OS_TIZEN)
-  return (strcmp(event->key, "XF86Back") == 0 ||
-          strcmp(event->key, "XF86Stop") == 0);
-#endif
-  return (strcmp(event->key, "Escape") == 0);
-}
-
-ui::TouchEvent MakeTouchEvent(Evas_Coord_Point pt,
-                              Evas_Touch_Point_State state,
-                              int id,
-                              Evas_Object* view,
-                              unsigned int timestamp) {
-  gfx::PointF point(pt.x, pt.y);
-  TranslateEvasCoordToWebKitCoord(view, &point);
-  pt.x = point.x();
-  pt.y = point.y();
-  const float scale = GetDeviceScaleFactor();
-  base::TimeTicks event_timestamp = base::TimeTicks::FromInternalValue(
-      timestamp * base::Time::kMicrosecondsPerMillisecond);
-
-  if (timestamp == 0)
-    event_timestamp = ui::EventTimeForNow();
-
-  return ui::TouchEvent(
-      EvasTouchEventTypeToUI(state), gfx::PointF(pt.x / scale, pt.y / scale),
-      gfx::PointF(pt.x / scale, pt.y / scale), event_timestamp,
-      ui::PointerDetails(ui::EventPointerType::kTouch, id));
-}
-
-template WebGestureEvent MakeGestureEvent<Evas_Event_Mouse_Down>(
-    WebInputEvent::Type type,
-    Evas_Object*,
-    const Evas_Event_Mouse_Down* ev);
-template WebGestureEvent MakeGestureEvent<Evas_Event_Mouse_Up>(
-    WebInputEvent::Type type,
-    Evas_Object*,
-    const Evas_Event_Mouse_Up* ev);
-
-template <class EVT>
-WebGestureEvent MakeGestureEvent(WebInputEvent::Type type,
-                                 Evas_Object* view,
-                                 const EVT* ev) {
-  WebGestureEvent event(type, EvasToWebModifiers(ev->modifiers),
-                        ui::EventTimeStampFromSeconds(ev->timestamp / 1000),
-                        blink::WebGestureDevice::kTouchscreen);
-
-  const float sf = GetDeviceScaleFactor();
-  gfx::PointF point(ev->canvas.x / sf, ev->canvas.y / sf);
-  TranslateEvasCoordToWebKitCoord(view, &point);
-
-  event.SetPositionInWidget(point);
-
-  return event;
-}
-
-}  // namespace content
diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/web_event_factory_efl.h b/tizen_src/chromium_impl/content/browser/renderer_host/web_event_factory_efl.h
deleted file mode 100644 (file)
index 1d43037..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2014 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef WEB_EVENT_FACTORY_EFL
-#define WEB_EVENT_FACTORY_EFL
-
-#include <Evas.h>
-
-#include "content/browser/renderer_host/render_widget_host_impl.h"
-#include "content/common/content_export.h"
-#include "content/public/browser/native_web_keyboard_event.h"
-#include "third_party/blink/public/common/input/web_input_event.h"
-#include "ui/events/event.h"
-
-namespace content {
-
-// Mouse
-template <class EVT>
-blink::WebMouseEvent MakeWebMouseEvent(
-    blink::WebInputEvent::Type type, Evas_Object* view, const EVT*);
-blink::WebMouseEvent MakeWebMouseEvent(Evas_Object* view,
-    const Evas_Event_Mouse_Out* ev);
-blink::WebMouseEvent MakeWebMouseEvent(Evas_Object* view,
-    const Evas_Event_Mouse_Move* ev);
-blink::WebMouseWheelEvent MakeWebMouseEvent(Evas_Object*,
-    const Evas_Event_Mouse_Wheel* ev);
-
-// Keyboard
-template <class EVT>
-NativeWebKeyboardEvent MakeWebKeyboardEvent(bool pressed, const EVT*);
-bool IsHardwareBackKey(const Evas_Event_Key_Down* event);
-
-// Touch
-// TODO(prashant.n): Make timestamp explicit argument.
-CONTENT_EXPORT ui::TouchEvent MakeTouchEvent(Evas_Coord_Point pt,
-                                             Evas_Touch_Point_State state,
-                                             int id, Evas_Object* view,
-                                             unsigned int timestamp = 0);
-
-template <class EVT>
-blink::WebGestureEvent MakeGestureEvent(blink::WebInputEvent::Type type,
-    Evas_Object* view, const EVT* event);
-
-} // namespace content
-
-#endif
index 9374331..00c5594 100644 (file)
@@ -6,7 +6,6 @@
 #include "content/browser/screen_orientation/screen_orientation_delegate_efl.h"
 
 #include "chromium_impl/content/browser/web_contents/web_contents_impl_efl.h"
-#include "chromium_impl/content/browser/web_contents/web_contents_view_efl.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "ewk/efl_integration/web_contents_view_efl_delegate_ewk.h"
@@ -32,22 +31,27 @@ bool ScreenOrientationDelegateEfl::FullScreenRequired(
 void ScreenOrientationDelegateEfl::Lock(
     WebContents* web_contents,
     device::mojom::ScreenOrientationLockType lock_orientation) {
+#if !defined(USE_AURA)
   WebContentsImpl* wci = static_cast<WebContentsImpl*>(web_contents);
   WebContentsViewEfl* wcve = static_cast<WebContentsViewEfl*>(wci->GetView());
   if (wcve->GetEflDelegate())
     wcve->GetEflDelegate()->OrientationLock(lock_orientation);
+#endif
 }
 
-bool ScreenOrientationDelegateEfl::ScreenOrientationProviderSupported() {
+bool ScreenOrientationDelegateEfl::ScreenOrientationProviderSupported(
+    WebContents* web_contents) {
   // TODO: Always supported on EFL?
   return true;
 }
 
 void ScreenOrientationDelegateEfl::Unlock(WebContents* web_contents) {
+#if !defined(USE_AURA)
   WebContentsImpl* wci = static_cast<WebContentsImpl*>(web_contents);
   WebContentsViewEfl* wcve = static_cast<WebContentsViewEfl*>(wci->GetView());
   if (wcve->GetEflDelegate())
     wcve->GetEflDelegate()->OrientationUnlock();
+#endif
 }
 
 } // namespace content
index 8bdf2bd..a258c8a 100644 (file)
@@ -6,7 +6,6 @@
 #ifndef CONTENT_BROWSER_SCREEN_ORIENTATION_SCREEN_ORIENTATION_DELEGATE_EFL_H_
 #define CONTENT_BROWSER_SCREEN_ORIENTATION_SCREEN_ORIENTATION_DELEGATE_EFL_H_
 
-#include "base/macros.h"
 #include "content/public/browser/screen_orientation_delegate.h"
 
 namespace content {
@@ -24,11 +23,11 @@ class ScreenOrientationDelegateEfl : public ScreenOrientationDelegate {
   bool FullScreenRequired(WebContents* web_contents) override;
   void Lock(WebContents* web_contents,
             device::mojom::ScreenOrientationLockType lock_orientation) override;
-  bool ScreenOrientationProviderSupported() override;
+  bool ScreenOrientationProviderSupported(WebContents* web_contents) override;
   void Unlock(WebContents* web_contents) override;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(ScreenOrientationDelegateEfl);
+  // DISALLOW_COPY_AND_ASSIGN(ScreenOrientationDelegateEfl);
 };
 
 } // namespace content
index ef657eb..d51ee22 100644 (file)
@@ -9,7 +9,6 @@
 #include "base/trace_event/trace_event.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
-#include "content/browser/renderer_host/render_widget_host_view_efl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/browser/web_contents/web_contents_impl_efl.h"
 #include "content/public/browser/context_menu_params.h"
@@ -114,7 +113,7 @@ void SelectionControllerEfl::SetControlsTemporarilyHidden(bool value) {
                "controls are hidden:", value);
   if (controls_temporarily_hidden_ == value)
     return;
-
+#if !defined(USE_AURA)
   RenderWidgetHostViewEfl* rwhv = static_cast<RenderWidgetHostViewEfl*>(
       web_contents_.GetRenderWidgetHostView());
   CHECK(rwhv);
@@ -122,7 +121,7 @@ void SelectionControllerEfl::SetControlsTemporarilyHidden(bool value) {
   // is left touching the screen.
   if (!value && rwhv->PointerStatePointerCount())
     return;
-
+#endif
   controls_temporarily_hidden_ = value;
   if (value) {
     Clear();
@@ -165,6 +164,7 @@ void SelectionControllerEfl::OnSelectionChanged(
 }
 
 void SelectionControllerEfl::OnTextInputStateChanged() {
+#if !defined(USE_AURA)
   RenderWidgetHostViewEfl* rwhv = static_cast<RenderWidgetHostViewEfl*>(
       web_contents_.GetRenderWidgetHostView());
   CHECK(rwhv);
@@ -189,6 +189,7 @@ void SelectionControllerEfl::OnTextInputStateChanged() {
     HideHandleAndContextMenu();
     ClearSelection();
   }
+#endif
 }
 
 void SelectionControllerEfl::UpdateSelectionData(const std::u16string& text) {
@@ -351,12 +352,15 @@ void SelectionControllerEfl::ShowHandleAndContextMenuIfRequired(
 }
 
 void SelectionControllerEfl::QuerySelectionStyle() {
+#if !defined(USE_AURA)
   WebContentsImpl* wci = static_cast<WebContentsImpl*>(&web_contents_);
   WebContentsViewEfl* wcve = static_cast<WebContentsViewEfl*>(wci->GetView());
   wcve->QuerySelectionStyle();
+#endif
 }
 
 void SelectionControllerEfl::ShowContextMenu() {
+#if !defined(USE_AURA)
   content::ContextMenuParams convertedParams = *(selection_data_->GetContextMenuParams());
 
   RenderWidgetHostViewEfl* rwhv =
@@ -374,13 +378,15 @@ void SelectionControllerEfl::ShowContextMenu() {
     WebContentsViewEfl* wcve = static_cast<WebContentsViewEfl*>(wci->GetView());
     wcve->ShowContextMenu(convertedParams);
   }
+#endif
 }
 
 void SelectionControllerEfl::CancelContextMenu(int request_id) {
+#if !defined(USE_AURA)
   WebContentsImpl* wci = static_cast<WebContentsImpl*>(&web_contents_);
   WebContentsViewEfl* wcve = static_cast<WebContentsViewEfl*>(wci->GetView());
-
   wcve->CancelContextMenu(request_id);
+#endif
 }
 
 void SelectionControllerEfl::HideHandles() {
@@ -469,6 +475,7 @@ void SelectionControllerEfl::HandleDragUpdateNotification(SelectionHandleEfl* ha
   magnifier_->Move(magnifier_point);
 
   switch (handle->Type()) {
+#if !defined(USE_AURA)
     case SelectionHandleEfl::HANDLE_TYPE_INPUT: {
       RenderWidgetHostViewEfl* rwhv =
           static_cast<RenderWidgetHostViewEfl*>(web_contents_.GetRenderWidgetHostView());
@@ -476,6 +483,7 @@ void SelectionControllerEfl::HandleDragUpdateNotification(SelectionHandleEfl* ha
         rwhv->MoveCaret(handle->GetBasePosition());
       return;
     }
+#endif
     case SelectionHandleEfl::HANDLE_TYPE_LEFT:
     case SelectionHandleEfl::HANDLE_TYPE_RIGHT: {
       float device_scale_factor =
@@ -538,13 +546,14 @@ void SelectionControllerEfl::HandleGesture(blink::WebGestureEvent& event) {
 
 void SelectionControllerEfl::HandlePostponedGesture(int x, int y, ui::EventType type) {
   DVLOG(0) << "HandlePostponedGesture :: " << type;
+#if !defined(USE_AURA)
   RenderWidgetHostViewEfl* rwhv =
       static_cast<RenderWidgetHostViewEfl*>(web_contents_.GetRenderWidgetHostView());
 
   gfx::Point point = gfx::Point(x, y);
   if (rwhv)
     point = rwhv->ConvertPointInViewPix(point);
-
+#endif
   switch (type) {
     case ui::ET_GESTURE_LONG_PRESS: {
       ClearSelectionViaEWebView();
@@ -571,13 +580,14 @@ bool SelectionControllerEfl::HandleLongPressEvent(
   if (params.is_editable) {
     // If one long press on an empty form, do not enter selection mode.
     // Instead, context menu will be shown if needed for clipboard actions.
+#if !defined(USE_AURA)
     RenderWidgetHostViewEfl* rwhv =
         static_cast<RenderWidgetHostViewEfl*>(web_contents_.GetRenderWidgetHostView());
     if (params.selection_text.empty() && !(rwhv && !rwhv->IsLastAvailableTextEmpty())) {
       long_mouse_press_ = false;
       return false;
     }
-
+#endif
     SetSelectionStatus(true);
     SetSelectionEditable(true);
     HandleLongPressEventPrivate(touch_point);
@@ -625,6 +635,7 @@ void SelectionControllerEfl::HandleLongPressEventPrivate(const gfx::Point& touch
 }
 
 void SelectionControllerEfl::HandleLongPressMoveEvent(const gfx::Point& touch_point) {
+#if !defined(USE_AURA)
   RenderWidgetHostViewEfl* rwhv =
       static_cast<RenderWidgetHostViewEfl*>(web_contents_.GetRenderWidgetHostView());
   Clear();
@@ -638,6 +649,7 @@ void SelectionControllerEfl::HandleLongPressMoveEvent(const gfx::Point& touch_po
     if (rwhv)
       rwhv->SelectClosestWord(touch_point);
   }
+#endif
 }
 
 void SelectionControllerEfl::HandleLongPressEndEvent() {
@@ -716,7 +728,7 @@ void SelectionControllerEfl::ChangeContextMenuPosition(gfx::Point& position, int
   edje_object_part_geometry_get(input_handle_->evas_object(), "handle", 0, 0, 0, &handleHeight);
   evas_object_geometry_get(GetParentView(), &webViewX, &webViewY, &webViewWidth, &webViewHeight);
   gfx::Rect viewportRect = gfx::Rect(webViewX, webViewY, webViewWidth, webViewHeight);
-
+#if !defined(USE_AURA)
   RenderWidgetHostViewEfl* rwhv =
       static_cast<RenderWidgetHostViewEfl*>(web_contents_.GetRenderWidgetHostView());
   if (rwhv && rwhv->IsIMEShow()) { // Get the Visible Rect .
@@ -724,7 +736,7 @@ void SelectionControllerEfl::ChangeContextMenuPosition(gfx::Point& position, int
     if ((viewportRect.y() + viewportRect.height()) > imeRect.y())
         viewportRect.set_height(imeRect.y() - viewportRect.y());
   }
-
+#endif
   gfx::Rect leftHandleRect = selection_data_->GetLeftRect();
   leftHandleRect.set_x(webViewX + leftHandleRect.x());
   leftHandleRect.set_y(webViewY + leftHandleRect.y());
index 8e55230..a3db66b 100644 (file)
@@ -6,9 +6,8 @@
 
 #include <Elementary.h>
 
-#include "base/path_service.h"
 #include "base/files/file_path.h"
-#include "content/browser/renderer_host/render_widget_host_view_efl.h"
+#include "base/path_service.h"
 #include "content/browser/selection/selection_controller_efl.h"
 #include "content/common/paths_efl.h"
 #include "content/public/browser/browser_thread.h"
@@ -168,11 +167,12 @@ void SelectionMagnifierEfl::UpdateLocation(const gfx::Point& location) {
   rect.y = content_rect.y();
   rect.w = content_rect.width();
   rect.h = content_rect.height();
-
+#if !defined(USE_AURA)
   RenderWidgetHostViewEfl* rwhv =
       static_cast<RenderWidgetHostViewEfl*>(web_contents_.GetRenderWidgetHostView());
   if (rwhv)
     rwhv->RequestSnapshotAsync(rect, MagnifierGetSnapshotCb, this);
+#endif
 }
 
 void SelectionMagnifierEfl::Move(const gfx::Point& location) {
@@ -202,11 +202,12 @@ void SelectionMagnifierEfl::Move(const gfx::Point& location) {
 void SelectionMagnifierEfl::Show() {
   shown_ = true;
   evas_object_show(container_);
-
+#if !defined(USE_AURA)
   RenderWidgetHostViewEfl* rwhv =
       static_cast<RenderWidgetHostViewEfl*>(web_contents_.GetRenderWidgetHostView());
   if (rwhv)
     rwhv->set_magnifier(true);
+#endif
   if (controller_->GetParentView())
     evas_object_smart_callback_call(controller_->GetParentView(), "magnifier,show", NULL);
 }
@@ -215,11 +216,12 @@ void SelectionMagnifierEfl::Hide() {
   shown_ = false;
   evas_object_hide(content_image_);
   evas_object_hide(container_);
-
+#if !defined(USE_AURA)
   RenderWidgetHostViewEfl* rwhv =
       static_cast<RenderWidgetHostViewEfl*>(web_contents_.GetRenderWidgetHostView());
   if (rwhv)
     rwhv->set_magnifier(false);
+#endif
   if (controller_->GetParentView())
     evas_object_smart_callback_call(controller_->GetParentView(), "magnifier,hide", NULL);
 }
index 3f14b3f..4a85445 100644 (file)
@@ -44,7 +44,7 @@ class CONTENT_EXPORT TtsMessageFilterEfl
 
   std::unique_ptr<TtsTizen> tts_tizen_;
 
-  DISALLOW_COPY_AND_ASSIGN(TtsMessageFilterEfl);
+  // DISALLOW_COPY_AND_ASSIGN(TtsMessageFilterEfl);
 };
 
 }  // namespace content
index 3236dff..8071dc7 100644 (file)
@@ -26,7 +26,7 @@ class CONTENT_EXPORT TracingControllerEfl {
   base::WeakPtrFactory<TracingControllerEfl> weak_factory_;
   std::string trace_file_name_;
 
-  DISALLOW_COPY_AND_ASSIGN(TracingControllerEfl);
+  // DISALLOW_COPY_AND_ASSIGN(TracingControllerEfl);
 };
 
 #endif  // IMPL_BROWSER_TRACING_TRACING_CONTROLLER_EFL_H_
index 478b644..1621f64 100644 (file)
@@ -76,7 +76,7 @@ class CONTENT_EXPORT WebContentsImplEfl : public WebContentsImpl {
 
   std::unique_ptr<WebContentsEflDelegate> efl_delegate_;
 
-  DISALLOW_COPY_AND_ASSIGN(WebContentsImplEfl);
+  // DISALLOW_COPY_AND_ASSIGN(WebContentsImplEfl);
 };
 
 } // namespace content
diff --git a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.cc b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.cc
deleted file mode 100644 (file)
index a8d169d..0000000
+++ /dev/null
@@ -1,377 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Copyright 2014 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "content/browser/web_contents/web_contents_view_efl.h"
-
-#include <Elementary.h>
-
-#include "base/command_line.h"
-#include "base/files/file_path.h"
-#include "base/logging.h"
-#include "base/path_service.h"
-#include "base/strings/utf_string_conversions.h"
-#include "content/browser/renderer_host/render_widget_host_view_efl.h"
-#include "content/browser/web_contents/web_contents_impl.h"
-#include "content/browser/web_contents/web_drag_dest_efl.h"
-#include "content/browser/web_contents/web_drag_source_efl.h"
-#include "content/common/paths_efl.h"
-#include "content/public/browser/render_view_host.h"
-#include "content/public/browser/web_contents_view_delegate.h"
-#include "content/public/browser/web_contents_view_efl_delegate.h"
-#include "content/public/common/content_switches.h"
-#include "efl/window_factory.h"
-#include "tizen/system_info.h"
-#include "ui/display/screen_efl.h"
-#include "ui/gfx/image/image_skia.h"
-#include "ui/gl/gl_shared_context_efl.h"
-
-namespace content {
-
-WebContentsView* CreateWebContentsView(
-    WebContentsImpl* web_contents,
-    WebContentsViewDelegate* delegate,
-    RenderViewHostDelegateView** render_view_host_delegate_view) {
-  WebContentsViewEfl* view = new WebContentsViewEfl(web_contents, delegate);
-  *render_view_host_delegate_view = view;
-  return view;
-}
-
-WebContentsViewEfl::WebContentsViewEfl(WebContents* contents,
-                                       WebContentsViewDelegate* delegate)
-    : delegate_(delegate),
-      native_view_(NULL),
-      drag_dest_delegate_(NULL),
-      orientation_(0),
-      touch_enabled_(IsMobileProfile() || IsWearableProfile()),
-      page_scale_factor_(1.0f),
-      web_contents_(contents) {
-  base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess();
-  if (cmdline->HasSwitch(switches::kTouchEventFeatureDetection)) {
-    touch_enabled_ =
-        cmdline->GetSwitchValueASCII(switches::kTouchEventFeatureDetection) ==
-        switches::kTouchEventFeatureDetectionEnabled;
-  }
-}
-
-WebContentsViewEfl::~WebContentsViewEfl() {}
-
-void WebContentsViewEfl::SetEflDelegate(WebContentsViewEflDelegate* delegate) {
-  efl_delegate_.reset(delegate);
-}
-
-WebContentsViewEflDelegate* WebContentsViewEfl::GetEflDelegate() {
-  return efl_delegate_.get();
-}
-
-void WebContentsViewEfl::CreateView(gfx::NativeView context) {
-  Evas_Object* root_window = efl::WindowFactory::GetHostWindow(web_contents_);
-
-  native_view_ = elm_layout_add(root_window);
-
-  base::FilePath edj_dir;
-  base::PathService::Get(PathsEfl::EDJE_RESOURCE_DIR, &edj_dir);
-
-  base::FilePath main_edj = edj_dir.Append(FILE_PATH_LITERAL("MainLayout.edj"));
-  elm_layout_file_set(native_view_, main_edj.AsUTF8Unsafe().c_str(),
-                      "main_layout");
-
-  GLSharedContextEfl::Initialize(root_window);
-
-  if (delegate_)
-    drag_dest_delegate_ = delegate_->GetDragDestDelegate();
-}
-
-RenderWidgetHostViewBase* WebContentsViewEfl::CreateViewForWidget(
-    RenderWidgetHost* render_widget_host) {
-  RenderWidgetHostViewEfl* view =
-      new RenderWidgetHostViewEfl(render_widget_host, *web_contents_);
-  view->InitAsChild(nullptr);
-  view->SetTouchEventsEnabled(touch_enabled_);
-  SetOrientation(orientation_);
-
-  RenderViewHost* render_view_host = web_contents_->GetRenderViewHost();
-  UpdateDragDest(render_view_host);
-
-  return view;
-}
-
-RenderWidgetHostViewBase* WebContentsViewEfl::CreateViewForChildWidget(
-    RenderWidgetHost* render_widget_host) {
-  return new RenderWidgetHostViewEfl(render_widget_host, *web_contents_);
-}
-
-void WebContentsViewEfl::SetPageTitle(const std::u16string& title) {
-  if (efl_delegate_)
-    efl_delegate_->SetPageTitle(title);
-}
-
-void WebContentsViewEfl::CancelContextMenu(int request_id) {
-  if (efl_delegate_)
-    efl_delegate_->CancelContextMenu(request_id);
-}
-
-void WebContentsViewEfl::UpdateDragDest(RenderViewHost* host) {
-  // Drag-and-drop is entirely managed by BrowserPluginGuest for guest
-  // processes in a largely platform independent way. WebDragDestEfl
-  // will result in spurious messages being sent to the guest process which
-  // will violate assumptions.
-  if (host->GetProcess() && host->GetProcess()->IsForGuestsOnly()) {
-    DCHECK(!drag_dest_);
-    return;
-  }
-
-  RenderWidgetHostViewEfl* view = static_cast<RenderWidgetHostViewEfl*>(
-      web_contents_->GetRenderWidgetHostView());
-  if (!view)
-    return;
-
-  // Create the new drag_dest_.
-  drag_dest_.reset(new WebDragDestEfl(web_contents_));
-  drag_dest_->SetPageScaleFactor(page_scale_factor_);
-
-  if (delegate_)
-    drag_dest_->SetDelegate(delegate_->GetDragDestDelegate());
-}
-
-void WebContentsViewEfl::RenderViewCreated(RenderViewHost* host) {
-  DCHECK(host->GetProcess());
-  DCHECK(web_contents_);
-}
-
-void WebContentsViewEfl::RenderViewReady() {
-  NOTIMPLEMENTED();
-}
-
-void WebContentsViewEfl::RenderViewHostChanged(RenderViewHost* old_host,
-                                               RenderViewHost* new_host) {
-  NOTIMPLEMENTED();
-}
-
-void WebContentsViewEfl::SetOverscrollControllerEnabled(bool enabled) {}
-
-gfx::NativeView WebContentsViewEfl::GetNativeView() const {
-  return native_view_;
-}
-
-gfx::NativeView WebContentsViewEfl::GetContentNativeView() const {
-  RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView();
-  return rwhv ? rwhv->GetNativeView() : NULL;
-}
-
-gfx::NativeWindow WebContentsViewEfl::GetTopLevelNativeWindow() const {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-gfx::Rect WebContentsViewEfl::GetContainerBounds() const {
-  RenderWidgetHostViewEfl* view = static_cast<RenderWidgetHostViewEfl*>(
-      web_contents_->GetRenderWidgetHostView());
-  if (view)
-    return view->GetBoundsInRootWindow();
-  return gfx::Rect();
-}
-
-void WebContentsViewEfl::SizeContents(const gfx::Size& size) {
-  RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView();
-  if (rwhv)
-    rwhv->SetSize(size);
-}
-
-void WebContentsViewEfl::Focus() {
-  if (delegate_.get() && delegate_->Focus())
-    return;
-
-  RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView();
-  if (rwhv)
-    rwhv->Focus();
-}
-
-void WebContentsViewEfl::SetInitialFocus() {
-  NOTIMPLEMENTED();
-}
-
-void WebContentsViewEfl::StoreFocus() {
-  NOTIMPLEMENTED();
-}
-
-void WebContentsViewEfl::RestoreFocus() {
-  NOTIMPLEMENTED();
-}
-
-void WebContentsViewEfl::FocusThroughTabTraversal(bool reverse) {
-  NOTIMPLEMENTED();
-}
-
-DropData* WebContentsViewEfl::GetDropData() const {
-  if (drag_dest_.get())
-    return drag_dest_->GetDropData();
-  return nullptr;
-}
-
-gfx::Rect WebContentsViewEfl::GetViewBounds() const {
-  int x, y, w, h;
-  evas_object_geometry_get(native_view_, &x, &y, &w, &h);
-  return gfx::Rect(x, y, w, h);
-}
-
-void WebContentsViewEfl::ShowContextMenu(RenderFrameHost* render_frame_host,
-                                         const ContextMenuParams& params) {
-  if (delegate_)
-    delegate_->ShowContextMenu(render_frame_host, params);
-}
-
-// Note: This is a EFL specific extension to WebContentsView responsible
-// for actually displaying a context menu UI.
-// On the other side, its overload method (above) is called by chromium
-// in response to a long press gesture. It is up to the embedder to define
-// how this long press gesture will be
-// handled, e.g. showing context menu right away or afte user lifts up his
-// finger.
-void WebContentsViewEfl::ShowContextMenu(const ContextMenuParams& params) {
-  if (efl_delegate_)
-    efl_delegate_->ShowContextMenu(params);
-}
-
-void WebContentsViewEfl::QuerySelectionStyle() {
-  if (efl_delegate_)
-    efl_delegate_->QuerySelectionStyle();
-}
-
-#if BUILDFLAG(USE_EXTERNAL_POPUP_MENU)
-void WebContentsViewEfl::ShowPopupMenu(RenderFrameHost* render_frame_host,
-                                       const gfx::Rect& bounds,
-                                       int item_height,
-                                       double item_font_size,
-                                       int selected_item,
-                                       const std::vector<MenuItem>& items,
-                                       bool right_aligned,
-                                       bool allow_multiple_selection) {
-  if (efl_delegate_)
-    efl_delegate_->ShowPopupMenu(render_frame_host, bounds, item_height,
-                                 item_font_size, selected_item, items,
-                                 right_aligned, allow_multiple_selection);
-}
-
-void WebContentsViewEfl::HidePopupMenu() {
-  if (efl_delegate_)
-    efl_delegate_->HidePopupMenu();
-}
-#endif
-
-void WebContentsViewEfl::StartDragging(
-    const DropData& drop_data,
-    blink::DragOperationsMask allowed_ops,
-    const gfx::ImageSkia& image,
-    const gfx::Vector2d& image_offset,
-    const blink::mojom::DragEventSourceInfo& event_info,
-    RenderWidgetHostImpl* source_rwh) {
-  if (drag_dest_.get()) {
-    drag_dest_->SetDropData(drop_data);
-    drag_dest_->SetAction(allowed_ops);
-  }
-
-  if (!drag_source_) {
-    drag_source_.reset(new WebDragSourceEfl(web_contents_));
-    drag_source_->SetPageScaleFactor(page_scale_factor_);
-  }
-
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  if (!drag_source_->StartDragging(drop_data, allowed_ops,
-                                   event_info.event_location, *image.bitmap(),
-                                   image_offset)) {
-    web_contents_->SystemDragEnded();
-  }
-#endif  // !defined(EWK_BRINGUP)
-}
-
-bool WebContentsViewEfl::IsDragging() const {
-  if (!drag_source_)
-    return false;
-  return drag_source_->IsDragging();
-}
-
-void WebContentsViewEfl::SetOrientation(int orientation) {
-  RenderWidgetHostViewEfl* rwhv = static_cast<RenderWidgetHostViewEfl*>(
-      web_contents_->GetRenderWidgetHostView());
-
-  if (rwhv) {
-    RenderWidgetHost* rwh = rwhv->GetRenderWidgetHost();
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-    // FIXME: EWK_BRINGUP definition should be removed.
-    blink::WebScreenInfo screen_info;
-    rwh->GetWebScreenInfo(&screen_info);
-    screen_info.orientationAngle = orientation;
-#endif  // !defined(EWK_BRINGUP)
-
-    gfx::Size new_size, backing_size;
-    gfx::Rect bounds_px = rwhv->GetViewBoundsInPix();
-    gfx::Rect bounds = rwhv->GetViewBounds();
-
-    if (orientation == 90 || orientation == 270) {
-      new_size = gfx::Size(bounds.height(), bounds.width());
-      backing_size = gfx::Size(bounds_px.height(), bounds_px.width());
-    } else {
-      new_size = gfx::Size(bounds.width(), bounds.height());
-      backing_size = gfx::Size(bounds_px.width(), bounds_px.height());
-    }
-
-    WebContentsImpl& contents_impl =
-        static_cast<WebContentsImpl&>(*web_contents_);
-
-#if !defined(EWK_BRINGUP)  // FIXME: m69 bringup
-    // FIXME: EWK_BRINGUP definition should be removed.
-    ResizeParams params;
-    params.screen_info = screen_info;
-    params.new_size = new_size;
-    params.physical_backing_size = backing_size;
-    params.is_fullscreen_granted = contents_impl.IsFullscreenForCurrentTab();
-    rwh->Send(new ViewMsg_Resize(rwh->GetRoutingID(), params));
-#endif
-    rwhv->UpdateScreenInfo();
-
-    contents_impl.OnScreenOrientationChange();
-
-    rwhv->UpdateRotationDegrees(orientation);
-  }
-
-  orientation_ = orientation;
-}
-
-void WebContentsViewEfl::SetTouchEventsEnabled(bool enabled) {
-  touch_enabled_ = enabled;
-  RenderWidgetHostViewEfl* rwhv = static_cast<RenderWidgetHostViewEfl*>(
-      web_contents_->GetRenderWidgetHostView());
-  if (rwhv)
-    rwhv->SetTouchEventsEnabled(enabled);
-}
-
-void WebContentsViewEfl::SetPageScaleFactor(float scale) {
-  page_scale_factor_ = scale;
-  if (drag_source_)
-    drag_source_->SetPageScaleFactor(scale);
-  if (drag_dest_)
-    drag_dest_->SetPageScaleFactor(scale);
-}
-
-void WebContentsViewEfl::HandleZoomGesture(blink::WebGestureEvent& event) {
-  if (efl_delegate_)
-    efl_delegate_->HandleZoomGesture(event);
-}
-
-bool WebContentsViewEfl::UseKeyPadWithoutUserAction() {
-  if (efl_delegate_)
-    return efl_delegate_->UseKeyPadWithoutUserAction();
-  return false;
-}
-
-void WebContentsViewEfl::OnOverscrolled(
-    const gfx::Vector2dF& accumulated_overscroll,
-    const gfx::Vector2dF& latest_overscroll_delta) {
-  if (efl_delegate_)
-    efl_delegate_->OnOverscrolled(accumulated_overscroll,
-                                  latest_overscroll_delta);
-}
-
-}  // namespace content
diff --git a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.h b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.h
deleted file mode 100644 (file)
index 5d6643e..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Copyright 2014 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef WEB_CONTENTS_VIEW_EFL
-#define WEB_CONTENTS_VIEW_EFL
-
-#include <Evas.h>
-
-#include "content/browser/renderer_host/render_view_host_delegate_view.h"
-#include "content/browser/web_contents/web_contents_view.h"
-#include "content/common/content_export.h"
-#include "third_party/blink/public/common/input/web_gesture_event.h"
-#include "third_party/blink/public/common/input/web_input_event.h"
-
-namespace content {
-
-class WebContents;
-class WebContentsViewDelegate;
-class WebContentsViewEflDelegate;
-class WebDragDestEfl;
-class WebDragSourceEfl;
-class WebDragDestDelegate;
-struct ScreenInfo;
-
-class CONTENT_EXPORT WebContentsViewEfl
-    : public content::WebContentsView
-    , public content::RenderViewHostDelegateView {
- public:
-  WebContentsViewEfl(WebContents* contents,
-                     WebContentsViewDelegate* delegate = NULL);
-  ~WebContentsViewEfl() override;
-
-  void SetEflDelegate(WebContentsViewEflDelegate*);
-  WebContentsViewEflDelegate* GetEflDelegate();
-
-  // content::WebContentsView implementation.
-  void CreateView(gfx::NativeView context) override;
-  RenderWidgetHostViewBase* CreateViewForWidget(
-      RenderWidgetHost* render_widget_host) override;
-  RenderWidgetHostViewBase* CreateViewForChildWidget(
-      RenderWidgetHost* render_widget_host) override;
-  void SetPageTitle(const std::u16string& title) override;
-  void RenderViewCreated(RenderViewHost* host);
-  void RenderViewReady() override;
-  void RenderViewHostChanged(RenderViewHost* old_host,
-                             RenderViewHost* new_host) override;
-  void SetOverscrollControllerEnabled(bool enabled) override;
-  gfx::NativeView GetNativeView() const override;
-  gfx::NativeView GetContentNativeView() const override;
-  gfx::NativeWindow GetTopLevelNativeWindow() const override;
-  gfx::Rect GetContainerBounds() const override;
-  void SizeContents(const gfx::Size& size);
-  void Focus() override;
-  void SetInitialFocus() override;
-  void StoreFocus() override;
-  void RestoreFocus() override;
-  void FocusThroughTabTraversal(bool reverse) override;
-  DropData* GetDropData() const override;
-  gfx::Rect GetViewBounds() const override;
-
-  // content::RenderViewHostDelegateView implementation.
-  void ShowContextMenu(RenderFrameHost* render_frame_host,
-                       const ContextMenuParams& params) override;
-  void ShowContextMenu(const ContextMenuParams& params);
-#if BUILDFLAG(USE_EXTERNAL_POPUP_MENU)
-  void ShowPopupMenu(RenderFrameHost* render_frame_host,
-                     const gfx::Rect& bounds,
-                     int item_height,
-                     double item_font_size,
-                     int selected_item,
-                     const std::vector<MenuItem>& items,
-                     bool right_aligned,
-                     bool allow_multiple_selection) override;
-  void HidePopupMenu() override;
-#endif
-  void UpdateDragDest(RenderViewHost* host);
-  void StartDragging(const DropData& drop_data,
-                     blink::DragOperationsMask allowed_ops,
-                     const gfx::ImageSkia& image,
-                     const gfx::Vector2d& image_offset,
-                     const blink::mojom::DragEventSourceInfo& event_info,
-                     RenderWidgetHostImpl* source_rwh) override;
-  void CancelContextMenu(int request_id);
-  bool IsDragging() const;
-
-  void SetOrientation(int orientation);
-  int GetOrientation() const { return orientation_; }
-  void SetTouchEventsEnabled(bool);
-  void SetPageScaleFactor(float);
-  void QuerySelectionStyle();
-
-  void HandleZoomGesture(blink::WebGestureEvent& event);
-
-  bool UseKeyPadWithoutUserAction();
-
-  void OnOverscrolled(const gfx::Vector2dF& accumulated_overscroll,
-                      const gfx::Vector2dF& latest_overscroll_delta);
-
-private:
-  // Our optional, generic views wrapper.
-  std::unique_ptr<WebContentsViewDelegate> delegate_;
-
-  // Delegate specific to EFL port of chromium.
-  // May be NULL in case of non EWK apps.
-  std::unique_ptr<WebContentsViewEflDelegate> efl_delegate_;
-
-  Evas_Object* native_view_;
-
-  WebDragDestDelegate* drag_dest_delegate_;
-
-  // Helpers handling drag source/destination related interactions with EFL.
-  std::unique_ptr<WebDragSourceEfl> drag_source_;
-  std::unique_ptr<WebDragDestEfl> drag_dest_;
-
-  int orientation_;
-  bool touch_enabled_;
-  float page_scale_factor_;
-
-  WebContents* web_contents_;
-
-  DISALLOW_COPY_AND_ASSIGN(WebContentsViewEfl);
-};
-
-}
-
-#endif
index 0c52f57..75dc051 100644 (file)
@@ -41,9 +41,13 @@ WebDragDestEfl::WebDragDestEfl(WebContents* web_contents)
     : modifier_flags_(0),
       delegate_(nullptr),
       web_contents_(web_contents),
-      parent_view_(static_cast<Evas_Object*>(web_contents->GetNativeView())),
       page_scale_factor_(1.0f),
       drag_initialized_(false) {
+#if defined(USE_AURA)
+  parent_view_ = nullptr;
+#else
+  parent_view_ = static_cast<Evas_Object*>(web_contents->GetNativeView());
+#endif
   device_scale_factor_ = display::Screen::GetScreen()->
       GetPrimaryDisplay().device_scale_factor();
   SetDragCallbacks();
index 7f3438a..dc86f0a 100644 (file)
@@ -74,7 +74,7 @@ class WebDragDestEfl {
   // The data for the current drag, or NULL if |context_| is NULL.
   std::unique_ptr<DropData> drop_data_;
 
-  DISALLOW_COPY_AND_ASSIGN(WebDragDestEfl);
+  // DISALLOW_COPY_AND_ASSIGN(WebDragDestEfl);
 };
 }  // namespace content
 
index 0ff7fef..57a668b 100644 (file)
@@ -56,11 +56,13 @@ void DragStateCb(void* data, Evas_Object* obj) {
 }  // namespace
 
 WebDragSourceEfl::WebDragSourceEfl(WebContents* web_contents)
-    : parent_view_(static_cast<Evas_Object*>(web_contents->GetNativeView())),
-      web_contents_(static_cast<WebContentsImpl*>(web_contents)),
+    : web_contents_(static_cast<WebContentsImpl*>(web_contents)),
       drag_failed_(false),
       drag_started_(false),
       page_scale_factor_(1.0f) {
+#if !defined(USE_AURA)
+  parent_view_ = static_cast<Evas_Object*>(web_contents->GetNativeView());
+#endif
   device_scale_factor_ =
       display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor();
 }
index 0c08b24..28a4e55 100644 (file)
@@ -97,7 +97,7 @@ class WebDragSourceEfl {
   gfx::Point initial_position_;
   gfx::Point last_pointer_pos_;
 
-  DISALLOW_COPY_AND_ASSIGN(WebDragSourceEfl);
+  // DISALLOW_COPY_AND_ASSIGN(WebDragSourceEfl);
 };
 
 }  // namespace content
index 06fed0a..761a88b 100644 (file)
@@ -166,4 +166,6 @@ int GetCursorType(ui::mojom::CursorType type) {
 }
 #endif // defined(USE_WAYLAND)
 
+#if !defined(USE_AURA)
 void content::WebCursor::CleanupPlatformData() {}
+#endif
index 0338f9f..4dcb2a7 100644 (file)
@@ -38,7 +38,7 @@ class CONTENT_EXPORT TizenVideoDecodeAccelerator
 
   Impl* impl_;
 
-  DISALLOW_COPY_AND_ASSIGN(TizenVideoDecodeAccelerator);
+  // DISALLOW_COPY_AND_ASSIGN(TizenVideoDecodeAccelerator);
 };
 
 }  // namespace content
index 005f3a9..d4e2e12 100644 (file)
@@ -44,7 +44,7 @@ class CONTENT_EXPORT TizenVideoEncodeAccelerator
 
   Impl* impl_;
 
-  DISALLOW_COPY_AND_ASSIGN(TizenVideoEncodeAccelerator);
+  // DISALLOW_COPY_AND_ASSIGN(TizenVideoEncodeAccelerator);
 };
 
 }  // namespace content
index 3d4166c..27c94af 100644 (file)
@@ -4,8 +4,8 @@
 
 #include "base/command_line.h"
 #include "base/time/time.h"
+#include "content/child/child_process.h"
 #include "content/gpu/gpu_child_thread.h"
-#include "content/gpu/gpu_process.h"
 #include "content/gpu/in_process_gpu_thread.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
@@ -31,8 +31,10 @@ struct GpuChildThreadEfl : public content::GpuChildThread {
     GpuChildThread::SetGpuServiceConnection(gpu_service);
     gpu_service->gpu_channel_manager()->share_group_ =
         GLSharedContextEfl::GetShareGroup();
+#if !defined(USE_AURA)
     SharedMailboxManager::SetMailboxManager(
         gpu_service->gpu_channel_manager()->mailbox_manager());
+#endif
   }
 };
 
@@ -43,7 +45,7 @@ struct InProcessGpuThreadEfl : public content::InProcessGpuThread {
       : InProcessGpuThread(params, gpu_preferences) {}
 
   void Init() override {
-    gpu_process_ = new content::GpuProcess(base::ThreadPriority::NORMAL);
+    gpu_process_ = std::make_unique<ChildProcess>(base::ThreadType::kDefault);
 
     auto gpu_init = std::make_unique<gpu::GpuInit>();
     gpu_init->InitializeInProcess(base::CommandLine::ForCurrentProcess(),
@@ -58,7 +60,7 @@ struct InProcessGpuThreadEfl : public content::InProcessGpuThread {
 
     // Since we are in the browser process, use the thread start time as the
     // process start time.
-    child_thread->Init(base::Time::Now());
+    child_thread->Init(base::TimeTicks::Now());
 
     gpu_process_->set_main_thread(child_thread);
   }
index a4884bc..d6c75b7 100644 (file)
@@ -79,7 +79,7 @@ class RendererDemuxerEfl : public IPC::MessageFilter {
   scoped_refptr<ThreadSafeSender> thread_safe_sender_;
   scoped_refptr<base::SingleThreadTaskRunner> media_task_runner_;
 
-  DISALLOW_COPY_AND_ASSIGN(RendererDemuxerEfl);
+  // DISALLOW_COPY_AND_ASSIGN(RendererDemuxerEfl);
 };
 
 } // namespace content
index bfb4d04..8a478ab 100644 (file)
@@ -95,7 +95,7 @@ class RendererMediaPlayerManager : public RenderFrameObserver {
   std::map<int, WebMediaPlayerEfl*> media_players_;
   int next_media_player_id_;
 
-  DISALLOW_COPY_AND_ASSIGN(RendererMediaPlayerManager);
+  // DISALLOW_COPY_AND_ASSIGN(RendererMediaPlayerManager);
 };
 
 }  // namespace content
index d145e68..cbc95af 100644 (file)
@@ -255,7 +255,7 @@ class WebMediaPlayerEfl
   scoped_ptr<media::EncryptedMediaPlayerSupport> encrypted_media_support_;
 #endif
 
-  DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerEfl);
+  // DISALLOW_COPY_AND_ASSIGN(WebMediaPlayerEfl);
 };
 
 }  // namespace content
index 4956804..33a00b3 100644 (file)
@@ -43,7 +43,7 @@ class AudioDecoderIO {
   int read_fd_;
   int write_fd_;
 
-  DISALLOW_COPY_AND_ASSIGN(AudioDecoderIO);
+  // DISALLOW_COPY_AND_ASSIGN(AudioDecoderIO);
 };
 
 AudioDecoderIO::AudioDecoderIO(const char* data, size_t data_size)
index b8a7bda..0049513 100644 (file)
@@ -72,7 +72,7 @@ class CONTENT_EXPORT TtsDispatcherEfl
   // Map from id to utterance objects.
   std::map<int, blink::WebSpeechSynthesisUtterance> utterance_id_map_;
 
-  DISALLOW_COPY_AND_ASSIGN(TtsDispatcherEfl);
+  // DISALLOW_COPY_AND_ASSIGN(TtsDispatcherEfl);
 };
 
 }  // namespace content
index 2373c75..d78ab09 100644 (file)
@@ -40,11 +40,13 @@ class Shell::Impl {
     if (!switches::IsRunWebTestsSwitchPresent())
       CreateURLBar(box);
 
+#if !defined(USE_AURA)
     Evas_Object* view =
         static_cast<Evas_Object*>(shell->web_contents()->GetNativeView());
     evas_object_size_hint_align_set(view, EVAS_HINT_FILL, EVAS_HINT_FILL);
     evas_object_size_hint_weight_set(view, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
     elm_box_pack_end(box, view);
+#endif
   }
 
   void CreateURLBar(Evas_Object* box) {
index 5191ea4..1489c8d 100644 (file)
@@ -95,6 +95,7 @@ ShellWebContentsViewDelegate::~ShellWebContentsViewDelegate() {}
 void ShellWebContentsViewDelegate::ShowContextMenu(
     RenderFrameHost* render_frame_host,
     const ContextMenuParams& params) {
+#if !defined(USE_AURA)
   if (switches::IsRunWebTestsSwitchPresent())
     return;
 
@@ -158,6 +159,7 @@ void ShellWebContentsViewDelegate::ShowContextMenu(
   g_context_menu = menu;
   elm_menu_move(menu, params.x, params.y);
   evas_object_show(menu);
+#endif
 }
 
 }  // namespace content
index 23b63bb..108fe07 100644 (file)
@@ -32,7 +32,7 @@ class BatteryStatusManagerTizen : public BatteryStatusManager {
   BatteryStatus current_status_;
   BatteryStatusService::BatteryUpdateCallback callback_;
 
-  DISALLOW_COPY_AND_ASSIGN(BatteryStatusManagerTizen);
+  // DISALLOW_COPY_AND_ASSIGN(BatteryStatusManagerTizen);
 };
 
 }  // namespace content
index 3b5aca7..e1e4c69 100644 (file)
@@ -17,7 +17,6 @@
 #include "gpu/config/gpu_switches.h"
 #include "tizen/system_info.h"
 #include "ui/compositor/compositor_switches.h"
-#include "ui/display/screen_efl.h"
 #include "ui/gfx/switches.h"
 #include "ui/gl/gl_switches.h"
 #include "ui/ozone/public/ozone_platform.h"
@@ -61,8 +60,6 @@ int Initialize(int argc, const char* argv[]) {
 
   base::MessagePump::OverrideMessagePumpForUIFactory(&MessagePumpFactory);
 
-  ui::InstallScreenInstance();
-
 #if defined(USE_OZONE)
   ui::OzonePlatform::InitParams params;
 
diff --git a/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.cc b/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.cc
deleted file mode 100644 (file)
index 33fb71a..0000000
+++ /dev/null
@@ -1,342 +0,0 @@
-// Copyright (c) 2015 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "gpu/command_buffer/client/gles2_implementation_efl.h"
-
-#include "base/logging.h"
-#include "gpu/command_buffer/client/shared_mailbox_manager.h"
-#include "gpu/command_buffer/service/mailbox_manager.h"
-#include "ui/gl/gl_shared_context_efl.h"
-
-// Defined in gl_current_context_efl.cc because of conflicts of
-// texture_manager.h with efl GL API wrappers.
-namespace content {
-extern GLuint GetTextureIdFromTexture(gpu::TextureBase* texture);
-}
-
-namespace gpu {
-namespace gles2 {
-
-// The size of provisional textures array.
-static const unsigned kMaxTextureId = 1024;
-
-GLES2ImplementationEfl::GLES2ImplementationEfl(Evas_GL_API* evas_gl_api)
-    : evas_gl_api_(evas_gl_api), current_program_(0), bound_texture_id_(0) {}
-
-GLES2ImplementationEfl::~GLES2ImplementationEfl() {}
-
-// Include the auto-generated part of this class. We split this because
-// it means we can easily edit the non-auto generated parts right here in
-// this file instead of having to edit some template or the code generator.
-#include "gpu/command_buffer/client/gles2_implementation_efl_autogen.h"
-
-bool GLES2ImplementationEfl::IsSyncTokenSignaled(
-    const gpu::SyncToken& sync_token) {
-  // TODO: Check if this has to return false.
-  return true;
-}
-
-uint64_t GLES2ImplementationEfl::ShareGroupTracingGUID() const {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-bool GLES2ImplementationEfl::ThreadSafeShallowLockDiscardableTexture(
-    uint32_t texture_id) {
-  NOTIMPLEMENTED();
-  return false;
-}
-
-bool GLES2ImplementationEfl::ThreadsafeDiscardableTextureIsDeletedForTracing(
-    uint32_t texture_id) {
-  NOTIMPLEMENTED();
-  return false;
-}
-
-void* GLES2ImplementationEfl::MapTransferCacheEntry(uint32_t serialized_size) {
-  NOTIMPLEMENTED();
-  return nullptr;
-}
-
-bool GLES2ImplementationEfl::ThreadsafeLockTransferCacheEntry(
-    uint32_t entry_type,
-    uint32_t entry_id) {
-  NOTIMPLEMENTED();
-  return false;
-}
-
-unsigned int GLES2ImplementationEfl::GetTransferBufferFreeSize() const {
-  NOTIMPLEMENTED();
-  return 0;
-}
-
-bool GLES2ImplementationEfl::IsJpegDecodeAccelerationSupported() const {
-  NOTREACHED();
-  return false;
-}
-
-bool GLES2ImplementationEfl::IsWebPDecodeAccelerationSupported() const {
-  NOTREACHED();
-  return false;
-}
-
-bool GLES2ImplementationEfl::CanDecodeWithHardwareAcceleration(
-    const cc::ImageHeaderMetadata* image_metadata) const {
-  NOTREACHED();
-  return false;
-}
-
-bool GLES2ImplementationEfl::HasGrContextSupport() const {
-  // TODO: Check if this has to return false.
-  return true;
-}
-
-GLES2ImplementationEfl::ProgramData& GLES2ImplementationEfl::GetProgramData(
-    GLint program) {
-  auto it_program = program_map_.find(program);
-  DCHECK(it_program != program_map_.end());
-  return it_program->second;
-}
-
-GLuint GLES2ImplementationEfl::DoCreateProgram() {
-  GLuint program = evas_gl_api_->glCreateProgram();
-  ProgramData program_data;
-  program_data.service_id_ = program;
-  program_map_[program] = program_data;
-  return program;
-}
-
-void GLES2ImplementationEfl::DoUseProgram(GLuint program) {
-  evas_gl_api_->glUseProgram(program);
-  current_program_ = program;
-}
-
-void GLES2ImplementationEfl::DoDeleteProgram(GLuint program) {
-  program_map_.erase(program);
-  evas_gl_api_->glDeleteProgram(program);
-}
-
-GLint GLES2ImplementationEfl::GetBoundUniformLocation(GLint location) {
-  const ProgramData& program_data = GetProgramData(current_program_);
-
-  auto it_location = program_data.uniform_location_map_.find(location);
-  DCHECK(it_location != program_data.uniform_location_map_.end());
-  const std::string& name = it_location->second;
-
-  return evas_gl_api_->glGetUniformLocation(program_data.service_id_,
-                                            name.c_str());
-}
-
-void GLES2ImplementationEfl::DoBindUniformLocationCHROMIUM(GLuint program,
-                                                           GLint location,
-                                                           const char* name) {
-  DCHECK(program);
-
-  ProgramData& program_data = GetProgramData(program);
-  program_data.uniform_location_map_[location] = name;
-}
-
-void GLES2ImplementationEfl::DoUniform1f(GLint location, GLfloat x) {
-  location = GetBoundUniformLocation(location);
-  evas_gl_api_->glUniform1f(location, x);
-}
-
-void GLES2ImplementationEfl::DoUniform1fv(GLint location,
-                                          GLsizei count,
-                                          const GLfloat* v) {
-  location = GetBoundUniformLocation(location);
-  evas_gl_api_->glUniform1fv(location, count, v);
-}
-
-void GLES2ImplementationEfl::DoUniform1i(GLint location, GLint x) {
-  location = GetBoundUniformLocation(location);
-  evas_gl_api_->glUniform1i(location, x);
-}
-
-void GLES2ImplementationEfl::DoUniform1iv(GLint location,
-                                          GLsizei count,
-                                          const GLint* v) {
-  location = GetBoundUniformLocation(location);
-  evas_gl_api_->glUniform1iv(location, count, v);
-}
-
-void GLES2ImplementationEfl::DoUniform2f(GLint location, GLfloat x, GLfloat y) {
-  location = GetBoundUniformLocation(location);
-  evas_gl_api_->glUniform2f(location, x, y);
-}
-
-void GLES2ImplementationEfl::DoUniform2fv(GLint location,
-                                          GLsizei count,
-                                          const GLfloat* v) {
-  location = GetBoundUniformLocation(location);
-  evas_gl_api_->glUniform2fv(location, count, v);
-}
-
-void GLES2ImplementationEfl::DoUniform2i(GLint location, GLint x, GLint y) {
-  location = GetBoundUniformLocation(location);
-  evas_gl_api_->glUniform2i(location, x, y);
-}
-
-void GLES2ImplementationEfl::DoUniform2iv(GLint location,
-                                          GLsizei count,
-                                          const GLint* v) {
-  location = GetBoundUniformLocation(location);
-  evas_gl_api_->glUniform2iv(location, count, v);
-}
-
-void GLES2ImplementationEfl::DoUniform3f(GLint location,
-                                         GLfloat x,
-                                         GLfloat y,
-                                         GLfloat z) {
-  location = GetBoundUniformLocation(location);
-  evas_gl_api_->glUniform3f(location, x, y, z);
-}
-
-void GLES2ImplementationEfl::DoUniform3fv(GLint location,
-                                          GLsizei count,
-                                          const GLfloat* v) {
-  location = GetBoundUniformLocation(location);
-  evas_gl_api_->glUniform3fv(location, count, v);
-}
-
-void GLES2ImplementationEfl::DoUniform3i(GLint location,
-                                         GLint x,
-                                         GLint y,
-                                         GLint z) {
-  location = GetBoundUniformLocation(location);
-  evas_gl_api_->glUniform3i(location, x, y, z);
-}
-
-void GLES2ImplementationEfl::DoUniform3iv(GLint location,
-                                          GLsizei count,
-                                          const GLint* v) {
-  location = GetBoundUniformLocation(location);
-  evas_gl_api_->glUniform3iv(location, count, v);
-}
-
-void GLES2ImplementationEfl::DoUniform4f(GLint location,
-                                         GLfloat x,
-                                         GLfloat y,
-                                         GLfloat z,
-                                         GLfloat w) {
-  location = GetBoundUniformLocation(location);
-  evas_gl_api_->glUniform4f(location, x, y, z, w);
-}
-
-void GLES2ImplementationEfl::DoUniform4fv(GLint location,
-                                          GLsizei count,
-                                          const GLfloat* v) {
-  location = GetBoundUniformLocation(location);
-  evas_gl_api_->glUniform4fv(location, count, v);
-}
-
-void GLES2ImplementationEfl::DoUniform4i(GLint location,
-                                         GLint x,
-                                         GLint y,
-                                         GLint z,
-                                         GLint w) {
-  location = GetBoundUniformLocation(location);
-  evas_gl_api_->glUniform4i(location, x, y, z, w);
-}
-
-void GLES2ImplementationEfl::DoUniform4iv(GLint location,
-                                          GLsizei count,
-                                          const GLint* v) {
-  location = GetBoundUniformLocation(location);
-  evas_gl_api_->glUniform4iv(location, count, v);
-}
-
-void GLES2ImplementationEfl::DoUniformMatrix2fv(GLint location,
-                                                GLsizei count,
-                                                GLboolean transpose,
-                                                const GLfloat* value) {
-  location = GetBoundUniformLocation(location);
-  evas_gl_api_->glUniformMatrix2fv(location, count, transpose, value);
-}
-
-void GLES2ImplementationEfl::DoUniformMatrix3fv(GLint location,
-                                                GLsizei count,
-                                                GLboolean transpose,
-                                                const GLfloat* value) {
-  location = GetBoundUniformLocation(location);
-  evas_gl_api_->glUniformMatrix3fv(location, count, transpose, value);
-}
-
-void GLES2ImplementationEfl::DoUniformMatrix4fv(GLint location,
-                                                GLsizei count,
-                                                GLboolean transpose,
-                                                const GLfloat* value) {
-  location = GetBoundUniformLocation(location);
-  evas_gl_api_->glUniformMatrix4fv(location, count, transpose, value);
-}
-
-void GLES2ImplementationEfl::DoGenTextures(GLsizei n, GLuint* textures) {
-  GLuint texture_ids[kMaxTextureId];
-  size_t index = 0;
-
-  for (index = 0; index < kMaxTextureId; index++) {
-    evas_gl_api_->glGenTextures(1, &texture_ids[index]);
-    if (!texture_consumed_map_.count(texture_ids[index]))
-      break;
-  }
-
-  // Delete provisionally generated but already consumed textures.
-  for (size_t i = 0; i < index; i++)
-    evas_gl_api_->glDeleteTextures(1, &texture_ids[i]);
-
-  textures_.insert(texture_ids[index]);
-  textures[0] = texture_ids[index];
-}
-
-GLuint GLES2ImplementationEfl::DoCreateAndConsumeTextureCHROMIUM(
-    const GLbyte* data) {
-  const Mailbox& mailbox = *reinterpret_cast<const Mailbox*>(data);
-  DCHECK(mailbox.Verify());
-
-  TextureBase* texture =
-      SharedMailboxManager::GetMailboxManager()->ConsumeTexture(mailbox);
-  if (!texture) {
-    LOG(ERROR) << __FUNCTION__ << " invalid mailbox name";
-    return bound_texture_id_;
-  }
-
-  GLuint bound_texture_id = ++bound_texture_id_;
-
-  while (textures_.count(bound_texture_id))
-    bound_texture_id = ++bound_texture_id_;
-
-  GLuint texid = ::content::GetTextureIdFromTexture(texture);
-  texture_consumed_map_[bound_texture_id] = texid;
-  return bound_texture_id;
-}
-
-void GLES2ImplementationEfl::DoBindTexture(GLenum target, GLuint texture) {
-  DCHECK(target == GL_TEXTURE_2D);
-  auto it_texture_consumed = texture_consumed_map_.find(texture);
-  if (it_texture_consumed != texture_consumed_map_.end())
-    evas_gl_api_->glBindTexture(target, it_texture_consumed->second);
-  else if (textures_.count(texture))
-    evas_gl_api_->glBindTexture(target, texture);
-}
-
-void GLES2ImplementationEfl::DoDeleteTextures(GLsizei n,
-                                              const GLuint* textures) {
-  auto it_texture_consumed = texture_consumed_map_.find(textures[0]);
-  if (it_texture_consumed != texture_consumed_map_.end()) {
-    texture_consumed_map_.erase(it_texture_consumed);
-  } else {
-    textures_.erase(textures[0]);
-    evas_gl_api_->glDeleteTextures(n, textures);
-  }
-}
-
-GLuint GLES2ImplementationEfl::DoInsertFenceSyncCHROMIUM() {
-  return 1;
-}
-
-void GLES2ImplementationEfl::DoWaitSyncTokenCHROMIUM(
-    const GLbyte* /* sync_token */) {}
-
-}  // namespace gles2
-}  // namespace gpu
diff --git a/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.h b/tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.h
deleted file mode 100644 (file)
index 5b86382..0000000
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright (c) 2015 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_EFL_H_
-#define GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_EFL_H_
-
-#include <Evas_GL.h>
-
-#include "gpu/command_buffer/client/context_support.h"
-#include "gpu/command_buffer/client/gles2_impl_export.h"
-#include "gpu/command_buffer/client/gles2_interface.h"
-
-#include <map>
-#include <set>
-
-namespace gpu {
-namespace gles2 {
-
-class GLES2_IMPL_EXPORT GLES2ImplementationEfl : public ContextSupport,
-                                                 public GLES2Interface {
- public:
-  GLES2ImplementationEfl(Evas_GL_API* evas_gl_api);
-  ~GLES2ImplementationEfl() override;
-
-// Include the auto-generated part of this class. We split this because
-// it means we can easily edit the non-auto generated parts right here in
-// this file instead of having to edit some template or the code generator.
-#include "gpu/command_buffer/client/gles2_implementation_efl_header_autogen.h"
-
-  // ContextSupport implementation.
-  void FlushPendingWork() override {}
-  void SignalSyncToken(const gpu::SyncToken& sync_token,
-                       base::OnceClosure callback) override {}
-  bool IsSyncTokenSignaled(const gpu::SyncToken& sync_token) override;
-  void SignalQuery(uint32_t query, base::OnceClosure callback) override {}
-  void GetGpuFence(uint32_t gpu_fence_id,
-                   base::OnceCallback<void(std::unique_ptr<gfx::GpuFence>)>
-                       callback) override {}
-  void SetAggressivelyFreeResources(bool aggressively_free_resources) override {
-  }
-  void Swap(uint32_t flags,
-            SwapCompletedCallback complete_callback,
-            PresentationCallback presentation_callback) override {}
-  void SwapWithBounds(const std::vector<gfx::Rect>& rects,
-                      uint32_t flags,
-                      SwapCompletedCallback swap_completed,
-                      PresentationCallback presentation_callback) override {}
-  void PartialSwapBuffers(const gfx::Rect& sub_buffer,
-                          uint32_t flags,
-                          SwapCompletedCallback swap_completed,
-                          PresentationCallback presentation_callback) override {
-  }
-  void CommitOverlayPlanes(
-      uint32_t flags,
-      SwapCompletedCallback swap_completed,
-      PresentationCallback presentation_callback) override {}
-  void ScheduleOverlayPlane(int plane_z_order,
-                            gfx::OverlayTransform plane_transform,
-                            unsigned overlay_texture_id,
-                            const gfx::Rect& display_bounds,
-                            const gfx::RectF& uv_rect,
-                            bool enable_blend,
-                            unsigned gpu_fence_id) override {}
-  uint64_t ShareGroupTracingGUID() const override;
-  void SetErrorMessageCallback(
-      base::RepeatingCallback<void(const char*, int32_t)> callback) override {}
-  bool ThreadSafeShallowLockDiscardableTexture(uint32_t texture_id) override;
-  void CompleteLockDiscardableTexureOnContextThread(
-      uint32_t texture_id) override {}
-  bool ThreadsafeDiscardableTextureIsDeletedForTracing(
-      uint32_t texture_id) override;
-  void* MapTransferCacheEntry(uint32_t serialized_size) override;
-  void UnmapAndCreateTransferCacheEntry(uint32_t type, uint32_t id) override {}
-  bool ThreadsafeLockTransferCacheEntry(uint32_t entry_type,
-                                        uint32_t entry_id) override;
-  void UnlockTransferCacheEntries(
-      const std::vector<std::pair<uint32_t, uint32_t>>& entries) override {}
-  void DeleteTransferCacheEntry(uint32_t entry_type,
-                                uint32_t entry_id) override {}
-  unsigned int GetTransferBufferFreeSize() const override;
-  bool IsJpegDecodeAccelerationSupported() const override;
-  bool IsWebPDecodeAccelerationSupported() const override;
-  bool CanDecodeWithHardwareAcceleration(
-      const cc::ImageHeaderMetadata* image_metadata) const override;
-  bool HasGrContextSupport() const override;
-  void SetGrContext(GrDirectContext* gr) override {}
-  void WillCallGLFromSkia() override {}
-  void DidCallGLFromSkia() override {}
-  void SetDisplayTransform(gfx::OverlayTransform transform) override {}
-  void SetFrameRate(float frame_rate) override {}
-
-  // InterfaceBase implementation.
-  void GenSyncTokenCHROMIUM(GLbyte* sync_token) override {}
-  void GenUnverifiedSyncTokenCHROMIUM(GLbyte* sync_token) override {}
-  void VerifySyncTokensCHROMIUM(GLbyte** sync_tokens, GLsizei count) override {}
-  void WaitSyncTokenCHROMIUM(const GLbyte* sync_token) override {}
-  void ShallowFlushCHROMIUM() override {}
-
-  GLuint DoCreateProgram();
-  void DoUseProgram(GLuint program);
-  void DoDeleteProgram(GLuint program);
-  void DoUniform1f(GLint location, GLfloat x);
-  void DoUniform1fv(GLint location, GLsizei count, const GLfloat* v);
-  void DoUniform1i(GLint location, GLint x);
-  void DoUniform1iv(GLint location, GLsizei count, const GLint* v);
-  void DoUniform2f(GLint location, GLfloat x, GLfloat y);
-  void DoUniform2fv(GLint location, GLsizei count, const GLfloat* v);
-  void DoUniform2i(GLint location, GLint x, GLint y);
-  void DoUniform2iv(GLint location, GLsizei count, const GLint* v);
-  void DoUniform3f(GLint location, GLfloat x, GLfloat y, GLfloat z);
-  void DoUniform3fv(GLint location, GLsizei count, const GLfloat* v);
-  void DoUniform3i(GLint location, GLint x, GLint y, GLint z);
-  void DoUniform3iv(GLint location, GLsizei count, const GLint* v);
-  void DoUniform4f(GLint location, GLfloat x, GLfloat y, GLfloat z, GLfloat w);
-  void DoUniform4fv(GLint location, GLsizei count, const GLfloat* v);
-  void DoUniform4i(GLint location, GLint x, GLint y, GLint z, GLint w);
-  void DoUniform4iv(GLint location, GLsizei count, const GLint* v);
-  void DoUniformMatrix2fv(GLint location,
-                          GLsizei count,
-                          GLboolean transpose,
-                          const GLfloat* value);
-  void DoUniformMatrix3fv(GLint location,
-                          GLsizei count,
-                          GLboolean transpose,
-                          const GLfloat* value);
-  void DoUniformMatrix4fv(GLint location,
-                          GLsizei count,
-                          GLboolean transpose,
-                          const GLfloat* value);
-  void DoBindUniformLocationCHROMIUM(GLuint program,
-                                     GLint location,
-                                     const char* name);
-
-  void DoGenTextures(GLsizei n, GLuint* textures);
-  GLuint DoCreateAndConsumeTextureCHROMIUM(const GLbyte* data);
-  void DoBindTexture(GLenum target, GLuint texture);
-  void DoDeleteTextures(GLsizei n, const GLuint* textures);
-
-  GLuint DoInsertFenceSyncCHROMIUM();
-  void DoWaitSyncTokenCHROMIUM(const GLbyte* sync_token);
-
- private:
-  Evas_GL_API* evas_gl_api_;
-
-  typedef struct {
-    GLint service_id_;
-    typedef std::map<GLint, std::string> UniformLocationMap;
-    UniformLocationMap uniform_location_map_;
-  } ProgramData;
-
-  GLint current_program_;
-
-  typedef std::map<GLint, ProgramData> ProgramMap;
-  ProgramMap program_map_;
-
-  GLuint bound_texture_id_;
-
-  typedef std::map<GLuint, GLuint> TextureConsumedMap;
-  TextureConsumedMap texture_consumed_map_;
-
-  std::set<GLuint> textures_;
-
-  GLint GetBoundUniformLocation(GLint location);
-  ProgramData& GetProgramData(GLint program);
-};
-
-}  // namespace gles2
-}  // namespace gpu
-
-#endif  // GPU_COMMAND_BUFFER_CLIENT_GLES2_IMPLEMENTATION_EFL_H_
diff --git a/tizen_src/chromium_impl/gpu/config/gpu_info_collector_efl.cc b/tizen_src/chromium_impl/gpu/config/gpu_info_collector_efl.cc
deleted file mode 100644 (file)
index d2b33b5..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2014 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "gpu/config/gpu_info_collector.h"
-
-#include "gpu/config/gpu_preferences.h"
-#include "gpu/config/scoped_restore_non_owned_egl_context.h"
-
-#if defined(TIZEN_MULTIMEDIA_SUPPORT)
-#include "content/public/browser/gpu_utils.h"
-#include "media/gpu/ipc/service/gpu_video_decode_accelerator.h"
-#include "media/gpu/ipc/service/gpu_video_encode_accelerator.h"
-#endif
-
-namespace gpu {
-
-bool CollectBasicGraphicsInfo(GPUInfo* gpu_info) {
-  NOTREACHED();
-  return false;
-}
-
-bool CollectContextGraphicsInfo(GPUInfo* gpu_info) {
-  DCHECK(gpu_info);
-
-  // Create a short-lived context on the GPU thread to collect the GL strings.
-  // Make sure we restore the existing context if there is one.
-  ScopedRestoreNonOwnedEGLContext restore_context;
-  bool success = CollectGraphicsInfoGL(gpu_info);
-#if defined(TIZEN_MULTIMEDIA_SUPPORT)
-  gpu::GpuPreferences gpu_preferences =
-      content::GetGpuPreferencesFromCommandLine();
-  gpu::GpuDriverBugWorkarounds work_arounds;
-  gpu_info->video_encode_accelerator_supported_profiles =
-      media::GpuVideoEncodeAccelerator::GetSupportedProfiles(gpu_preferences);
-  gpu_info->video_decode_accelerator_capabilities =
-      media::GpuVideoDecodeAccelerator::GetCapabilities(gpu_preferences,
-                                                        work_arounds);
-#endif
-  return success;
-}
-
-}  // namespace gpu
diff --git a/tizen_src/chromium_impl/gpu/config/scoped_restore_non_owned_egl_context.cc b/tizen_src/chromium_impl/gpu/config/scoped_restore_non_owned_egl_context.cc
deleted file mode 100644 (file)
index ddfae1c..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2014 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "gpu/config/scoped_restore_non_owned_egl_context.h"
-
-ScopedRestoreNonOwnedEGLContext::ScopedRestoreNonOwnedEGLContext()
-    : context_(EGL_NO_CONTEXT),
-      display_(EGL_NO_DISPLAY),
-      draw_surface_(EGL_NO_SURFACE),
-      read_surface_(EGL_NO_SURFACE) {
-  // This should only used to restore a context that is not created or owned by
-  // Chromium native code, but created by Android system itself.
-  DCHECK(!gl::GLContext::GetCurrent());
-
-  context_ = eglGetCurrentContext();
-  display_ = eglGetCurrentDisplay();
-  draw_surface_ = eglGetCurrentSurface(EGL_DRAW);
-  read_surface_ = eglGetCurrentSurface(EGL_READ);
-}
-
-ScopedRestoreNonOwnedEGLContext::~ScopedRestoreNonOwnedEGLContext() {
-  if (context_ == EGL_NO_CONTEXT || display_ == EGL_NO_DISPLAY ||
-      draw_surface_ == EGL_NO_SURFACE || read_surface_ == EGL_NO_SURFACE)
-    return;
-
-  if (!eglMakeCurrent(display_, draw_surface_, read_surface_, context_))
-    LOG(WARNING) << "Failed to restore EGL context";
-}
-
diff --git a/tizen_src/chromium_impl/gpu/config/scoped_restore_non_owned_egl_context.h b/tizen_src/chromium_impl/gpu/config/scoped_restore_non_owned_egl_context.h
deleted file mode 100644 (file)
index a8810cb..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2014 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef SCOPED_RESTORE_NON_OWNED_EGL_CONTEXT_H_
-#define SCOPED_RESTORE_NON_OWNED_EGL_CONTEXT_H_
-
-#include "ui/gl/gl_context.h"
-#include "ui/gl/gl_surface.h"
-#include "ui/gl/gl_surface_egl.h"
-
-class ScopedRestoreNonOwnedEGLContext {
- public:
-  ScopedRestoreNonOwnedEGLContext();
-  ~ScopedRestoreNonOwnedEGLContext();
-
- private:
-  EGLContext context_;
-  EGLDisplay display_;
-  EGLSurface draw_surface_;
-  EGLSurface read_surface_;
-};
-
-#endif  // SCOPED_RESTORE_NON_OWNED_EGL_CONTEXT_H_
\ No newline at end of file
index 09166b8..ecafd27 100644 (file)
@@ -2,21 +2,11 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-external_exclude_gpu_efl_sources = []
-
-if (!is_tizen) {
-  external_exclude_gpu_efl_sources += [ "gpu_info_collector_linux.cc" ]
+if (is_tizen) {
+  import("//build/config/ui.gni")
 }
 
-external_gpu_efl_sources = [
-  "//tizen_src/chromium_impl/gpu/config/gpu_info_collector_efl.cc",
-  "//tizen_src/chromium_impl/gpu/config/scoped_restore_non_owned_egl_context.cc",
-  "//tizen_src/chromium_impl/gpu/config/scoped_restore_non_owned_egl_context.h",
-]
-
 external_gles2_implementation_sources = [
-  "//tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.cc",
-  "//tizen_src/chromium_impl/gpu/command_buffer/client/gles2_implementation_efl.h",
   "//tizen_src/chromium_impl/gpu/command_buffer/client/shared_mailbox_manager.cc",
   "//tizen_src/chromium_impl/gpu/command_buffer/client/shared_mailbox_manager.h",
 ]
index 3a30097..b2d03c6 100644 (file)
@@ -60,7 +60,7 @@ class MEDIA_EXPORT AudioManagerCapi : public AudioManagerBase {
 
   int native_input_sample_rate_;
 
-  DISALLOW_COPY_AND_ASSIGN(AudioManagerCapi);
+  // DISALLOW_COPY_AND_ASSIGN(AudioManagerCapi);
 };
 
 }  // namespace media
index 3f42284..eafd569 100644 (file)
@@ -59,7 +59,7 @@ class CapiAudioInputStream final : public AgcAudioStream<AudioInputStream> {
   // Holds the data from the OS.
   AudioBlockFifo fifo_;
 
-  DISALLOW_COPY_AND_ASSIGN(CapiAudioInputStream);
+  // DISALLOW_COPY_AND_ASSIGN(CapiAudioInputStream);
 };
 
 }  // namespace media
index 42e8644..4ad7228 100644 (file)
@@ -52,7 +52,7 @@ class CapiAudioOutputStream : public AudioOutputStream {
   AudioSourceCallback* source_callback_;
   std::unique_ptr<AudioBus> audio_bus_;
 
-  DISALLOW_COPY_AND_ASSIGN(CapiAudioOutputStream);
+  // DISALLOW_COPY_AND_ASSIGN(CapiAudioOutputStream);
 };
 
 }  // namespace media
index 839c51b..57fe9cf 100644 (file)
@@ -93,7 +93,7 @@ class MEDIA_EXPORT MediaPlayerEfl {
   // Resource manager for all the media players.
   MediaPlayerManager* manager_;
 
-  DISALLOW_COPY_AND_ASSIGN(MediaPlayerEfl);
+  // DISALLOW_COPY_AND_ASSIGN(MediaPlayerEfl);
 };
 
 }  // namespace media
index 0528124..e42a11a 100644 (file)
@@ -109,7 +109,7 @@ class MEDIA_EXPORT MediaPlayerBridgeCapi
   // NOTE: Weak pointers must be invalidated before all other member variables.
   base::WeakPtrFactory<MediaPlayerBridgeCapi> weak_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(MediaPlayerBridgeCapi);
+  // DISALLOW_COPY_AND_ASSIGN(MediaPlayerBridgeCapi);
 };
 
 }  // namespace media
index c74a828..299d4b7 100644 (file)
@@ -136,7 +136,7 @@ class MEDIA_EXPORT MediaSourcePlayerCapi
 
   base::WeakPtrFactory<MediaSourcePlayerCapi> weak_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayerCapi);
+  // DISALLOW_COPY_AND_ASSIGN(MediaSourcePlayerCapi);
 };
 
 }  // namespace media
index a14734a..bf704cb 100644 (file)
@@ -38,7 +38,7 @@ class MEDIA_EXPORT WebAudioDecoderCapi : public WebAudioDecoder {
 
   base::Thread capi_thread_;
 
-  DISALLOW_COPY_AND_ASSIGN(WebAudioDecoderCapi);
+  // DISALLOW_COPY_AND_ASSIGN(WebAudioDecoderCapi);
 };
 
 class AudioDecoderCapi {
index 8b9315b..5414053 100644 (file)
@@ -196,7 +196,7 @@ class CameraHandle final {
   camera_h camera_handle_;
 
   friend struct base::DefaultSingletonTraits<CameraHandle>;
-  DISALLOW_COPY_AND_ASSIGN(CameraHandle);
+  // DISALLOW_COPY_AND_ASSIGN(CameraHandle);
 };
 
 } // namespace
index 896b5bd..065163a 100644 (file)
@@ -30,7 +30,7 @@ class MEDIA_EXPORT VideoCaptureDeviceFactoryTizen
  private:
   scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner_;
 
-  DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceFactoryTizen);
+  // DISALLOW_COPY_AND_ASSIGN(VideoCaptureDeviceFactoryTizen);
 };
 
 }  // namespace media
index a606c57..d6d6258 100644 (file)
@@ -64,7 +64,7 @@ class VideoCaptureDeviceTizen : public VideoCaptureDevice {
   base::Thread worker_;  // Thread used for reading data from the device.
   std::unique_ptr<VideoCaptureDevice::Client::Buffer> buffer_;
   camera_h camera_;
-  DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceTizen);
+  // DISALLOW_IMPLICIT_CONSTRUCTORS(VideoCaptureDeviceTizen);
 };
 
 }  // namespace media
diff --git a/tizen_src/chromium_impl/ui/BUILD.gn b/tizen_src/chromium_impl/ui/BUILD.gn
deleted file mode 100644 (file)
index cf225f1..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-# copyright (c) 2015 samsung electronics. all rights reserved.
-# use of this source code is governed by a bsd-style license that can be
-# found in the license file.
-
-static_library("ui_events_source_inject") {
-  sources = [
-    # Indirectly includes ui/events/gestures/gesture_recognizer_impl_efl.cc/h.
-    "//tizen_src/chromium_impl/ui/events/gestures/gesture_recognizer_impl_efl.cc",
-    "//tizen_src/chromium_impl/ui/events/gestures/gesture_recognizer_impl_efl.h",
-    "//tizen_src/chromium_impl/ui/events/gestures/gesture_recognizer_impl_override.cc",
-    "//ui/events/gestures/gesture_provider_aura.cc",
-    "//ui/events/gestures/gesture_provider_aura.h",
-    "//ui/events/gestures/motion_event_aura.cc",
-    "//ui/events/gestures/motion_event_aura.h",
-  ]
-  include_dirs = [ "//third_party/skia" ]
-  deps = [ "//third_party/perfetto/protos/perfetto/trace/track_event:zero" ]
-  public_deps = [ "//third_party/abseil-cpp:absl" ]
-}
-
-static_library("ui_native_theme_inject") {
-  sources = [
-    "//ui/native_theme/native_theme_aura.cc",
-    "//ui/native_theme/native_theme_aura.h",
-  ]
-  deps = [
-    "//skia",
-    "//ui/base:buildflags",
-  ]
-  public_deps = [ "//third_party/abseil-cpp:absl" ]
-}
-
-static_library("ui_base_inject") {
-  sources = [
-    #"//ui/base/cursor/cursors_aura.h",
-    #"//ui/base/cursor/cursors_aura.cc",
-  ]
-  deps = [ "//skia" ]
-}
index fd3f650..635862b 100644 (file)
@@ -17,8 +17,9 @@
 #include <X11/Xlib.h>
 #endif
 
-#include "base/memory/singleton.h"
 #include "base/logging.h"
+#include "base/memory/singleton.h"
+#include "base/notreached.h"
 #include "base/strings/utf_string_conversions.h"
 
 #if defined(WAYLAND_BRINGUP)
index 8eaa62d..851d400 100644 (file)
@@ -63,7 +63,7 @@ class ClipboardHelperEfl {
 #endif
   void clearClipboardHandler();
   void initializeAtomList();
-  DISALLOW_COPY_AND_ASSIGN(ClipboardHelperEfl);
+  // DISALLOW_COPY_AND_ASSIGN(ClipboardHelperEfl);
 
   Ecore_Event_Handler* m_selectionClearHandler;
   Ecore_Event_Handler* m_selectionNotifyHandler;
diff --git a/tizen_src/chromium_impl/ui/base/resource/resource_bundle_efl.cc b/tizen_src/chromium_impl/ui/base/resource/resource_bundle_efl.cc
deleted file mode 100644 (file)
index af7dc14..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/base/resource/resource_bundle.h"
-
-#include "base/command_line.h"
-#include "base/logging.h"
-#include "base/path_service.h"
-#include "ui/base/layout.h"
-#include "ui/base/resource/resource_handle.h"
-#include "ui/base/ui_base_paths.h"
-#include "ui/base/ui_base_switches.h"
-#include "ui/display/display.h"
-#include "ui/gfx/image/image.h"
-
-namespace {
-
-base::FilePath GetResourcesPakFilePath(const std::string& pak_name) {
-  base::FilePath path;
-  if (base::PathService::Get(base::DIR_MODULE, &path))
-    return path.AppendASCII(pak_name.c_str());
-
-  // Return just the name of the pack file.
-  return base::FilePath(pak_name.c_str());
-}
-
-}  // namespace
-
-namespace ui {
-
-void ResourceBundle::LoadCommonResources() {
-  // Always load the 1x data pack first as the 2x data pack contains both 1x and
-  // 2x images. The 1x data pack only has 1x images, thus passes in an accurate
-  // scale factor to gfx::ImageSkia::AddRepresentation.
-  AddDataPackFromPath(GetResourcesPakFilePath(
-      "chrome_100_percent.pak"), SCALE_FACTOR_100P);
-
-  if (IsScaleFactorSupported(SCALE_FACTOR_200P)) {
-    AddOptionalDataPackFromPath(GetResourcesPakFilePath(
-        "chrome_200_percent.pak"), SCALE_FACTOR_200P);
-  }
-}
-
-gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) {
-  // Flipped image is not used on ChromeOS.
-  return GetImageNamed(resource_id);
-}
-
-}  // namespace ui
index 5527da6..a2ab542 100644 (file)
@@ -87,7 +87,7 @@ class DISPLAY_EXPORT DeviceDisplayInfoEflImpl {
   int rotation_degrees_;
   base::ObserverList<DeviceDisplayInfoObserverEfl>::Unchecked observer_list_;
 
-  DISALLOW_COPY_AND_ASSIGN(DeviceDisplayInfoEflImpl);
+  // DISALLOW_COPY_AND_ASSIGN(DeviceDisplayInfoEflImpl);
 };
 
 // static
index 2c3dd9a..47aeb3a 100644 (file)
@@ -46,7 +46,7 @@ class DISPLAY_EXPORT DeviceDisplayInfoEfl {
   void RemoveObserver(DeviceDisplayInfoObserverEfl* observer);
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(DeviceDisplayInfoEfl);
+  // DISALLOW_COPY_AND_ASSIGN(DeviceDisplayInfoEfl);
 };
 
 }  // namespace display
diff --git a/tizen_src/chromium_impl/ui/display/screen_efl.cc b/tizen_src/chromium_impl/ui/display/screen_efl.cc
deleted file mode 100644 (file)
index 890e4f9..0000000
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright 2014 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/display/screen_efl.h"
-
-#include "ecore_x_wayland_wrapper.h"
-
-#include "content/browser/renderer_host/dip_util.h"
-#include "ui/display/device_display_info_efl.h"
-#include "ui/display/device_display_info_observer_efl.h"
-#include "ui/display/display.h"
-#include "ui/display/display_observer.h"
-#include "ui/display/screen.h"
-#include "ui/gfx/geometry/dip_util.h"
-#include "ui/gfx/geometry/rect.h"
-
-using namespace display;
-
-namespace ui {
-
-class ScreenEfl : public display::Screen,
-                  public display::DeviceDisplayInfoObserverEfl {
- public:
-  ScreenEfl() {
-    display::DeviceDisplayInfoEfl display_info;
-    display_info.AddObserver(this);
-    UpdateDisplays();
-  }
-
-  ~ScreenEfl() override {
-    display::DeviceDisplayInfoEfl display_info;
-    display_info.RemoveObserver(this);
-  }
-
-  // display::Screen overrides
-  gfx::Point GetCursorScreenPoint() override {
-    NOTIMPLEMENTED();
-    return gfx::Point();
-  }
-
-  bool IsWindowUnderCursor(gfx::NativeWindow window) override {
-    NOTIMPLEMENTED();
-    return false;
-  }
-
-  gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override {
-    return nullptr;
-  }
-
-  gfx::NativeWindow GetLocalProcessWindowAtPoint(
-      const gfx::Point& point,
-      const std::set<gfx::NativeWindow>& ignore) override {
-    return nullptr;
-  }
-
-  int GetNumDisplays() const override { return 1; }
-
-  const std::vector<display::Display>& GetAllDisplays() const override {
-    return displays_;
-  }
-
-  display::Display GetDisplayNearestWindow(
-      gfx::NativeView /*view*/) const override {
-    return GetPrimaryDisplay();
-  }
-
-  display::Display GetDisplayNearestPoint(
-      const gfx::Point& /*point*/) const override {
-    return GetPrimaryDisplay();
-  }
-
-  display::Display GetDisplayMatching(
-      const gfx::Rect& /*match_rect*/) const override {
-    return GetPrimaryDisplay();
-  }
-
-  display::Display GetPrimaryDisplay() const override {
-    DCHECK(!displays_.empty());
-    return displays_[0];
-  }
-
-  void AddObserver(display::DisplayObserver* /*observer*/) override {
-    NOTIMPLEMENTED();
-  }
-
-  void RemoveObserver(display::DisplayObserver* /*observer*/) override {
-    NOTIMPLEMENTED();
-  }
-
-  // display::DeviceDisplayInfoObserverEfl implementation.
-  void OnDeviceDisplayInfoChanged() override { UpdateDisplays(); }
-
- private:
-  void UpdateDisplays() {
-    display::DeviceDisplayInfoEfl display_info;
-    const float device_scale_factor =
-        display::Display::HasForceDeviceScaleFactor()
-            ? display::Display::GetForcedDeviceScaleFactor()
-            : display_info.GetDIPScale();
-
-    display::Display display(0);
-    display.SetRotationAsDegree(display_info.GetRotationDegrees());
-
-    int width = display_info.GetDisplayWidth();
-    int height = display_info.GetDisplayHeight();
-
-    const gfx::Rect bounds_in_pixels = gfx::Rect(width, height);
-#if !defined(EWK_BRINGUP)  // FIXME: m94 bringup
-    const gfx::Rect bounds_in_dip =
-        gfx::ConvertRectToDIP(device_scale_factor, bounds_in_pixels);
-#else
-    const gfx::Rect bounds_in_dip = bounds_in_pixels;
-#endif
-    display.set_device_scale_factor(device_scale_factor);
-    display.set_bounds(bounds_in_dip);
-    std::vector<display::Display> displays(1, display);
-    displays_.swap(displays);
-  }
-
-  std::vector<display::Display> displays_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScreenEfl);
-};
-
-void InstallScreenInstance() {
-  static bool installed = false;
-  if (!installed) {
-    installed = true;
-    display::Screen::SetScreenInstance(new ui::ScreenEfl());
-  }
-}
-
-}  // namespace ui
-
-namespace display {
-// static
-gfx::NativeWindow Screen::GetWindowForView(gfx::NativeView view) {
-  return view;
-}
-}  // namespace display
diff --git a/tizen_src/chromium_impl/ui/display/screen_efl.h b/tizen_src/chromium_impl/ui/display/screen_efl.h
deleted file mode 100644 (file)
index e77ffa3..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2014 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef SCREEN_EFL
-#define SCREEN_EFL
-
-#include "ui/gfx/gfx_export.h"
-
-namespace ui {
-
-GFX_EXPORT void InstallScreenInstance();
-
-}
-
-#endif
diff --git a/tizen_src/chromium_impl/ui/events/gesture_detection/gesture_configuration_efl.cc b/tizen_src/chromium_impl/ui/events/gesture_detection/gesture_configuration_efl.cc
deleted file mode 100644 (file)
index e922305..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/events/gesture_detection/gesture_configuration.h"
-
-#include "base/command_line.h"
-#include "base/memory/singleton.h"
-#include "ui/events/event_switches.h"
-
-namespace ui {
-namespace {
-
-class GestureConfigurationEfl : public GestureConfiguration {
- public:
-  ~GestureConfigurationEfl() override {
-  }
-
-  static GestureConfigurationEfl* GetInstance() {
-    return base::Singleton<GestureConfigurationEfl>::get();
-  }
-
- private:
-  GestureConfigurationEfl() : GestureConfiguration() {
-    set_gesture_begin_end_types_enabled(true);
-  }
-
-  friend struct base::DefaultSingletonTraits<GestureConfigurationEfl>;
-  DISALLOW_COPY_AND_ASSIGN(GestureConfigurationEfl);
-};
-
-}  // namespace
-
-// Create a GestureConfigurationEfl singleton instance when using aura.
-GestureConfiguration* GestureConfiguration::GetPlatformSpecificInstance() {
-  return GestureConfigurationEfl::GetInstance();
-}
-
-}  // namespace ui
diff --git a/tizen_src/chromium_impl/ui/events/gestures/gesture_recognizer_impl_efl.cc b/tizen_src/chromium_impl/ui/events/gestures/gesture_recognizer_impl_efl.cc
deleted file mode 100644 (file)
index 5c772c0..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2015 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/events/gestures/gesture_recognizer_impl_efl.h"
-
-#include "ui/events/gestures/gesture_recognizer_impl.h"
-#include "ui/events/gestures/gesture_recognizer.h"
-
-namespace ui {
-
-// The two methods below are originally defined in
-// ui/events/gestures/gesture_recognizer_impl.cc. The reason
-// for EFL port to redefine them are:
-// 1) ::Create method instantiates our own GestureRegnizerImplEfl,
-//    instead of its parent GestureRecognizerImpl.
-//    See gesture_recognizer_impl_override.cc.
-// 2) In GestureRegnizerImplEfl, ::GetGestureProviderForConsumer method
-//    is overloaded and made public. In practice, it just calls its
-//    parent class implementation.
-//
-// We use the getter to access the instance of GestureProviderAura
-// object associated with GestureRecognizer{Impl}. Further customizations
-// are then possible, including enabling double tap support.
-
-GestureProviderAura* GestureRecognizerImplEfl::GetGestureProviderForConsumer(
-    GestureConsumer* c) {
-  return GestureRecognizerImpl::GetGestureProviderForConsumer(c);
-}
-
-} // namespace ui
-
diff --git a/tizen_src/chromium_impl/ui/events/gestures/gesture_recognizer_impl_efl.h b/tizen_src/chromium_impl/ui/events/gestures/gesture_recognizer_impl_efl.h
deleted file mode 100644 (file)
index 6c4d2fb..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2015 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef UI_EVENTS_GESTURES_GESTURE_RECOGNIZER_IMPL_EFL_H_
-#define UI_EVENTS_GESTURES_GESTURE_RECOGNIZER_IMPL_EFL_H_
-
-#include "ui/events/gestures/gesture_recognizer_impl.h"
-
-namespace ui {
-class GestureConsumer;
-
-class EVENTS_EXPORT GestureRecognizerImplEfl : public GestureRecognizerImpl {
- public:
-
-  GestureProviderAura* GetGestureProviderForConsumer(
-      GestureConsumer* c) override;
-};
-
-}  // namespace ui
-
-#endif  // UI_EVENTS_GESTURES_GESTURE_RECOGNIZER_IMPL_EFL_H_
diff --git a/tizen_src/chromium_impl/ui/events/gestures/gesture_recognizer_impl_override.cc b/tizen_src/chromium_impl/ui/events/gestures/gesture_recognizer_impl_override.cc
deleted file mode 100644 (file)
index 81d219c..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2015 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// Define "Create" method to something else, because we want to have our own.
-#define Create not_Create
-#include "ui/events/gestures/gesture_recognizer_impl.cc"
index f6352b9..12e05c0 100644 (file)
@@ -55,7 +55,7 @@ class OzonePlatformEfl : public OzonePlatform {
   }
 
   std::unique_ptr<InputMethod> CreateInputMethod(
-      internal::InputMethodDelegate* delegate,
+      ImeKeyEventDispatcher* ime_key_event_dispatcher,
       gfx::AcceleratedWidget widget) override {
     return nullptr;
   }
@@ -64,8 +64,9 @@ class OzonePlatformEfl : public OzonePlatform {
   void InitScreen(PlatformScreen* screen) override {}
 
  private:
-  void InitializeUI(const InitParams& /*params*/) override {
+  bool InitializeUI(const InitParams& /*params*/) override {
     gpu_platform_host_.reset(CreateStubGpuPlatformSupportHost());
+    return true;
   }
 
   void InitializeGPU(const InitParams& /*params*/) override {
@@ -75,7 +76,7 @@ class OzonePlatformEfl : public OzonePlatform {
   std::unique_ptr<SurfaceFactoryEfl> surface_factory_;
   std::unique_ptr<GpuPlatformSupportHost> gpu_platform_host_;
 
-  DISALLOW_COPY_AND_ASSIGN(OzonePlatformEfl);
+  // DISALLOW_COPY_AND_ASSIGN(OzonePlatformEfl);
 };
 
 }  // namespace
index 1535a39..781cdc7 100644 (file)
@@ -21,18 +21,22 @@ class GLOzoneEGLEfl : public GLOzoneEGL {
   ~GLOzoneEGLEfl() override {}
 
   scoped_refptr<gl::GLSurface> CreateViewGLSurface(
+      gl::GLDisplay* display,
       gfx::AcceleratedWidget window) override {
     // We use offscreen surface for EFL port.
     return nullptr;
   }
 
   scoped_refptr<gl::GLSurface> CreateOffscreenGLSurface(
+      gl::GLDisplay* display,
       const gfx::Size& size) override {
-    if (gl::GLSurfaceEGL::IsEGLSurfacelessContextSupported() &&
-        size.width() == 0 && size.height() == 0) {
-      return gl::InitializeGLSurface(new gl::SurfacelessEGL(size));
+    gl::GLDisplayEGL* egl_display = display->GetAs<gl::GLDisplayEGL>();
+    if (egl_display->IsEGLSurfacelessContextSupported() && size.width() == 0 &&
+        size.height() == 0) {
+      return gl::InitializeGLSurface(new gl::SurfacelessEGL(egl_display, size));
     } else {
-      return gl::InitializeGLSurface(new gl::PbufferGLSurfaceEGL(size));
+      return gl::InitializeGLSurface(
+          new gl::PbufferGLSurfaceEGL(egl_display, size));
     }
   }
 
@@ -59,7 +63,7 @@ class GLOzoneEGLEfl : public GLOzoneEGL {
   }
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(GLOzoneEGLEfl);
+  // DISALLOW_COPY_AND_ASSIGN(GLOzoneEGLEfl);
 };
 
 }  // namespace
index f2ce590..ec0e660 100644 (file)
@@ -22,7 +22,7 @@ class SurfaceFactoryEfl : public SurfaceFactoryOzone {
  private:
   std::unique_ptr<GLOzone> egl_implementation_;
 
-  DISALLOW_COPY_AND_ASSIGN(SurfaceFactoryEfl);
+  // DISALLOW_COPY_AND_ASSIGN(SurfaceFactoryEfl);
 };
 
 }  // namespace ui
diff --git a/tizen_src/chromium_impl/ui/snapshot/snapshot_efl.cc b/tizen_src/chromium_impl/ui/snapshot/snapshot_efl.cc
deleted file mode 100644 (file)
index f9d183e..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "ui/snapshot/snapshot.h"
-
-#include "base/bind.h"
-#include "base/callback.h"
-#include "base/logging.h"
-#include "base/numerics/safe_conversions.h"
-#include "base/task_runner_util.h"
-#include "ui/display/display.h"
-#include "ui/gfx/image/image.h"
-#include "ui/gfx/geometry/rect.h"
-#include "ui/display/screen.h"
-
-namespace ui {
-
-bool GrabViewSnapshot(gfx::NativeView view,
-                      const gfx::Rect& snapshot_bounds,
-                      gfx::Image* image) {
-  return GrabWindowSnapshot(view, snapshot_bounds, image);
-}
-
-bool GrabWindowSnapshot(gfx::NativeWindow window,
-                        const gfx::Rect& snapshot_bounds,
-                        gfx::Image* image) {
-  // Not supported in EFL port. Callers should fall back to the async version.
-  return false;
-}
-
-void GrabWindowSnapshotAsync(gfx::NativeWindow window,
-                             const gfx::Rect& source_rect,
-                             GrabWindowSnapshotAsyncCallback callback) {
-  NOTIMPLEMENTED();
-}
-
-void GrabViewSnapshotAsync(gfx::NativeView view,
-                           const gfx::Rect& source_rect,
-                           GrabWindowSnapshotAsyncCallback callback) {
-  GrabWindowSnapshotAsync(view, source_rect, std::move(callback));
-}
-
-}  // namespace ui
index 5569643..87e32c6 100644 (file)
@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//tizen_src/build/config/tizen_features.gni")
-import("ui_efl_injections.gni")
 
 external_ui_base_configs = [
   "//tizen_src/build:elementary",
@@ -63,10 +62,6 @@ external_ui_gfx_sources = [
   "//tizen_src/chromium_impl/ui/display/device_display_info_efl.cc",
   "//tizen_src/chromium_impl/ui/display/device_display_info_efl.h",
   "//tizen_src/chromium_impl/ui/display/device_display_info_observer_efl.h",
-  "//tizen_src/chromium_impl/ui/display/screen_efl.cc",
-  "//tizen_src/chromium_impl/ui/display/screen_efl.h",
-  "//ui/gfx/nine_image_painter.cc",
-  "//ui/gfx/nine_image_painter.h",
 ]
 
 # For //ui/gfx/x target
@@ -80,7 +75,6 @@ if (wayland_bringup) {
 external_exclude_ui_gl_sources = []
 
 # For //ui/gl target
-#external_exclude_ui_gl_sources += [ "gl_context_egl.cc" ]
 external_ui_gl_sources = [
   "//tizen_src/chromium_impl/ui/gl/gl_current_context_efl.cc",
   "//tizen_src/chromium_impl/ui/gl/gl_shared_context_efl.cc",
@@ -101,9 +95,7 @@ external_ui_base_includes = [ "//third_party/mojo/src/" ]
 external_ui_base_sources = [
   "//tizen_src/chromium_impl/ui/base/clipboard/clipboard_helper_efl.cc",
   "//tizen_src/chromium_impl/ui/base/clipboard/clipboard_helper_efl.h",
-  "//tizen_src/chromium_impl/ui/base/resource/resource_bundle_efl.cc",
   "//ui/base/nine_image_painter_factory.h",
-  "clipboard/clipboard_format_type_aura.cc",
 ]
 
 # FIXME: ewk_bringup definition should be removed.
@@ -114,24 +106,21 @@ if (!ewk_bringup) {
   ]
 }
 
-# EWK_BRINGUP
-#if (use_x11) {
-#  if (!wayland_bringup) {
-#    external_ui_base_sources += [
-#      "//ui/base/cursor/cursor_x11.cc",
-#      "//ui/base/cursor/cursor_x11.h",
-#      "//ui/base/cursor/cursor_loader_x11.h",
-#      "//ui/base/cursor/cursor_loader_x11.cc",
-#    ]
-#  }
-#}
 external_exclude_ui_base_sources = []
 
 # For //ui/snapshot target
-external_ui_snapshot_sources =
-    [ "//tizen_src/chromium_impl/ui/snapshot/snapshot_efl.cc" ]
+external_ui_snapshot_sources = []
+if (!use_aura) {
+  external_ui_snapshot_sources =
+      [ "//tizen_src/chromium_impl/ui/snapshot/snapshot_efl.cc" ]
+}
 
 # For //ui/events:gesture_detection target
-external_exclude_ui_gesture_detection_sources =
-    [ "gesture_detection/gesture_configuration_default.cc" ]
-external_ui_gesture_detection_sources = [ "//tizen_src/chromium_impl/ui/events/gesture_detection/gesture_configuration_efl.cc" ]
+external_exclude_ui_gesture_detection_sources = []
+external_ui_gesture_detection_sources = []
+
+if (!use_aura) {
+  external_exclude_ui_gesture_detection_sources +=
+      [ "gesture_detection/gesture_configuration_default.cc" ]
+  external_ui_gesture_detection_sources += [ "//tizen_src/chromium_impl/ui/events/gesture_detection/gesture_configuration_efl.cc" ]
+}
diff --git a/tizen_src/chromium_impl/ui/ui_efl_injections.gni b/tizen_src/chromium_impl/ui/ui_efl_injections.gni
deleted file mode 100644 (file)
index 16168d7..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright (c) 2015 Samsung Electronics. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# In static mode, we build some sources that is needed
-# by efl-port as injectable static library.
-# However, in component mode, we build each of ui modules
-# as single DLL. So we include needed sources directly.
-
-external_ui_base_static_lib_deps =
-    [ "//tizen_src/chromium_impl/ui:ui_base_inject" ]
-
-external_ui_events_static_lib_deps =
-    [ "//tizen_src/chromium_impl/ui:ui_events_source_inject" ]
-
-external_native_theme_static_lib_deps =
-    [ "//tizen_src/chromium_impl/ui:ui_native_theme_inject" ]
-
-# For //ui/base target
-external_ui_base_shared_lib_sources = [
-  "cursor/cursors_aura.cc",
-  "cursor/cursors_aura.h",
-]
-
-# For //ui/events target
-external_ui_events_shared_lib_sources = [
-  "//tizen_src/chromium_impl/ui/events/gestures/gesture_recognizer_impl_override.cc",
-  "//tizen_src/chromium_impl/ui/events/gestures/gesture_recognizer_impl_efl.cc",
-  "//tizen_src/chromium_impl/ui/events/gestures/gesture_recognizer_impl_efl.h",
-  "gestures/gesture_provider_aura.cc",
-  "gestures/gesture_provider_aura.h",
-  "gestures/motion_event_aura.cc",
-  "gestures/motion_event_aura.h",
-]
-
-# For //ui/native_theme target
-external_ui_native_theme_shared_lib_sources = [
-  "native_theme_aura.cc",
-  "native_theme_aura.h",
-]
index 88be7c2..e4cd931 100644 (file)
@@ -97,7 +97,7 @@ class AutofillClientEfl
   scoped_refptr<AutofillWebDataService> database_;
   AutofillPopupViewEfl* popup_controller_;
 
-  DISALLOW_COPY_AND_ASSIGN(AutofillClientEfl);
+  // DISALLOW_COPY_AND_ASSIGN(AutofillClientEfl);
 };
 
 }  // namespace autofill
index a9c1ffa..2d3100e 100644 (file)
@@ -51,7 +51,7 @@ class PersonalDataManagerFactory : public PersonalDataManagerObserver {
 
   IDMap<PersonalDataManager, IDMapOwnPointer> personal_data_manager_id_map_;
 
-  DISALLOW_COPY_AND_ASSIGN(PersonalDataManagerFactory);
+  // DISALLOW_COPY_AND_ASSIGN(PersonalDataManagerFactory);
   Ewk_Context_Form_Autofill_Profile_Changed_Callback callback_;
   void* callback_user_data_;
 };
index a6121ed..5f14fec 100644 (file)
@@ -6,9 +6,9 @@
 
 #include "base/bind.h"
 #include "base/logging.h"
-#include "base/task/post_task.h"
+#include "base/task/bind_post_task.h"
+#include "base/task/thread_pool.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "content/browser/appcache/appcache_service_impl.h"
 #include "content/common/render_messages_efl.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_task_traits.h"
@@ -91,7 +91,7 @@ void BrowsingDataRemoverEfl::ClearNetworkCache() {
   waiting_for_clear_cache_ = true;
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
 
-  base::PostTask(
+  base::ThreadPool::PostTask(
       FROM_HERE, {BrowserThread::IO},
       base::BindOnce(&BrowsingDataRemoverEfl::ClearNetworkCacheOnIOThread,
                      base::Unretained(this)));
@@ -172,9 +172,10 @@ void BrowsingDataRemoverEfl::DoClearCache(int rv)  {
         next_cache_state_ = STATE_NONE;
 
         // Notify the UI thread that we are done.
-        base::PostTask(FROM_HERE, {BrowserThread::UI},
-                       base::BindOnce(&BrowsingDataRemoverEfl::ClearedCache,
-                                      base::Unretained(this)));
+        base::ThreadPool::PostTask(
+            FROM_HERE, {BrowserThread::UI},
+            base::BindOnce(&BrowsingDataRemoverEfl::ClearedCache,
+                           base::Unretained(this)));
         return;
       }
       default: {
@@ -207,7 +208,7 @@ void BrowsingDataRemoverEfl::DeleteIfDone() {
 }
 
 typedef void (*Application_Cache_Origins_Get_Callback)(void* origins, void* user_data);
-
+#if !defined(EWK_BRINGUP)  // FIXME: m108 bringup
 void OnGotOriginsWithApplicationCache(Application_Cache_Origins_Get_Callback callback,
                                       void* user_data,
                                       scoped_refptr<content::AppCacheInfoCollection> collection,
@@ -221,7 +222,7 @@ void OnGotOriginsWithApplicationCache(Application_Cache_Origins_Get_Callback cal
       bdre->DeleteAppCachesForOrigin(origin.first);
    }
 }
-
+#endif
 void BrowsingDataRemoverEfl::RemoveImpl(int remove_mask,
                                         const GURL& origin) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI));
@@ -246,7 +247,7 @@ void BrowsingDataRemoverEfl::RemoveImpl(int remove_mask,
     }
 #endif
     waiting_for_clear_quota_managed_data_ = true;
-    base::PostTask(
+    base::ThreadPool::PostTask(
         FROM_HERE, {BrowserThread::IO},
         base::BindOnce(&BrowsingDataRemoverEfl::ClearQuotaManagedDataOnIOThread,
                        base::Unretained(this)));
@@ -261,12 +262,14 @@ void BrowsingDataRemoverEfl::RemoveImpl(int remove_mask,
       DeleteAppCachesForOrigin(url::Origin::Create(origin));
     }
     else {
+#if !defined(EWK_BRINGUP)  // FIXME: m108 bringup
       //if origin is empty delete all app cache (actual deletion in OnGotOriginsWithApplicationCache)
       Application_Cache_Origins_Get_Callback cb = NULL;
       scoped_refptr<content::AppCacheInfoCollection> collection(new content::AppCacheInfoCollection());
       app_cache_service_->GetAllAppCacheInfo(
           collection.get(), base::BindOnce(&OnGotOriginsWithApplicationCache,
                                            cb, this, collection));
+#endif
     }
   }
 }
@@ -276,7 +279,7 @@ void BrowsingDataRemoverEfl::DeleteAppCachesForOrigin(
   if (BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     // TODO: Using base::Unretained is not thread safe
     // It may happen that on IO thread this ptr will be already deleted
-    base::PostTask(
+    base::ThreadPool::PostTask(
         FROM_HERE, {BrowserThread::IO},
         base::BindOnce(&BrowsingDataRemoverEfl::DeleteAppCachesForOrigin,
                        base::Unretained(this), origin));
@@ -284,8 +287,10 @@ void BrowsingDataRemoverEfl::DeleteAppCachesForOrigin(
   }
 
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+#if !defined(EWK_BRINGUP)  // FIXME: m108 bringup
   net::CompletionRepeatingCallback rm_app_catche_cb;
   static_cast<content::AppCacheServiceImpl*>(app_cache_service_)->DeleteAppCachesForOrigin(origin, rm_app_catche_cb);
+#endif
 }
 
 void BrowsingDataRemoverEfl::ClearLocalStorageOnUIThread() {
@@ -304,8 +309,8 @@ void BrowsingDataRemoverEfl::OnGotLocalStorageUsageInfo(
   for (size_t i = 0; i < infos.size(); ++i) {
     if (infos[i].last_modified >= delete_begin_
         && infos[i].last_modified <= delete_end_)
-      dom_storage_context_->DeleteLocalStorage(
-          blink::StorageKey(infos[i].origin), base::DoNothing());
+      dom_storage_context_->DeleteLocalStorage(infos[i].storage_key,
+                                               base::DoNothing());
   }
   waiting_for_clear_local_storage_ = false;
   DeleteIfDone();
@@ -389,7 +394,7 @@ void BrowsingDataRemoverEfl::CheckQuotaManagedDataDeletionStatus() {
       quota_managed_origins_to_delete_count_ != 0)
   return;
 
-  base::PostTask(
+  base::ThreadPool::PostTask(
       FROM_HERE, {BrowserThread::UI},
       base::BindOnce(&BrowsingDataRemoverEfl::OnQuotaManagedDataDeleted,
                      base::Unretained(this)));
index 04cc1a1..0d81672 100644 (file)
@@ -60,7 +60,7 @@ bool DownloadManagerDelegateEfl::DetermineDownloadTarget(
         download::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
         download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
         download::DownloadItem::MixedContentStatus::UNKNOWN, base::FilePath(),
-        absl::nullopt /*download_schedule*/,
+        base::FilePath(), std::string() /*mime_type*/,
         download::DOWNLOAD_INTERRUPT_REASON_USER_CANCELED);
   } else {
     std::move(*callback).Run(
@@ -68,8 +68,8 @@ bool DownloadManagerDelegateEfl::DetermineDownloadTarget(
         download::DownloadItem::TARGET_DISPOSITION_OVERWRITE,
         download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
         download::DownloadItem::MixedContentStatus::UNKNOWN,
-        GetPlatformDownloadPath(item), absl::nullopt /*download_schedule*/,
-        download::DOWNLOAD_INTERRUPT_REASON_NONE);
+        GetPlatformDownloadPath(item), base::FilePath(),
+        std::string() /*mime_type*/, download::DOWNLOAD_INTERRUPT_REASON_NONE);
   }
   return true;
 }
index f5eb1a9..3e52dbf 100644 (file)
@@ -6,7 +6,9 @@
 #include <cstdio>
 #include <iostream>
 #include "base/files/file_util.h"
-#include "base/task/post_task.h"
+#include "base/logging.h"
+#include "base/task/bind_post_task.h"
+#include "base/task/thread_pool.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "favicon_commands.h"
 #include "favicon_database_p.h"
@@ -229,7 +231,8 @@ void FaviconDatabase::SyncSQLite() {
           content::BrowserThread::DB);
 #else
   scoped_refptr<base::SingleThreadTaskRunner> ptr =
-      base::CreateSingleThreadTaskRunner({content::BrowserThread::UI});
+      base::ThreadPool::CreateSingleThreadTaskRunner(
+          {content::BrowserThread::UI});
 #endif
   ptr->PostTask(FROM_HERE, base::BindOnce(&FaviconDatabasePrivate::performSync,
                                           d->weakPtrFactory.GetWeakPtr()));
@@ -237,7 +240,8 @@ void FaviconDatabase::SyncSQLite() {
 
 void FaviconDatabase::ScheduleSync() {
   if (!d->timer.IsRunning()) {
-    d->timer.Start(FROM_HERE, base::TimeDelta::FromSeconds(SYNC_DELAY), this, &FaviconDatabase::SyncSQLite);
+    d->timer.Start(FROM_HERE, base::Seconds(SYNC_DELAY), this,
+                   &FaviconDatabase::SyncSQLite);
   }
 }
 
index 7278602..2dc138d 100644 (file)
@@ -6,12 +6,11 @@
 #define FAVICON_DATABASE_H
 
 #include <string>
+#include "base/files/file_path.h"
+#include "base/memory/weak_ptr.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/sqlite/sqlite3.h"
 #include "url/gurl.h"
-#include "base/files/file_path.h"
-#include "base/memory/weak_ptr.h"
-#include "base/macros.h"
 
 struct FaviconDatabasePrivate;
 
@@ -37,7 +36,7 @@ class FaviconDatabase {
 
  private:
   FaviconDatabase();
-  DISALLOW_COPY_AND_ASSIGN(FaviconDatabase);
+  // DISALLOW_COPY_AND_ASSIGN(FaviconDatabase);
 
   bool IsOpen() const;
   bool Open();
index 7208a06..55d72c5 100644 (file)
@@ -4,7 +4,8 @@
 
 #include "favicon_database_p.h"
 #include <iostream>
-#include "base/task/post_task.h"
+#include "base/task/bind_post_task.h"
+#include "base/task/thread_pool.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "favicon_commands.h"
 
@@ -51,7 +52,8 @@ scoped_refptr<base::SingleThreadTaskRunner> FaviconDatabasePrivate::taskRunner()
   return content::BrowserThread::GetTaskRunnerForThread(
       content::BrowserThread::DB);
 #else
-  return base::CreateSingleThreadTaskRunner({content::BrowserThread::UI});
+  return base::ThreadPool::CreateSingleThreadTaskRunner(
+      {content::BrowserThread::UI});
 #endif
 }
 
index 5ac1d6a..a9dd774 100644 (file)
@@ -7,17 +7,17 @@
 
 #include <map>
 #include <queue>
-#include "url/gurl.h"
-#include "third_party/skia/include/core/SkBitmap.h"
-#include "third_party/sqlite/sqlite3.h"
 #include "base/files/file_path.h"
-#include "base/single_thread_task_runner.h"
+#include "base/memory/weak_ptr.h"
 #include "base/synchronization/lock.h"
+#include "base/task/single_thread_task_runner.h"
 #include "base/timer/timer.h"
-#include "base/memory/weak_ptr.h"
 #include "content/public/browser/browser_thread.h"
 #include "favicon_database.h"
 #include "private/ewk_main_private.h"
+#include "third_party/skia/include/core/SkBitmap.h"
+#include "third_party/sqlite/sqlite3.h"
+#include "url/gurl.h"
 
 class Command;
 
index 41430b1..2676837 100644 (file)
@@ -23,10 +23,10 @@ void FaviconDownloader::Start() {
 int FaviconDownloader::DownloadFavicon(const GURL &faviconUrl) {
   return web_contents()->DownloadImage(
       faviconUrl,
-      true,   // is_favicon
-      0,      // no preferred size
-      0,      // no max size
-      false,  // normal cache policy
+      true,         // is_favicon
+      gfx::Size(),  // no preferred size
+      0,            // no max size
+      false,        // normal cache policy
       base::BindOnce(&FaviconDownloader::DidDownloadFavicon,
                      m_weakPtrFactory.GetWeakPtr()));
 }
index b002784..301f936 100644 (file)
@@ -41,7 +41,7 @@ class FaviconDownloader : public content::WebContentsObserver {
   GURL m_faviconUrl;
   FaviconDownloaderCallback m_callback;
   base::WeakPtrFactory<FaviconDownloader> m_weakPtrFactory;
-  DISALLOW_COPY_AND_ASSIGN(FaviconDownloader);
+  // DISALLOW_COPY_AND_ASSIGN(FaviconDownloader);
 };
 
 #endif // FAVICON_DOWNLOADER_H
index abdb9cb..f33f46e 100644 (file)
@@ -4,6 +4,8 @@
 
 #include "browser/geolocation/geolocation_permission_context_efl.h"
 
+#include <tuple>
+
 #include "common/web_contents_utils.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
@@ -63,7 +65,7 @@ void GeolocationPermissionContextEfl::RequestPermissionOnUIThread(
     // if request is suspended, the API takes over the request object lifetime
     // and request will be deleted after decision is made
     if (request->isSuspended())
-      ignore_result(request.release());
+      std::ignore = request.release();
     else if (!request->isDecided())  // Reject permission if request is not suspended and not decided
       std::move(callback).Run(PermissionStatus::DENIED);
   }
@@ -74,7 +76,7 @@ void GeolocationPermissionContextEfl::RequestPermission(
     int render_frame_id,
     const GURL& requesting_frame,
     base::OnceCallback<void(PermissionStatus)> callback) const {
-  base::PostTask(
+  base::ThreadPool::PostTask(
       FROM_HERE, {BrowserThread::UI},
       base::BindOnce(
           &GeolocationPermissionContextEfl::RequestPermissionOnUIThread,
index a460ec1..cd439db 100644 (file)
@@ -38,7 +38,7 @@ class LocationProviderEfl : public LocationProviderBase {
   location_manager_h location_manager_;
   base::MessageLoop* geolocation_message_loop_;
 
-  DISALLOW_COPY_AND_ASSIGN(LocationProviderEfl);
+  // DISALLOW_COPY_AND_ASSIGN(LocationProviderEfl);
 };
 
 }  // namespace content
index b1ee43b..313af2c 100644 (file)
@@ -84,7 +84,7 @@ class JavaScriptDialogManagerEfl : public content::JavaScriptDialogManager {
   std::unique_ptr<JavaScriptModalCallbacksData> prompt_callback_data_;
   DialogClosedCallback dialog_closed_callback_;
 
-  DISALLOW_COPY_AND_ASSIGN(JavaScriptDialogManagerEfl);
+  // DISALLOW_COPY_AND_ASSIGN(JavaScriptDialogManagerEfl);
 };
 
 #endif /* JAVASCRIPT_DIALOG_MANAGER_EFL_H_ */
index 81c1d2d..6b2dffa 100644 (file)
@@ -36,7 +36,7 @@ class MimeOverrideManagerEfl {
   base::Lock lock_;
   MimeOverrideMap mime_override_map_;
 
-  DISALLOW_COPY_AND_ASSIGN(MimeOverrideManagerEfl);
+  // DISALLOW_COPY_AND_ASSIGN(MimeOverrideManagerEfl);
 };
 
 #endif // MIME_OVERRIDE_MANAGER_EFL_H_
index 4ff2e6b..f74547f 100644 (file)
@@ -4,6 +4,8 @@
 
 #include "browser/notification/notification_controller_efl.h"
 
+#include <tuple>
+
 #include "base/files/file_enumerator.h"
 #include "base/files/file_util.h"
 #include "base/logging.h"
@@ -265,7 +267,7 @@ void PermissionHandler::RequestPermission(
         // If policy is suspended, the API takes over the policy object lifetime
         // and policy will be deleted after decision is made.
         if (notification_permission->IsSuspended())
-          ignore_result(notification_permission.release());
+          std::ignore = notification_permission.release();
       }
       break;
     case PermissionStatus::GRANTED:
index 19df7a9..fb6e721 100644 (file)
@@ -197,7 +197,7 @@ class NotificationControllerEfl : public PlatformNotificationService {
   std::unique_ptr<DefaultCallback> default_callback_;
   std::unique_ptr<NotificationHelper> notification_helper_;
 
-  DISALLOW_COPY_AND_ASSIGN(NotificationControllerEfl);
+  // DISALLOW_COPY_AND_ASSIGN(NotificationControllerEfl);
 };
 
 } // namespace content
index 051f42c..71e7921 100644 (file)
@@ -90,7 +90,7 @@ public:
   // Allows authentication callbacks to be destroyed when this client is gone.
   base::WeakPtrFactory<PasswordManagerClientEfl> weak_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(PasswordManagerClientEfl);
+  // DISALLOW_COPY_AND_ASSIGN(PasswordManagerClientEfl);
 };
 }
 
index 93321ef..7691e6c 100644 (file)
@@ -26,7 +26,7 @@ class PasswordStoreService {
 
  private:
   scoped_refptr<PasswordStore> password_store_;
-  DISALLOW_COPY_AND_ASSIGN(PasswordStoreService);
+  // DISALLOW_COPY_AND_ASSIGN(PasswordStoreService);
 };
 
 // Singleton that owns all PasswordStores and associates them with
@@ -46,7 +46,7 @@ class PasswordStoreFactory {
 
   std::unique_ptr<PasswordStoreService> service_;
 
-  DISALLOW_COPY_AND_ASSIGN(PasswordStoreFactory);
+  // DISALLOW_COPY_AND_ASSIGN(PasswordStoreFactory);
 };
 }
 #endif // TIZEN_AUTOFILL_SUPPORT
index df25b6a..d782c80 100644 (file)
@@ -4,12 +4,13 @@
 
 #include "browser/policy_response_delegate_efl.h"
 
+#include "base/task/thread_pool.h"
 #include "browser/mime_override_manager_efl.h"
 #include "browser/resource_throttle_efl.h"
 #include "common/web_contents_utils.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_frame_host.h"
+#include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "eweb_view.h"
 #include "private/ewk_policy_decision_private.h"
@@ -50,13 +51,13 @@ PolicyResponseDelegateEfl::PolicyResponseDelegateEfl(
   // accept them without EWK-specific logic. For example notification icon is internal
   // chromium download
   if (render_process_id_ > 0 && (render_frame_id_ > 0 || render_view_id_ > 0)) {
-    base::PostTask(
+    base::ThreadPool::PostTask(
         FROM_HERE, {BrowserThread::UI},
         base::BindOnce(
             &PolicyResponseDelegateEfl::HandlePolicyResponseOnUIThread, this));
   } else {
     // Async call required!
-    base::PostTask(
+    base::ThreadPool::PostTask(
         FROM_HERE, {BrowserThread::IO},
         base::BindOnce(&PolicyResponseDelegateEfl::UseResponseOnIOThread,
                        this));
@@ -119,14 +120,14 @@ void PolicyResponseDelegateEfl::HandlePolicyResponseOnUIThread() {
 
 void PolicyResponseDelegateEfl::UseResponse() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  base::PostTask(
+  base::ThreadPool::PostTask(
       FROM_HERE, {BrowserThread::IO},
       base::BindOnce(&PolicyResponseDelegateEfl::UseResponseOnIOThread, this));
 }
 
 void PolicyResponseDelegateEfl::IgnoreResponse() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  base::PostTask(
+  base::ThreadPool::PostTask(
       FROM_HERE, {BrowserThread::IO},
       base::BindOnce(&PolicyResponseDelegateEfl::IgnoreResponseOnIOThread,
                      this));
index 20a96b6..f24bee9 100644 (file)
@@ -17,7 +17,7 @@ void QuotaPermissionContextEfl::RequestQuotaPermission(
     int render_process_id,
     QuotaPermissionContext::PermissionCallback callback) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    base::PostTask(
+    base::ThreadPool::PostTask(
         FROM_HERE, {BrowserThread::UI},
         base::BindOnce(&QuotaPermissionContextEfl::RequestQuotaPermission, this,
                        params, render_process_id, std::move(callback)));
@@ -48,9 +48,10 @@ void QuotaPermissionContextEfl::DispatchCallback(
   DCHECK_EQ(false, callback.is_null());
 
   if (!content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)) {
-    base::PostTask(FROM_HERE, {BrowserThread::IO},
-                   base::BindOnce(&QuotaPermissionContextEfl::DispatchCallback,
-                                  std::move(callback), response));
+    base::ThreadPool::PostTask(
+        FROM_HERE, {BrowserThread::IO},
+        base::BindOnce(&QuotaPermissionContextEfl::DispatchCallback,
+                       std::move(callback), response));
     return;
   }
 
index f6d7267..d459bac 100644 (file)
@@ -27,7 +27,7 @@ const uint32_t kFilteredMessageClasses[] = {EwkMsgStart};
 
 RenderMessageFilterEfl::RenderMessageFilterEfl(int render_process_id)
     : BrowserMessageFilter(kFilteredMessageClasses,
-                           base::size(kFilteredMessageClasses)),
+                           std::size(kFilteredMessageClasses)),
       render_process_id_(render_process_id) {}
 
 RenderMessageFilterEfl::~RenderMessageFilterEfl() { }
index a3cc959..1ed69cb 100644 (file)
@@ -4,7 +4,7 @@
 
 #include "resource_dispatcher_host_delegate_efl.h"
 
-#include "base/task/post_task.h"
+#include "base/task/bind_post_task.h"
 #include "browser/login_delegate_efl.h"
 #include "browser/mime_override_manager_efl.h"
 #include "browser_context_efl.h"
@@ -137,7 +137,7 @@ void ResourceDispatcherHostDelegateEfl::TriggerNewDownloadStartCallback(
 
   // Since called by IO thread callback trigger needs to
   // be posted to UI thread so that IO thread is unblocked
-  base::PostTaskWithTraits(
+  base::ThreadPool::PostTaskWithTraits(
       FROM_HERE, {BrowserThread::UI},
       base::BindOnce(TriggerNewDownloadStartCallbackOnUIThread,
                      render_process_id, render_view_id, request->url(),
index ffdf6ef..f7cae42 100644 (file)
@@ -67,18 +67,18 @@ bool SSLHostStateDelegateEfl::DidHostRunInsecureContent(
 
 void SSLHostStateDelegateEfl::AllowHttpForHost(
     const std::string& host,
-    content::WebContents* web_contents) {}
+    StoragePartition* storage_partition) {}
 
 bool SSLHostStateDelegateEfl::IsHttpAllowedForHost(
     const std::string& host,
-    content::WebContents* web_contents) {
+    StoragePartition* storage_partition) {
   return false;
 }
 
 void SSLHostStateDelegateEfl::AllowCert(const std::string& host,
                                         const net::X509Certificate& cert,
                                         int error,
-                                        WebContents* web_contents) {
+                                        StoragePartition* storage_partition) {
   cert_policy_for_host_[host].Allow(cert, error);
 }
 
@@ -91,7 +91,7 @@ SSLHostStateDelegate::CertJudgment SSLHostStateDelegateEfl::QueryPolicy(
     const std::string& host,
     const net::X509Certificate& cert,
     int error,
-    WebContents* web_contents) {
+    StoragePartition* storage_partition) {
   return cert_policy_for_host_[host].Check(cert, error)
              ? SSLHostStateDelegate::ALLOWED
              : SSLHostStateDelegate::DENIED;
@@ -102,8 +102,9 @@ void SSLHostStateDelegateEfl::RevokeUserAllowExceptions(
   cert_policy_for_host_.erase(host);
 }
 
-bool SSLHostStateDelegateEfl::HasAllowException(const std::string& host,
-                                                WebContents* web_contents) {
+bool SSLHostStateDelegateEfl::HasAllowException(
+    const std::string& host,
+    StoragePartition* storage_partition) {
   return false;
 }
 }
index 5f34500..f6c113b 100644 (file)
@@ -47,7 +47,7 @@ class SSLHostStateDelegateEfl : public SSLHostStateDelegate {
   void AllowCert(const std::string& host,
                  const net::X509Certificate& cert,
                  int error,
-                 WebContents* web_contents) override;
+                 StoragePartition* storage_partition) override;
 
   void Clear(
       base::RepeatingCallback<bool(const std::string&)> host_filter) override;
@@ -57,7 +57,7 @@ class SSLHostStateDelegateEfl : public SSLHostStateDelegate {
       const std::string& host,
       const net::X509Certificate& cert,
       int error,
-      WebContents* web_contents) override;
+      StoragePartition* storage_partition) override;
 
   // Records that a host has run insecure content.
   void HostRanInsecureContent(const std::string& host,
@@ -72,12 +72,12 @@ class SSLHostStateDelegateEfl : public SSLHostStateDelegate {
   // Allowlists site so it can be loaded over HTTP when HTTPS-First Mode is
   // enabled.
   void AllowHttpForHost(const std::string& host,
-                        WebContents* web_contents) override;
+                        StoragePartition* storage_partition) override;
 
   // Returns whether site is allowed to load over HTTP when HTTPS-First Mode is
   // enabled.
   bool IsHttpAllowedForHost(const std::string& host,
-                            WebContents* web_contents) override;
+                            StoragePartition* storage_partition) override;
 
   // Revokes all SSL certificate error allow exceptions made by the user for
   // |host|.
@@ -88,13 +88,13 @@ class SSLHostStateDelegateEfl : public SSLHostStateDelegate {
   // that there exists an exception. To see if a particular certificate and
   // error combination exception is allowed, use QueryPolicy().
   bool HasAllowException(const std::string& host,
-                         WebContents* web_contents) override;
+                         StoragePartition* storage_partition) override;
 
  private:
   // Certificate policies for each host.
   std::map<std::string, internal::CertPolicy> cert_policy_for_host_;
 
-  DISALLOW_COPY_AND_ASSIGN(SSLHostStateDelegateEfl);
+  // DISALLOW_COPY_AND_ASSIGN(SSLHostStateDelegateEfl);
 };
 }
 
index ce59a07..a560e28 100644 (file)
@@ -5,7 +5,6 @@
 #ifndef Vibration_Provider_Client_h
 #define Vibration_Provider_Client_h
 
-#include "base/macros.h"
 #include "device/vibration/vibration_provider_client.h"
 #include "public/ewk_context_internal.h"
 
@@ -28,7 +27,7 @@ class VibrationProviderClientEwk: public device::VibrationProviderClient {
   Ewk_Vibration_Client_Vibration_Cancel_Cb cancel_vibration_cb_;
   void* user_data_;
 
-  DISALLOW_COPY_AND_ASSIGN(VibrationProviderClientEwk);
+  // DISALLOW_COPY_AND_ASSIGN(VibrationProviderClientEwk);
 };
 
 #endif // Vibration_Provider_Client_h
index 9f66c4f..015ffe9 100644 (file)
@@ -46,7 +46,7 @@ class WebCacheManagerEfl : public content::NotificationObserver {
   std::set<int> renderers_;
   content::BrowserContext* browser_context_;
   Ewk_Cache_Model cache_model_;
-  DISALLOW_COPY_AND_ASSIGN(WebCacheManagerEfl);
+  // DISALLOW_COPY_AND_ASSIGN(WebCacheManagerEfl);
 };
 
 #endif
index 3efac6c..b777dea 100644 (file)
@@ -180,7 +180,7 @@ class WebViewBrowserMessageFilterPrivate
 WebViewBrowserMessageFilter::WebViewBrowserMessageFilter(
     content::WebContents* web_contents)
     : BrowserMessageFilter(kFilteredMessageClasses,
-                           base::size(kFilteredMessageClasses)),
+                           std::size(kFilteredMessageClasses)),
       private_(new WebViewBrowserMessageFilterPrivate(web_contents)) {}
 
 WebViewBrowserMessageFilter::~WebViewBrowserMessageFilter() {
index cb9ec07..7fc149d 100644 (file)
@@ -61,7 +61,7 @@ class WebDataService : public WebDataServiceBase {
   virtual ~WebDataService();
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(WebDataService);
+  // DISALLOW_COPY_AND_ASSIGN(WebDataService);
 };
 
 #endif // TIZEN_AUTOFILL_SUPPORT
index 5ad1bcc..7cf6b0d 100644 (file)
@@ -36,7 +36,7 @@ class WebDataServiceWrapper{
   scoped_refptr<autofill::AutofillWebDataService> autofill_web_data_;
   scoped_refptr<WebDataService> web_data_;
 
-  DISALLOW_COPY_AND_ASSIGN(WebDataServiceWrapper);
+  // DISALLOW_COPY_AND_ASSIGN(WebDataServiceWrapper);
 };
 
 // Singleton that owns all WebDataServiceWrappers
@@ -56,7 +56,7 @@ class WebDataServiceFactory {
   WebDataServiceFactory();
   virtual ~WebDataServiceFactory();
 
-  DISALLOW_COPY_AND_ASSIGN(WebDataServiceFactory);
+  // DISALLOW_COPY_AND_ASSIGN(WebDataServiceFactory);
 };
 
 #endif // TIZEN_AUTOFILL_SUPPORT
index 1c06db2..764f735 100644 (file)
@@ -57,7 +57,7 @@ class BrowserContextEfl : public BrowserContext,
     HTTPCustomHeadersEflMap http_custom_headers_;
     mutable base::Lock http_custom_headers_lock_;
 
-    DISALLOW_COPY_AND_ASSIGN(ResourceContextEfl);
+    // DISALLOW_COPY_AND_ASSIGN(ResourceContextEfl);
   };
 
   BrowserContextEfl(EWebContext*, bool incognito = false);
@@ -68,14 +68,17 @@ class BrowserContextEfl : public BrowserContext,
   net::URLRequestContextGetter* CreateMediaRequestContextForStoragePartition(
       const base::FilePath&,
       bool);
+  PlatformNotificationService* GetPlatformNotificationService() override {
+    return nullptr;
+  }
   StorageNotificationService* GetStorageNotificationService() override {
     return nullptr;
   }
   bool IsOffTheRecord() override { return incognito_; }
-
-  // visitedlink::VisitedLinkDelegate implementation.
-  void RebuildTable(const scoped_refptr<URLEnumerator>& enumerator) override;
-
+  ReduceAcceptLanguageControllerDelegate*
+  GetReduceAcceptLanguageControllerDelegate() override {
+    return nullptr;
+  }
   ResourceContext* GetResourceContext() override;
   content::DownloadManagerDelegate* GetDownloadManagerDelegate() override {
     return &download_manager_delegate_;
@@ -92,6 +95,9 @@ class BrowserContextEfl : public BrowserContext,
   BackgroundFetchDelegate* GetBackgroundFetchDelegate() override;
   BrowsingDataRemoverDelegate* GetBrowsingDataRemoverDelegate() override;
 
+  // visitedlink::VisitedLinkDelegate implementation.
+  void RebuildTable(const scoped_refptr<URLEnumerator>& enumerator) override;
+
   std::unique_ptr<ZoomLevelDelegate> CreateZoomLevelDelegate(
       const base::FilePath& partition_path);
   URLRequestContextGetterEfl* GetRequestContextEfl() {
@@ -134,7 +140,7 @@ class BrowserContextEfl : public BrowserContext,
   std::unique_ptr<BackgroundSyncController> background_sync_controller_;
   std::unique_ptr<PermissionControllerDelegate> permission_controller_delegate_;
 
-  DISALLOW_COPY_AND_ASSIGN(BrowserContextEfl);
+  // DISALLOW_COPY_AND_ASSIGN(BrowserContextEfl);
 };
 }
 
index 1d2f570..ea9512d 100644 (file)
@@ -5,7 +5,6 @@
 #ifndef CONTENT_BROWSER_MAIN_PARTS_EFL_H_
 #define CONTENT_BROWSER_MAIN_PARTS_EFL_H_
 
-#include "base/macros.h"
 #include "content/public/browser/browser_main_parts.h"
 
 namespace content {
@@ -28,7 +27,7 @@ class BrowserMainPartsEfl : public BrowserMainParts {
  private:
   DevToolsDelegateEfl* devtools_delegate_;
 
-  DISALLOW_COPY_AND_ASSIGN(BrowserMainPartsEfl);
+  // DISALLOW_COPY_AND_ASSIGN(BrowserMainPartsEfl);
 };
 
 }  // namespace content
index f400044..d38d54a 100644 (file)
@@ -98,7 +98,7 @@ content::MainFunctionParams CommandLineEfl::GetDefaultPortParams() {
 
   AppendUserArgs(*p_command_line);
 
-  return content::MainFunctionParams(*p_command_line);
+  return content::MainFunctionParams(p_command_line);
 }
 
 void CommandLineEfl::AppendProcessSpecificArgs(base::CommandLine& command_line) {
index 0b5441e..7032645 100644 (file)
@@ -7,7 +7,6 @@
 
 #include <string>
 
-#include "base/macros.h"
 #include "build/tizen_version.h"
 
 namespace EflWebView {
@@ -91,7 +90,7 @@ class VersionInfo {
   std::string product_version_;
   static VersionInfo* version_info_;
 
-  DISALLOW_COPY_AND_ASSIGN(VersionInfo);
+  // DISALLOW_COPY_AND_ASSIGN(VersionInfo);
 };
 
 }  // namespace EflWebView
index 1a35d5b..f0fca25 100644 (file)
@@ -4,32 +4,31 @@
 
 #include "content_browser_client_efl.h"
 
-#include "command_line_efl.h"
 #include "base/callback.h"
 #include "base/strings/string_number_conversions.h"
-#include "browser_main_parts_efl.h"
-#include "browser_context_efl.h"
-#include "eweb_context.h"
-#include "web_contents_delegate_efl.h"
-#include "web_contents_view_delegate_ewk.h"
-#include "devtools_manager_delegate_efl.h"
 #include "browser/editor_client_observer.h"
 #include "browser/notification/notification_controller_efl.h"
 #include "browser/quota_permission_context_efl.h"
 #include "browser/render_message_filter_efl.h"
 #include "browser/web_view_browser_message_filter.h"
+#include "browser_context_efl.h"
+#include "browser_main_parts_efl.h"
+#include "command_line_efl.h"
 #include "common/content_switches_efl.h"
+#include "common/version_info.h"
+#include "common/web_contents_utils.h"
 #include "components/error_page/common/error.h"
 #include "components/error_page/common/localized_error.h"
-#include "content/browser/web_contents/web_contents_view_efl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_iterator.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/content_switches.h"
-#include "common/version_info.h"
-#include "common/web_contents_utils.h"
+#include "devtools_manager_delegate_efl.h"
+#include "eweb_context.h"
 #include "shared_url_loader_factory_efl.h"
+#include "web_contents_delegate_efl.h"
+#include "web_contents_view_delegate_ewk.h"
 
 #if defined(OS_TIZEN)
 #if !defined(EWK_BRINGUP)
@@ -95,8 +94,7 @@ ContentBrowserClientEfl::~ContentBrowserClientEfl() {
 }
 
 std::unique_ptr<BrowserMainParts>
-ContentBrowserClientEfl::CreateBrowserMainParts(
-    const MainFunctionParams& parameters) {
+ContentBrowserClientEfl::CreateBrowserMainParts(bool is_integration_test) {
   auto browser_main_parts = std::make_unique<BrowserMainPartsEfl>();
   browser_main_parts_efl_ = browser_main_parts.get();
   return browser_main_parts;
@@ -342,7 +340,7 @@ void ContentBrowserClientEfl::SetCertificatePem(const net::SSLInfo& ssl_info,
                                            &pem_certificate))
     return;
 
-  base::PostTask(
+  base::ThreadPool::PostTask(
       FROM_HERE, {BrowserThread::UI},
       base::BindOnce(&ContentBrowserClientEfl::SetCertificatePemOnUIThread,
                      render_process_id, render_view_id, pem_certificate));
@@ -383,9 +381,10 @@ std::string ContentBrowserClientEfl::GetApplicationLocale() {
   return locale;
 }
 
-WebContentsViewDelegate* ContentBrowserClientEfl::GetWebContentsViewDelegate(
-    WebContents* web_contents) {
-  return new WebContentsViewDelegateEwk(WebViewFromWebContents(web_contents));
+std::unique_ptr<WebContentsViewDelegate>
+ContentBrowserClientEfl::GetWebContentsViewDelegate(WebContents* web_contents) {
+  return std::make_unique<WebContentsViewDelegateEwk>(
+      WebViewFromWebContents(web_contents));
 }
 
 scoped_refptr<QuotaPermissionContext>
index 19ed7c3..b6803ba 100644 (file)
@@ -35,7 +35,7 @@ class ContentBrowserClientEfl : public ContentBrowserClient {
       AcceptLangsChangedCallback;
 
   std::unique_ptr<BrowserMainParts> CreateBrowserMainParts(
-      const MainFunctionParams& parameters) override;
+      bool is_integration_test) override;
 
   // Allows the embedder to pass extra command line flags.
   // switches::kProcessType will already be set at this point.
@@ -68,8 +68,8 @@ class ContentBrowserClientEfl : public ContentBrowserClient {
       bool strict_enforcement,
       base::OnceCallback<void(CertificateRequestResultType)> callback) override;
 
-  virtual PlatformNotificationService* GetPlatformNotificationService(
-      BrowserContext* browser_context) override;
+  PlatformNotificationService* GetPlatformNotificationService(
+      BrowserContext* browser_context);
 
   NotificationControllerEfl* GetNotificationController() const;
 
@@ -100,7 +100,7 @@ class ContentBrowserClientEfl : public ContentBrowserClient {
 
   std::string GetApplicationLocale() override;
 
-  WebContentsViewDelegate* GetWebContentsViewDelegate(
+  std::unique_ptr<WebContentsViewDelegate> GetWebContentsViewDelegate(
       WebContents* web_contents) override;
 
   void SetBrowserContext(BrowserContextEfl* context) {
@@ -151,7 +151,7 @@ class ContentBrowserClientEfl : public ContentBrowserClient {
   std::string preferred_langs_;
   std::vector<AcceptLangsChangedCallback> accept_langs_changed_callbacks_;
 
-  DISALLOW_COPY_AND_ASSIGN(ContentBrowserClientEfl);
+  // DISALLOW_COPY_AND_ASSIGN(ContentBrowserClientEfl);
 };
 }
 
index e261fc3..c2ffeb4 100644 (file)
@@ -111,7 +111,7 @@ ContentBrowserClient* ContentMainDelegateEfl::CreateContentBrowserClient() {
   return browser_client_.get();
 }
 
-bool ContentMainDelegateEfl::BasicStartupComplete(int* /*exit_code*/) {
+absl::optional<int> ContentMainDelegateEfl::BasicStartupComplete() {
   content::SetContentClient(&content_client_);
   PathsEfl::Register();
   LocaleEfl::Initialize();
index 79bec3b..f26a3e8 100644 (file)
@@ -21,7 +21,7 @@ class ContentMainDelegateEfl
   ~ContentMainDelegateEfl() override = default;
 
   // ContentMainDelegate implementation:
-  bool BasicStartupComplete(int* exit_code) override;
+  absl::optional<int> BasicStartupComplete() override;
   void PreSandboxStartup() override;
   ContentBrowserClient* CreateContentBrowserClient() override;
   ContentRendererClient* CreateContentRendererClient() override;
@@ -34,7 +34,7 @@ class ContentMainDelegateEfl
   std::unique_ptr<ContentBrowserClient> browser_client_;
   std::unique_ptr<ContentRendererClient> renderer_client_;
   ContentClientEfl content_client_;
-  DISALLOW_COPY_AND_ASSIGN(ContentMainDelegateEfl);
+  // DISALLOW_COPY_AND_ASSIGN(ContentMainDelegateEfl);
 };
 
 }
index d943f6e..cb8f299 100644 (file)
@@ -11,7 +11,6 @@
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "common/web_contents_utils.h"
-#include "content/browser/renderer_host/render_widget_host_view_efl.h"
 #include "content/browser/selection/selection_controller_efl.h"
 #include "content/common/paths_efl.h"
 #include "content/public/browser/browser_thread.h"
@@ -47,12 +46,15 @@ std::vector<ContextMenuItemEfl> ContextMenuControllerEfl::_context_menu_listdata
 ContextMenuControllerEfl::ContextMenuControllerEfl(EWebView* wv,
                                                    WebContents& web_contents)
     : webview_(wv),
+#if !defined(USE_AURA)
       native_view_(static_cast<Evas_Object*>(web_contents.GetNativeView())),
+#endif
       popup_(nullptr),
       menu_items_(nullptr),
       web_contents_(web_contents),
       is_text_selection_(false),
-      weak_ptr_factory_(this) {}
+      weak_ptr_factory_(this) {
+}
 
 ContextMenuControllerEfl::~ContextMenuControllerEfl() {
   for (std::set<download::DownloadItem*>::iterator it =
@@ -197,7 +199,7 @@ void ContextMenuControllerEfl::GetProposedContextMenu() {
         params_.link_url.spec(),
         params_.link_url.spec());
   }
-
+#if !defined(EWK_BRINGUP)
   RenderWidgetHostViewEfl* rwhv = static_cast<RenderWidgetHostViewEfl*>(web_contents_.GetRenderWidgetHostView());
   if ((params_.media_type != ContextMenuDataMediaType::kImage &&
        !params_.selection_text.empty()) ||
@@ -207,7 +209,6 @@ void ContextMenuControllerEfl::GetProposedContextMenu() {
     AddItemToProposedList(EWK_CONTEXT_MENU_ITEM_TYPE_ACTION, EWK_CONTEXT_MENU_ITEM_TAG_SELECT_ALL,
         std::string(dgettext("WebKit", "IDS_WEBVIEW_OPT_SELECT_ALL_ABB")));
   }
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
   if (params_.is_draggable) {
     AddItemToProposedList(EWK_CONTEXT_MENU_ITEM_TYPE_ACTION, EWK_CONTEXT_MENU_ITEM_TAG_DRAG,
         std::string(dgettext("WebKit", "IDS_WEBVIEW_OPT_DRAG_AND_DROP")));
@@ -571,7 +572,7 @@ base::FilePath ContextMenuControllerEfl::DownloadFile(
     download::DownloadUrlParameters::OnStartedCallback callback) {
   LOG(INFO) << "Downloading file: " << url << "to: "<< outputDir.value();
   const GURL referrer = web_contents_.GetVisibleURL();
-  RenderFrameHost* frame_host = web_contents_.GetMainFrame();
+  RenderFrameHost* frame_host = web_contents_.GetPrimaryMainFrame();
   StoragePartition* storage_partition =
       web_contents_.GetBrowserContext()->GetStoragePartition(
           frame_host->GetSiteInstance());
index 2e8d38e..8df7217 100644 (file)
@@ -10,6 +10,7 @@
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/synchronization/waitable_event.h"
+#include "base/task/thread_pool.h"
 #include "content/browser/storage_partition_impl.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
@@ -128,9 +129,10 @@ void CookieManager::DeleteCookiesAsync(const std::string& url,
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   std::unique_ptr<net::CookieStore> cookie_store = GetCookieStore();
   if (cookie_store.get()) {
-    base::PostTask(FROM_HERE, {BrowserThread::IO},
-                   base::BindOnce(DeleteCookiesOnIOThread,
-                                  std::move(cookie_store), url, cookie_name));
+    base::ThreadPool::PostTask(
+        FROM_HERE, {BrowserThread::IO},
+        base::BindOnce(DeleteCookiesOnIOThread, std::move(cookie_store), url,
+                       cookie_name));
   }
 }
 
@@ -155,17 +157,19 @@ void CookieManager::SetStoragePath(const std::string& path,
 
  scoped_refptr<content::URLRequestContextGetterEfl> context_getter = GetContextGetter();
  if (context_getter.get()) {
-   base::PostTask(FROM_HERE, {BrowserThread::IO},
-                  base::BindOnce(SetStoragePathOnIOThread, context_getter, path,
-                                 persist_session_cookies, file_storage_type));
+   base::ThreadPool::PostTask(
+       FROM_HERE, {BrowserThread::IO},
+       base::BindOnce(SetStoragePathOnIOThread, context_getter, path,
+                      persist_session_cookies, file_storage_type));
  }
 }
 
 void CookieManager::GetAcceptPolicyAsync(Ewk_Cookie_Manager_Policy_Async_Get_Cb callback, void *data) {
   AutoLock lock(lock_);
-  base::PostTask(FROM_HERE, {BrowserThread::UI},
-                 base::BindOnce(&TriggerHostPolicyGetCallbackAsyncOnUIThread,
-                                cookie_policy_, callback, data));
+  base::ThreadPool::PostTask(
+      FROM_HERE, {BrowserThread::UI},
+      base::BindOnce(&TriggerHostPolicyGetCallbackAsyncOnUIThread,
+                     cookie_policy_, callback, data));
 }
 
 void CookieManager::GetHostNamesWithCookiesAsync(AsyncHostnamesGetCb callback, void *data) {
@@ -173,9 +177,10 @@ void CookieManager::GetHostNamesWithCookiesAsync(AsyncHostnamesGetCb callback, v
   host_callback_queue_.push(new EwkGetHostCallback(callback, data));
   std::unique_ptr<net::CookieStore> cookie_store = GetCookieStore();
   if (cookie_store.get()) {
-    base::PostTask(FROM_HERE, {BrowserThread::IO},
-                   base::BindOnce(&CookieManager::FetchCookiesOnIOThread,
-                                  GetSharedThis(), std::move(cookie_store)));
+    base::ThreadPool::PostTask(
+        FROM_HERE, {BrowserThread::IO},
+        base::BindOnce(&CookieManager::FetchCookiesOnIOThread, GetSharedThis(),
+                       std::move(cookie_store)));
   }
 }
 
@@ -193,9 +198,9 @@ void CookieManager::FetchCookiesOnIOThread(
 
 void CookieManager::OnFetchComplete(const net::CookieList& cookies) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    base::PostTask(FROM_HERE, {BrowserThread::UI},
-                   base::BindOnce(&CookieManager::OnFetchComplete,
-                                  base::Unretained(this), cookies));
+    base::ThreadPool::PostTask(FROM_HERE, {BrowserThread::UI},
+                               base::BindOnce(&CookieManager::OnFetchComplete,
+                                              base::Unretained(this), cookies));
     return;
   }
   if (!host_callback_queue_.empty()) {
@@ -341,7 +346,7 @@ std::string CookieManager::GetCookiesForURL(const std::string& url) {
   std::string cookie_value;
   base::WaitableEvent completion(base::WaitableEvent::ResetPolicy::AUTOMATIC,
                                  base::WaitableEvent::InitialState::NOT_SIGNALED);
-  base::PostTask(
+  base::ThreadPool::PostTask(
       FROM_HERE, {BrowserThread::IO},
       base::BindOnce(GetCookieValueOnIOThread, std::move(cookie_store),
                      GURL(url), &cookie_value, &completion));
index 0a90df6..78e81ac 100644 (file)
@@ -121,7 +121,7 @@ class CookieManager : public base::RefCountedThreadSafe<CookieManager> {
   // file scheme
   base::Lock file_scheme_lock_;
 
-  DISALLOW_COPY_AND_ASSIGN(CookieManager);
+  // DISALLOW_COPY_AND_ASSIGN(CookieManager);
 };
 
 #endif //cookie_manager_h
index 179b276..dfdec4a 100644 (file)
@@ -15,8 +15,7 @@ class DevToolsManagerDelegateEfl : public DevToolsManagerDelegate {
   ~DevToolsManagerDelegateEfl() override;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(DevToolsManagerDelegateEfl);
-
+  // DISALLOW_COPY_AND_ASSIGN(DevToolsManagerDelegateEfl);
 };
 
 } // namespace content
index b4ec37a..b0f19c9 100644 (file)
@@ -17,5 +17,5 @@ int efl_webprocess_main(int argc, const char **argv) {
   params.argc = argc;
   params.argv = argv;
 
-  return content::ContentMain(params);
+  return content::ContentMain(std::move(params));
 }
index d8b5a0f..c60641d 100644 (file)
 #endif
 
 #include "base/synchronization/waitable_event.h"
+#include "base/task/thread_pool.h"
 #include "browser/favicon/favicon_database.h"
 #include "browser/webdata/web_data_service_factory.h"
 #include "components/autofill/content/browser/content_autofill_driver.h"
-#include "content/public/browser/appcache_service.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
@@ -94,7 +94,7 @@ class WebStorageGetAllOriginsDispatcher
 
     for (it = local_storage.begin(); it != local_storage.end(); it++) {
       _Ewk_Security_Origin* origin =
-          new _Ewk_Security_Origin(it->origin.GetURL());
+          new _Ewk_Security_Origin(it->storage_key.origin().GetURL());
       lorigins = eina_list_append(lorigins, origin);
     }
 
@@ -124,7 +124,7 @@ void SetProxyConfigCallbackOnIOThread(
 #endif
   done->Signal();
 }
-
+#if !defined(EWK_BRINGUP)  // FIXME: m108 bringup
 void OnOriginsWithApplicationCacheObtained(
     Ewk_Web_Application_Cache_Origins_Get_Callback callback,
     void* user_data,
@@ -140,7 +140,7 @@ void OnOriginsWithApplicationCacheObtained(
   }
   callback(origins, user_data);
 }
-
+#endif
 void OnTemporaryUsageAndQuotaObtained(
     Ewk_Web_Application_Cache_Usage_For_Origin_Get_Callback callback,
     void* user_data,
@@ -152,8 +152,8 @@ void OnTemporaryUsageAndQuotaObtained(
     // We still trigger callback.
     usage = 0;
   }
-  base::PostTask(FROM_HERE, {BrowserThread::UI},
-                 base::BindOnce(callback, usage, user_data));
+  base::ThreadPool::PostTask(FROM_HERE, {BrowserThread::UI},
+                             base::BindOnce(callback, usage, user_data));
 }
 
 void OnGetWebDBOrigins(Ewk_Web_Database_Origins_Get_Callback callback,
@@ -165,8 +165,8 @@ void OnGetWebDBOrigins(Ewk_Web_Database_Origins_Get_Callback callback,
     _Ewk_Security_Origin* sec_origin = new _Ewk_Security_Origin(*iter);
     origins = eina_list_append(origins, sec_origin);
   }
-  base::PostTask(FROM_HERE, {BrowserThread::UI},
-                 base::BindOnce(callback, origins, user_data));
+  base::ThreadPool::PostTask(FROM_HERE, {BrowserThread::UI},
+                             base::BindOnce(callback, origins, user_data));
 }
 
 void GetWebDBOriginsOnDBThread(Ewk_Web_Database_Origins_Get_Callback callback,
@@ -190,8 +190,8 @@ void OnGetFileSystemOrigins(Ewk_Local_File_System_Origins_Get_Callback callback,
     _Ewk_Security_Origin* sec_origin = new _Ewk_Security_Origin(*iter);
     origins = eina_list_append(origins, sec_origin);
   }
-  base::PostTask(FROM_HERE, {BrowserThread::UI},
-                 base::BindOnce(callback, origins, user_data));
+  base::ThreadPool::PostTask(FROM_HERE, {BrowserThread::UI},
+                             base::BindOnce(callback, origins, user_data));
 }
 
 void GetFileSystemOriginsOnFILEThread(
@@ -500,7 +500,7 @@ void EWebContext::SetProxyUri(const char* uri) {
   config.proxy_rules().ParseFromString(proxy_uri_);
   base::WaitableEvent done(base::WaitableEvent::ResetPolicy::AUTOMATIC,
                            base::WaitableEvent::InitialState::NOT_SIGNALED);
-  base::PostTask(
+  base::ThreadPool::PostTask(
       FROM_HERE, {BrowserThread::IO},
       base::BindOnce(
           &SetProxyConfigCallbackOnIOThread, &done,
@@ -538,9 +538,10 @@ Ewk_Cookie_Manager* EWebContext::ewkCookieManager() {
 
 void EWebContext::DeleteAllApplicationCache() {
   if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
-    base::PostTask(FROM_HERE, {BrowserThread::IO},
-                   base::BindOnce(&EWebContext::DeleteAllApplicationCache,
-                                  base::Unretained(this)));
+    base::ThreadPool::PostTask(
+        FROM_HERE, {BrowserThread::IO},
+        base::BindOnce(&EWebContext::DeleteAllApplicationCache,
+                       base::Unretained(this)));
     return;
   }
   BrowsingDataRemoverEfl* remover =
@@ -585,7 +586,7 @@ void EWebContext::GetApplicationCacheUsage(
   content::StoragePartition* partition =
       BrowserContext::GetStoragePartition(browser_context_.get(), NULL);
 
-  base::PostTask(
+  base::ThreadPool::PostTask(
       FROM_HERE, {BrowserThread::IO},
       base::BindOnce(&storage::QuotaManager::GetUsageAndQuota,
                      partition->GetQuotaManager(), url,
@@ -597,7 +598,7 @@ void EWebContext::GetApplicationCacheUsage(
 
 void EWebContext::WebStorageDelete() {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    base::PostTask(
+    base::ThreadPool::PostTask(
         FROM_HERE, {BrowserThread::UI},
         base::BindOnce(&EWebContext::WebStorageDelete, base::Unretained(this)));
     return;
@@ -609,9 +610,10 @@ void EWebContext::WebStorageDelete() {
 
 void EWebContext::WebStorageDeleteForOrigin(const GURL& origin) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    base::PostTask(FROM_HERE, {BrowserThread::UI},
-                   base::BindOnce(&EWebContext::WebStorageDeleteForOrigin,
-                                  base::Unretained(this), origin));
+    base::ThreadPool::PostTask(
+        FROM_HERE, {BrowserThread::UI},
+        base::BindOnce(&EWebContext::WebStorageDeleteForOrigin,
+                       base::Unretained(this), origin));
     return;
   }
 #if !defined(EWK_BRINGUP)  // FIXME: m94 bringup
@@ -640,7 +642,7 @@ void EWebContext::WebStorageOriginsAllGet(
 
 void EWebContext::IndexedDBDelete() {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    base::PostTask(
+    base::ThreadPool::PostTask(
         FROM_HERE, {BrowserThread::UI},
         base::BindOnce(&EWebContext::IndexedDBDelete, base::Unretained(this)));
     return;
@@ -652,9 +654,9 @@ void EWebContext::IndexedDBDelete() {
 
 void EWebContext::WebDBDelete(const GURL& host) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    base::PostTask(FROM_HERE, {BrowserThread::UI},
-                   base::BindOnce(&EWebContext::WebDBDelete,
-                                  base::Unretained(this), host));
+    base::ThreadPool::PostTask(FROM_HERE, {BrowserThread::UI},
+                               base::BindOnce(&EWebContext::WebDBDelete,
+                                              base::Unretained(this), host));
     return;
   }
   BrowsingDataRemoverEfl* remover =
@@ -668,17 +670,18 @@ void EWebContext::GetAllOriginsWithWebDB(
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
   content::StoragePartition* partition =
       BrowserContext::GetStoragePartition(browser_context_.get(), NULL);
-  BrowserThread::PostTask(BrowserThread::DB, FROM_HERE,
-                          base::BindOnce(&GetWebDBOriginsOnDBThread, callback,
-                                         user_data, partition));
+  BrowserThread::ThreadPool::PostTask(
+      BrowserThread::DB, FROM_HERE,
+      base::BindOnce(&GetWebDBOriginsOnDBThread, callback, user_data,
+                     partition));
 #endif
 }
 
 void EWebContext::FileSystemDelete(const GURL& host) {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    base::PostTask(FROM_HERE, {BrowserThread::UI},
-                   base::BindOnce(&EWebContext::FileSystemDelete,
-                                  base::Unretained(this), host));
+    base::ThreadPool::PostTask(FROM_HERE, {BrowserThread::UI},
+                               base::BindOnce(&EWebContext::FileSystemDelete,
+                                              base::Unretained(this), host));
     return;
   }
   BrowsingDataRemoverEfl* remover =
@@ -692,9 +695,10 @@ void EWebContext::GetAllOriginsWithFileSystem(
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
   content::StoragePartition* partition =
       BrowserContext::GetStoragePartition(browser_context_.get(), NULL);
-  BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
-                          base::BindOnce(&GetFileSystemOriginsOnFILEThread,
-                                         callback, user_data, partition));
+  BrowserThread::ThreadPool::PostTask(
+      BrowserThread::FILE, FROM_HERE,
+      base::BindOnce(&GetFileSystemOriginsOnFILEThread, callback, user_data,
+                     partition));
 #endif
 }
 
@@ -733,9 +737,9 @@ Evas_Object* EWebContext::AddFaviconObject(const char* uri,
 void EWebContext::ClearCandidateData() {
 #if defined(TIZEN_AUTOFILL_SUPPORT)
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    base::PostTask(FROM_HERE, {BrowserThread::UI},
-                   base::BindOnce(&EWebContext::ClearCandidateData,
-                                  base::Unretained(this)));
+    base::ThreadPool::PostTask(FROM_HERE, {BrowserThread::UI},
+                               base::BindOnce(&EWebContext::ClearCandidateData,
+                                              base::Unretained(this)));
     return;
   }
   WebDataServiceFactory* webDataServiceInstance =
index 401c454..e8b4016 100644 (file)
 #include "components/sessions/content/content_serialized_navigation_builder.h"
 #include "components/sessions/core/serialized_navigation_entry.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
-#include "content/browser/renderer_host/render_widget_host_view_efl.h"
 #include "content/browser/renderer_host/ui_events_helper.h"
-#include "content/browser/renderer_host/web_event_factory_efl.h"
 #include "content/browser/web_contents/web_contents_impl_efl.h"
 #include "content/browser/web_contents/web_contents_view.h"
-#include "content/browser/web_contents/web_contents_view_efl.h"
 #include "content/common/content_client_export.h"
 #include "content/public/browser/browser_message_filter.h"
 #include "content/public/browser/browser_task_traits.h"
@@ -147,10 +144,12 @@ EWebView* EWebView::FromEvasObject(Evas_Object* eo) {
   return WebViewDelegateEwk::GetInstance().GetWebViewFromEvasObject(eo);
 }
 
+#if !defined(USE_AURA)
 RenderWidgetHostViewEfl* EWebView::rwhv() const {
   return static_cast<RenderWidgetHostViewEfl*>(
       web_contents_->GetRenderWidgetHostView());
 }
+#endif
 
 EWebView::EWebView(Ewk_Context* context, Evas_Object* object)
     : context_(context),
@@ -398,7 +397,7 @@ void EWebView::Stop() {
 void EWebView::Suspend() {
   CHECK(web_contents_);
   RenderViewHost* rvh = web_contents_->GetRenderViewHost();
-  RenderFrameHost* rfh = web_contents_->GetMainFrame();
+  RenderFrameHost* rfh = web_contents_->GetPrimaryMainFrame();
   CHECK(rvh);
   CHECK(rfh);
 #if !defined(EWK_BRINGUP)  // FIXME: m69 bringup
@@ -418,7 +417,7 @@ void EWebView::Suspend() {
 void EWebView::Resume() {
   CHECK(web_contents_);
   RenderViewHost* rvh = web_contents_->GetRenderViewHost();
-  RenderFrameHost* rfh = web_contents_->GetMainFrame();
+  RenderFrameHost* rfh = web_contents_->GetPrimaryMainFrame();
   CHECK(rvh);
   CHECK(rfh);
 #if !defined(EWK_BRINGUP)  // FIXME: m69 bringup
@@ -496,8 +495,9 @@ void EWebView::SetOrientation(int orientation) {
 
   if (orientation == 0 || orientation == 90 || orientation == 180 ||
       orientation == 270) {
+#if !defined(USE_AURA)
     GetWebContentsViewEfl()->SetOrientation(orientation);
-
+#endif
     int width = 0;
     int height = 0;
     const Ecore_Evas* ee =
@@ -520,7 +520,11 @@ void EWebView::SetOrientation(int orientation) {
 }
 
 int EWebView::GetOrientation() {
+#if !defined(USE_AURA)
   return GetWebContentsViewEfl()->GetOrientation();
+#else
+  return 0;
+#endif
 }
 
 void EWebView::Show() {
@@ -597,6 +601,7 @@ void EWebView::InvokePolicyNavigationCallback(
 void EWebView::HandleTouchEvents(Ewk_Touch_Event_Type type,
                                  const Eina_List* points,
                                  const Evas_Modifier* modifiers) {
+#if !defined(USE_AURA)
   const Eina_List* l;
   void* data;
   EINA_LIST_FOREACH(points, l, data) {
@@ -614,13 +619,14 @@ void EWebView::HandleTouchEvents(Ewk_Touch_Event_Type type,
       rwhv()->HandleTouchEvent(&touch_event);
     }
   }
+#endif
 }
-
+#if !defined(USE_AURA)
 content::WebContentsViewEfl* EWebView::GetWebContentsViewEfl() const {
   WebContentsImpl* wc = static_cast<WebContentsImpl*>(web_contents_.get());
   return static_cast<WebContentsViewEfl*>(wc->GetView());
 }
-
+#endif
 bool EWebView::TouchEventsEnabled() const {
   return touch_events_enabled_;
 }
@@ -633,8 +639,9 @@ void EWebView::SetTouchEventsEnabled(bool enabled) {
     return;
 
   touch_events_enabled_ = enabled;
+#if !defined(USE_AURA)
   GetWebContentsViewEfl()->SetTouchEventsEnabled(enabled);
-
+#endif
 #if !defined(EWK_BRINGUP)  // FIXME: m94 bringup
   // there is no flag touch_enabled in web preferences
   GetSettings()->getPreferences().touch_enabled = enabled;
@@ -655,7 +662,9 @@ void EWebView::SetMouseEventsEnabled(bool enabled) {
     return;
 
   mouse_events_enabled_ = enabled;
+#if !defined(USE_AURA)
   GetWebContentsViewEfl()->SetTouchEventsEnabled(!enabled);
+#endif
 }
 
 namespace {
@@ -678,7 +687,9 @@ void JavaScriptComplete(JavaScriptCallbackDetails* script_callback_data,
     return;
 
   std::string return_string;
+#if !defined(EWK_BRINGUP)  // FIXME: m108 bringup
   result->GetAsString(&return_string);
+#endif
   script_callback_data->callback_func_(script_callback_data->view_,
                                        return_string.c_str(),
                                        script_callback_data->user_data_);
@@ -698,7 +709,7 @@ bool EWebView::ExecuteJavaScript(const char* script,
   if (!web_contents_)
     return false;
 
-  RenderFrameHost* render_frame_host = web_contents_->GetMainFrame();
+  RenderFrameHost* render_frame_host = web_contents_->GetPrimaryMainFrame();
   if (!render_frame_host)
     return false;
 
@@ -724,7 +735,8 @@ bool EWebView::ExecuteJavaScript(const char* script,
     // ExecuteJavaScriptWithUserGestureForTests sets user_gesture to true. This
     // was the
     // behaviour is m34, and we want to keep it that way.
-    render_frame_host->ExecuteJavaScriptWithUserGestureForTests(js_script);
+    render_frame_host->ExecuteJavaScriptWithUserGestureForTests(
+        js_script, base::NullCallback());
   }
 
   return true;
@@ -778,7 +790,9 @@ bool EWebView::GetPrivateBrowsing() const {
 }
 
 void EWebView::set_magnifier(bool status) {
+#if !defined(USE_AURA)
   rwhv()->set_magnifier(status);
+#endif
 }
 
 const char* EWebView::GetUserAgent() const {
@@ -797,21 +811,21 @@ const char* EWebView::GetUserAgentAppName() const {
 }
 
 const char* EWebView::GetSelectedText() const {
+#if !defined(USE_AURA)
   if (!rwhv())
     return "";
 
   return base::UTF16ToUTF8(rwhv()->GetSelectedText()).c_str();
+#else
+  return "";
+#endif
 }
 
 _Ewk_Frame* EWebView::GetMainFrame() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
-  if (!frame_.get()) {
-    RenderViewHost* render_view_host = web_contents_->GetRenderViewHost();
-
-    if (render_view_host)
-      frame_.reset(new _Ewk_Frame(render_view_host->GetMainFrame()));
-  }
+  if (!frame_.get())
+    frame_.reset(new _Ewk_Frame(web_contents_->GetPrimaryMainFrame()));
 
   return frame_.get();
 }
@@ -832,7 +846,7 @@ void EWebView::UpdateWebKitPreferences() {
 
 void EWebView::UpdateWebkitPreferencesEfl(RenderViewHost* render_view_host) {
   DCHECK(render_view_host);
-
+#if !defined(EWK_BRINGUP)  // FIXME: m108 bringup
   IPC::Message* message = new EwkSettingsMsg_UpdateWebKitPreferencesEfl(
       render_view_host->GetRoutingID(), settings_->getPreferencesEfl());
 
@@ -843,6 +857,7 @@ void EWebView::UpdateWebkitPreferencesEfl(RenderViewHost* render_view_host) {
   } else {
     delayed_messages_.push_back(message);
   }
+#endif
 }
 
 void EWebView::SetContentSecurityPolicy(const char* policy,
@@ -915,7 +930,7 @@ void EWebView::ShowPopupMenu(const std::vector<blink::MenuItemInfo>& items,
   // Request form navigation information as early as possible,
   // given that is renderer will ping-back with actual requested data.
   RenderFrameHostImpl* render_frame_host =
-      static_cast<RenderFrameHostImpl*>(web_contents_->GetMainFrame());
+      static_cast<RenderFrameHostImpl*>(web_contents_->GetPrimaryMainFrame());
   if (render_frame_host)
     render_frame_host->Send(new EwkFrameMsg_RequestSelectCollectionInformation(
         render_frame_host->GetRoutingID()));
@@ -997,7 +1012,7 @@ Eina_Bool EWebView::PopupMenuUpdate(Eina_List* items, int selectedIndex) {
 
 void EWebView::FormNavigate(bool direction) {
   RenderFrameHostImpl* render_frame_host =
-      static_cast<RenderFrameHostImpl*>(web_contents_->GetMainFrame());
+      static_cast<RenderFrameHostImpl*>(web_contents_->GetPrimaryMainFrame());
   if (!render_frame_host)
     return;
 
@@ -1015,7 +1030,7 @@ void EWebView::FormNavigate(bool direction) {
 
 Eina_Bool EWebView::DidSelectPopupMenuItem(int selectedIndex) {
   RenderFrameHostImpl* render_frame_host =
-      static_cast<RenderFrameHostImpl*>(web_contents_->GetMainFrame());
+      static_cast<RenderFrameHostImpl*>(web_contents_->GetPrimaryMainFrame());
   if (!render_frame_host)
     return false;
 
@@ -1046,7 +1061,7 @@ Eina_Bool EWebView::DidSelectPopupMenuItem(int selectedIndex) {
 Eina_Bool EWebView::DidMultipleSelectPopupMenuItem(
     std::vector<int>& selectedIndices) {
   RenderFrameHostImpl* render_frame_host =
-      static_cast<RenderFrameHostImpl*>(web_contents_->GetMainFrame());
+      static_cast<RenderFrameHostImpl*>(web_contents_->GetPrimaryMainFrame());
   if (!render_frame_host)
     return false;
 
@@ -1077,7 +1092,7 @@ Eina_Bool EWebView::PopupMenuClose() {
   popupMenuItems_ = 0;
 
   RenderFrameHostImpl* render_frame_host =
-      static_cast<RenderFrameHostImpl*>(web_contents_->GetMainFrame());
+      static_cast<RenderFrameHostImpl*>(web_contents_->GetPrimaryMainFrame());
   if (!render_frame_host)
     return false;
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
@@ -1088,6 +1103,7 @@ Eina_Bool EWebView::PopupMenuClose() {
 
 void EWebView::HandleLongPressGesture(
     const content::ContextMenuParams& params) {
+#if !defined(USE_AURA)
   // This menu is created in renderer process and it does not now anything about
   // view scaling factor and it has another calling sequence, so coordinates is
   // not updated.
@@ -1109,9 +1125,11 @@ void EWebView::HandleLongPressGesture(
     if (show_context_menu_now)
       ShowContextMenuInternal(convertedParams);
   }
+#endif
 }
 
 void EWebView::ShowContextMenu(const content::ContextMenuParams& params) {
+#if !defined(USE_AURA)
   // This menu is created in renderer process and it does not now anything about
   // view scaling factor and it has another calling sequence, so coordinates is
   // not updated.
@@ -1129,6 +1147,7 @@ void EWebView::ShowContextMenu(const content::ContextMenuParams& params) {
   context_menu_position_ = gfx::Point(convertedParams.x, convertedParams.y);
 
   ShowContextMenuInternal(convertedParams);
+#endif
 }
 
 void EWebView::ShowContextMenuInternal(
@@ -1179,11 +1198,12 @@ void EWebView::SetScale(double scale_factor, int x, int y) {
 }
 
 bool EWebView::GetScrollPosition(int* x, int* y) const {
+#if !defined(USE_AURA)
   if (!rwhv()) {
     LOG(ERROR) << "rwhv() returns nullptr";
     return false;
   }
-
+#endif
   if (scroll_detector_->IsScrollOffsetChanged()) {
     if (x)
       *x = previous_scroll_position_.x();
@@ -1208,11 +1228,12 @@ bool EWebView::GetScrollPosition(int* x, int* y) const {
 }
 
 void EWebView::ChangeScroll(int& x, int& y) {
+#if !defined(USE_AURA)
   if (!rwhv()) {
     LOG(ERROR) << "rwhv() returns nullptr";
     return;
   }
-
+#endif
   int max_x = 0;
   int max_y = 0;
   GetScrollSize(&max_x, &max_y);
@@ -1287,8 +1308,10 @@ void EWebView::GetScrollSize(int* width, int* height) {
 }
 
 void EWebView::MoveCaret(const gfx::Point& point) {
+#if !defined(USE_AURA)
   if (rwhv())
     rwhv()->MoveCaret(point);
+#endif
 }
 
 void EWebView::QuerySelectionStyle() {
@@ -1312,10 +1335,14 @@ void EWebView::OnQuerySelectionStyleReply(const SelectionStylePrams& params) {
 }
 
 SelectionControllerEfl* EWebView::GetSelectionController() const {
+#if !defined(USE_AURA)
   RenderViewHost* render_view_host = web_contents_->GetRenderViewHost();
   RenderWidgetHostViewEfl* view = static_cast<RenderWidgetHostViewEfl*>(
       render_view_host->GetWidget()->GetView());
   return view ? view->GetSelectionController() : 0;
+#else
+  return nullptr;
+#endif
 }
 
 void EWebView::SelectLinkText(const gfx::Point& touch_point) {
@@ -1345,6 +1372,7 @@ bool EWebView::GetSelectionRange(Eina_Rectangle* left_rect,
 }
 
 Eina_Bool EWebView::ClearSelection() {
+#if !defined(USE_AURA)
   if (!rwhv())
     return EINA_FALSE;
 
@@ -1353,7 +1381,7 @@ Eina_Bool EWebView::ClearSelection() {
 
   if (GetSelectionController())
     return GetSelectionController()->ClearSelectionViaEWebView();
-
+#endif
   return EINA_FALSE;
 }
 
@@ -1491,11 +1519,12 @@ void EWebView::OnCopyFromBackingStore(bool success, const SkBitmap& bitmap) {}
 void EWebView::RenderViewCreated(RenderViewHost* render_view_host) {
   SendDelayedMessages(render_view_host);
   UpdateWebkitPreferencesEfl(render_view_host);
+#if !defined(USE_AURA)
   RenderWidgetHostViewEfl* view = static_cast<RenderWidgetHostViewEfl*>(
       render_view_host->GetWidget()->GetView());
   if (view)
     view->SetEvasHandler(evas_event_handler_);
-
+#endif
   if (render_view_host) {
     WebContents* content = WebContents::FromRenderViewHost(render_view_host);
     if (content) {
@@ -1579,14 +1608,19 @@ bool EWebView::GetSnapshotAsync(
     Eina_Rectangle rect,
     Ewk_Web_App_Screenshot_Captured_Callback callback,
     void* user_data) {
+#if !defined(USE_AURA)
   if (!rwhv())
     return false;
 
   return rwhv()->RequestSnapshotAsync(rect, callback, user_data);
+#else
+  return false;
+#endif
 }
 
 Evas_Object* EWebView::GetSnapshot(Eina_Rectangle rect) {
   Evas_Object* image = NULL;
+#if !defined(USE_AURA)
 #ifdef OS_TIZEN
   if (!rwhv() || !rwhv()->MakeCurrent())
     return NULL;
@@ -1640,6 +1674,7 @@ Evas_Object* EWebView::GetSnapshot(Eina_Rectangle rect) {
     evas_object_resize(image, width, height);
   }
 #endif
+#endif
   return image;
 }
 
@@ -1913,7 +1948,9 @@ double EWebView::GetScale() {
 
 void EWebView::DidChangePageScaleFactor(double scale_factor) {
   page_scale_factor_ = scale_factor;
+#if !defined(USE_AURA)
   GetWebContentsViewEfl()->SetPageScaleFactor(scale_factor);
+#endif
 }
 
 inline JavaScriptDialogManagerEfl* EWebView::GetJavaScriptDialogManagerEfl() {
@@ -2059,7 +2096,11 @@ void EWebView::SetCertificatePem(const std::string& certificate) {
 }
 
 bool EWebView::IsDragging() const {
+#if !defined(USE_AURA)
   return GetWebContentsViewEfl()->IsDragging();
+#else
+  return false;
+#endif
 }
 
 void EWebView::ShowFileChooser(content::RenderFrameHost* render_frame_host,
@@ -2137,7 +2178,7 @@ void EWebView::InputPickerShow(ui::TextInputType input_type,
 
 void EWebView::LoadNotFoundErrorPage(const std::string& invalidUrl) {
 #if !defined(EWK_BRINGUP)  // FIXME: m94 bringup
-  RenderFrameHost* render_frame_host = web_contents_->GetMainFrame();
+  RenderFrameHost* render_frame_host = web_contents_->GetPrimaryMainFrame();
   if (render_frame_host)
     render_frame_host->Send(new EwkFrameMsg_LoadNotFoundErrorPage(
         render_frame_host->GetRoutingID(), invalidUrl));
@@ -2182,9 +2223,10 @@ void EWebView::SyncAcceptLanguages(const std::string& accept_languages) {
 }
 
 void EWebView::HandleRendererProcessCrash() {
-  base::PostTask(FROM_HERE, {BrowserThread::UI},
-                 base::BindOnce(&EWebView::InvokeWebProcessCrashedCallback,
-                                base::Unretained(this)));
+  base::ThreadPool::PostTask(
+      FROM_HERE, {BrowserThread::UI},
+      base::BindOnce(&EWebView::InvokeWebProcessCrashedCallback,
+                     base::Unretained(this)));
 }
 
 void EWebView::InitializeContent() {
@@ -2193,7 +2235,8 @@ void EWebView::InitializeContent() {
     WebContents::CreateParams params(context_->browser_context());
     web_contents_.reset(
         new WebContentsImplEfl(context_->browser_context(), this));
-    static_cast<WebContentsImpl*>(web_contents_.get())->Init(params);
+    static_cast<WebContentsImpl*>(web_contents_.get())
+        ->Init(params, blink::FramePolicy());
   } else {
     web_contents_.reset(new_contents);
 
@@ -2238,8 +2281,10 @@ void EWebView::InitializeContent() {
   }
   web_contents_delegate_.reset(new WebContentsDelegateEfl(this));
   web_contents_->SetDelegate(web_contents_delegate_.get());
+#if !defined(USE_AURA)
   GetWebContentsViewEfl()->SetEflDelegate(
       new WebContentsViewEflDelegateEwk(this));
+#endif
   WebContentsImplEfl* wc_efl =
       static_cast<WebContentsImplEfl*>(web_contents_.get());
   wc_efl->SetEflDelegate(new WebContentsEflDelegateEwk(this));
@@ -2250,7 +2295,9 @@ void EWebView::InitializeContent() {
 
   permission_popup_manager_.reset(new PermissionPopupManager(evas_object_));
 
+#if !defined(USE_AURA)
   native_view_ = static_cast<Evas_Object*>(web_contents_->GetNativeView());
+#endif
   evas_object_smart_member_add(native_view_, evas_object_);
 }
 
@@ -2421,9 +2468,10 @@ void EWebView::SendDelayedMessages(RenderViewHost* render_view_host) {
   DCHECK(render_view_host);
 
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
-    base::PostTask(FROM_HERE, {BrowserThread::UI},
-                   base::BindOnce(&EWebView::SendDelayedMessages,
-                                  base::Unretained(this), render_view_host));
+    base::ThreadPool::PostTask(
+        FROM_HERE, {BrowserThread::UI},
+        base::BindOnce(&EWebView::SendDelayedMessages, base::Unretained(this),
+                       render_view_host));
     return;
   }
 
index 6f46f2f..41d1632 100644 (file)
 namespace content {
 class RenderFrameHost;
 class RenderViewHost;
-class RenderWidgetHostViewEfl;
 class WebContentsDelegateEfl;
 class ContextMenuControllerEfl;
-class WebContentsViewEfl;
 class PopupControllerEfl;
 }
 
@@ -493,9 +491,9 @@ class EWebView {
       int y,
       Ewk_Hit_Test_Mode mode,
       WebViewAsyncRequestHitTestDataCallback* cb);
-
+#if !defined(USE_AURA)
   content::WebContentsViewEfl* GetWebContentsViewEfl() const;
-
+#endif
 #if defined(OS_TIZEN) && !defined(EWK_BRINGUP)
   static void cameraResultCb(service_h request,
                              service_h reply,
@@ -506,7 +504,9 @@ class EWebView {
 #if defined(OS_TIZEN) && !defined(EWK_BRINGUP)
   bool LaunchCamera(std::u16string mimetype);
 #endif
+#if !defined(USE_AURA)
   content::RenderWidgetHostViewEfl* rwhv() const;
+#endif
   JavaScriptDialogManagerEfl* GetJavaScriptDialogManagerEfl();
 
   void ReleasePopupMenuList();
index 3c7b9b6..a5d3151 100644 (file)
@@ -36,7 +36,6 @@
 
 #include "command_line_efl.h"
 #include "content_main_delegate_efl.h"
-#include "ui/display/screen_efl.h"
 
 #ifdef OS_TIZEN
 #include <dlfcn.h>
@@ -126,10 +125,7 @@ EwkGlobalData* EwkGlobalData::GetInstance() {
       instance_->content_main_delegate_efl_.get());
   params.argc = CommandLineEfl::GetArgc();
   params.argv = CommandLineEfl::GetArgv();
-  instance_->content_main_runner_->Initialize(params);
-
-  // ScreenEfl should be installed only after CommandLine has been initialized.
-  ui::InstallScreenInstance();
+  instance_->content_main_runner_->Initialize(std::move(params));
 
 #if defined(USE_OZONE)
   ui::OzonePlatform::InitParams init_params;
@@ -152,14 +148,14 @@ EwkGlobalData* EwkGlobalData::GetInstance() {
 
   instance_->mojo_ipc_support_ = std::make_unique<content::MojoIpcSupport>(
       content::BrowserTaskExecutor::CreateIOThread());
-  instance_->startup_data_ =
+  main_funtion_params.startup_data =
       instance_->mojo_ipc_support_->CreateBrowserStartupData();
-  main_funtion_params.startup_data = instance_->startup_data_.get();
 
   instance_->browser_main_runner_ = BrowserMainRunner::Create();
-  instance_->browser_main_runner_->Initialize(main_funtion_params);
-
+  instance_->browser_main_runner_->Initialize(std::move(main_funtion_params));
+#if !defined(EWK_BRINGUP)  // FIXME: m108 bringup
   base::ThreadRestrictions::SetIOAllowed(true);
+#endif
 
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kSingleProcess)) {
index 939e791..e65e47b 100644 (file)
@@ -5,7 +5,6 @@
 #ifndef EWK_GLOBAL_DATA_H_
 #define EWK_GLOBAL_DATA_H_
 
-#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "content/browser/startup_data_impl.h"
 #include "url_request_context_getter_efl.h"
@@ -54,7 +53,7 @@ class EwkGlobalData
 
   scoped_refptr<content::URLRequestContextGetterEfl> system_request_context_;
 
-  DISALLOW_COPY_AND_ASSIGN(EwkGlobalData);
+  // DISALLOW_COPY_AND_ASSIGN(EwkGlobalData);
 };
 
 #endif // EWK_GLOBAL_DATA_H_
index c7f2414..264aeb0 100644 (file)
@@ -7,7 +7,6 @@
 
 #include <string>
 
-#include "base/macros.h"
 #include "net/base/http_user_agent_settings.h"
 
 // An implementation of |HttpUserAgentSettings| that provides fixed value for
@@ -23,7 +22,7 @@ class HttpUserAgentSettingsEfl : public net::HttpUserAgentSettings {
   std::string GetUserAgent() const override;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(HttpUserAgentSettingsEfl);
+  // DISALLOW_COPY_AND_ASSIGN(HttpUserAgentSettingsEfl);
 };
 
 #endif  // HTTP_USER_AGENT_SETTINGS_EFL_H_
index a888080..3b94127 100644 (file)
@@ -34,8 +34,7 @@ bool NetworkDelegateEfl::OnCanGetCookies(const URLRequest& request,
 
 bool NetworkDelegateEfl::OnCanSetCookie(const URLRequest& request,
                                         const CanonicalCookie& cookie,
-                                        CookieOptions* options,
-                                        bool allowed_from_caller) {
+                                        CookieOptions* options) {
   if (!cookie_manager_.get())
     return false;
   return cookie_manager_->OnCanSetCookie(request, std::string(), options);
index 270a0e3..3048563 100644 (file)
@@ -29,8 +29,7 @@ class NetworkDelegateEfl : public NetworkDelegateImpl {
 
   bool OnCanSetCookie(const URLRequest& request,
                       const CanonicalCookie& cookie,
-                      CookieOptions* options,
-                      bool allowed_from_caller) override;
+                      CookieOptions* options) override;
 
   bool OnCanAccessFile(const URLRequest& request,
                        const base::FilePath& original_path,
index 3993839..8945f05 100644 (file)
@@ -5,18 +5,18 @@
 #include "permission_controller_delegate_efl.h"
 
 #include "base/callback.h"
-#include "browser_context_efl.h"
 #include "browser/geolocation/geolocation_permission_context_efl.h"
 #include "browser/notification/notification_controller_efl.h"
-#include "content_browser_client_efl.h"
-#include "content_main_delegate_efl.h"
+#include "browser_context_efl.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/permission_controller.h"
-#include "content/public/browser/permission_type.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
+#include "content_browser_client_efl.h"
+#include "content_main_delegate_efl.h"
 #include "ewk_global_data.h"
+#include "third_party/blink/public/common/permissions/permission_utils.h"
 
 using namespace blink::mojom;
 
@@ -182,6 +182,14 @@ void PermissionControllerDelegateEfl::OnPermissionRequestResponse(
   pending_request->callback().Run(pending_request->results());
 }
 
+void PermissionControllerDelegateEfl::RequestPermissionsFromCurrentDocument(
+    const std::vector<blink::PermissionType>& permissions,
+    RenderFrameHost* render_frame_host,
+    bool user_gesture,
+    PermissionStatusVectorCallback callback) {
+  NOTIMPLEMENTED();
+}
+
 PermissionStatus PermissionControllerDelegateEfl::GetPermissionStatus(
                                                  PermissionType permission,
                                                  const GURL& requesting_origin,
@@ -219,16 +227,26 @@ PermissionStatus PermissionControllerDelegateEfl::GetPermissionStatus(
   }
 }
 
+PermissionResult
+PermissionControllerDelegateEfl::GetPermissionResultForOriginWithoutContext(
+    PermissionType permission,
+    const url::Origin& origin) {
+  NOTIMPLEMENTED();
+}
+
+blink::mojom::PermissionStatus
+PermissionControllerDelegateEfl::GetPermissionStatusForCurrentDocument(
+    PermissionType permission,
+    RenderFrameHost* render_frame_host) {
+  NOTIMPLEMENTED();
+}
+
 blink::mojom::PermissionStatus
-PermissionControllerDelegateEfl::GetPermissionStatusForFrame(
+PermissionControllerDelegateEfl::GetPermissionStatusForWorker(
     PermissionType permission,
-   content::RenderFrameHost* render_frame_host,
-    const GURL& requesting_origin) {
-  return GetPermissionStatus(
-      permission, requesting_origin,
-      content::WebContents::FromRenderFrameHost(render_frame_host)
-          ->GetLastCommittedURL()
-          .GetOrigin());
+    RenderProcessHost* render_process_host,
+    const GURL& worker_origin) {
+  NOTIMPLEMENTED();
 }
 
 void PermissionControllerDelegateEfl::ResetPermission(PermissionType permission,
@@ -240,7 +258,8 @@ void PermissionControllerDelegateEfl::ResetPermission(PermissionType permission,
 PermissionControllerDelegate::SubscriptionId
 PermissionControllerDelegateEfl::SubscribePermissionStatusChange(
     PermissionType permission,
-    content::RenderFrameHost* render_frame_host,
+    RenderProcessHost* render_process_host,
+    RenderFrameHost* render_frame_host,
     const GURL& embedding_origin,
     base::RepeatingCallback<void(blink::mojom::PermissionStatus)> callback) {
   NOTIMPLEMENTED();
index 222a716..6fef9e9 100644 (file)
@@ -7,12 +7,12 @@
 
 #include "base/callback_forward.h"
 #include "base/containers/id_map.h"
-#include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "content/public/browser/permission_controller_delegate.h"
 
 namespace content {
 
+using PermissionType = blink::PermissionType;
 using PermissionStatusCallback = base::OnceCallback<void(blink::mojom::PermissionStatus)>;
 using PermissionStatusVectorCallback =
     base::OnceCallback<void(const std::vector<blink::mojom::PermissionStatus>&)>;
@@ -35,14 +35,28 @@ class CONTENT_EXPORT PermissionControllerDelegateEfl : public PermissionControll
                           bool user_gesture,
                           PermissionStatusVectorCallback callback) override;
 
+  void RequestPermissionsFromCurrentDocument(
+      const std::vector<blink::PermissionType>& permissions,
+      RenderFrameHost* render_frame_host,
+      bool user_gesture,
+      PermissionStatusVectorCallback callback) override;
+
   blink::mojom::PermissionStatus GetPermissionStatus(PermissionType permission,
                                        const GURL& requesting_origin,
                                        const GURL& embedding_origin) override;
 
-  blink::mojom::PermissionStatus GetPermissionStatusForFrame(
+  PermissionResult GetPermissionResultForOriginWithoutContext(
       PermissionType permission,
-      RenderFrameHost* render_frame_host,
-      const GURL& requesting_origin) override;
+      const url::Origin& origin) override;
+
+  blink::mojom::PermissionStatus GetPermissionStatusForCurrentDocument(
+      PermissionType permission,
+      RenderFrameHost* render_frame_host) override;
+
+  blink::mojom::PermissionStatus GetPermissionStatusForWorker(
+      PermissionType permission,
+      RenderProcessHost* render_process_host,
+      const GURL& worker_origin) override;
 
   void ResetPermission(PermissionType permission,
                        const GURL& requesting_origin,
@@ -52,6 +66,7 @@ class CONTENT_EXPORT PermissionControllerDelegateEfl : public PermissionControll
   // pair { requesting_origin, embedding_origin } changes.
   PermissionControllerDelegate::SubscriptionId SubscribePermissionStatusChange(
       PermissionType permission,
+      RenderProcessHost* render_process_host,
       RenderFrameHost* render_frame_host,
       const GURL& embedding_origin,
       base::RepeatingCallback<void(blink::mojom::PermissionStatus)> callback)
@@ -71,7 +86,7 @@ class CONTENT_EXPORT PermissionControllerDelegateEfl : public PermissionControll
   PendingRequestsMap pending_requests_;
   base::WeakPtrFactory<PermissionControllerDelegateEfl> weak_ptr_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(PermissionControllerDelegateEfl);
+  // DISALLOW_COPY_AND_ASSIGN(PermissionControllerDelegateEfl);
 };
 
 }
index 4b684af..7bd8373 100644 (file)
@@ -141,7 +141,7 @@ struct Ewk_Context : public base::RefCounted<Ewk_Context> {
   ~Ewk_Context();
   friend class base::RefCounted<Ewk_Context>;
 
-  DISALLOW_COPY_AND_ASSIGN(Ewk_Context);
+  // DISALLOW_COPY_AND_ASSIGN(Ewk_Context);
 };
 
 
index a1e724d..b3c6754 100644 (file)
@@ -25,7 +25,7 @@ _Ewk_Frame::_Ewk_Frame(RenderFrameHost* rfh)
   WebContents *wc = WebContents::FromRenderViewHost(rvh);
   if (!wc)
     return;
-  is_main_frame_ = wc->GetMainFrame() == rfh;
+  is_main_frame_ = wc->GetPrimaryMainFrame() == rfh;
 }
 
 _Ewk_Frame::_Ewk_Frame(const NavigationPolicyParams &params)
index b82fae5..55ccb87 100644 (file)
@@ -56,7 +56,7 @@ class _Ewk_Hit_Test {
     Eina_Hash* attributeHash; // attribute data for hit element
 
    private:
-    DISALLOW_COPY_AND_ASSIGN(Hit_Test_Node_Data);
+    // DISALLOW_COPY_AND_ASSIGN(Hit_Test_Node_Data);
   } nodeData;
 
   // when hit node is image we need to store image buffer and filename extension
@@ -68,10 +68,10 @@ class _Ewk_Hit_Test {
     SkBitmap imageBitmap;          // image pixels data
 
    private:
-    DISALLOW_COPY_AND_ASSIGN(Hit_Test_Image_Buffer);
+    // DISALLOW_COPY_AND_ASSIGN(Hit_Test_Image_Buffer);
   } imageData;
 
-  DISALLOW_COPY_AND_ASSIGN(_Ewk_Hit_Test);
+  // DISALLOW_COPY_AND_ASSIGN(_Ewk_Hit_Test);
 };
 
 
index a6b9de7..c9c9bd2 100644 (file)
@@ -9,7 +9,6 @@
 #include <string>
 
 #include "base/callback.h"
-#include "base/macros.h"
 #include "private/ewk_security_origin_private.h"
 #include "third_party/blink/public/mojom/permissions/permission_status.mojom.h"
 #include "third_party/skia/include/core/SkBitmap.h"
@@ -42,8 +41,7 @@ struct Ewk_Notification {
   uint64_t notificationID_;
   std::unique_ptr<_Ewk_Security_Origin> origin_;
 
-  DISALLOW_COPY_AND_ASSIGN(Ewk_Notification);
-
+  // DISALLOW_COPY_AND_ASSIGN(Ewk_Notification);
 };
 
 struct Ewk_Notification_Permission_Request {
@@ -65,7 +63,7 @@ struct Ewk_Notification_Permission_Request {
   bool decided_;
   mutable bool suspended_;
 
-  DISALLOW_COPY_AND_ASSIGN(Ewk_Notification_Permission_Request);
+  // DISALLOW_COPY_AND_ASSIGN(Ewk_Notification_Permission_Request);
 };
 
 
index 190ded9..97644fa 100644 (file)
@@ -111,7 +111,7 @@ _Ewk_Policy_Decision::_Ewk_Policy_Decision(
   RenderFrameHost* rfh = NULL;
   // we can use main frame here
   if (view) {
-    view->web_contents().GetMainFrame();
+    view->web_contents().GetPrimaryMainFrame();
   }
 
   frame_.reset(new _Ewk_Frame(rfh));
@@ -217,7 +217,9 @@ void _Ewk_Policy_Decision::InitializeOnUIThread() {
 
       // DCHECK(viewhost);
       if (viewhost) {
+#if !defined(EWK_BRINGUP)  // FIXME: m108 bringup
         host = viewhost->GetMainFrame();
+#endif
       }
     }
 
index b787479..c79d656 100644 (file)
@@ -31,7 +31,7 @@ struct _Ewk_Quota_Permission_Request {
   bool isPersistent_;
   Evas_Object* view_;
 
-  DISALLOW_COPY_AND_ASSIGN(_Ewk_Quota_Permission_Request);
+  // DISALLOW_COPY_AND_ASSIGN(_Ewk_Quota_Permission_Request);
 };
 
 #endif // EWK_QUOTA_PERMISSION_REQUEST_PRIVATE_H
index 4b17730..7462b51 100644 (file)
@@ -33,7 +33,7 @@ struct _Ewk_Security_Origin
   const Eina_Stringshare* protocol_;
   const int port_;
 
-  DISALLOW_COPY_AND_ASSIGN(_Ewk_Security_Origin);
+  // DISALLOW_COPY_AND_ASSIGN(_Ewk_Security_Origin);
 };
 
 #endif // ewk_security_origin_private_h
index 05fd228..b069a31 100644 (file)
@@ -5,7 +5,6 @@
 #include "ewk_settings_private.h"
 
 #include "net/http/http_stream_factory.h"
-#include "content/browser/renderer_host/edge_effect.h"
 
 void Ewk_Settings::setSpdyEnabled(bool flag)
 {
@@ -29,5 +28,7 @@ void Ewk_Settings::setDefaultTextEncoding(const char* encoding) {
 
 void Ewk_Settings::setEdgeEffectEnabled(bool enable) {
   m_edgeEffectEnabled = enable;
+#if !defined(EWK_BRINGUP)  // FIXME: m94 bringup
   content::EdgeEffect::EnableGlobally(enable);
+#endif
 }
index 4889f91..7b425c2 100644 (file)
@@ -19,7 +19,7 @@ struct EwkViewImpl  {
   const EWebView* GetTizenWebView() const { return wv_; }
  private:
   EWebView* wv_;
-  DISALLOW_COPY_AND_ASSIGN(EwkViewImpl);
+  // DISALLOW_COPY_AND_ASSIGN(EwkViewImpl);
 };
 
 Evas_Smart_Class parent_smart_class_ = EVAS_SMART_CLASS_INIT_NULL;
index bce9313..010551a 100644 (file)
@@ -6,7 +6,6 @@
 #define webview_delegate_ewk_h
 
 #include <Evas.h>
-#include "base/macros.h"
 
 class EWebView;
 
@@ -31,7 +30,7 @@ struct WebViewDelegateEwk {
   void RequestHandleOrientationUnlock(EWebView* wv) const;
  private:
   WebViewDelegateEwk() {}
-  DISALLOW_COPY_AND_ASSIGN(WebViewDelegateEwk);
+  // DISALLOW_COPY_AND_ASSIGN(WebViewDelegateEwk);
 };
 
 
index e8cadf3..63a0413 100644 (file)
@@ -29,8 +29,8 @@
 // // TODO: remove dependency to chromium internal
 #include <base/bind.h>
 #include <base/location.h>
-
 #include "base/threading/thread_task_runner_handle.h"
+#include "base/time/time.h"
 
 using namespace base;
 
@@ -45,7 +45,7 @@ void ewk_dispatcher_dispatch(ewk_dispatch_callback cb, void *user_data, unsigned
 {
   if (delay) {
     g_task_runner->PostDelayedTask(FROM_HERE, BindOnce(cb, user_data),
-                                   TimeDelta::FromMilliseconds(delay));
+                                   base::Milliseconds(delay));
   } else {
     g_task_runner->PostTask(FROM_HERE, BindOnce(cb, user_data));
   }
index 0ca98e2..26fb4e7 100644 (file)
@@ -110,7 +110,9 @@ static Ewk_Error_Code convertErrorCode(const Ewk_Error* error)
       return EWK_ERROR_CODE_CANT_LOOKUP_HOST;
 
     case net::ERR_BAD_SSL_CLIENT_AUTH_CERT:
+#if !defined(EWK_BRINGUP)  // FIXME: m108 bringup
     case net::ERR_CERT_ERROR_IN_SSL_RENEGOTIATION:
+#endif
     case net::ERR_SSL_CLIENT_AUTH_SIGNATURE_FAILED:
     case net::ERR_SSL_HANDSHAKE_NOT_COMPLETED:
       return EWK_ERROR_CODE_FAILED_TLS_HANDSHAKE;
@@ -142,9 +144,10 @@ static Ewk_Error_Code convertErrorCode(const Ewk_Error* error)
     case net::ERR_ADDRESS_INVALID:
     case net::ERR_INVALID_URL:
       return EWK_ERROR_CODE_BAD_URL;
-
-    case net::ERR_DISALLOWED_URL_SCHEME:
-    case net::ERR_UNKNOWN_URL_SCHEME:
+#if !defined(EWK_BRINGUP)  // FIXME: m108 bringup
+    case net::ERR_         // DISALLOWED_URL_SCHEME:
+#endif
+        case net::ERR_UNKNOWN_URL_SCHEME:
       return EWK_ERROR_CODE_UNSUPPORTED_SCHEME;
 
     case net::ERR_CLIENT_AUTH_CERT_TYPE_UNSUPPORTED:
index 8512b76..e791a8d 100644 (file)
@@ -26,7 +26,6 @@
 #include "ewk_ipc_message_internal.h"
 
 #include "common/render_messages_ewk.h"
-#include "content/public/renderer/render_view.h"
 #include "eweb_context.h"
 #include "private/ewk_context_private.h"
 #include "private/ewk_wrt_private.h"
index e4067f7..d414859 100644 (file)
 #include "content/common/paths_efl.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/public/renderer/render_thread.h"
-#include "content/public/renderer/render_view.h"
 #include "content/renderer/common_renderer_client.h"
-#include "content/renderer/render_view_impl.h"
 #include "renderer/content_settings_client_efl.h"
 #if !defined(EWK_BRINGUP)  // FIXME: m94 bringup
 #include "renderer/editorclient_agent.h"
-#include "renderer/render_view_observer_efl.h"
 #endif
 #include "renderer/plugins/plugin_placeholder_efl.h"
 #include "renderer/render_frame_observer_efl.h"
@@ -144,6 +141,7 @@ void ContentRendererClientEfl::RenderFrameCreated(content::RenderFrame* render_f
 #endif
 }
 
+#if !defined(EWK_BRINGUP)  // FIXME: m108 bringup
 void ContentRendererClientEfl::RenderViewCreated(content::RenderView* render_view) {
   ApplyCustomMobileSettings(render_view->GetWebView());
 
@@ -157,6 +155,7 @@ void ContentRendererClientEfl::RenderViewCreated(content::RenderView* render_vie
   render_view->SetWrtUrlParser(wrt_url_parser_.get());
 #endif
 }
+#endif
 
 bool ContentRendererClientEfl::OverrideCreatePlugin(
     content::RenderFrame* render_frame,
@@ -178,6 +177,7 @@ void ContentRendererClientEfl::DidCreateScriptContext(
     blink::WebFrame* frame,
     v8::Handle<v8::Context> context,
     int world_id) {
+#if !defined(EWK_BRINGUP)  // FIXME: m108 bringup
   content::RenderView* render_view =
       content::RenderView::FromWebView(frame->View());
   if (widget_) {
@@ -189,6 +189,7 @@ void ContentRendererClientEfl::DidCreateScriptContext(
                               .Utf8()
                               .c_str());
   }
+#endif
 }
 
 void ContentRendererClientEfl::WillReleaseScriptContext(
@@ -201,23 +202,21 @@ void ContentRendererClientEfl::WillReleaseScriptContext(
 
 bool ContentRendererClientEfl::HandleNavigation(
     content::RenderFrame* render_frame,
-    bool render_view_was_created_by_renderer,
     blink::WebFrame* frame,
     const blink::WebURLRequest& request,
     blink::WebNavigationType type,
     blink::WebNavigationPolicy default_policy,
     bool is_redirect) {
+#if !defined(EWK_BRINGUP)  // FIXME: m108 bringup
   content::RenderView* render_view =
       content::RenderView::FromWebView(frame->View());
   bool result = false;
   GURL referrer_url(blink::WebStringToGURL(
       request.HttpHeaderField(blink::WebString::FromUTF8("Referer"))));
-#if !defined(EWK_BRINGUP)  // FIXME: m94 bringup
   network::mojom::ReferrerPolicy referrer_policy =
       request.IsNull()
           ? frame->ToWebLocalFrame()->GetDocument().GetReferrerPolicy()
           : request.GetReferrerPolicy();
-#endif
   int render_view_id = render_view->GetRoutingID();
 
   NavigationPolicyParams params;
@@ -246,6 +245,9 @@ bool ContentRendererClientEfl::HandleNavigation(
       new EwkHostMsg_DecideNavigationPolicy(params, &result));
 
   return result;
+#else
+  return false;
+#endif
 }
 
 uint64_t ContentRendererClientEfl::VisitedLinkHash(const char* canonical_url,
@@ -261,6 +263,8 @@ void ContentRendererClientEfl::PrepareErrorPage(
     content::RenderFrame* render_frame,
     const blink::WebURLError& error,
     const std::string& http_method,
+    content::mojom::AlternativeErrorPageOverrideInfoPtr
+        alternative_error_page_info,
     std::string* error_html) {
   content::CommonRendererClient::PrepareErrorPage(error, error_html);
 }
@@ -270,6 +274,8 @@ void ContentRendererClientEfl::PrepareErrorPageForHttpStatusError(
     const blink::WebURLError& error,
     const std::string& http_method,
     int http_status,
+    content::mojom::AlternativeErrorPageOverrideInfoPtr
+        alternative_error_page_info,
     std::string* error_html) {
   content::CommonRendererClient::PrepareErrorPage(error, error_html);
 }
@@ -286,7 +292,9 @@ void ContentRendererClientEfl::ApplyCustomMobileSettings(blink::WebView* webview
     blink::WebSettings* settings = webview->GetSettings();
     settings->SetViewportStyle(blink::mojom::ViewportStyle::kMobile);
     settings->SetViewportMetaEnabled(true);
+#if !defined(EWK_BRINGUP)  // FIXME: m108 bringup
     settings->SetAutoZoomFocusedNodeToLegibleScale(true);
+#endif
     webview->SetDefaultPageScaleLimits(minimum_page_scale_for_mobile,
                                        maximum_page_scale_for_mobile);
   }
index 660f495..cfd8591 100644 (file)
@@ -15,10 +15,9 @@ class WebView;
 }
 
 namespace content {
-class RenderView;
 class RenderFrame;
 class DocumentState;
-}
+}  // namespace content
 
 namespace visitedlink {
 class VisitedLinkReader;
@@ -37,9 +36,9 @@ class ContentRendererClientEfl : public content::ContentRendererClient {
   void RenderThreadStarted() override;
 
   void RenderFrameCreated(content::RenderFrame* render_frame) override;
-
+#if !defined(EWK_BRINGUP)  // FIXME: m108 bringup
   void RenderViewCreated(content::RenderView* render_view);
-
+#endif
   bool OverrideCreatePlugin(
       content::RenderFrame* render_frame,
       const blink::WebPluginParams& params,
@@ -56,7 +55,6 @@ class ContentRendererClientEfl : public content::ContentRendererClient {
   void SetAllowPopup(bool value) { javascript_can_open_windows_ = value; }
 
   bool HandleNavigation(content::RenderFrame* render_frame,
-                        bool render_view_was_created_by_renderer,
                         blink::WebFrame* frame,
                         const blink::WebURLRequest& request,
                         blink::WebNavigationType type,
@@ -75,12 +73,16 @@ class ContentRendererClientEfl : public content::ContentRendererClient {
   void PrepareErrorPage(content::RenderFrame* render_frame,
                         const blink::WebURLError& error,
                         const std::string& http_method,
+                        content::mojom::AlternativeErrorPageOverrideInfoPtr
+                            alternative_error_page_info,
                         std::string* error_html) override;
   void PrepareErrorPageForHttpStatusError(
       content::RenderFrame* render_frame,
       const blink::WebURLError& error,
       const std::string& http_method,
       int http_status,
+      content::mojom::AlternativeErrorPageOverrideInfoPtr
+          alternative_error_page_info,
       std::string* error_html) override;
 
   uint64_t VisitedLinkHash(const char* canonical_url, size_t length) override;
index 49fb42e..e3d3918 100644 (file)
@@ -23,7 +23,7 @@ class ContentSettingsClientEfl : public RenderFrameObserver,
   void DidNotAllowScript() override;
 
  private:
-  DISALLOW_COPY_AND_ASSIGN(ContentSettingsClientEfl);
+  // DISALLOW_COPY_AND_ASSIGN(ContentSettingsClientEfl);
 };
 
 }  // namespace content
index cace601..9f94147 100644 (file)
@@ -29,7 +29,7 @@ class PluginPlaceholderEfl : public plugins::LoadablePluginPlaceholder,
   v8::Local<v8::Value> GetV8Handle(v8::Isolate*) override;
   blink::WebPlugin* CreatePlugin() override;
 
-  DISALLOW_COPY_AND_ASSIGN(PluginPlaceholderEfl);
+  // DISALLOW_COPY_AND_ASSIGN(PluginPlaceholderEfl);
 };
 
 #endif  // PLUGIN_PLACEHOLDER_EFL_H_
index f385af9..fe95f11 100644 (file)
@@ -8,7 +8,6 @@
 #include "base/logging.h"
 #include "common/render_messages_ewk.h"
 #include "content/public/renderer/render_thread.h"
-#include "content/public/renderer/render_view.h"
 #include "printing/metafile_skia.h"
 #include "printing/units.h"
 #include "skia/ext/platform_canvas.h"
@@ -74,18 +73,14 @@ void ComputeWebKitPrintParamsInDesiredDpi(const PrintParams& print_params,
 
 } //namespace
 
-PrintWebViewHelperEfl::PrintWebViewHelperEfl(content::RenderView* view,
-    const base::FilePath& filename)
-  : view_(view),
-    filename_(filename) {
-}
+PrintWebViewHelperEfl::PrintWebViewHelperEfl(const base::FilePath& filename)
+    : filename_(filename) {}
 
 PrintWebViewHelperEfl::~PrintWebViewHelperEfl() {
 }
 
 void PrintWebViewHelperEfl::PrintToPdf(int width, int height) {
   InitPrintSettings(width, height, true);
-  DCHECK(view_->GetWebView());
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
   RenderPagesForPrint(view_->GetWebView()->mainFrame());
 #endif
index 21ebd3b..41fc6fd 100644 (file)
@@ -8,10 +8,6 @@
 #include "base/files/file_path.h"
 #include "common/print_pages_params.h"
 
-namespace content {
-class RenderView;
-}
-
 namespace blink {
 class WebFrame;
 }
@@ -24,7 +20,7 @@ struct PrintPagesParams;
 
 class PrintWebViewHelperEfl {
  public:
-  PrintWebViewHelperEfl(content::RenderView* view, const base::FilePath& filename);
+  PrintWebViewHelperEfl(const base::FilePath& filename);
   virtual ~PrintWebViewHelperEfl();
   void PrintToPdf(int width, int height);
   void InitPrintSettings(int width, int height, bool fit_to_paper_size);
@@ -39,7 +35,6 @@ class PrintWebViewHelperEfl {
   bool RenderPagesForPrint(blink::WebFrame* frame);
 
   std::unique_ptr<PrintPagesParams> print_pages_params_;
-  content::RenderView* view_;
   base::FilePath filename_;
 };
 
index 8838bff..6df21a8 100644 (file)
@@ -4,20 +4,13 @@
 
 #include "renderer/render_frame_observer_efl.h"
 
+#include "common/render_messages_ewk.h"
 #include "content/common/content_client_export.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/url_constants.h"
 #include "content/public/renderer/content_renderer_client.h"
 #include "content/public/renderer/render_frame.h"
-#include "content/public/renderer/render_view.h"
-// RenderFrameImpl declares itself as a friend class to
-// RenderFrameObserver. In order to access private members of
-// the former from a descendant class of RenderFrameObserver,
-// we define redefine "private" while including the associated header.
-#define private public
 #include "content/renderer/render_frame_impl.h"
-#undef private
-#include "common/render_messages_ewk.h"
 #include "renderer/content_renderer_client_efl.h"
 #include "third_party/blink/public/platform/url_conversion.h"
 #include "third_party/blink/public/platform/web_url_error.h"
@@ -107,6 +100,7 @@ void RenderFrameObserverEfl::OnSelectPopupMenuItems(
 }
 
 void RenderFrameObserverEfl::OnLoadNotFoundErrorPage(std::string errorUrl) {
+#if !defined(EWK_BRINGUP)  // FIXME: m108 bringup
   blink::WebLocalFrame* frame = render_frame()->GetWebFrame();
   blink::WebURL web_url = blink::WebURL(GURL(errorUrl));
   blink::WebURLError error(net::ERR_FAILED, web_url);
@@ -115,7 +109,6 @@ void RenderFrameObserverEfl::OnLoadNotFoundErrorPage(std::string errorUrl) {
   std::string error_html;
   GetContentClientExport()->renderer()->PrepareErrorPage(
       render_frame(), error, failed_request.HttpMethod().Ascii(), &error_html);
-#if !defined(EWK_BRINGUP)  // FIXME: m94 bringup
   render_frame()->LoadHTMLString(error_html, GURL(kUnreachableWebDataURL), "UTF-8",
                                  web_url, replace);
 #endif
@@ -135,7 +128,7 @@ void RenderFrameObserverEfl::OnRequestSelectCollectionInformation() {
   WebElement focused_element = GetFocusedElement(render_frame()->GetWebFrame());
   if (focused_element.IsNull())
     return;
-
+#if !defined(EWK_BRINGUP)  // FIXME: m108 bringup
   content::RenderView* render_view_ = render_frame()->GetRenderView();
   WebLocalFrame* focused_frame = render_view_->GetWebView()->FocusedFrame();
   if (!focused_frame)
@@ -160,7 +153,6 @@ void RenderFrameObserverEfl::OnRequestSelectCollectionInformation() {
     }
 #endif
   }
-
   if (count) {
     bool prev_status = index > 0;
     bool next_status = index < count - 1;
@@ -168,6 +160,7 @@ void RenderFrameObserverEfl::OnRequestSelectCollectionInformation() {
     Send(new EwkHostMsg_RequestSelectCollectionInformationUpdateACK(
         render_frame()->GetRoutingID(), count, index, prev_status, next_status));
   }
+#endif
 }
 
 void RenderFrameObserverEfl::DidChangeScrollOffset() {
diff --git a/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.cc b/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.cc
deleted file mode 100644 (file)
index 0919815..0000000
+++ /dev/null
@@ -1,631 +0,0 @@
-// Copyright 2014 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#include "renderer/render_view_observer_efl.h"
-
-#include <string>
-#include <limits.h>
-
-#include "base/files/file_path.h"
-#include "base/strings/string_number_conversions.h"
-#include "base/strings/string_split.h"
-#include "base/strings/string_util.h"
-#include "base/strings/utf_string_conversions.h"
-#include "common/hit_test_params.h"
-#include "common/render_messages_ewk.h"
-#include "content/public/renderer/content_renderer_client.h"
-#include "content/public/renderer/render_view.h"
-#include "third_party/blink/public/common/input/web_input_event.h"
-#include "third_party/blink/public/platform/web_data.h"
-#include "third_party/blink/public/platform/web_size.h"
-#include "third_party/blink/public/platform/web_string.h"
-#include "third_party/blink/public/platform/web_url_error.h"
-#include "third_party/blink/public/platform/web_url_request.h"
-#include "third_party/blink/public/web/web_document.h"
-#include "third_party/blink/public/web/web_form_element.h"
-#include "third_party/blink/public/web/web_frame.h"
-#include "third_party/blink/public/web/web_frame_content_dumper.h"
-#include "third_party/blink/public/web/web_frame_widget.h"
-#include "third_party/blink/public/web/web_hit_test_result.h"
-#include "third_party/blink/public/web/web_local_frame.h"
-#include "third_party/blink/public/web/web_settings.h"
-#include "third_party/blink/public/web/web_view.h"
-
-// XXX: config.h needs to be included before internal blink headers.
-//      It'd be great if we did not include not internal blibk headers.
-#include "third_party/blink/renderer/platform/fonts/font_cache.h"
-
-using blink::WebDocumentLoader;
-using blink::WebURLRequest;
-
-namespace {
-
-typedef network::mojom::ContentSecurityPolicyType SecurityPolicyType;
-
-static_assert(static_cast<int>(SecurityPolicyType::kReport) ==
-                  static_cast<int>(EWK_REPORT_ONLY),
-              "mismatching enums : EWK_REPORT_ONLY");
-static_assert(static_cast<int>(SecurityPolicyType::kEnforce) ==
-                  static_cast<int>(EWK_ENFORCE_POLICY),
-              "mismatching enums : EWK_ENFORCE_POLICY");
-
-SecurityPolicyType ToSecurityPolicyType(Ewk_CSP_Header_Type type) {
-  return static_cast<SecurityPolicyType>(type);
-}
-
-bool GetGRBAValuesFromString(const std::string& input, int* r, int* g, int* b, int* a)
-{
-  bool parsing_status = false;
-  // for example - rgba(255, 255, 255, 255)
-  // for example - rgb(255, 255, 255)
-  if (std::string::npos != input.find("rgb")) {
-    size_t startPos = input.find("(");
-    size_t endPos = input.find(")");
-
-    std::string value = input.substr(startPos + 1, endPos - startPos - 1);
-    std::vector<std::string> colorValues = base::SplitString(value,
-                                                             ",",
-                                                             base::TRIM_WHITESPACE,
-                                                             base::SPLIT_WANT_ALL);
-    if (colorValues.size() == 4 || colorValues.size() == 3) {
-      base::StringToInt(colorValues[0], r);
-      base::StringToInt(colorValues[1], g);
-      base::StringToInt(colorValues[2], b);
-      if (std::string::npos != input.find("rgba") && colorValues.size() == 4)
-        base::StringToInt(colorValues[3], a);
-      else
-        *a = 255;
-      parsing_status = true;
-    }
-  }
-  return parsing_status;
-}
-
-void PopulateEwkHitTestData(const blink::WebHitTestResult& web_hit_test, Hit_Test_Params* params)
-{
-  DCHECK(params);
-  params->imageURI = web_hit_test.AbsoluteImageURL().GetString().Utf8();
-  params->linkURI = web_hit_test.AbsoluteLinkURL().GetString().Utf8();
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  params->linkLabel = web_hit_test.textContent().Utf8();
-  params->linkTitle = web_hit_test.titleDisplayString().Utf8();
-#endif
-  params->isEditable = web_hit_test.IsContentEditable();
-
-  int context = EWK_HIT_TEST_RESULT_CONTEXT_DOCUMENT;
-  if (!web_hit_test.AbsoluteLinkURL().IsEmpty())
-    context |= EWK_HIT_TEST_RESULT_CONTEXT_LINK;
-  if (!web_hit_test.AbsoluteImageURL().IsEmpty())
-    context |= EWK_HIT_TEST_RESULT_CONTEXT_IMAGE;
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  if (!web_hit_test.absoluteMediaURL().IsEmpty())
-    context |= EWK_HIT_TEST_RESULT_CONTEXT_MEDIA;
-  if (web_hit_test.isSelected())
-    context |= EWK_HIT_TEST_RESULT_CONTEXT_SELECTION;
-#endif
-  if (web_hit_test.IsContentEditable())
-    context |= EWK_HIT_TEST_RESULT_CONTEXT_EDITABLE;
-  if (web_hit_test.GetNode().IsTextNode())
-    context |= EWK_HIT_TEST_RESULT_CONTEXT_TEXT;
-
-  params->context = static_cast<Ewk_Hit_Test_Result_Context>(context);
-
-  if (params->mode & EWK_HIT_TEST_MODE_NODE_DATA) {
-    params->nodeData.nodeValue = web_hit_test.GetNode().NodeValue().Utf8();
-  }
-
-  if ((params->mode & EWK_HIT_TEST_MODE_IMAGE_DATA) &&
-      (params->context & EWK_HIT_TEST_RESULT_CONTEXT_IMAGE)) {
-    blink::WebElement hit_element =
-        web_hit_test.GetNode().ToConst<blink::WebElement>();
-
-#if !defined(EWK_BRINGUP)  // FIXME: m69 bringup
-    params->imageData.imageBitmap = hit_element.ImageContents().GetSkBitmap();
-    params->imageData.fileNameExtension =
-        hit_element.imageFilenameExtension().Utf8();
-#endif
-  }
-}
-
-void PopulateNodeAttributesMapFromHitTest(const blink::WebHitTestResult& web_hit_test,
-                                          Hit_Test_Params* params)
-{
-  DCHECK(params);
-
-  if (!web_hit_test.GetNode().IsElementNode())
-    return;
-
-  blink::WebElement hit_element =
-      web_hit_test.GetNode().ToConst<blink::WebElement>();
-  for (unsigned int i = 0; i < hit_element.AttributeCount(); i++) {
-    params->nodeData.attributes.insert(std::pair<std::string, std::string>(
-        hit_element.AttributeLocalName(i).Utf8(),
-        hit_element.AttributeValue(i).Utf8()));
-  }
-}
-
-}  //namespace
-
-RenderViewObserverEfl::RenderViewObserverEfl(
-    content::RenderView* render_view,
-    ContentRendererClientEfl* render_client)
-  : content::RenderViewObserver(render_view),
-    renderer_client_(render_client)
-{
-}
-
-RenderViewObserverEfl::~RenderViewObserverEfl()
-{
-}
-
-bool RenderViewObserverEfl::OnMessageReceived(const IPC::Message& message)
-{
-  bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(RenderViewObserverEfl, message)
-    IPC_MESSAGE_HANDLER(EwkViewMsg_SetCSP, OnSetContentSecurityPolicy)
-    IPC_MESSAGE_HANDLER(EwkViewMsg_Scale, OnScale)
-    IPC_MESSAGE_HANDLER(EwkViewMsg_SetScroll, OnSetScroll)
-    IPC_MESSAGE_HANDLER(EwkViewMsg_UseSettingsFont, OnUseSettingsFont)
-    IPC_MESSAGE_HANDLER(EwkViewMsg_PlainTextGet, OnPlainTextGet)
-    IPC_MESSAGE_HANDLER(EwkViewMsg_GetSelectionStyle, OnGetSelectionStyle);
-    IPC_MESSAGE_HANDLER(EwkViewMsg_DoHitTest, OnDoHitTest)
-    IPC_MESSAGE_HANDLER(EwkViewMsg_DoHitTestAsync, OnDoHitTestAsync)
-    IPC_MESSAGE_HANDLER(EwkViewMsg_PrintToPdf, OnPrintToPdf)
-    IPC_MESSAGE_HANDLER(EwkViewMsg_GetMHTMLData, OnGetMHTMLData);
-    IPC_MESSAGE_HANDLER(EwkViewMsg_WebAppIconUrlGet, OnWebAppIconUrlGet);
-    IPC_MESSAGE_HANDLER(EwkViewMsg_WebAppIconUrlsGet, OnWebAppIconUrlsGet);
-    IPC_MESSAGE_HANDLER(EwkViewMsg_WebAppCapableGet, OnWebAppCapableGet);
-    IPC_MESSAGE_HANDLER(EwkViewMsg_SetDrawsTransparentBackground, OnSetDrawsTransparentBackground);
-    IPC_MESSAGE_HANDLER(EwkViewMsg_SetBrowserFont, OnSetBrowserFont);
-    IPC_MESSAGE_HANDLER(EwkViewMsg_SuspendScheduledTask, OnSuspendScheduledTasks);
-    IPC_MESSAGE_HANDLER(EwkViewMsg_ResumeScheduledTasks, OnResumeScheduledTasks);
-    IPC_MESSAGE_HANDLER(EwkSettingsMsg_UpdateWebKitPreferencesEfl, OnUpdateWebKitPreferencesEfl);
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-    IPC_MESSAGE_HANDLER(ViewMsg_SetViewMode, OnSetViewMode);
-#endif
-    IPC_MESSAGE_HANDLER(ViewMsg_SetTextZoomFactor, OnSetTextZoomFactor)
-
-    IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP()
-  return handled;
-}
-
-void RenderViewObserverEfl::OnDestruct() {
-  delete this;
-}
-
-void RenderViewObserverEfl::OnSetContentSecurityPolicy(const std::string& policy, Ewk_CSP_Header_Type header_type)
-{
-  blink::WebView* view = render_view()->GetWebView();
-  DCHECK(view);
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  blink::WebDocument document = view->FocusedFrame()->GetDocument();
-
-  document.setContentSecurityPolicyUsingHeader(
-      blink::WebString::FromUTF8(policy), ToSecurityPolicyType(header_type));
-#endif
-}
-
-void RenderViewObserverEfl::OnScale(double scale_factor, int x, int y)
-{
-  blink::WebView* view = render_view()->GetWebView();
-  if (!view)
-    return;
-
-  view->SetPageScaleFactor(scale_factor);
-}
-
-void RenderViewObserverEfl::OnSetScroll(int x, int y)
-{
-  blink::WebLocalFrame* frame = render_view()->GetWebView()->FocusedFrame();
-  if (!frame)
-    return;
-  frame->SetScrollOffset(blink::WebSize(x, y));
-}
-
-void RenderViewObserverEfl::OnUseSettingsFont()
-{
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  blink::FontCache::fontCache()->invalidate();
-
-  blink::WebView* view = render_view()->GetWebView();
-  if (view)
-    view->sendResizeEventAndForceLayout();
-#endif
-}
-
-void RenderViewObserverEfl::OnPlainTextGet(int plain_text_get_callback_id)
-{
-  // WebFrameContentDumper should only be used for testing purposes. See http://crbug.com/585164.
-  blink::WebString content = blink::WebFrameContentDumper::DumpWebViewAsText(
-      render_view()->GetWebView(), INT_MAX);
-  Send(new EwkHostMsg_PlainTextGetContents(render_view()->GetRoutingID(),
-                                           content.Utf8(),
-                                           plain_text_get_callback_id));
-}
-
-void RenderViewObserverEfl::OnGetSelectionStyle()
-{
-  blink::WebView* view = render_view()->GetWebView();
-  if (!view)
-    return;
-
-  blink::WebLocalFrame* frame = view->FocusedFrame();
-  if (!frame)
-    return;
-
-  SelectionStylePrams params;
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  params.underline_state =
-      frame->commandState(blink::WebString::FromUTF8("underline"));
-  params.italic_state =
-      frame->commandState(blink::WebString::FromUTF8("italic"));
-  params.bold_state = frame->commandState(blink::WebString::FromUTF8("bold"));
-  blink::WebString bg_color =
-      frame->commandValue(blink::WebString::FromUTF8("BackColor"));
-  GetGRBAValuesFromString(std::string(bg_color.Utf8()), &params.bg_color.r,
-                          &params.bg_color.g, &params.bg_color.b,
-                          &params.bg_color.a);
-  blink::WebString color =
-      frame->commandValue(blink::WebString::FromUTF8("ForeColor"));
-  GetGRBAValuesFromString(std::string(color.Utf8()), &params.color.r,
-                          &params.color.g, &params.color.b, &params.color.a);
-  blink::WebString font_size =
-      frame->commandValue(blink::WebString::FromUTF8("FontSize"));
-  params.font_size = font_size.Utf8();
-  params.order_list_state =
-      frame->commandState(blink::WebString::FromUTF8("InsertOrderedList"));
-  params.un_order_list_state =
-      frame->commandState(blink::WebString::FromUTF8("InsertUnorderedList"));
-  params.text_align_center_state =
-      frame->commandState(blink::WebString::FromUTF8("JustifyCenter"));
-  params.text_align_left_state =
-      frame->commandState(blink::WebString::FromUTF8("JustifyLeft"));
-  params.text_align_right_state =
-      frame->commandState(blink::WebString::FromUTF8("JustifyRight"));
-  params.text_align_full_state =
-      frame->commandState(blink::WebString::FromUTF8("JustifyFull"));
-#endif
-  params.has_composition = frame->HasMarkedText();
-  Send(new EwkViewMsg_SelectionTextStyleState(render_view()->GetRoutingID(), params));
-}
-
-void RenderViewObserverEfl::OnDoHitTest(int view_x, int view_y, Ewk_Hit_Test_Mode mode)
-{
-  Hit_Test_Params params;
-
-  if (DoHitTest(view_x, view_y, mode, &params)) {
-    Send(new EwkViewHostMsg_HitTestReply(routing_id(), params));
-  }
-}
-
-void RenderViewObserverEfl::OnDoHitTestAsync(int view_x, int view_y, Ewk_Hit_Test_Mode mode, int64_t request_id)
-{
-  Hit_Test_Params params;
-
-  if (DoHitTest(view_x, view_y, mode, &params)) {
-    Send(new EwkViewHostMsg_HitTestAsyncReply(routing_id(), params, request_id));
-  }
-}
-
-bool RenderViewObserverEfl::DoHitTest(int view_x, int view_y, Ewk_Hit_Test_Mode mode, Hit_Test_Params* params)
-{
-  DCHECK(params);
-
-  if (!render_view() || !render_view()->GetWebView())
-    return false;
-#if !defined(EWK_BRINGUP)  // FIXME: m73 bringup
-  const blink::WebHitTestResult web_hit_test_result =
-      render_view()->GetWebView()->HitTestResultAt(
-          blink::WebPoint(view_x, view_y));
-#else
-  blink::WebHitTestResult web_hit_test_result;
-#endif
-
-  if (web_hit_test_result.GetNode().IsNull())
-    return false;
-
-  params->mode = mode;
-
-  PopulateEwkHitTestData(web_hit_test_result, params);
-  if (params->mode & EWK_HIT_TEST_MODE_NODE_DATA)
-    PopulateNodeAttributesMapFromHitTest(web_hit_test_result, params);
-
-  return true;
-}
-
-void RenderViewObserverEfl::OnPrintToPdf(int width, int height, const base::FilePath& filename)
-{
-  blink::WebView* web_view = render_view()->GetWebView();
-  DCHECK(web_view);
-  PrintWebViewHelperEfl print_helper(render_view(), filename);
-  print_helper.PrintToPdf(width, height);
-}
-
-void RenderViewObserverEfl::OnGetMHTMLData(int callback_id)
-{
-  blink::WebView* view = render_view()->GetWebView();
-  if (!view)
-    return;
-
-  std::string content_string;
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-#pragma message "[M49] WebPageSerializer has been removed from blink. Check for alternative."
-  blink::WebCString content =  blink::WebPageSerializer::serializeToMHTML(view);
-  if (!content.isEmpty())
-    content_string = content.data();
-#endif
-
-  Send(new EwkHostMsg_ReadMHTMLData(render_view()->GetRoutingID(), content_string, callback_id));
-}
-
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-void RenderViewObserverEfl::DidChangePageScaleFactor()
-{
-  blink::WebView* view = render_view()->GetWebView();
-  if (!view)
-    return;
-
-  Send(new EwkHostMsg_DidChangePageScaleFactor(render_view()->GetRoutingID(),
-                                               view->PageScaleFactor()));
-}
-#endif
-
-void RenderViewObserverEfl::DidUpdateLayout()
-{
-  // Check if the timer is already running
-  if (check_contents_size_timer_.IsRunning())
-    return;
-
-  check_contents_size_timer_.Start(FROM_HERE,
-                                   base::TimeDelta::FromMilliseconds(0), this,
-                                   &RenderViewObserverEfl::CheckContentsSize);
-}
-
-void RenderViewObserverEfl::CheckContentsSize()
-{
-  blink::WebView* view = render_view()->GetWebView();
-  if (!view || !view->MainFrame())
-    return;
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  gfx::Size contents_size =
-      view->MainFrame()->ToWebLocalFrame()->ContentsSize();
-#else
-  gfx::Size contents_size;
-#endif
-
-  // Fall back to contentsPreferredMinimumSize if the mainFrame is reporting a
-  // 0x0 size (this happens during initial load).
-  if (contents_size.IsEmpty()) {
-    contents_size = render_view()->GetWebView()->ContentsPreferredMinimumSize();
-  }
-
-  if (contents_size == last_sent_contents_size_)
-    return;
-
-  last_sent_contents_size_ = contents_size;
-  const blink::WebSize size = static_cast<blink::WebSize>(contents_size);
-  Send(new EwkHostMsg_DidChangeContentsSize(render_view()->GetRoutingID(),
-                                            size.width,
-                                            size.height));
-}
-
-void RenderViewObserverEfl::OnSetDrawsTransparentBackground(bool draws_transparent_background)
-{
-#if !defined(EWK_BRINGUP)  // FIXME: m76 bringup
-  blink::WebFrameWidget* widget = render_view()->GetWebFrameWidget();
-  if (!widget)
-    return;
-  blink::WebColor backgroundColor = draws_transparent_background ?
-      static_cast<blink::WebColor>(0x00000000) : static_cast<blink::WebColor>(0xFFFFFFFF);
-
-  widget->SetBaseBackgroundColor(backgroundColor);
-#endif
-}
-
-void RenderViewObserverEfl::OnWebAppIconUrlGet(int callback_id)
-{
-  blink::WebFrame* frame = render_view()->GetWebView()->MainFrame();
-  if (!frame) {
-    return;
-  }
-
-  blink::WebDocument document = frame->ToWebLocalFrame()->GetDocument();
-  blink::WebElement head = document.Head();
-  if (head.IsNull()) {
-    return;
-  }
-
-  std::string iconUrl;
-  std::string appleIconUrl;
-  // We're looking for Apple style rel ("apple-touch-*")
-  // and Google style rel ("icon"), but we prefer the Apple one
-  // when both appear, as WebKit-efl was looking only for Apple style rels.
-  for (blink::WebNode node = head.FirstChild(); !node.IsNull();
-       node = node.NextSibling()) {
-    if (!node.IsElementNode()) {
-      continue;
-    }
-    blink::WebElement elem = node.To<blink::WebElement>();
-    if (!elem.HasHTMLTagName("link")) {
-      continue;
-    }
-    std::string rel = elem.GetAttribute("rel").Utf8();
-    if (base::LowerCaseEqualsASCII(rel, "apple-touch-icon") ||              // Apple's way
-        base::LowerCaseEqualsASCII(rel, "apple-touch-icon-precomposed")) {
-      appleIconUrl =
-          document.CompleteURL(elem.GetAttribute("href")).GetString().Utf8();
-      break;
-    } else if (base::LowerCaseEqualsASCII(rel, "icon")) {                   // Google's way
-      iconUrl =
-          document.CompleteURL(elem.GetAttribute("href")).GetString().Utf8();
-    }
-  }
-  Send(new EwkHostMsg_WebAppIconUrlGet(render_view()->GetRoutingID(), appleIconUrl.empty() ? iconUrl : appleIconUrl, callback_id));
-}
-
-void RenderViewObserverEfl::OnWebAppIconUrlsGet(int callback_id) {
-  blink::WebFrame* frame = render_view()->GetWebView()->MainFrame();
-  if (!frame) {
-    return;
-  }
-
-  blink::WebDocument document = frame->ToWebLocalFrame()->GetDocument();
-  blink::WebElement head = document.Head();
-  if (head.IsNull()) {
-    return;
-  }
-
-  std::map<std::string, std::string> iconUrls;
-  for (blink::WebNode node = head.FirstChild(); !node.IsNull();
-       node = node.NextSibling()) {
-    if (!node.IsElementNode()) {
-      continue;
-    }
-    blink::WebElement elem = node.To<blink::WebElement>();
-    if (!elem.HasHTMLTagName("link")) {
-      continue;
-    }
-    std::string rel = elem.GetAttribute("rel").Utf8();
-    if (base::LowerCaseEqualsASCII(rel, "apple-touch-icon") ||              // Apple's way
-        base::LowerCaseEqualsASCII(rel, "apple-touch-icon-precomposed") ||  // same here
-        base::LowerCaseEqualsASCII(rel, "icon")) {                          // Google's way
-      std::string iconSize = elem.GetAttribute("sizes").Utf8();
-      std::string iconUrl =
-          document.CompleteURL(elem.GetAttribute("href")).GetString().Utf8();
-
-      iconUrls[iconSize] = iconUrl;
-    }
-  }
-  Send(new EwkHostMsg_WebAppIconUrlsGet(render_view()->GetRoutingID(), iconUrls, callback_id));
-}
-
-void RenderViewObserverEfl::OnWebAppCapableGet(int callback_id) {
-  blink::WebFrame* frame = render_view()->GetWebView()->MainFrame();
-  if (!frame)
-    return;
-
-  blink::WebDocument document = frame->ToWebLocalFrame()->GetDocument();
-  blink::WebElement head = document.Head();
-  if (head.IsNull())
-    return;
-
-  bool capable = false;
-  for (blink::WebNode node = head.FirstChild(); !node.IsNull();
-       node = node.NextSibling()) {
-    if (!node.IsElementNode())
-      continue;
-
-    blink::WebElement elem = node.To<blink::WebElement>();
-    if (!elem.HasHTMLTagName("meta"))
-      continue;
-
-    std::string name = elem.GetAttribute("name").Utf8();
-    if (base::LowerCaseEqualsASCII(name, "apple-mobile-web-app-capable") ||   // Apple's way
-        base::LowerCaseEqualsASCII(name, "mobile-web-app-capable")) {         // Google's way
-      std::string content = elem.GetAttribute("content").Utf8();
-      if (base::LowerCaseEqualsASCII(content, "yes")) {
-        capable = true;
-      }
-      break;
-    }
-  }
-  Send(new EwkHostMsg_WebAppCapableGet(render_view()->GetRoutingID(), capable, callback_id));
-}
-
-void RenderViewObserverEfl::DidHandleGestureEvent(const blink::WebGestureEvent& event)
-{
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  // FIXME: EWK_BRINGUP definition should be removed.
-  if (event.type == blink::WebInputEvent::GestureTap)
-    HandleTap(event);
-#endif  // !defined(EWK_BRINGUP)
-}
-
-void RenderViewObserverEfl::OnSetBrowserFont()
-{
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  // FIXME: EWK_BRINGUP definition should be removed.
-  blink::WebView* view = render_view()->GetWebView();
-  if (view) {
-    view->setBrowserFont();
-  }
-#endif  // !defined(EWK_BRINGUP)
-}
-
-void RenderViewObserverEfl::OnSuspendScheduledTasks()
-{
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  blink::WebView* view = render_view()->GetWebView();
-  if (view)
-    view->suspendScheduledTasks();
-#endif
-}
-
-void RenderViewObserverEfl::OnResumeScheduledTasks()
-{
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  blink::WebView* view = render_view()->GetWebView();
-  if (view)
-    view->resumeScheduledTasks();
-#endif
-}
-
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-void RenderViewObserverEfl::OnSetViewMode(blink::WebViewMode view_mode) {
-  blink::WebView* view = render_view()->GetWebView();
-  if (view)
-    view->setViewMode(view_mode);
-}
-#endif
-
-void RenderViewObserverEfl::OnUpdateWebKitPreferencesEfl(const WebPreferencesEfl& web_preferences_efl)
-{
-  blink::WebView* view = render_view()->GetWebView();
-  if (view && view->GetSettings()) {
-    blink::WebSettings* settings = view->GetSettings();
-    settings->SetShrinksViewportContentToFit(
-        web_preferences_efl.shrinks_viewport_content_to_fit);
-    // Allows resetting the scale factor when "auto fitting" gets disabled.
-    settings->SetLoadWithOverviewMode(
-        web_preferences_efl.shrinks_viewport_content_to_fit);
-    // and more if they exist in web_preferences_efl.
-  }
-
-  DCHECK(renderer_client_);
-  static_cast<ContentRendererClientEfl*>(renderer_client_)->SetAllowPopup(
-      web_preferences_efl.javascript_can_open_windows_automatically_ewk);
-}
-
-void RenderViewObserverEfl::HandleTap(const blink::WebGestureEvent& event)
-{
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  // FIXME: EWK_BRINGUP definition should be removed.
-  // In order to closely match our touch adjustment logic, we
-  // perform a hit test "for tap" using the same "padding" as the
-  // original tap event. That way, touch adjustment picks up a link
-  // for clicking, we will emit a click sound.
-  blink::WebSize size(event.data.tap.width, event.data.tap.height);
-  const blink::WebHitTestResult web_hit_test_result =
-      render_view()->GetWebView()->hitTestResultForTap(
-          blink::WebPoint(event.x, event.y), size);
-
-  bool hit_link = !web_hit_test_result.absoluteLinkURL().isEmpty();
-  bool hit_content_editable = web_hit_test_result.isContentEditable();
-  Send(new EwkHostMsg_HandleTapGestureWithContext(render_view()->GetRoutingID(),
-      hit_link, hit_content_editable));
-#endif  // !defined(EWK_BRINGUP)
-}
-
-void RenderViewObserverEfl::OnSetTextZoomFactor(float zoom_factor) {
-  blink::WebView* view = render_view()->GetWebView();
-  if (!view)
-    return;
-
-  // Hide selection and autofill popups.
-#if !defined(EWK_BRINGUP)  // FIXME: m73 bringup
-  view->HidePopups();
-  view->SetTextZoomFactor(zoom_factor);
-#endif
-}
diff --git a/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.h b/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.h
deleted file mode 100644 (file)
index 2e1c431..0000000
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright 2014 Samsung Electronics. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef RENDER_VIEW_OBSERVER_EFL_H_
-#define RENDER_VIEW_OBSERVER_EFL_H_
-
-#include <string>
-
-#include "base/timer/timer.h"
-#include "common/web_preferences_efl.h"
-#include "content/public/renderer/render_view_observer.h"
-#include "private/ewk_hit_test_private.h"
-#include "public/ewk_hit_test_internal.h"
-#include "public/ewk_view_internal.h"
-#include "renderer/content_renderer_client_efl.h"
-#include "renderer/print_web_view_helper_efl.h"
-#include "third_party/blink/public/platform/web_size.h"
-//#include "third_party/blink/public/web/WebViewModeEnums.h"
-
-namespace base {
-class FilePath;
-}
-
-namespace content {
-class ContentRendererClient;
-class RenderView;
-}
-
-namespace WebKit {
-class WebHitTestResult;
-}
-
-namespace blink {
-class WebGestureEvent;
-}
-
-class EwkViewMsg_LoadData_Params;
-class Hit_Test_Params;
-
-class RenderViewObserverEfl: public content::RenderViewObserver {
- public:
-  explicit RenderViewObserverEfl(
-      content::RenderView* render_view,
-      ContentRendererClientEfl* render_client);
-  virtual ~RenderViewObserverEfl();
-
-  bool OnMessageReceived(const IPC::Message& message) override;
-  void OnDestruct() override;
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  virtual void DidChangePageScaleFactor() override;
-#endif
-  //Changes in PageScaleFactorLimits are applied when layoutUpdated is called
-  //So using this notification to update minimum and maximum page scale factor values
-  virtual void DidUpdateLayout();
-
-  void DidHandleGestureEvent(const blink::WebGestureEvent& event);
-
- private:
-  void OnSetContentSecurityPolicy(const std::string& policy, Ewk_CSP_Header_Type header_type);
-  void OnScale(double scale_factor, int x, int y);
-  void OnSetScroll(int x, int y);
-  void OnUseSettingsFont();
-  void OnPlainTextGet(int plain_text_get_callback_id);
-  void OnGetSelectionStyle();
-  void OnDoHitTest(int x, int y, Ewk_Hit_Test_Mode mode);
-  void OnDoHitTestAsync(int view_x, int view_y, Ewk_Hit_Test_Mode mode, int64_t request_id);
-  bool DoHitTest(int view_x, int view_y, Ewk_Hit_Test_Mode mode, Hit_Test_Params* params);
-  void OnPrintToPdf(int width, int height, const base::FilePath& filename);
-  void OnGetMHTMLData(int callback_id);
-  void OnSetDrawsTransparentBackground(bool enabled);
-  void OnWebAppIconUrlGet(int callback_id);
-  void OnWebAppIconUrlsGet(int callback_id);
-  void OnWebAppCapableGet(int callback_id);
-  void OnSetBrowserFont();
-  void CheckContentsSize();
-  void OnSuspendScheduledTasks();
-  void OnResumeScheduledTasks();
-  void OnUpdateWebKitPreferencesEfl(const WebPreferencesEfl&);
-
-  void HandleTap(const blink::WebGestureEvent& event);
-
-  // This function sets CSS "view-mode" media feature value.
-#if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
-  void OnSetViewMode(blink::WebViewMode view_mode);
-#endif
-  void OnSetTextZoomFactor(float zoom_factor);
-
-  gfx::Size last_sent_contents_size_;
-  base::OneShotTimer check_contents_size_timer_;
-
-  content::ContentRendererClient* renderer_client_;
-};
-
-#endif /* RENDER_VIEW_OBSERVER_EFL_H_ */
index f29d798..2224851 100644 (file)
@@ -56,7 +56,7 @@ class SharedURLLoaderFactoryEfl : public network::SharedURLLoaderFactory {
 
   mojo::Remote<network::mojom::URLLoaderFactory> url_loader_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(SharedURLLoaderFactoryEfl);
+  // DISALLOW_COPY_AND_ASSIGN(SharedURLLoaderFactoryEfl);
 };
 /* LCOV_EXCL_STOP */
 
index 400fb3b..7baa31c 100644 (file)
@@ -9,7 +9,7 @@
 #include "base/files/file_util.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/string_number_conversions.h"
-#include "base/task/post_task.h"
+#include "base/task/bind_post_task.h"
 #include "components/network_session_configurator/common/network_switches.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/cookie_store_factory.h"
@@ -31,6 +31,7 @@
 #include "net/proxy_resolution/proxy_resolution_service.h"
 #include "net/ssl/ssl_config_service_defaults.h"
 #include "net/url_request/static_http_user_agent_settings.h"
+#include "net/url_request/url_request_context_builder.h"
 #include "net/url_request/url_request_job_factory.h"
 #include "network_delegate_efl.h"
 #include "services/network/public/cpp/network_switches.h"
@@ -61,8 +62,7 @@ URLRequestContextGetterEfl::URLRequestContextGetterEfl(
       net::CertVerifier::CreateDefault(/*cert_net_fetcher=*/nullptr);
 
   proxy_config_service_ =
-      net::ConfiguredProxyResolutionService::CreateSystemProxyConfigService(
-          io_task_runner);
+      net::ProxyConfigService::CreateSystemProxyConfigService(io_task_runner);
 }
 
 URLRequestContextGetterEfl::~URLRequestContextGetterEfl() {
@@ -84,6 +84,7 @@ net::URLRequestContext* URLRequestContextGetterEfl::GetURLRequestContext() {
     return nullptr;
 
   if (!url_request_context_) {
+#if !defined(EWK_BRINGUP)  // FIXME: m108 bringup
     const base::CommandLine& command_line =
         *base::CommandLine::ForCurrentProcess();
 
@@ -220,6 +221,10 @@ net::URLRequestContext* URLRequestContextGetterEfl::GetURLRequestContext() {
     request_interceptors_.clear();
 #endif
     storage_->set_job_factory(std::move(job_factory));
+#else
+    net::URLRequestContextBuilder builder;
+    url_request_context_ = builder.Build();
+#endif
   }
 
   return url_request_context_.get();
@@ -227,7 +232,7 @@ net::URLRequestContext* URLRequestContextGetterEfl::GetURLRequestContext() {
 
 scoped_refptr<base::SingleThreadTaskRunner>
 URLRequestContextGetterEfl::GetNetworkTaskRunner() const {
-  return base::CreateSingleThreadTaskRunner({BrowserThread::IO});
+  return base::ThreadPool::CreateSingleThreadTaskRunner({BrowserThread::IO});
 }
 
 net::HostResolver* URLRequestContextGetterEfl::host_resolver() {
@@ -244,7 +249,7 @@ void URLRequestContextGetterEfl::SetCookieStoragePath(
   }
 
   if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) {
-    base::PostTask(
+    base::ThreadPool::PostTask(
         FROM_HERE, {BrowserThread::IO},
         base::BindOnce(&URLRequestContextGetterEfl::SetCookieStoragePath, this,
                        path, persist_session_cookies, file_storage));
@@ -278,11 +283,12 @@ void URLRequestContextGetterEfl::CreateSQLitePersistentCookieStore(
   if (base::DirectoryExists(path) || base::CreateDirectory(path)) {
     const base::FilePath& cookie_path = path.AppendASCII("Cookies");
     persistent_store = new net::SQLitePersistentCookieStore(
-        cookie_path, base::CreateSingleThreadTaskRunner({BrowserThread::IO}),
+        cookie_path,
+        base::ThreadPool::CreateSingleThreadTaskRunner({BrowserThread::IO}),
 #if !defined(EWK_BRINGUP)  // FIXME: m67 bringup
         BrowserThread::GetTaskRunnerForThread(BrowserThread::DB),
 #else
-        base::CreateSingleThreadTaskRunner({BrowserThread::UI}),
+        base::ThreadPool::CreateSingleThreadTaskRunner({BrowserThread::UI}),
 #endif
         persist_session_cookies, NULL);
   } else {
@@ -304,9 +310,9 @@ void URLRequestContextGetterEfl::CreateSQLitePersistentCookieStore(
         std::string(net::CookieMonster::kDefaultCookieableSchemes[i]));
   schemes.push_back(url::kFileScheme);
   cookie_monster->SetCookieableSchemes(schemes, base::DoNothing());
-
+#if !defined(EWK_BRINGUP)  // FIXME: m108 bringup
   storage_->set_cookie_store(std::move(cookie_monster));
-
+#endif
   cookie_store_path_ = path;
 }
 
@@ -331,7 +337,9 @@ void URLRequestContextGetterEfl::CreatePersistentCookieStore(
   cookie_monster->SetCookieableSchemes(schemes, base::DoNothing());
 
   DCHECK(url_request_context_);
+#if !defined(EWK_BRINGUP)  // FIXME: m108 bringup
   url_request_context_->set_cookie_store(cookie_store_.get());
+#endif
 }
 
 };  // namespace content
index 771d8e8..ab86706 100644 (file)
@@ -7,15 +7,16 @@
 #define _URL_REQUEST_CONTEXT_GETTER_EFL_H_
 
 #include "base/memory/weak_ptr.h"
-#include "base/task/post_task.h"
+#include "base/task/thread_pool.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_task_traits.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "net/base/network_delegate.h"
+#include "net/cookies/cookie_store.h"
+#include "net/http/http_network_session.h"
 #include "net/proxy_resolution/proxy_config_service.h"
 #include "net/url_request/url_request_context_getter.h"
-#include "net/url_request/url_request_context_storage.h"
 #include "public/ewk_cookie_manager_internal.h"
 
 namespace net {
@@ -34,15 +35,15 @@ class URLRequestContextGetterEfl : public net::URLRequestContextGetter {
       bool ignore_certificate_errors = false,
       const base::FilePath& base_path = base::FilePath(),
       const scoped_refptr<base::SingleThreadTaskRunner>& io_task_runner =
-          base::CreateSingleThreadTaskRunner({BrowserThread::IO}),
+          base::ThreadPool::CreateSingleThreadTaskRunner({BrowserThread::IO}),
       const scoped_refptr<base::SingleThreadTaskRunner>& file_task_runner =
-          base::CreateSingleThreadTaskRunner({BrowserThread::UI}),
+          base::ThreadPool::CreateSingleThreadTaskRunner({BrowserThread::UI}),
       net::NetLog* net_log = NULL);
 
   // net::URLRequestContextGetter implementation.
-  virtual net::URLRequestContext* GetURLRequestContext() override;
-  virtual scoped_refptr<base::SingleThreadTaskRunner>
-      GetNetworkTaskRunner() const override;
+  net::URLRequestContext* GetURLRequestContext() override;
+  scoped_refptr<base::SingleThreadTaskRunner> GetNetworkTaskRunner()
+      const override;
 
   net::HostResolver* host_resolver();
 
@@ -80,12 +81,11 @@ class URLRequestContextGetterEfl : public net::URLRequestContextGetter {
   std::unique_ptr<net::HttpNetworkSession> http_network_session_;
   std::unique_ptr<net::ProxyConfigService> proxy_config_service_;
   std::unique_ptr<net::NetworkDelegate> network_delegate_;
-  std::unique_ptr<net::URLRequestContextStorage> storage_;
   std::unique_ptr<net::CertVerifier> cert_verifier_;
   std::unique_ptr<net::URLRequestContext> url_request_context_;
   base::WeakPtrFactory<URLRequestContextGetterEfl> weak_ptr_factory_;
 
-  DISALLOW_COPY_AND_ASSIGN(URLRequestContextGetterEfl);
+  // DISALLOW_COPY_AND_ASSIGN(URLRequestContextGetterEfl);
 };
 
 }; // namespace content
index 024ed6b..0db907b 100644 (file)
@@ -14,7 +14,6 @@
 #include "components/favicon_base/favicon_types.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "components/prefs/pref_service.h"
-#include "content/browser/renderer_host/render_widget_host_view_efl.h"
 #include "content/common/content_switches_internal.h"
 #include "content/common/render_messages_efl.h"
 #include "content/public/browser/browser_thread.h"
@@ -462,11 +461,13 @@ void WebContentsDelegateEfl::RequestCertificateConfirm(
 
   // if policy is suspended, the API takes over the policy object lifetime
   // and policy will be deleted after decision is made
+#if !defined(EWK_BRINGUP)  // FIXME: m108 bringup
   if (certificate_policy_decision_->isSuspended()) {
     ignore_result(certificate_policy_decision_.release());
   } else {
     certificate_policy_decision_->setDecision(true);
   }
+#endif
 }
 
 void WebContentsDelegateEfl::ActivateContents(WebContents* contents) {
index 2b68c33..49344fc 100644 (file)
@@ -121,7 +121,7 @@ class WebContentsDelegateEfl : public WebContentsDelegate,
   void NavigationEntryCommitted(
       const LoadCommittedDetails& load_details) override;
   void RenderViewCreated(RenderViewHost* render_view_host);
-  void RenderProcessGone(base::TerminationStatus status) override;
+  void RenderProcessGone(base::TerminationStatus status);
   bool DidAddMessageToConsole(WebContents* source,
                               blink::mojom::ConsoleMessageLevel level,
                               const std::u16string& message,
@@ -229,7 +229,7 @@ class WebContentsDelegateEfl : public WebContentsDelegate,
   std::unique_ptr<_Ewk_Certificate_Policy_Decision>
       certificate_policy_decision_;
 
-  DISALLOW_COPY_AND_ASSIGN(WebContentsDelegateEfl);
+  // DISALLOW_COPY_AND_ASSIGN(WebContentsDelegateEfl);
 };
 }
 
index e501bd2..469a3b1 100644 (file)
@@ -4,6 +4,8 @@
 
 #include "web_contents_efl_delegate_ewk.h"
 
+#include <tuple>
+
 #include "eweb_view.h"
 
 WebContentsEflDelegateEwk::WebContentsEflDelegateEwk(EWebView* wv)
@@ -21,7 +23,7 @@ bool WebContentsEflDelegateEwk::ShouldCreateWebContentsAsync(
 
   if (pd->isSuspended()) {
     // it will be deleted later after it's used/ignored/downloaded
-    ignore_result(pd.release());
+    std::ignore = pd.release();
   } else if (!pd->isDecided()) {
     pd->Use();
   }
index 8b60c1c..d6a3acd 100644 (file)
@@ -23,7 +23,7 @@ class WebContentsEflDelegateEwk : public content::WebContentsEflDelegate {
  private:
   EWebView* web_view_;
 
-  DISALLOW_COPY_AND_ASSIGN(WebContentsEflDelegateEwk);
+  // DISALLOW_COPY_AND_ASSIGN(WebContentsEflDelegateEwk);
 };
 
 #endif //  CONTENT_PUBLIC_BROWSER_WEB_CONTENTS_EFL_DELEGATE_EWK_H_
index 3150590..02e5ebe 100644 (file)
@@ -17,9 +17,8 @@ WebContentsViewDelegateEwk::WebContentsViewDelegateEwk(EWebView* wv)
 // For the former, EWK apps enter selection mode, whereas for the
 // later, context menu is shown right way.
 void WebContentsViewDelegateEwk::ShowContextMenu(
-    content::RenderFrameHost* render_frame_host,
+    content::RenderFrameHost& render_frame_host,
     const content::ContextMenuParams& params) {
-
   if (params.source_type == ui::MENU_SOURCE_TOUCH) {
     CHECK(web_view_->TouchEventsEnabled());
     web_view_->HandleLongPressGesture(params);
index 0df2d38..861a7fe 100644 (file)
@@ -19,9 +19,8 @@ class WebContentsViewDelegateEwk
  public:
   WebContentsViewDelegateEwk(EWebView*);
 
-  void ShowContextMenu(
-      content::RenderFrameHost* render_frame_host,
-      const content::ContextMenuParams& params) override;
+  void ShowContextMenu(content::RenderFrameHost& render_frame_host,
+                       const content::ContextMenuParams& params) override;
 
  private:
   EWebView* web_view_;
index 991da38..f71ac92 100644 (file)
@@ -6,7 +6,6 @@
 #define EWK_EFL_INTEGRATION_WRT_DYNAMICPLUGIN_H_
 
 #include <string>
-#include "base/macros.h"
 #include "v8/include/v8.h"
 
 typedef unsigned int (*VersionFunction)(void);
index b34c74f..0307361 100644 (file)
@@ -56,7 +56,7 @@ class WrtDynamicPlugin : public DynamicPlugin {
   DatabaseAttachFun database_attach_;
   OnIPCMessageFun on_IPC_message_;
 
-  DISALLOW_COPY_AND_ASSIGN(WrtDynamicPlugin);
+  // DISALLOW_COPY_AND_ASSIGN(WrtDynamicPlugin);
 };
 
 #endif  // EWK_EFL_INTEGRATION_WRT_WRT_DYNAMICPLUGIN_H_
index 12d70ae..251c018 100644 (file)
@@ -35,7 +35,7 @@ class WrtFileProtocolHandler : public URLRequestJobFactory::ProtocolHandler {
   bool GetWrtParsedUrl(const GURL& url, GURL& parsed_url) const;
 
   const scoped_refptr<base::TaskRunner> file_task_runner_;
-  DISALLOW_COPY_AND_ASSIGN(WrtFileProtocolHandler);
+  // DISALLOW_COPY_AND_ASSIGN(WrtFileProtocolHandler);
 };
 
 }  // namespace net
index a55a696..1fe575c 100644 (file)
@@ -47,7 +47,7 @@ class WrtWidgetHost {
   base::AtomicSequenceNumber callback_id_generator_;
   callbacks_type callbacks_;
 
-  DISALLOW_COPY_AND_ASSIGN(WrtWidgetHost);
+  // DISALLOW_COPY_AND_ASSIGN(WrtWidgetHost);
 };
 
 
index ce9b6a8..3838e2e 100644 (file)
@@ -14,9 +14,8 @@ template("po_translations") {
   action_foreach(po_target_name) {
     script = "//tizen_src/build/cmd_execution.py"
     sources = invoker.sources
-    outputs = [
-      "$root_out_dir/locale/{{source_name_part}}/LC_MESSAGES/WebKit.mo",
-    ]
+    outputs =
+        [ "$root_out_dir/locale/{{source_name_part}}/LC_MESSAGES/WebKit.mo" ]
     args = [
       "$msgfmt",
       "-o",
@@ -27,9 +26,7 @@ template("po_translations") {
   }
 
   source_set(target_name) {
-    deps = [
-      ":$po_target_name",
-    ]
+    deps = [ ":$po_target_name" ]
   }
 }
 
@@ -98,6 +95,6 @@ po_translations("locale_efl") {
 }
 
 chromium_efl_repack_locales("packed_locales_efl") {
-  input_locales = locales
-  output_locales = locales
+  input_locales = platform_pak_locales
+  output_locales = platform_pak_locales
 }
index 39ec6a6..5066a62 100644 (file)
@@ -558,7 +558,7 @@ component("base") {
     deps += [ "//ui/events" ]
   }
 
-  if (use_aura && (is_linux || is_chromeos)) {
+  if (use_aura && (is_linux || is_chromeos || is_tizen)) {
     sources += [ "resource/resource_bundle_auralinux.cc" ]
   }
 
@@ -646,15 +646,9 @@ component("base") {
   }
 
   if (use_efl) {
-    if (!is_component_build) {
-      deps += external_ui_base_static_lib_deps
-    } else {
-      #sources += external_ui_base_shared_lib_sources
-    }
     configs += external_ui_base_configs
     include_dirs = external_ui_base_includes
     sources += external_ui_base_sources
-    sources -= external_exclude_ui_base_sources
   }
 }
 
@@ -1343,7 +1337,7 @@ if (is_win) {
   }
 }
 
-if (is_linux || is_chromeos) {
+if (is_linux || is_chromeos || is_tizen) {
   # This source set defines linux wm role names and must not have any external
   # dependencies and be kept as minimal as possible.
   source_set("wm_role_names") {
index ec20ec8..95acab8 100644 (file)
@@ -5,7 +5,7 @@
 import("//build/config/chromeos/ui_mode.gni")
 import("//build/config/linux/pangocairo/pangocairo.gni")
 
-assert(is_linux || is_chromeos_lacros)
+assert(is_linux || is_chromeos_lacros || is_tizen)
 
 component("linux") {
   output_name = "ui_base_ime_linux"
index c31b367..13310a9 100644 (file)
@@ -388,9 +388,7 @@ component("events") {
   }
 
   if (use_efl) {
-    if (!is_component_build) {
-      deps += external_ui_events_static_lib_deps
-    } else {
+    if (is_component_build) {
       sources += external_ui_events_shared_lib_sources
     }
   }
@@ -514,11 +512,6 @@ component("gesture_detection") {
   } else {
     sources += [ "gesture_detection/gesture_configuration_default.cc" ]
   }
-
-  if (use_efl) {
-    sources += external_ui_gesture_detection_sources
-    sources -= external_exclude_ui_gesture_detection_sources
-  }
 }
 
 static_library("test_support") {
index 941393f..d545ce4 100644 (file)
@@ -6,7 +6,7 @@ import("//build/config/chromeos/args.gni")
 import("//build/config/linux/pkg_config.gni")
 import("//build/config/ui.gni")
 
-assert(use_ozone && (is_linux || is_chromeos))
+assert(use_ozone && (is_linux || is_chromeos || is_tizen))
 
 visibility = [ ":*" ]
 
index 383b6dd..be05669 100644 (file)
@@ -590,7 +590,7 @@ source_set("memory_buffer_sources") {
     "//ui/gfx/geometry",
   ]
 
-  if (is_linux || is_chromeos) {
+  if (is_linux || is_chromeos || is_tizen) {
     sources += [
       "linux/client_native_pixmap_dmabuf.cc",
       "linux/client_native_pixmap_dmabuf.h",
index e7bd49e..e44f821 100644 (file)
@@ -13,6 +13,12 @@ source_set("drm") {
     "drm_util_linux.h",
   ]
 
+  if (is_tizen && use_aura) {
+    set_sources_assignment_filter([])
+    sources += [ "drm_util_linux.cc" ]
+    set_sources_assignment_filter(sources_assignment_filter)
+  }
+
   deps = [
     "//base:base",
     "//build/config/linux/libdrm",
index 042f75d..cd47ffa 100644 (file)
@@ -33,6 +33,7 @@ Event::Event(scoped_refptr<base::RefCountedMemory> event_bytes,
     // between the 32-byte event and the additional data, so we need to shift
     // the additional data over by 4 bytes so the event is back in its wire
     // format, which is what Xlib and XProto are expecting.
+    if (response_type == GeGenericEvent::opcode) {
       auto* ge = reinterpret_cast<xcb_ge_event_t*>(xcb_event);
       constexpr size_t ge_length = sizeof(xcb_raw_generic_event_t);
       constexpr size_t offset = sizeof(ge->full_sequence);
index 502930d..8cdb7c8 100644 (file)
@@ -227,6 +227,15 @@ component("gl") {
       "shared_gl_fence_egl.h",
     ]
 
+    if (enable_vulkan) {
+      sources += [
+        "gl_angle_util_vulkan.cc",
+        "gl_angle_util_vulkan.h",
+        "gl_image_egl_angle_vulkan.cc",
+        "gl_image_egl_angle_vulkan.h",
+      ]
+    }
+
     if (is_linux || is_tizen || is_chromeos || use_ozone) {
       sources += [
         "gl_image_native_pixmap.cc",
@@ -436,6 +445,7 @@ component("gl") {
     configs += external_ui_gl_configs
     sources += external_ui_gl_sources
     sources -= external_exclude_ui_gl_sources
+    deps += [ "//third_party/dawn/include/dawn:headers" ]
   }
 
   if (is_linux) {
index 21b148b..e307b68 100644 (file)
@@ -86,9 +86,7 @@ component("native_theme") {
   ]
 
   if (use_efl) {
-    if (!is_component_build) {
-      deps += external_native_theme_static_lib_deps
-    } else {
+    if (is_component_build) {
       sources += external_ui_native_theme_shared_lib_sources
     }
   }
index 785f7f6..049417c 100644 (file)
@@ -5,5 +5,5 @@
 import("//build/config/chromecast_build.gni")
 
 declare_args() {
-  use_qt = is_linux && !is_castos
+  use_qt = is_linux && !is_castos && !use_efl
 }
index c52d4d9..1c38990 100644 (file)
@@ -81,10 +81,6 @@ component("snapshot") {
       "CoreGraphics.framework",
     ]
   }
-
-  if (use_efl) {
-    sources += external_ui_snapshot_sources
-  }
 }
 
 source_set("snapshot_export") {
index 73135bd..dbe3d5a 100644 (file)
@@ -581,7 +581,7 @@ component("views") {
     public_deps += [ "//ui/linux:linux_ui" ]
   }
 
-  if (is_linux || is_chromeos || is_fuchsia) {
+  if (is_linux || is_chromeos || is_fuchsia || is_tizen) {
     public += [ "color_chooser/color_chooser_view.h" ]
     sources += [ "color_chooser/color_chooser_view.cc" ]
   }
@@ -659,7 +659,7 @@ component("views") {
     ]
   }
 
-  if (is_tizen) {
+  if (is_tizen && !use_aura) {
     public -= [ "drag_utils.h" ]
     sources -= [ "drag_utils.cc" ]
   }