From ea435d7384b4183e8ff9ffca6fa439be77a5a390 Mon Sep 17 00:00:00 2001 From: Piotr Tworek Date: Wed, 4 Mar 2015 20:02:47 +0900 Subject: [PATCH] Move EWK implementation code into ewk/ directory where it belongs. Around 3/4 of the code from impl is responsible for implementing EWK API specifics. This code belongs in ewk/ directory of tizen_src. This patch performs the move and ajusts the build system and chromium_impl code to make EWK buildable again. With this patch in place it's possible to build crosswalk, content_shell and EWK apps once again on desktop. All of the apps should run, but rendering is still broken in EWK. This will be handlled in a separate commit. Change-Id: I28bcbbd4c142c6db25e0efbbabfc69d79e2542ca Signed-off-by: Piotr Tworek --- tizen_src/build/build_desktop.sh | 2 +- tizen_src/build/common.sh | 12 +- tizen_src/build/gyp_chromiumefl | 15 +- tizen_src/build/gyp_chromiumefl.sh | 29 +- .../renderer_host/render_widget_host_view_efl.cc | 1 + .../renderer_host/render_widget_host_view_efl.h | 7 +- .../browser/tracing/tracing_controller_efl.cc | 2 +- .../browser/tracing/tracing_controller_efl.h | 0 .../browser/web_contents/web_contents_impl_efl.cc | 16 +- .../browser/web_contents/web_contents_impl_efl.h | 10 +- .../browser/web_contents/web_contents_view_efl.cc | 1 + .../content/common/message_generator_efl.h | 3 - .../chromium_impl/content/common/paths_efl.cc | 19 +- tizen_src/chromium_impl/content/common/paths_efl.h | 2 + .../content/common/render_messages_efl.h | 320 ------------- tizen_src/chromium_impl/content/content_efl.gypi | 7 +- tizen_src/chromium_impl/ui/ui_efl.gypi | 6 + tizen_src/chromium_impl/ui/ui_targets_efl.gyp | 11 + tizen_src/ewk/chromium-ewk.gyp | 267 +---------- tizen_src/ewk/chromium-ewk.gypi | 22 + .../{impl => ewk/efl_integration}/EdgeEffect.cpp | 2 +- .../{impl => ewk/efl_integration}/EdgeEffect.h | 0 .../efl_integration}/autofill_popup_view_efl.cc | 2 +- .../efl_integration}/autofill_popup_view_efl.h | 0 .../autofill/autofill_manager_delegate_efl.cc | 0 .../autofill/autofill_manager_delegate_efl.h | 0 .../browser/autofill/autofill_pref_store_efl.cc | 0 .../browser/autofill/autofill_pref_store_efl.h | 0 .../autofill/personal_data_manager_factory.cc | 0 .../autofill/personal_data_manager_factory.h | 0 .../browser}/browsing_data_remover_efl.cc | 4 +- .../browser}/browsing_data_remover_efl.h | 0 .../browser/download_manager_delegate_efl.cc | 0 .../browser/download_manager_delegate_efl.h | 0 .../browser/editor_client_observer.cc | 5 +- .../browser/editor_client_observer.h | 0 .../browser/favicon/favicon_commands.cc | 0 .../browser/favicon/favicon_commands.h | 0 .../browser/favicon/favicon_database.cc | 0 .../browser/favicon/favicon_database.h | 0 .../browser/favicon/favicon_database_p.cc | 0 .../browser/favicon/favicon_database_p.h | 0 .../browser/favicon/favicon_downloader.cc | 0 .../browser/favicon/favicon_downloader.h | 0 .../browser/favicon/favicon_service.cc | 0 .../browser/favicon/favicon_service.h | 0 .../browser/geolocation/access_token_store_efl.cc | 0 .../browser/geolocation/access_token_store_efl.h | 0 .../geolocation_permission_context_efl.cc | 2 +- .../geolocation_permission_context_efl.h | 0 .../browser/geolocation/location_provider_efl.cc | 0 .../browser/geolocation/location_provider_efl.h | 0 .../browser/inputpicker/InputPicker.cc | 2 +- .../browser/inputpicker/InputPicker.h | 0 .../browser/inputpicker/color_chooser_efl.cc | 0 .../browser/inputpicker/color_chooser_efl.h | 4 +- .../browser/javascript_dialog_manager_efl.cc | 0 .../browser/javascript_dialog_manager_efl.h | 0 .../browser/javascript_modal_dialog_efl.cc | 2 +- .../browser/javascript_modal_dialog_efl.h | 0 .../efl_integration}/browser/login_delegate_efl.cc | 0 .../efl_integration}/browser/login_delegate_efl.h | 0 .../browser/mime_override_manager_efl.cc | 0 .../browser/mime_override_manager_efl.h | 0 .../efl_integration}/browser/motion/MotionUI.cc | 0 .../efl_integration}/browser/motion/MotionUI.h | 0 .../browser/motion/wkext_motion.cc | 0 .../efl_integration}/browser/motion/wkext_motion.h | 0 .../browser/navigation_policy_handler_efl.cc | 12 +- .../browser/navigation_policy_handler_efl.h | 6 +- .../notification/notification_controller_efl.cc | 0 .../notification/notification_controller_efl.h | 0 .../content_password_manager_driver.cc | 0 .../content_password_manager_driver.h | 0 .../password_manager/password_form_manager.cc | 0 .../password_manager/password_form_manager.h | 0 .../password_generation_manager.cc | 0 .../password_manager/password_generation_manager.h | 0 .../browser/password_manager/password_manager.cc | 0 .../browser/password_manager/password_manager.h | 0 .../password_manager/password_manager_client.cc | 0 .../password_manager/password_manager_client.h | 0 .../password_manager_client_efl.cc | 0 .../password_manager/password_manager_client_efl.h | 0 .../password_manager/password_manager_driver.h | 0 .../password_manager/password_manager_util.h | 0 .../password_manager/password_manager_util_efl.cc | 0 .../password_manager/password_store_factory.cc | 2 +- .../password_manager/password_store_factory.h | 0 .../browser/policy_response_delegate_efl.cc | 5 +- .../browser/policy_response_delegate_efl.h | 0 .../browser}/render_message_filter_efl.cc | 9 +- .../browser}/render_message_filter_efl.h | 3 +- .../resource_dispatcher_host_delegate_efl.cc | 2 + .../resource_dispatcher_host_delegate_efl.h | 2 + .../browser/resource_throttle_efl.cc | 0 .../browser/resource_throttle_efl.h | 0 .../scoped_allow_wait_for_legacy_web_view_api.h | 0 .../efl_integration}/browser/scoped_wait_for_ewk.h | 0 .../browser/selectpicker/WebPopupItem.cc | 0 .../browser/selectpicker/WebPopupItem.h | 0 .../browser/selectpicker/popup_menu_item.cc | 0 .../browser/selectpicker/popup_menu_item.h | 0 .../browser/selectpicker/popup_menu_item_private.h | 0 .../browser/selectpicker/popup_picker.cc | 2 +- .../browser/selectpicker/popup_picker.h | 0 .../efl_integration}/browser/sound_effect.cc | 0 .../efl_integration}/browser/sound_effect.h | 0 .../efl_integration}/browser/sound_effect_tizen.cc | 0 .../browser/vibration/vibration_message_filter.cc | 0 .../browser/vibration/vibration_message_filter.h | 0 .../browser/vibration/vibration_provider_client.cc | 0 .../browser/vibration/vibration_provider_client.h | 0 .../web_cache_efl}/web_cache_manager_efl.cc | 6 +- .../browser/web_cache_efl}/web_cache_manager_efl.h | 0 .../browser/web_view_browser_message_filter.cc | 6 +- .../browser/web_view_browser_message_filter.h | 0 .../browser/webdata/web_data_service.cc | 0 .../browser/webdata/web_data_service.h | 0 .../browser/webdata/web_data_service_factory.cc | 2 +- .../browser/webdata/web_data_service_factory.h | 0 .../efl_integration}/browser_context_efl.cc | 2 +- .../efl_integration}/browser_context_efl.h | 0 .../efl_integration}/browser_main_parts_efl.cc | 0 .../efl_integration}/browser_main_parts_efl.h | 0 .../efl_integration}/command_line_efl.cc | 2 + .../efl_integration}/command_line_efl.h | 0 .../efl_integration}/common/cache_params_efl.h | 2 + .../efl_integration}/common/content_client_efl.cc | 0 .../efl_integration}/common/content_client_efl.h | 0 .../common/content_switches_efl.cc | 0 .../efl_integration}/common/content_switches_efl.h | 0 .../efl_integration}/common/editing_messages.h | 0 .../common/message_generator_ewk.cc | 34 ++ .../efl_integration/common/message_generator_ewk.h | 9 + .../common/navigation_policy_params.cc | 6 +- .../common/navigation_policy_params.h | 4 - .../efl_integration/common}/print_pages_params.cc | 6 +- .../efl_integration/common}/print_pages_params.h | 4 - .../efl_integration/common/render_messages_ewk.h | 298 ++++++++++++ .../efl_integration}/common/version_info.cc | 0 .../efl_integration}/common/version_info.h | 0 .../efl_integration}/common/version_info_efl.h | 0 .../efl_integration}/common/web_contents_utils.cc | 4 +- .../efl_integration}/common/web_contents_utils.h | 0 .../efl_integration}/content_browser_client_efl.cc | 6 +- .../efl_integration}/content_browser_client_efl.h | 2 +- .../efl_integration}/content_main_delegate_efl.cc | 4 +- .../efl_integration}/content_main_delegate_efl.h | 0 .../context_menu_controller_efl.cc | 11 +- .../efl_integration}/context_menu_controller_efl.h | 0 .../efl_integration}/cookie_manager.cc | 0 .../{impl => ewk/efl_integration}/cookie_manager.h | 0 .../efl_integration}/devtools_delegate_efl.cc | 2 +- .../efl_integration}/devtools_delegate_efl.h | 0 .../devtools_manager_delegate_efl.cc | 0 .../devtools_manager_delegate_efl.h | 0 tizen_src/ewk/efl_integration/efl_integration.gypi | 522 +++++++++++++++++++++ .../efl_webprocess.cc | 0 .../efl_integration}/efl_webprocess_main.cc | 0 .../efl_integration}/efl_webprocess_main.h | 0 .../{impl => ewk/efl_integration}/eweb_context.cc | 6 +- .../{impl => ewk/efl_integration}/eweb_context.h | 4 +- .../{impl => ewk/efl_integration}/eweb_view.cc | 176 +++++-- .../{impl => ewk/efl_integration}/eweb_view.h | 13 +- .../efl_integration}/eweb_view_callbacks.h | 22 +- .../efl_integration}/ewk_global_data.cc | 4 +- .../efl_integration}/ewk_global_data.h | 0 .../file_chooser_controller_efl.cc | 0 .../efl_integration}/file_chooser_controller_efl.h | 0 .../http_user_agent_settings_efl.cc | 0 .../http_user_agent_settings_efl.h | 0 .../{impl => ewk/efl_integration}/locale_efl.cc | 2 +- .../{impl => ewk/efl_integration}/locale_efl.h | 0 .../{impl => ewk/efl_integration}/memory_purger.cc | 2 +- .../{impl => ewk/efl_integration}/memory_purger.h | 0 .../efl_integration}/message_pump_for_ui_efl.cc | 0 .../efl_integration}/message_pump_for_ui_efl.h | 0 .../efl_integration}/network_delegate_efl.cc | 0 .../efl_integration}/network_delegate_efl.h | 0 .../efl_integration}/popup_controller_efl.cc | 7 +- .../efl_integration}/popup_controller_efl.h | 0 .../private}/ewk_auth_challenge_private.h | 0 .../private}/ewk_autofill_profile_private.cc | 0 .../private}/ewk_autofill_profile_private.h | 0 .../private}/ewk_certificate_private.h | 0 .../private}/ewk_console_message_private.h | 0 .../ewk_context_form_autofill_profile_private.cc | 0 .../ewk_context_form_autofill_profile_private.h | 0 .../private}/ewk_context_menu_private.h | 0 .../private}/ewk_cookie_manager_private.h | 0 .../efl_integration/private}/ewk_error_private.h | 0 .../private}/ewk_geolocation_private.cc | 0 .../private}/ewk_geolocation_private.h | 0 .../private/ewk_hit_test_private.cc | 71 +++ .../efl_integration/private/ewk_hit_test_private.h | 49 ++ .../private}/ewk_ipc_message_private.cc | 8 +- .../private}/ewk_ipc_message_private.h | 0 .../private/ewk_policy_decision_private.cc | 279 ++++++++++- .../private/ewk_policy_decision_private.h | 119 +++++ .../private/ewk_security_origin_private.h | 44 ++ .../private}/ewk_settings_private.cc | 0 .../private}/ewk_settings_private.h | 0 .../private}/ewk_suspendable_object.cc | 0 .../private}/ewk_suspendable_object.h | 0 .../private}/ewk_text_style_private.h | 0 .../private}/ewk_tracing_private.cc | 2 +- .../efl_integration/private}/ewk_tracing_private.h | 0 .../private}/ewk_user_media_private.h | 0 .../efl_integration/private/ewk_view_private.cc | 14 +- .../ewk_web_application_icon_data_private.cc | 0 .../ewk_web_application_icon_data_private.h | 0 .../private}/ewk_window_features_private.h | 0 .../efl_integration/public/ewk_auth_challenge.cc | 2 +- .../ewk/efl_integration/public/ewk_auth_request.cc | 3 +- .../efl_integration/public/ewk_autofill_profile.cc | 4 +- .../ewk/efl_integration/public/ewk_certificate.cc | 4 +- .../efl_integration/public/ewk_console_message.cc | 3 +- .../ewk/efl_integration/public/ewk_context.cc | 15 +- .../ewk/efl_integration/public/ewk_context_menu.cc | 5 +- .../efl_integration/public/ewk_cookie_manager.cc | 6 +- tizen_src/ewk/efl_integration/public/ewk_error.cc | 6 +- .../ewk/efl_integration/public/ewk_geolocation.cc | 4 +- .../ewk/efl_integration/public/ewk_hit_test.cc | 9 +- tizen_src/ewk/efl_integration/public/ewk_main.cc | 14 +- .../ewk/efl_integration/public/ewk_notification.cc | 17 +- .../efl_integration/public/ewk_policy_decision.cc | 4 +- .../ewk/efl_integration/public/ewk_settings.cc | 15 +- .../ewk/efl_integration/public/ewk_text_style.cc | 3 +- .../ewk/efl_integration/public/ewk_tracing.cc | 2 +- .../ewk/efl_integration/public/ewk_user_media.cc | 4 +- tizen_src/ewk/efl_integration/public/ewk_view.cc | 20 +- .../public/ewk_web_application_icon_data.cc | 3 +- .../efl_integration/public/ewk_window_features.cc | 3 +- .../renderer/content_renderer_client_efl.cc | 13 +- .../renderer/content_renderer_client_efl.h | 34 +- .../renderer/editorclient_agent.cc | 6 +- .../efl_integration}/renderer/editorclient_agent.h | 0 .../renderer/print_web_view_helper_efl.cc | 3 +- .../renderer/print_web_view_helper_efl.h | 2 +- .../renderer/render_frame_observer_efl.cc | 2 +- .../renderer/render_frame_observer_efl.h | 0 .../renderer/render_process_observer_efl.cc | 2 +- .../renderer/render_process_observer_efl.h | 3 +- .../renderer/render_view_observer_efl.cc | 8 +- .../renderer/render_view_observer_efl.h | 3 +- .../efl_integration}/resource/AutofillPopup.edc | 0 .../resource/DisambiguationPopup.edc | 0 .../efl_integration}/resource/Edge.edc | 0 .../efl_integration}/resource/JavaScriptPopup.edc | 0 .../efl_integration}/resource/Magnifier.edc | 0 .../efl_integration}/resource/control.edc | 0 .../resource/images/I01_picker_arrow_left.png | Bin .../resource/images/I01_picker_arrow_right.png | Bin .../resource/images/I01_picker_btn_02_normal.png | Bin .../resource/images/I01_picker_btn_02_press.png | Bin .../resource/images/I01_picker_btn_normal.png | Bin .../resource/images/I01_picker_panel_bg.png | Bin .../resource/images/magnifier_left.png | Bin .../resource/images/magnifier_middle.png | Bin .../resource/images/magnifier_right.png | Bin .../resource/images/overscrolling_dark_bottom.png | Bin .../resource/images/overscrolling_dark_left.png | Bin .../resource/images/overscrolling_dark_right.png | Bin .../resource/images/overscrolling_dark_top.png | Bin .../efl_integration}/selection_box_efl.cc | 0 .../efl_integration}/selection_box_efl.h | 0 .../efl_integration}/selection_controller_efl.cc | 0 .../efl_integration}/selection_controller_efl.h | 2 +- .../efl_integration}/selection_handle_efl.cc | 0 .../efl_integration}/selection_handle_efl.h | 0 .../efl_integration}/selection_magnifier_efl.cc | 2 +- .../efl_integration}/selection_magnifier_efl.h | 0 .../efl_integration}/tizen_webview/public/README | 0 .../public/tw_back_forward_history.cc | 0 .../tizen_webview/public/tw_back_forward_history.h | 16 +- .../tizen_webview/public/tw_back_forward_list.h | 0 .../public/tw_back_forward_list_impl.cc | 0 .../public/tw_back_forward_list_impl.h | 18 +- .../tizen_webview/public/tw_cache_model.h | 0 .../tizen_webview/public/tw_callbacks.h | 0 .../public/tw_content_security_policy.h | 0 .../public/tw_context_menu_controller.cc | 0 .../public/tw_context_menu_controller.h | 0 .../tizen_webview/public/tw_cookie_accept_policy.h | 0 .../tizen_webview/public/tw_custom_handlers.cc | 0 .../tizen_webview/public/tw_custom_handlers.h | 0 .../tizen_webview/public/tw_error.h | 0 .../tizen_webview/public/tw_export.h | 0 .../tizen_webview/public/tw_find_options.h | 0 .../tizen_webview/public/tw_frame.cc | 11 +- .../tizen_webview/public/tw_frame.h | 4 +- .../tizen_webview/public/tw_hit_test.cc | 4 +- .../tizen_webview/public/tw_hit_test.h | 0 .../public/tw_legacy_font_size_mode.h | 0 .../tizen_webview/public/tw_macro.h | 0 .../tizen_webview/public/tw_notification.cc | 0 .../tizen_webview/public/tw_notification.h | 0 .../tizen_webview/public/tw_policy_decision.cc | 2 +- .../tizen_webview/public/tw_policy_decision.h | 5 +- .../tizen_webview/public/tw_ref_counted.h | 0 .../tizen_webview/public/tw_security_origin.cc | 0 .../tizen_webview/public/tw_security_origin.h | 0 .../public/tw_selection_controller.cc | 0 .../tizen_webview/public/tw_selection_controller.h | 0 .../tizen_webview/public/tw_settings.h | 0 .../tizen_webview/public/tw_touch_event.h | 0 .../tizen_webview/public/tw_touch_point.cc | 0 .../tizen_webview/public/tw_touch_point.h | 0 .../tizen_webview/public/tw_url.cc | 0 .../efl_integration}/tizen_webview/public/tw_url.h | 0 .../tizen_webview/public/tw_web_context.cc | 0 .../tizen_webview/public/tw_web_context.h | 0 .../tizen_webview/public/tw_webview.cc | 10 +- .../tizen_webview/public/tw_webview.h | 4 +- .../tizen_webview/public/tw_webview_delegate.cc | 0 .../tizen_webview/public/tw_webview_delegate.h | 0 .../public/tw_webview_evas_event_handler.cc | 0 .../public/tw_webview_evas_event_handler.h | 0 .../tizen_webview/public/tw_wrt.cc | 2 +- .../efl_integration}/tizen_webview/public/tw_wrt.h | 0 .../tizen_webview/tw_misc_utility.cc | 0 .../tizen_webview/tw_misc_utility.h | 0 .../url_request_context_getter_efl.cc | 0 .../url_request_context_getter_efl.h | 0 .../efl_integration}/web_contents_delegate_efl.cc | 16 +- .../efl_integration}/web_contents_delegate_efl.h | 30 +- .../web_process_content_main_delegate_efl.cc | 2 +- .../web_process_content_main_delegate_efl.h | 0 .../efl_integration}/wrt/dynamicplugin.cc | 0 .../efl_integration}/wrt/dynamicplugin.h | 0 .../wrt/wrt_file_protocol_handler.cc | 0 .../wrt/wrt_file_protocol_handler.h | 0 .../efl_integration}/wrt/wrt_widget_host.cc | 2 +- .../efl_integration}/wrt/wrt_widget_host.h | 0 .../{impl => ewk/efl_integration}/wrt/wrtwidget.cc | 6 +- .../{impl => ewk/efl_integration}/wrt/wrtwidget.h | 0 tizen_src/ewk/efl_webview_app/efl_webview_app.gypi | 74 +++ tizen_src/ewk/ubrowser/ubrowser.gypi | 6 +- tizen_src/ewk/unittest/ewk-tests.gypi | 2 +- tizen_src/impl/API/ewk_hit_test_private.cc | 77 --- tizen_src/impl/API/ewk_hit_test_private.h | 58 --- tizen_src/impl/API/ewk_policy_decision_private.cc | 283 ----------- tizen_src/impl/API/ewk_policy_decision_private.h | 129 ----- tizen_src/impl/API/ewk_security_origin_private.h | 53 --- tizen_src/supplement.gypi | 4 - 346 files changed, 2053 insertions(+), 1563 deletions(-) rename tizen_src/{impl => chromium_impl/content}/browser/tracing/tracing_controller_efl.cc (97%) rename tizen_src/{impl => chromium_impl/content}/browser/tracing/tracing_controller_efl.h (100%) create mode 100644 tizen_src/ewk/chromium-ewk.gypi rename tizen_src/{impl => ewk/efl_integration}/EdgeEffect.cpp (99%) rename tizen_src/{impl => ewk/efl_integration}/EdgeEffect.h (100%) rename tizen_src/{impl => ewk/efl_integration}/autofill_popup_view_efl.cc (99%) rename tizen_src/{impl => ewk/efl_integration}/autofill_popup_view_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/autofill/autofill_manager_delegate_efl.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/autofill/autofill_manager_delegate_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/autofill/autofill_pref_store_efl.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/autofill/autofill_pref_store_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/autofill/personal_data_manager_factory.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/autofill/personal_data_manager_factory.h (100%) rename tizen_src/{impl/browser/renderer_host => ewk/efl_integration/browser}/browsing_data_remover_efl.cc (99%) rename tizen_src/{impl/browser/renderer_host => ewk/efl_integration/browser}/browsing_data_remover_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/download_manager_delegate_efl.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/download_manager_delegate_efl.h (100%) rename tizen_src/{impl/components/editing/content => ewk/efl_integration}/browser/editor_client_observer.cc (98%) rename tizen_src/{impl/components/editing/content => ewk/efl_integration}/browser/editor_client_observer.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/favicon/favicon_commands.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/favicon/favicon_commands.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/favicon/favicon_database.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/favicon/favicon_database.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/favicon/favicon_database_p.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/favicon/favicon_database_p.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/favicon/favicon_downloader.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/favicon/favicon_downloader.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/favicon/favicon_service.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/favicon/favicon_service.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/geolocation/access_token_store_efl.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/geolocation/access_token_store_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/geolocation/geolocation_permission_context_efl.cc (98%) rename tizen_src/{impl => ewk/efl_integration}/browser/geolocation/geolocation_permission_context_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/geolocation/location_provider_efl.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/geolocation/location_provider_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/inputpicker/InputPicker.cc (99%) mode change 100755 => 100644 rename tizen_src/{impl => ewk/efl_integration}/browser/inputpicker/InputPicker.h (100%) mode change 100755 => 100644 rename tizen_src/{impl => ewk/efl_integration}/browser/inputpicker/color_chooser_efl.cc (100%) mode change 100755 => 100644 rename tizen_src/{impl => ewk/efl_integration}/browser/inputpicker/color_chooser_efl.h (89%) mode change 100755 => 100644 rename tizen_src/{impl => ewk/efl_integration}/browser/javascript_dialog_manager_efl.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/javascript_dialog_manager_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/javascript_modal_dialog_efl.cc (99%) rename tizen_src/{impl => ewk/efl_integration}/browser/javascript_modal_dialog_efl.h (100%) mode change 100755 => 100644 rename tizen_src/{impl => ewk/efl_integration}/browser/login_delegate_efl.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/login_delegate_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/mime_override_manager_efl.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/mime_override_manager_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/motion/MotionUI.cc (100%) mode change 100755 => 100644 rename tizen_src/{impl => ewk/efl_integration}/browser/motion/MotionUI.h (100%) mode change 100755 => 100644 rename tizen_src/{impl => ewk/efl_integration}/browser/motion/wkext_motion.cc (100%) mode change 100755 => 100644 rename tizen_src/{impl => ewk/efl_integration}/browser/motion/wkext_motion.h (100%) mode change 100755 => 100644 rename tizen_src/{impl => ewk/efl_integration}/browser/navigation_policy_handler_efl.cc (80%) rename tizen_src/{impl => ewk/efl_integration}/browser/navigation_policy_handler_efl.h (82%) rename tizen_src/{impl => ewk/efl_integration}/browser/notification/notification_controller_efl.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/notification/notification_controller_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/password_manager/content_password_manager_driver.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/password_manager/content_password_manager_driver.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/password_manager/password_form_manager.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/password_manager/password_form_manager.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/password_manager/password_generation_manager.cc (100%) mode change 100755 => 100644 rename tizen_src/{impl => ewk/efl_integration}/browser/password_manager/password_generation_manager.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/password_manager/password_manager.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/password_manager/password_manager.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/password_manager/password_manager_client.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/password_manager/password_manager_client.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/password_manager/password_manager_client_efl.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/password_manager/password_manager_client_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/password_manager/password_manager_driver.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/password_manager/password_manager_util.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/password_manager/password_manager_util_efl.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/password_manager/password_store_factory.cc (98%) mode change 100755 => 100644 rename tizen_src/{impl => ewk/efl_integration}/browser/password_manager/password_store_factory.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/policy_response_delegate_efl.cc (99%) rename tizen_src/{impl => ewk/efl_integration}/browser/policy_response_delegate_efl.h (100%) rename tizen_src/{impl/browser/renderer_host => ewk/efl_integration/browser}/render_message_filter_efl.cc (88%) rename tizen_src/{impl/browser/renderer_host => ewk/efl_integration/browser}/render_message_filter_efl.h (95%) rename tizen_src/{impl => ewk/efl_integration}/browser/resource_dispatcher_host_delegate_efl.cc (99%) rename tizen_src/{impl => ewk/efl_integration}/browser/resource_dispatcher_host_delegate_efl.h (98%) rename tizen_src/{impl => ewk/efl_integration}/browser/resource_throttle_efl.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/resource_throttle_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/scoped_allow_wait_for_legacy_web_view_api.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/scoped_wait_for_ewk.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/selectpicker/WebPopupItem.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/selectpicker/WebPopupItem.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/selectpicker/popup_menu_item.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/selectpicker/popup_menu_item.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/selectpicker/popup_menu_item_private.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/selectpicker/popup_picker.cc (99%) rename tizen_src/{impl => ewk/efl_integration}/browser/selectpicker/popup_picker.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/sound_effect.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/sound_effect.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/sound_effect_tizen.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/vibration/vibration_message_filter.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/vibration/vibration_message_filter.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/vibration/vibration_provider_client.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/vibration/vibration_provider_client.h (100%) rename tizen_src/{impl/browser/renderer_host => ewk/efl_integration/browser/web_cache_efl}/web_cache_manager_efl.cc (98%) rename tizen_src/{impl/browser/renderer_host => ewk/efl_integration/browser/web_cache_efl}/web_cache_manager_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/web_view_browser_message_filter.cc (96%) rename tizen_src/{impl => ewk/efl_integration}/browser/web_view_browser_message_filter.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/webdata/web_data_service.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/webdata/web_data_service.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser/webdata/web_data_service_factory.cc (99%) rename tizen_src/{impl => ewk/efl_integration}/browser/webdata/web_data_service_factory.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser_context_efl.cc (99%) rename tizen_src/{impl => ewk/efl_integration}/browser_context_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/browser_main_parts_efl.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/browser_main_parts_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/command_line_efl.cc (99%) rename tizen_src/{impl => ewk/efl_integration}/command_line_efl.h (100%) rename tizen_src/{chromium_impl/content => ewk/efl_integration}/common/cache_params_efl.h (94%) rename tizen_src/{impl => ewk/efl_integration}/common/content_client_efl.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/common/content_client_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/common/content_switches_efl.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/common/content_switches_efl.h (100%) rename tizen_src/{impl/components/editing/content => ewk/efl_integration}/common/editing_messages.h (100%) create mode 100644 tizen_src/ewk/efl_integration/common/message_generator_ewk.cc create mode 100644 tizen_src/ewk/efl_integration/common/message_generator_ewk.h rename tizen_src/{chromium_impl/content => ewk/efl_integration}/common/navigation_policy_params.cc (84%) rename tizen_src/{chromium_impl/content => ewk/efl_integration}/common/navigation_policy_params.h (95%) rename tizen_src/{chromium_impl/content/renderer => ewk/efl_integration/common}/print_pages_params.cc (84%) rename tizen_src/{chromium_impl/content/renderer => ewk/efl_integration/common}/print_pages_params.h (96%) create mode 100644 tizen_src/ewk/efl_integration/common/render_messages_ewk.h rename tizen_src/{impl => ewk/efl_integration}/common/version_info.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/common/version_info.h (100%) rename tizen_src/{impl => ewk/efl_integration}/common/version_info_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/common/web_contents_utils.cc (93%) rename tizen_src/{impl => ewk/efl_integration}/common/web_contents_utils.h (100%) rename tizen_src/{impl => ewk/efl_integration}/content_browser_client_efl.cc (98%) mode change 100755 => 100644 rename tizen_src/{impl => ewk/efl_integration}/content_browser_client_efl.h (99%) rename tizen_src/{impl => ewk/efl_integration}/content_main_delegate_efl.cc (97%) rename tizen_src/{impl => ewk/efl_integration}/content_main_delegate_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/context_menu_controller_efl.cc (99%) rename tizen_src/{impl => ewk/efl_integration}/context_menu_controller_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/cookie_manager.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/cookie_manager.h (100%) rename tizen_src/{impl => ewk/efl_integration}/devtools_delegate_efl.cc (98%) rename tizen_src/{impl => ewk/efl_integration}/devtools_delegate_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/devtools_manager_delegate_efl.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/devtools_manager_delegate_efl.h (100%) create mode 100644 tizen_src/ewk/efl_integration/efl_integration.gypi rename tizen_src/ewk/{efl_webprocess => efl_integration}/efl_webprocess.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/efl_webprocess_main.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/efl_webprocess_main.h (100%) rename tizen_src/{impl => ewk/efl_integration}/eweb_context.cc (99%) rename tizen_src/{impl => ewk/efl_integration}/eweb_context.h (97%) rename tizen_src/{impl => ewk/efl_integration}/eweb_view.cc (96%) rename tizen_src/{impl => ewk/efl_integration}/eweb_view.h (98%) rename tizen_src/{impl => ewk/efl_integration}/eweb_view_callbacks.h (97%) rename tizen_src/{impl => ewk/efl_integration}/ewk_global_data.cc (98%) rename tizen_src/{impl => ewk/efl_integration}/ewk_global_data.h (100%) rename tizen_src/{impl => ewk/efl_integration}/file_chooser_controller_efl.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/file_chooser_controller_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/http_user_agent_settings_efl.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/http_user_agent_settings_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/locale_efl.cc (98%) rename tizen_src/{impl => ewk/efl_integration}/locale_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/memory_purger.cc (98%) rename tizen_src/{impl => ewk/efl_integration}/memory_purger.h (100%) rename tizen_src/{impl => ewk/efl_integration}/message_pump_for_ui_efl.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/message_pump_for_ui_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/network_delegate_efl.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/network_delegate_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/popup_controller_efl.cc (99%) rename tizen_src/{impl => ewk/efl_integration}/popup_controller_efl.h (100%) rename tizen_src/{impl/API => ewk/efl_integration/private}/ewk_auth_challenge_private.h (100%) rename tizen_src/{impl/API => ewk/efl_integration/private}/ewk_autofill_profile_private.cc (100%) rename tizen_src/{impl/API => ewk/efl_integration/private}/ewk_autofill_profile_private.h (100%) rename tizen_src/{impl/API => ewk/efl_integration/private}/ewk_certificate_private.h (100%) rename tizen_src/{impl/API => ewk/efl_integration/private}/ewk_console_message_private.h (100%) rename tizen_src/{impl/API => ewk/efl_integration/private}/ewk_context_form_autofill_profile_private.cc (100%) rename tizen_src/{impl/API => ewk/efl_integration/private}/ewk_context_form_autofill_profile_private.h (100%) rename tizen_src/{impl/API => ewk/efl_integration/private}/ewk_context_menu_private.h (100%) rename tizen_src/{impl/API => ewk/efl_integration/private}/ewk_cookie_manager_private.h (100%) rename tizen_src/{impl/API => ewk/efl_integration/private}/ewk_error_private.h (100%) rename tizen_src/{impl/API => ewk/efl_integration/private}/ewk_geolocation_private.cc (100%) rename tizen_src/{impl/API => ewk/efl_integration/private}/ewk_geolocation_private.h (100%) rename tizen_src/{impl/API => ewk/efl_integration/private}/ewk_ipc_message_private.cc (90%) rename tizen_src/{impl/API => ewk/efl_integration/private}/ewk_ipc_message_private.h (100%) rename tizen_src/{impl/API => ewk/efl_integration/private}/ewk_settings_private.cc (100%) rename tizen_src/{impl/API => ewk/efl_integration/private}/ewk_settings_private.h (100%) rename tizen_src/{impl/API => ewk/efl_integration/private}/ewk_suspendable_object.cc (100%) rename tizen_src/{impl/API => ewk/efl_integration/private}/ewk_suspendable_object.h (100%) rename tizen_src/{impl/API => ewk/efl_integration/private}/ewk_text_style_private.h (100%) rename tizen_src/{impl/API => ewk/efl_integration/private}/ewk_tracing_private.cc (92%) rename tizen_src/{impl/API => ewk/efl_integration/private}/ewk_tracing_private.h (100%) rename tizen_src/{impl/API => ewk/efl_integration/private}/ewk_user_media_private.h (100%) rename tizen_src/{impl/API => ewk/efl_integration/private}/ewk_web_application_icon_data_private.cc (100%) rename tizen_src/{impl/API => ewk/efl_integration/private}/ewk_web_application_icon_data_private.h (100%) rename tizen_src/{impl/API => ewk/efl_integration/private}/ewk_window_features_private.h (100%) rename tizen_src/{impl => ewk/efl_integration}/renderer/content_renderer_client_efl.cc (97%) rename tizen_src/{impl => ewk/efl_integration}/renderer/content_renderer_client_efl.h (71%) rename tizen_src/{impl/components/editing/content => ewk/efl_integration}/renderer/editorclient_agent.cc (92%) rename tizen_src/{impl/components/editing/content => ewk/efl_integration}/renderer/editorclient_agent.h (100%) rename tizen_src/{impl => ewk/efl_integration}/renderer/print_web_view_helper_efl.cc (98%) rename tizen_src/{impl => ewk/efl_integration}/renderer/print_web_view_helper_efl.h (96%) rename tizen_src/{impl => ewk/efl_integration}/renderer/render_frame_observer_efl.cc (98%) rename tizen_src/{impl => ewk/efl_integration}/renderer/render_frame_observer_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/renderer/render_process_observer_efl.cc (98%) rename tizen_src/{impl => ewk/efl_integration}/renderer/render_process_observer_efl.h (96%) rename tizen_src/{impl => ewk/efl_integration}/renderer/render_view_observer_efl.cc (99%) rename tizen_src/{impl => ewk/efl_integration}/renderer/render_view_observer_efl.h (98%) rename tizen_src/{impl => ewk/efl_integration}/resource/AutofillPopup.edc (100%) rename tizen_src/{impl => ewk/efl_integration}/resource/DisambiguationPopup.edc (100%) rename tizen_src/{impl => ewk/efl_integration}/resource/Edge.edc (100%) rename tizen_src/{impl => ewk/efl_integration}/resource/JavaScriptPopup.edc (100%) mode change 100755 => 100644 rename tizen_src/{impl => ewk/efl_integration}/resource/Magnifier.edc (100%) rename tizen_src/{impl => ewk/efl_integration}/resource/control.edc (100%) mode change 100755 => 100644 rename tizen_src/{impl => ewk/efl_integration}/resource/images/I01_picker_arrow_left.png (100%) mode change 100755 => 100644 rename tizen_src/{impl => ewk/efl_integration}/resource/images/I01_picker_arrow_right.png (100%) mode change 100755 => 100644 rename tizen_src/{impl => ewk/efl_integration}/resource/images/I01_picker_btn_02_normal.png (100%) mode change 100755 => 100644 rename tizen_src/{impl => ewk/efl_integration}/resource/images/I01_picker_btn_02_press.png (100%) mode change 100755 => 100644 rename tizen_src/{impl => ewk/efl_integration}/resource/images/I01_picker_btn_normal.png (100%) mode change 100755 => 100644 rename tizen_src/{impl => ewk/efl_integration}/resource/images/I01_picker_panel_bg.png (100%) mode change 100755 => 100644 rename tizen_src/{impl => ewk/efl_integration}/resource/images/magnifier_left.png (100%) rename tizen_src/{impl => ewk/efl_integration}/resource/images/magnifier_middle.png (100%) rename tizen_src/{impl => ewk/efl_integration}/resource/images/magnifier_right.png (100%) rename tizen_src/{impl => ewk/efl_integration}/resource/images/overscrolling_dark_bottom.png (100%) rename tizen_src/{impl => ewk/efl_integration}/resource/images/overscrolling_dark_left.png (100%) rename tizen_src/{impl => ewk/efl_integration}/resource/images/overscrolling_dark_right.png (100%) rename tizen_src/{impl => ewk/efl_integration}/resource/images/overscrolling_dark_top.png (100%) rename tizen_src/{impl => ewk/efl_integration}/selection_box_efl.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/selection_box_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/selection_controller_efl.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/selection_controller_efl.h (99%) rename tizen_src/{impl => ewk/efl_integration}/selection_handle_efl.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/selection_handle_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/selection_magnifier_efl.cc (99%) rename tizen_src/{impl => ewk/efl_integration}/selection_magnifier_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/README (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_back_forward_history.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_back_forward_history.h (76%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_back_forward_list.h (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_back_forward_list_impl.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_back_forward_list_impl.h (83%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_cache_model.h (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_callbacks.h (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_content_security_policy.h (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_context_menu_controller.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_context_menu_controller.h (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_cookie_accept_policy.h (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_custom_handlers.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_custom_handlers.h (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_error.h (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_export.h (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_find_options.h (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_frame.cc (75%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_frame.h (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_hit_test.cc (97%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_hit_test.h (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_legacy_font_size_mode.h (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_macro.h (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_notification.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_notification.h (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_policy_decision.cc (98%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_policy_decision.h (96%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_ref_counted.h (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_security_origin.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_security_origin.h (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_selection_controller.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_selection_controller.h (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_settings.h (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_touch_event.h (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_touch_point.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_touch_point.h (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_url.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_url.h (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_web_context.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_web_context.h (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_webview.cc (98%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_webview.h (98%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_webview_delegate.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_webview_delegate.h (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_webview_evas_event_handler.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_webview_evas_event_handler.h (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_wrt.cc (97%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/public/tw_wrt.h (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/tw_misc_utility.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/tizen_webview/tw_misc_utility.h (100%) rename tizen_src/{impl => ewk/efl_integration}/url_request_context_getter_efl.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/url_request_context_getter_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/web_contents_delegate_efl.cc (98%) rename tizen_src/{impl => ewk/efl_integration}/web_contents_delegate_efl.h (90%) rename tizen_src/{impl => ewk/efl_integration}/web_process_content_main_delegate_efl.cc (97%) rename tizen_src/{impl => ewk/efl_integration}/web_process_content_main_delegate_efl.h (100%) rename tizen_src/{impl => ewk/efl_integration}/wrt/dynamicplugin.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/wrt/dynamicplugin.h (100%) rename tizen_src/{impl => ewk/efl_integration}/wrt/wrt_file_protocol_handler.cc (100%) rename tizen_src/{impl => ewk/efl_integration}/wrt/wrt_file_protocol_handler.h (100%) rename tizen_src/{impl => ewk/efl_integration}/wrt/wrt_widget_host.cc (99%) rename tizen_src/{impl => ewk/efl_integration}/wrt/wrt_widget_host.h (100%) rename tizen_src/{impl => ewk/efl_integration}/wrt/wrtwidget.cc (96%) rename tizen_src/{impl => ewk/efl_integration}/wrt/wrtwidget.h (100%) create mode 100644 tizen_src/ewk/efl_webview_app/efl_webview_app.gypi delete mode 100644 tizen_src/impl/API/ewk_hit_test_private.cc delete mode 100644 tizen_src/impl/API/ewk_hit_test_private.h delete mode 100644 tizen_src/impl/API/ewk_policy_decision_private.cc delete mode 100644 tizen_src/impl/API/ewk_policy_decision_private.h delete mode 100644 tizen_src/impl/API/ewk_security_origin_private.h diff --git a/tizen_src/build/build_desktop.sh b/tizen_src/build/build_desktop.sh index 3d05888..8cd7d21 100755 --- a/tizen_src/build/build_desktop.sh +++ b/tizen_src/build/build_desktop.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPTDIR=$( cd $(dirname $0) ; pwd -P ) -TOPDIR=$( cd ${SCRIPTDIR}/.. ; pwd -P ) +TOPDIR=$( cd ${SCRIPTDIR}/../.. ; pwd -P ) source ${SCRIPTDIR}/common.sh trap 'error_report $0 $LINENO' ERR SIGINT SIGTERM SIGQUIT diff --git a/tizen_src/build/common.sh b/tizen_src/build/common.sh index e6de375..c7bdaf1 100755 --- a/tizen_src/build/common.sh +++ b/tizen_src/build/common.sh @@ -4,10 +4,8 @@ pushd `dirname $0` > /dev/null export SCRIPTDIR=`pwd -L` popd > /dev/null -export TOPDIR=$(readlink -f "${SCRIPTDIR}/..") -export CHROME_SRC="${TOPDIR}/src" - -export CLANG_DIR="${TOPDIR}/src/third_party/llvm-build/Release+Asserts/" +export TOPDIR=$(readlink -f "${SCRIPTDIR}/../..") +export CHROME_SRC="${TOPDIR}" function applyPatch { directory=$1 @@ -128,18 +126,18 @@ function parseHostBuildScriptParams() { function hostGypChromiumEfl() { if [[ $SKIP_GYP == 0 ]]; then - ${TOPDIR}/build/gyp_chromiumefl.sh $@ + ${TOPDIR}/tizen_src/build/gyp_chromiumefl.sh $@ fi } function hostNinja() { if [[ $SKIP_NINJA == 0 ]]; then - TARGETS="chromium-efl efl_webprocess chromium-ewk efl_webview_app ubrowser" + TARGETS="chromium-ewk efl_webprocess efl_webview_app ubrowser" if [[ $BUILD_EWK_UNITTESTS == 1 ]]; then TARGETS="$TARGETS ewk_unittests" fi if [[ $BUILD_CONTENT_SHELL == 1 ]]; then - TARGETS="$TARGETS content_shell_efl" + TARGETS="$TARGETS content_shell" fi BUILDDIR=${GYP_GENERATOR_OUTPUT}/${BUILD_SUBDIRECTORY} ninja -C $BUILDDIR ${JOBS} ${TARGETS} diff --git a/tizen_src/build/gyp_chromiumefl b/tizen_src/build/gyp_chromiumefl index c0d5633..8588027 100755 --- a/tizen_src/build/gyp_chromiumefl +++ b/tizen_src/build/gyp_chromiumefl @@ -10,15 +10,13 @@ chrome_src = os.environ.get('CHROME_SRC') if chrome_src: chrome_src = os.path.abspath(chrome_src) if not chrome_src or not os.path.isdir(chrome_src): - chrome_src = os.path.join(top_dir, 'src') + chrome_src = os.path.join(top_dir, '..') print 'CHROME_SRC not set, falling back to ' + chrome_src script_dir = os.path.abspath(os.path.join(chrome_src, 'build')) if not os.path.isdir(script_dir): print script_dir + " is not a valid directory" sys.exit(1) -root_dir = top_dir -impl_dir = os.path.join(top_dir, 'impl') sys.path.insert(0, script_dir) import gyp_helper @@ -82,7 +80,7 @@ def additional_include_files(args=[]): AddInclude(os.path.join(script_dir, 'common.gypi')) # Used for additional build tweaks such as file exclusions - AddInclude(os.path.join(top_dir, 'impl', 'chromium-efl.gypi')) + AddInclude(os.path.join(top_dir, 'ewk', 'chromium-ewk.gypi')) # Optionally add supplemental .gypi files if present. supplements = glob.glob(os.path.join(chrome_src, '*', 'supplement.gypi')) @@ -94,7 +92,7 @@ def additional_include_files(args=[]): def get_output_dir(): outdir = os.environ.get("GYP_GENERATOR_OUTPUT") if not outdir: - outdir = os.path.join(root_dir, "out") + outdir = os.path.join(top_dir, "out") if not os.path.isdir(outdir): os.mkdir(outdir) if not os.path.isdir(outdir): @@ -123,7 +121,7 @@ if __name__ == '__main__': break if not gyp_file_specified: - args.append(os.path.join(root_dir, 'impl', 'chromium-efl.gyp')) + args.append(os.path.join(top_dir, 'tizen_src', 'ewk', 'chromium-ewk.gyp')) args.extend(['-I' + i for i in additional_include_files(args)]) @@ -144,17 +142,14 @@ if __name__ == '__main__': if sys.platform not in ('darwin',): args.append('--no-circular-check') - args.extend(['-D', 'webkit_src_dir=' + chrome_src + '/third_party/WebKit']) # the top_level source directory is the first common ancestor of our module and the chromium source tree for the build to be sane. # commonprefix works on a character basis, so it might return a phony common prefix (not the common parent directory we expect), - toplevel= os.path.commonprefix([root_dir, chrome_src]) + toplevel= os.path.commonprefix([top_dir, chrome_src]) if not os.path.exists(toplevel): toplevel = os.path.join(toplevel, os.pardir) args.extend(["--toplevel-dir=" + toplevel]) # Chromium specific Hack: for Chromium to build, the depth has to be set to the chromium src dir. args.extend(["--depth=" + chrome_src]) - args.extend(['-D', 'chrome_src_dir=' + chrome_src]) - args.extend(['-D', 'efl_impl_dir=' + impl_dir]) # Tweak the output location and format (hardcode ninja for now) args.extend(['--generator-output', os.path.abspath(get_output_dir())]) args.extend(['-Goutput_dir='+ os.path.abspath(get_output_dir())]) diff --git a/tizen_src/build/gyp_chromiumefl.sh b/tizen_src/build/gyp_chromiumefl.sh index 7707859..5d0157b 100755 --- a/tizen_src/build/gyp_chromiumefl.sh +++ b/tizen_src/build/gyp_chromiumefl.sh @@ -60,19 +60,16 @@ COMMON_GYP_PARAMETERS=" -Duse_gnome_keyring=0 -Duse_openssl=1 -Duse_openssl_certs=1 - -Dtoolkit_uses_gtk=0 -Dtizen_multimedia_support=1 + -Denable_plugins=0 + -Duse_allocator=none " -if [[ $BUILD_CONTENT_SHELL == 1 ]]; then - COMMON_GYP_PARAMETERS+="-Dchromium_efl_library_type=static_library" -fi add_desktop_flags() { ADDITIONAL_GYP_PARAMETERS+="-Dbuilding_for_tizen=0 -Dbuilding_for_tizen_mobile=0 -Dbuilding_for_tizen_tv=0 -Dclang=${USE_CLANG} - -Dmake_clang_dir=${CLANG_DIR} -Dtizen_multimedia_use_capi_for_me=0 -Dwerror= -Ddisable_fatal_linker_warnings= @@ -118,7 +115,6 @@ add_gbs_flags() { ADDITIONAL_GYP_PARAMETERS+="-Dtarget_arch=$host_arch -Dhost_arch=$host_arch -Dsysroot= - -Duse_allocator=tcmalloc --no-parallel " # TODO(b.kelemen): ideally crosscompile should also support system libs. @@ -177,13 +173,20 @@ else fi fi -set -x -${TOPDIR}/build/gyp_chromiumefl \ - $COMMON_GYP_PARAMETERS \ - $SYSTEM_DEPS \ - $ADDITIONAL_GYP_PARAMETERS \ - $EXTRA_GYP_ARGS \ - ${TOPDIR}/ewk/chromium-ewk.gyp +_GYP_ARGS=" + $COMMON_GYP_PARAMETERS + $SYSTEM_DEPS + $ADDITIONAL_GYP_PARAMETERS + $EXTRA_GYP_ARGS + " +printf "GYP_ARGUMENTS:\n" +for arg in $_GYP_ARGS; do + printf " * ${arg##-D}\n" +done + +${TOPDIR}/tizen_src/build/gyp_chromiumefl \ + ${_GYP_ARGS} \ + ${TOPDIR}/tizen_src/ewk/chromium-ewk.gyp ret=$? 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 index 1bbb0cb..2576655 100644 --- 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 @@ -22,6 +22,7 @@ #include "base/strings/string_number_conversions.h" #include "base/logging.h" #include "base/strings/utf_string_conversions.h" +#include "content/common/view_messages.h" #include "content/browser/gpu/browser_gpu_channel_host_factory.h" #include "content/browser/gpu/compositor_util.h" #include "content/browser/renderer_host/render_widget_host_impl.h" 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 index 2962de8..0d3aed0 100644 --- 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 @@ -26,7 +26,6 @@ #include "content/browser/accessibility/browser_accessibility_manager.h" #include "content/browser/compositor/image_transport_factory.h" #include "content/browser/compositor/owned_mailbox.h" -#include "content/common/view_messages.h" #include "gpu/command_buffer/common/mailbox.h" #include "ui/base/ime/composition_text.h" #include "ui/base/ime/text_input_client.h" @@ -42,11 +41,17 @@ typedef char GLchar; #endif +struct ViewHostMsg_TextInputState_Params; + namespace ui { class GestureEvent; class TouchEvent; } +namespace blink { +struct WebScreenInfo; +} + namespace content { class DisambiguationPopupEfl; diff --git a/tizen_src/impl/browser/tracing/tracing_controller_efl.cc b/tizen_src/chromium_impl/content/browser/tracing/tracing_controller_efl.cc similarity index 97% rename from tizen_src/impl/browser/tracing/tracing_controller_efl.cc rename to tizen_src/chromium_impl/content/browser/tracing/tracing_controller_efl.cc index bb21aae..8c602b0 100644 --- a/tizen_src/impl/browser/tracing/tracing_controller_efl.cc +++ b/tizen_src/chromium_impl/content/browser/tracing/tracing_controller_efl.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/tracing/tracing_controller_efl.h" +#include "content/browser/tracing/tracing_controller_efl.h" #include "base/debug/trace_event.h" #include "base/debug/trace_event_impl.h" diff --git a/tizen_src/impl/browser/tracing/tracing_controller_efl.h b/tizen_src/chromium_impl/content/browser/tracing/tracing_controller_efl.h similarity index 100% rename from tizen_src/impl/browser/tracing/tracing_controller_efl.h rename to tizen_src/chromium_impl/content/browser/tracing/tracing_controller_efl.h diff --git a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc index a57c95e..455a7c8 100644 --- a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc +++ b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.cc @@ -65,8 +65,7 @@ WebContentsImpl* WebContentsImpl::CreateWithOpener( TRACE_EVENT0("browser", "WebContentsImpl::CreateWithOpener"); // XXX: Compared to original this one creates WebContentsImplEfl WebContentsImpl* new_contents = new WebContentsImplEfl( - params.browser_context, opener, - static_cast(params.ewk_view)); + params.browser_context, opener, params.ewk_view); new_contents->Init(params); return new_contents; @@ -77,8 +76,7 @@ WebContents* WebContents::CreateWithSessionStorage( const SessionStorageNamespaceMap& session_storage_namespace_map) { // XXX: Compared to original this one creates WebContentsImplEfl WebContentsImpl* new_contents = new WebContentsImplEfl( - params.browser_context, NULL, - static_cast(params.ewk_view)); + params.browser_context, NULL, params.ewk_view); for (SessionStorageNamespaceMap::const_iterator it = session_storage_namespace_map.begin(); @@ -94,9 +92,9 @@ WebContents* WebContents::CreateWithSessionStorage( WebContentsImplEfl::WebContentsImplEfl(BrowserContext* browser_context, WebContentsImpl* opener, - EWebView* ewk_view) + void* platform_data) : WebContentsImpl(browser_context, opener) - , ewk_view_(ewk_view) { + , platform_data_(platform_data) { } void WebContentsImplEfl::CreateNewWindow( @@ -223,7 +221,7 @@ WebContents* WebContentsImplEfl::HandleNewWebContentsCreate( int main_frame_route_id, const ViewHostMsg_CreateWindow_Params& params, SessionStorageNamespace* session_storage_namespace, - void* ewk_view) { + void* platform_data) { bool is_guest = BrowserPluginGuest::IsGuest(this); scoped_refptr site_instance = params.opener_suppressed && !is_guest ? @@ -241,7 +239,7 @@ WebContents* WebContentsImplEfl::HandleNewWebContentsCreate( create_params.main_frame_routing_id = main_frame_route_id; create_params.opener = this; create_params.opener_suppressed = params.opener_suppressed; - create_params.ewk_view = ewk_view; + create_params.ewk_view = platform_data; if (params.disposition == NEW_BACKGROUND_TAB) create_params.initially_hidden = true; @@ -261,7 +259,7 @@ WebContents* WebContentsImplEfl::HandleNewWebContentsCreate( new_contents->RenderViewCreated(new_contents->GetRenderViewHost()); // Added for EFL port - new_contents->SetEWebView(ewk_view); + new_contents->SetPlatformData(platform_data); // Added for EFL port // Save the window for later if we're not suppressing the opener (since it diff --git a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.h b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.h index eb33df5..97e97a2 100644 --- a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.h +++ b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_impl_efl.h @@ -7,8 +7,6 @@ #include "content/browser/web_contents/web_contents_impl.h" -typedef void EWebView; - namespace content { class WebContentsImplEfl : public WebContentsImpl { @@ -20,8 +18,8 @@ class WebContentsImplEfl : public WebContentsImpl { const ViewHostMsg_CreateWindow_Params& params, SessionStorageNamespace* session_storage_namespace) override; - EWebView* GetEWebView() const { return ewk_view_; }; - void SetEWebView(EWebView* view) { ewk_view_ = view; }; + void* GetPlatformData() const { return platform_data_; }; + void SetPlatformData(void* data) { platform_data_ = data; }; private: // Needed to access private WebContentsImplEfl constructor from @@ -32,7 +30,7 @@ class WebContentsImplEfl : public WebContentsImpl { // See WebContents::Create for a description of these parameters. WebContentsImplEfl(BrowserContext* browser_context, WebContentsImpl* opener, - EWebView* ewk_view); + void* ewk_view); void CancelWindowRequest( int render_process_id, @@ -55,7 +53,7 @@ class WebContentsImplEfl : public WebContentsImpl { SessionStorageNamespace* session_storage_namespace, void* ewk_view); - EWebView* ewk_view_; + void* platform_data_; DISALLOW_COPY_AND_ASSIGN(WebContentsImplEfl); }; 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 index 58cfe41..9902567 100644 --- 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 @@ -11,6 +11,7 @@ #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/common/view_messages.h" #include "content/public/browser/screen_orientation_dispatcher_host.h" #include "content/public/browser/web_contents_view_delegate.h" #include "content/public/browser/interstitial_page.h" diff --git a/tizen_src/chromium_impl/content/common/message_generator_efl.h b/tizen_src/chromium_impl/content/common/message_generator_efl.h index 3a03df0..5ad3f81 100644 --- a/tizen_src/chromium_impl/content/common/message_generator_efl.h +++ b/tizen_src/chromium_impl/content/common/message_generator_efl.h @@ -6,9 +6,6 @@ // efl message generator #include "content/common/render_messages_efl.h" -#if !defined(EWK_BRINGUP) -#include "components/editing/content/common/editing_messages.h" -#endif #if defined(OS_TIZEN_MOBILE) #include "content/common/tts_messages_efl.h" #endif diff --git a/tizen_src/chromium_impl/content/common/paths_efl.cc b/tizen_src/chromium_impl/content/common/paths_efl.cc index fda04a7..0521180 100644 --- a/tizen_src/chromium_impl/content/common/paths_efl.cc +++ b/tizen_src/chromium_impl/content/common/paths_efl.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/common/paths_efl.h" +#include "paths_efl.h" #include @@ -18,15 +18,20 @@ #endif namespace { -#if defined(OS_TIZEN) const base::FilePath::CharType kDataPath[] = FILE_PATH_LITERAL(DATA_DIR); const base::FilePath::CharType kExePath[] = FILE_PATH_LITERAL(EXE_DIR); const base::FilePath::CharType kLocalePath[] = FILE_PATH_LITERAL(LOCALE_DIR); +#if defined(OS_TIZEN) const base::FilePath::CharType kEdjeThemesDir[] = FILE_PATH_LITERAL("themes"); const base::FilePath::CharType kApplicationDataDir[] = FILE_PATH_LITERAL("data"); const base::FilePath::CharType kApplicationCacheDir[] = FILE_PATH_LITERAL("cache"); +const base::FilePath::CharType kDownloadsDir[] = FILE_PATH_LITERAL("/opt/usr/media/Downloads/"); +const base::FilePath::CharType kImagesDir[] = FILE_PATH_LITERAL("/opt/usr/media/Images/"); #else const base::FilePath::CharType kEdjeThemesDir[] = FILE_PATH_LITERAL("resources"); +const base::FilePath::CharType kLocaleDir[] = FILE_PATH_LITERAL("locale"); +const base::FilePath::CharType kDownloadsDir[] = FILE_PATH_LITERAL("/tmp/"); +const base::FilePath::CharType kImagesDir[] = FILE_PATH_LITERAL("/tmp/"); #endif const base::FilePath::CharType kApplicationName[] = FILE_PATH_LITERAL("chromium-efl"); const base::FilePath::CharType kApplicationDataBaseDir[] = FILE_PATH_LITERAL("db"); @@ -150,11 +155,21 @@ bool PathProvider(int key, base::FilePath* result) { *result = base::FilePath(kDataPath).Append(kEdjeThemesDir); return true; #else + case DIR_LOCALE: + PathService::Get(base::DIR_MODULE, result); + *result = result->Append(kLocaleDir); + return true; case EDJE_RESOURCE_DIR: PathService::Get(base::DIR_MODULE, result); *result = result->Append(kEdjeThemesDir); return true; #endif + case DIR_DOWNLOADS: + *result = base::FilePath(kDownloadsDir); + return true; + case DIR_DOWNLOAD_IMAGE: + *result = base::FilePath(kImagesDir); + return true; case DIR_USER_DATA: GetDirUserData(cur); break; diff --git a/tizen_src/chromium_impl/content/common/paths_efl.h b/tizen_src/chromium_impl/content/common/paths_efl.h index 25b705b..9661a61 100644 --- a/tizen_src/chromium_impl/content/common/paths_efl.h +++ b/tizen_src/chromium_impl/content/common/paths_efl.h @@ -15,6 +15,8 @@ enum { WEB_DATABASE_DIR, DIR_USER_DATA, DIR_DATA_PATH, + DIR_DOWNLOADS, + DIR_DOWNLOAD_IMAGE, DIR_LOCALE, PATH_END }; diff --git a/tizen_src/chromium_impl/content/common/render_messages_efl.h b/tizen_src/chromium_impl/content/common/render_messages_efl.h index 0de8633..bb91fe8 100644 --- a/tizen_src/chromium_impl/content/common/render_messages_efl.h +++ b/tizen_src/chromium_impl/content/common/render_messages_efl.h @@ -7,40 +7,14 @@ #include "base/values.h" #include "ipc/ipc_message_macros.h" #include "ipc/ipc_channel_handle.h" -#include "content/common/cache_params_efl.h" -#include "content/common/navigation_policy_params.h" #include "content/public/common/common_param_traits.h" -#include "content/public/common/referrer.h" -#include "content/renderer/print_pages_params.h" #include "ui/gfx/ipc/gfx_param_traits.h" -#if !defined(EWK_BRINGUP) -#include "API/ewk_hit_test_private.h" -#include "API/ewk_text_style_private.h" -#endif // !EWK_BRINGUP -#include "third_party/WebKit/public/web/WebNavigationPolicy.h" -#include "third_party/WebKit/public/web/WebNavigationType.h" -#include "third_party/WebKit/public/web/WebViewModeEnums.h" -#include "ui/gfx/ipc/gfx_param_traits.h" -#include "url/gurl.h" - -#if !defined(EWK_BRINGUP) -#include "tizen_webview/public/tw_content_security_policy.h" -#include "tizen_webview/public/tw_error.h" -#include "tizen_webview/public/tw_hit_test.h" -#include "tizen_webview/public/tw_settings.h" -#include "tizen_webview/public/tw_wrt.h" -#endif // !EWK_BRINGUP - -#include -#include #if defined(TIZEN_MULTIMEDIA_SUPPORT) #include "base/file_descriptor_posix.h" #include "base/memory/shared_memory.h" #endif -typedef std::map StringMap; - //----------------------------------------------------------------------------- // RenderView messages // These are messages sent from the browser to the renderer process. @@ -51,300 +25,6 @@ typedef std::map StringMap; // but actual messages are different so they shouldn't mess with chrome messages #define IPC_MESSAGE_START ChromeMsgStart -IPC_STRUCT_TRAITS_BEGIN(CacheParamsEfl) - IPC_STRUCT_TRAITS_MEMBER(cache_total_capacity) - IPC_STRUCT_TRAITS_MEMBER(cache_min_dead_capacity) - IPC_STRUCT_TRAITS_MEMBER(cache_max_dead_capacity) -IPC_STRUCT_TRAITS_END() - -#if !defined(EWK_BRINGUP) -IPC_ENUM_TRAITS(tizen_webview::ContentSecurityPolicyType) -#endif - -IPC_ENUM_TRAITS(blink::WebNavigationPolicy) -IPC_ENUM_TRAITS(blink::WebNavigationType) - -IPC_STRUCT_TRAITS_BEGIN(content::NavigationPolicyParams) - IPC_STRUCT_TRAITS_MEMBER(render_view_id) - IPC_STRUCT_TRAITS_MEMBER(cookie) - IPC_STRUCT_TRAITS_MEMBER(url) - IPC_STRUCT_TRAITS_MEMBER(httpMethod) - IPC_STRUCT_TRAITS_MEMBER(referrer) - IPC_STRUCT_TRAITS_MEMBER(policy) - IPC_STRUCT_TRAITS_MEMBER(type) - IPC_STRUCT_TRAITS_MEMBER(should_replace_current_entry) - IPC_STRUCT_TRAITS_MEMBER(is_main_frame) - IPC_STRUCT_TRAITS_MEMBER(is_redirect) -IPC_STRUCT_TRAITS_END() - -#if !defined(EWK_BRINGUP) -IPC_STRUCT_TRAITS_BEGIN(SelectionColor) - IPC_STRUCT_TRAITS_MEMBER(r) - IPC_STRUCT_TRAITS_MEMBER(g) - IPC_STRUCT_TRAITS_MEMBER(b) - IPC_STRUCT_TRAITS_MEMBER(a) -IPC_STRUCT_TRAITS_END() - -IPC_STRUCT_TRAITS_BEGIN(SelectionStylePrams) - IPC_STRUCT_TRAITS_MEMBER(underline_state) - IPC_STRUCT_TRAITS_MEMBER(italic_state) - IPC_STRUCT_TRAITS_MEMBER(bold_state) - IPC_STRUCT_TRAITS_MEMBER(bg_color) - IPC_STRUCT_TRAITS_MEMBER(color) - IPC_STRUCT_TRAITS_MEMBER(font_size) - IPC_STRUCT_TRAITS_MEMBER(order_list_state) - IPC_STRUCT_TRAITS_MEMBER(un_order_list_state) - IPC_STRUCT_TRAITS_MEMBER(text_align_center_state) - IPC_STRUCT_TRAITS_MEMBER(text_align_left_state) - IPC_STRUCT_TRAITS_MEMBER(text_align_right_state) - IPC_STRUCT_TRAITS_MEMBER(text_align_full_state) - IPC_STRUCT_TRAITS_MEMBER(has_composition) -IPC_STRUCT_TRAITS_END() - -IPC_ENUM_TRAITS(tizen_webview::Hit_Test_Mode) -IPC_ENUM_TRAITS(tizen_webview::Hit_Test_Result_Context) - -IPC_STRUCT_TRAITS_BEGIN(_Ewk_Hit_Test::Hit_Test_Node_Data) - IPC_STRUCT_TRAITS_MEMBER(tagName) - IPC_STRUCT_TRAITS_MEMBER(nodeValue) -IPC_STRUCT_TRAITS_END() - -IPC_STRUCT_TRAITS_BEGIN(_Ewk_Hit_Test::Hit_Test_Image_Buffer) - IPC_STRUCT_TRAITS_MEMBER(fileNameExtension) - IPC_STRUCT_TRAITS_MEMBER(imageBitmap) -IPC_STRUCT_TRAITS_END() - -IPC_STRUCT_TRAITS_BEGIN(_Ewk_Hit_Test) - IPC_STRUCT_TRAITS_MEMBER(context) - IPC_STRUCT_TRAITS_MEMBER(linkURI) - IPC_STRUCT_TRAITS_MEMBER(linkLabel) - IPC_STRUCT_TRAITS_MEMBER(linkTitle) - IPC_STRUCT_TRAITS_MEMBER(imageURI) - IPC_STRUCT_TRAITS_MEMBER(mediaURI) - IPC_STRUCT_TRAITS_MEMBER(isEditable) - IPC_STRUCT_TRAITS_MEMBER(mode) - IPC_STRUCT_TRAITS_MEMBER(nodeData) -// XXX: find a better way to prevent the crash when copying SkBitmap -#if !defined(EWK_BRINGUP) - IPC_STRUCT_TRAITS_MEMBER(imageData) -#endif -IPC_STRUCT_TRAITS_END() -#endif - -IPC_STRUCT_TRAITS_BEGIN(content::DidPrintPagesParams) - IPC_STRUCT_TRAITS_MEMBER(metafile_data_handle) - IPC_STRUCT_TRAITS_MEMBER(data_size) - IPC_STRUCT_TRAITS_MEMBER(document_cookie) - IPC_STRUCT_TRAITS_MEMBER(filename) -IPC_STRUCT_TRAITS_END() - -#if !defined(EWK_BRINGUP) -IPC_STRUCT_TRAITS_BEGIN(tizen_webview::WrtIpcMessageData) - IPC_STRUCT_TRAITS_MEMBER(type) - IPC_STRUCT_TRAITS_MEMBER(value) - IPC_STRUCT_TRAITS_MEMBER(id) - IPC_STRUCT_TRAITS_MEMBER(reference_id) -IPC_STRUCT_TRAITS_END() -#endif - -IPC_ENUM_TRAITS(blink::WebViewMode) - -#if !defined(EWK_BRINGUP) -IPC_STRUCT_TRAITS_BEGIN(tizen_webview::Settings) - IPC_STRUCT_TRAITS_MEMBER(javascript_can_open_windows) -IPC_STRUCT_TRAITS_END() - -IPC_STRUCT_TRAITS_BEGIN(tizen_webview::Error) - IPC_STRUCT_TRAITS_MEMBER(url) - IPC_STRUCT_TRAITS_MEMBER(is_main_frame) - IPC_STRUCT_TRAITS_MEMBER(code) - IPC_STRUCT_TRAITS_MEMBER(description) - IPC_STRUCT_TRAITS_MEMBER(domain) -IPC_STRUCT_TRAITS_END() -#endif - -// Tells the renderer to clear the cache. -IPC_MESSAGE_CONTROL0(EflViewMsg_ClearCache) -IPC_MESSAGE_ROUTED0(EwkViewMsg_UseSettingsFont) -IPC_MESSAGE_ROUTED0(EwkViewMsg_SetBrowserFont) -IPC_MESSAGE_ROUTED0(EwkViewMsg_SuspendScheduledTask) -IPC_MESSAGE_ROUTED0(EwkViewMsg_ResumeScheduledTasks) -IPC_MESSAGE_CONTROL1(EflViewMsg_SetCache, - CacheParamsEfl) - -// Tells the renderer to dump as much memory as it can, perhaps because we -// have memory pressure or the renderer is (or will be) paged out. This -// should only result in purging objects we can recalculate, e.g. caches or -// JS garbage, not in purging irreplaceable objects. -IPC_MESSAGE_CONTROL0(EwkViewMsg_PurgeMemory) - -IPC_MESSAGE_CONTROL4(WrtMsg_SetWidgetInfo, - int, // result: widgetHandle - double, // result: scale - std::string, // result: theme - std::string) // result: encodedBundle - -IPC_MESSAGE_CONTROL2(WrtMsg_ParseUrl, - int, // result: request_id - GURL) // result: url - -IPC_MESSAGE_CONTROL2(WrtMsg_ParseUrlResponse, - int, // result: request_id - GURL) // result: url - -#if !defined(EWK_BRINGUP) -IPC_MESSAGE_CONTROL1(WrtMsg_SendWrtMessage, - tizen_webview::WrtIpcMessageData /* data */); -#endif - -IPC_MESSAGE_ROUTED0(EwkViewMsg_GetSelectionStyle) - -#if !defined(EWK_BRINGUP) -IPC_MESSAGE_ROUTED2(EwkViewMsg_SetCSP, - std::string, /* policy */ - tizen_webview::ContentSecurityPolicyType /* header type */) -#endif - -IPC_MESSAGE_ROUTED2(EwkViewMsg_SetScroll, - int, /* horizontal position */ - int /* vertical position */) - -#if !defined(EWK_BRINGUP) -IPC_MESSAGE_ROUTED3(EwkViewMsg_DoHitTest, - int, /* horizontal position */ - int, /* vertical position */ - tizen_webview::Hit_Test_Mode /* mode */) - -IPC_MESSAGE_ROUTED4(EwkViewMsg_DoHitTestAsync, - int, /* horizontal position */ - int, /* vertical position */ - tizen_webview::Hit_Test_Mode, /* mode */ - int64_t /* request id */) - -IPC_MESSAGE_ROUTED1(EwkViewMsg_DidFailLoadWithError, - tizen_webview::Error /* error */) -#endif - -IPC_MESSAGE_ROUTED3(EwkViewMsg_PrintToPdf, - int, /* width */ - int, /* height */ - base::FilePath /* file name to save pdf*/) - -#if !defined(EWK_BRINGUP) -IPC_MESSAGE_ROUTED1(EflViewMsg_UpdateSettings, tizen_webview::Settings) -#endif - -// from renderer to browser - -IPC_MESSAGE_ROUTED1(EwkHostMsg_DidPrintPagesToPdf, - content::DidPrintPagesParams /* pdf document parameters */) - -IPC_SYNC_MESSAGE_CONTROL1_1(EwkHostMsg_DecideNavigationPolicy, - content::NavigationPolicyParams, - bool /*handled*/) - -#if !defined(EWK_BRINGUP) -IPC_SYNC_MESSAGE_ROUTED0_2(EwkHostMsg_GetContentSecurityPolicy, - std::string, /* policy */ - tizen_webview::ContentSecurityPolicyType /* header type */) - -IPC_SYNC_MESSAGE_ROUTED1_1(EwkHostMsg_WrtSyncMessage, - tizen_webview::WrtIpcMessageData /* data */, - std::string /*result*/); -#endif - -IPC_MESSAGE_ROUTED3(EwkViewMsg_Scale, - double, /* scale factor */ - int, /* center x */ - int /* center y */) - -IPC_MESSAGE_ROUTED1(EwkViewMsg_PlainTextGet, - int /* callback id */) - -IPC_MESSAGE_ROUTED2(EwkHostMsg_PlainTextGetContents, - std::string, /* contentText */ - int /* callback id */) - -#if !defined(EWK_BRINGUP) -IPC_MESSAGE_ROUTED1(EwkHostMsg_WrtMessage, - tizen_webview::WrtIpcMessageData /* data */); -#endif - -IPC_MESSAGE_ROUTED2(EwkHostMsg_DidChangeContentsSize, - int, /* width */ - int /* height */) - -#if !defined(EWK_BRINGUP) -IPC_MESSAGE_ROUTED1(EwkViewMsg_SelectionTextStyleState, - SelectionStylePrams /* params */) -#endif - -IPC_MESSAGE_ROUTED2(EwkHostMsg_DidChangeMaxScrollOffset, - int, /*max scrollX*/ - int /*max scrollY*/) - -IPC_MESSAGE_ROUTED2(EwkHostMsg_DidChangeScrollOffset, - int, /*scrollX*/ - int /*scrollY*/) - -#if !defined(EWK_BRINGUP) -IPC_MESSAGE_CONTROL3(EwkViewHostMsg_HitTestReply, - int, /* render_view_id */ - _Ewk_Hit_Test, /* Ewk Hit test data without node map */ - NodeAttributesMap /* node attributes */) - -IPC_MESSAGE_CONTROL4(EwkViewHostMsg_HitTestAsyncReply, - int, /* render_view_id */ - _Ewk_Hit_Test, /* Ewk Hit test data without node map */ - NodeAttributesMap, /* node attributes */ - int64_t /* request id */) -#endif - -IPC_MESSAGE_ROUTED1(EwkViewMsg_GetMHTMLData, - int /* callback id */) - -IPC_MESSAGE_ROUTED2(EwkHostMsg_ReadMHTMLData, - std::string, /* Mhtml text */ - int /* callback id */) - -IPC_MESSAGE_ROUTED1(EwkHostMsg_DidChangePageScaleFactor, - double /* page scale factor */) - -IPC_MESSAGE_ROUTED2(EwkHostMsg_DidChangePageScaleRange, - double, /* minimum page scale factor */ - double /* maximum page scale factor */) - -IPC_MESSAGE_ROUTED1(EwkViewMsg_SetDrawsTransparentBackground, - bool /* enabled */) - -// Notifies the browser to form submit -IPC_MESSAGE_ROUTED1(EwkHostMsg_FormSubmit, GURL) - -IPC_MESSAGE_ROUTED1(EwkViewMsg_WebAppIconUrlGet, - int /* callback id */) - -IPC_MESSAGE_ROUTED2(EwkHostMsg_WebAppIconUrlGet, - std::string, /* icon url */ - int /* callback id */) - -IPC_MESSAGE_ROUTED1(EwkViewMsg_WebAppIconUrlsGet, - int /* callback id */) - -IPC_MESSAGE_ROUTED2(EwkHostMsg_WebAppIconUrlsGet, - StringMap, /* icon urls */ - int /* callback id */) - -IPC_MESSAGE_ROUTED1(EwkViewMsg_WebAppCapableGet, - int /* calback id */) - -IPC_MESSAGE_ROUTED2(EwkHostMsg_WebAppCapableGet, - bool, /* capable */ - int /* calback id */) - -// Used to set view mode. -IPC_MESSAGE_ROUTED1(ViewMsg_SetViewMode, - blink::WebViewMode /* view_mode */) - #if defined(TIZEN_MULTIMEDIA_SUPPORT) // This message runs the GStreamer for decoding audio for webaudio. IPC_MESSAGE_CONTROL3(EflViewHostMsg_GstWebAudioDecode, diff --git a/tizen_src/chromium_impl/content/content_efl.gypi b/tizen_src/chromium_impl/content/content_efl.gypi index d2918fb..fd3f1da 100644 --- a/tizen_src/chromium_impl/content/content_efl.gypi +++ b/tizen_src/chromium_impl/content/content_efl.gypi @@ -50,9 +50,6 @@ 'LOCALE_DIR="<(locale_dir)"', ], 'sources': [ - 'common/cache_params_efl.h', - 'common/navigation_policy_params.cc', - 'common/navigation_policy_params.h', 'common/message_generator_efl.cc', 'common/message_generator_efl.h', 'common/paths_efl.h', @@ -105,6 +102,8 @@ 'browser/web_contents/web_contents_impl_efl.cc', 'browser/web_contents/web_drag_dest_efl.h', 'browser/web_contents/web_drag_dest_efl.cc', + 'browser/tracing/tracing_controller_efl.h', + 'browser/tracing/tracing_controller_efl.cc', 'browser/renderer_host/disambiguation_popup_efl.h', 'browser/renderer_host/disambiguation_popup_efl.cc', 'browser/renderer_host/native_web_keyboard_event_efl.cc', @@ -145,8 +144,6 @@ ['_target_name=="content_renderer"', { 'sources': [ - 'renderer/print_pages_params.h', - 'renderer/print_pages_params.cc', '<(DEPTH)/content/renderer/external_popup_menu.cc', '<(DEPTH)/content/renderer/external_popup_menu.h', ], diff --git a/tizen_src/chromium_impl/ui/ui_efl.gypi b/tizen_src/chromium_impl/ui/ui_efl.gypi index 19f9820..a32b037 100644 --- a/tizen_src/chromium_impl/ui/ui_efl.gypi +++ b/tizen_src/chromium_impl/ui/ui_efl.gypi @@ -6,6 +6,7 @@ 'variables': { 'external_ui_base_deps': [ '<(DEPTH)/tizen_src/build/system.gyp:elementary', + '<(DEPTH)/tizen_src/chromium_impl/ui/ui_targets_efl.gyp:ui_base_inject', ], 'external_ui_gl_deps': [ '<(DEPTH)/tizen_src/build/system.gyp:evas', @@ -66,6 +67,11 @@ ['_target_name=="ui_base"', { 'sources': [ + '<(DEPTH)/ui/base/cursor/cursor.h', + '<(DEPTH)/ui/base/cursor/cursor.cc', + '<(DEPTH)/ui/base/cursor/cursor_x11.cc', + '<(DEPTH)/ui/base/cursor/cursor_loader_x11.h', + '<(DEPTH)/ui/base/cursor/cursor_loader_x11.cc', '<(DEPTH)/ui/base/nine_image_painter_factory.cc', '<(DEPTH)/ui/base/nine_image_painter_factory.h', 'base/resource/resource_bundle_efl.cc', diff --git a/tizen_src/chromium_impl/ui/ui_targets_efl.gyp b/tizen_src/chromium_impl/ui/ui_targets_efl.gyp index 4e936ae..1aec56e 100644 --- a/tizen_src/chromium_impl/ui/ui_targets_efl.gyp +++ b/tizen_src/chromium_impl/ui/ui_targets_efl.gyp @@ -31,6 +31,17 @@ 'dependencies': [ '<(DEPTH)/skia/skia.gyp:skia', ] + }, + { + 'target_name': 'ui_base_inject', + 'type': 'static_library', + 'sources': [ + '<(DEPTH)/ui/base/cursor/cursors_aura.h', + '<(DEPTH)/ui/base/cursor/cursors_aura.cc', + ], + 'dependencies': [ + '<(DEPTH)/skia/skia.gyp:skia', + ] } ], } diff --git a/tizen_src/ewk/chromium-ewk.gyp b/tizen_src/ewk/chromium-ewk.gyp index 806a0d5..b1b3183 100644 --- a/tizen_src/ewk/chromium-ewk.gyp +++ b/tizen_src/ewk/chromium-ewk.gyp @@ -1,266 +1,27 @@ +# 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. + { - 'target_defaults': { - 'link_settings': { - 'ldflags': [ - '-Wl,--no-undefined', - ], - }, - 'dependencies': [ - '<(efl_impl_dir)/chromium-efl-deps.gyp:efl', - ], - 'conditions': [ - ['building_for_tizen==1', { - 'dependencies': [ - '<(efl_impl_dir)/chromium-efl-deps.gyp:tizen', - ], - }], - ['custom_libc_dir!=""', { - 'ldflags': [ - # We want to statically link libstdc++/libgcc_s. - '-static-libstdc++', - '-static-libgcc', - '-Wl,-rpath,<(custom_libc_dir)', - '-Wl,--dynamic-linker=<(custom_libc_dir)/ld-linux.so.3', - ], - }], - ]}, + # This file should contain contain gyp code that is supposed to be common + # for all build targets we have in chromium-ewk. Thigs specific only to one + # component should go to appropriate gypi file included below. + 'variables': { + 'ewk_bringup%': 1, + }, 'includes': [ 'unittest/ewk-tests.gypi', 'ubrowser/ubrowser.gypi', + 'efl_webview_app/efl_webview_app.gypi', + 'efl_integration/efl_integration.gypi' ], - 'targets': [{ - 'target_name': 'chromium-ewk', - 'type': 'shared_library', - 'include_dirs': [ - '<(efl_impl_dir)', - 'efl_integration', - 'efl_integration/public', - ], - - 'dependencies': [ - '<(efl_impl_dir)/chromium-efl.gyp:chromium-efl', - '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources', - ], - - 'sources': [ - 'efl_integration/public/ewk_application_cache_manager.cc', - 'efl_integration/public/ewk_application_cache_manager.h', - 'efl_integration/public/ewk_auth_challenge.cc', - 'efl_integration/public/ewk_auth_challenge.h', - 'efl_integration/public/ewk_auth_request.cc', - 'efl_integration/public/ewk_auth_request.h', - 'efl_integration/public/ewk_autofill_profile.cc', - 'efl_integration/public/ewk_autofill_profile.h', - 'efl_integration/public/ewk_back_forward_list.cc', - 'efl_integration/public/ewk_back_forward_list.h', - 'efl_integration/public/ewk_back_forward_list_item.cc', - 'efl_integration/public/ewk_back_forward_list_item.h', - 'efl_integration/public/ewk_certificate.cc', - 'efl_integration/public/ewk_certificate.h', - 'efl_integration/public/ewk_console_message.cc', - 'efl_integration/public/ewk_console_message.h', - 'efl_integration/public/ewk_content_screening_detection.cc', - 'efl_integration/public/ewk_content_screening_detection.h', - 'efl_integration/public/ewk_context.cc', - 'efl_integration/public/ewk_context.h', - 'efl_integration/public/ewk_context_menu.cc', - 'efl_integration/public/ewk_context_menu.h', - 'efl_integration/public/ewk_cookie_manager.cc', - 'efl_integration/public/ewk_cookie_manager.h', - 'efl_integration/public/ewk_custom_handlers.cc', - 'efl_integration/public/ewk_custom_handlers.h', - 'efl_integration/public/ewk_dispatcher.cc', - 'efl_integration/public/ewk_dispatcher.h', - 'efl_integration/public/ewk_error.cc', - 'efl_integration/public/ewk_error.h', - 'efl_integration/public/ewk_favicon_database.cc', - 'efl_integration/public/ewk_favicon_database.h', - 'efl_integration/public/ewk_frame.cc', - 'efl_integration/public/ewk_frame.h', - 'efl_integration/public/ewk_geolocation.cc', - 'efl_integration/public/ewk_geolocation.h', - 'efl_integration/public/ewk_history.cc', - 'efl_integration/public/ewk_history.h', - 'efl_integration/public/ewk_hit_test.cc', - 'efl_integration/public/ewk_hit_test.h', - 'efl_integration/public/ewk_intercept_request.cc', - 'efl_integration/public/ewk_intercept_request.h', - 'efl_integration/public/ewk_ipc_message.cc', - 'efl_integration/public/ewk_ipc_message.h', - 'efl_integration/public/ewk_main.cc', - 'efl_integration/public/ewk_main.h', - 'efl_integration/public/ewk_notification.cc', - 'efl_integration/public/ewk_notification.h', - 'efl_integration/public/ewk_object.cc', - 'efl_integration/public/ewk_object.h', - 'efl_integration/public/ewk_page_group.cc', - 'efl_integration/public/ewk_page_group.h', - 'efl_integration/public/ewk_policy_decision.cc', - 'efl_integration/public/ewk_policy_decision.h', - 'efl_integration/public/ewk_popup_menu_item.cc', - 'efl_integration/public/ewk_popup_menu_item.h', - 'efl_integration/public/ewk_quota_permission_request.cc', - 'efl_integration/public/ewk_quota_permission_request.h', - 'efl_integration/public/ewk_security_origin.cc', - 'efl_integration/public/ewk_security_origin.h', - 'efl_integration/public/ewk_settings.cc', - 'efl_integration/public/ewk_settings.h', - 'efl_integration/public/ewk_storage_manager.cc', - 'efl_integration/public/ewk_storage_manager.h', - 'efl_integration/public/ewk_text_style.cc', - 'efl_integration/public/ewk_text_style.h', - 'efl_integration/public/ewk_tracing.cc', - 'efl_integration/public/ewk_tracing.h', - 'efl_integration/public/ewk_user_media.cc', - 'efl_integration/public/ewk_user_media.h', - 'efl_integration/public/ewk_view.cc', - 'efl_integration/public/ewk_view.h', - 'efl_integration/public/ewk_web_application_icon_data.cc', - 'efl_integration/public/ewk_web_application_icon_data.h', - 'efl_integration/public/ewk_window_features.cc', - 'efl_integration/public/ewk_window_features.h', - 'efl_integration/public/ewk_chromium.h', - 'efl_integration/public/ewk_enums.h', - 'efl_integration/public/ewk_export.h', - 'efl_integration/public/ewk_log.h', - 'efl_integration/public/ewk_touch.h', - - 'efl_integration/private/api_static_check.cc', - 'efl_integration/private/chromium_glue.cc', - 'efl_integration/private/chromium_glue.h', - 'efl_integration/private/ewk_back_forward_list_private.h', - 'efl_integration/private/ewk_back_forward_list_private.cc', - 'efl_integration/private/ewk_context_private.cc', - 'efl_integration/private/ewk_context_private.h', - 'efl_integration/private/ewk_frame_private.h', - 'efl_integration/private/ewk_hit_test_private.h', - 'efl_integration/private/ewk_hit_test_private.cc', - 'efl_integration/private/ewk_main_private.h', - 'efl_integration/private/ewk_main_private.cc', - 'efl_integration/private/ewk_notification_private.h', - 'efl_integration/private/ewk_notification_private.cc', - 'efl_integration/private/ewk_policy_decision_private.cc', - 'efl_integration/private/ewk_policy_decision_private.h', - 'efl_integration/private/ewk_private.h', - 'efl_integration/private/ewk_quota_permission_request_private.h', - 'efl_integration/private/ewk_quota_permission_request_private.cc', - 'efl_integration/private/ewk_security_origin_private.h', - 'efl_integration/private/ewk_security_origin_private.cc', - 'efl_integration/private/ewk_view_private.h', - 'efl_integration/private/ewk_view_private.cc', - 'efl_integration/private/ewk_wrt_private.h', - 'efl_integration/private/ewk_wrt_private.cc', - 'efl_integration/private/ewk_history_private.h', - 'efl_integration/private/ewk_history_private.cc', - 'efl_integration/private/webview_delegate_ewk.h', - 'efl_integration/private/webview_delegate_ewk.cc', - 'efl_integration/private/ewk_favicon_database_private.h', - 'efl_integration/public/text_encoding_map_efl.cc', - 'efl_integration/public/text_encoding_map_efl.h', - ], - 'defines': [ - 'HAVE_ECORE_X= #include -#include "API/ewk_settings_private.h" +#include "private/ewk_settings_private.h" #include "eweb_view.h" #ifdef TIZEN_EDGE_EFFECT diff --git a/tizen_src/impl/EdgeEffect.h b/tizen_src/ewk/efl_integration/EdgeEffect.h similarity index 100% rename from tizen_src/impl/EdgeEffect.h rename to tizen_src/ewk/efl_integration/EdgeEffect.h diff --git a/tizen_src/impl/autofill_popup_view_efl.cc b/tizen_src/ewk/efl_integration/autofill_popup_view_efl.cc similarity index 99% rename from tizen_src/impl/autofill_popup_view_efl.cc rename to tizen_src/ewk/efl_integration/autofill_popup_view_efl.cc index b47c012..5dcbbb2 100644 --- a/tizen_src/impl/autofill_popup_view_efl.cc +++ b/tizen_src/ewk/efl_integration/autofill_popup_view_efl.cc @@ -8,8 +8,8 @@ #include "base/path_service.h" #include "base/files/file_path.h" #include "base/strings/utf_string_conversions.h" +#include "content/common/paths_efl.h" #include "eweb_view.h" -#include "paths_efl.h" #define AUTOFILL_POPUP_LABEL_COUNT 6 // Autofill component send 6 at max #define AUTOFILL_POPUP_LABEL_LEN 100 diff --git a/tizen_src/impl/autofill_popup_view_efl.h b/tizen_src/ewk/efl_integration/autofill_popup_view_efl.h similarity index 100% rename from tizen_src/impl/autofill_popup_view_efl.h rename to tizen_src/ewk/efl_integration/autofill_popup_view_efl.h diff --git a/tizen_src/impl/browser/autofill/autofill_manager_delegate_efl.cc b/tizen_src/ewk/efl_integration/browser/autofill/autofill_manager_delegate_efl.cc similarity index 100% rename from tizen_src/impl/browser/autofill/autofill_manager_delegate_efl.cc rename to tizen_src/ewk/efl_integration/browser/autofill/autofill_manager_delegate_efl.cc diff --git a/tizen_src/impl/browser/autofill/autofill_manager_delegate_efl.h b/tizen_src/ewk/efl_integration/browser/autofill/autofill_manager_delegate_efl.h similarity index 100% rename from tizen_src/impl/browser/autofill/autofill_manager_delegate_efl.h rename to tizen_src/ewk/efl_integration/browser/autofill/autofill_manager_delegate_efl.h diff --git a/tizen_src/impl/browser/autofill/autofill_pref_store_efl.cc b/tizen_src/ewk/efl_integration/browser/autofill/autofill_pref_store_efl.cc similarity index 100% rename from tizen_src/impl/browser/autofill/autofill_pref_store_efl.cc rename to tizen_src/ewk/efl_integration/browser/autofill/autofill_pref_store_efl.cc diff --git a/tizen_src/impl/browser/autofill/autofill_pref_store_efl.h b/tizen_src/ewk/efl_integration/browser/autofill/autofill_pref_store_efl.h similarity index 100% rename from tizen_src/impl/browser/autofill/autofill_pref_store_efl.h rename to tizen_src/ewk/efl_integration/browser/autofill/autofill_pref_store_efl.h diff --git a/tizen_src/impl/browser/autofill/personal_data_manager_factory.cc b/tizen_src/ewk/efl_integration/browser/autofill/personal_data_manager_factory.cc similarity index 100% rename from tizen_src/impl/browser/autofill/personal_data_manager_factory.cc rename to tizen_src/ewk/efl_integration/browser/autofill/personal_data_manager_factory.cc diff --git a/tizen_src/impl/browser/autofill/personal_data_manager_factory.h b/tizen_src/ewk/efl_integration/browser/autofill/personal_data_manager_factory.h similarity index 100% rename from tizen_src/impl/browser/autofill/personal_data_manager_factory.h rename to tizen_src/ewk/efl_integration/browser/autofill/personal_data_manager_factory.h diff --git a/tizen_src/impl/browser/renderer_host/browsing_data_remover_efl.cc b/tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.cc similarity index 99% rename from tizen_src/impl/browser/renderer_host/browsing_data_remover_efl.cc rename to tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.cc index 4105794..f0e5d32 100644 --- a/tizen_src/impl/browser/renderer_host/browsing_data_remover_efl.cc +++ b/tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/renderer_host/browsing_data_remover_efl.h" -#include "common/render_messages_efl.h" +#include "browser/browsing_data_remover_efl.h" #include "base/bind.h" #include "base/logging.h" +#include "content/common/render_messages_efl.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/dom_storage_context.h" diff --git a/tizen_src/impl/browser/renderer_host/browsing_data_remover_efl.h b/tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.h similarity index 100% rename from tizen_src/impl/browser/renderer_host/browsing_data_remover_efl.h rename to tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.h diff --git a/tizen_src/impl/browser/download_manager_delegate_efl.cc b/tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.cc similarity index 100% rename from tizen_src/impl/browser/download_manager_delegate_efl.cc rename to tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.cc diff --git a/tizen_src/impl/browser/download_manager_delegate_efl.h b/tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.h similarity index 100% rename from tizen_src/impl/browser/download_manager_delegate_efl.h rename to tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.h diff --git a/tizen_src/impl/components/editing/content/browser/editor_client_observer.cc b/tizen_src/ewk/efl_integration/browser/editor_client_observer.cc similarity index 98% rename from tizen_src/impl/components/editing/content/browser/editor_client_observer.cc rename to tizen_src/ewk/efl_integration/browser/editor_client_observer.cc index ac1e85f..764f914 100644 --- a/tizen_src/impl/components/editing/content/browser/editor_client_observer.cc +++ b/tizen_src/ewk/efl_integration/browser/editor_client_observer.cc @@ -17,10 +17,9 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_view_host.h" - -#include "eweb_view.h" #include "common/web_contents_utils.h" -#include "components/editing/content/common/editing_messages.h" +#include "common/editing_messages.h" +#include "eweb_view.h" using web_contents_utils::WebViewFromViewId; diff --git a/tizen_src/impl/components/editing/content/browser/editor_client_observer.h b/tizen_src/ewk/efl_integration/browser/editor_client_observer.h similarity index 100% rename from tizen_src/impl/components/editing/content/browser/editor_client_observer.h rename to tizen_src/ewk/efl_integration/browser/editor_client_observer.h diff --git a/tizen_src/impl/browser/favicon/favicon_commands.cc b/tizen_src/ewk/efl_integration/browser/favicon/favicon_commands.cc similarity index 100% rename from tizen_src/impl/browser/favicon/favicon_commands.cc rename to tizen_src/ewk/efl_integration/browser/favicon/favicon_commands.cc diff --git a/tizen_src/impl/browser/favicon/favicon_commands.h b/tizen_src/ewk/efl_integration/browser/favicon/favicon_commands.h similarity index 100% rename from tizen_src/impl/browser/favicon/favicon_commands.h rename to tizen_src/ewk/efl_integration/browser/favicon/favicon_commands.h diff --git a/tizen_src/impl/browser/favicon/favicon_database.cc b/tizen_src/ewk/efl_integration/browser/favicon/favicon_database.cc similarity index 100% rename from tizen_src/impl/browser/favicon/favicon_database.cc rename to tizen_src/ewk/efl_integration/browser/favicon/favicon_database.cc diff --git a/tizen_src/impl/browser/favicon/favicon_database.h b/tizen_src/ewk/efl_integration/browser/favicon/favicon_database.h similarity index 100% rename from tizen_src/impl/browser/favicon/favicon_database.h rename to tizen_src/ewk/efl_integration/browser/favicon/favicon_database.h diff --git a/tizen_src/impl/browser/favicon/favicon_database_p.cc b/tizen_src/ewk/efl_integration/browser/favicon/favicon_database_p.cc similarity index 100% rename from tizen_src/impl/browser/favicon/favicon_database_p.cc rename to tizen_src/ewk/efl_integration/browser/favicon/favicon_database_p.cc diff --git a/tizen_src/impl/browser/favicon/favicon_database_p.h b/tizen_src/ewk/efl_integration/browser/favicon/favicon_database_p.h similarity index 100% rename from tizen_src/impl/browser/favicon/favicon_database_p.h rename to tizen_src/ewk/efl_integration/browser/favicon/favicon_database_p.h diff --git a/tizen_src/impl/browser/favicon/favicon_downloader.cc b/tizen_src/ewk/efl_integration/browser/favicon/favicon_downloader.cc similarity index 100% rename from tizen_src/impl/browser/favicon/favicon_downloader.cc rename to tizen_src/ewk/efl_integration/browser/favicon/favicon_downloader.cc diff --git a/tizen_src/impl/browser/favicon/favicon_downloader.h b/tizen_src/ewk/efl_integration/browser/favicon/favicon_downloader.h similarity index 100% rename from tizen_src/impl/browser/favicon/favicon_downloader.h rename to tizen_src/ewk/efl_integration/browser/favicon/favicon_downloader.h diff --git a/tizen_src/impl/browser/favicon/favicon_service.cc b/tizen_src/ewk/efl_integration/browser/favicon/favicon_service.cc similarity index 100% rename from tizen_src/impl/browser/favicon/favicon_service.cc rename to tizen_src/ewk/efl_integration/browser/favicon/favicon_service.cc diff --git a/tizen_src/impl/browser/favicon/favicon_service.h b/tizen_src/ewk/efl_integration/browser/favicon/favicon_service.h similarity index 100% rename from tizen_src/impl/browser/favicon/favicon_service.h rename to tizen_src/ewk/efl_integration/browser/favicon/favicon_service.h diff --git a/tizen_src/impl/browser/geolocation/access_token_store_efl.cc b/tizen_src/ewk/efl_integration/browser/geolocation/access_token_store_efl.cc similarity index 100% rename from tizen_src/impl/browser/geolocation/access_token_store_efl.cc rename to tizen_src/ewk/efl_integration/browser/geolocation/access_token_store_efl.cc diff --git a/tizen_src/impl/browser/geolocation/access_token_store_efl.h b/tizen_src/ewk/efl_integration/browser/geolocation/access_token_store_efl.h similarity index 100% rename from tizen_src/impl/browser/geolocation/access_token_store_efl.h rename to tizen_src/ewk/efl_integration/browser/geolocation/access_token_store_efl.h diff --git a/tizen_src/impl/browser/geolocation/geolocation_permission_context_efl.cc b/tizen_src/ewk/efl_integration/browser/geolocation/geolocation_permission_context_efl.cc similarity index 98% rename from tizen_src/impl/browser/geolocation/geolocation_permission_context_efl.cc rename to tizen_src/ewk/efl_integration/browser/geolocation/geolocation_permission_context_efl.cc index 041d029..84bfb60 100644 --- a/tizen_src/impl/browser/geolocation/geolocation_permission_context_efl.cc +++ b/tizen_src/ewk/efl_integration/browser/geolocation/geolocation_permission_context_efl.cc @@ -8,7 +8,7 @@ #include "content/public/browser/browser_thread.h" #include "eweb_view.h" #include "eweb_view_callbacks.h" -#include "API/ewk_geolocation_private.h" +#include "private/ewk_geolocation_private.h" using web_contents_utils::WebContentsFromViewID; using web_contents_utils::WebViewFromWebContents; diff --git a/tizen_src/impl/browser/geolocation/geolocation_permission_context_efl.h b/tizen_src/ewk/efl_integration/browser/geolocation/geolocation_permission_context_efl.h similarity index 100% rename from tizen_src/impl/browser/geolocation/geolocation_permission_context_efl.h rename to tizen_src/ewk/efl_integration/browser/geolocation/geolocation_permission_context_efl.h diff --git a/tizen_src/impl/browser/geolocation/location_provider_efl.cc b/tizen_src/ewk/efl_integration/browser/geolocation/location_provider_efl.cc similarity index 100% rename from tizen_src/impl/browser/geolocation/location_provider_efl.cc rename to tizen_src/ewk/efl_integration/browser/geolocation/location_provider_efl.cc diff --git a/tizen_src/impl/browser/geolocation/location_provider_efl.h b/tizen_src/ewk/efl_integration/browser/geolocation/location_provider_efl.h similarity index 100% rename from tizen_src/impl/browser/geolocation/location_provider_efl.h rename to tizen_src/ewk/efl_integration/browser/geolocation/location_provider_efl.h diff --git a/tizen_src/impl/browser/inputpicker/InputPicker.cc b/tizen_src/ewk/efl_integration/browser/inputpicker/InputPicker.cc old mode 100755 new mode 100644 similarity index 99% rename from tizen_src/impl/browser/inputpicker/InputPicker.cc rename to tizen_src/ewk/efl_integration/browser/inputpicker/InputPicker.cc index 053701d..0ab7784 --- a/tizen_src/impl/browser/inputpicker/InputPicker.cc +++ b/tizen_src/ewk/efl_integration/browser/inputpicker/InputPicker.cc @@ -6,9 +6,9 @@ #include "base/path_service.h" #include "base/files/file_path.h" -#include "paths_efl.h" #include "base/logging.h" #include "base/time/time.h" +#include "content/common/paths_efl.h" #include "content/public/browser/web_contents.h" #include "eweb_view.h" diff --git a/tizen_src/impl/browser/inputpicker/InputPicker.h b/tizen_src/ewk/efl_integration/browser/inputpicker/InputPicker.h old mode 100755 new mode 100644 similarity index 100% rename from tizen_src/impl/browser/inputpicker/InputPicker.h rename to tizen_src/ewk/efl_integration/browser/inputpicker/InputPicker.h diff --git a/tizen_src/impl/browser/inputpicker/color_chooser_efl.cc b/tizen_src/ewk/efl_integration/browser/inputpicker/color_chooser_efl.cc old mode 100755 new mode 100644 similarity index 100% rename from tizen_src/impl/browser/inputpicker/color_chooser_efl.cc rename to tizen_src/ewk/efl_integration/browser/inputpicker/color_chooser_efl.cc diff --git a/tizen_src/impl/browser/inputpicker/color_chooser_efl.h b/tizen_src/ewk/efl_integration/browser/inputpicker/color_chooser_efl.h old mode 100755 new mode 100644 similarity index 89% rename from tizen_src/impl/browser/inputpicker/color_chooser_efl.h rename to tizen_src/ewk/efl_integration/browser/inputpicker/color_chooser_efl.h index 3625440..59d6fdb --- a/tizen_src/impl/browser/inputpicker/color_chooser_efl.h +++ b/tizen_src/ewk/efl_integration/browser/inputpicker/color_chooser_efl.h @@ -21,8 +21,8 @@ class ColorChooserEfl : public ColorChooser { ~ColorChooserEfl(); // ColorChooser implementation. - virtual void SetSelectedColor(SkColor color); - virtual void End(); + void SetSelectedColor(SkColor color) override; + void End() override; private: WebContents& web_contents_; diff --git a/tizen_src/impl/browser/javascript_dialog_manager_efl.cc b/tizen_src/ewk/efl_integration/browser/javascript_dialog_manager_efl.cc similarity index 100% rename from tizen_src/impl/browser/javascript_dialog_manager_efl.cc rename to tizen_src/ewk/efl_integration/browser/javascript_dialog_manager_efl.cc diff --git a/tizen_src/impl/browser/javascript_dialog_manager_efl.h b/tizen_src/ewk/efl_integration/browser/javascript_dialog_manager_efl.h similarity index 100% rename from tizen_src/impl/browser/javascript_dialog_manager_efl.h rename to tizen_src/ewk/efl_integration/browser/javascript_dialog_manager_efl.h diff --git a/tizen_src/impl/browser/javascript_modal_dialog_efl.cc b/tizen_src/ewk/efl_integration/browser/javascript_modal_dialog_efl.cc similarity index 99% rename from tizen_src/impl/browser/javascript_modal_dialog_efl.cc rename to tizen_src/ewk/efl_integration/browser/javascript_modal_dialog_efl.cc index 85343d2..f2416d0 100644 --- a/tizen_src/impl/browser/javascript_modal_dialog_efl.cc +++ b/tizen_src/ewk/efl_integration/browser/javascript_modal_dialog_efl.cc @@ -7,8 +7,8 @@ #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" #include "common/web_contents_utils.h" +#include "content/common/paths_efl.h" #include "eweb_view.h" -#include "paths_efl.h" #ifdef OS_TIZEN_MOBILE #include diff --git a/tizen_src/impl/browser/javascript_modal_dialog_efl.h b/tizen_src/ewk/efl_integration/browser/javascript_modal_dialog_efl.h old mode 100755 new mode 100644 similarity index 100% rename from tizen_src/impl/browser/javascript_modal_dialog_efl.h rename to tizen_src/ewk/efl_integration/browser/javascript_modal_dialog_efl.h diff --git a/tizen_src/impl/browser/login_delegate_efl.cc b/tizen_src/ewk/efl_integration/browser/login_delegate_efl.cc similarity index 100% rename from tizen_src/impl/browser/login_delegate_efl.cc rename to tizen_src/ewk/efl_integration/browser/login_delegate_efl.cc diff --git a/tizen_src/impl/browser/login_delegate_efl.h b/tizen_src/ewk/efl_integration/browser/login_delegate_efl.h similarity index 100% rename from tizen_src/impl/browser/login_delegate_efl.h rename to tizen_src/ewk/efl_integration/browser/login_delegate_efl.h diff --git a/tizen_src/impl/browser/mime_override_manager_efl.cc b/tizen_src/ewk/efl_integration/browser/mime_override_manager_efl.cc similarity index 100% rename from tizen_src/impl/browser/mime_override_manager_efl.cc rename to tizen_src/ewk/efl_integration/browser/mime_override_manager_efl.cc diff --git a/tizen_src/impl/browser/mime_override_manager_efl.h b/tizen_src/ewk/efl_integration/browser/mime_override_manager_efl.h similarity index 100% rename from tizen_src/impl/browser/mime_override_manager_efl.h rename to tizen_src/ewk/efl_integration/browser/mime_override_manager_efl.h diff --git a/tizen_src/impl/browser/motion/MotionUI.cc b/tizen_src/ewk/efl_integration/browser/motion/MotionUI.cc old mode 100755 new mode 100644 similarity index 100% rename from tizen_src/impl/browser/motion/MotionUI.cc rename to tizen_src/ewk/efl_integration/browser/motion/MotionUI.cc diff --git a/tizen_src/impl/browser/motion/MotionUI.h b/tizen_src/ewk/efl_integration/browser/motion/MotionUI.h old mode 100755 new mode 100644 similarity index 100% rename from tizen_src/impl/browser/motion/MotionUI.h rename to tizen_src/ewk/efl_integration/browser/motion/MotionUI.h diff --git a/tizen_src/impl/browser/motion/wkext_motion.cc b/tizen_src/ewk/efl_integration/browser/motion/wkext_motion.cc old mode 100755 new mode 100644 similarity index 100% rename from tizen_src/impl/browser/motion/wkext_motion.cc rename to tizen_src/ewk/efl_integration/browser/motion/wkext_motion.cc diff --git a/tizen_src/impl/browser/motion/wkext_motion.h b/tizen_src/ewk/efl_integration/browser/motion/wkext_motion.h old mode 100755 new mode 100644 similarity index 100% rename from tizen_src/impl/browser/motion/wkext_motion.h rename to tizen_src/ewk/efl_integration/browser/motion/wkext_motion.h diff --git a/tizen_src/impl/browser/navigation_policy_handler_efl.cc b/tizen_src/ewk/efl_integration/browser/navigation_policy_handler_efl.cc similarity index 80% rename from tizen_src/impl/browser/navigation_policy_handler_efl.cc rename to tizen_src/ewk/efl_integration/browser/navigation_policy_handler_efl.cc index 6ffe4e4..6914c97 100644 --- a/tizen_src/impl/browser/navigation_policy_handler_efl.cc +++ b/tizen_src/ewk/efl_integration/browser/navigation_policy_handler_efl.cc @@ -3,16 +3,18 @@ // found in the LICENSE file. #include "browser/navigation_policy_handler_efl.h" -#include "common/render_messages_efl.h" #include "content/browser/renderer_host/render_view_host_delegate.h" +#include "content/common/render_messages_efl.h" #include "content/public/browser/render_view_host.h" #include "ipc/ipc_message.h" -NavigationPolicyHandlerEfl::NavigationPolicyHandlerEfl(content::RenderViewHost* rvh, const NavigationPolicyParams& params) - : rvh_(rvh), - decision_(Undecied), - params_(params) { +NavigationPolicyHandlerEfl::NavigationPolicyHandlerEfl( + content::RenderViewHost* rvh, + const NavigationPolicyParams& params) + : rvh_(rvh), + decision_(Undecied), + params_(params) { DCHECK(rvh); } diff --git a/tizen_src/impl/browser/navigation_policy_handler_efl.h b/tizen_src/ewk/efl_integration/browser/navigation_policy_handler_efl.h similarity index 82% rename from tizen_src/impl/browser/navigation_policy_handler_efl.h rename to tizen_src/ewk/efl_integration/browser/navigation_policy_handler_efl.h index ddf2cf2..cfa8a44 100644 --- a/tizen_src/impl/browser/navigation_policy_handler_efl.h +++ b/tizen_src/ewk/efl_integration/browser/navigation_policy_handler_efl.h @@ -5,7 +5,7 @@ #ifndef NAVIGATION_POLICY_HANDLER_EFL_H_ #define NAVIGATION_POLICY_HANDLER_EFL_H_ -#include "navigation_policy_params.h" +#include "common/navigation_policy_params.h" namespace content { class RenderViewHost; @@ -23,7 +23,9 @@ class NavigationPolicyHandlerEfl { Unhandled }; - NavigationPolicyHandlerEfl(content::RenderViewHost* rvh, const NavigationPolicyParams& params); + NavigationPolicyHandlerEfl( + content::RenderViewHost* rvh, + const NavigationPolicyParams& params); virtual ~NavigationPolicyHandlerEfl(); void DownloadNavigation(); Decision GetDecision() const { return decision_; } diff --git a/tizen_src/impl/browser/notification/notification_controller_efl.cc b/tizen_src/ewk/efl_integration/browser/notification/notification_controller_efl.cc similarity index 100% rename from tizen_src/impl/browser/notification/notification_controller_efl.cc rename to tizen_src/ewk/efl_integration/browser/notification/notification_controller_efl.cc diff --git a/tizen_src/impl/browser/notification/notification_controller_efl.h b/tizen_src/ewk/efl_integration/browser/notification/notification_controller_efl.h similarity index 100% rename from tizen_src/impl/browser/notification/notification_controller_efl.h rename to tizen_src/ewk/efl_integration/browser/notification/notification_controller_efl.h diff --git a/tizen_src/impl/browser/password_manager/content_password_manager_driver.cc b/tizen_src/ewk/efl_integration/browser/password_manager/content_password_manager_driver.cc similarity index 100% rename from tizen_src/impl/browser/password_manager/content_password_manager_driver.cc rename to tizen_src/ewk/efl_integration/browser/password_manager/content_password_manager_driver.cc diff --git a/tizen_src/impl/browser/password_manager/content_password_manager_driver.h b/tizen_src/ewk/efl_integration/browser/password_manager/content_password_manager_driver.h similarity index 100% rename from tizen_src/impl/browser/password_manager/content_password_manager_driver.h rename to tizen_src/ewk/efl_integration/browser/password_manager/content_password_manager_driver.h diff --git a/tizen_src/impl/browser/password_manager/password_form_manager.cc b/tizen_src/ewk/efl_integration/browser/password_manager/password_form_manager.cc similarity index 100% rename from tizen_src/impl/browser/password_manager/password_form_manager.cc rename to tizen_src/ewk/efl_integration/browser/password_manager/password_form_manager.cc diff --git a/tizen_src/impl/browser/password_manager/password_form_manager.h b/tizen_src/ewk/efl_integration/browser/password_manager/password_form_manager.h similarity index 100% rename from tizen_src/impl/browser/password_manager/password_form_manager.h rename to tizen_src/ewk/efl_integration/browser/password_manager/password_form_manager.h diff --git a/tizen_src/impl/browser/password_manager/password_generation_manager.cc b/tizen_src/ewk/efl_integration/browser/password_manager/password_generation_manager.cc old mode 100755 new mode 100644 similarity index 100% rename from tizen_src/impl/browser/password_manager/password_generation_manager.cc rename to tizen_src/ewk/efl_integration/browser/password_manager/password_generation_manager.cc diff --git a/tizen_src/impl/browser/password_manager/password_generation_manager.h b/tizen_src/ewk/efl_integration/browser/password_manager/password_generation_manager.h similarity index 100% rename from tizen_src/impl/browser/password_manager/password_generation_manager.h rename to tizen_src/ewk/efl_integration/browser/password_manager/password_generation_manager.h diff --git a/tizen_src/impl/browser/password_manager/password_manager.cc b/tizen_src/ewk/efl_integration/browser/password_manager/password_manager.cc similarity index 100% rename from tizen_src/impl/browser/password_manager/password_manager.cc rename to tizen_src/ewk/efl_integration/browser/password_manager/password_manager.cc diff --git a/tizen_src/impl/browser/password_manager/password_manager.h b/tizen_src/ewk/efl_integration/browser/password_manager/password_manager.h similarity index 100% rename from tizen_src/impl/browser/password_manager/password_manager.h rename to tizen_src/ewk/efl_integration/browser/password_manager/password_manager.h diff --git a/tizen_src/impl/browser/password_manager/password_manager_client.cc b/tizen_src/ewk/efl_integration/browser/password_manager/password_manager_client.cc similarity index 100% rename from tizen_src/impl/browser/password_manager/password_manager_client.cc rename to tizen_src/ewk/efl_integration/browser/password_manager/password_manager_client.cc diff --git a/tizen_src/impl/browser/password_manager/password_manager_client.h b/tizen_src/ewk/efl_integration/browser/password_manager/password_manager_client.h similarity index 100% rename from tizen_src/impl/browser/password_manager/password_manager_client.h rename to tizen_src/ewk/efl_integration/browser/password_manager/password_manager_client.h diff --git a/tizen_src/impl/browser/password_manager/password_manager_client_efl.cc b/tizen_src/ewk/efl_integration/browser/password_manager/password_manager_client_efl.cc similarity index 100% rename from tizen_src/impl/browser/password_manager/password_manager_client_efl.cc rename to tizen_src/ewk/efl_integration/browser/password_manager/password_manager_client_efl.cc diff --git a/tizen_src/impl/browser/password_manager/password_manager_client_efl.h b/tizen_src/ewk/efl_integration/browser/password_manager/password_manager_client_efl.h similarity index 100% rename from tizen_src/impl/browser/password_manager/password_manager_client_efl.h rename to tizen_src/ewk/efl_integration/browser/password_manager/password_manager_client_efl.h diff --git a/tizen_src/impl/browser/password_manager/password_manager_driver.h b/tizen_src/ewk/efl_integration/browser/password_manager/password_manager_driver.h similarity index 100% rename from tizen_src/impl/browser/password_manager/password_manager_driver.h rename to tizen_src/ewk/efl_integration/browser/password_manager/password_manager_driver.h diff --git a/tizen_src/impl/browser/password_manager/password_manager_util.h b/tizen_src/ewk/efl_integration/browser/password_manager/password_manager_util.h similarity index 100% rename from tizen_src/impl/browser/password_manager/password_manager_util.h rename to tizen_src/ewk/efl_integration/browser/password_manager/password_manager_util.h diff --git a/tizen_src/impl/browser/password_manager/password_manager_util_efl.cc b/tizen_src/ewk/efl_integration/browser/password_manager/password_manager_util_efl.cc similarity index 100% rename from tizen_src/impl/browser/password_manager/password_manager_util_efl.cc rename to tizen_src/ewk/efl_integration/browser/password_manager/password_manager_util_efl.cc diff --git a/tizen_src/impl/browser/password_manager/password_store_factory.cc b/tizen_src/ewk/efl_integration/browser/password_manager/password_store_factory.cc old mode 100755 new mode 100644 similarity index 98% rename from tizen_src/impl/browser/password_manager/password_store_factory.cc rename to tizen_src/ewk/efl_integration/browser/password_manager/password_store_factory.cc index c40ccfd..f763ec1 --- a/tizen_src/impl/browser/password_manager/password_store_factory.cc +++ b/tizen_src/ewk/efl_integration/browser/password_manager/password_store_factory.cc @@ -12,12 +12,12 @@ #include "base/prefs/pref_service.h" #include "base/path_service.h" #include "base/files/file_path.h" -#include "paths_efl.h" #include "browser/webdata/web_data_service.h" #include "browser/webdata/web_data_service_factory.h" #include "components/password_manager/core/browser/login_database.h" #include "components/password_manager/core/browser/password_store.h" #include "components/password_manager/core/browser/password_store_default.h" +#include "content/common/paths_efl.h" #include "content/public/browser/browser_thread.h" using namespace password_manager; diff --git a/tizen_src/impl/browser/password_manager/password_store_factory.h b/tizen_src/ewk/efl_integration/browser/password_manager/password_store_factory.h similarity index 100% rename from tizen_src/impl/browser/password_manager/password_store_factory.h rename to tizen_src/ewk/efl_integration/browser/password_manager/password_store_factory.h diff --git a/tizen_src/impl/browser/policy_response_delegate_efl.cc b/tizen_src/ewk/efl_integration/browser/policy_response_delegate_efl.cc similarity index 99% rename from tizen_src/impl/browser/policy_response_delegate_efl.cc rename to tizen_src/ewk/efl_integration/browser/policy_response_delegate_efl.cc index 7157aab..ed978da6 100644 --- a/tizen_src/impl/browser/policy_response_delegate_efl.cc +++ b/tizen_src/ewk/efl_integration/browser/policy_response_delegate_efl.cc @@ -6,16 +6,15 @@ #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/resource_dispatcher_host.h" #include "content/public/browser/resource_request_info.h" #include "content/public/browser/web_contents.h" - -#include "API/ewk_policy_decision_private.h" -#include "common/web_contents_utils.h" #include "eweb_view.h" +#include "private/ewk_policy_decision_private.h" using content::BrowserThread; using content::RenderViewHost; diff --git a/tizen_src/impl/browser/policy_response_delegate_efl.h b/tizen_src/ewk/efl_integration/browser/policy_response_delegate_efl.h similarity index 100% rename from tizen_src/impl/browser/policy_response_delegate_efl.h rename to tizen_src/ewk/efl_integration/browser/policy_response_delegate_efl.h diff --git a/tizen_src/impl/browser/renderer_host/render_message_filter_efl.cc b/tizen_src/ewk/efl_integration/browser/render_message_filter_efl.cc similarity index 88% rename from tizen_src/impl/browser/renderer_host/render_message_filter_efl.cc rename to tizen_src/ewk/efl_integration/browser/render_message_filter_efl.cc index 035eef7..2448ca2 100644 --- a/tizen_src/impl/browser/renderer_host/render_message_filter_efl.cc +++ b/tizen_src/ewk/efl_integration/browser/render_message_filter_efl.cc @@ -2,10 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/renderer_host/render_message_filter_efl.h" +#include "browser/render_message_filter_efl.h" #include "common/web_contents_utils.h" -#include "common/render_messages_efl.h" +#include "content/common/render_messages_efl.h" +#include "common/render_messages_ewk.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" @@ -13,7 +14,7 @@ #include "net/url_request/url_request_context_getter.h" #if defined(TIZEN_MULTIMEDIA_SUPPORT) -#include "content/browser/media/tizen/webaudio_decoder_browser_gstreamer.h" +#include "content/browser/media/gstreamer/webaudio_decoder_browser_gstreamer.h" #endif using web_contents_utils::WebContentsFromViewID; @@ -64,7 +65,7 @@ void RenderMessageFilterEfl::OnGstWebAudioDecode( base::SharedMemoryHandle encoded_data_handle, base::FileDescriptor pcm_output, uint32_t data_size) { - content::BrowserMessageFilterTizen::GetInstance()->EncodedDataReceived( + content::BrowserMessageFilterGstreamer::GetInstance()->EncodedDataReceived( encoded_data_handle, pcm_output, data_size); } #endif diff --git a/tizen_src/impl/browser/renderer_host/render_message_filter_efl.h b/tizen_src/ewk/efl_integration/browser/render_message_filter_efl.h similarity index 95% rename from tizen_src/impl/browser/renderer_host/render_message_filter_efl.h rename to tizen_src/ewk/efl_integration/browser/render_message_filter_efl.h index 59ad820..4d81036 100644 --- a/tizen_src/impl/browser/renderer_host/render_message_filter_efl.h +++ b/tizen_src/ewk/efl_integration/browser/render_message_filter_efl.h @@ -5,10 +5,9 @@ #ifndef RENDER_MESSAGE_FILTER_EFL_H #define RENDER_MESSAGE_FILTER_EFL_H -#include "API/ewk_hit_test_private.h" #include "base/compiler_specific.h" #include "content/public/browser/browser_message_filter.h" -#include "API/ewk_hit_test_private.h" +#include "private/ewk_hit_test_private.h" #include "third_party/WebKit/public/web/WebNavigationPolicy.h" #include "third_party/WebKit/public/web/WebNavigationType.h" #include "url/gurl.h" diff --git a/tizen_src/impl/browser/resource_dispatcher_host_delegate_efl.cc b/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.cc similarity index 99% rename from tizen_src/impl/browser/resource_dispatcher_host_delegate_efl.cc rename to tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.cc index f85b34a..ea52992 100644 --- a/tizen_src/impl/browser/resource_dispatcher_host_delegate_efl.cc +++ b/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.cc @@ -146,6 +146,7 @@ void ResourceDispatcherHostDelegateEfl::TriggerNewDownloadStartCallback( content_length)); } +#if !defined(EWK_BRINGUP) bool ResourceDispatcherHostDelegateEfl::ShouldOverrideMimeType( const GURL& url, std::string& new_mime_type) const { MimeOverrideManagerEfl* mime_override_manager_efl = @@ -153,5 +154,6 @@ bool ResourceDispatcherHostDelegateEfl::ShouldOverrideMimeType( return mime_override_manager_efl->PopOverriddenMime(url.spec(), new_mime_type); } +#endif } // namespace content diff --git a/tizen_src/impl/browser/resource_dispatcher_host_delegate_efl.h b/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.h similarity index 98% rename from tizen_src/impl/browser/resource_dispatcher_host_delegate_efl.h rename to tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.h index 95dfec8..81a39e0 100644 --- a/tizen_src/impl/browser/resource_dispatcher_host_delegate_efl.h +++ b/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.h @@ -48,8 +48,10 @@ class ResourceDispatcherHostDelegateEfl ScopedVector* throttles) override; // Returns true if mime type should be overridden, otherwise returns false. +#if !defined(EWK_BRINGUP) bool ShouldOverrideMimeType(const GURL& url, std::string& new_mime_type) const override; +#endif private: void TriggerNewDownloadStartCallback( diff --git a/tizen_src/impl/browser/resource_throttle_efl.cc b/tizen_src/ewk/efl_integration/browser/resource_throttle_efl.cc similarity index 100% rename from tizen_src/impl/browser/resource_throttle_efl.cc rename to tizen_src/ewk/efl_integration/browser/resource_throttle_efl.cc diff --git a/tizen_src/impl/browser/resource_throttle_efl.h b/tizen_src/ewk/efl_integration/browser/resource_throttle_efl.h similarity index 100% rename from tizen_src/impl/browser/resource_throttle_efl.h rename to tizen_src/ewk/efl_integration/browser/resource_throttle_efl.h diff --git a/tizen_src/impl/browser/scoped_allow_wait_for_legacy_web_view_api.h b/tizen_src/ewk/efl_integration/browser/scoped_allow_wait_for_legacy_web_view_api.h similarity index 100% rename from tizen_src/impl/browser/scoped_allow_wait_for_legacy_web_view_api.h rename to tizen_src/ewk/efl_integration/browser/scoped_allow_wait_for_legacy_web_view_api.h diff --git a/tizen_src/impl/browser/scoped_wait_for_ewk.h b/tizen_src/ewk/efl_integration/browser/scoped_wait_for_ewk.h similarity index 100% rename from tizen_src/impl/browser/scoped_wait_for_ewk.h rename to tizen_src/ewk/efl_integration/browser/scoped_wait_for_ewk.h diff --git a/tizen_src/impl/browser/selectpicker/WebPopupItem.cc b/tizen_src/ewk/efl_integration/browser/selectpicker/WebPopupItem.cc similarity index 100% rename from tizen_src/impl/browser/selectpicker/WebPopupItem.cc rename to tizen_src/ewk/efl_integration/browser/selectpicker/WebPopupItem.cc diff --git a/tizen_src/impl/browser/selectpicker/WebPopupItem.h b/tizen_src/ewk/efl_integration/browser/selectpicker/WebPopupItem.h similarity index 100% rename from tizen_src/impl/browser/selectpicker/WebPopupItem.h rename to tizen_src/ewk/efl_integration/browser/selectpicker/WebPopupItem.h diff --git a/tizen_src/impl/browser/selectpicker/popup_menu_item.cc b/tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item.cc similarity index 100% rename from tizen_src/impl/browser/selectpicker/popup_menu_item.cc rename to tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item.cc diff --git a/tizen_src/impl/browser/selectpicker/popup_menu_item.h b/tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item.h similarity index 100% rename from tizen_src/impl/browser/selectpicker/popup_menu_item.h rename to tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item.h diff --git a/tizen_src/impl/browser/selectpicker/popup_menu_item_private.h b/tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item_private.h similarity index 100% rename from tizen_src/impl/browser/selectpicker/popup_menu_item_private.h rename to tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item_private.h diff --git a/tizen_src/impl/browser/selectpicker/popup_picker.cc b/tizen_src/ewk/efl_integration/browser/selectpicker/popup_picker.cc similarity index 99% rename from tizen_src/impl/browser/selectpicker/popup_picker.cc rename to tizen_src/ewk/efl_integration/browser/selectpicker/popup_picker.cc index 3e756c0..912d350 100644 --- a/tizen_src/impl/browser/selectpicker/popup_picker.cc +++ b/tizen_src/ewk/efl_integration/browser/selectpicker/popup_picker.cc @@ -11,7 +11,7 @@ #include "eweb_view.h" #include "base/path_service.h" #include "base/files/file_path.h" -#include "paths_efl.h" +#include "content/common/paths_efl.h" #include "base/logging.h" #include diff --git a/tizen_src/impl/browser/selectpicker/popup_picker.h b/tizen_src/ewk/efl_integration/browser/selectpicker/popup_picker.h similarity index 100% rename from tizen_src/impl/browser/selectpicker/popup_picker.h rename to tizen_src/ewk/efl_integration/browser/selectpicker/popup_picker.h diff --git a/tizen_src/impl/browser/sound_effect.cc b/tizen_src/ewk/efl_integration/browser/sound_effect.cc similarity index 100% rename from tizen_src/impl/browser/sound_effect.cc rename to tizen_src/ewk/efl_integration/browser/sound_effect.cc diff --git a/tizen_src/impl/browser/sound_effect.h b/tizen_src/ewk/efl_integration/browser/sound_effect.h similarity index 100% rename from tizen_src/impl/browser/sound_effect.h rename to tizen_src/ewk/efl_integration/browser/sound_effect.h diff --git a/tizen_src/impl/browser/sound_effect_tizen.cc b/tizen_src/ewk/efl_integration/browser/sound_effect_tizen.cc similarity index 100% rename from tizen_src/impl/browser/sound_effect_tizen.cc rename to tizen_src/ewk/efl_integration/browser/sound_effect_tizen.cc diff --git a/tizen_src/impl/browser/vibration/vibration_message_filter.cc b/tizen_src/ewk/efl_integration/browser/vibration/vibration_message_filter.cc similarity index 100% rename from tizen_src/impl/browser/vibration/vibration_message_filter.cc rename to tizen_src/ewk/efl_integration/browser/vibration/vibration_message_filter.cc diff --git a/tizen_src/impl/browser/vibration/vibration_message_filter.h b/tizen_src/ewk/efl_integration/browser/vibration/vibration_message_filter.h similarity index 100% rename from tizen_src/impl/browser/vibration/vibration_message_filter.h rename to tizen_src/ewk/efl_integration/browser/vibration/vibration_message_filter.h diff --git a/tizen_src/impl/browser/vibration/vibration_provider_client.cc b/tizen_src/ewk/efl_integration/browser/vibration/vibration_provider_client.cc similarity index 100% rename from tizen_src/impl/browser/vibration/vibration_provider_client.cc rename to tizen_src/ewk/efl_integration/browser/vibration/vibration_provider_client.cc diff --git a/tizen_src/impl/browser/vibration/vibration_provider_client.h b/tizen_src/ewk/efl_integration/browser/vibration/vibration_provider_client.h similarity index 100% rename from tizen_src/impl/browser/vibration/vibration_provider_client.h rename to tizen_src/ewk/efl_integration/browser/vibration/vibration_provider_client.h diff --git a/tizen_src/impl/browser/renderer_host/web_cache_manager_efl.cc b/tizen_src/ewk/efl_integration/browser/web_cache_efl/web_cache_manager_efl.cc similarity index 98% rename from tizen_src/impl/browser/renderer_host/web_cache_manager_efl.cc rename to tizen_src/ewk/efl_integration/browser/web_cache_efl/web_cache_manager_efl.cc index 740c3c1..97a362d 100644 --- a/tizen_src/impl/browser/renderer_host/web_cache_manager_efl.cc +++ b/tizen_src/ewk/efl_integration/browser/web_cache_efl/web_cache_manager_efl.cc @@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "browser/renderer_host/web_cache_manager_efl.h" -#include "common/render_messages_efl.h" -#include "cache_params_efl.h" +#include "browser/web_cache_efl/web_cache_manager_efl.h" #include "base/logging.h" #include "base/sys_info.h" +#include "common/render_messages_ewk.h" +#include "common/cache_params_efl.h" #include "content/public/browser/browser_context.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/notification_source.h" diff --git a/tizen_src/impl/browser/renderer_host/web_cache_manager_efl.h b/tizen_src/ewk/efl_integration/browser/web_cache_efl/web_cache_manager_efl.h similarity index 100% rename from tizen_src/impl/browser/renderer_host/web_cache_manager_efl.h rename to tizen_src/ewk/efl_integration/browser/web_cache_efl/web_cache_manager_efl.h diff --git a/tizen_src/impl/browser/web_view_browser_message_filter.cc b/tizen_src/ewk/efl_integration/browser/web_view_browser_message_filter.cc similarity index 96% rename from tizen_src/impl/browser/web_view_browser_message_filter.cc rename to tizen_src/ewk/efl_integration/browser/web_view_browser_message_filter.cc index ee0a829..3ccda4f 100644 --- a/tizen_src/impl/browser/web_view_browser_message_filter.cc +++ b/tizen_src/ewk/efl_integration/browser/web_view_browser_message_filter.cc @@ -4,9 +4,8 @@ #include "browser/web_view_browser_message_filter.h" -#include "API/ewk_hit_test_private.h" -#include "common/render_messages_efl.h" #include "common/web_contents_utils.h" +#include "common/render_messages_ewk.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" @@ -14,6 +13,7 @@ #include "content/public/browser/notification_types.h" #include "content/public/browser/web_contents.h" #include "eweb_view.h" +#include "private/ewk_hit_test_private.h" #include "tizen_webview/public/tw_error.h" using content::BrowserThread; @@ -77,7 +77,7 @@ class WebViewBrowserMessageFilterPrivate } void Observe(int type, const content::NotificationSource& source, - const content::NotificationDetails& details) { + const content::NotificationDetails& details) override { DCHECK_EQ(content::NOTIFICATION_WEB_CONTENTS_DESTROYED, type); web_view_ = NULL; diff --git a/tizen_src/impl/browser/web_view_browser_message_filter.h b/tizen_src/ewk/efl_integration/browser/web_view_browser_message_filter.h similarity index 100% rename from tizen_src/impl/browser/web_view_browser_message_filter.h rename to tizen_src/ewk/efl_integration/browser/web_view_browser_message_filter.h diff --git a/tizen_src/impl/browser/webdata/web_data_service.cc b/tizen_src/ewk/efl_integration/browser/webdata/web_data_service.cc similarity index 100% rename from tizen_src/impl/browser/webdata/web_data_service.cc rename to tizen_src/ewk/efl_integration/browser/webdata/web_data_service.cc diff --git a/tizen_src/impl/browser/webdata/web_data_service.h b/tizen_src/ewk/efl_integration/browser/webdata/web_data_service.h similarity index 100% rename from tizen_src/impl/browser/webdata/web_data_service.h rename to tizen_src/ewk/efl_integration/browser/webdata/web_data_service.h diff --git a/tizen_src/impl/browser/webdata/web_data_service_factory.cc b/tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.cc similarity index 99% rename from tizen_src/impl/browser/webdata/web_data_service_factory.cc rename to tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.cc index 42ea0ec..ee44682 100644 --- a/tizen_src/impl/browser/webdata/web_data_service_factory.cc +++ b/tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.cc @@ -11,11 +11,11 @@ #include "base/bind.h" #include "base/path_service.h" #include "base/files/file_path.h" -#include "paths_efl.h" #include "components/autofill/core/browser/autofill_country.h" #include "components/autofill/core/browser/webdata/autofill_table.h" #include "components/autofill/core/browser/webdata/autofill_webdata_service.h" #include "components/webdata/common/webdata_constants.h" +#include "content/common/paths_efl.h" #include "content/public/browser/browser_thread.h" using autofill::AutofillWebDataService; diff --git a/tizen_src/impl/browser/webdata/web_data_service_factory.h b/tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.h similarity index 100% rename from tizen_src/impl/browser/webdata/web_data_service_factory.h rename to tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.h diff --git a/tizen_src/impl/browser_context_efl.cc b/tizen_src/ewk/efl_integration/browser_context_efl.cc similarity index 99% rename from tizen_src/impl/browser_context_efl.cc rename to tizen_src/ewk/efl_integration/browser_context_efl.cc index 2bd192f..c708dcd 100644 --- a/tizen_src/impl/browser_context_efl.cc +++ b/tizen_src/ewk/efl_integration/browser_context_efl.cc @@ -18,11 +18,11 @@ #include "components/autofill/core/common/autofill_pref_names.h" #include "components/user_prefs/user_prefs.h" #include "components/visitedlink/browser/visitedlink_master.h" +#include "content/common/paths_efl.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" #include "eweb_context.h" -#include "paths_efl.h" using namespace autofill::prefs; using std::pair; diff --git a/tizen_src/impl/browser_context_efl.h b/tizen_src/ewk/efl_integration/browser_context_efl.h similarity index 100% rename from tizen_src/impl/browser_context_efl.h rename to tizen_src/ewk/efl_integration/browser_context_efl.h diff --git a/tizen_src/impl/browser_main_parts_efl.cc b/tizen_src/ewk/efl_integration/browser_main_parts_efl.cc similarity index 100% rename from tizen_src/impl/browser_main_parts_efl.cc rename to tizen_src/ewk/efl_integration/browser_main_parts_efl.cc diff --git a/tizen_src/impl/browser_main_parts_efl.h b/tizen_src/ewk/efl_integration/browser_main_parts_efl.h similarity index 100% rename from tizen_src/impl/browser_main_parts_efl.h rename to tizen_src/ewk/efl_integration/browser_main_parts_efl.h diff --git a/tizen_src/impl/command_line_efl.cc b/tizen_src/ewk/efl_integration/command_line_efl.cc similarity index 99% rename from tizen_src/impl/command_line_efl.cc rename to tizen_src/ewk/efl_integration/command_line_efl.cc index 6c57e99..0bdfa6b 100644 --- a/tizen_src/impl/command_line_efl.cc +++ b/tizen_src/ewk/efl_integration/command_line_efl.cc @@ -87,8 +87,10 @@ content::MainFunctionParams CommandLineEfl::GetDefaultPortParams() { switches::kAcceleratedCanvas2dMSAASampleCount, "4"); #endif +#if !defined(EWK_BRINGUP) if (p_command_line->HasSwitch(switches::kDisableIpcSandbox)) p_command_line->AppendSwitch(switches::kDisableRendererZygote); +#endif // XXX: Skia benchmarking should be only used for testing, // when enabled the following warning is printed to stderr: diff --git a/tizen_src/impl/command_line_efl.h b/tizen_src/ewk/efl_integration/command_line_efl.h similarity index 100% rename from tizen_src/impl/command_line_efl.h rename to tizen_src/ewk/efl_integration/command_line_efl.h diff --git a/tizen_src/chromium_impl/content/common/cache_params_efl.h b/tizen_src/ewk/efl_integration/common/cache_params_efl.h similarity index 94% rename from tizen_src/chromium_impl/content/common/cache_params_efl.h rename to tizen_src/ewk/efl_integration/common/cache_params_efl.h index 449d1e3..d16b2cf 100644 --- a/tizen_src/chromium_impl/content/common/cache_params_efl.h +++ b/tizen_src/ewk/efl_integration/common/cache_params_efl.h @@ -5,6 +5,8 @@ #ifndef CACHE_PARAMS_EFL_H_ #define CACHE_PARAMS_EFL_H_ +#include "base/basictypes.h" + struct CacheParamsEfl { int64 cache_total_capacity; int64 cache_min_dead_capacity; diff --git a/tizen_src/impl/common/content_client_efl.cc b/tizen_src/ewk/efl_integration/common/content_client_efl.cc similarity index 100% rename from tizen_src/impl/common/content_client_efl.cc rename to tizen_src/ewk/efl_integration/common/content_client_efl.cc diff --git a/tizen_src/impl/common/content_client_efl.h b/tizen_src/ewk/efl_integration/common/content_client_efl.h similarity index 100% rename from tizen_src/impl/common/content_client_efl.h rename to tizen_src/ewk/efl_integration/common/content_client_efl.h diff --git a/tizen_src/impl/common/content_switches_efl.cc b/tizen_src/ewk/efl_integration/common/content_switches_efl.cc similarity index 100% rename from tizen_src/impl/common/content_switches_efl.cc rename to tizen_src/ewk/efl_integration/common/content_switches_efl.cc diff --git a/tizen_src/impl/common/content_switches_efl.h b/tizen_src/ewk/efl_integration/common/content_switches_efl.h similarity index 100% rename from tizen_src/impl/common/content_switches_efl.h rename to tizen_src/ewk/efl_integration/common/content_switches_efl.h diff --git a/tizen_src/impl/components/editing/content/common/editing_messages.h b/tizen_src/ewk/efl_integration/common/editing_messages.h similarity index 100% rename from tizen_src/impl/components/editing/content/common/editing_messages.h rename to tizen_src/ewk/efl_integration/common/editing_messages.h diff --git a/tizen_src/ewk/efl_integration/common/message_generator_ewk.cc b/tizen_src/ewk/efl_integration/common/message_generator_ewk.cc new file mode 100644 index 0000000..9699d26 --- /dev/null +++ b/tizen_src/ewk/efl_integration/common/message_generator_ewk.cc @@ -0,0 +1,34 @@ +// 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. + +// Get basic type definitions. +#define IPC_MESSAGE_IMPL +#include "common/message_generator_ewk.h" + +// Generate constructors. +#include "ipc/struct_constructor_macros.h" +#include "common/message_generator_ewk.h" + +// Generate destructors. +#include "ipc/struct_destructor_macros.h" +#include "common/message_generator_ewk.h" + +// Generate param traits write methods. +#include "ipc/param_traits_write_macros.h" +namespace IPC { +#include "common/message_generator_ewk.h" +} // namespace IPC + +// Generate param traits read methods. +#include "ipc/param_traits_read_macros.h" +namespace IPC { +#include "common/message_generator_ewk.h" +} // namespace IPC + +// Generate param traits log methods. +#include "ipc/param_traits_log_macros.h" +namespace IPC { +#include "common/message_generator_ewk.h" +} // namespace IPC + diff --git a/tizen_src/ewk/efl_integration/common/message_generator_ewk.h b/tizen_src/ewk/efl_integration/common/message_generator_ewk.h new file mode 100644 index 0000000..db42330 --- /dev/null +++ b/tizen_src/ewk/efl_integration/common/message_generator_ewk.h @@ -0,0 +1,9 @@ +// 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. + +// Multiply-included file, hence no include guard. +// efl message generator + +#include "common/render_messages_ewk.h" +#include "common/editing_messages.h" diff --git a/tizen_src/chromium_impl/content/common/navigation_policy_params.cc b/tizen_src/ewk/efl_integration/common/navigation_policy_params.cc similarity index 84% rename from tizen_src/chromium_impl/content/common/navigation_policy_params.cc rename to tizen_src/ewk/efl_integration/common/navigation_policy_params.cc index 461cc24..7a815dd 100644 --- a/tizen_src/chromium_impl/content/common/navigation_policy_params.cc +++ b/tizen_src/ewk/efl_integration/common/navigation_policy_params.cc @@ -2,12 +2,10 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/common/navigation_policy_params.h" +#include "common/navigation_policy_params.h" #include "third_party/WebKit/public/web/WebNavigationPolicy.h" -namespace content { - NavigationPolicyParams::NavigationPolicyParams() : render_view_id(-1) , policy(blink::WebNavigationPolicyIgnore) @@ -19,5 +17,3 @@ NavigationPolicyParams::NavigationPolicyParams() NavigationPolicyParams::~NavigationPolicyParams() { } - -} // namespace content diff --git a/tizen_src/chromium_impl/content/common/navigation_policy_params.h b/tizen_src/ewk/efl_integration/common/navigation_policy_params.h similarity index 95% rename from tizen_src/chromium_impl/content/common/navigation_policy_params.h rename to tizen_src/ewk/efl_integration/common/navigation_policy_params.h index 97aecc9..ffaad14 100644 --- a/tizen_src/chromium_impl/content/common/navigation_policy_params.h +++ b/tizen_src/ewk/efl_integration/common/navigation_policy_params.h @@ -11,8 +11,6 @@ #include "third_party/WebKit/public/platform/WebString.h" #include "url/gurl.h" -namespace content { - struct NavigationPolicyParams { NavigationPolicyParams(); ~NavigationPolicyParams(); @@ -30,6 +28,4 @@ struct NavigationPolicyParams { bool is_redirect; }; -} // namespace content - #endif /* POLICY_NAVIGATION_PARAMS_H_ */ diff --git a/tizen_src/chromium_impl/content/renderer/print_pages_params.cc b/tizen_src/ewk/efl_integration/common/print_pages_params.cc similarity index 84% rename from tizen_src/chromium_impl/content/renderer/print_pages_params.cc rename to tizen_src/ewk/efl_integration/common/print_pages_params.cc index 6635ad1..2f8b304 100644 --- a/tizen_src/chromium_impl/content/renderer/print_pages_params.cc +++ b/tizen_src/ewk/efl_integration/common/print_pages_params.cc @@ -2,9 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "content/renderer/print_pages_params.h" - -namespace content { +#include "common/print_pages_params.h" PrintParams::PrintParams() : page_size(), @@ -24,5 +22,3 @@ PrintPagesParams::PrintPagesParams() PrintPagesParams::~PrintPagesParams(){ } - -} // namespace content diff --git a/tizen_src/chromium_impl/content/renderer/print_pages_params.h b/tizen_src/ewk/efl_integration/common/print_pages_params.h similarity index 96% rename from tizen_src/chromium_impl/content/renderer/print_pages_params.h rename to tizen_src/ewk/efl_integration/common/print_pages_params.h index 5f0a770..5056a36 100644 --- a/tizen_src/chromium_impl/content/renderer/print_pages_params.h +++ b/tizen_src/ewk/efl_integration/common/print_pages_params.h @@ -15,8 +15,6 @@ #include "ui/gfx/rect.h" #include "ui/gfx/size.h" -namespace content { - struct PrintParams { PrintParams(); @@ -53,6 +51,4 @@ struct DidPrintPagesParams { base::FilePath filename; }; -} // namespace content - #endif // PRINT_PAGES_PARAMS_H_ diff --git a/tizen_src/ewk/efl_integration/common/render_messages_ewk.h b/tizen_src/ewk/efl_integration/common/render_messages_ewk.h new file mode 100644 index 0000000..3cc0167 --- /dev/null +++ b/tizen_src/ewk/efl_integration/common/render_messages_ewk.h @@ -0,0 +1,298 @@ +// 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. + +// Multiply-included file, no traditional include guard. + +#include "base/values.h" +#include "common//print_pages_params.h" +#include "common/cache_params_efl.h" +#include "common/navigation_policy_params.h" +#include "ipc/ipc_message_macros.h" +#include "ipc/ipc_channel_handle.h" +#include "private/ewk_hit_test_private.h" +#include "private/ewk_text_style_private.h" +#include "private/ewk_ipc_message_private.h" +#include "tizen_webview/public/tw_content_security_policy.h" +#include "tizen_webview/public/tw_error.h" +#include "tizen_webview/public/tw_hit_test.h" +#include "tizen_webview/public/tw_settings.h" +#include "tizen_webview/public/tw_wrt.h" +#include "third_party/WebKit/public/web/WebNavigationPolicy.h" +#include "third_party/WebKit/public/web/WebNavigationType.h" +#include "third_party/WebKit/public/web/WebViewModeEnums.h" + +typedef std::map StringMap; + +#define IPC_MESSAGE_START EwkMsgStart + +IPC_STRUCT_TRAITS_BEGIN(tizen_webview::WrtIpcMessageData) + IPC_STRUCT_TRAITS_MEMBER(type) + IPC_STRUCT_TRAITS_MEMBER(value) + IPC_STRUCT_TRAITS_MEMBER(id) + IPC_STRUCT_TRAITS_MEMBER(reference_id) +IPC_STRUCT_TRAITS_END() + +IPC_STRUCT_TRAITS_BEGIN(tizen_webview::Settings) + IPC_STRUCT_TRAITS_MEMBER(javascript_can_open_windows) +IPC_STRUCT_TRAITS_END() + +IPC_STRUCT_TRAITS_BEGIN(tizen_webview::Error) + IPC_STRUCT_TRAITS_MEMBER(url) + IPC_STRUCT_TRAITS_MEMBER(is_main_frame) + IPC_STRUCT_TRAITS_MEMBER(code) + IPC_STRUCT_TRAITS_MEMBER(description) + IPC_STRUCT_TRAITS_MEMBER(domain) +IPC_STRUCT_TRAITS_END() + +IPC_ENUM_TRAITS(tizen_webview::ContentSecurityPolicyType) + +IPC_ENUM_TRAITS(tizen_webview::Hit_Test_Mode) +IPC_ENUM_TRAITS(tizen_webview::Hit_Test_Result_Context) + +IPC_STRUCT_TRAITS_BEGIN(_Ewk_Hit_Test::Hit_Test_Node_Data) + IPC_STRUCT_TRAITS_MEMBER(tagName) + IPC_STRUCT_TRAITS_MEMBER(nodeValue) +IPC_STRUCT_TRAITS_END() + +IPC_STRUCT_TRAITS_BEGIN(DidPrintPagesParams) + IPC_STRUCT_TRAITS_MEMBER(metafile_data_handle) + IPC_STRUCT_TRAITS_MEMBER(data_size) + IPC_STRUCT_TRAITS_MEMBER(document_cookie) + IPC_STRUCT_TRAITS_MEMBER(filename) +IPC_STRUCT_TRAITS_END() + +#if !defined(EWK_BRINGUP) +IPC_STRUCT_TRAITS_BEGIN(_Ewk_Hit_Test::Hit_Test_Image_Buffer) + IPC_STRUCT_TRAITS_MEMBER(fileNameExtension) + IPC_STRUCT_TRAITS_MEMBER(imageBitmap) +IPC_STRUCT_TRAITS_END() +#endif + +IPC_STRUCT_TRAITS_BEGIN(_Ewk_Hit_Test) + IPC_STRUCT_TRAITS_MEMBER(context) + IPC_STRUCT_TRAITS_MEMBER(linkURI) + IPC_STRUCT_TRAITS_MEMBER(linkLabel) + IPC_STRUCT_TRAITS_MEMBER(linkTitle) + IPC_STRUCT_TRAITS_MEMBER(imageURI) + IPC_STRUCT_TRAITS_MEMBER(mediaURI) + IPC_STRUCT_TRAITS_MEMBER(isEditable) + IPC_STRUCT_TRAITS_MEMBER(mode) + IPC_STRUCT_TRAITS_MEMBER(nodeData) +// XXX: find a better way to prevent the crash when copying SkBitmap +#if !defined(EWK_BRINGUP) + IPC_STRUCT_TRAITS_MEMBER(imageData) +#endif +IPC_STRUCT_TRAITS_END() + +IPC_STRUCT_TRAITS_BEGIN(CacheParamsEfl) + IPC_STRUCT_TRAITS_MEMBER(cache_total_capacity) + IPC_STRUCT_TRAITS_MEMBER(cache_min_dead_capacity) + IPC_STRUCT_TRAITS_MEMBER(cache_max_dead_capacity) +IPC_STRUCT_TRAITS_END() + +IPC_STRUCT_TRAITS_BEGIN(SelectionStylePrams) + IPC_STRUCT_TRAITS_MEMBER(underline_state) + IPC_STRUCT_TRAITS_MEMBER(italic_state) + IPC_STRUCT_TRAITS_MEMBER(bold_state) + IPC_STRUCT_TRAITS_MEMBER(bg_color) + IPC_STRUCT_TRAITS_MEMBER(color) + IPC_STRUCT_TRAITS_MEMBER(font_size) + IPC_STRUCT_TRAITS_MEMBER(order_list_state) + IPC_STRUCT_TRAITS_MEMBER(un_order_list_state) + IPC_STRUCT_TRAITS_MEMBER(text_align_center_state) + IPC_STRUCT_TRAITS_MEMBER(text_align_left_state) + IPC_STRUCT_TRAITS_MEMBER(text_align_right_state) + IPC_STRUCT_TRAITS_MEMBER(text_align_full_state) + IPC_STRUCT_TRAITS_MEMBER(has_composition) +IPC_STRUCT_TRAITS_END() + +IPC_STRUCT_TRAITS_BEGIN(SelectionColor) + IPC_STRUCT_TRAITS_MEMBER(r) + IPC_STRUCT_TRAITS_MEMBER(g) + IPC_STRUCT_TRAITS_MEMBER(b) + IPC_STRUCT_TRAITS_MEMBER(a) +IPC_STRUCT_TRAITS_END() + +IPC_ENUM_TRAITS(blink::WebNavigationPolicy) +IPC_ENUM_TRAITS(blink::WebNavigationType) + +IPC_STRUCT_TRAITS_BEGIN(NavigationPolicyParams) + IPC_STRUCT_TRAITS_MEMBER(render_view_id) + IPC_STRUCT_TRAITS_MEMBER(cookie) + IPC_STRUCT_TRAITS_MEMBER(url) + IPC_STRUCT_TRAITS_MEMBER(httpMethod) + IPC_STRUCT_TRAITS_MEMBER(referrer) + IPC_STRUCT_TRAITS_MEMBER(policy) + IPC_STRUCT_TRAITS_MEMBER(type) + IPC_STRUCT_TRAITS_MEMBER(should_replace_current_entry) + IPC_STRUCT_TRAITS_MEMBER(is_main_frame) + IPC_STRUCT_TRAITS_MEMBER(is_redirect) +IPC_STRUCT_TRAITS_END() + +IPC_ENUM_TRAITS(blink::WebViewMode) + + +IPC_MESSAGE_CONTROL4(WrtMsg_SetWidgetInfo, + int, // result: widgetHandle + double, // result: scale + std::string, // result: theme + std::string) // result: encodedBundle + +IPC_MESSAGE_CONTROL2(WrtMsg_ParseUrl, + int, // result: request_id + GURL) // result: url + +IPC_MESSAGE_CONTROL2(WrtMsg_ParseUrlResponse, + int, // result: request_id + GURL) // result: url + +IPC_MESSAGE_CONTROL1(WrtMsg_SendWrtMessage, + tizen_webview::WrtIpcMessageData /* data */); + +IPC_SYNC_MESSAGE_ROUTED1_1(EwkHostMsg_WrtSyncMessage, + tizen_webview::WrtIpcMessageData /* data */, + std::string /*result*/); + +IPC_MESSAGE_ROUTED1(EwkHostMsg_WrtMessage, + tizen_webview::WrtIpcMessageData /* data */); + +IPC_MESSAGE_CONTROL3(EwkViewHostMsg_HitTestReply, + int, /* render_view_id */ + _Ewk_Hit_Test, /* Ewk Hit test data without node map */ + NodeAttributesMap /* node attributes */) + +IPC_MESSAGE_CONTROL4(EwkViewHostMsg_HitTestAsyncReply, + int, /* render_view_id */ + _Ewk_Hit_Test, /* Ewk Hit test data without node map */ + NodeAttributesMap, /* node attributes */ + int64_t /* request id */) + +IPC_MESSAGE_ROUTED1(EwkViewMsg_DidFailLoadWithError, + tizen_webview::Error /* error */) + +IPC_MESSAGE_ROUTED2(EwkViewMsg_SetCSP, + std::string, /* policy */ + tizen_webview::ContentSecurityPolicyType /* header type */) + +IPC_SYNC_MESSAGE_ROUTED0_2(EwkHostMsg_GetContentSecurityPolicy, + std::string, /* policy */ + tizen_webview::ContentSecurityPolicyType /* header type */) + +IPC_MESSAGE_ROUTED3(EwkViewMsg_Scale, + double, /* scale factor */ + int, /* center x */ + int /* center y */) + +IPC_MESSAGE_ROUTED1(EwkHostMsg_DidPrintPagesToPdf, + DidPrintPagesParams /* pdf document parameters */) + +IPC_MESSAGE_CONTROL0(EflViewMsg_ClearCache) +IPC_MESSAGE_CONTROL1(EflViewMsg_SetCache, + CacheParamsEfl) + +// Tells the renderer to dump as much memory as it can, perhaps because we +// have memory pressure or the renderer is (or will be) paged out. This +// should only result in purging objects we can recalculate, e.g. caches or +// JS garbage, not in purging irreplaceable objects. +IPC_MESSAGE_CONTROL0(EwkViewMsg_PurgeMemory) + +IPC_MESSAGE_ROUTED3(EwkViewMsg_PrintToPdf, + int, /* width */ + int, /* height */ + base::FilePath /* file name to save pdf*/) + +IPC_MESSAGE_ROUTED1(EwkViewMsg_GetMHTMLData, + int /* callback id */) + +IPC_MESSAGE_ROUTED3(EwkViewMsg_DoHitTest, + int, /* horizontal position */ + int, /* vertical position */ + tizen_webview::Hit_Test_Mode /* mode */) + +IPC_MESSAGE_ROUTED4(EwkViewMsg_DoHitTestAsync, + int, /* horizontal position */ + int, /* vertical position */ + tizen_webview::Hit_Test_Mode, /* mode */ + int64_t /* request id */) + +// Tells the renderer to clear the cache. +IPC_MESSAGE_ROUTED0(EwkViewMsg_UseSettingsFont) +IPC_MESSAGE_ROUTED0(EwkViewMsg_SetBrowserFont) +IPC_MESSAGE_ROUTED0(EwkViewMsg_SuspendScheduledTask) +IPC_MESSAGE_ROUTED0(EwkViewMsg_ResumeScheduledTasks) + +IPC_MESSAGE_ROUTED0(EwkViewMsg_GetSelectionStyle) + +IPC_MESSAGE_ROUTED2(EwkViewMsg_SetScroll, + int, /* horizontal position */ + int /* vertical position */) + +IPC_MESSAGE_ROUTED1(EwkViewMsg_PlainTextGet, + int /* callback id */) + +IPC_MESSAGE_ROUTED1(EwkViewMsg_SelectionTextStyleState, + SelectionStylePrams /* params */) + +IPC_MESSAGE_ROUTED1(EflViewMsg_UpdateSettings, tizen_webview::Settings) + +IPC_MESSAGE_ROUTED2(EwkHostMsg_PlainTextGetContents, + std::string, /* contentText */ + int /* callback id */) + +IPC_MESSAGE_ROUTED2(EwkHostMsg_DidChangeContentsSize, + int, /* width */ + int /* height */) + +IPC_MESSAGE_ROUTED2(EwkHostMsg_DidChangeMaxScrollOffset, + int, /*max scrollX*/ + int /*max scrollY*/) + +IPC_MESSAGE_ROUTED2(EwkHostMsg_DidChangeScrollOffset, + int, /*scrollX*/ + int /*scrollY*/) + +IPC_MESSAGE_ROUTED2(EwkHostMsg_ReadMHTMLData, + std::string, /* Mhtml text */ + int /* callback id */) + +IPC_MESSAGE_ROUTED1(EwkHostMsg_DidChangePageScaleFactor, + double /* page scale factor */) + +IPC_MESSAGE_ROUTED2(EwkHostMsg_DidChangePageScaleRange, + double, /* minimum page scale factor */ + double /* maximum page scale factor */) + +IPC_MESSAGE_ROUTED1(EwkViewMsg_SetDrawsTransparentBackground, + bool /* enabled */) + +// Notifies the browser to form submit +IPC_MESSAGE_ROUTED1(EwkHostMsg_FormSubmit, GURL) + +IPC_MESSAGE_ROUTED1(EwkViewMsg_WebAppIconUrlGet, + int /* callback id */) + +IPC_MESSAGE_ROUTED2(EwkHostMsg_WebAppIconUrlGet, + std::string, /* icon url */ + int /* callback id */) + +IPC_MESSAGE_ROUTED1(EwkViewMsg_WebAppIconUrlsGet, + int /* callback id */) + +IPC_MESSAGE_ROUTED2(EwkHostMsg_WebAppIconUrlsGet, + StringMap, /* icon urls */ + int /* callback id */) + +IPC_MESSAGE_ROUTED1(EwkViewMsg_WebAppCapableGet, + int /* calback id */) + +IPC_MESSAGE_ROUTED2(EwkHostMsg_WebAppCapableGet, + bool, /* capable */ + int /* calback id */) + +IPC_SYNC_MESSAGE_CONTROL1_1(EwkHostMsg_DecideNavigationPolicy, + NavigationPolicyParams, + bool /*handled*/) + +IPC_MESSAGE_ROUTED1(ViewMsg_SetViewMode, + blink::WebViewMode /* view_mode */) diff --git a/tizen_src/impl/common/version_info.cc b/tizen_src/ewk/efl_integration/common/version_info.cc similarity index 100% rename from tizen_src/impl/common/version_info.cc rename to tizen_src/ewk/efl_integration/common/version_info.cc diff --git a/tizen_src/impl/common/version_info.h b/tizen_src/ewk/efl_integration/common/version_info.h similarity index 100% rename from tizen_src/impl/common/version_info.h rename to tizen_src/ewk/efl_integration/common/version_info.h diff --git a/tizen_src/impl/common/version_info_efl.h b/tizen_src/ewk/efl_integration/common/version_info_efl.h similarity index 100% rename from tizen_src/impl/common/version_info_efl.h rename to tizen_src/ewk/efl_integration/common/version_info_efl.h diff --git a/tizen_src/impl/common/web_contents_utils.cc b/tizen_src/ewk/efl_integration/common/web_contents_utils.cc similarity index 93% rename from tizen_src/impl/common/web_contents_utils.cc rename to tizen_src/ewk/efl_integration/common/web_contents_utils.cc index 3dc5c00..b5e07fa 100644 --- a/tizen_src/impl/common/web_contents_utils.cc +++ b/tizen_src/ewk/efl_integration/common/web_contents_utils.cc @@ -5,7 +5,7 @@ #include "common/web_contents_utils.h" #include "browser_context_efl.h" -#include "browser/web_contents/web_contents_impl_efl.h" +#include "content/browser/web_contents/web_contents_impl_efl.h" #include "content/public/browser/render_frame_host.h" #include "content/public/browser/render_view_host.h" #include "content/public/browser/web_contents.h" @@ -55,7 +55,7 @@ EWebView* WebViewFromWebContents(content::WebContents* web_contents) { CHECK(web_contents); content::WebContentsImplEfl* web_contents_efl = static_cast(web_contents); - EWebView* wv = web_contents_efl->GetEWebView(); + EWebView* wv = static_cast(web_contents_efl->GetPlatformData()); // Each WebContents in EFL port should always have EWebView hosting it. CHECK(wv); return wv; diff --git a/tizen_src/impl/common/web_contents_utils.h b/tizen_src/ewk/efl_integration/common/web_contents_utils.h similarity index 100% rename from tizen_src/impl/common/web_contents_utils.h rename to tizen_src/ewk/efl_integration/common/web_contents_utils.h diff --git a/tizen_src/impl/content_browser_client_efl.cc b/tizen_src/ewk/efl_integration/content_browser_client_efl.cc old mode 100755 new mode 100644 similarity index 98% rename from tizen_src/impl/content_browser_client_efl.cc rename to tizen_src/ewk/efl_integration/content_browser_client_efl.cc index c767c51..60e2e62 --- a/tizen_src/impl/content_browser_client_efl.cc +++ b/tizen_src/ewk/efl_integration/content_browser_client_efl.cc @@ -10,13 +10,14 @@ #include "browser_context_efl.h" #include "web_contents_delegate_efl.h" #include "devtools_manager_delegate_efl.h" -#include "browser/web_contents/web_contents_view_efl.h" +#include "browser/editor_client_observer.h" #include "browser/geolocation/access_token_store_efl.h" #include "browser/geolocation/geolocation_permission_context_efl.h" -#include "browser/renderer_host/render_message_filter_efl.h" +#include "browser/render_message_filter_efl.h" #include "browser/resource_dispatcher_host_delegate_efl.h" #include "browser/vibration/vibration_message_filter.h" #include "browser/web_view_browser_message_filter.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" @@ -24,7 +25,6 @@ #include "content/public/browser/web_contents.h" #include "content/public/common/show_desktop_notification_params.h" #include "common/web_contents_utils.h" -#include "components/editing/content/browser/editor_client_observer.h" #if defined(OS_TIZEN) #include "browser/geolocation/location_provider_efl.h" diff --git a/tizen_src/impl/content_browser_client_efl.h b/tizen_src/ewk/efl_integration/content_browser_client_efl.h similarity index 99% rename from tizen_src/impl/content_browser_client_efl.h rename to tizen_src/ewk/efl_integration/content_browser_client_efl.h index c47cad4..afde9fe 100644 --- a/tizen_src/impl/content_browser_client_efl.h +++ b/tizen_src/ewk/efl_integration/content_browser_client_efl.h @@ -118,7 +118,7 @@ class ContentBrowserClientEfl: public ContentBrowserClient { virtual void SetCertificatePem(const net::SSLInfo& ssl_info, int render_process_id, - int render_view_id) override; + int render_view_id); void RequestPermission( content::PermissionType permission, diff --git a/tizen_src/impl/content_main_delegate_efl.cc b/tizen_src/ewk/efl_integration/content_main_delegate_efl.cc similarity index 97% rename from tizen_src/impl/content_main_delegate_efl.cc rename to tizen_src/ewk/efl_integration/content_main_delegate_efl.cc index 8d75594..9cd09b3 100644 --- a/tizen_src/impl/content_main_delegate_efl.cc +++ b/tizen_src/ewk/efl_integration/content_main_delegate_efl.cc @@ -6,13 +6,13 @@ #include "base/path_service.h" #include "content/browser/gpu/gpu_process_host.h" +#include "content/common/paths_efl.h" #include "content/gpu/in_process_gpu_thread.h" +#include "content/gpu/gpu_thread_override_efl.h" #include "content/public/common/content_switches.h" #include "browser/resource_dispatcher_host_delegate_efl.h" #include "command_line_efl.h" #include "content_browser_client_efl.h" -#include "gpu/gpu_thread_override_efl.h" -#include "paths_efl.h" #include "locale_efl.h" namespace content { diff --git a/tizen_src/impl/content_main_delegate_efl.h b/tizen_src/ewk/efl_integration/content_main_delegate_efl.h similarity index 100% rename from tizen_src/impl/content_main_delegate_efl.h rename to tizen_src/ewk/efl_integration/content_main_delegate_efl.h diff --git a/tizen_src/impl/context_menu_controller_efl.cc b/tizen_src/ewk/efl_integration/context_menu_controller_efl.cc similarity index 99% rename from tizen_src/impl/context_menu_controller_efl.cc rename to tizen_src/ewk/efl_integration/context_menu_controller_efl.cc index 82adaa0..1d761e3 100644 --- a/tizen_src/impl/context_menu_controller_efl.cc +++ b/tizen_src/ewk/efl_integration/context_menu_controller_efl.cc @@ -6,10 +6,9 @@ #include #include -#include "API/ewk_context_menu_private.h" #include "base/files/file_path.h" #include "base/path_service.h" -#include "components/clipboard/clipboard_helper_efl.h" +#include "ui/base/clipboard/clipboard_helper_efl.h" #include "context_menu_controller_efl.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/download_manager.h" @@ -17,14 +16,14 @@ #include "eweb_view.h" #include "net/base/net_util.h" #include "net/base/filename_util.h" -#include "paths_efl.h" +#include "content/common/paths_efl.h" #include "third_party/WebKit/public/platform/WebReferrerPolicy.h" #include "ui/base/clipboard/clipboard.h" +#include "private/ewk_context_menu_private.h" #include "tizen_webview/public/tw_webview.h" #include "tizen_webview/public/tw_selection_controller.h" -// TODO: remove this header dependency #include "selection_controller_efl.h" #if defined(OS_TIZEN_MOBILE) @@ -166,10 +165,12 @@ void ContextMenuControllerEfl::GetProposedContextMenu() { AddItemToPropsedList(MENU_ITEM_TYPE_ACTION, MENU_ITEM_SELECT_ALL, std::string(dgettext("WebKit", "IDS_WEBVIEW_OPT_SELECT_ALL_ABB"))); } +#if !defined(EWK_BRINGUP) if (params_.is_draggable) { AddItemToPropsedList(MENU_ITEM_TYPE_ACTION, MENU_ITEM_DRAG, std::string(dgettext("WebKit", "IDS_WEBVIEW_OPT_DRAG_AND_DROP"))); } +#endif if (params_.is_editable && ClipboardHelperEfl::NumberOfItems() > 0) { AddItemToPropsedList(MENU_ITEM_TYPE_ACTION, MENU_ITEM_CLIPBOARD, std::string(dgettext("WebKit", "IDS_WEBVIEW_OPT_CLIPBOARD"))); @@ -821,12 +822,14 @@ void ContextMenuControllerEfl::MenuItemSelected(ContextMenuItemEfl* menu_item) ClipboardHelperEfl::GetInstance()->OpenClipboardWindow(view, true); break; } +#if !defined(EWK_BRINGUP) case MENU_ITEM_DRAG: { RenderViewHost* rvh = web_contents_.GetRenderViewHost(); rvh->StartDragging(); context_menu_show_pos_.SetPoint(params_.x, params_.y); break; } +#endif default: CustomMenuItemSelected(menu_item); } diff --git a/tizen_src/impl/context_menu_controller_efl.h b/tizen_src/ewk/efl_integration/context_menu_controller_efl.h similarity index 100% rename from tizen_src/impl/context_menu_controller_efl.h rename to tizen_src/ewk/efl_integration/context_menu_controller_efl.h diff --git a/tizen_src/impl/cookie_manager.cc b/tizen_src/ewk/efl_integration/cookie_manager.cc similarity index 100% rename from tizen_src/impl/cookie_manager.cc rename to tizen_src/ewk/efl_integration/cookie_manager.cc diff --git a/tizen_src/impl/cookie_manager.h b/tizen_src/ewk/efl_integration/cookie_manager.h similarity index 100% rename from tizen_src/impl/cookie_manager.h rename to tizen_src/ewk/efl_integration/cookie_manager.h diff --git a/tizen_src/impl/devtools_delegate_efl.cc b/tizen_src/ewk/efl_integration/devtools_delegate_efl.cc similarity index 98% rename from tizen_src/impl/devtools_delegate_efl.cc rename to tizen_src/ewk/efl_integration/devtools_delegate_efl.cc index d605941..b577245 100644 --- a/tizen_src/impl/devtools_delegate_efl.cc +++ b/tizen_src/ewk/efl_integration/devtools_delegate_efl.cc @@ -42,7 +42,7 @@ class TCPServerSocketFactory : content::DevToolsHttpHandler::ServerSocketFactory( address, port, backlog) {} - virtual scoped_ptr Create() const { + scoped_ptr Create() const override { return scoped_ptr( new net::TCPServerSocket(NULL, net::NetLog::Source())); } diff --git a/tizen_src/impl/devtools_delegate_efl.h b/tizen_src/ewk/efl_integration/devtools_delegate_efl.h similarity index 100% rename from tizen_src/impl/devtools_delegate_efl.h rename to tizen_src/ewk/efl_integration/devtools_delegate_efl.h diff --git a/tizen_src/impl/devtools_manager_delegate_efl.cc b/tizen_src/ewk/efl_integration/devtools_manager_delegate_efl.cc similarity index 100% rename from tizen_src/impl/devtools_manager_delegate_efl.cc rename to tizen_src/ewk/efl_integration/devtools_manager_delegate_efl.cc diff --git a/tizen_src/impl/devtools_manager_delegate_efl.h b/tizen_src/ewk/efl_integration/devtools_manager_delegate_efl.h similarity index 100% rename from tizen_src/impl/devtools_manager_delegate_efl.h rename to tizen_src/ewk/efl_integration/devtools_manager_delegate_efl.h diff --git a/tizen_src/ewk/efl_integration/efl_integration.gypi b/tizen_src/ewk/efl_integration/efl_integration.gypi new file mode 100644 index 0000000..a77d7cb --- /dev/null +++ b/tizen_src/ewk/efl_integration/efl_integration.gypi @@ -0,0 +1,522 @@ +# 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. + +{ + 'variables': { + 'edje_compiler%': 'edje_cc', + }, + + 'targets': [{ + 'target_name': 'chromium-ewk', + 'type': 'shared_library', + + 'include_dirs': [ + '.', + 'public', + '<(DEPTH)/third_party/skia/include/core', + '<(DEPTH)/v8/include', + '<(SHARED_INTERMEDIATE_DIR)/webkit/', + ], + + 'dependencies': [ + '<(DEPTH)/tizen_src/build/system.gyp:ecore', + '<(DEPTH)/tizen_src/build/system.gyp:evas', + '<(DEPTH)/tizen_src/build/system.gyp:ecore-evas', + '<(DEPTH)/tizen_src/build/system.gyp:elementary', + '<(DEPTH)/tizen_src/build/system.gyp:gstreamer', + '<(DEPTH)/tizen_src/ewk/po_tizen/locale.gyp:locale_efl', + + '<(DEPTH)/content/content.gyp:content', + '<(DEPTH)/content/content.gyp:content_app_browser', + '<(DEPTH)/content/content_shell_and_tests.gyp:content_shell_resources', + '<(DEPTH)/content/content_shell_and_tests.gyp:content_shell_pak', + '<(DEPTH)/components/components.gyp:visitedlink_browser', + '<(DEPTH)/components/components.gyp:visitedlink_renderer', + '<(DEPTH)/components/components.gyp:sessions_content', + '<(DEPTH)/components/components.gyp:autofill_content_renderer', + '<(DEPTH)/components/components.gyp:autofill_content_browser', + '<(DEPTH)/components/components.gyp:password_manager_core_common', + '<(DEPTH)/components/components.gyp:password_manager_core_browser', + #'<(DEPTH)/chrome/chrome_resources.gyp:packed_resources', + ], + + 'defines': [ + 'HAVE_ECORE_X= +//#include #include "base/pickle.h" #include "browser/navigation_policy_handler_efl.h" -#include "browser/renderer_host/render_widget_host_view_efl.h" -#include "browser/renderer_host/web_event_factory_efl.h" #include "browser/scoped_allow_wait_for_legacy_web_view_api.h" -#include "browser/web_contents/web_contents_view_efl.h" #include "common/content_client_efl.h" -#include "common/render_messages_efl.h" +#include "common/render_messages_ewk.h" #include "common/version_info.h" #include "components/sessions/serialized_navigation_entry.h" #include "components/sessions/content/content_serialized_navigation_builder.h" -#include "API/ewk_policy_decision_private.h" -#include "API/ewk_settings_private.h" -#include "API/ewk_text_style_private.h" +#include "private/ewk_policy_decision_private.h" +#include "private/ewk_settings_private.h" +#include "private/ewk_text_style_private.h" #include "web_contents_delegate_efl.h" #include "public/platform/WebString.h" #include "base/command_line.h" @@ -27,9 +24,12 @@ #include "base/strings/utf_string_conversions.h" #include "content/common/view_messages.h" #include "content/common/frame_messages.h" +#include "content/browser/renderer_host/render_widget_host_view_efl.h" +#include "content/browser/renderer_host/web_event_factory_efl.h" #include "content/browser/renderer_host/ui_events_helper.h" #include "content/browser/renderer_host/render_view_host_impl.h" #include "content/browser/web_contents/web_contents_view.h" +#include "content/browser/web_contents/web_contents_view_efl.h" #include "content/public/browser/browser_message_filter.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/navigation_entry.h" @@ -162,7 +162,7 @@ class WebViewAsyncRequestHitTestDataUserCallback: public WebViewAsyncRequestHitT , user_data_(user_data) { } - virtual void Run(tizen_webview::Hit_Test *hit_test, EWebView* web_view) { + void Run(tizen_webview::Hit_Test *hit_test, EWebView* web_view) override { DCHECK(callback_); callback_(web_view->evas_object(), GetX(), GetY(), GetMode(), hit_test, user_data_); } @@ -186,7 +186,7 @@ class WebViewAsyncRequestHitTestDataInternalCallback: public WebViewAsyncRequest , callback_(cb) { } - void Run(tizen_webview::Hit_Test* hit_test, EWebView* web_view) { + void Run(tizen_webview::Hit_Test* hit_test, EWebView* web_view) override { DCHECK(callback_); (web_view->*callback_)(GetX(), GetY(), GetMode(), hit_test); } @@ -359,7 +359,9 @@ RenderWidgetHostViewEfl* EWebView::rwhv() const { EWebView::EWebView(tizen_webview::WebView* owner, tizen_webview::WebContext* context, Evas_Object* object) : public_webview_(owner), +#if defined(EWK_REFACTOR) evas_event_handler_(NULL), +#endif context_(context), evas_object_(object), touch_events_enabled_(false), @@ -381,7 +383,9 @@ void EWebView::Initialize() { return; } +#if defined(EWK_REFACTOR) evas_event_handler_ = new tizen_webview::WebViewEvasEventHandler(public_webview_); +#endif selection_controller_.reset(new content::SelectionControllerEfl(this)); InitializeContent(); @@ -394,20 +398,24 @@ void EWebView::Initialize() { back_forward_list_.reset(new tizen_webview::BackForwardList( web_contents_->GetController())); +#if defined(EWK_REFACTOR) // Activate Event handler evas_event_handler_->BindFocusEventHandlers(); evas_event_handler_->BindKeyEventHandlers(); +#endif geolocation_permission_cb_.reset(new WebViewGeolocationPermissionCallback(NULL, NULL)); unfocus_allow_cb_.reset(new WebViewUnfocusAllowCallback(NULL, NULL)); #if defined(OS_TIZEN_MOBILE) +#if defined(EWK_REFACTOR) bool enable = GetTiltZoomEnabled(); if (enable) { evas_event_handler_->BindMotionEventHandlers(); } else { evas_event_handler_->UnbindMotionEventHandlers(); } +#endif //evas_object_smart_callback_call(evas_object(), "motion,enable", (void*)&enable); wkext_motion_tilt_enable_set(evas_object_, static_cast(enable), g_default_tilt_motion_sensitivity); @@ -445,10 +453,12 @@ EWebView::~EWebView() return; } StopInspectorServer(); // inside is check to Inspector is running +#if defined(EWK_REFACTOR) GetEvasEventHandler()->UnbindFocusEventHandlers(); GetEvasEventHandler()->UnbindKeyEventHandlers(); GetEvasEventHandler()->UnbindTouchEventHandlers(); GetEvasEventHandler()->UnbindMouseEventHandlers(); +#endif context_menu_.reset(); mhtml_callback_map_.Clear(); @@ -465,7 +475,9 @@ EWebView::~EWebView() formNavigation_.nextState = false; #endif // evas_object_del(evas_object()); +#if defined(EWK_REFACTOR) delete evas_event_handler_; +#endif public_webview_ = NULL; // Release manually those scoped pointers to @@ -733,25 +745,6 @@ void EWebView::InvokePolicyNavigationCallback(RenderViewHost* rvh, *handled = policy_decision->GetImpl()->GetNavigationPolicyHandler()->GetDecision() == NavigationPolicyHandlerEfl::Handled; } -void EWebView::HandleTouchEvents(tizen_webview::Touch_Event_Type type, const Eina_List *points, const Evas_Modifier *modifiers) -{ - const Eina_List* l; - void* data; - EINA_LIST_FOREACH(points, l, data) { - const tizen_webview::Touch_Point* point = reinterpret_cast(data); - if (point->state == EVAS_TOUCH_POINT_STILL) { - // Chromium doesn't expect (and doesn't like) these events. - continue; - } - if (rwhv()) { - ui::TouchEvent touch_event = WebEventFactoryEfl::toUITouchEvent(point, - evas_object(), gfx::Screen::GetNativeScreen()-> - GetPrimaryDisplay().device_scale_factor()); - rwhv()->HandleTouchEvent(&touch_event); - } - } -} - /* FIXME: Figure out wher this code should be placed. void EWebView::DispatchPostponedGestureEvent(ui::GestureEvent* event) { Ewk_Settings* settings = GetSettings(); @@ -892,6 +885,7 @@ void EWebView::SetTouchEventsEnabled(bool enabled) { touch_events_enabled_ = enabled; +#if defined(EWK_REFACTOR) if (enabled) { GetEvasEventHandler()->UnbindMouseEventHandlers(); GetEvasEventHandler()->BindTouchEventHandlers(); @@ -900,6 +894,7 @@ void EWebView::SetTouchEventsEnabled(bool enabled) { // I think it should be called to be symmetric with "enabled" case GetEvasEventHandler()->UnbindTouchEventHandlers(); } +#endif } bool EWebView::MouseEventsEnabled() const { @@ -912,6 +907,7 @@ void EWebView::SetMouseEventsEnabled(bool enabled) { mouse_events_enabled_ = enabled; +#if defined(EWK_REFACTOR) if (enabled) { GetEvasEventHandler()->UnbindTouchEventHandlers(); GetEvasEventHandler()->BindMouseEventHandlers(); @@ -920,6 +916,7 @@ void EWebView::SetMouseEventsEnabled(bool enabled) { // I think it should be called to be symmetric with "enabled" case GetEvasEventHandler()->UnbindMouseEventHandlers(); } +#endif } namespace { @@ -1055,7 +1052,12 @@ const char* EWebView::GetSelectedText() const { } bool EWebView::IsLastAvailableTextEmpty() const { +#if defined(EWK_REFACTOR) return rwhv() ? rwhv()->IsLastAvailableTextEmpty() : true; +#else + NOTIMPLEMENTED(); + return false; +#endif } Ewk_Settings* EWebView::GetSettings() { @@ -1392,6 +1394,7 @@ void EWebView::SetScale(double scale_factor, int x, int y) { } bool EWebView::GetScrollPosition(int* x, int* y) const { +#if defined(EWK_REFACTOR) DCHECK(x); DCHECK(y); if (!rwhv()) { @@ -1408,9 +1411,14 @@ bool EWebView::GetScrollPosition(int* x, int* y) const { *y = scroll_position.y(); } return true; +#else + NOTIMPLEMENTED(); + return false; +#endif } void EWebView::SetScroll(int x, int y) { +#if defined(EWK_REFACTOR) RenderViewHost* render_view_host = web_contents_->GetRenderViewHost(); if (!render_view_host) return; @@ -1424,6 +1432,9 @@ void EWebView::SetScroll(int x, int y) { } render_view_host->Send(new EwkViewMsg_SetScroll(render_view_host->GetRoutingID(), x, y)); +#else + NOTIMPLEMENTED(); +#endif } void EWebView::UseSettingsFont() { @@ -1462,11 +1473,19 @@ void EWebView::GetScrollSize(int* width, int* height) { } void EWebView::SelectRange(const gfx::Point& start, const gfx::Point& end) { +#if defined(EWK_REFACTOR) rwhv()->SelectRange(start, end); +#else + NOTIMPLEMENTED(); +#endif } void EWebView::MoveCaret(const gfx::Point& point) { - rwhv()->MoveCaret(point); +#if defined(EWK_REFACTOR) + rwhv()->MoveCaret(point); +#else + NOTIMPLEMENTED(); +#endif } void EWebView::QuerySelectionStyle() { @@ -1489,8 +1508,10 @@ void EWebView::SelectClosestWord(const gfx::Point& touch_point) { EvasToBlinkCords(touch_point.x(), touch_point.y(), &view_x, &view_y); RenderViewHost* render_view_host = web_contents_->GetRenderViewHost(); +#if !defined(EWK_BRINGUP) render_view_host->Send(new ViewMsg_SelectClosestWord( render_view_host->GetRoutingID(), view_x, view_y)); +#endif } void EWebView::SelectLinkText(const gfx::Point& touch_point) { @@ -2094,7 +2115,12 @@ void EWebView::SetCertificatePem(const std::string& certificate) { } bool EWebView::IsDragging() const { +#if defined(EWK_REFACTOR) return GetWebContentsViewEfl()->IsDragging(); +#else + NOTIMPLEMENTED(); + return false; +#endif } void EWebView::ShowFileChooser(const content::FileChooserParams& params) { @@ -2123,7 +2149,11 @@ void EWebView::ShowFileChooser(const content::FileChooserParams& params) { } void EWebView::SetViewMode(blink::WebViewMode view_mode) { +#if defined(EWK_REFACTOR) GetWebContentsViewEfl()->SetViewMode(view_mode); +#else + NOTIMPLEMENTED(); +#endif } gfx::Point EWebView::GetContextMenuPosition() const { @@ -2159,22 +2189,34 @@ void EWebView::InputPickerShow( } bool EWebView::IsIMEShow() { +#if defined(EWK_REFACTOR) if (rwhv()->im_context()) return rwhv()->im_context()->IsShow(); - return false; +#else + NOTIMPLEMENTED(); + return false; +#endif } gfx::Rect EWebView::GetIMERect() { +#if defined(EWK_REFACTOR) if (rwhv()->im_context()) return rwhv()->im_context()->GetIMERect(); - return gfx::Rect(); +#else + NOTIMPLEMENTED(); + return gfx::Rect(); +#endif } void EWebView::ScrollFocusedEditableNode() { +#if defined(EWK_REFACTOR) if (rwhv()) rwhv()->ScrollFocusedEditableNode(); +#else + NOTIMPLEMENTED(); +#endif } void EWebView::LoadNotFoundErrorPage(const std::string& invalidUrl) { @@ -2360,113 +2402,183 @@ void EWebView::UrlRequestSet(const char* url, } bool EWebView::HandleShow() { +#if defined(EWK_REFACTOR) if (rwhv()) { rwhv()->HandleShow(); return true; } return false; +#else + NOTIMPLEMENTED(); + return false; +#endif } bool EWebView::HandleHide() { +#if defined(EWK_REFACTOR) if (rwhv()) { rwhv()->HandleHide(); return true; } return false; +#else + NOTIMPLEMENTED(); + return false; +#endif } bool EWebView::HandleMove(int x, int y) { +#if defined(EWK_REFACTOR) if (rwhv()) { rwhv()->HandleMove(x, y); return true; } return false; +#else + NOTIMPLEMENTED(); + return false; +#endif } bool EWebView::HandleResize(int width, int height) { +#if defined(EWK_REFACTOR) if (rwhv()) { rwhv()->HandleResize(width, height); return true; } return false; +#else + NOTIMPLEMENTED(); + return false; +#endif } bool EWebView::HandleFocusIn() { +#if defined(EWK_REFACTOR) if (rwhv()) { rwhv()->HandleFocusIn(); return true; } return false; +#else + NOTIMPLEMENTED(); + return false; +#endif } bool EWebView::HandleFocusOut() { +#if defined(EWK_REFACTOR) if (rwhv()) { rwhv()->HandleFocusOut(); return true; } return false; +#else + NOTIMPLEMENTED(); + return false; +#endif } bool EWebView::HandleEvasEvent(const Evas_Event_Mouse_Down* event) { +#if defined(EWK_REFACTOR) if (rwhv()) { rwhv()->HandleEvasEvent(event); return true; } return false; +#else + NOTIMPLEMENTED(); + return false; +#endif } bool EWebView::HandleEvasEvent(const Evas_Event_Mouse_Up* event) { +#if defined(EWK_REFACTOR) if (rwhv()) { rwhv()->HandleEvasEvent(event); return true; } return false; +#else + NOTIMPLEMENTED(); + return false; +#endif } bool EWebView::HandleEvasEvent(const Evas_Event_Mouse_Move* event) { +#if defined(EWK_REFACTOR) if (rwhv()) { rwhv()->HandleEvasEvent(event); return true; } return false; +#else + NOTIMPLEMENTED(); + return false; +#endif } bool EWebView::HandleEvasEvent(const Evas_Event_Mouse_Wheel* event) { +#if defined(EWK_REFACTOR) if (rwhv()) { rwhv()->HandleEvasEvent(event); return true; } return false; +#else + NOTIMPLEMENTED(); + return false; +#endif } bool EWebView::HandleEvasEvent(const Evas_Event_Key_Down* event) { +#if defined(EWK_REFACTOR) if (rwhv()) { rwhv()->HandleEvasEvent(event); return true; } return false; +#else + NOTIMPLEMENTED(); + return false; +#endif } bool EWebView::HandleEvasEvent(const Evas_Event_Key_Up* event) { +#if defined(EWK_REFACTOR) if (rwhv()) { rwhv()->HandleEvasEvent(event); return true; } return false; +#else + NOTIMPLEMENTED(); + return false; +#endif } bool EWebView::HandleGesture(ui::GestureEvent* event) { +#if defined(EWK_REFACTOR) if (rwhv()) { rwhv()->HandleGesture(event); return true; } return false; +#else + NOTIMPLEMENTED(); + return false; +#endif } bool EWebView::HandleTouchEvent(ui::TouchEvent* event) { +#if defined(EWK_REFACTOR) if (rwhv()) { rwhv()->HandleTouchEvent(event); return true; } return false; +#else + NOTIMPLEMENTED(); + return false; +#endif } diff --git a/tizen_src/impl/eweb_view.h b/tizen_src/ewk/efl_integration/eweb_view.h similarity index 98% rename from tizen_src/impl/eweb_view.h rename to tizen_src/ewk/efl_integration/eweb_view.h index 682f0cf..d8ec219 100644 --- a/tizen_src/impl/eweb_view.h +++ b/tizen_src/ewk/efl_integration/eweb_view.h @@ -31,10 +31,10 @@ #include "base/id_map.h" #include "context_menu_controller_efl.h" #include "eweb_context.h" -#include "API/ewk_hit_test_private.h" -#include "API/ewk_auth_challenge_private.h" -#include "API/ewk_settings_private.h" -#include "API/ewk_web_application_icon_data_private.h" +#include "private/ewk_hit_test_private.h" +#include "private/ewk_auth_challenge_private.h" +#include "private/ewk_settings_private.h" +#include "private/ewk_web_application_icon_data_private.h" #include "eweb_view_callbacks.h" #include "selection_controller_efl.h" #include "web_contents_delegate_efl.h" @@ -239,7 +239,9 @@ class EWebView { void CreateNewWindow(content::WebContentsDelegate::WebContentsCreateCallback); tizen_webview::WebView* GetPublicWebView(); +#if defined(EWK_REFACTOR) tizen_webview::WebViewEvasEventHandler* GetEvasEventHandler() { return evas_event_handler_; } +#endif tizen_webview::WebContext* context() const { return context_.get(); } Evas_Object* evas_object() const { return evas_object_; } Evas* GetEvas() const { return evas_object_evas_get(evas_object_); } @@ -281,7 +283,6 @@ class EWebView { void SetTouchEventsEnabled(bool enabled); bool MouseEventsEnabled() const; void SetMouseEventsEnabled(bool enabled); - void HandleTouchEvents(tizen_webview::Touch_Event_Type type, const Eina_List *points, const Evas_Modifier *modifiers); void Show(); void Hide(); bool ExecuteJavaScript(const char* script, tizen_webview::View_Script_Execute_Callback callback, void* userdata); @@ -509,7 +510,9 @@ class EWebView { #endif tizen_webview::WebView* public_webview_; +#if defined(EWK_REFACTOR) tizen_webview::WebViewEvasEventHandler* evas_event_handler_; +#endif scoped_refptr context_; scoped_refptr old_context_; scoped_ptr web_contents_; diff --git a/tizen_src/impl/eweb_view_callbacks.h b/tizen_src/ewk/efl_integration/eweb_view_callbacks.h similarity index 97% rename from tizen_src/impl/eweb_view_callbacks.h rename to tizen_src/ewk/efl_integration/eweb_view_callbacks.h index 5a244b3..0c7f772 100644 --- a/tizen_src/impl/eweb_view_callbacks.h +++ b/tizen_src/ewk/efl_integration/eweb_view_callbacks.h @@ -21,21 +21,21 @@ #ifndef EWEB_VIEW_CALLBACKS #define EWEB_VIEW_CALLBACKS +#include +#include + #include "eweb_view.h" -#include "API/ewk_console_message_private.h" -#include "API/ewk_error_private.h" -#include "API/ewk_context_menu_private.h" -#include "API/ewk_auth_challenge_private.h" -#include "API/ewk_text_style_private.h" -#include "API/ewk_geolocation_private.h" -#include "API/ewk_certificate_private.h" -#include "API/ewk_user_media_private.h" +#include "private/ewk_console_message_private.h" +#include "private/ewk_error_private.h" +#include "private/ewk_context_menu_private.h" +#include "private/ewk_auth_challenge_private.h" +#include "private/ewk_text_style_private.h" +#include "private/ewk_geolocation_private.h" +#include "private/ewk_certificate_private.h" +#include "private/ewk_user_media_private.h" #include "tizen_webview/public/tw_custom_handlers.h" #include "tizen_webview/public/tw_policy_decision.h" -#include -#include - typedef struct EwkObject Ewk_Auth_Request; typedef struct EwkObject Ewk_Download_Job; typedef struct EwkObject Ewk_File_Chooser_Request; diff --git a/tizen_src/impl/ewk_global_data.cc b/tizen_src/ewk/efl_integration/ewk_global_data.cc similarity index 98% rename from tizen_src/impl/ewk_global_data.cc rename to tizen_src/ewk/efl_integration/ewk_global_data.cc index d5b6469..9c120c4 100644 --- a/tizen_src/impl/ewk_global_data.cc +++ b/tizen_src/ewk/efl_integration/ewk_global_data.cc @@ -22,14 +22,14 @@ #include "content/utility/in_process_utility_thread.h" #include "content/browser/utility_process_host_impl.h" #include "content/browser/renderer_host/render_process_host_impl.h" -#include "gpu/gpu_thread_override_efl.h" +#include "content/gpu/gpu_thread_override_efl.h" #include "tizen_webview/public/tw_web_context.h" #include "ui/base/resource/resource_bundle.h" #include "command_line_efl.h" #include "content_main_delegate_efl.h" #include "message_pump_for_ui_efl.h" -#include "screen_efl.h" +#include "ui/gfx/screen_efl.h" #ifdef OS_TIZEN_MOBILE #include diff --git a/tizen_src/impl/ewk_global_data.h b/tizen_src/ewk/efl_integration/ewk_global_data.h similarity index 100% rename from tizen_src/impl/ewk_global_data.h rename to tizen_src/ewk/efl_integration/ewk_global_data.h diff --git a/tizen_src/impl/file_chooser_controller_efl.cc b/tizen_src/ewk/efl_integration/file_chooser_controller_efl.cc similarity index 100% rename from tizen_src/impl/file_chooser_controller_efl.cc rename to tizen_src/ewk/efl_integration/file_chooser_controller_efl.cc diff --git a/tizen_src/impl/file_chooser_controller_efl.h b/tizen_src/ewk/efl_integration/file_chooser_controller_efl.h similarity index 100% rename from tizen_src/impl/file_chooser_controller_efl.h rename to tizen_src/ewk/efl_integration/file_chooser_controller_efl.h diff --git a/tizen_src/impl/http_user_agent_settings_efl.cc b/tizen_src/ewk/efl_integration/http_user_agent_settings_efl.cc similarity index 100% rename from tizen_src/impl/http_user_agent_settings_efl.cc rename to tizen_src/ewk/efl_integration/http_user_agent_settings_efl.cc diff --git a/tizen_src/impl/http_user_agent_settings_efl.h b/tizen_src/ewk/efl_integration/http_user_agent_settings_efl.h similarity index 100% rename from tizen_src/impl/http_user_agent_settings_efl.h rename to tizen_src/ewk/efl_integration/http_user_agent_settings_efl.h diff --git a/tizen_src/impl/locale_efl.cc b/tizen_src/ewk/efl_integration/locale_efl.cc similarity index 98% rename from tizen_src/impl/locale_efl.cc rename to tizen_src/ewk/efl_integration/locale_efl.cc index 10d53c8..5ac2ea5 100644 --- a/tizen_src/impl/locale_efl.cc +++ b/tizen_src/ewk/efl_integration/locale_efl.cc @@ -13,7 +13,7 @@ #include "base/path_service.h" #include "content/public/common/content_switches.h" #include "ui/base/resource/resource_bundle.h" -#include "paths_efl.h" +#include "content/common/paths_efl.h" #if defined(OS_TIZEN) #include diff --git a/tizen_src/impl/locale_efl.h b/tizen_src/ewk/efl_integration/locale_efl.h similarity index 100% rename from tizen_src/impl/locale_efl.h rename to tizen_src/ewk/efl_integration/locale_efl.h diff --git a/tizen_src/impl/memory_purger.cc b/tizen_src/ewk/efl_integration/memory_purger.cc similarity index 98% rename from tizen_src/impl/memory_purger.cc rename to tizen_src/ewk/efl_integration/memory_purger.cc index f4c7b62..c6f063c 100644 --- a/tizen_src/impl/memory_purger.cc +++ b/tizen_src/ewk/efl_integration/memory_purger.cc @@ -10,7 +10,7 @@ #include "base/allocator/allocator_extension.h" #include "base/bind.h" #include "base/threading/thread.h" -#include "common/render_messages_efl.h" +#include "content/common/render_messages_efl.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/render_widget_host.h" #include "content/public/browser/browser_thread.h" diff --git a/tizen_src/impl/memory_purger.h b/tizen_src/ewk/efl_integration/memory_purger.h similarity index 100% rename from tizen_src/impl/memory_purger.h rename to tizen_src/ewk/efl_integration/memory_purger.h diff --git a/tizen_src/impl/message_pump_for_ui_efl.cc b/tizen_src/ewk/efl_integration/message_pump_for_ui_efl.cc similarity index 100% rename from tizen_src/impl/message_pump_for_ui_efl.cc rename to tizen_src/ewk/efl_integration/message_pump_for_ui_efl.cc diff --git a/tizen_src/impl/message_pump_for_ui_efl.h b/tizen_src/ewk/efl_integration/message_pump_for_ui_efl.h similarity index 100% rename from tizen_src/impl/message_pump_for_ui_efl.h rename to tizen_src/ewk/efl_integration/message_pump_for_ui_efl.h diff --git a/tizen_src/impl/network_delegate_efl.cc b/tizen_src/ewk/efl_integration/network_delegate_efl.cc similarity index 100% rename from tizen_src/impl/network_delegate_efl.cc rename to tizen_src/ewk/efl_integration/network_delegate_efl.cc diff --git a/tizen_src/impl/network_delegate_efl.h b/tizen_src/ewk/efl_integration/network_delegate_efl.h similarity index 100% rename from tizen_src/impl/network_delegate_efl.h rename to tizen_src/ewk/efl_integration/network_delegate_efl.h diff --git a/tizen_src/impl/popup_controller_efl.cc b/tizen_src/ewk/efl_integration/popup_controller_efl.cc similarity index 99% rename from tizen_src/impl/popup_controller_efl.cc rename to tizen_src/ewk/efl_integration/popup_controller_efl.cc index 18ef52f..a84a5e1 100644 --- a/tizen_src/impl/popup_controller_efl.cc +++ b/tizen_src/ewk/efl_integration/popup_controller_efl.cc @@ -2,13 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/logging.h" -#include "popup_controller_efl.h" -#include "components/clipboard/clipboard_helper_efl.h" #include #include #include +#include "base/logging.h" +#include "popup_controller_efl.h" +#include "ui/base/clipboard/clipboard_helper_efl.h" + #ifdef TIZEN_CONTENTS_DETECTION #include #include diff --git a/tizen_src/impl/popup_controller_efl.h b/tizen_src/ewk/efl_integration/popup_controller_efl.h similarity index 100% rename from tizen_src/impl/popup_controller_efl.h rename to tizen_src/ewk/efl_integration/popup_controller_efl.h diff --git a/tizen_src/impl/API/ewk_auth_challenge_private.h b/tizen_src/ewk/efl_integration/private/ewk_auth_challenge_private.h similarity index 100% rename from tizen_src/impl/API/ewk_auth_challenge_private.h rename to tizen_src/ewk/efl_integration/private/ewk_auth_challenge_private.h diff --git a/tizen_src/impl/API/ewk_autofill_profile_private.cc b/tizen_src/ewk/efl_integration/private/ewk_autofill_profile_private.cc similarity index 100% rename from tizen_src/impl/API/ewk_autofill_profile_private.cc rename to tizen_src/ewk/efl_integration/private/ewk_autofill_profile_private.cc diff --git a/tizen_src/impl/API/ewk_autofill_profile_private.h b/tizen_src/ewk/efl_integration/private/ewk_autofill_profile_private.h similarity index 100% rename from tizen_src/impl/API/ewk_autofill_profile_private.h rename to tizen_src/ewk/efl_integration/private/ewk_autofill_profile_private.h diff --git a/tizen_src/impl/API/ewk_certificate_private.h b/tizen_src/ewk/efl_integration/private/ewk_certificate_private.h similarity index 100% rename from tizen_src/impl/API/ewk_certificate_private.h rename to tizen_src/ewk/efl_integration/private/ewk_certificate_private.h diff --git a/tizen_src/impl/API/ewk_console_message_private.h b/tizen_src/ewk/efl_integration/private/ewk_console_message_private.h similarity index 100% rename from tizen_src/impl/API/ewk_console_message_private.h rename to tizen_src/ewk/efl_integration/private/ewk_console_message_private.h diff --git a/tizen_src/impl/API/ewk_context_form_autofill_profile_private.cc b/tizen_src/ewk/efl_integration/private/ewk_context_form_autofill_profile_private.cc similarity index 100% rename from tizen_src/impl/API/ewk_context_form_autofill_profile_private.cc rename to tizen_src/ewk/efl_integration/private/ewk_context_form_autofill_profile_private.cc diff --git a/tizen_src/impl/API/ewk_context_form_autofill_profile_private.h b/tizen_src/ewk/efl_integration/private/ewk_context_form_autofill_profile_private.h similarity index 100% rename from tizen_src/impl/API/ewk_context_form_autofill_profile_private.h rename to tizen_src/ewk/efl_integration/private/ewk_context_form_autofill_profile_private.h diff --git a/tizen_src/impl/API/ewk_context_menu_private.h b/tizen_src/ewk/efl_integration/private/ewk_context_menu_private.h similarity index 100% rename from tizen_src/impl/API/ewk_context_menu_private.h rename to tizen_src/ewk/efl_integration/private/ewk_context_menu_private.h diff --git a/tizen_src/impl/API/ewk_cookie_manager_private.h b/tizen_src/ewk/efl_integration/private/ewk_cookie_manager_private.h similarity index 100% rename from tizen_src/impl/API/ewk_cookie_manager_private.h rename to tizen_src/ewk/efl_integration/private/ewk_cookie_manager_private.h diff --git a/tizen_src/impl/API/ewk_error_private.h b/tizen_src/ewk/efl_integration/private/ewk_error_private.h similarity index 100% rename from tizen_src/impl/API/ewk_error_private.h rename to tizen_src/ewk/efl_integration/private/ewk_error_private.h diff --git a/tizen_src/impl/API/ewk_geolocation_private.cc b/tizen_src/ewk/efl_integration/private/ewk_geolocation_private.cc similarity index 100% rename from tizen_src/impl/API/ewk_geolocation_private.cc rename to tizen_src/ewk/efl_integration/private/ewk_geolocation_private.cc diff --git a/tizen_src/impl/API/ewk_geolocation_private.h b/tizen_src/ewk/efl_integration/private/ewk_geolocation_private.h similarity index 100% rename from tizen_src/impl/API/ewk_geolocation_private.h rename to tizen_src/ewk/efl_integration/private/ewk_geolocation_private.h diff --git a/tizen_src/ewk/efl_integration/private/ewk_hit_test_private.cc b/tizen_src/ewk/efl_integration/private/ewk_hit_test_private.cc index 2ba4fa9..0dea03f 100644 --- a/tizen_src/ewk/efl_integration/private/ewk_hit_test_private.cc +++ b/tizen_src/ewk/efl_integration/private/ewk_hit_test_private.cc @@ -4,6 +4,77 @@ #include "ewk_hit_test_private.h" +using namespace tizen_webview; + +static void FreeHitTestAttributeHashData(void* data) { + eina_stringshare_del(static_cast(data)); + } + +_Ewk_Hit_Test::_Ewk_Hit_Test() + : context(TW_HIT_TEST_RESULT_CONTEXT_DOCUMENT), + isEditable(false), + mode(TW_HIT_TEST_MODE_DEFAULT) { +} + +_Ewk_Hit_Test::_Ewk_Hit_Test(const _Ewk_Hit_Test& other) + : context(other.context), + linkURI(other.linkURI), + linkTitle(other.linkTitle), + linkLabel(other.linkLabel), + imageURI(other.imageURI), + mediaURI(other.mediaURI), + isEditable(other.isEditable), + mode(other.mode), + nodeData(other.nodeData), + imageData(other.imageData) { +} + +_Ewk_Hit_Test::Hit_Test_Node_Data::Hit_Test_Node_Data() + : attributeHash(NULL) { +} + +// deep copy of node map +_Ewk_Hit_Test::Hit_Test_Node_Data::Hit_Test_Node_Data(const Hit_Test_Node_Data& other) + : tagName(other.tagName), + nodeValue(other.nodeValue), + attributeHash(NULL) { + if (!other.attributeHash) + return; + + Eina_Iterator* it = eina_hash_iterator_tuple_new(other.attributeHash); + void* data; + attributeHash = eina_hash_string_superfast_new(FreeHitTestAttributeHashData); + while (eina_iterator_next(it, &data)) { + Eina_Hash_Tuple* t = static_cast(data); + eina_hash_add(attributeHash, + static_cast(t->key), eina_stringshare_add(static_cast(t->data))); + } + eina_iterator_free(it); +} + +_Ewk_Hit_Test::Hit_Test_Node_Data::~Hit_Test_Node_Data() { + eina_hash_free(attributeHash); +} + +void _Ewk_Hit_Test::Hit_Test_Node_Data::PopulateNodeAtributes(const NodeAttributesMap& nodeAttributes) { + if (nodeAttributes.empty()) + return; + + attributeHash = eina_hash_string_superfast_new(FreeHitTestAttributeHashData); + NodeAttributesMap::const_iterator attributeMapEnd = nodeAttributes.end(); + for (NodeAttributesMap::const_iterator it = nodeAttributes.begin(); it != attributeMapEnd; ++it) { + eina_hash_add(attributeHash, it->first.c_str(), eina_stringshare_add(it->second.c_str())); + } +} + +_Ewk_Hit_Test::Hit_Test_Image_Buffer::Hit_Test_Image_Buffer() { +} + +//(warning) deep copy of skia buffer. +_Ewk_Hit_Test::Hit_Test_Image_Buffer::Hit_Test_Image_Buffer(const Hit_Test_Image_Buffer& other) + : fileNameExtension(other.fileNameExtension) { + other.imageBitmap.deepCopyTo(&imageBitmap); +} // Use compiler generated constructor and destructor // No significant implementation is required. diff --git a/tizen_src/ewk/efl_integration/private/ewk_hit_test_private.h b/tizen_src/ewk/efl_integration/private/ewk_hit_test_private.h index b1a3e1f..8d945d0 100644 --- a/tizen_src/ewk/efl_integration/private/ewk_hit_test_private.h +++ b/tizen_src/ewk/efl_integration/private/ewk_hit_test_private.h @@ -5,7 +5,56 @@ #ifndef ewk_hit_test_private_h #define ewk_hit_test_private_h +#include +#include + +#include + #include +#include "third_party/skia/include/core/SkBitmap.h" +#include "tizen_webview/public/tw_hit_test.h" + +typedef std::map NodeAttributesMap; + +// Structure used to report hit test result +struct _Ewk_Hit_Test { + _Ewk_Hit_Test(); + _Ewk_Hit_Test(const _Ewk_Hit_Test& other); + // TODO: check whether bitwise assignment is acceptable (e.g, attributeHash) + // If not, proper implementation for below should be added: + // _Ewk_Hit_Test& operator=(const _Ewk_Hit_Test&); + // Note: Currently the operation is used in EwebView::UpdateHitTestData(). + + tizen_webview::Hit_Test_Result_Context context; + std::string linkURI; + std::string linkTitle; // the title of link + std::string linkLabel; // the text of the link + std::string imageURI; + std::string mediaURI; + bool isEditable; + tizen_webview::Hit_Test_Mode mode; + + // store node attributes in a map + struct Hit_Test_Node_Data { + Hit_Test_Node_Data(); + Hit_Test_Node_Data(const Hit_Test_Node_Data& other); + ~Hit_Test_Node_Data(); + void PopulateNodeAtributes(const NodeAttributesMap& nodeAttributes); + + std::string tagName; // tag name for hit element + std::string nodeValue; // node value for hit element + Eina_Hash* attributeHash; // attribute data for hit element + } nodeData; + + // when hit node is image we need to store image buffer and filename extension + struct Hit_Test_Image_Buffer { + Hit_Test_Image_Buffer(); + Hit_Test_Image_Buffer(const Hit_Test_Image_Buffer& other); + + std::string fileNameExtension; // image filename extension for hit element + SkBitmap imageBitmap; // image pixels data + } imageData; +}; struct Ewk_Hit_Test : public tizen_webview::Hit_Test { }; diff --git a/tizen_src/impl/API/ewk_ipc_message_private.cc b/tizen_src/ewk/efl_integration/private/ewk_ipc_message_private.cc similarity index 90% rename from tizen_src/impl/API/ewk_ipc_message_private.cc rename to tizen_src/ewk/efl_integration/private/ewk_ipc_message_private.cc index 56b88a1..dadcd45 100644 --- a/tizen_src/impl/API/ewk_ipc_message_private.cc +++ b/tizen_src/ewk/efl_integration/private/ewk_ipc_message_private.cc @@ -4,8 +4,8 @@ #include "ewk_ipc_message_private.h" +#include "common/render_messages_ewk.h" #include "content/public/renderer/render_view.h" -#include "common/render_messages_efl.h" #include "eweb_context.h" Eina_Bool ewk_ipc_plugins_message_send_private(int routingId, const Ewk_IPC_Wrt_Message_Data &data) { @@ -14,7 +14,9 @@ Eina_Bool ewk_ipc_plugins_message_send_private(int routingId, const Ewk_IPC_Wrt_ return false; } +#if !defined(EWK_BRINGUP) render_view->Send(new EwkHostMsg_WrtMessage(render_view->GetRoutingID(), data)); +#endif return true; } @@ -24,7 +26,9 @@ Eina_Bool ewk_ipc_wrt_message_send_private(tizen_webview::WebContext* context, c if (!web_context) { return false; } +#if !defined(EWK_BRINGUP) web_context->SendWrtMessage(data); +#endif return true; } @@ -35,7 +39,9 @@ Eina_Bool ewk_ipc_plugins_sync_message_send_private(int routingId, Ewk_IPC_Wrt_M } std::string result; +#if !defined(EWK_BRINGUP) render_view->Send(new EwkHostMsg_WrtSyncMessage(routingId, *data, &result)); +#endif data->value.swap(result); return true; diff --git a/tizen_src/impl/API/ewk_ipc_message_private.h b/tizen_src/ewk/efl_integration/private/ewk_ipc_message_private.h similarity index 100% rename from tizen_src/impl/API/ewk_ipc_message_private.h rename to tizen_src/ewk/efl_integration/private/ewk_ipc_message_private.h diff --git a/tizen_src/ewk/efl_integration/private/ewk_policy_decision_private.cc b/tizen_src/ewk/efl_integration/private/ewk_policy_decision_private.cc index 15c1b25..8e6c88f 100644 --- a/tizen_src/ewk/efl_integration/private/ewk_policy_decision_private.cc +++ b/tizen_src/ewk/efl_integration/private/ewk_policy_decision_private.cc @@ -4,5 +4,280 @@ #include "ewk_policy_decision_private.h" -// Use compiler generated constructor and destructor -// No significant implementation is required. +#include + +#include +#include +#include "eweb_view.h" +#include + +using content::BrowserThread; +using content::RenderFrameHost; +using content::RenderViewHost; +using namespace tizen_webview; + +namespace { + void FreeStringShare(void *data) { + eina_stringshare_del(static_cast(data)); + } +} + +_Ewk_Policy_Decision::_Ewk_Policy_Decision(const GURL &request_url, + net::URLRequest* request, + content::ResourceType resource_type, + PolicyResponseDelegateEfl* delegate) + : web_view_(NULL) + , policy_response_delegate_(delegate) + , responseHeaders_(NULL) + , decisionType_(TW_POLICY_DECISION_USE) + , navigationType_(TW_POLICY_NAVIGATION_TYPE_OTHER) + , isDecided_(false) + , isSuspended_(false) + , responseStatusCode_(0) + , type_(POLICY_RESPONSE) { + DCHECK(delegate); + DCHECK(request); + + net::HttpResponseHeaders* response_headers = request->response_headers(); + + ParseUrl(request_url); + if (response_headers) { + responseStatusCode_ = response_headers->response_code(); + + std::string mime_type; + + request->GetMimeType(&mime_type); + responseMime_ = mime_type; + + if (!content::IsResourceTypeFrame(resource_type) && + !resource_type == content::RESOURCE_TYPE_FAVICON) { + decisionType_ = TW_POLICY_DECISION_DOWNLOAD; + } + + if (request_url.has_password() && request_url.has_username()) + SetAuthorizationIfNecessary(request_url); + + std::string set_cookie_; + + if (response_headers->EnumerateHeader(NULL, "Set-Cookie", &set_cookie_)) + cookie_ = set_cookie_; + + void* iter = NULL; + std::string name; + std::string value; + responseHeaders_ = eina_hash_string_small_new(FreeStringShare); + while (response_headers->EnumerateHeaderLines(&iter, &name, &value)) + eina_hash_add(responseHeaders_, name.c_str(), eina_stringshare_add(value.c_str())); + } +} + +_Ewk_Policy_Decision::_Ewk_Policy_Decision(const NavigationPolicyParams ¶ms, content::RenderViewHost* rvh) + : web_view_(NULL) + , navigation_policy_handler_(new NavigationPolicyHandlerEfl(rvh, params)) + , frame_(new tizen_webview::Frame(params)) + , cookie_(params.cookie) + , httpMethod_(params.httpMethod) + , responseHeaders_(NULL) + , decisionType_(TW_POLICY_DECISION_USE) + , navigationType_(static_cast(params.type)) + , isDecided_(false) + , isSuspended_(false) + , responseStatusCode_(0) + , type_(POLICY_NAVIGATION) { + ParseUrl(params.url); + if (!params.auth.isEmpty()) + SetAuthorizationIfNecessary(params.auth.utf8()); + else if (params.url.has_password() && params.url.has_username()) + SetAuthorizationIfNecessary(params.url); +} + +_Ewk_Policy_Decision::_Ewk_Policy_Decision(EWebView* view, + content::WebContentsDelegate::NewWindowDecideCallback callback) + : web_view_(view) + , window_create_callback_(callback) + , responseHeaders_(NULL) + , decisionType_(TW_POLICY_DECISION_USE) + , navigationType_(TW_POLICY_NAVIGATION_TYPE_OTHER) + , isDecided_(false) + , isSuspended_(false) + , responseStatusCode_(0) + , type_(POLICY_NEWWINDOW) { + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + DCHECK(view); + + RenderFrameHost* rfh = NULL; + // we can use main frame here + if (view) { + view->web_contents().GetMainFrame(); + } + + frame_.reset(new tizen_webview::Frame(rfh)); +} + +_Ewk_Policy_Decision::~_Ewk_Policy_Decision() { + eina_hash_free(responseHeaders_); +} + +void _Ewk_Policy_Decision::Use() { + isDecided_ = true; + switch (type_) { + case POLICY_RESPONSE: + policy_response_delegate_->UseResponse(); + break; + case POLICY_NAVIGATION: + navigation_policy_handler_->SetDecision(NavigationPolicyHandlerEfl::Unhandled); + break; + case POLICY_NEWWINDOW: + window_create_callback_.Run(true); + break; + default: + NOTREACHED(); + break; + } +} + +void _Ewk_Policy_Decision::Ignore() { + isDecided_ = true; + switch (type_) { + case _Ewk_Policy_Decision::POLICY_RESPONSE: + policy_response_delegate_->IgnoreResponse(); + break; + case _Ewk_Policy_Decision::POLICY_NAVIGATION: + navigation_policy_handler_->SetDecision(NavigationPolicyHandlerEfl::Handled); + break; + case _Ewk_Policy_Decision::POLICY_NEWWINDOW: + window_create_callback_.Run(false); + break; + default: + NOTREACHED(); + break; + } +} + +void _Ewk_Policy_Decision::Download() { + isDecided_ = true; + switch (type_) { + case _Ewk_Policy_Decision::POLICY_RESPONSE: + policy_response_delegate_->UseResponse(); + break; + case _Ewk_Policy_Decision::POLICY_NAVIGATION: + navigation_policy_handler_->DownloadNavigation(); + break; + case _Ewk_Policy_Decision::POLICY_NEWWINDOW: + Ignore(); + break; + default: + NOTREACHED(); + break; + } +} + +bool _Ewk_Policy_Decision::Suspend() { + if (!isDecided_ && type_ != _Ewk_Policy_Decision::POLICY_NAVIGATION) { + // Policy navigation API is currently synchronous - we can't suspend it + isSuspended_ = true; + return true; + } + + return false; +} + +void _Ewk_Policy_Decision::InitializeOnUIThread() { + DCHECK(type_ == _Ewk_Policy_Decision::POLICY_RESPONSE); + DCHECK(policy_response_delegate_.get()); + + if (policy_response_delegate_.get()) { + RenderFrameHost *host = RenderFrameHost::FromID(policy_response_delegate_->GetRenderProcessId(), policy_response_delegate_->GetRenderFrameId()); + + // Download request has no render frame id, they're detached. We override it with main frame from render view id + if (!host) { + RenderViewHost *viewhost = RenderViewHost::FromID(policy_response_delegate_->GetRenderProcessId(), policy_response_delegate_->GetRenderViewId()); + + //DCHECK(viewhost); + if (viewhost) { + host = viewhost->GetMainFrame(); + } + } + + if (host) { + /* + * In some situations there is no renderer associated to the response + * Such case can be observed while running TC utc_blink_ewk_geolocation_permission_request_suspend_func + */ + frame_.reset(new tizen_webview::Frame(host)); + } + } +} + +tizen_webview::Frame* _Ewk_Policy_Decision::GetFrameRef() const { + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); + // Ups, forgot to initialize something? + DCHECK(frame_.get()); + return frame_.get(); +} + +void _Ewk_Policy_Decision::ParseUrl(const GURL& url) { + url_ = url.spec(); + scheme_ = url.scheme(); + host_ = url.host(); +} + +void _Ewk_Policy_Decision::SetAuthorizationIfNecessary(const GURL& request_url) { + // There is no need to check if username or password is empty. + // It was checked befor in constructor + AuthPassword_ = request_url.password(); + AuthUser_ = request_url.username(); +} + +void _Ewk_Policy_Decision::SetAuthorizationIfNecessary(const std::string request) { + std::string type = request.substr(0, request.find_first_of(' ')); + std::transform(type.begin(), type.end(), type.begin(), ::toupper); + + if (type.compare(BASIC_AUTHORIZATION)) { + AuthUser_.clear(); + AuthPassword_.clear(); + return; + } + + std::size_t space = request.find(' '); + std::size_t colon = request.find(':'); + + DCHECK(space != std::string::npos && colon != std::string::npos && colon != request.length()); + if (space == std::string::npos || colon == std::string::npos || colon == request.length()) + return; + + AuthUser_ = request.substr(space + 1, request.length() - colon - 1); + AuthPassword_ = request.substr(colon + 1); +} + +const char* _Ewk_Policy_Decision::GetCookie() const { + return cookie_.c_str(); +} + +const char* _Ewk_Policy_Decision::GetAuthUser() const { + return AuthUser_.empty() ? NULL : AuthUser_.c_str(); +} + +const char* _Ewk_Policy_Decision::GetAuthPassword() const { + return AuthPassword_.empty() ? NULL : AuthPassword_.c_str(); +} + +const char* _Ewk_Policy_Decision::GetUrl() const { + return url_.empty() ? NULL : url_.c_str(); +} + +const char* _Ewk_Policy_Decision::GetHttpMethod() const { + return httpMethod_.empty() ? NULL : httpMethod_.c_str(); +} + +const char* _Ewk_Policy_Decision::GetScheme() const { + return scheme_.empty() ? NULL : scheme_.c_str(); +} + +const char* _Ewk_Policy_Decision::GetHost() const { + return host_.empty() ? NULL : host_.c_str(); +} + +const char* _Ewk_Policy_Decision::GetResponseMime() const { + return responseMime_.empty() ? NULL : responseMime_.c_str(); +} diff --git a/tizen_src/ewk/efl_integration/private/ewk_policy_decision_private.h b/tizen_src/ewk/efl_integration/private/ewk_policy_decision_private.h index 2a6821a..8f6890e 100644 --- a/tizen_src/ewk/efl_integration/private/ewk_policy_decision_private.h +++ b/tizen_src/ewk/efl_integration/private/ewk_policy_decision_private.h @@ -5,8 +5,127 @@ #ifndef ewk_policy_decision_private_h #define ewk_policy_decision_private_h +#include + +#include + +#include "base/callback.h" +#include "base/memory/ref_counted.h" +#include "base/memory/scoped_ptr.h" +#include "browser/navigation_policy_handler_efl.h" +#include "browser/policy_response_delegate_efl.h" +#include "content/public/browser/web_contents_delegate.h" +#include "content/public/common/resource_type.h" +#include "third_party/WebKit/public/web/WebViewModeEnums.h" +#include "tizen_webview/public/tw_frame.h" +#include "tizen_webview/public/tw_policy_decision.h" #include +// Basic type of authorization - 'type username:password' +#define BASIC_AUTHORIZATION "BASIC" + +namespace net { +class URLRequest; +} + +class EWebView; +struct NavigationPolicyParams; + +namespace content { +class RenderViewHost; +} // namespace content + +class _Ewk_Policy_Decision { + public: + /** + * Constructs _Ewk_Policy_Decision with navigation type POLICY_RESPONSE + */ + explicit _Ewk_Policy_Decision(const GURL& request_url, + net::URLRequest* request, + content::ResourceType resource_type, + PolicyResponseDelegateEfl* delegate); + + /** + * Constructs _Ewk_Policy_Decision with navigation type POLICY_NAVIGATION + */ + explicit _Ewk_Policy_Decision(const NavigationPolicyParams ¶ms, content::RenderViewHost* rvh); + + /** + * Constructs _Ewk_Policy_Decision with navigation type POLICY_NEWWINDOW + */ + explicit _Ewk_Policy_Decision(EWebView* view, + content::WebContentsDelegate::NewWindowDecideCallback); + + ~_Ewk_Policy_Decision(); + + void Use(); + void Ignore(); + void Download(); + bool Suspend(); + + bool isDecided() const { return isDecided_; } + bool isSuspended() const { return isSuspended_; } + tizen_webview::Policy_Navigation_Type GetNavigationType() const { return navigationType_; } + const char* GetCookie() const; + const char* GetAuthUser() const; + const char* GetAuthPassword() const; + const char* GetUrl() const; + const char* GetHttpMethod() const; + const char* GetScheme() const; + const char* GetHost() const; + const char* GetResponseMime() const; + tizen_webview::Policy_Decision_Type GetDecisionType() const { return decisionType_; } + Eina_Hash* GetResponseHeaders() const { return responseHeaders_; } + int GetResponseStatusCode() const { return responseStatusCode_; } + + NavigationPolicyHandlerEfl* GetNavigationPolicyHandler() const { return navigation_policy_handler_.get(); } + + tizen_webview::Frame* GetFrameRef() const; + + void InitializeOnUIThread(); + void ParseUrl(const GURL& url); + +private: + /** + * @brief sets userID and password + * @param request_url requested url - user:password@address + */ + void SetAuthorizationIfNecessary(const GURL& request_url); + + /** + * @brief sets userID and password + * @param request contents of Authorization HTTP header + */ + void SetAuthorizationIfNecessary(const std::string request); + + enum PolicyType { + POLICY_RESPONSE, + POLICY_NAVIGATION, + POLICY_NEWWINDOW, + }; + + EWebView* web_view_; + scoped_refptr policy_response_delegate_; + scoped_ptr navigation_policy_handler_; + scoped_ptr frame_; + content::WebContentsDelegate::NewWindowDecideCallback window_create_callback_; + std::string cookie_; + std::string url_; + std::string httpMethod_; + std::string host_; + std::string scheme_; + std::string responseMime_; + Eina_Hash* responseHeaders_; + tizen_webview::Policy_Decision_Type decisionType_; + tizen_webview::Policy_Navigation_Type navigationType_; + bool isDecided_; + bool isSuspended_; + int responseStatusCode_; + std::string AuthUser_; + std::string AuthPassword_; + PolicyType type_; +}; + struct Ewk_Policy_Decision : public tizen_webview::PolicyDecision { }; diff --git a/tizen_src/ewk/efl_integration/private/ewk_security_origin_private.h b/tizen_src/ewk/efl_integration/private/ewk_security_origin_private.h index a481282..42ee835 100644 --- a/tizen_src/ewk/efl_integration/private/ewk_security_origin_private.h +++ b/tizen_src/ewk/efl_integration/private/ewk_security_origin_private.h @@ -5,8 +5,52 @@ #ifndef ewk_security_origin_private_h #define ewk_security_origin_private_h +#include +#include +#include +#include + +#include "base/callback.h" +#include "url/gurl.h" #include +// Security Origin Structure +struct __Ewk_Security_Origin { + __Ewk_Security_Origin(const GURL& url) + : host(eina_stringshare_add(url.host().c_str())), + protocol(eina_stringshare_add(url.scheme().c_str())) { + assert(url.IntPort() != url::PORT_INVALID); + port = url.IntPort(); + } + + //FIXME: Replace uint16_t by int for this constructor and use GURL::IntPort for populating. + // Better yet, just hold GURL::GetOrigin() as member and implement ewk API using that + __Ewk_Security_Origin(const char* host_in, const char* protocol_in, uint16_t port_in) + : host(eina_stringshare_add(host_in)), + protocol(eina_stringshare_add(protocol_in)), + port(port_in) { + } + + ~__Ewk_Security_Origin() { + eina_stringshare_del(host); + eina_stringshare_del(protocol); + } + + GURL GetAsGURL() const { + std::ostringstream url; + url << protocol << "://" << host; + if (port != url::PORT_UNSPECIFIED) + url << ":" << port; + GURL result(url.str()); + assert(result.is_valid()); + return result; + } + + Eina_Stringshare* host; + Eina_Stringshare* protocol; + int port; +}; + // chromium-efl implementation for _Ewk_Security_Origin struct _Ewk_Security_Origin : tizen_webview::Security_Origin { diff --git a/tizen_src/impl/API/ewk_settings_private.cc b/tizen_src/ewk/efl_integration/private/ewk_settings_private.cc similarity index 100% rename from tizen_src/impl/API/ewk_settings_private.cc rename to tizen_src/ewk/efl_integration/private/ewk_settings_private.cc diff --git a/tizen_src/impl/API/ewk_settings_private.h b/tizen_src/ewk/efl_integration/private/ewk_settings_private.h similarity index 100% rename from tizen_src/impl/API/ewk_settings_private.h rename to tizen_src/ewk/efl_integration/private/ewk_settings_private.h diff --git a/tizen_src/impl/API/ewk_suspendable_object.cc b/tizen_src/ewk/efl_integration/private/ewk_suspendable_object.cc similarity index 100% rename from tizen_src/impl/API/ewk_suspendable_object.cc rename to tizen_src/ewk/efl_integration/private/ewk_suspendable_object.cc diff --git a/tizen_src/impl/API/ewk_suspendable_object.h b/tizen_src/ewk/efl_integration/private/ewk_suspendable_object.h similarity index 100% rename from tizen_src/impl/API/ewk_suspendable_object.h rename to tizen_src/ewk/efl_integration/private/ewk_suspendable_object.h diff --git a/tizen_src/impl/API/ewk_text_style_private.h b/tizen_src/ewk/efl_integration/private/ewk_text_style_private.h similarity index 100% rename from tizen_src/impl/API/ewk_text_style_private.h rename to tizen_src/ewk/efl_integration/private/ewk_text_style_private.h diff --git a/tizen_src/impl/API/ewk_tracing_private.cc b/tizen_src/ewk/efl_integration/private/ewk_tracing_private.cc similarity index 92% rename from tizen_src/impl/API/ewk_tracing_private.cc rename to tizen_src/ewk/efl_integration/private/ewk_tracing_private.cc index 4e57004..bf121c9 100644 --- a/tizen_src/impl/API/ewk_tracing_private.cc +++ b/tizen_src/ewk/efl_integration/private/ewk_tracing_private.cc @@ -4,7 +4,7 @@ #include "ewk_tracing_private.h" -#include "browser/tracing/tracing_controller_efl.h" +#include "content/browser/tracing/tracing_controller_efl.h" TracingControllerEfl& GetTraceController() { return TracingControllerEfl::GetTraceController(); diff --git a/tizen_src/impl/API/ewk_tracing_private.h b/tizen_src/ewk/efl_integration/private/ewk_tracing_private.h similarity index 100% rename from tizen_src/impl/API/ewk_tracing_private.h rename to tizen_src/ewk/efl_integration/private/ewk_tracing_private.h diff --git a/tizen_src/impl/API/ewk_user_media_private.h b/tizen_src/ewk/efl_integration/private/ewk_user_media_private.h similarity index 100% rename from tizen_src/impl/API/ewk_user_media_private.h rename to tizen_src/ewk/efl_integration/private/ewk_user_media_private.h diff --git a/tizen_src/ewk/efl_integration/private/ewk_view_private.cc b/tizen_src/ewk/efl_integration/private/ewk_view_private.cc index 91acb87..31918fe 100644 --- a/tizen_src/ewk/efl_integration/private/ewk_view_private.cc +++ b/tizen_src/ewk/efl_integration/private/ewk_view_private.cc @@ -3,14 +3,15 @@ // found in the LICENSE file. #include "ewk_view_private.h" + #include -#include -#include + +#include "eweb_view.h" +#include "tizen_webview/public/tw_webview_delegate.h" +#include "tizen_webview/public/tw_webview_evas_event_handler.h" #include "private/ewk_context_private.h" #include "private/webview_delegate_ewk.h" -//TODO: remove below header dependency -#include "../impl/eweb_view.h" using tizen_webview::WebView; using tizen_webview::WebViewDelegate; @@ -174,6 +175,7 @@ void handleEvasObjectColorSet(Evas_Object*, int red, int green, int blue, int al // FIXME: implement. } +#if defined(EWK_REFACTOR) Eina_Bool handleFocusIn(Ewk_View_Smart_Data* d) { WebView* wv = GetWebViewFromSmartData(d); @@ -246,7 +248,7 @@ Eina_Bool handleTextSelectionUp(Ewk_View_Smart_Data* d, int x, int y) GetWebViewFromSmartData(d)->GetEvasEventHandler(); return wv_handler ? wv_handler->HandleEventDefault_TextSelectionUp(x, y) : false; } - +#endif // EWK_REFACTOR unsigned long long handleExceededDatabaseQuota(Ewk_View_Smart_Data *sd, const char *databaseName, const char *displayName, unsigned long long currentQuota, unsigned long long currentOriginUsage, unsigned long long currentDatabaseUsage, unsigned long long expectedUsage) { @@ -368,6 +370,7 @@ bool InitSmartClassInterface(Ewk_View_Smart_Class& api) api.sc.color_set = &handleEvasObjectColorSet; // Set Ewk_View_Smart_Class callbacks. +#if defined(EWK_REFACTOR) api.focus_in = &handleFocusIn; api.focus_out = &handleFocusOut; api.mouse_down = &handleMouseDown; @@ -378,6 +381,7 @@ bool InitSmartClassInterface(Ewk_View_Smart_Class& api) api.key_up = &handleKeyUp; api.text_selection_down = &handleTextSelectionDown; api.text_selection_up = &handleTextSelectionUp; +#endif api.exceeded_database_quota = &handleExceededDatabaseQuota; diff --git a/tizen_src/impl/API/ewk_web_application_icon_data_private.cc b/tizen_src/ewk/efl_integration/private/ewk_web_application_icon_data_private.cc similarity index 100% rename from tizen_src/impl/API/ewk_web_application_icon_data_private.cc rename to tizen_src/ewk/efl_integration/private/ewk_web_application_icon_data_private.cc diff --git a/tizen_src/impl/API/ewk_web_application_icon_data_private.h b/tizen_src/ewk/efl_integration/private/ewk_web_application_icon_data_private.h similarity index 100% rename from tizen_src/impl/API/ewk_web_application_icon_data_private.h rename to tizen_src/ewk/efl_integration/private/ewk_web_application_icon_data_private.h diff --git a/tizen_src/impl/API/ewk_window_features_private.h b/tizen_src/ewk/efl_integration/private/ewk_window_features_private.h similarity index 100% rename from tizen_src/impl/API/ewk_window_features_private.h rename to tizen_src/ewk/efl_integration/private/ewk_window_features_private.h diff --git a/tizen_src/ewk/efl_integration/public/ewk_auth_challenge.cc b/tizen_src/ewk/efl_integration/public/ewk_auth_challenge.cc index be54436..a5dc036 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_auth_challenge.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_auth_challenge.cc @@ -5,7 +5,7 @@ #include "ewk_auth_challenge.h" -#include <../impl/API/ewk_auth_challenge_private.h> +#include "private/ewk_auth_challenge_private.h" void ewkAuthChallengeDelete(Ewk_Auth_Challenge* authChallenge) { diff --git a/tizen_src/ewk/efl_integration/public/ewk_auth_request.cc b/tizen_src/ewk/efl_integration/public/ewk_auth_request.cc index ba649e6..51cd77e 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_auth_request.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_auth_request.cc @@ -5,8 +5,7 @@ #include "ewk_auth_request.h" #include "private/ewk_private.h" - -#include <../impl/API/ewk_auth_challenge_private.h> +#include "private/ewk_auth_challenge_private.h" Eina_Bool ewk_auth_request_authenticate(Ewk_Auth_Request* request, const char* username, const char* password) { diff --git a/tizen_src/ewk/efl_integration/public/ewk_autofill_profile.cc b/tizen_src/ewk/efl_integration/public/ewk_autofill_profile.cc index dd7b177..71665e5 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_autofill_profile.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_autofill_profile.cc @@ -4,9 +4,7 @@ #include "ewk_autofill_profile.h" -// TODO: remove dependency -#include <../impl/API/ewk_autofill_profile_private.h> - +#include "private/ewk_autofill_profile_private.h" #include "private/ewk_private.h" Ewk_Autofill_Profile* ewk_autofill_profile_new() diff --git a/tizen_src/ewk/efl_integration/public/ewk_certificate.cc b/tizen_src/ewk/efl_integration/public/ewk_certificate.cc index c0c5c11..387c473 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_certificate.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_certificate.cc @@ -6,9 +6,7 @@ #include -// TODO: remove dependency -#include <../impl/API/ewk_certificate_private.h> - +#include "private/ewk_certificate_private.h" void ewk_certificate_policy_decision_allowed_set(Ewk_Certificate_Policy_Decision* certificatePolicyDecision, Eina_Bool allowed) { diff --git a/tizen_src/ewk/efl_integration/public/ewk_console_message.cc b/tizen_src/ewk/efl_integration/public/ewk_console_message.cc index c77103a..ac0cc81 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_console_message.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_console_message.cc @@ -4,8 +4,7 @@ #include "ewk_console_message.h" -// TODO: remove dependency -#include <../impl/API/ewk_console_message_private.h> +#include "private/ewk_console_message_private.h" Ewk_Console_Message_Level ewk_console_message_level_get(const Ewk_Console_Message *message) { diff --git a/tizen_src/ewk/efl_integration/public/ewk_context.cc b/tizen_src/ewk/efl_integration/public/ewk_context.cc index 32a2244..605156c 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_context.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_context.cc @@ -4,25 +4,22 @@ #include "ewk_context.h" -// TODO: remove dependency -#include <../src/base/memory/ref_counted.h> -#include <../impl/browser/vibration/vibration_provider_client.h> -#include <../impl/browser_context_efl.h> -#include <../impl/http_user_agent_settings_efl.h> -#include <../impl/API/ewk_cookie_manager_private.h> -#include <../impl/API/ewk_context_form_autofill_profile_private.h> - #include #include #include +#include "base/memory/ref_counted.h" +#include "browser/vibration/vibration_provider_client.h" +#include "browser_context_efl.h" +#include "http_user_agent_settings_efl.h" #include "public/ewk_security_origin.h" #include "private/ewk_context_private.h" #include "private/ewk_private.h" #include "private/ewk_security_origin_private.h" #include "private/chromium_glue.h" #include "private/ewk_favicon_database_private.h" - +#include "private/ewk_cookie_manager_private.h" +#include "private/ewk_context_form_autofill_profile_private.h" using tizen_webview::WebContext; diff --git a/tizen_src/ewk/efl_integration/public/ewk_context_menu.cc b/tizen_src/ewk/efl_integration/public/ewk_context_menu.cc index 0218377..dcfd545 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_context_menu.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_context_menu.cc @@ -6,9 +6,8 @@ #include -// TODO: remove dependency -#include <../impl/API/ewk_context_menu_private.h> -#include <../impl/context_menu_controller_efl.h> +#include "private/ewk_context_menu_private.h" +#include "context_menu_controller_efl.h" unsigned ewk_context_menu_item_count(Ewk_Context_Menu* menu) { diff --git a/tizen_src/ewk/efl_integration/public/ewk_cookie_manager.cc b/tizen_src/ewk/efl_integration/public/ewk_cookie_manager.cc index 1276ae5..434a69e 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_cookie_manager.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_cookie_manager.cc @@ -4,12 +4,10 @@ #include "ewk_cookie_manager.h" -// TODO: remove dependency -#include <../impl/API/ewk_cookie_manager_private.h> -#include <../impl/cookie_manager.h> - +#include "cookie_manager.h" #include "public/ewk_log.h" #include "private/chromium_glue.h" +#include "private/ewk_cookie_manager_private.h" #define EWK_COOKIE_MANAGER_GET_OR_RETURN(manager, cookie_manager, ...) \ if (!(manager)) { \ diff --git a/tizen_src/ewk/efl_integration/public/ewk_error.cc b/tizen_src/ewk/efl_integration/public/ewk_error.cc index 1c9352e..6504b75 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_error.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_error.cc @@ -7,9 +7,7 @@ #include "net/base/net_errors.h" -// TODO: remove dependency -#include <../impl/API/ewk_error_private.h> - +#include "private/ewk_error_private.h" #include "private/ewk_private.h" Ewk_Error_Type ewk_error_type_get(const Ewk_Error* error) @@ -53,4 +51,4 @@ const char* ewk_error_domain_get(const Ewk_Error* error) Eina_Bool ewk_error_cancellation_get(const Ewk_Error* error) { return EINA_FALSE; -} \ No newline at end of file +} diff --git a/tizen_src/ewk/efl_integration/public/ewk_geolocation.cc b/tizen_src/ewk/efl_integration/public/ewk_geolocation.cc index 06cfd4f..88c63e8 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_geolocation.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_geolocation.cc @@ -4,11 +4,9 @@ #include "public/ewk_geolocation.h" -// TODO: remove dependency -#include <../impl/API/ewk_geolocation_private.h> - #include "public/ewk_security_origin.h" #include "private/ewk_security_origin_private.h" +#include "private/ewk_geolocation_private.h" const Ewk_Security_Origin* ewk_geolocation_permission_request_origin_get(const Ewk_Geolocation_Permission_Request* permissionRequest) { diff --git a/tizen_src/ewk/efl_integration/public/ewk_hit_test.cc b/tizen_src/ewk/efl_integration/public/ewk_hit_test.cc index 9892315..02ddc8a 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_hit_test.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_hit_test.cc @@ -4,15 +4,12 @@ #include "public/ewk_hit_test.h" -#include "tizen_webview/public/tw_hit_test.h" - -// TODO: remove dependency -#include <../impl/eweb_view.h> -#include <../impl/web_contents_delegate_efl.h> - +#include "eweb_view.h" +#include "web_contents_delegate_efl.h" #include "public/ewk_view.h" #include "private/chromium_glue.h" #include "private/ewk_hit_test_private.h" +#include "tizen_webview/public/tw_hit_test.h" using namespace tizen_webview; diff --git a/tizen_src/ewk/efl_integration/public/ewk_main.cc b/tizen_src/ewk/efl_integration/public/ewk_main.cc index 128d5de..ed0e032 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_main.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_main.cc @@ -29,20 +29,18 @@ #include #include -#if defined(HAVE_ECORE_X) -#include -#endif - +#include "command_line_efl.h" +#include "eweb_context.h" +#include "ewk_global_data.h" #include "public/ewk_log.h" #include "public/ewk_view.h" #include "private/webview_delegate_ewk.h" #include "private/ewk_private.h" #include "private/ewk_main_private.h" -// TODO: remove dependency -#include <../impl/command_line_efl.h> -#include <../impl/eweb_context.h> -#include <../impl/ewk_global_data.h> +#if defined(HAVE_ECORE_X) +#include +#endif static int _ewkInitCount = 0; diff --git a/tizen_src/ewk/efl_integration/public/ewk_notification.cc b/tizen_src/ewk/efl_integration/public/ewk_notification.cc index 9a527e4e..c1dec08 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_notification.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_notification.cc @@ -3,18 +3,15 @@ // found in the LICENSE file. #include "ewk_notification.h" -#include - -// TODO: remove dependency -#include <../impl/eweb_view.h> -#include <../impl/browser_context_efl.h> +#include -#include "../impl/browser/notification/notification_controller_efl.h" -#include "../impl/content_browser_client_efl.h" -#include "../impl/content_main_delegate_efl.h" -#include "../impl/ewk_global_data.h" - +#include "content_browser_client_efl.h" +#include "content_main_delegate_efl.h" +#include "eweb_view.h" +#include "ewk_global_data.h" +#include "browser_context_efl.h" +#include "browser/notification/notification_controller_efl.h" #include "private/ewk_context_private.h" #include "private/ewk_security_origin_private.h" #include "private/ewk_notification_private.h" diff --git a/tizen_src/ewk/efl_integration/public/ewk_policy_decision.cc b/tizen_src/ewk/efl_integration/public/ewk_policy_decision.cc index a3cabf3..ab6f99c 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_policy_decision.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_policy_decision.cc @@ -4,13 +4,11 @@ #include "ewk_policy_decision.h" -// TODO: remove dependency -#include <../impl/web_contents_delegate_efl.h> - #include "private/chromium_glue.h" #include "private/ewk_frame_private.h" #include "private/ewk_policy_decision_private.h" #include "private/ewk_private.h" +#include "web_contents_delegate_efl.h" const char* ewk_policy_decision_cookie_get(const Ewk_Policy_Decision* policyDecision) { diff --git a/tizen_src/ewk/efl_integration/public/ewk_settings.cc b/tizen_src/ewk/efl_integration/public/ewk_settings.cc index e1bf842..d00fb60 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_settings.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_settings.cc @@ -6,16 +6,13 @@ #include -// TODO: remove dependency -#include -#include <../impl/API/ewk_settings_private.h> -// TODO: move non-ewk header file to other location -#include "public/text_encoding_map_efl.h" #include "eweb_view.h" - +#include "ui/events/gesture_detection/gesture_configuration.h" +#include "public/text_encoding_map_efl.h" #include "private/chromium_glue.h" #include "private/ewk_private.h" #include "private/ewk_private.h" +#include "private/ewk_settings_private.h" #include "private/ewk_view_private.h" using tizen_webview::WebView; @@ -673,14 +670,20 @@ namespace { void Ewk_Extra_Feature_Set_ViewportQuirk(Ewk_Settings* settings, Eina_Bool value) { EINA_SAFETY_ON_NULL_RETURN(settings); +#if !defined(EWK_BRINGUP) settings->getPreferences().viewport_meta_non_user_scalable_quirk = value; +#endif ewkUpdateWebkitPreferences(settings->getEvasObject()); } Eina_Bool Ewk_Extra_Feature_Get_ViewportQuirk(const Ewk_Settings* settings) { +#if !defined(EWK_BRINGUP) EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); return settings->getPreferences().viewport_meta_non_user_scalable_quirk; +#else + return EINA_FALSE; +#endif } typedef struct { diff --git a/tizen_src/ewk/efl_integration/public/ewk_text_style.cc b/tizen_src/ewk/efl_integration/public/ewk_text_style.cc index 2367326..f2a3223 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_text_style.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_text_style.cc @@ -6,8 +6,7 @@ #include -// TODO: remove dependency -#include <../impl/API/ewk_text_style_private.h> +#include "private/ewk_text_style_private.h" Ewk_Text_Style_State ewk_text_style_underline_get(Ewk_Text_Style* textStyle) { diff --git a/tizen_src/ewk/efl_integration/public/ewk_tracing.cc b/tizen_src/ewk/efl_integration/public/ewk_tracing.cc index 051257d..9184c00 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_tracing.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_tracing.cc @@ -4,7 +4,7 @@ #include "ewk_tracing.h" -#include "../impl/API/ewk_tracing_private.h" +#include "private/ewk_tracing_private.h" Eina_Bool ewk_start_tracing(const char* categories, const char* trace_options, diff --git a/tizen_src/ewk/efl_integration/public/ewk_user_media.cc b/tizen_src/ewk/efl_integration/public/ewk_user_media.cc index a026814..76bf0bb 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_user_media.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_user_media.cc @@ -4,8 +4,8 @@ #include "ewk_user_media.h" -// TODO: remove dependency -#include <../impl/API/ewk_user_media_private.h> + +#include "private/ewk_user_media_private.h" Eina_Bool ewk_user_media_permission_request_suspend(Ewk_User_Media_Permission_Request* permissionRequest) { diff --git a/tizen_src/ewk/efl_integration/public/ewk_view.cc b/tizen_src/ewk/efl_integration/public/ewk_view.cc index 5f2b375..9b6330a 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_view.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_view.cc @@ -23,20 +23,17 @@ #include "ewk_view.h" #include -#include #include -// TODO: remove dependency -#include +#include "content/public/browser/navigation_controller.h" +#include "ui/events/gesture_detection/gesture_configuration.h" #if !defined(EWK_BRINGUP) -#include +#include "webkit/common/webpreferences.h" #else -#include +#include "content/public/common/web_preferences.h" #endif -#include <../impl/eweb_view.h> -#include <../impl/web_contents_delegate_efl.h> -#include <../impl/cookie_manager.h> - +#include "eweb_view.h" +#include "cookie_manager.h" #include "public/ewk_back_forward_list.h" #include "public/ewk_context.h" #include "public/ewk_enums.h" @@ -54,6 +51,7 @@ #include "private/ewk_history_private.h" #include "private/ewk_view_private.h" #include "third_party/WebKit/public/web/WebViewModeEnums.h" +#include "web_contents_delegate_efl.h" using tizen_webview::WebView; using tizen_webview::WebContext; @@ -760,11 +758,15 @@ void ewk_view_back_forward_list_clear(const Evas_Object *view) Eina_Bool ewk_view_feed_touch_event(Evas_Object *view, Ewk_Touch_Event_Type type, const Eina_List *points, const Evas_Modifier *modifiers) { +#if defined(EWK_REFACTOR) EWK_VIEW_IMPL_GET_OR_RETURN(view, impl, false); impl->HandleTouchEvents(chromium_glue::to(type), points, modifiers); return true; +#else + LOG_EWK_API_MOCKUP("Not Supported by chromium"); +#endif } Eina_Bool ewk_view_touch_events_enabled_set(Evas_Object *view, Eina_Bool enabled) diff --git a/tizen_src/ewk/efl_integration/public/ewk_web_application_icon_data.cc b/tizen_src/ewk/efl_integration/public/ewk_web_application_icon_data.cc index 2481a09..6a87e6a 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_web_application_icon_data.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_web_application_icon_data.cc @@ -4,8 +4,7 @@ #include "ewk_web_application_icon_data.h" -// TODO: remove dependency -#include <../impl/API/ewk_web_application_icon_data_private.h> +#include "private/ewk_web_application_icon_data_private.h" const char* ewk_web_application_icon_data_url_get(Ewk_Web_App_Icon_Data* data) { diff --git a/tizen_src/ewk/efl_integration/public/ewk_window_features.cc b/tizen_src/ewk/efl_integration/public/ewk_window_features.cc index 04991ca..657fed3 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_window_features.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_window_features.cc @@ -4,8 +4,9 @@ #include "ewk_window_features.h" -#include <../impl/API/ewk_window_features_private.h> + #include "eweb_view.h" +#include "private/ewk_window_features_private.h" void _Ewk_Window_Features::setToolbarVisible(bool toolbar_visible) { diff --git a/tizen_src/impl/renderer/content_renderer_client_efl.cc b/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc similarity index 97% rename from tizen_src/impl/renderer/content_renderer_client_efl.cc rename to tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc index 6a075ed..2c1f0d9 100644 --- a/tizen_src/impl/renderer/content_renderer_client_efl.cc +++ b/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc @@ -9,14 +9,16 @@ #endif #include "url/gurl.h" -#include "common/render_messages_efl.h" -#include "paths_efl.h" #include "base/path_service.h" +#include "common/render_messages_ewk.h" +#include "content/common/paths_efl.h" #include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_view.h" #include "content/child/request_extra_data.h" +#include "renderer/editorclient_agent.h" #include "renderer/render_frame_observer_efl.h" #include "renderer/render_view_observer_efl.h" +#include "components/visitedlink/renderer/visitedlink_slave.h" #include "content/public/renderer/content_renderer_client.h" #include "third_party/WebKit/public/platform/WebURLError.h" #include "third_party/WebKit/public/platform/WebURLRequest.h" @@ -25,9 +27,6 @@ #include "third_party/WebKit/public/web/WebFrame.h" #include "third_party/WebKit/public/web/WebView.h" -#include "components/editing/content/renderer/editorclient_agent.h" -#include "components/visitedlink/renderer/visitedlink_slave.h" - #if defined(OS_TIZEN_MOBILE) #include "common/tts_messages_efl.h" #include "renderer/tts_dispatcher_efl.h" @@ -41,8 +40,8 @@ #endif #include "renderer/content_renderer_client_efl.h" -#include "navigation_policy_params.h" -#include "wrt/wrt_url_parse.h" +#include "common/navigation_policy_params.h" +#include "content/common/wrt/wrt_url_parse.h" #include "wrt/wrtwidget.h" #ifdef TIZEN_AUTOFILL_SUPPORT diff --git a/tizen_src/impl/renderer/content_renderer_client_efl.h b/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.h similarity index 71% rename from tizen_src/impl/renderer/content_renderer_client_efl.h rename to tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.h index da36336..d9fc7c4 100644 --- a/tizen_src/impl/renderer/content_renderer_client_efl.h +++ b/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.h @@ -34,22 +34,22 @@ class ContentRendererClientEfl : public content::ContentRendererClient ContentRendererClientEfl(); ~ContentRendererClientEfl(); - virtual void RenderThreadStarted(); + void RenderThreadStarted() override; - virtual void RenderFrameCreated(content::RenderFrame* render_frame); + void RenderFrameCreated(content::RenderFrame* render_frame) override; - virtual void RenderViewCreated(content::RenderView* render_view); + void RenderViewCreated(content::RenderView* render_view) override; - virtual void DidCreateScriptContext(blink::WebFrame* frame, - v8::Handle context, - int extension_group, - int world_id); + void DidCreateScriptContext(blink::WebFrame* frame, + v8::Handle context, + int extension_group, + int world_id) override; - virtual void WillReleaseScriptContext(blink::WebFrame* frame, - v8::Handle, - int world_id); + void WillReleaseScriptContext(blink::WebFrame* frame, + v8::Handle, + int world_id); - virtual bool AllowPopup() override { + bool AllowPopup() override { return m_settings.javascript_can_open_windows; } @@ -65,13 +65,13 @@ class ContentRendererClientEfl : public content::ContentRendererClient blink::WebNavigationPolicy default_policy, bool is_redirect) override; - virtual bool WillSendRequest(blink::WebFrame* frame, - ui::PageTransition transition_type, - const GURL& url, - const GURL& first_party_for_cookies, - GURL* new_url) override; + bool WillSendRequest(blink::WebFrame* frame, + ui::PageTransition transition_type, + const GURL& url, + const GURL& first_party_for_cookies, + GURL* new_url) override; - virtual void GetNavigationErrorStrings( + void GetNavigationErrorStrings( content::RenderView* render_view, blink::WebFrame* frame, const blink::WebURLRequest& failed_request, diff --git a/tizen_src/impl/components/editing/content/renderer/editorclient_agent.cc b/tizen_src/ewk/efl_integration/renderer/editorclient_agent.cc similarity index 92% rename from tizen_src/impl/components/editing/content/renderer/editorclient_agent.cc rename to tizen_src/ewk/efl_integration/renderer/editorclient_agent.cc index 407b813..6872272 100644 --- a/tizen_src/impl/components/editing/content/renderer/editorclient_agent.cc +++ b/tizen_src/ewk/efl_integration/renderer/editorclient_agent.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "components/editing/content/renderer/editorclient_agent.h" -#include "third_party/WebKit/public/web/WebView.h" +#include "renderer/editorclient_agent.h" #include "content/public/renderer/render_view.h" -#include "components/editing/content/common/editing_messages.h" +#include "common/editing_messages.h" +#include "third_party/WebKit/public/web/WebView.h" namespace editing { diff --git a/tizen_src/impl/components/editing/content/renderer/editorclient_agent.h b/tizen_src/ewk/efl_integration/renderer/editorclient_agent.h similarity index 100% rename from tizen_src/impl/components/editing/content/renderer/editorclient_agent.h rename to tizen_src/ewk/efl_integration/renderer/editorclient_agent.h diff --git a/tizen_src/impl/renderer/print_web_view_helper_efl.cc b/tizen_src/ewk/efl_integration/renderer/print_web_view_helper_efl.cc similarity index 98% rename from tizen_src/impl/renderer/print_web_view_helper_efl.cc rename to tizen_src/ewk/efl_integration/renderer/print_web_view_helper_efl.cc index d03569f..e24d57e 100644 --- a/tizen_src/impl/renderer/print_web_view_helper_efl.cc +++ b/tizen_src/ewk/efl_integration/renderer/print_web_view_helper_efl.cc @@ -7,8 +7,7 @@ #include "base/logging.h" #include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_view.h" -#include "common/render_messages_efl.h" -#include "renderer/print_pages_params.h" +#include "common/render_messages_ewk.h" #include "printing/metafile_skia_wrapper.h" #include "printing/pdf_metafile_skia.h" #include "printing/units.h" diff --git a/tizen_src/impl/renderer/print_web_view_helper_efl.h b/tizen_src/ewk/efl_integration/renderer/print_web_view_helper_efl.h similarity index 96% rename from tizen_src/impl/renderer/print_web_view_helper_efl.h rename to tizen_src/ewk/efl_integration/renderer/print_web_view_helper_efl.h index 5901c62..dc51095 100644 --- a/tizen_src/impl/renderer/print_web_view_helper_efl.h +++ b/tizen_src/ewk/efl_integration/renderer/print_web_view_helper_efl.h @@ -7,7 +7,7 @@ #include "base/files/file_path.h" #include "base/memory/scoped_ptr.h" -#include "renderer/print_pages_params.h" +#include "common/print_pages_params.h" #include "third_party/WebKit/public/platform/WebCanvas.h" namespace content { diff --git a/tizen_src/impl/renderer/render_frame_observer_efl.cc b/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc similarity index 98% rename from tizen_src/impl/renderer/render_frame_observer_efl.cc rename to tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc index 55ea847..976572c 100644 --- a/tizen_src/impl/renderer/render_frame_observer_efl.cc +++ b/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc @@ -9,7 +9,7 @@ #include "content/public/renderer/render_view.h" #include "content/renderer/render_frame_impl.h" #include "content/renderer/external_popup_menu.h" -#include "common/render_messages_efl.h" +#include "common/render_messages_ewk.h" #include "third_party/WebKit/public/web/WebDocument.h" #include "third_party/WebKit/public/web/WebElement.h" #include "third_party/WebKit/public/web/WebLocalFrame.h" diff --git a/tizen_src/impl/renderer/render_frame_observer_efl.h b/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.h similarity index 100% rename from tizen_src/impl/renderer/render_frame_observer_efl.h rename to tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.h diff --git a/tizen_src/impl/renderer/render_process_observer_efl.cc b/tizen_src/ewk/efl_integration/renderer/render_process_observer_efl.cc similarity index 98% rename from tizen_src/impl/renderer/render_process_observer_efl.cc rename to tizen_src/ewk/efl_integration/renderer/render_process_observer_efl.cc index b426c75..b2c3da3 100644 --- a/tizen_src/impl/renderer/render_process_observer_efl.cc +++ b/tizen_src/ewk/efl_integration/renderer/render_process_observer_efl.cc @@ -7,7 +7,7 @@ #include "base/allocator/allocator_extension.h" #include "base/command_line.h" #include "common/content_switches_efl.h" -#include "common/render_messages_efl.h" +#include "common/render_messages_ewk.h" #include "content/public/renderer/render_thread.h" #include "third_party/WebKit/public/web/WebCache.h" #include "third_party/sqlite/sqlite3.h" diff --git a/tizen_src/impl/renderer/render_process_observer_efl.h b/tizen_src/ewk/efl_integration/renderer/render_process_observer_efl.h similarity index 96% rename from tizen_src/impl/renderer/render_process_observer_efl.h rename to tizen_src/ewk/efl_integration/renderer/render_process_observer_efl.h index 9e0e2b4..af81eb3 100644 --- a/tizen_src/impl/renderer/render_process_observer_efl.h +++ b/tizen_src/ewk/efl_integration/renderer/render_process_observer_efl.h @@ -6,9 +6,10 @@ #define RENDER_PROCESS_OBSERVER_EFL_H #include + #include "base/compiler_specific.h" +#include "common/cache_params_efl.h" #include "content/public/renderer/render_process_observer.h" -#include "cache_params_efl.h" namespace IPC { class Message; diff --git a/tizen_src/impl/renderer/render_view_observer_efl.cc b/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.cc similarity index 99% rename from tizen_src/impl/renderer/render_view_observer_efl.cc rename to tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.cc index 0d13b28..72e5554 100644 --- a/tizen_src/impl/renderer/render_view_observer_efl.cc +++ b/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.cc @@ -14,7 +14,7 @@ #include "base/strings/utf_string_conversions.h" #include "content/public/renderer/content_renderer_client.h" #include "content/public/renderer/render_view.h" -#include "common/render_messages_efl.h" +#include "common/render_messages_ewk.h" #include "third_party/WebKit/public/platform/WebCString.h" #include "third_party/WebKit/public/platform/WebData.h" #include "third_party/WebKit/public/platform/WebPoint.h" @@ -44,6 +44,7 @@ using blink::WebURLRequest; namespace { +#if !defined(EWK_BRINGUP) typedef blink::WebDocument::WebContentSecurityPolicyHeaderType SecurityPolicyHeaderType; COMPILE_ASSERT( @@ -57,6 +58,7 @@ SecurityPolicyHeaderType ToSecurityPolicyHeaderType( tizen_webview::ContentSecurityPolicyType type) { return static_cast(type); } +#endif bool GetGRBAValuesFromString(const std::string& input, int* r, int* g, int* b, int* a) { @@ -187,12 +189,14 @@ void RenderViewObserverEfl::DidCreateDocumentElement(blink::WebLocalFrame* frame tizen_webview::ContentSecurityPolicyType type = TW_CSP_DEFAULT_POLICY; Send(new EwkHostMsg_GetContentSecurityPolicy(render_view()->GetRoutingID(), &policy, &type)); +#if !defined(EWK_BRINGUP) // Since, Webkit supports some more types and we cast ewk type to Webkit type. // We allow only ewk types. if (type == TW_CSP_REPORT_ONLY || type == TW_CSP_ENFORCE_POLICY) { frame->document().setContentSecurityPolicyUsingHeader( blink::WebString::fromUTF8(policy), ToSecurityPolicyHeaderType(type)); } +#endif } void RenderViewObserverEfl::OnSetContentSecurityPolicy(const std::string& policy, tizen_webview::ContentSecurityPolicyType header_type) @@ -200,8 +204,10 @@ void RenderViewObserverEfl::OnSetContentSecurityPolicy(const std::string& policy blink::WebView* view = render_view()->GetWebView(); DCHECK(view); blink::WebDocument document = view->mainFrame()->document(); +#if !defined(EWK_BRINGUP) document.setContentSecurityPolicyUsingHeader(blink::WebString::fromUTF8(policy), ToSecurityPolicyHeaderType(header_type)); +#endif } void RenderViewObserverEfl::OnScale(double scale_factor, int x, int y) diff --git a/tizen_src/impl/renderer/render_view_observer_efl.h b/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.h similarity index 98% rename from tizen_src/impl/renderer/render_view_observer_efl.h rename to tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.h index ca90abf..7e5d557 100644 --- a/tizen_src/impl/renderer/render_view_observer_efl.h +++ b/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.h @@ -6,13 +6,14 @@ #define RENDER_VIEW_OBSERVER_EFL_H_ #include + #include "base/timer/timer.h" #include "content/public/renderer/render_view_observer.h" #include "content/public/renderer/render_view_observer.h" #include "renderer/content_renderer_client_efl.h" #include "renderer/print_web_view_helper_efl.h" #include "content/public/renderer/render_view_observer.h" -#include "API/ewk_hit_test_private.h" +#include "private/ewk_hit_test_private.h" #include "third_party/WebKit/public/platform/WebSize.h" #include "third_party/WebKit/public/web/WebViewModeEnums.h" #include "tizen_webview/public/tw_content_security_policy.h" diff --git a/tizen_src/impl/resource/AutofillPopup.edc b/tizen_src/ewk/efl_integration/resource/AutofillPopup.edc similarity index 100% rename from tizen_src/impl/resource/AutofillPopup.edc rename to tizen_src/ewk/efl_integration/resource/AutofillPopup.edc diff --git a/tizen_src/impl/resource/DisambiguationPopup.edc b/tizen_src/ewk/efl_integration/resource/DisambiguationPopup.edc similarity index 100% rename from tizen_src/impl/resource/DisambiguationPopup.edc rename to tizen_src/ewk/efl_integration/resource/DisambiguationPopup.edc diff --git a/tizen_src/impl/resource/Edge.edc b/tizen_src/ewk/efl_integration/resource/Edge.edc similarity index 100% rename from tizen_src/impl/resource/Edge.edc rename to tizen_src/ewk/efl_integration/resource/Edge.edc diff --git a/tizen_src/impl/resource/JavaScriptPopup.edc b/tizen_src/ewk/efl_integration/resource/JavaScriptPopup.edc old mode 100755 new mode 100644 similarity index 100% rename from tizen_src/impl/resource/JavaScriptPopup.edc rename to tizen_src/ewk/efl_integration/resource/JavaScriptPopup.edc diff --git a/tizen_src/impl/resource/Magnifier.edc b/tizen_src/ewk/efl_integration/resource/Magnifier.edc similarity index 100% rename from tizen_src/impl/resource/Magnifier.edc rename to tizen_src/ewk/efl_integration/resource/Magnifier.edc diff --git a/tizen_src/impl/resource/control.edc b/tizen_src/ewk/efl_integration/resource/control.edc old mode 100755 new mode 100644 similarity index 100% rename from tizen_src/impl/resource/control.edc rename to tizen_src/ewk/efl_integration/resource/control.edc diff --git a/tizen_src/impl/resource/images/I01_picker_arrow_left.png b/tizen_src/ewk/efl_integration/resource/images/I01_picker_arrow_left.png old mode 100755 new mode 100644 similarity index 100% rename from tizen_src/impl/resource/images/I01_picker_arrow_left.png rename to tizen_src/ewk/efl_integration/resource/images/I01_picker_arrow_left.png diff --git a/tizen_src/impl/resource/images/I01_picker_arrow_right.png b/tizen_src/ewk/efl_integration/resource/images/I01_picker_arrow_right.png old mode 100755 new mode 100644 similarity index 100% rename from tizen_src/impl/resource/images/I01_picker_arrow_right.png rename to tizen_src/ewk/efl_integration/resource/images/I01_picker_arrow_right.png diff --git a/tizen_src/impl/resource/images/I01_picker_btn_02_normal.png b/tizen_src/ewk/efl_integration/resource/images/I01_picker_btn_02_normal.png old mode 100755 new mode 100644 similarity index 100% rename from tizen_src/impl/resource/images/I01_picker_btn_02_normal.png rename to tizen_src/ewk/efl_integration/resource/images/I01_picker_btn_02_normal.png diff --git a/tizen_src/impl/resource/images/I01_picker_btn_02_press.png b/tizen_src/ewk/efl_integration/resource/images/I01_picker_btn_02_press.png old mode 100755 new mode 100644 similarity index 100% rename from tizen_src/impl/resource/images/I01_picker_btn_02_press.png rename to tizen_src/ewk/efl_integration/resource/images/I01_picker_btn_02_press.png diff --git a/tizen_src/impl/resource/images/I01_picker_btn_normal.png b/tizen_src/ewk/efl_integration/resource/images/I01_picker_btn_normal.png old mode 100755 new mode 100644 similarity index 100% rename from tizen_src/impl/resource/images/I01_picker_btn_normal.png rename to tizen_src/ewk/efl_integration/resource/images/I01_picker_btn_normal.png diff --git a/tizen_src/impl/resource/images/I01_picker_panel_bg.png b/tizen_src/ewk/efl_integration/resource/images/I01_picker_panel_bg.png old mode 100755 new mode 100644 similarity index 100% rename from tizen_src/impl/resource/images/I01_picker_panel_bg.png rename to tizen_src/ewk/efl_integration/resource/images/I01_picker_panel_bg.png diff --git a/tizen_src/impl/resource/images/magnifier_left.png b/tizen_src/ewk/efl_integration/resource/images/magnifier_left.png similarity index 100% rename from tizen_src/impl/resource/images/magnifier_left.png rename to tizen_src/ewk/efl_integration/resource/images/magnifier_left.png diff --git a/tizen_src/impl/resource/images/magnifier_middle.png b/tizen_src/ewk/efl_integration/resource/images/magnifier_middle.png similarity index 100% rename from tizen_src/impl/resource/images/magnifier_middle.png rename to tizen_src/ewk/efl_integration/resource/images/magnifier_middle.png diff --git a/tizen_src/impl/resource/images/magnifier_right.png b/tizen_src/ewk/efl_integration/resource/images/magnifier_right.png similarity index 100% rename from tizen_src/impl/resource/images/magnifier_right.png rename to tizen_src/ewk/efl_integration/resource/images/magnifier_right.png diff --git a/tizen_src/impl/resource/images/overscrolling_dark_bottom.png b/tizen_src/ewk/efl_integration/resource/images/overscrolling_dark_bottom.png similarity index 100% rename from tizen_src/impl/resource/images/overscrolling_dark_bottom.png rename to tizen_src/ewk/efl_integration/resource/images/overscrolling_dark_bottom.png diff --git a/tizen_src/impl/resource/images/overscrolling_dark_left.png b/tizen_src/ewk/efl_integration/resource/images/overscrolling_dark_left.png similarity index 100% rename from tizen_src/impl/resource/images/overscrolling_dark_left.png rename to tizen_src/ewk/efl_integration/resource/images/overscrolling_dark_left.png diff --git a/tizen_src/impl/resource/images/overscrolling_dark_right.png b/tizen_src/ewk/efl_integration/resource/images/overscrolling_dark_right.png similarity index 100% rename from tizen_src/impl/resource/images/overscrolling_dark_right.png rename to tizen_src/ewk/efl_integration/resource/images/overscrolling_dark_right.png diff --git a/tizen_src/impl/resource/images/overscrolling_dark_top.png b/tizen_src/ewk/efl_integration/resource/images/overscrolling_dark_top.png similarity index 100% rename from tizen_src/impl/resource/images/overscrolling_dark_top.png rename to tizen_src/ewk/efl_integration/resource/images/overscrolling_dark_top.png diff --git a/tizen_src/impl/selection_box_efl.cc b/tizen_src/ewk/efl_integration/selection_box_efl.cc similarity index 100% rename from tizen_src/impl/selection_box_efl.cc rename to tizen_src/ewk/efl_integration/selection_box_efl.cc diff --git a/tizen_src/impl/selection_box_efl.h b/tizen_src/ewk/efl_integration/selection_box_efl.h similarity index 100% rename from tizen_src/impl/selection_box_efl.h rename to tizen_src/ewk/efl_integration/selection_box_efl.h diff --git a/tizen_src/impl/selection_controller_efl.cc b/tizen_src/ewk/efl_integration/selection_controller_efl.cc similarity index 100% rename from tizen_src/impl/selection_controller_efl.cc rename to tizen_src/ewk/efl_integration/selection_controller_efl.cc diff --git a/tizen_src/impl/selection_controller_efl.h b/tizen_src/ewk/efl_integration/selection_controller_efl.h similarity index 99% rename from tizen_src/impl/selection_controller_efl.h rename to tizen_src/ewk/efl_integration/selection_controller_efl.h index d787b39..e4243fe 100644 --- a/tizen_src/impl/selection_controller_efl.h +++ b/tizen_src/ewk/efl_integration/selection_controller_efl.h @@ -82,7 +82,7 @@ class SelectionControllerEfl : public tizen_webview::SelectionController { EWebView* GetParentView() { return parent_view_; } void HideHandle() override; void HideHandleAndContextMenu(); - bool IsAnyHandleVisible() const; + bool IsAnyHandleVisible() const override; void SetScrollStatus(const bool enable); bool GetScrollStatus(); diff --git a/tizen_src/impl/selection_handle_efl.cc b/tizen_src/ewk/efl_integration/selection_handle_efl.cc similarity index 100% rename from tizen_src/impl/selection_handle_efl.cc rename to tizen_src/ewk/efl_integration/selection_handle_efl.cc diff --git a/tizen_src/impl/selection_handle_efl.h b/tizen_src/ewk/efl_integration/selection_handle_efl.h similarity index 100% rename from tizen_src/impl/selection_handle_efl.h rename to tizen_src/ewk/efl_integration/selection_handle_efl.h diff --git a/tizen_src/impl/selection_magnifier_efl.cc b/tizen_src/ewk/efl_integration/selection_magnifier_efl.cc similarity index 99% rename from tizen_src/impl/selection_magnifier_efl.cc rename to tizen_src/ewk/efl_integration/selection_magnifier_efl.cc index 5fe951e..d1f17b8 100644 --- a/tizen_src/impl/selection_magnifier_efl.cc +++ b/tizen_src/ewk/efl_integration/selection_magnifier_efl.cc @@ -4,9 +4,9 @@ #include "base/path_service.h" #include "base/files/file_path.h" +#include "content/common/paths_efl.h" #include "content/public/browser/browser_thread.h" #include "eweb_view.h" -#include "paths_efl.h" #include "selection_magnifier_efl.h" #include "selection_controller_efl.h" diff --git a/tizen_src/impl/selection_magnifier_efl.h b/tizen_src/ewk/efl_integration/selection_magnifier_efl.h similarity index 100% rename from tizen_src/impl/selection_magnifier_efl.h rename to tizen_src/ewk/efl_integration/selection_magnifier_efl.h diff --git a/tizen_src/impl/tizen_webview/public/README b/tizen_src/ewk/efl_integration/tizen_webview/public/README similarity index 100% rename from tizen_src/impl/tizen_webview/public/README rename to tizen_src/ewk/efl_integration/tizen_webview/public/README diff --git a/tizen_src/impl/tizen_webview/public/tw_back_forward_history.cc b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_back_forward_history.cc similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_back_forward_history.cc rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_back_forward_history.cc diff --git a/tizen_src/impl/tizen_webview/public/tw_back_forward_history.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_back_forward_history.h similarity index 76% rename from tizen_src/impl/tizen_webview/public/tw_back_forward_history.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_back_forward_history.h index 9f78548..a825f3b 100644 --- a/tizen_src/impl/tizen_webview/public/tw_back_forward_history.h +++ b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_back_forward_history.h @@ -24,15 +24,15 @@ class BackForwardHistoryItem : } } - const GURL& GetURL() const { + const GURL& GetURL() const override { return url_; } - const GURL& GetOriginalURL() const { + const GURL& GetOriginalURL() const override { return original_url_; } - const std::string& GetTitle() const { + const std::string& GetTitle() const override { return title_; } @@ -48,11 +48,11 @@ class BackForwardHistory : BackForwardHistory(content::NavigationController &controller); ~BackForwardHistory(); - int GetCurrentIndex() const; - int GetLength() const; - int GetBackListLength() const; - int GetForwardListLength() const; - back_forward_list::Item* GetItemAtIndex(int index) const; + int GetCurrentIndex() const override; + int GetLength() const override; + int GetBackListLength() const override; + int GetForwardListLength() const override; + back_forward_list::Item* GetItemAtIndex(int index) const override; private: const int current_index_; diff --git a/tizen_src/impl/tizen_webview/public/tw_back_forward_list.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_back_forward_list.h similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_back_forward_list.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_back_forward_list.h diff --git a/tizen_src/impl/tizen_webview/public/tw_back_forward_list_impl.cc b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_back_forward_list_impl.cc similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_back_forward_list_impl.cc rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_back_forward_list_impl.cc diff --git a/tizen_src/impl/tizen_webview/public/tw_back_forward_list_impl.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_back_forward_list_impl.h similarity index 83% rename from tizen_src/impl/tizen_webview/public/tw_back_forward_list_impl.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_back_forward_list_impl.h index b297ae0..8e77666 100644 --- a/tizen_src/impl/tizen_webview/public/tw_back_forward_list_impl.h +++ b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_back_forward_list_impl.h @@ -34,15 +34,15 @@ class BackForwardListItem : } } - const GURL& GetURL() const { + const GURL& GetURL() const override { return url_; } - const GURL& GetOriginalURL() const { + const GURL& GetOriginalURL() const override { return original_url_; } - const std::string& GetTitle() const { + const std::string& GetTitle() const override { return title_; } @@ -62,11 +62,11 @@ class BackForwardList : BackForwardList(content::NavigationController &controller); ~BackForwardList() {} - int GetCurrentIndex() const; - int GetLength() const; - int GetBackListLength() const; - int GetForwardListLength() const; - back_forward_list::Item* GetItemAtIndex(int index) const; + int GetCurrentIndex() const override; + int GetLength() const override; + int GetBackListLength() const override; + int GetForwardListLength() const override; + back_forward_list::Item* GetItemAtIndex(int index) const override; void NewPageCommited(int prev_entry_index, content::NavigationEntry* new_entry); @@ -74,7 +74,7 @@ class BackForwardList : void ClearCache(); void Observe(int type, const content::NotificationSource &source, - const content::NotificationDetails &details); + const content::NotificationDetails &details) override; private: BackForwardListItem* FindOrCreateItem(int index) const; diff --git a/tizen_src/impl/tizen_webview/public/tw_cache_model.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_cache_model.h similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_cache_model.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_cache_model.h diff --git a/tizen_src/impl/tizen_webview/public/tw_callbacks.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_callbacks.h similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_callbacks.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_callbacks.h diff --git a/tizen_src/impl/tizen_webview/public/tw_content_security_policy.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_content_security_policy.h similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_content_security_policy.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_content_security_policy.h diff --git a/tizen_src/impl/tizen_webview/public/tw_context_menu_controller.cc b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_context_menu_controller.cc similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_context_menu_controller.cc rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_context_menu_controller.cc diff --git a/tizen_src/impl/tizen_webview/public/tw_context_menu_controller.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_context_menu_controller.h similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_context_menu_controller.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_context_menu_controller.h diff --git a/tizen_src/impl/tizen_webview/public/tw_cookie_accept_policy.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_cookie_accept_policy.h similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_cookie_accept_policy.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_cookie_accept_policy.h diff --git a/tizen_src/impl/tizen_webview/public/tw_custom_handlers.cc b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_custom_handlers.cc similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_custom_handlers.cc rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_custom_handlers.cc diff --git a/tizen_src/impl/tizen_webview/public/tw_custom_handlers.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_custom_handlers.h similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_custom_handlers.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_custom_handlers.h diff --git a/tizen_src/impl/tizen_webview/public/tw_error.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_error.h similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_error.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_error.h diff --git a/tizen_src/impl/tizen_webview/public/tw_export.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_export.h similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_export.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_export.h diff --git a/tizen_src/impl/tizen_webview/public/tw_find_options.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_find_options.h similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_find_options.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_find_options.h diff --git a/tizen_src/impl/tizen_webview/public/tw_frame.cc b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_frame.cc similarity index 75% rename from tizen_src/impl/tizen_webview/public/tw_frame.cc rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_frame.cc index 3208b3e..4cbf6b8 100644 --- a/tizen_src/impl/tizen_webview/public/tw_frame.cc +++ b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_frame.cc @@ -5,12 +5,11 @@ #include "tw_frame.h" -#include -#include -#include -#include - -#include +#include "common/navigation_policy_params.h" +#include "content/public/browser/render_frame_host.h" +#include "content/public/browser/render_process_host.h" +#include "content/public/browser/render_view_host.h" +#include "content/public/browser/web_contents.h" using content::RenderFrameHost; using content::RenderViewHost; diff --git a/tizen_src/impl/tizen_webview/public/tw_frame.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_frame.h similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_frame.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_frame.h index 0cb76bf..51f0cfd 100644 --- a/tizen_src/impl/tizen_webview/public/tw_frame.h +++ b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_frame.h @@ -6,12 +6,12 @@ #ifndef TIZEN_WEBVIEW_PUBLIC_TW_FRAME_H_ #define TIZEN_WEBVIEW_PUBLIC_TW_FRAME_H_ -struct NavigationPolicyParams; - namespace content { class RenderFrameHost; } +struct NavigationPolicyParams; + namespace tizen_webview { class Frame { public: diff --git a/tizen_src/impl/tizen_webview/public/tw_hit_test.cc b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_hit_test.cc similarity index 97% rename from tizen_src/impl/tizen_webview/public/tw_hit_test.cc rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_hit_test.cc index 08b4b88..1d0b396 100644 --- a/tizen_src/impl/tizen_webview/public/tw_hit_test.cc +++ b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_hit_test.cc @@ -4,8 +4,10 @@ // found in the LICENSE file. #include "tw_hit_test.h" + #include -#include "API/ewk_hit_test_private.h" + +#include "private/ewk_hit_test_private.h" namespace tizen_webview { diff --git a/tizen_src/impl/tizen_webview/public/tw_hit_test.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_hit_test.h similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_hit_test.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_hit_test.h diff --git a/tizen_src/impl/tizen_webview/public/tw_legacy_font_size_mode.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_legacy_font_size_mode.h similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_legacy_font_size_mode.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_legacy_font_size_mode.h diff --git a/tizen_src/impl/tizen_webview/public/tw_macro.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_macro.h similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_macro.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_macro.h diff --git a/tizen_src/impl/tizen_webview/public/tw_notification.cc b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_notification.cc similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_notification.cc rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_notification.cc diff --git a/tizen_src/impl/tizen_webview/public/tw_notification.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_notification.h similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_notification.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_notification.h diff --git a/tizen_src/impl/tizen_webview/public/tw_policy_decision.cc b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_policy_decision.cc similarity index 98% rename from tizen_src/impl/tizen_webview/public/tw_policy_decision.cc rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_policy_decision.cc index 8508693..84c2f14 100644 --- a/tizen_src/impl/tizen_webview/public/tw_policy_decision.cc +++ b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_policy_decision.cc @@ -6,7 +6,7 @@ #include "tw_policy_decision.h" #include "tw_webview.h" -#include "API/ewk_policy_decision_private.h" +#include "private/ewk_policy_decision_private.h" #include "tw_webview.h" #include "content/public/browser/browser_thread.h" diff --git a/tizen_src/impl/tizen_webview/public/tw_policy_decision.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_policy_decision.h similarity index 96% rename from tizen_src/impl/tizen_webview/public/tw_policy_decision.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_policy_decision.h index de2dc8b..b32c50f 100644 --- a/tizen_src/impl/tizen_webview/public/tw_policy_decision.h +++ b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_policy_decision.h @@ -12,23 +12,20 @@ #include "content/public/browser/web_contents_delegate.h" #include "content/public/common/resource_type.h" -// TODO: break below dependency namespace content { class RenderViewHost; } -// TODO: break below dependency namespace net { class HttpResponseHeaders; class URLRequest; } -// TODO: break below dependency class NavigationPolicyHandlerEfl; class GURL; class _Ewk_Policy_Decision; -class PolicyResponseDelegateEfl; struct NavigationPolicyParams; +class PolicyResponseDelegateEfl; class EWebView; namespace tizen_webview { diff --git a/tizen_src/impl/tizen_webview/public/tw_ref_counted.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_ref_counted.h similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_ref_counted.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_ref_counted.h diff --git a/tizen_src/impl/tizen_webview/public/tw_security_origin.cc b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_security_origin.cc similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_security_origin.cc rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_security_origin.cc diff --git a/tizen_src/impl/tizen_webview/public/tw_security_origin.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_security_origin.h similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_security_origin.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_security_origin.h diff --git a/tizen_src/impl/tizen_webview/public/tw_selection_controller.cc b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_selection_controller.cc similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_selection_controller.cc rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_selection_controller.cc diff --git a/tizen_src/impl/tizen_webview/public/tw_selection_controller.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_selection_controller.h similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_selection_controller.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_selection_controller.h diff --git a/tizen_src/impl/tizen_webview/public/tw_settings.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_settings.h similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_settings.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_settings.h diff --git a/tizen_src/impl/tizen_webview/public/tw_touch_event.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_touch_event.h similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_touch_event.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_touch_event.h diff --git a/tizen_src/impl/tizen_webview/public/tw_touch_point.cc b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_touch_point.cc similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_touch_point.cc rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_touch_point.cc diff --git a/tizen_src/impl/tizen_webview/public/tw_touch_point.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_touch_point.h similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_touch_point.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_touch_point.h diff --git a/tizen_src/impl/tizen_webview/public/tw_url.cc b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_url.cc similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_url.cc rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_url.cc diff --git a/tizen_src/impl/tizen_webview/public/tw_url.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_url.h similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_url.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_url.h diff --git a/tizen_src/impl/tizen_webview/public/tw_web_context.cc b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_web_context.cc similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_web_context.cc rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_web_context.cc diff --git a/tizen_src/impl/tizen_webview/public/tw_web_context.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_web_context.h similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_web_context.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_web_context.h diff --git a/tizen_src/impl/tizen_webview/public/tw_webview.cc b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview.cc similarity index 98% rename from tizen_src/impl/tizen_webview/public/tw_webview.cc rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview.cc index d1fedfd..07265c3 100644 --- a/tizen_src/impl/tizen_webview/public/tw_webview.cc +++ b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview.cc @@ -9,7 +9,7 @@ #include #include -#include "browser/renderer_host/render_widget_host_view_efl.h" +#include "content/browser/renderer_host/render_widget_host_view_efl.h" #include namespace { @@ -78,7 +78,11 @@ SelectionController* WebView::GetSelectionController() { } WebViewEvasEventHandler* WebView::GetEvasEventHandler() { +#if defined(EWK_REFACTOR) return impl_->GetEvasEventHandler(); +#else + return NULL; +#endif } ContextMenuController* WebView::GetContextMenuController() { @@ -343,10 +347,6 @@ void WebView::SetTouchEventsEnabled(bool enabled) { return impl_->SetTouchEventsEnabled(enabled); } -void WebView::HandleTouchEvents(Touch_Event_Type type, const Eina_List *points, const Evas_Modifier *modifiers) { - return impl_->HandleTouchEvents(type, points, modifiers); -} - Hit_Test* WebView::RequestHitTestDataAt(int x, int y, Hit_Test_Mode mode) { return impl_->RequestHitTestDataAt(x, y, mode); } diff --git a/tizen_src/impl/tizen_webview/public/tw_webview.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview.h similarity index 98% rename from tizen_src/impl/tizen_webview/public/tw_webview.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview.h index 4fbcac5..25f30e3 100644 --- a/tizen_src/impl/tizen_webview/public/tw_webview.h +++ b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview.h @@ -9,6 +9,7 @@ #include #include #include + #include "content/public/browser/navigation_controller.h" #include "tizen_webview/public/tw_back_forward_history.h" #include "tizen_webview/public/tw_back_forward_list_impl.h" @@ -18,11 +19,9 @@ #include "tizen_webview/public/tw_find_options.h" #include "tizen_webview/public/tw_macro.h" #include "tizen_webview/public/tw_touch_event.h" - #include "third_party/WebKit/public/web/WebViewModeEnums.h" // TODO: Remove this dependency -#include "EdgeEffect.h" class Ewk_Settings; class WebContentDelegateEfl; struct SelectionStylePrams; @@ -151,7 +150,6 @@ class WebView { // ---- Touch & Hit Test bool TouchEventsEnabled() const; void SetTouchEventsEnabled(bool enabled); - void HandleTouchEvents(Touch_Event_Type type, const Eina_List *points, const Evas_Modifier *modifiers); Hit_Test* RequestHitTestDataAt(int x, int y, Hit_Test_Mode mode); Eina_Bool AsyncRequestHitTestDataAt(int x, int y, tizen_webview::Hit_Test_Mode mode, tizen_webview::View_Hit_Test_Request_Callback, void* user_data); diff --git a/tizen_src/impl/tizen_webview/public/tw_webview_delegate.cc b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview_delegate.cc similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_webview_delegate.cc rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview_delegate.cc diff --git a/tizen_src/impl/tizen_webview/public/tw_webview_delegate.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview_delegate.h similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_webview_delegate.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview_delegate.h diff --git a/tizen_src/impl/tizen_webview/public/tw_webview_evas_event_handler.cc b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview_evas_event_handler.cc similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_webview_evas_event_handler.cc rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview_evas_event_handler.cc diff --git a/tizen_src/impl/tizen_webview/public/tw_webview_evas_event_handler.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview_evas_event_handler.h similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_webview_evas_event_handler.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_webview_evas_event_handler.h diff --git a/tizen_src/impl/tizen_webview/public/tw_wrt.cc b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_wrt.cc similarity index 97% rename from tizen_src/impl/tizen_webview/public/tw_wrt.cc rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_wrt.cc index 323c769..23ce98f 100644 --- a/tizen_src/impl/tizen_webview/public/tw_wrt.cc +++ b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_wrt.cc @@ -6,7 +6,7 @@ #include "tw_wrt.h" #include "content/public/renderer/render_view.h" -#include "common/render_messages_efl.h" +#include "common/render_messages_ewk.h" #include "eweb_context.h" #include "tizen_webview/public/tw_web_context.h" diff --git a/tizen_src/impl/tizen_webview/public/tw_wrt.h b/tizen_src/ewk/efl_integration/tizen_webview/public/tw_wrt.h similarity index 100% rename from tizen_src/impl/tizen_webview/public/tw_wrt.h rename to tizen_src/ewk/efl_integration/tizen_webview/public/tw_wrt.h diff --git a/tizen_src/impl/tizen_webview/tw_misc_utility.cc b/tizen_src/ewk/efl_integration/tizen_webview/tw_misc_utility.cc similarity index 100% rename from tizen_src/impl/tizen_webview/tw_misc_utility.cc rename to tizen_src/ewk/efl_integration/tizen_webview/tw_misc_utility.cc diff --git a/tizen_src/impl/tizen_webview/tw_misc_utility.h b/tizen_src/ewk/efl_integration/tizen_webview/tw_misc_utility.h similarity index 100% rename from tizen_src/impl/tizen_webview/tw_misc_utility.h rename to tizen_src/ewk/efl_integration/tizen_webview/tw_misc_utility.h diff --git a/tizen_src/impl/url_request_context_getter_efl.cc b/tizen_src/ewk/efl_integration/url_request_context_getter_efl.cc similarity index 100% rename from tizen_src/impl/url_request_context_getter_efl.cc rename to tizen_src/ewk/efl_integration/url_request_context_getter_efl.cc diff --git a/tizen_src/impl/url_request_context_getter_efl.h b/tizen_src/ewk/efl_integration/url_request_context_getter_efl.h similarity index 100% rename from tizen_src/impl/url_request_context_getter_efl.h rename to tizen_src/ewk/efl_integration/url_request_context_getter_efl.h diff --git a/tizen_src/impl/web_contents_delegate_efl.cc b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc similarity index 98% rename from tizen_src/impl/web_contents_delegate_efl.cc rename to tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc index c49b57f..f5db880 100644 --- a/tizen_src/impl/web_contents_delegate_efl.cc +++ b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc @@ -4,21 +4,21 @@ #include "web_contents_delegate_efl.h" -#include "API/ewk_console_message_private.h" -#include "API/ewk_error_private.h" -#include "API/ewk_certificate_private.h" -#include "API/ewk_policy_decision_private.h" -#include "API/ewk_user_media_private.h" +#include "private/ewk_console_message_private.h" +#include "private/ewk_error_private.h" +#include "private/ewk_certificate_private.h" +#include "private/ewk_policy_decision_private.h" +#include "private/ewk_user_media_private.h" #include "browser/javascript_dialog_manager_efl.h" #include "browser/policy_response_delegate_efl.h" -#include "browser/renderer_host/render_widget_host_view_efl.h" #include "browser/inputpicker/color_chooser_efl.h" -#include "common/render_messages_efl.h" +#include "content/common/render_messages_efl.h" +#include "common/render_messages_ewk.h" #include "eweb_view.h" #include "eweb_view_callbacks.h" - #include "base/strings/utf_string_conversions.h" #include "content/common/view_messages.h" +#include "content/browser/renderer_host/render_widget_host_view_efl.h" #include "content/public/browser/invalidate_type.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/navigation_entry.h" diff --git a/tizen_src/impl/web_contents_delegate_efl.h b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h similarity index 90% rename from tizen_src/impl/web_contents_delegate_efl.h rename to tizen_src/ewk/efl_integration/web_contents_delegate_efl.h index cfe4a92..6fec004 100644 --- a/tizen_src/impl/web_contents_delegate_efl.h +++ b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h @@ -152,21 +152,23 @@ class WebContentsDelegateEfl bool OnMessageReceived(const IPC::Message& message) override; void OnPrintedMetafileReceived(const DidPrintPagesParams& params); - virtual void NavigationEntryCommitted(const LoadCommittedDetails& load_details) override; - virtual void RenderProcessGone(base::TerminationStatus status) override; - virtual bool AddMessageToConsole(WebContents* source, - int32 level, - const base::string16& message, - int32 line_no, - const base::string16& source_id) override; - void RunFileChooser(WebContents* web_contents, const FileChooserParams& params); - ColorChooser* OpenColorChooser(WebContents* web_contents, SkColor color, const std::vector& suggestions); + void NavigationEntryCommitted(const LoadCommittedDetails& load_details) override; + void RenderProcessGone(base::TerminationStatus status) override; + bool AddMessageToConsole(WebContents* source, + int32 level, + const base::string16& message, + int32 line_no, + const base::string16& source_id) override; + void RunFileChooser(WebContents* web_contents, + const FileChooserParams& params) override; + ColorChooser* OpenColorChooser(WebContents* web_contents, SkColor color, + const std::vector& suggestions) override; void OpenDateTimeDialog(ui::TextInputType dialog_type, - double dialog_value, - double min, - double max, - double step, - const std::vector& suggestions); + double dialog_value, + double min, + double max, + double step, + const std::vector& suggestions) override; private: void OnGetContentSecurityPolicy(IPC::Message* reply_msg); diff --git a/tizen_src/impl/web_process_content_main_delegate_efl.cc b/tizen_src/ewk/efl_integration/web_process_content_main_delegate_efl.cc similarity index 97% rename from tizen_src/impl/web_process_content_main_delegate_efl.cc rename to tizen_src/ewk/efl_integration/web_process_content_main_delegate_efl.cc index ec1bb78..6e963a9 100644 --- a/tizen_src/impl/web_process_content_main_delegate_efl.cc +++ b/tizen_src/ewk/efl_integration/web_process_content_main_delegate_efl.cc @@ -6,9 +6,9 @@ #include "base/files/file_path.h" #include "base/path_service.h" +#include "content/common/paths_efl.h" #include "content/public/common/referrer.h" #include "ui/base/resource/resource_bundle.h" -#include "paths_efl.h" #include "renderer/content_renderer_client_efl.h" #include "common/content_client_efl.h" #include "locale_efl.h" diff --git a/tizen_src/impl/web_process_content_main_delegate_efl.h b/tizen_src/ewk/efl_integration/web_process_content_main_delegate_efl.h similarity index 100% rename from tizen_src/impl/web_process_content_main_delegate_efl.h rename to tizen_src/ewk/efl_integration/web_process_content_main_delegate_efl.h diff --git a/tizen_src/impl/wrt/dynamicplugin.cc b/tizen_src/ewk/efl_integration/wrt/dynamicplugin.cc similarity index 100% rename from tizen_src/impl/wrt/dynamicplugin.cc rename to tizen_src/ewk/efl_integration/wrt/dynamicplugin.cc diff --git a/tizen_src/impl/wrt/dynamicplugin.h b/tizen_src/ewk/efl_integration/wrt/dynamicplugin.h similarity index 100% rename from tizen_src/impl/wrt/dynamicplugin.h rename to tizen_src/ewk/efl_integration/wrt/dynamicplugin.h diff --git a/tizen_src/impl/wrt/wrt_file_protocol_handler.cc b/tizen_src/ewk/efl_integration/wrt/wrt_file_protocol_handler.cc similarity index 100% rename from tizen_src/impl/wrt/wrt_file_protocol_handler.cc rename to tizen_src/ewk/efl_integration/wrt/wrt_file_protocol_handler.cc diff --git a/tizen_src/impl/wrt/wrt_file_protocol_handler.h b/tizen_src/ewk/efl_integration/wrt/wrt_file_protocol_handler.h similarity index 100% rename from tizen_src/impl/wrt/wrt_file_protocol_handler.h rename to tizen_src/ewk/efl_integration/wrt/wrt_file_protocol_handler.h diff --git a/tizen_src/impl/wrt/wrt_widget_host.cc b/tizen_src/ewk/efl_integration/wrt/wrt_widget_host.cc similarity index 99% rename from tizen_src/impl/wrt/wrt_widget_host.cc rename to tizen_src/ewk/efl_integration/wrt/wrt_widget_host.cc index 4189e09..8140924 100644 --- a/tizen_src/impl/wrt/wrt_widget_host.cc +++ b/tizen_src/ewk/efl_integration/wrt/wrt_widget_host.cc @@ -5,7 +5,7 @@ #include "wrt_widget_host.h" #include "base/lazy_instance.h" -#include "common/render_messages_efl.h" +#include "common/render_messages_ewk.h" #include "content/public/browser/browser_message_filter.h" #include "content/public/browser/render_process_host.h" #include "content/public/browser/resource_request_info.h" diff --git a/tizen_src/impl/wrt/wrt_widget_host.h b/tizen_src/ewk/efl_integration/wrt/wrt_widget_host.h similarity index 100% rename from tizen_src/impl/wrt/wrt_widget_host.h rename to tizen_src/ewk/efl_integration/wrt/wrt_widget_host.h diff --git a/tizen_src/impl/wrt/wrtwidget.cc b/tizen_src/ewk/efl_integration/wrt/wrtwidget.cc similarity index 96% rename from tizen_src/impl/wrt/wrtwidget.cc rename to tizen_src/ewk/efl_integration/wrt/wrtwidget.cc index 7028e9e..7cf7d8e 100644 --- a/tizen_src/impl/wrt/wrtwidget.cc +++ b/tizen_src/ewk/efl_integration/wrt/wrtwidget.cc @@ -4,7 +4,7 @@ #include "wrtwidget.h" -#include "common/render_messages_efl.h" +#include "common/render_messages_ewk.h" #include "content/public/renderer/render_thread.h" #include "ipc/ipc_sync_channel.h" #include "wrt/dynamicplugin.h" @@ -19,7 +19,7 @@ class WrtRenderThreadObserver : public content::RenderProcessObserver { channel_(content::RenderThread::Get()->GetChannel()) { } - bool OnControlMessageReceived(const IPC::Message& message) { + bool OnControlMessageReceived(const IPC::Message& message) override { bool handled = true; IPC_BEGIN_MESSAGE_MAP(WrtRenderThreadObserver, message) IPC_MESSAGE_FORWARD(WrtMsg_SetWidgetInfo, wrt_widget_, WrtWidget::SetWidgetInfo) @@ -28,7 +28,7 @@ class WrtRenderThreadObserver : public content::RenderProcessObserver { IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() return handled; - } + } private: void ParseUrl(int request_id, const GURL& url) { diff --git a/tizen_src/impl/wrt/wrtwidget.h b/tizen_src/ewk/efl_integration/wrt/wrtwidget.h similarity index 100% rename from tizen_src/impl/wrt/wrtwidget.h rename to tizen_src/ewk/efl_integration/wrt/wrtwidget.h diff --git a/tizen_src/ewk/efl_webview_app/efl_webview_app.gypi b/tizen_src/ewk/efl_webview_app/efl_webview_app.gypi new file mode 100644 index 0000000..034d9ee --- /dev/null +++ b/tizen_src/ewk/efl_webview_app/efl_webview_app.gypi @@ -0,0 +1,74 @@ +# 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. + +{ + 'targets': [ + { + 'target_name': 'efl_webview_app', + 'type': 'executable', + + 'copies': [{ + 'destination': '<(PRODUCT_DIR)', + 'files': [ 'efl_webview_app.sh', ], + }], + + 'dependencies': [ + '<(DEPTH)/tizen_src/build/system.gyp:evas', + '<(DEPTH)/tizen_src/build/system.gyp:ecore', + '<(DEPTH)/tizen_src/build/system.gyp:ecore-evas', + '<(DEPTH)/tizen_src/build/system.gyp:ecore-x', + '<(DEPTH)/tizen_src/build/system.gyp:elementary', + 'chromium-ewk', + ], + 'include_dirs': [ + '../efl_integration', + ], + 'sources': [ + 'app.c', + ], + 'link_settings': { + 'ldflags': [ + '-Llib', + ], + 'libraries': [ + '-lchromium-ewk', + ], + }, + }, + { + 'target_name': 'mini_browser', + 'type': 'executable', + 'conditions': [ + ['building_for_tizen==1', { # FIXME: mini_browser shouldn't depend on dlog and appcore-efl without OS(TIZEN) checks + 'sources': [ + 'mini_browser.c', + 'browser-object.h', + 'browser-string.h', + ], + 'include_dirs': [ + '../efl_integration', + ], + 'dependencies': [ + '<(DEPTH)/tizen_src/build/system.gyp:evas', + '<(DEPTH)/tizen_src/build/system.gyp:ecore', + '<(DEPTH)/tizen_src/build/system.gyp:ecore-evas', + '<(DEPTH)/tizen_src/build/system.gyp:elementary', + 'chromium-ewk', + ], + 'cflags': [ + '(data)); - } - -_Ewk_Hit_Test::_Ewk_Hit_Test() - : context(TW_HIT_TEST_RESULT_CONTEXT_DOCUMENT), - isEditable(false), - mode(TW_HIT_TEST_MODE_DEFAULT) { -} - -_Ewk_Hit_Test::_Ewk_Hit_Test(const _Ewk_Hit_Test& other) - : context(other.context), - linkURI(other.linkURI), - linkTitle(other.linkTitle), - linkLabel(other.linkLabel), - imageURI(other.imageURI), - mediaURI(other.mediaURI), - isEditable(other.isEditable), - mode(other.mode), - nodeData(other.nodeData), - imageData(other.imageData) { -} - -_Ewk_Hit_Test::Hit_Test_Node_Data::Hit_Test_Node_Data() - : attributeHash(NULL) { -} - -// deep copy of node map -_Ewk_Hit_Test::Hit_Test_Node_Data::Hit_Test_Node_Data(const Hit_Test_Node_Data& other) - : tagName(other.tagName), - nodeValue(other.nodeValue), - attributeHash(NULL) { - if (!other.attributeHash) - return; - - Eina_Iterator* it = eina_hash_iterator_tuple_new(other.attributeHash); - void* data; - attributeHash = eina_hash_string_superfast_new(FreeHitTestAttributeHashData); - while (eina_iterator_next(it, &data)) { - Eina_Hash_Tuple* t = static_cast(data); - eina_hash_add(attributeHash, - static_cast(t->key), eina_stringshare_add(static_cast(t->data))); - } - eina_iterator_free(it); -} - -_Ewk_Hit_Test::Hit_Test_Node_Data::~Hit_Test_Node_Data() { - eina_hash_free(attributeHash); -} - -void _Ewk_Hit_Test::Hit_Test_Node_Data::PopulateNodeAtributes(const NodeAttributesMap& nodeAttributes) { - if (nodeAttributes.empty()) - return; - - attributeHash = eina_hash_string_superfast_new(FreeHitTestAttributeHashData); - NodeAttributesMap::const_iterator attributeMapEnd = nodeAttributes.end(); - for (NodeAttributesMap::const_iterator it = nodeAttributes.begin(); it != attributeMapEnd; ++it) { - eina_hash_add(attributeHash, it->first.c_str(), eina_stringshare_add(it->second.c_str())); - } -} - -_Ewk_Hit_Test::Hit_Test_Image_Buffer::Hit_Test_Image_Buffer() { -} - -//(warning) deep copy of skia buffer. -_Ewk_Hit_Test::Hit_Test_Image_Buffer::Hit_Test_Image_Buffer(const Hit_Test_Image_Buffer& other) - : fileNameExtension(other.fileNameExtension) { - other.imageBitmap.deepCopyTo(&imageBitmap); -} diff --git a/tizen_src/impl/API/ewk_hit_test_private.h b/tizen_src/impl/API/ewk_hit_test_private.h deleted file mode 100644 index 5af8af4..0000000 --- a/tizen_src/impl/API/ewk_hit_test_private.h +++ /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 EWK_HIT_TEST_PRIVATE_H_ -#define EWK_HIT_TEST_PRIVATE_H_ - -#include -#include - -#include - -#include "third_party/skia/include/core/SkBitmap.h" -#include "tizen_webview/public/tw_hit_test.h" - -typedef std::map NodeAttributesMap; - -// Structure used to report hit test result -struct _Ewk_Hit_Test { - _Ewk_Hit_Test(); - _Ewk_Hit_Test(const _Ewk_Hit_Test& other); - // TODO: check whether bitwise assignment is acceptable (e.g, attributeHash) - // If not, proper implementation for below should be added: - // _Ewk_Hit_Test& operator=(const _Ewk_Hit_Test&); - // Note: Currently the operation is used in EwebView::UpdateHitTestData(). - - tizen_webview::Hit_Test_Result_Context context; - std::string linkURI; - std::string linkTitle; // the title of link - std::string linkLabel; // the text of the link - std::string imageURI; - std::string mediaURI; - bool isEditable; - tizen_webview::Hit_Test_Mode mode; - - // store node attributes in a map - struct Hit_Test_Node_Data { - Hit_Test_Node_Data(); - Hit_Test_Node_Data(const Hit_Test_Node_Data& other); - ~Hit_Test_Node_Data(); - void PopulateNodeAtributes(const NodeAttributesMap& nodeAttributes); - - std::string tagName; // tag name for hit element - std::string nodeValue; // node value for hit element - Eina_Hash* attributeHash; // attribute data for hit element - } nodeData; - - // when hit node is image we need to store image buffer and filename extension - struct Hit_Test_Image_Buffer { - Hit_Test_Image_Buffer(); - Hit_Test_Image_Buffer(const Hit_Test_Image_Buffer& other); - - std::string fileNameExtension; // image filename extension for hit element - SkBitmap imageBitmap; // image pixels data - } imageData; -}; - -#endif // EWK_HIT_TEST_PRIVATE_H_ diff --git a/tizen_src/impl/API/ewk_policy_decision_private.cc b/tizen_src/impl/API/ewk_policy_decision_private.cc deleted file mode 100644 index 8e6c88f..0000000 --- a/tizen_src/impl/API/ewk_policy_decision_private.cc +++ /dev/null @@ -1,283 +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 "ewk_policy_decision_private.h" - -#include - -#include -#include -#include "eweb_view.h" -#include - -using content::BrowserThread; -using content::RenderFrameHost; -using content::RenderViewHost; -using namespace tizen_webview; - -namespace { - void FreeStringShare(void *data) { - eina_stringshare_del(static_cast(data)); - } -} - -_Ewk_Policy_Decision::_Ewk_Policy_Decision(const GURL &request_url, - net::URLRequest* request, - content::ResourceType resource_type, - PolicyResponseDelegateEfl* delegate) - : web_view_(NULL) - , policy_response_delegate_(delegate) - , responseHeaders_(NULL) - , decisionType_(TW_POLICY_DECISION_USE) - , navigationType_(TW_POLICY_NAVIGATION_TYPE_OTHER) - , isDecided_(false) - , isSuspended_(false) - , responseStatusCode_(0) - , type_(POLICY_RESPONSE) { - DCHECK(delegate); - DCHECK(request); - - net::HttpResponseHeaders* response_headers = request->response_headers(); - - ParseUrl(request_url); - if (response_headers) { - responseStatusCode_ = response_headers->response_code(); - - std::string mime_type; - - request->GetMimeType(&mime_type); - responseMime_ = mime_type; - - if (!content::IsResourceTypeFrame(resource_type) && - !resource_type == content::RESOURCE_TYPE_FAVICON) { - decisionType_ = TW_POLICY_DECISION_DOWNLOAD; - } - - if (request_url.has_password() && request_url.has_username()) - SetAuthorizationIfNecessary(request_url); - - std::string set_cookie_; - - if (response_headers->EnumerateHeader(NULL, "Set-Cookie", &set_cookie_)) - cookie_ = set_cookie_; - - void* iter = NULL; - std::string name; - std::string value; - responseHeaders_ = eina_hash_string_small_new(FreeStringShare); - while (response_headers->EnumerateHeaderLines(&iter, &name, &value)) - eina_hash_add(responseHeaders_, name.c_str(), eina_stringshare_add(value.c_str())); - } -} - -_Ewk_Policy_Decision::_Ewk_Policy_Decision(const NavigationPolicyParams ¶ms, content::RenderViewHost* rvh) - : web_view_(NULL) - , navigation_policy_handler_(new NavigationPolicyHandlerEfl(rvh, params)) - , frame_(new tizen_webview::Frame(params)) - , cookie_(params.cookie) - , httpMethod_(params.httpMethod) - , responseHeaders_(NULL) - , decisionType_(TW_POLICY_DECISION_USE) - , navigationType_(static_cast(params.type)) - , isDecided_(false) - , isSuspended_(false) - , responseStatusCode_(0) - , type_(POLICY_NAVIGATION) { - ParseUrl(params.url); - if (!params.auth.isEmpty()) - SetAuthorizationIfNecessary(params.auth.utf8()); - else if (params.url.has_password() && params.url.has_username()) - SetAuthorizationIfNecessary(params.url); -} - -_Ewk_Policy_Decision::_Ewk_Policy_Decision(EWebView* view, - content::WebContentsDelegate::NewWindowDecideCallback callback) - : web_view_(view) - , window_create_callback_(callback) - , responseHeaders_(NULL) - , decisionType_(TW_POLICY_DECISION_USE) - , navigationType_(TW_POLICY_NAVIGATION_TYPE_OTHER) - , isDecided_(false) - , isSuspended_(false) - , responseStatusCode_(0) - , type_(POLICY_NEWWINDOW) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - DCHECK(view); - - RenderFrameHost* rfh = NULL; - // we can use main frame here - if (view) { - view->web_contents().GetMainFrame(); - } - - frame_.reset(new tizen_webview::Frame(rfh)); -} - -_Ewk_Policy_Decision::~_Ewk_Policy_Decision() { - eina_hash_free(responseHeaders_); -} - -void _Ewk_Policy_Decision::Use() { - isDecided_ = true; - switch (type_) { - case POLICY_RESPONSE: - policy_response_delegate_->UseResponse(); - break; - case POLICY_NAVIGATION: - navigation_policy_handler_->SetDecision(NavigationPolicyHandlerEfl::Unhandled); - break; - case POLICY_NEWWINDOW: - window_create_callback_.Run(true); - break; - default: - NOTREACHED(); - break; - } -} - -void _Ewk_Policy_Decision::Ignore() { - isDecided_ = true; - switch (type_) { - case _Ewk_Policy_Decision::POLICY_RESPONSE: - policy_response_delegate_->IgnoreResponse(); - break; - case _Ewk_Policy_Decision::POLICY_NAVIGATION: - navigation_policy_handler_->SetDecision(NavigationPolicyHandlerEfl::Handled); - break; - case _Ewk_Policy_Decision::POLICY_NEWWINDOW: - window_create_callback_.Run(false); - break; - default: - NOTREACHED(); - break; - } -} - -void _Ewk_Policy_Decision::Download() { - isDecided_ = true; - switch (type_) { - case _Ewk_Policy_Decision::POLICY_RESPONSE: - policy_response_delegate_->UseResponse(); - break; - case _Ewk_Policy_Decision::POLICY_NAVIGATION: - navigation_policy_handler_->DownloadNavigation(); - break; - case _Ewk_Policy_Decision::POLICY_NEWWINDOW: - Ignore(); - break; - default: - NOTREACHED(); - break; - } -} - -bool _Ewk_Policy_Decision::Suspend() { - if (!isDecided_ && type_ != _Ewk_Policy_Decision::POLICY_NAVIGATION) { - // Policy navigation API is currently synchronous - we can't suspend it - isSuspended_ = true; - return true; - } - - return false; -} - -void _Ewk_Policy_Decision::InitializeOnUIThread() { - DCHECK(type_ == _Ewk_Policy_Decision::POLICY_RESPONSE); - DCHECK(policy_response_delegate_.get()); - - if (policy_response_delegate_.get()) { - RenderFrameHost *host = RenderFrameHost::FromID(policy_response_delegate_->GetRenderProcessId(), policy_response_delegate_->GetRenderFrameId()); - - // Download request has no render frame id, they're detached. We override it with main frame from render view id - if (!host) { - RenderViewHost *viewhost = RenderViewHost::FromID(policy_response_delegate_->GetRenderProcessId(), policy_response_delegate_->GetRenderViewId()); - - //DCHECK(viewhost); - if (viewhost) { - host = viewhost->GetMainFrame(); - } - } - - if (host) { - /* - * In some situations there is no renderer associated to the response - * Such case can be observed while running TC utc_blink_ewk_geolocation_permission_request_suspend_func - */ - frame_.reset(new tizen_webview::Frame(host)); - } - } -} - -tizen_webview::Frame* _Ewk_Policy_Decision::GetFrameRef() const { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); - // Ups, forgot to initialize something? - DCHECK(frame_.get()); - return frame_.get(); -} - -void _Ewk_Policy_Decision::ParseUrl(const GURL& url) { - url_ = url.spec(); - scheme_ = url.scheme(); - host_ = url.host(); -} - -void _Ewk_Policy_Decision::SetAuthorizationIfNecessary(const GURL& request_url) { - // There is no need to check if username or password is empty. - // It was checked befor in constructor - AuthPassword_ = request_url.password(); - AuthUser_ = request_url.username(); -} - -void _Ewk_Policy_Decision::SetAuthorizationIfNecessary(const std::string request) { - std::string type = request.substr(0, request.find_first_of(' ')); - std::transform(type.begin(), type.end(), type.begin(), ::toupper); - - if (type.compare(BASIC_AUTHORIZATION)) { - AuthUser_.clear(); - AuthPassword_.clear(); - return; - } - - std::size_t space = request.find(' '); - std::size_t colon = request.find(':'); - - DCHECK(space != std::string::npos && colon != std::string::npos && colon != request.length()); - if (space == std::string::npos || colon == std::string::npos || colon == request.length()) - return; - - AuthUser_ = request.substr(space + 1, request.length() - colon - 1); - AuthPassword_ = request.substr(colon + 1); -} - -const char* _Ewk_Policy_Decision::GetCookie() const { - return cookie_.c_str(); -} - -const char* _Ewk_Policy_Decision::GetAuthUser() const { - return AuthUser_.empty() ? NULL : AuthUser_.c_str(); -} - -const char* _Ewk_Policy_Decision::GetAuthPassword() const { - return AuthPassword_.empty() ? NULL : AuthPassword_.c_str(); -} - -const char* _Ewk_Policy_Decision::GetUrl() const { - return url_.empty() ? NULL : url_.c_str(); -} - -const char* _Ewk_Policy_Decision::GetHttpMethod() const { - return httpMethod_.empty() ? NULL : httpMethod_.c_str(); -} - -const char* _Ewk_Policy_Decision::GetScheme() const { - return scheme_.empty() ? NULL : scheme_.c_str(); -} - -const char* _Ewk_Policy_Decision::GetHost() const { - return host_.empty() ? NULL : host_.c_str(); -} - -const char* _Ewk_Policy_Decision::GetResponseMime() const { - return responseMime_.empty() ? NULL : responseMime_.c_str(); -} diff --git a/tizen_src/impl/API/ewk_policy_decision_private.h b/tizen_src/impl/API/ewk_policy_decision_private.h deleted file mode 100644 index d5c93b0..0000000 --- a/tizen_src/impl/API/ewk_policy_decision_private.h +++ /dev/null @@ -1,129 +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 EWK_POLICY_DECISION_PRIVATE_H_ -#define EWK_POLICY_DECISION_PRIVATE_H_ - -#include - -#include - -#include "base/callback.h" -#include "base/memory/ref_counted.h" -#include "base/memory/scoped_ptr.h" -#include "browser/navigation_policy_handler_efl.h" -#include "browser/policy_response_delegate_efl.h" -#include "content/public/browser/web_contents_delegate.h" -#include "content/public/common/resource_type.h" -#include "third_party/WebKit/public/web/WebViewModeEnums.h" -#include "tizen_webview/public/tw_frame.h" -#include "tizen_webview/public/tw_policy_decision.h" - -// Basic type of authorization - 'type username:password' -#define BASIC_AUTHORIZATION "BASIC" - -struct NavigationPolicyParams; - -namespace net { -class URLRequest; -} - -class EWebView; - -namespace content { -class RenderViewHost; -} // namespace content - -class _Ewk_Policy_Decision { - public: - /** - * Constructs _Ewk_Policy_Decision with navigation type POLICY_RESPONSE - */ - explicit _Ewk_Policy_Decision(const GURL& request_url, - net::URLRequest* request, - content::ResourceType resource_type, - PolicyResponseDelegateEfl* delegate); - - /** - * Constructs _Ewk_Policy_Decision with navigation type POLICY_NAVIGATION - */ - explicit _Ewk_Policy_Decision(const NavigationPolicyParams ¶ms, content::RenderViewHost* rvh); - - /** - * Constructs _Ewk_Policy_Decision with navigation type POLICY_NEWWINDOW - */ - explicit _Ewk_Policy_Decision(EWebView* view, - content::WebContentsDelegate::NewWindowDecideCallback); - - ~_Ewk_Policy_Decision(); - - void Use(); - void Ignore(); - void Download(); - bool Suspend(); - - bool isDecided() const { return isDecided_; } - bool isSuspended() const { return isSuspended_; } - tizen_webview::Policy_Navigation_Type GetNavigationType() const { return navigationType_; } - const char* GetCookie() const; - const char* GetAuthUser() const; - const char* GetAuthPassword() const; - const char* GetUrl() const; - const char* GetHttpMethod() const; - const char* GetScheme() const; - const char* GetHost() const; - const char* GetResponseMime() const; - tizen_webview::Policy_Decision_Type GetDecisionType() const { return decisionType_; } - Eina_Hash* GetResponseHeaders() const { return responseHeaders_; } - int GetResponseStatusCode() const { return responseStatusCode_; } - - NavigationPolicyHandlerEfl* GetNavigationPolicyHandler() const { return navigation_policy_handler_.get(); } - - tizen_webview::Frame* GetFrameRef() const; - - void InitializeOnUIThread(); - void ParseUrl(const GURL& url); - -private: - /** - * @brief sets userID and password - * @param request_url requested url - user:password@address - */ - void SetAuthorizationIfNecessary(const GURL& request_url); - - /** - * @brief sets userID and password - * @param request contents of Authorization HTTP header - */ - void SetAuthorizationIfNecessary(const std::string request); - - enum PolicyType { - POLICY_RESPONSE, - POLICY_NAVIGATION, - POLICY_NEWWINDOW, - }; - - EWebView* web_view_; - scoped_refptr policy_response_delegate_; - scoped_ptr navigation_policy_handler_; - scoped_ptr frame_; - content::WebContentsDelegate::NewWindowDecideCallback window_create_callback_; - std::string cookie_; - std::string url_; - std::string httpMethod_; - std::string host_; - std::string scheme_; - std::string responseMime_; - Eina_Hash* responseHeaders_; - tizen_webview::Policy_Decision_Type decisionType_; - tizen_webview::Policy_Navigation_Type navigationType_; - bool isDecided_; - bool isSuspended_; - int responseStatusCode_; - std::string AuthUser_; - std::string AuthPassword_; - PolicyType type_; -}; - -#endif /* EWK_POLICY_DECISION_PRIVATE_H_ */ diff --git a/tizen_src/impl/API/ewk_security_origin_private.h b/tizen_src/impl/API/ewk_security_origin_private.h deleted file mode 100644 index 9710759..0000000 --- a/tizen_src/impl/API/ewk_security_origin_private.h +++ /dev/null @@ -1,53 +0,0 @@ -// Copyright 2013 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 ewk_security_origin_private_h -#define ewk_security_origin_private_h - -#include -#include -#include -#include - -#include "base/callback.h" -#include "url/gurl.h" - -// Security Origin Structure -struct _Ewk_Security_Origin { - _Ewk_Security_Origin(const GURL& url) - : host(eina_stringshare_add(url.host().c_str())), - protocol(eina_stringshare_add(url.scheme().c_str())) { - assert(url.IntPort() != url::PORT_INVALID); - port = url.IntPort(); - } - - //FIXME: Replace uint16_t by int for this constructor and use GURL::IntPort for populating. - // Better yet, just hold GURL::GetOrigin() as member and implement ewk API using that - _Ewk_Security_Origin(const char* host_in, const char* protocol_in, uint16_t port_in) - : host(eina_stringshare_add(host_in)), - protocol(eina_stringshare_add(protocol_in)), - port(port_in) { - } - - ~_Ewk_Security_Origin() { - eina_stringshare_del(host); - eina_stringshare_del(protocol); - } - - GURL GetAsGURL() const { - std::ostringstream url; - url << protocol << "://" << host; - if (port != url::PORT_UNSPECIFIED) - url << ":" << port; - GURL result(url.str()); - assert(result.is_valid()); - return result; - } - - Eina_Stringshare* host; - Eina_Stringshare* protocol; - int port; -}; - -#endif // ewk_security_origin_private_h diff --git a/tizen_src/supplement.gypi b/tizen_src/supplement.gypi index 7de3d1f..5e08a9e 100644 --- a/tizen_src/supplement.gypi +++ b/tizen_src/supplement.gypi @@ -47,10 +47,6 @@ # Mobile gcc 4.6.x hack end ], - 'defines': [ - 'EWK_BRINGUP=1', - ], - 'conditions': [ ['use_efl==1', { -- 2.7.4