From aa8a1f0d164a8f26d54f8f4b47fdea538e304128 Mon Sep 17 00:00:00 2001 From: Chandan Padhi Date: Tue, 24 Jul 2018 06:11:13 -0700 Subject: [PATCH] [M67 Dev][EFL] Fix compiler errors (2/2) This resolves compiler errors to enable EFL port. Change-Id: I9de1665ce3d04761ffa45d170d99fa892554f8bd Signed-off-by: Chandan Padhi --- content/browser/web_contents/web_contents_impl.h | 8 +++ content/child/blink_platform_impl.cc | 4 ++ content/child/blink_platform_impl.h | 2 + content/public/common/web_preferences.cc | 4 +- content/public/common/web_preferences.h | 4 +- content/public/renderer/content_renderer_client.cc | 2 +- content/public/renderer/content_renderer_client.h | 2 +- .../renderer/android/renderer_date_time_picker.cc | 6 ++ content/shell/browser/shell.cc | 2 + content/shell/browser/shell.h | 9 +++ .../browser/shell_web_contents_view_delegate.h | 2 +- .../renderer/platform/scroll/scrollbar_theme.cc | 8 +++ .../javascript_dialog_manager_efl.cc | 1 + .../browser/renderer_host/im_context_efl.cc | 3 +- .../renderer_host/render_widget_host_view_efl.cc | 28 +++++++-- .../renderer_host/render_widget_host_view_efl.h | 15 ++--- .../browser/renderer_host/web_event_factory_efl.cc | 4 +- .../browser/selection/selection_controller_efl.cc | 7 ++- .../browser/web_contents/web_contents_impl_efl.cc | 4 +- .../browser/web_contents/web_contents_impl_efl.h | 3 +- .../browser/web_contents/web_contents_view_efl.cc | 26 ++++++--- .../browser/web_contents/web_contents_view_efl.h | 5 +- .../content/gpu/in_process_gpu_thread_efl.cc | 8 +-- .../content/gpu/shared_mailbox_manager.h | 2 - .../shell_web_contents_view_delegate_efl.cc | 2 +- .../chromium_impl/ui/gl/gl_current_context_efl.cc | 3 +- tizen_src/ewk/efl_integration/BUILD.gn | 4 +- .../browser/browsing_data_remover_efl.cc | 23 ++++---- .../browser/browsing_data_remover_efl.h | 8 ++- .../browser/download_manager_delegate_efl.cc | 34 ++++++----- .../browser/download_manager_delegate_efl.h | 10 ++-- .../browser/favicon/favicon_commands.cc | 2 +- .../browser/favicon/favicon_database.cc | 4 ++ .../browser/favicon/favicon_database_p.cc | 4 ++ .../browser/inputpicker/InputPicker.cc | 17 ++++-- .../browser/javascript_dialog_manager_efl.cc | 16 +++--- .../browser/javascript_dialog_manager_efl.h | 13 +++-- .../efl_integration/browser/login_delegate_efl.cc | 4 ++ .../efl_integration/browser/login_delegate_efl.h | 4 +- .../notification/notification_controller_efl.cc | 3 +- .../notification/notification_controller_efl.h | 3 +- .../browser/permission_manager_efl.cc | 15 ++++- .../browser/permission_manager_efl.h | 7 ++- .../browser/quota_permission_context_efl.cc | 2 +- .../browser/render_message_filter_efl.h | 4 +- .../resource_dispatcher_host_delegate_efl.cc | 4 +- .../resource_dispatcher_host_delegate_efl.h | 2 + .../browser/selectpicker/popup_menu_item.h | 2 +- .../browser/selectpicker/popup_menu_item_private.h | 2 +- .../browser/ssl_host_state_delegate_efl.cc | 8 +++ .../browser/ssl_host_state_delegate_efl.h | 2 + .../browser/web_view_browser_message_filter.cc | 2 + .../browser/webdata/web_data_service_factory.cc | 8 +++ .../ewk/efl_integration/browser_context_efl.cc | 8 +++ .../efl_integration/common/content_client_efl.cc | 2 +- .../common/navigation_policy_params.cc | 2 +- .../common/navigation_policy_params.h | 6 +- .../efl_integration/common/print_pages_params.h | 2 +- .../efl_integration/common/render_messages_ewk.h | 12 ++-- .../efl_integration/content_browser_client_efl.cc | 13 +++-- .../efl_integration/content_browser_client_efl.h | 7 ++- .../efl_integration/context_menu_controller_efl.cc | 40 ++++++++----- .../efl_integration/context_menu_controller_efl.h | 22 ++++---- tizen_src/ewk/efl_integration/cookie_manager.cc | 4 +- .../ewk/efl_integration/devtools_delegate_efl.h | 2 +- .../devtools_manager_delegate_efl.cc | 2 +- .../devtools_manager_delegate_efl.h | 2 +- tizen_src/ewk/efl_integration/eweb_context.cc | 49 +++++++++------- tizen_src/ewk/efl_integration/eweb_view.cc | 39 +++++++------ tizen_src/ewk/efl_integration/eweb_view.h | 8 +-- tizen_src/ewk/efl_integration/ewk_global_data.cc | 5 +- .../ewk/efl_integration/network_delegate_efl.cc | 4 +- .../ewk/efl_integration/network_delegate_efl.h | 2 +- .../private/ewk_hit_test_private.cc | 2 +- .../efl_integration/private/ewk_object_private.h | 2 +- .../private/ewk_policy_decision_private.cc | 2 +- .../ewk/efl_integration/public/ewk_settings.cc | 32 ++++++----- tizen_src/ewk/efl_integration/public/ewk_view.cc | 4 ++ .../renderer/content_renderer_client_efl.cc | 55 +++++++++--------- .../renderer/content_renderer_client_efl.h | 30 +++++----- .../efl_integration/renderer/editorclient_agent.cc | 2 +- .../renderer/plugins/plugin_placeholder_efl.cc | 2 +- .../renderer/print_web_view_helper_efl.cc | 6 +- .../renderer/print_web_view_helper_efl.h | 2 +- .../renderer/render_frame_observer_efl.cc | 31 ++++++---- .../renderer/render_frame_observer_efl.h | 2 +- .../renderer/render_thread_observer_efl.cc | 6 +- .../renderer/render_view_observer_efl.cc | 66 ++++++++++++++-------- .../renderer/render_view_observer_efl.h | 9 ++- .../url_request_context_getter_efl.cc | 24 ++++---- .../url_request_context_getter_efl.h | 4 +- .../efl_integration/web_contents_delegate_efl.cc | 8 ++- .../efl_integration/web_contents_delegate_efl.h | 4 +- .../wrt/wrt_file_protocol_handler.cc | 2 +- .../cursor/ozone/bitmap_cursor_factory_ozone.cc | 4 ++ 95 files changed, 568 insertions(+), 333 deletions(-) diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h index 860d5da..140e9c2 100644 --- a/content/browser/web_contents/web_contents_impl.h +++ b/content/browser/web_contents/web_contents_impl.h @@ -115,6 +115,10 @@ class HostZoomMapObserver; class PepperPlaybackObserver; #endif +#if defined(USE_EFL) +class WebContentsImplEfl; +#endif + // Factory function for the implementations that content knows about. Takes // ownership of |delegate|. WebContentsView* CreateWebContentsView( @@ -996,6 +1000,10 @@ class CONTENT_EXPORT WebContentsImpl : public WebContents, // TODO(brettw) TestWebContents shouldn't exist! friend class TestWebContents; +#if defined(USE_EFL) + friend class WebContentsImplEfl; +#endif + class DestructionObserver; // Represents a WebContents node in a tree of WebContents structure. diff --git a/content/child/blink_platform_impl.cc b/content/child/blink_platform_impl.cc index aa67eb8..14351fa 100644 --- a/content/child/blink_platform_impl.cc +++ b/content/child/blink_platform_impl.cc @@ -699,7 +699,11 @@ BlinkPlatformImpl::MediaCapabilitiesClient() { } WebThemeEngine* BlinkPlatformImpl::ThemeEngine() { +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup return &native_theme_engine_; +#else + return nullptr; +#endif } WebFallbackThemeEngine* BlinkPlatformImpl::FallbackThemeEngine() { diff --git a/content/child/blink_platform_impl.h b/content/child/blink_platform_impl.h index f9d13cf..63aed57 100644 --- a/content/child/blink_platform_impl.h +++ b/content/child/blink_platform_impl.h @@ -126,7 +126,9 @@ class CONTENT_EXPORT BlinkPlatformImpl : public blink::Platform { scoped_refptr main_thread_task_runner_; scoped_refptr io_thread_task_runner_; +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup WebThemeEngineImpl native_theme_engine_; +#endif WebFallbackThemeEngineImpl fallback_theme_engine_; base::ThreadLocalStorage::Slot current_thread_slot_; webcrypto::WebCryptoImpl web_crypto_; diff --git a/content/public/common/web_preferences.cc b/content/public/common/web_preferences.cc index 53bc2c0..6420357 100644 --- a/content/public/common/web_preferences.cc +++ b/content/public/common/web_preferences.cc @@ -183,9 +183,11 @@ WebPreferences::WebPreferences() user_gesture_required_for_presentation(true), text_track_margin_percentage(0.0f), immersive_mode_enabled(false), +#if defined(OS_ANDROID) || defined(USE_EFL) + font_scale_factor(1.0f), +#endif #if defined(OS_ANDROID) text_autosizing_enabled(true), - font_scale_factor(1.0f), device_scale_adjustment(1.0f), force_enable_zoom(false), fullscreen_supported(true), diff --git a/content/public/common/web_preferences.h b/content/public/common/web_preferences.h index e4fc39c..d855a78 100644 --- a/content/public/common/web_preferences.h +++ b/content/public/common/web_preferences.h @@ -216,9 +216,11 @@ struct CONTENT_EXPORT WebPreferences { bool immersive_mode_enabled; +#if defined(OS_ANDROID) || defined(USE_EFL) + float font_scale_factor; +#endif #if defined(OS_ANDROID) bool text_autosizing_enabled; - float font_scale_factor; float device_scale_adjustment; bool force_enable_zoom; bool fullscreen_supported; diff --git a/content/public/renderer/content_renderer_client.cc b/content/public/renderer/content_renderer_client.cc index 5bfd292..2175805 100644 --- a/content/public/renderer/content_renderer_client.cc +++ b/content/public/renderer/content_renderer_client.cc @@ -107,7 +107,7 @@ bool ContentRendererClient::AllowPopup() { return false; } -#if defined(OS_ANDROID) +#if defined(OS_ANDROID) || defined(USE_EFL) bool ContentRendererClient::HandleNavigation( RenderFrame* render_frame, bool is_content_initiated, diff --git a/content/public/renderer/content_renderer_client.h b/content/public/renderer/content_renderer_client.h index a68f00a..a6e37e7 100644 --- a/content/public/renderer/content_renderer_client.h +++ b/content/public/renderer/content_renderer_client.h @@ -211,7 +211,7 @@ class CONTENT_EXPORT ContentRendererClient { // Returns true if a popup window should be allowed. virtual bool AllowPopup(); -#if defined(OS_ANDROID) +#if defined(OS_ANDROID) || defined(USE_EFL) // TODO(sgurun) This callback is deprecated and will be removed as soon // as android webview completes implementation of a resource throttle based // shouldoverrideurl implementation. See crbug.com/325351 diff --git a/content/renderer/android/renderer_date_time_picker.cc b/content/renderer/android/renderer_date_time_picker.cc index 52092de..3639aef 100644 --- a/content/renderer/android/renderer_date_time_picker.cc +++ b/content/renderer/android/renderer_date_time_picker.cc @@ -91,8 +91,10 @@ bool RendererDateTimePicker::OnMessageReceived( const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(RendererDateTimePicker, message) +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup IPC_MESSAGE_HANDLER(ViewMsg_ReplaceDateTime, OnReplaceDateTime) IPC_MESSAGE_HANDLER(ViewMsg_CancelDateTimeDialog, OnCancel) +#endif IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() return handled; @@ -101,13 +103,17 @@ bool RendererDateTimePicker::OnMessageReceived( void RendererDateTimePicker::OnReplaceDateTime(double value) { if (chooser_completion_) chooser_completion_->DidChooseValue(value); +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup static_cast(render_view())->DismissDateTimeDialog(); +#endif } void RendererDateTimePicker::OnCancel() { if (chooser_completion_) chooser_completion_->DidCancelChooser(); +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup static_cast(render_view())->DismissDateTimeDialog(); +#endif } void RendererDateTimePicker::OnDestruct() { diff --git a/content/shell/browser/shell.cc b/content/shell/browser/shell.cc index 8df5f79..655a8472 100644 --- a/content/shell/browser/shell.cc +++ b/content/shell/browser/shell.cc @@ -477,6 +477,7 @@ void Shell::DidNavigateMainFramePostCommit(WebContents* web_contents) { PlatformSetAddressBarURL(web_contents->GetLastCommittedURL()); } +#if !defined(USE_EFL) JavaScriptDialogManager* Shell::GetJavaScriptDialogManager( WebContents* source) { if (!dialog_manager_) { @@ -486,6 +487,7 @@ JavaScriptDialogManager* Shell::GetJavaScriptDialogManager( } return dialog_manager_.get(); } +#endif std::unique_ptr Shell::RunBluetoothChooser( RenderFrameHost* frame, diff --git a/content/shell/browser/shell.h b/content/shell/browser/shell.h index 65af9a7..b6bc9f2 100644 --- a/content/shell/browser/shell.h +++ b/content/shell/browser/shell.h @@ -238,7 +238,11 @@ class Shell : public WebContentsDelegate, void OnDevToolsWebContentsDestroyed(); +#if defined(USE_EFL) + std::unique_ptr dialog_manager_; +#else std::unique_ptr dialog_manager_; +#endif std::unique_ptr web_contents_; @@ -254,6 +258,11 @@ class Shell : public WebContentsDelegate, gfx::Size content_size_; +#if defined(USE_EFL) + class Impl; + Impl* impl_; +#endif + #if defined(OS_ANDROID) base::android::ScopedJavaGlobalRef java_object_; #elif defined(USE_AURA) diff --git a/content/shell/browser/shell_web_contents_view_delegate.h b/content/shell/browser/shell_web_contents_view_delegate.h index 2bce977..feb456a 100644 --- a/content/shell/browser/shell_web_contents_view_delegate.h +++ b/content/shell/browser/shell_web_contents_view_delegate.h @@ -41,7 +41,7 @@ class ShellWebContentsViewDelegate : public WebContentsViewDelegate { private: WebContents* web_contents_; -#if defined(OS_MACOSX) +#if defined(OS_MACOSX) || defined(USE_EFL) ContextMenuParams params_; #endif diff --git a/third_party/blink/renderer/platform/scroll/scrollbar_theme.cc b/third_party/blink/renderer/platform/scroll/scrollbar_theme.cc index ba85a69..a068657 100644 --- a/third_party/blink/renderer/platform/scroll/scrollbar_theme.cc +++ b/third_party/blink/renderer/platform/scroll/scrollbar_theme.cc @@ -407,6 +407,14 @@ ScrollbarTheme& ScrollbarTheme::DeprecatedStaticGetTheme() { return NativeTheme(); } +// TODO: Remove this mock theme and apply the appropriate theme for tizen. +#if defined(EWK_BRINGUP) +ScrollbarTheme& ScrollbarTheme::NativeTheme() { + DEFINE_STATIC_LOCAL(ScrollbarThemeMock, mock_theme, ()); + return mock_theme; +} +#endif + void ScrollbarTheme::SetMockScrollbarsEnabled(bool flag) { g_mock_scrollbars_enabled_ = flag; } diff --git a/tizen_src/chromium_impl/components/js_dialogs_efl/javascript_dialog_manager_efl.cc b/tizen_src/chromium_impl/components/js_dialogs_efl/javascript_dialog_manager_efl.cc index 56141c9..8a07259 100644 --- a/tizen_src/chromium_impl/components/js_dialogs_efl/javascript_dialog_manager_efl.cc +++ b/tizen_src/chromium_impl/components/js_dialogs_efl/javascript_dialog_manager_efl.cc @@ -54,6 +54,7 @@ void JavaScriptDialogManagerEfl::RunJavaScriptDialog( void JavaScriptDialogManagerEfl::RunBeforeUnloadDialog( content::WebContents* web_contents, + RenderFrameHost* render_frame_host, bool is_reload, DialogClosedCallback callback) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/im_context_efl.cc b/tizen_src/chromium_impl/content/browser/renderer_host/im_context_efl.cc index 6a6fb16..3d0ba02 100644 --- a/tizen_src/chromium_impl/content/browser/renderer_host/im_context_efl.cc +++ b/tizen_src/chromium_impl/content/browser/renderer_host/im_context_efl.cc @@ -453,11 +453,12 @@ void IMContextEfl::OnPreeditChanged(void* data, if (!text16.empty()) SendFakeCompositionKeyEvent(text16); composition_.text = text16; - +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup ui::ImeTextSpan text_underline(ui::ImeTextSpan::Type::kComposition, 0, composition_.text.length(), SK_ColorBLACK, false, SK_ColorTRANSPARENT); composition_.ime_text_spans.push_back(text_underline); +#endif composition_.selection = gfx::Range(composition_.text.length()); // Only add preedit to queue, till we dont know if key event 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 b7f570b..4f7249c 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 @@ -154,9 +154,9 @@ void RenderWidgetHostViewBase::GetDefaultScreenInfo( } #endif // !defined(EWK_BRINGUP) -RenderWidgetHostViewEfl::RenderWidgetHostViewEfl(RenderWidgetHost* widget, +RenderWidgetHostViewEfl::RenderWidgetHostViewEfl(RenderWidgetHost* widget_host, WebContents& web_contents) - : host_(RenderWidgetHostImpl::From(widget)), + : RenderWidgetHostViewBase(widget_host), im_context_(NULL), evas_(NULL), parent_view_(NULL), @@ -485,8 +485,10 @@ bool RenderWidgetHostViewEfl::MakeCurrent() { void RenderWidgetHostViewEfl::UpdateRotationDegrees(int rotation_degrees) { display::DeviceDisplayInfoEfl display_info; display_info.SetRotationDegrees(rotation_degrees); +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup Send(new ViewMsg_UpdateRotationDegrees(host_->GetRoutingID(), display_info.GetRotationDegrees())); +#endif } void RenderWidgetHostViewEfl::EnsureDeviceDisplayInfoInitialized() { @@ -655,9 +657,11 @@ void RenderWidgetHostViewEfl::SetEvasHandler( bool RenderWidgetHostViewEfl::OnMessageReceived(const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(RenderWidgetHostViewEfl, message) +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup IPC_MESSAGE_HANDLER(ViewHostMsg_TextInputInFormStateChanged, OnTextInputInFormStateChanged) IPC_MESSAGE_HANDLER(ViewHostMsg_SnapshotDataReceived, OnSnapshotDataReceived) +#endif IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() return handled; @@ -864,6 +868,17 @@ SkColor RenderWidgetHostViewEfl::background_color() const { return background_color_; } +void RenderWidgetHostViewEfl::TakeFallbackContentFrom( + RenderWidgetHostView* view) {} + +viz::SurfaceId RenderWidgetHostViewEfl::GetCurrentSurfaceId() const { + return viz::SurfaceId(); +} + +gfx::Vector2d RenderWidgetHostViewEfl::GetOffsetFromRootSurface() { + return gfx::Vector2d(); +} + void RenderWidgetHostViewEfl::UpdateBackgroundColorFromRenderer( SkColor color) { if (color == background_color()) @@ -1154,6 +1169,8 @@ bool RenderWidgetHostViewEfl::RequestSnapshotAsync( return true; } +void RenderWidgetHostViewEfl::SetWantsAnimateOnlyBeginFrames() {} + void RenderWidgetHostViewEfl::SetNeedsBeginFrames(bool needs_begin_frames) {} void RenderWidgetHostViewEfl::DidOverscroll( @@ -1764,7 +1781,9 @@ void RenderWidgetHostViewEfl::HandleGesture(blink::WebGestureEvent& event) { // event to stop any in-progress flings. blink::WebGestureEvent fling_cancel = event; fling_cancel.SetType(blink::WebInputEvent::kGestureFlingCancel); +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup fling_cancel.source_device = blink::kWebGestureDeviceTouchscreen; +#endif SendGestureEvent(fling_cancel); } else if (event_type == blink::WebInputEvent::kGestureScrollUpdate) { if (event.data.scroll_update.delta_x < 0) @@ -1784,13 +1803,14 @@ void RenderWidgetHostViewEfl::HandleGesture(blink::WebGestureEvent& event) { void RenderWidgetHostViewEfl::HandleGesture(ui::GestureEvent* event) { blink::WebGestureEvent gesture = MakeWebGestureEventFromUIEvent(*event); +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup gesture.x = event->x(); gesture.y = event->y(); const gfx::Point root_point = event->root_location(); gesture.global_x = root_point.x(); gesture.global_y = root_point.y(); - +#endif if (event->type() == ui::ET_GESTURE_BEGIN) HandleGestureBegin(); else if (event->type() == ui::ET_GESTURE_END) @@ -1814,7 +1834,7 @@ void RenderWidgetHostViewEfl::HandleTouchEvent(ui::TouchEvent* event) { } blink::WebTouchEvent touch_event = ui::CreateWebTouchEventFromMotionEvent( - pointer_state_, event->may_cause_scrolling()); + pointer_state_, event->may_cause_scrolling(), event->hovering()); pointer_state_.CleanupRemovedTouchPoints(*event); event->StopPropagation(); 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 a597517..dc6bf3d 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 @@ -117,6 +117,10 @@ class CONTENT_EXPORT RenderWidgetHostViewEfl void SetIsLoading(bool) override; void SetBackgroundColor(SkColor color) override; SkColor background_color() const override; + void TakeFallbackContentFrom(RenderWidgetHostView* view) override; + viz::SurfaceId GetCurrentSurfaceId() const override; + gfx::Vector2d GetOffsetFromRootSurface() override; + void UpdateBackgroundColorFromRenderer(SkColor color); // CompositorResizeLockClient implementation. @@ -148,16 +152,7 @@ class CONTENT_EXPORT RenderWidgetHostViewEfl const gfx::Range&) override; void SelectionBoundsChanged( const ViewHostMsg_SelectionBounds_Params&) override; -#if !defined(EWK_BRINGUP) // FIXME: m67 bringup - void CopyFromCompositingSurface(const gfx::Rect&, - const gfx::Size& /* dst_size */, - const ReadbackRequestCallback&, - const SkColorType) override; - void CopyFromCompositingSurfaceToVideoFrame( - const gfx::Rect&, - const scoped_refptr&, - const base::Callback&) override; -#endif + void SetWantsAnimateOnlyBeginFrames() override; void SetNeedsBeginFrames(bool needs_begin_frames) override; void DidOverscroll(const ui::DidOverscrollParams& params) override; bool HasAcceleratedSurface(const gfx::Size&) override; diff --git a/tizen_src/chromium_impl/content/browser/renderer_host/web_event_factory_efl.cc b/tizen_src/chromium_impl/content/browser/renderer_host/web_event_factory_efl.cc index 4756c5b..242911a 100644 --- a/tizen_src/chromium_impl/content/browser/renderer_host/web_event_factory_efl.cc +++ b/tizen_src/chromium_impl/content/browser/renderer_host/web_event_factory_efl.cc @@ -545,7 +545,7 @@ WebGestureEvent MakeGestureEvent(WebInputEvent::Type type, const EVT* ev) { WebGestureEvent event(type, EvasToWebModifiers(ev->modifiers), ev->timestamp / 1000); - +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup event.source_device = kWebGestureDeviceTouchscreen; const float sf = GetDeviceScaleFactor(); @@ -554,7 +554,7 @@ WebGestureEvent MakeGestureEvent(WebInputEvent::Type type, event.x = point.x; event.y = point.y; - +#endif return event; } diff --git a/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc b/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc index 5e31465..1ee6d12 100644 --- a/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc +++ b/tizen_src/chromium_impl/content/browser/selection/selection_controller_efl.cc @@ -515,6 +515,7 @@ void SelectionControllerEfl::GetSelectionBounds(gfx::Rect* left, void SelectionControllerEfl::HandleGesture(blink::WebGestureEvent& event) { blink::WebInputEvent::Type event_type = event.GetType(); +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup if (event_type == blink::WebInputEvent::kGestureTap) { HandlePostponedGesture(event.x, event.y, ui::ET_GESTURE_TAP); } else if (event_type == blink::WebInputEvent::kGestureShowPress) { @@ -525,7 +526,7 @@ void SelectionControllerEfl::HandleGesture(blink::WebGestureEvent& event) { event.x, event.y, ui::ET_GESTURE_LONG_PRESS); long_mouse_press_ = true; } - +#endif if (event_type == blink::WebInputEvent::kGestureScrollBegin || event_type == blink::WebInputEvent::kGesturePinchBegin) { SetControlsTemporarilyHidden(true); @@ -583,7 +584,11 @@ bool SelectionControllerEfl::HandleLongPressEvent( return true; } else if (params.link_url.is_empty() && params.src_url.is_empty() +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup && params.is_text_node) { +#else + ) { +#endif // If user is long pressing on a content with // -webkit-user-select: none, we should bail and not enter // selection neither show magnigier class or context menu. 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 7299ba92..7b80a26 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 @@ -89,8 +89,8 @@ WebContents* WebContentsImplEfl::Clone() { return NULL; } -void WebContentsImplEfl::SetUserAgentOverride(const std::string& override) { - WebContentsImplEfl::SetUserAgentOverride(override); +void WebContentsImplEfl::SetUserAgentOverride(const std::string& override, + bool override_in_new_tabs) { } #if !defined(EWK_BRINGUP) // FIXME: m67 bringup 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 fb3fb48..668f073 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 @@ -38,7 +38,8 @@ class CONTENT_EXPORT WebContentsImplEfl : public WebContentsImpl { // Overrides for WebContents WebContents* Clone() override; - void SetUserAgentOverride(const std::string& override) override; + void SetUserAgentOverride(const std::string& override, + bool override_in_new_tabs) override; private: // Needed to access private WebContentsImplEfl constructor from 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 d3eea5d..118565b 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 @@ -52,11 +52,13 @@ WebContentsViewEfl::WebContentsViewEfl(WebContents* contents, , page_scale_factor_(1.0f), web_contents_(contents) { +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess(); if (cmdline->HasSwitch(switches::kTouchEvents)) { touch_enabled_ = cmdline->GetSwitchValueASCII(switches::kTouchEvents) == switches::kTouchEventsEnabled; } +#endif } WebContentsViewEfl::~WebContentsViewEfl() {} @@ -220,6 +222,10 @@ void WebContentsViewEfl::RestoreFocus() { NOTIMPLEMENTED(); } +void WebContentsViewEfl::FocusThroughTabTraversal(bool reverse) { + NOTIMPLEMENTED(); +} + DropData* WebContentsViewEfl::GetDropData() const { if (drag_dest_.get()) return drag_dest_->GetDropData(); @@ -255,14 +261,15 @@ void WebContentsViewEfl::QuerySelectionStyle() { efl_delegate_->QuerySelectionStyle(); } -void WebContentsViewEfl::ShowPopupMenu(RenderFrameHost* render_frame_host, - const gfx::Rect& bounds, - int item_height, - double item_font_size, - int selected_item, - const std::vector& items, - bool right_aligned, - bool allow_multiple_selection) { +#if BUILDFLAG(USE_EXTERNAL_POPUP_MENU) + void WebContentsViewEfl::ShowPopupMenu(RenderFrameHost* render_frame_host, + const gfx::Rect& bounds, + int item_height, + double item_font_size, + int selected_item, + const std::vector& items, + bool right_aligned, + bool allow_multiple_selection) { if (efl_delegate_) efl_delegate_->ShowPopupMenu(render_frame_host, bounds, item_height, item_font_size, selected_item, items, @@ -273,6 +280,7 @@ void WebContentsViewEfl::HidePopupMenu() { if (efl_delegate_) efl_delegate_->HidePopupMenu(); } +#endif void WebContentsViewEfl::StartDragging(const DropData& drop_data, blink::WebDragOperationsMask allowed_ops, @@ -339,7 +347,9 @@ void WebContentsViewEfl::SetOrientation(int orientation) { params.screen_info = screen_info; #endif // !defined(EWK_BRINGUP) params.new_size = new_size; +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup params.physical_backing_size = backing_size; +#endif params.is_fullscreen_granted = contents_impl.IsFullscreenForCurrentTab(); rwh->Send(new ViewMsg_Resize(rwh->GetRoutingID(), params)); diff --git a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.h b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.h index 40542a2..f076bcb 100644 --- a/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.h +++ b/tizen_src/chromium_impl/content/browser/web_contents/web_contents_view_efl.h @@ -47,7 +47,7 @@ class CONTENT_EXPORT WebContentsViewEfl void SetOverscrollControllerEnabled(bool enabled) override; gfx::NativeView GetNativeView() const override; gfx::NativeView GetContentNativeView() const override; - void GetScreenInfo(ScreenInfo* screen_info) const override; + void GetScreenInfo(ScreenInfo* screen_info) const; gfx::NativeWindow GetTopLevelNativeWindow() const override; void GetContainerBounds(gfx::Rect* out) const override; void SizeContents(const gfx::Size& size) override; @@ -55,6 +55,7 @@ class CONTENT_EXPORT WebContentsViewEfl void SetInitialFocus() override; void StoreFocus() override; void RestoreFocus() override; + void FocusThroughTabTraversal(bool reverse) override; DropData* GetDropData() const override; gfx::Rect GetViewBounds() const override; @@ -62,6 +63,7 @@ class CONTENT_EXPORT WebContentsViewEfl void ShowContextMenu(RenderFrameHost* render_frame_host, const ContextMenuParams& params) override; void ShowContextMenu(const ContextMenuParams& params); +#if BUILDFLAG(USE_EXTERNAL_POPUP_MENU) void ShowPopupMenu(RenderFrameHost* render_frame_host, const gfx::Rect& bounds, int item_height, @@ -71,6 +73,7 @@ class CONTENT_EXPORT WebContentsViewEfl bool right_aligned, bool allow_multiple_selection) override; void HidePopupMenu() override; +#endif void UpdateDragDest(RenderViewHost* host); void StartDragging(const DropData& drop_data, blink::WebDragOperationsMask allowed_ops, diff --git a/tizen_src/chromium_impl/content/gpu/in_process_gpu_thread_efl.cc b/tizen_src/chromium_impl/content/gpu/in_process_gpu_thread_efl.cc index 2e8985f..c35d71d 100644 --- a/tizen_src/chromium_impl/content/gpu/in_process_gpu_thread_efl.cc +++ b/tizen_src/chromium_impl/content/gpu/in_process_gpu_thread_efl.cc @@ -55,7 +55,7 @@ struct InProcessGpuThreadEfl : public content::InProcessGpuThread { explicit InProcessGpuThreadEfl( const content::InProcessChildThreadParams& params, const gpu::GpuPreferences& gpu_preferences) - : InProcessGpuThread(params) {} + : InProcessGpuThread(params, gpu_preferences) {} void Init() override { gpu_process_ = new content::GpuProcess(base::ThreadPriority::NORMAL); @@ -63,11 +63,9 @@ struct InProcessGpuThreadEfl : public content::InProcessGpuThread { gpu::GPUInfo gpu_info; gpu::CollectContextGraphicsInfo(&gpu_info); - auto* client = GetContentClient()->gpu(); auto gpu_init = std::make_unique(); - gpu_init->InitializeInProcess(base::CommandLine::ForCurrentProcess(), - client ? client->GetGPUInfo() : nullptr, - client ? client->GetGpuFeatureInfo() : nullptr); + gpu_init->InitializeInProcess(base::CommandLine::ForCurrentProcess(), gpu_preferences_); + // The process object takes ownership of the thread object, so do not // save and delete the pointer. gpu_process_->set_main_thread(new GpuChildThreadEfl( diff --git a/tizen_src/chromium_impl/content/gpu/shared_mailbox_manager.h b/tizen_src/chromium_impl/content/gpu/shared_mailbox_manager.h index df3382f..e89306f 100644 --- a/tizen_src/chromium_impl/content/gpu/shared_mailbox_manager.h +++ b/tizen_src/chromium_impl/content/gpu/shared_mailbox_manager.h @@ -5,10 +5,8 @@ #include "content/common/content_export.h" namespace gpu { -namespace gles2 { class MailboxManager; } -} namespace content { #if !defined(EWK_BRINGUP) // FIXME: m67 bringup diff --git a/tizen_src/chromium_impl/content/shell/browser/shell_web_contents_view_delegate_efl.cc b/tizen_src/chromium_impl/content/shell/browser/shell_web_contents_view_delegate_efl.cc index 95fa16d..c47ad8e 100644 --- a/tizen_src/chromium_impl/content/shell/browser/shell_web_contents_view_delegate_efl.cc +++ b/tizen_src/chromium_impl/content/shell/browser/shell_web_contents_view_delegate_efl.cc @@ -15,7 +15,7 @@ #include "content/shell/browser/shell_content_browser_client.h" #include "content/shell/browser/shell_devtools_frontend.h" #include "content/shell/common/shell_switches.h" -#include "third_party/blink/public/web/WebContextMenuData.h" +#include "third_party/blink/public/web/web_context_menu_data.h" using blink::WebContextMenuData; diff --git a/tizen_src/chromium_impl/ui/gl/gl_current_context_efl.cc b/tizen_src/chromium_impl/ui/gl/gl_current_context_efl.cc index 61c557c..8b633fc 100644 --- a/tizen_src/chromium_impl/ui/gl/gl_current_context_efl.cc +++ b/tizen_src/chromium_impl/ui/gl/gl_current_context_efl.cc @@ -9,7 +9,6 @@ using namespace gl; - extern void* GLGetCurentContext() { // Temprorarily load corresponding gl library and shutdown for // later correct initialization. @@ -29,7 +28,7 @@ extern void* GLGetCurentContext() { } namespace content { -GL_EXPORT GLuint GetTextureIdFromTexture(gpu::gles2::Texture* texture) { +GL_EXPORT GLuint GetTextureIdFromTexture(gpu::TextureBase* texture) { return texture->service_id(); } } diff --git a/tizen_src/ewk/efl_integration/BUILD.gn b/tizen_src/ewk/efl_integration/BUILD.gn index 538866b..11b9220 100644 --- a/tizen_src/ewk/efl_integration/BUILD.gn +++ b/tizen_src/ewk/efl_integration/BUILD.gn @@ -300,8 +300,8 @@ shared_library("chromium-ewk") { "browser/favicon/favicon_database.cc", "browser/favicon/favicon_commands.h", "browser/favicon/favicon_downloader.cc", - "browser/geolocation/access_token_store_efl.cc", - "browser/geolocation/access_token_store_efl.h", + #"browser/geolocation/access_token_store_efl.cc", + #"browser/geolocation/access_token_store_efl.h", "browser/geolocation/geolocation_permission_context_efl.cc", "browser/geolocation/geolocation_permission_context_efl.h", "browser/geolocation/location_provider_efl.cc", diff --git a/tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.cc b/tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.cc index 57e83fe..038ae90 100644 --- a/tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.cc +++ b/tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.cc @@ -25,7 +25,7 @@ #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" #include "storage/browser/quota/quota_manager.h" -#include "storage/common/quota/quota_types.h" +//#include "storage/common/quota/quota_types.h" using content::BrowserThread; @@ -191,13 +191,12 @@ void OnGotOriginsWithApplicationCache(Application_Cache_Origins_Get_Callback cal void* user_data, scoped_refptr collection, int result){ - BrowsingDataRemoverEfl* BRDE = static_cast(user_data); + BrowsingDataRemoverEfl* bdre = static_cast(user_data); //information about end of process is not needed so cb left empty net::CompletionCallback cb; - for (std::map::iterator iter = collection->infos_by_origin.begin(); - iter != collection->infos_by_origin.end(); - ++iter) { - BRDE->DeleteAppCachesForOrigin(iter->first); + if (collection.get()) { + for (const auto& origin : collection->infos_by_origin) + bdre->DeleteAppCachesForOrigin(origin.first); } } @@ -233,7 +232,7 @@ void BrowsingDataRemoverEfl::RemoveImpl(int remove_mask, } if (origin.is_valid()) { - DeleteAppCachesForOrigin(origin); + DeleteAppCachesForOrigin(url::Origin::Create(origin)); } else { //if origin is empty delete all app cache (actual deletion in OnGotOriginsWithApplicationCache) @@ -245,7 +244,7 @@ void BrowsingDataRemoverEfl::RemoveImpl(int remove_mask, } } -void BrowsingDataRemoverEfl::DeleteAppCachesForOrigin(const GURL& origin) { +void BrowsingDataRemoverEfl::DeleteAppCachesForOrigin(const url::Origin& origin) { if (BrowserThread::CurrentlyOn(BrowserThread::UI)) { // TODO: Using base::Unretained is not thread safe // It may happen that on IO thread this ptr will be already deleted @@ -274,11 +273,10 @@ void BrowsingDataRemoverEfl::OnGotLocalStorageUsageInfo( const std::vector& infos) { DCHECK(waiting_for_clear_local_storage_); DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); - for (size_t i = 0; i < infos.size(); ++i) { if (infos[i].last_modified >= delete_begin_ && infos[i].last_modified <= delete_end_) - dom_storage_context_->DeleteLocalStorage(infos[i].origin); + dom_storage_context_->DeleteLocalStorage(infos[i].origin, base::DoNothing()); } waiting_for_clear_local_storage_ = false; DeleteIfDone(); @@ -286,7 +284,7 @@ void BrowsingDataRemoverEfl::OnGotLocalStorageUsageInfo( void BrowsingDataRemoverEfl::ClearQuotaManagedDataOnIOThread() { DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO)); - +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup // Ask the QuotaManager for all origins with temporary quota modified within // the user-specified timeframe, and deal with the resulting set in // OnGotQuotaManagedOrigins(). @@ -314,8 +312,10 @@ void BrowsingDataRemoverEfl::ClearQuotaManagedDataOnIOThread() { storage::kStorageTypeSyncable, delete_begin_, base::Bind(&BrowsingDataRemoverEfl::OnGotQuotaManagedOrigins, base::Unretained(this))); +#endif } +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup void BrowsingDataRemoverEfl::OnGotQuotaManagedOrigins( const std::set& origins, storage::StorageType type) { DCHECK_GT(quota_managed_storage_types_to_delete_count_, 0); @@ -353,6 +353,7 @@ void BrowsingDataRemoverEfl::OnQuotaManagedOriginDeletion( --quota_managed_origins_to_delete_count_; CheckQuotaManagedDataDeletionStatus(); } +#endif void BrowsingDataRemoverEfl::CheckQuotaManagedDataDeletionStatus() { if (quota_managed_storage_types_to_delete_count_ != 0 || diff --git a/tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.h b/tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.h index 9f3d76a..80684dd 100644 --- a/tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.h +++ b/tizen_src/ewk/efl_integration/browser/browsing_data_remover_efl.h @@ -12,8 +12,9 @@ #include "base/time/time.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "storage/common/quota/quota_types.h" +//#include "storage/common/quota/quota_types.h" #include "url/gurl.h" +#include "url/origin.h" namespace net { class URLRequestContextGetter; @@ -50,7 +51,7 @@ class BrowsingDataRemoverEfl { void ClearNetworkCache(); // deletes app cache for given origin - void DeleteAppCachesForOrigin(const GURL& origin); + void DeleteAppCachesForOrigin(const url::Origin& origin); protected: BrowsingDataRemoverEfl(content::BrowserContext*, base::Time start, base::Time end); @@ -77,12 +78,13 @@ class BrowsingDataRemoverEfl { // Callback to respond to QuotaManager::GetOriginsModifiedSince, which is the // core of 'ClearQuotaManagedDataOnIOThread'. +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup void OnGotQuotaManagedOrigins(const std::set&, storage::StorageType); // Callback responding to deletion of a single quota managed origin's // persistent data void OnQuotaManagedOriginDeletion(const GURL&, storage::StorageType, storage::QuotaStatusCode); - +#endif // Called to check whether all temporary and persistent origin data that // should be deleted has been deleted. If everything's good to go, invokes // OnQuotaManagedDataDeleted on the UI thread. diff --git a/tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.cc b/tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.cc index 82db6ca..5861d31 100644 --- a/tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.cc +++ b/tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.cc @@ -6,17 +6,21 @@ #include "base/files/file_path.h" #include "base/path_service.h" -#include "third_party/WebKit/common/mime_util/mime_util.h" +#include "third_party/blink/public/common/mime_util/mime_util.h" #include "content/common/paths_efl.h" -#include "content/public/browser/download_danger_type.h" -#include "content/public/browser/download_item.h" +#include "components/download/public/common/download_danger_type.h" +#include "components/download/public/common/download_item.h" #include "ewk/efl_integration/browser_context_efl.h" #include "ewk/efl_integration/eweb_view.h" bool DownloadManagerDelegateEfl::TriggerExternalDownloadManager( - content::DownloadItem* item) const { + download::DownloadItem* item) const { +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup content::BrowserContextEfl* browser_context = static_cast(item->GetBrowserContext()); +#else + content::BrowserContextEfl* browser_context = nullptr; +#endif if (browser_context) { auto start_download_callback = browser_context->WebContext()->DidStartDownloadCallback(); @@ -30,7 +34,7 @@ bool DownloadManagerDelegateEfl::TriggerExternalDownloadManager( } base::FilePath DownloadManagerDelegateEfl::GetPlatformDownloadPath( - content::DownloadItem* item) const { + download::DownloadItem* item) const { base::FilePath path; if (blink::IsSupportedImageMimeType(item->GetMimeType())) { if (!PathService::Get(PathsEfl::DIR_DOWNLOAD_IMAGE, &path)) { @@ -50,37 +54,37 @@ base::FilePath DownloadManagerDelegateEfl::GetPlatformDownloadPath( void DownloadManagerDelegateEfl::CancelDownload( const content::DownloadTargetCallback& callback) const { callback.Run(base::FilePath(), /* Empty file path for cancellation */ - content::DownloadItem::TARGET_DISPOSITION_OVERWRITE, - content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, + download::DownloadItem::TARGET_DISPOSITION_OVERWRITE, + download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, base::FilePath(), - content::DOWNLOAD_INTERRUPT_REASON_USER_CANCELED); + download::DOWNLOAD_INTERRUPT_REASON_USER_CANCELED); } -bool DownloadManagerDelegateEfl::DetermineDownloadTarget(content::DownloadItem* item, +bool DownloadManagerDelegateEfl::DetermineDownloadTarget(download::DownloadItem* item, const content::DownloadTargetCallback& callback) { if (TriggerExternalDownloadManager(item)) { CancelDownload(callback); } else { callback.Run(GetPlatformDownloadPath(item), - content::DownloadItem::TARGET_DISPOSITION_OVERWRITE, - content::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, + download::DownloadItem::TARGET_DISPOSITION_OVERWRITE, + download::DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS, GetPlatformDownloadPath(item), - content::DOWNLOAD_INTERRUPT_REASON_NONE); + download::DOWNLOAD_INTERRUPT_REASON_NONE); } return true; } -bool DownloadManagerDelegateEfl::ShouldCompleteDownload(content::DownloadItem*, +bool DownloadManagerDelegateEfl::ShouldCompleteDownload(download::DownloadItem*, const base::Closure&) { return true; } -bool DownloadManagerDelegateEfl::ShouldOpenDownload(content::DownloadItem*, +bool DownloadManagerDelegateEfl::ShouldOpenDownload(download::DownloadItem*, const content::DownloadOpenDelayedCallback&) { return true; } void DownloadManagerDelegateEfl::GetNextId(const content::DownloadIdCallback& callback) { - static uint32_t next_id = content::DownloadItem::kInvalidId + 1; + static uint32_t next_id = download::DownloadItem::kInvalidId + 1; callback.Run(next_id++); } diff --git a/tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.h b/tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.h index 9a4fa88..b15b21a 100644 --- a/tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.h +++ b/tizen_src/ewk/efl_integration/browser/download_manager_delegate_efl.h @@ -14,21 +14,21 @@ public: // content::DownloadManagerDelegate implementation. virtual bool DetermineDownloadTarget( - content::DownloadItem*, + download::DownloadItem*, const content::DownloadTargetCallback&) override; virtual bool ShouldCompleteDownload( - content::DownloadItem*, + download::DownloadItem*, const base::Closure&) override; virtual bool ShouldOpenDownload( - content::DownloadItem*, + download::DownloadItem*, const content::DownloadOpenDelayedCallback&) override; virtual void GetNextId(const content::DownloadIdCallback&) override; private: // If the external download manager is available, trigger download // with it and return true, otherwise return false. - bool TriggerExternalDownloadManager(content::DownloadItem* item) const; + bool TriggerExternalDownloadManager(download::DownloadItem* item) const; - base::FilePath GetPlatformDownloadPath(content::DownloadItem* item) const; + base::FilePath GetPlatformDownloadPath(download::DownloadItem* item) const; void CancelDownload(const content::DownloadTargetCallback&) const; }; diff --git a/tizen_src/ewk/efl_integration/browser/favicon/favicon_commands.cc b/tizen_src/ewk/efl_integration/browser/favicon/favicon_commands.cc index 98f6869..a636ca4 100644 --- a/tizen_src/ewk/efl_integration/browser/favicon/favicon_commands.cc +++ b/tizen_src/ewk/efl_integration/browser/favicon/favicon_commands.cc @@ -46,7 +46,7 @@ scoped_refptr Command::serialize(const SkBitmap &bitmap) { if (bitmap.isNull()) { return res; } - res->alloc(bitmap.getSize() + 4 * sizeof(int)); + res->alloc(bitmap.computeByteSize() + 4 * sizeof(int)); static_cast(res->data)[0] = static_cast(bitmap.colorType()); static_cast(res->data)[1] = static_cast(bitmap.alphaType()); static_cast(res->data)[2] = bitmap.width(); diff --git a/tizen_src/ewk/efl_integration/browser/favicon/favicon_database.cc b/tizen_src/ewk/efl_integration/browser/favicon/favicon_database.cc index df8f786..f6e97aa 100644 --- a/tizen_src/ewk/efl_integration/browser/favicon/favicon_database.cc +++ b/tizen_src/ewk/efl_integration/browser/favicon/favicon_database.cc @@ -207,7 +207,11 @@ void FaviconDatabase::Close() { } void FaviconDatabase::SyncSQLite() { +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup scoped_refptr ptr = content::BrowserThread::GetTaskRunnerForThread(content::BrowserThread::DB); +#else + scoped_refptr ptr = content::BrowserThread::GetTaskRunnerForThread(content::BrowserThread::UI); +#endif ptr->PostTask(FROM_HERE, base::Bind(&FaviconDatabasePrivate::performSync, d->weakPtrFactory.GetWeakPtr())); } diff --git a/tizen_src/ewk/efl_integration/browser/favicon/favicon_database_p.cc b/tizen_src/ewk/efl_integration/browser/favicon/favicon_database_p.cc index 7d05e41..33026bf 100644 --- a/tizen_src/ewk/efl_integration/browser/favicon/favicon_database_p.cc +++ b/tizen_src/ewk/efl_integration/browser/favicon/favicon_database_p.cc @@ -45,7 +45,11 @@ bool FaviconDatabasePrivate::existsForFaviconURL(const GURL &faviconUrl) const { } scoped_refptr FaviconDatabasePrivate::taskRunner() const { +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup return content::BrowserThread::GetTaskRunnerForThread(content::BrowserThread::DB); +#else + return content::BrowserThread::GetTaskRunnerForThread(content::BrowserThread::UI); +#endif } void FaviconDatabasePrivate::performSync() { diff --git a/tizen_src/ewk/efl_integration/browser/inputpicker/InputPicker.cc b/tizen_src/ewk/efl_integration/browser/inputpicker/InputPicker.cc index 6fe60b5..1682f1b 100755 --- a/tizen_src/ewk/efl_integration/browser/inputpicker/InputPicker.cc +++ b/tizen_src/ewk/efl_integration/browser/inputpicker/InputPicker.cc @@ -584,7 +584,9 @@ void InputPicker::showDatetimePopup(struct tm* currentTime, bool datetime_local) Eina_Bool InputPicker::removeDatetimePicker(void* data) { InputPicker* inputPicker = static_cast(data); +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup inputPicker->web_view_.web_contents().DidCancelDialog(); +#endif if (!inputPicker->picker_layout_) return ECORE_CALLBACK_CANCEL; @@ -823,8 +825,9 @@ void InputPicker::datePopupCallback( char dateStr[20] = { 0, }; strftime(dateStr, 20, "%F" , ¤tTime); - +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup inputPicker->web_view_.web_contents().DidReplaceDateTime(std::string(dateStr)); +#endif inputPicker->web_view_.ExecuteEditCommand("Unselect", 0); inputPicker->deletePopupLayout(); @@ -844,8 +847,9 @@ void InputPicker::weekPopupCallback( char dateStr[20] = { 0, }; strftime(dateStr, 20, "%G-W%V", ¤tTime); - +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup inputPicker->web_view_.web_contents().DidReplaceDateTime(std::string(dateStr)); +#endif inputPicker->web_view_.ExecuteEditCommand("Unselect", 0); inputPicker->deletePopupLayout(); @@ -865,8 +869,9 @@ void InputPicker::timePopupCallback( char dateStr[20] = { 0, }; strftime(dateStr, 20, "%R", ¤tTime); - +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup inputPicker->web_view_.web_contents().DidReplaceDateTime(std::string(dateStr)); +#endif inputPicker->web_view_.ExecuteEditCommand("Unselect", 0); inputPicker->deletePopupLayout(); @@ -886,8 +891,9 @@ void InputPicker::monthPopupCallback( char dateStr[20] = { 0, }; strftime(dateStr, 20, "%Y-%m", ¤tTime); - +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup inputPicker->web_view_.web_contents().DidReplaceDateTime(std::string(dateStr)); +#endif inputPicker->web_view_.ExecuteEditCommand("Unselect", 0); inputPicker->deletePopupLayout(); @@ -910,8 +916,9 @@ void InputPicker::datetimePopupCallback( strftime(dateStr, 50, "%FT%R", ¤tTime); else strftime(dateStr, 50, "%FT%RZ", ¤tTime); - +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup inputPicker->web_view_.web_contents().DidReplaceDateTime(std::string(dateStr)); +#endif inputPicker->web_view_.ExecuteEditCommand("Unselect", 0); inputPicker->deletePopupLayout(); diff --git a/tizen_src/ewk/efl_integration/browser/javascript_dialog_manager_efl.cc b/tizen_src/ewk/efl_integration/browser/javascript_dialog_manager_efl.cc index b3c5d19..db9b68b 100644 --- a/tizen_src/ewk/efl_integration/browser/javascript_dialog_manager_efl.cc +++ b/tizen_src/ewk/efl_integration/browser/javascript_dialog_manager_efl.cc @@ -78,14 +78,13 @@ JavaScriptDialogManagerEfl::JavaScriptDialogManagerEfl() {} JavaScriptDialogManagerEfl::~JavaScriptDialogManagerEfl() {} -void JavaScriptDialogManagerEfl::RunJavaScriptDialog( - content::WebContents* web_contents, - const GURL& alerting_frame_url, - content::JavaScriptDialogType dialog_type, - const base::string16& message_text, - const base::string16& default_prompt_text, - DialogClosedCallback callback, - bool* did_suppress_message) { +void JavaScriptDialogManagerEfl::RunJavaScriptDialog(content::WebContents* web_contents, + content::RenderFrameHost* render_frame_host, + content::JavaScriptDialogType dialog_type, + const base::string16& message_text, + const base::string16& default_prompt_text, + DialogClosedCallback callback, + bool* did_suppress_message) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(web_contents); dialog_closed_callback_ = std::move(callback); @@ -164,6 +163,7 @@ void JavaScriptDialogManagerEfl::SetPopupSize(int width, int height) { void JavaScriptDialogManagerEfl::RunBeforeUnloadDialog( content::WebContents* web_contents, + content::RenderFrameHost* render_frame_host, bool is_reload, DialogClosedCallback callback) { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); diff --git a/tizen_src/ewk/efl_integration/browser/javascript_dialog_manager_efl.h b/tizen_src/ewk/efl_integration/browser/javascript_dialog_manager_efl.h index 476372a..de3460b 100644 --- a/tizen_src/ewk/efl_integration/browser/javascript_dialog_manager_efl.h +++ b/tizen_src/ewk/efl_integration/browser/javascript_dialog_manager_efl.h @@ -53,13 +53,14 @@ class JavaScriptDialogManagerEfl : public content::JavaScriptDialogManager { // JavaScriptDialogManager: void RunJavaScriptDialog(content::WebContents* web_contents, - const GURL& alerting_frame_url, - content::JavaScriptDialogType dialog_type, - const base::string16& message_text, - const base::string16& default_prompt_text, - DialogClosedCallback callback, - bool* did_suppress_message) override; + content::RenderFrameHost* render_frame_host, + content::JavaScriptDialogType dialog_type, + const base::string16& message_text, + const base::string16& default_prompt_text, + DialogClosedCallback callback, + bool* did_suppress_message) override; void RunBeforeUnloadDialog(content::WebContents* web_contents, + content::RenderFrameHost* render_frame_host, bool is_reload, DialogClosedCallback callback) override; bool HandleJavaScriptDialog(content::WebContents* web_contents, diff --git a/tizen_src/ewk/efl_integration/browser/login_delegate_efl.cc b/tizen_src/ewk/efl_integration/browser/login_delegate_efl.cc index 80e9ff5..8b4cdb9 100644 --- a/tizen_src/ewk/efl_integration/browser/login_delegate_efl.cc +++ b/tizen_src/ewk/efl_integration/browser/login_delegate_efl.cc @@ -74,7 +74,9 @@ void LoginDelegateEfl::CancelOnIOThread() { DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); if (request_) { request_->CancelAuth(); +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup ResourceDispatcherHost::Get()->ClearLoginDelegateForRequest(request_); +#endif request_ = NULL; } } @@ -84,7 +86,9 @@ void LoginDelegateEfl::ProceedOnIOThread(const base::string16& user, DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); if (request_) { request_->SetAuth(net::AuthCredentials(user, password)); +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup ResourceDispatcherHost::Get()->ClearLoginDelegateForRequest(request_); +#endif request_ = NULL; } } diff --git a/tizen_src/ewk/efl_integration/browser/login_delegate_efl.h b/tizen_src/ewk/efl_integration/browser/login_delegate_efl.h index b507ae1..23bac62 100644 --- a/tizen_src/ewk/efl_integration/browser/login_delegate_efl.h +++ b/tizen_src/ewk/efl_integration/browser/login_delegate_efl.h @@ -7,14 +7,14 @@ #include "base/memory/ref_counted.h" #include "base/strings/string16.h" -#include "content/public/browser/resource_dispatcher_host_login_delegate.h" +#include "content/public/browser/login_delegate.h" namespace net { class AuthChallengeInfo; class URLRequest; } -class LoginDelegateEfl: public content::ResourceDispatcherHostLoginDelegate { +class LoginDelegateEfl: public content::LoginDelegate { public: LoginDelegateEfl(net::AuthChallengeInfo* auth_info, net::URLRequest* request); diff --git a/tizen_src/ewk/efl_integration/browser/notification/notification_controller_efl.cc b/tizen_src/ewk/efl_integration/browser/notification/notification_controller_efl.cc index d31117d..01c170d 100644 --- a/tizen_src/ewk/efl_integration/browser/notification/notification_controller_efl.cc +++ b/tizen_src/ewk/efl_integration/browser/notification/notification_controller_efl.cc @@ -97,8 +97,7 @@ void NotificationControllerEfl::DisplayNotification( const std::string& notification_id, const GURL& origin, const PlatformNotificationData& notification_data, - const NotificationResources& notification_resources, - base::Closure* cancel_callback) { + const NotificationResources& notification_resources) { BrowserContextEfl* browser_context_efl = static_cast(browser_context); CHECK(browser_context_efl); diff --git a/tizen_src/ewk/efl_integration/browser/notification/notification_controller_efl.h b/tizen_src/ewk/efl_integration/browser/notification/notification_controller_efl.h index 39a108a..90c2f05 100644 --- a/tizen_src/ewk/efl_integration/browser/notification/notification_controller_efl.h +++ b/tizen_src/ewk/efl_integration/browser/notification/notification_controller_efl.h @@ -110,8 +110,7 @@ class NotificationControllerEfl: public PlatformNotificationService { const std::string& notification_id, const GURL& origin, const PlatformNotificationData& notification_data, - const NotificationResources& notification_resources, - base::Closure* cancel_callback) override; + const NotificationResources& notification_resources) override; // Displays the persistent notification described in |notification_data| to // the user. This method must be called on the UI thread. diff --git a/tizen_src/ewk/efl_integration/browser/permission_manager_efl.cc b/tizen_src/ewk/efl_integration/browser/permission_manager_efl.cc index 399564f..36c1b1c 100644 --- a/tizen_src/ewk/efl_integration/browser/permission_manager_efl.cc +++ b/tizen_src/ewk/efl_integration/browser/permission_manager_efl.cc @@ -116,9 +116,6 @@ int PermissionManagerEfl::RequestPermissions( return request_id; } -void PermissionManagerEfl::CancelPermissionRequest(int request_id) { -} - PermissionStatus PermissionManagerEfl::GetPermissionStatus( PermissionType permission, const GURL& requesting_origin, @@ -126,6 +123,18 @@ PermissionStatus PermissionManagerEfl::GetPermissionStatus( return PermissionStatus::DENIED; } +blink::mojom::PermissionStatus +PermissionManagerEfl::GetPermissionStatusForFrame( + PermissionType permission, + content::RenderFrameHost* render_frame_host, + const GURL& requesting_origin) { + return GetPermissionStatus( + permission, requesting_origin, + content::WebContents::FromRenderFrameHost(render_frame_host) + ->GetLastCommittedURL() + .GetOrigin()); +} + void PermissionManagerEfl::ResetPermission(PermissionType permission, const GURL& requesting_origin, const GURL& embedding_origin) { diff --git a/tizen_src/ewk/efl_integration/browser/permission_manager_efl.h b/tizen_src/ewk/efl_integration/browser/permission_manager_efl.h index 0c80dca..804f81b 100644 --- a/tizen_src/ewk/efl_integration/browser/permission_manager_efl.h +++ b/tizen_src/ewk/efl_integration/browser/permission_manager_efl.h @@ -34,13 +34,16 @@ class CONTENT_EXPORT PermissionManagerEfl : public PermissionManager { void(const std::vector&)>& callback) override; - void CancelPermissionRequest(int request_id) override; - blink::mojom::PermissionStatus GetPermissionStatus( PermissionType permission, const GURL& requesting_origin, const GURL& embedding_origin) override; + blink::mojom::PermissionStatus GetPermissionStatusForFrame( + PermissionType permission, + RenderFrameHost* render_frame_host, + const GURL& requesting_origin) override; + void ResetPermission(PermissionType permission, const GURL& requesting_origin, const GURL& embedding_origin) override; diff --git a/tizen_src/ewk/efl_integration/browser/quota_permission_context_efl.cc b/tizen_src/ewk/efl_integration/browser/quota_permission_context_efl.cc index 1e3d9187..4200c09 100644 --- a/tizen_src/ewk/efl_integration/browser/quota_permission_context_efl.cc +++ b/tizen_src/ewk/efl_integration/browser/quota_permission_context_efl.cc @@ -34,7 +34,7 @@ void QuotaPermissionContextEfl::RequestQuotaPermission( } bool isPersistent = - (storage::StorageType::kStorageTypePersistent == params.storage_type); + (blink::mojom::StorageType::kPersistent == params.storage_type); _Ewk_Quota_Permission_Request* request = new _Ewk_Quota_Permission_Request( params.origin_url, params.requested_size, isPersistent); diff --git a/tizen_src/ewk/efl_integration/browser/render_message_filter_efl.h b/tizen_src/ewk/efl_integration/browser/render_message_filter_efl.h index fa5ebe0..1a11f33 100644 --- a/tizen_src/ewk/efl_integration/browser/render_message_filter_efl.h +++ b/tizen_src/ewk/efl_integration/browser/render_message_filter_efl.h @@ -8,8 +8,8 @@ #include "base/compiler_specific.h" #include "content/public/browser/browser_message_filter.h" #include "private/ewk_hit_test_private.h" -#include "third_party/blink/public/web/WebNavigationPolicy.h" -#include "third_party/blink/public/web/WebNavigationType.h" +#include "third_party/blink/public/web/web_navigation_policy.h" +#include "third_party/blink/public/web/web_navigation_type.h" #include "url/gurl.h" #if defined(TIZEN_MULTIMEDIA_SUPPORT) diff --git a/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.cc b/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.cc index 61a7f00..f3c34ff 100644 --- a/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.cc +++ b/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.cc @@ -11,11 +11,11 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/resource_request_info.h" #include "content/public/browser/web_contents.h" -#include "content/public/common/resource_response.h" #include "eweb_context.h" #include "net/http/http_response_headers.h" #include "net/url_request/url_request.h" #include "resource_throttle_efl.h" +#include "services/network/public/cpp/resource_response.h" using web_contents_utils::WebContentsFromViewID; @@ -81,12 +81,14 @@ void ResourceDispatcherHostDelegateEfl::RequestBeginning( #endif } +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup ResourceDispatcherHostLoginDelegate* ResourceDispatcherHostDelegateEfl::CreateLoginDelegate( net::AuthChallengeInfo* auth_info, net::URLRequest* request) { return new LoginDelegateEfl(auth_info, request); } +#endif void ResourceDispatcherHostDelegateEfl::DownloadStarting( net::URLRequest* request, diff --git a/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.h b/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.h index 0e04a27..bdf80da 100644 --- a/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.h +++ b/tizen_src/ewk/efl_integration/browser/resource_dispatcher_host_delegate_efl.h @@ -43,9 +43,11 @@ class ResourceDispatcherHostDelegateEfl throttles) override; // Create login delegate. +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup content::ResourceDispatcherHostLoginDelegate* CreateLoginDelegate( net::AuthChallengeInfo* auth_info, net::URLRequest* request) override; +#endif // EWK_BRINGUP: Removed in upversion. // Returns true if mime type should be overridden, otherwise returns false. diff --git a/tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item.h b/tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item.h index 8c14a57..e97e397 100644 --- a/tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item.h +++ b/tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item.h @@ -23,7 +23,7 @@ #include #include -#include "third_party/blink/public/web/WebTextDirection.h" +#include "third_party/blink/public/web/web_text_direction.h" #ifdef __cplusplus extern "C" { diff --git a/tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item_private.h b/tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item_private.h index 2b3f3aa..5cd0cdd 100644 --- a/tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item_private.h +++ b/tizen_src/ewk/efl_integration/browser/selectpicker/popup_menu_item_private.h @@ -7,7 +7,7 @@ #include "popup_menu_item.h" #include "content/public/common/menu_item.h" -#include "third_party/blink/public/web/WebTextDirection.h" +#include "third_party/blink/public/web/web_text_direction.h" #include diff --git a/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.cc b/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.cc index 3427cb9..db990c7 100644 --- a/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.cc +++ b/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.cc @@ -12,9 +12,13 @@ namespace content { namespace internal { net::SHA256HashValue getChainFingerprint256(const net::X509Certificate& cert) { +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup net::SHA256HashValue fingerprint = net::X509Certificate::CalculateChainFingerprint256( cert.os_cert_handle(), cert.GetIntermediateCertificates()); +#else + net::SHA256HashValue fingerprint; +#endif return fingerprint; } @@ -29,6 +33,7 @@ CertPolicy::~CertPolicy() { // in the saved CertStatus. bool CertPolicy::Check(const net::X509Certificate& cert, net::CertStatus error) const { +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup net::SHA256HashValue fingerprint = getChainFingerprint256(cert); std::map::const_iterator allowed_iter = @@ -37,6 +42,7 @@ bool CertPolicy::Check(const net::X509Certificate& cert, ((allowed_iter->second & error) == error)) { return true; } +#endif return false; } @@ -44,8 +50,10 @@ void CertPolicy::Allow(const net::X509Certificate& cert, net::CertStatus error) { // If this same cert had already been saved with a different error status, // this will replace it with the new error status. +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup net::SHA256HashValue fingerprint = getChainFingerprint256(cert); allowed_[fingerprint] = error; +#endif } } // namespace internal diff --git a/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.h b/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.h index ac277b6..b1581b1 100644 --- a/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.h +++ b/tizen_src/ewk/efl_integration/browser/ssl_host_state_delegate_efl.h @@ -32,8 +32,10 @@ class CertPolicy { private: // The set of fingerprints of allowed certificates. +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup std::map allowed_; +#endif }; } // namespace internal diff --git a/tizen_src/ewk/efl_integration/browser/web_view_browser_message_filter.cc b/tizen_src/ewk/efl_integration/browser/web_view_browser_message_filter.cc index 615414a..92c8dbe 100644 --- a/tizen_src/ewk/efl_integration/browser/web_view_browser_message_filter.cc +++ b/tizen_src/ewk/efl_integration/browser/web_view_browser_message_filter.cc @@ -229,8 +229,10 @@ bool WebViewBrowserMessageFilter::OnMessageReceived( WebViewBrowserMessageFilterPrivate::OnDidChangeScrollOffset) IPC_MESSAGE_FORWARD(EwkHostMsg_FormSubmit, private_, WebViewBrowserMessageFilterPrivate::OnFormSubmit) +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup IPC_MESSAGE_FORWARD(ViewHostMsg_StartContentIntent, private_, WebViewBrowserMessageFilterPrivate::OnStartContentIntent) +#endif IPC_MESSAGE_FORWARD(EwkHostMsg_RequestSelectCollectionInformationUpdateACK, private_, WebViewBrowserMessageFilterPrivate::OnRequestSelectCollectionInformationUpdateACK) diff --git a/tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.cc b/tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.cc index 13f9b75..df4d0a1 100644 --- a/tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.cc +++ b/tizen_src/ewk/efl_integration/browser/webdata/web_data_service_factory.cc @@ -52,7 +52,11 @@ WebDataServiceWrapper::WebDataServiceWrapper() { new WebDatabaseService( path, BrowserThread::GetTaskRunnerForThread(BrowserThread::UI), +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup BrowserThread::GetTaskRunnerForThread(BrowserThread::DB)); +#else + BrowserThread::GetTaskRunnerForThread(BrowserThread::UI)); +#endif // All tables objects that participate in managing the database must // be added here. @@ -63,7 +67,11 @@ WebDataServiceWrapper::WebDataServiceWrapper() { new AutofillWebDataService( web_database_, BrowserThread::GetTaskRunnerForThread(BrowserThread::UI), +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup BrowserThread::GetTaskRunnerForThread(BrowserThread::DB), +#else + BrowserThread::GetTaskRunnerForThread(BrowserThread::DB), +#endif base::Bind(&ProfileErrorCallback, 0)); autofill_web_data_->Init(); diff --git a/tizen_src/ewk/efl_integration/browser_context_efl.cc b/tizen_src/ewk/efl_integration/browser_context_efl.cc index acb54b7..843f749 100644 --- a/tizen_src/ewk/efl_integration/browser_context_efl.cc +++ b/tizen_src/ewk/efl_integration/browser_context_efl.cc @@ -229,7 +229,11 @@ net::URLRequestContextGetter* BrowserContextEfl::CreateRequestContext( request_context_getter_ = new URLRequestContextGetterEfl( std::move(network_delegate_for_getter_), false, cache_base_path, BrowserThread::GetTaskRunnerForThread(BrowserThread::IO), +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), +#else + BrowserThread::GetTaskRunnerForThread(BrowserThread::UI), +#endif protocol_handlers, std::move(request_interceptors), NULL); web_context_->cookieManager()->SetRequestContextGetter( request_context_getter_); @@ -241,13 +245,17 @@ net::URLRequestContextGetter* BrowserContextEfl::CreateRequestContext( void BrowserContextEfl::SetCertificate(const char* certificate_file) { base::FilePath* certificate_path = new base::FilePath(certificate_file); DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, base::Bind(&BrowserContextEfl::ReadCertificateAndAdd, base::Owned(certificate_path))); +#endif } void BrowserContextEfl::ReadCertificateAndAdd(base::FilePath* file_path) { +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); +#endif std::string cert_contents; base::ReadFileToString(*file_path, &cert_contents); scoped_refptr cert( diff --git a/tizen_src/ewk/efl_integration/common/content_client_efl.cc b/tizen_src/ewk/efl_integration/common/content_client_efl.cc index 649e011..2ad7fff 100644 --- a/tizen_src/ewk/efl_integration/common/content_client_efl.cc +++ b/tizen_src/ewk/efl_integration/common/content_client_efl.cc @@ -28,7 +28,7 @@ base::StringPiece ContentClientEfl::GetDataResource( ui::ScaleFactor scale_factor) const { // TODO(boliu): Used only by WebKit, so only bundle those resources for // Android WebView. - return ResourceBundle::GetSharedInstance().GetRawDataResourceForScale( + return ui::ResourceBundle::GetSharedInstance().GetRawDataResourceForScale( resource_id, scale_factor); } diff --git a/tizen_src/ewk/efl_integration/common/navigation_policy_params.cc b/tizen_src/ewk/efl_integration/common/navigation_policy_params.cc index 2b9f2db..b8e5791 100644 --- a/tizen_src/ewk/efl_integration/common/navigation_policy_params.cc +++ b/tizen_src/ewk/efl_integration/common/navigation_policy_params.cc @@ -4,7 +4,7 @@ #include "common/navigation_policy_params.h" -#include "third_party/blink/public/web/WebNavigationPolicy.h" +#include "third_party/blink/public/web/web_navigation_policy.h" NavigationPolicyParams::NavigationPolicyParams() : render_view_id(-1) diff --git a/tizen_src/ewk/efl_integration/common/navigation_policy_params.h b/tizen_src/ewk/efl_integration/common/navigation_policy_params.h index 134d27e..f684d61 100644 --- a/tizen_src/ewk/efl_integration/common/navigation_policy_params.h +++ b/tizen_src/ewk/efl_integration/common/navigation_policy_params.h @@ -6,9 +6,9 @@ #define POLICY_NAVIGATION_PARAMS_H_ #include "content/public/common/referrer.h" -#include "third_party/blink/public/web/WebNavigationPolicy.h" -#include "third_party/blink/public/web/WebNavigationType.h" -#include "third_party/blink/public/platform/WebString.h" +#include "third_party/blink/public/web/web_navigation_policy.h" +#include "third_party/blink/public/web/web_navigation_type.h" +#include "third_party/blink/public/platform/web_string.h" #include "url/gurl.h" struct NavigationPolicyParams { diff --git a/tizen_src/ewk/efl_integration/common/print_pages_params.h b/tizen_src/ewk/efl_integration/common/print_pages_params.h index 7b16032..ade2a39 100644 --- a/tizen_src/ewk/efl_integration/common/print_pages_params.h +++ b/tizen_src/ewk/efl_integration/common/print_pages_params.h @@ -10,7 +10,7 @@ #include "base/files/file_path.h" #include "base/memory/shared_memory.h" #include "printing/printing_export.h" -#include "third_party/blink/public/web/WebPrintScalingOption.h" +#include "third_party/blink/public/web/web_print_scaling_option.h" #include "ui/gfx/geometry/rect.h" #include "ui/gfx/geometry/size.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 index 1fc2af8..78fb5ee 100644 --- a/tizen_src/ewk/efl_integration/common/render_messages_ewk.h +++ b/tizen_src/ewk/efl_integration/common/render_messages_ewk.h @@ -17,9 +17,9 @@ #include "private/ewk_wrt_private.h" #include "public/ewk_hit_test.h" #include "public/ewk_view.h" -#include "third_party/blink/public/web/WebNavigationPolicy.h" -#include "third_party/blink/public/web/WebNavigationType.h" -#include "third_party/blink/public/web/WebViewModeEnums.h" +#include "third_party/blink/public/web/web_navigation_policy.h" +#include "third_party/blink/public/web/web_navigation_type.h" +//#include "third_party/blink/public/web/WebViewModeEnums.h" #include "ipc_message_start_ewk.h" typedef std::map StringMap; @@ -116,9 +116,9 @@ IPC_STRUCT_TRAITS_BEGIN(NavigationPolicyParams) IPC_STRUCT_TRAITS_MEMBER(is_main_frame) IPC_STRUCT_TRAITS_MEMBER(is_redirect) IPC_STRUCT_TRAITS_END() - +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup IPC_ENUM_TRAITS(blink::WebViewMode) - +#endif IPC_MESSAGE_CONTROL2(WrtMsg_ParseUrl, int, // result: request_id @@ -265,8 +265,10 @@ IPC_SYNC_MESSAGE_CONTROL1_1(EwkHostMsg_DecideNavigationPolicy, bool /*handled*/) // FIXME: error: ‘WebNavigationTypeOther’ is not a member of ‘blink’ +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup IPC_MESSAGE_ROUTED1(ViewMsg_SetViewMode, blink::WebViewMode /* view_mode */) +#endif IPC_MESSAGE_ROUTED1(ViewMsg_SetTextZoomFactor, float /*font zoom factor*/) diff --git a/tizen_src/ewk/efl_integration/content_browser_client_efl.cc b/tizen_src/ewk/efl_integration/content_browser_client_efl.cc index 1f12f65..624583c 100644 --- a/tizen_src/ewk/efl_integration/content_browser_client_efl.cc +++ b/tizen_src/ewk/efl_integration/content_browser_client_efl.cc @@ -14,7 +14,7 @@ #include "web_contents_view_delegate_ewk.h" #include "devtools_manager_delegate_efl.h" #include "browser/editor_client_observer.h" -#include "browser/geolocation/access_token_store_efl.h" +//#include "browser/geolocation/access_token_store_efl.h" #include "browser/quota_permission_context_efl.h" #include "browser/render_message_filter_efl.h" #include "browser/resource_dispatcher_host_delegate_efl.h" @@ -84,7 +84,7 @@ void ContentBrowserClientEfl::AppendExtraCommandLineSwitches( double scale = context->GetWidgetScale(); command_line->AppendSwitchASCII(switches::kWidgetScale, - base::DoubleToString(scale)); + base::NumberToString(scale)); const std::string& widget_theme = context->GetWidgetTheme(); command_line->AppendSwitchASCII(switches::kWidgetTheme, @@ -233,7 +233,7 @@ bool ContentBrowserClientEfl::AllowGetCookie(const GURL& url, bool ContentBrowserClientEfl::AllowSetCookie( const GURL& url, const GURL& first_party, - const std::string& cookie_line, + const net::CanonicalCookie& cookie, content::ResourceContext* context, int render_process_id, int render_frame_id, @@ -247,7 +247,7 @@ bool ContentBrowserClientEfl::AllowSetCookie( if (!cookie_manager.get()) return false; - return cookie_manager->AllowSetCookie(url, first_party, cookie_line, context, + return cookie_manager->AllowSetCookie(url, first_party, std::string(), context, render_process_id, render_frame_id, options); } @@ -275,7 +275,8 @@ void ContentBrowserClientEfl::OverrideWebkitPrefs( } void ContentBrowserClientEfl::RenderProcessWillLaunch( - content::RenderProcessHost* host) { + content::RenderProcessHost* host, + service_manager::mojom::ServiceRequest* service_request) { host->AddFilter(new RenderMessageFilterEfl(host->GetID())); host->AddFilter(new editing::EditorClientObserver(host->GetID())); #if defined(OS_TIZEN) @@ -290,7 +291,7 @@ void ContentBrowserClientEfl::SetCertificatePem(const net::SSLInfo& ssl_info, return; std::string pem_certificate; - if (!net::X509Certificate::GetPEMEncoded(ssl_info.cert->os_cert_handle(), + if (!net::X509Certificate::GetPEMEncoded(ssl_info.cert->cert_buffer(), &pem_certificate)) return; diff --git a/tizen_src/ewk/efl_integration/content_browser_client_efl.h b/tizen_src/ewk/efl_integration/content_browser_client_efl.h index eb8f7fd..a07fdc0 100644 --- a/tizen_src/ewk/efl_integration/content_browser_client_efl.h +++ b/tizen_src/ewk/efl_integration/content_browser_client_efl.h @@ -7,7 +7,7 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/content_browser_client.h" -#include "third_party/blink/public/web/WebWindowFeatures.h" +#include "third_party/blink/public/web/web_window_features.h" namespace base { class CommandLine; @@ -84,7 +84,7 @@ class ContentBrowserClientEfl : public ContentBrowserClient { virtual bool AllowSetCookie(const GURL& url, const GURL& first_party, - const std::string& cookie_line, + const net::CanonicalCookie& cookie, content::ResourceContext* context, int render_process_id, int render_frame_id, @@ -94,7 +94,8 @@ class ContentBrowserClientEfl : public ContentBrowserClient { content::WebPreferences* prefs) override; virtual void RenderProcessWillLaunch( - content::RenderProcessHost* host) override; + content::RenderProcessHost* host, + service_manager::mojom::ServiceRequest* service_request) override; virtual void SetCertificatePem(const net::SSLInfo& ssl_info, int render_process_id, diff --git a/tizen_src/ewk/efl_integration/context_menu_controller_efl.cc b/tizen_src/ewk/efl_integration/context_menu_controller_efl.cc index b6aa001..aec62f2 100644 --- a/tizen_src/ewk/efl_integration/context_menu_controller_efl.cc +++ b/tizen_src/ewk/efl_integration/context_menu_controller_efl.cc @@ -21,7 +21,7 @@ #include "net/base/filename_util.h" #include "net/traffic_annotation/network_traffic_annotation.h" #include "content/common/paths_efl.h" -#include "third_party/blink/public/platform/WebReferrerPolicy.h" +#include "third_party/blink/public/platform/web_referrer_policy.h" #include "ui/base/clipboard/clipboard.h" #include "private/ewk_context_menu_private.h" @@ -44,11 +44,11 @@ bool ContextMenuControllerEfl::_context_menu_resized = false; std::vector ContextMenuControllerEfl::_context_menu_listdata; ContextMenuControllerEfl::~ContextMenuControllerEfl() { - for (std::set::iterator it = clipboard_download_items_.begin(); + for (std::set::iterator it = clipboard_download_items_.begin(); it != clipboard_download_items_.end(); ++it) { (*it)->RemoveObserver(this); } - for (std::set::iterator it = disk_download_items_.begin(); + for (std::set::iterator it = disk_download_items_.begin(); it != disk_download_items_.end(); ++it) { (*it)->RemoveObserver(this); } @@ -498,8 +498,8 @@ void ContextMenuControllerEfl::RequestShowSelectionHandleAndContextMenu() { } void ContextMenuControllerEfl::OnClipboardDownload( - content::DownloadItem* item, - content::DownloadInterruptReason interrupt_reason) { + download::DownloadItem* item, + download::DownloadInterruptReason interrupt_reason) { item->AddObserver(this); clipboard_download_items_.insert(item); } @@ -510,8 +510,8 @@ void EmptyDialogClosedCallback( } void ContextMenuControllerEfl::OnDiskDownload( - content::DownloadItem* item, - content::DownloadInterruptReason interrupt_reason) { + download::DownloadItem* item, + download::DownloadInterruptReason interrupt_reason) { if (!item) { save_fail_dialog_.reset(JavaScriptModalDialogEfl::CreateDialog( &web_contents_, @@ -525,7 +525,7 @@ void ContextMenuControllerEfl::OnDiskDownload( disk_download_items_.insert(item); } -void ContextMenuControllerEfl::OnDownloadUpdated(content::DownloadItem* download) { +void ContextMenuControllerEfl::OnDownloadUpdated(download::DownloadItem* download) { if(download && download->AllDataSaved()) { if (clipboard_download_items_.find(download) != clipboard_download_items_.end()) { #if !defined(WAYLAND_BRINGUP) @@ -553,18 +553,25 @@ void ContextMenuControllerEfl::OnDownloadUpdated(content::DownloadItem* download base::FilePath ContextMenuControllerEfl::DownloadFile(const GURL url, const base::FilePath outputDir, - const DownloadUrlParameters::OnStartedCallback &callback = - DownloadUrlParameters::OnStartedCallback()) { + const download::DownloadUrlParameters::OnStartedCallback &callback = + download::DownloadUrlParameters::OnStartedCallback()) { LOG(INFO) << "Downloading file: " << url << "to: "<< outputDir.value(); const GURL referrer = web_contents_.GetVisibleURL(); - DownloadManager* dlm = BrowserContext::GetDownloadManager( - web_contents_.GetBrowserContext()); - - std::unique_ptr dl_params( - DownloadUrlParameters::CreateForWebContentsMainFrame(&web_contents_, url, NO_TRAFFIC_ANNOTATION_YET)); + RenderFrameHost* frame_host = web_contents_.GetMainFrame(); + StoragePartition* storage_partition = BrowserContext::GetStoragePartition( + web_contents_.GetBrowserContext(), frame_host->GetSiteInstance()); + auto dl_params = std::make_unique( + url, frame_host->GetProcess()->GetID(), + frame_host->GetRenderViewHost()->GetRoutingID(), + frame_host->GetRoutingID(), storage_partition->GetURLRequestContext(), + NO_TRAFFIC_ANNOTATION_YET); dl_params->set_post_id(-1); +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup dl_params->set_referrer( content::Referrer(referrer, blink::kWebReferrerPolicyAlways)); +#else + dl_params->set_referrer(referrer); +#endif dl_params->set_referrer_encoding("utf8"); base::FilePath fileName = net::GenerateFileName(url,"","","","",""); base::FilePath fullPath = outputDir.Append(fileName); @@ -584,6 +591,9 @@ base::FilePath ContextMenuControllerEfl::DownloadFile(const GURL url, dl_params->set_file_path(fullPath); dl_params->set_prompt(true); dl_params->set_callback(callback); + + DownloadManager* dlm = BrowserContext::GetDownloadManager( + web_contents_.GetBrowserContext()); dlm->DownloadUrl(std::move(dl_params)); return fullPath; } diff --git a/tizen_src/ewk/efl_integration/context_menu_controller_efl.h b/tizen_src/ewk/efl_integration/context_menu_controller_efl.h index faba1a5..edf265c 100644 --- a/tizen_src/ewk/efl_integration/context_menu_controller_efl.h +++ b/tizen_src/ewk/efl_integration/context_menu_controller_efl.h @@ -11,8 +11,8 @@ #include "base/memory/weak_ptr.h" #include "browser/javascript_modal_dialog_efl.h" #include "content/public/browser/render_view_host.h" -#include "content/public/browser/download_item.h" -#include "content/public/browser/download_url_parameters.h" +#include "components/download/public/common/download_item.h" +#include "components/download/public/common/download_url_parameters.h" #include "content/public/browser/web_contents.h" #include "content/public/common/context_menu_params.h" #include "public/ewk_context_menu.h" @@ -62,7 +62,7 @@ class ContextMenuItemEfl { }; class ContextMenuControllerEfl - : public content::DownloadItem::Observer { + : public download::DownloadItem::Observer { public: static void ContextMenuCancelCallback(void* data, Evas_Object* obj, void* event_info); static void ContextMenuItemSelectedCallback(void* data, Evas_Object* obj, void* event_info); @@ -105,14 +105,14 @@ class ContextMenuControllerEfl const std::string& icon_path = std::string()); void HideSelectionHandle(); void RequestShowSelectionHandleAndContextMenu(); - virtual void OnDownloadUpdated(content::DownloadItem* download) override; - void OnClipboardDownload(content::DownloadItem* item, - content::DownloadInterruptReason interrupt_reason); - void OnDiskDownload(content::DownloadItem* item, - content::DownloadInterruptReason interrupt_reason); + virtual void OnDownloadUpdated(download::DownloadItem* download) override; + void OnClipboardDownload(download::DownloadItem* item, + download::DownloadInterruptReason interrupt_reason); + void OnDiskDownload(download::DownloadItem* item, + download::DownloadInterruptReason interrupt_reason); base::FilePath DownloadFile(const GURL url, const base::FilePath outputDir, - const DownloadUrlParameters::OnStartedCallback& callback); + const download::DownloadUrlParameters::OnStartedCallback& callback); bool TriggerDownloadCb(const GURL url); void OpenURL(const GURL url, const WindowOpenDisposition disposition); #if defined(OS_TIZEN) @@ -132,8 +132,8 @@ class ContextMenuControllerEfl base::WeakPtrFactory weak_ptr_factory_; gfx::Point context_menu_show_pos_; bool is_text_selection_; - std::set clipboard_download_items_; - std::set disk_download_items_; + std::set clipboard_download_items_; + std::set disk_download_items_; std::unique_ptr file_saved_dialog_; std::unique_ptr save_fail_dialog_; }; diff --git a/tizen_src/ewk/efl_integration/cookie_manager.cc b/tizen_src/ewk/efl_integration/cookie_manager.cc index a450046..57d306e 100644 --- a/tizen_src/ewk/efl_integration/cookie_manager.cc +++ b/tizen_src/ewk/efl_integration/cookie_manager.cc @@ -299,11 +299,13 @@ static void GetCookieValueOnIOThread(std::unique_ptr cookie_st options.set_include_httponly(); if (cookie_store.get()) { +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup cookie_store->GetCookiesWithOptionsAsync(host, options, base::Bind(SignalGetCookieValueCompleted, completion, - result)); + i result)); +#endif } else { DCHECK(completion); completion->Signal(); diff --git a/tizen_src/ewk/efl_integration/devtools_delegate_efl.h b/tizen_src/ewk/efl_integration/devtools_delegate_efl.h index c282c54..9c68bb9 100644 --- a/tizen_src/ewk/efl_integration/devtools_delegate_efl.h +++ b/tizen_src/ewk/efl_integration/devtools_delegate_efl.h @@ -28,7 +28,7 @@ class DevToolsDelegateEfl : public DevToolsManagerDelegate { // ChromiumDevToolsHttpHandler::Delegate overrides. virtual std::string GetDiscoveryPageHTML() override; - virtual std::string GetFrontendResource(const std::string& path) override; + std::string GetFrontendResource(const std::string& path); DevToolsHttpHandler* devtools_http_handler() { return devtools_http_handler_.get(); diff --git a/tizen_src/ewk/efl_integration/devtools_manager_delegate_efl.cc b/tizen_src/ewk/efl_integration/devtools_manager_delegate_efl.cc index 5a16bfe..2c30178 100644 --- a/tizen_src/ewk/efl_integration/devtools_manager_delegate_efl.cc +++ b/tizen_src/ewk/efl_integration/devtools_manager_delegate_efl.cc @@ -106,7 +106,7 @@ DevToolsManagerDelegateEfl::~DevToolsManagerDelegateEfl() { bool DevToolsManagerDelegateEfl::HandleCommand( content::DevToolsAgentHost* agent_host, - int session_id, + DevToolsAgentHostClient* client, base::DictionaryValue* command_dict) { return false; } diff --git a/tizen_src/ewk/efl_integration/devtools_manager_delegate_efl.h b/tizen_src/ewk/efl_integration/devtools_manager_delegate_efl.h index 622d020..6a83247a 100644 --- a/tizen_src/ewk/efl_integration/devtools_manager_delegate_efl.h +++ b/tizen_src/ewk/efl_integration/devtools_manager_delegate_efl.h @@ -17,7 +17,7 @@ class DevToolsManagerDelegateEfl : public DevToolsManagerDelegate { // content::DevToolsManagerDelegate implementation. virtual void Inspect(content::DevToolsAgentHost* agent_host) override{}; virtual bool HandleCommand(DevToolsAgentHost* agent_host, - int session_id, + DevToolsAgentHostClient* client, base::DictionaryValue* command) override; private: diff --git a/tizen_src/ewk/efl_integration/eweb_context.cc b/tizen_src/ewk/efl_integration/eweb_context.cc index 270ab48..93d5d7b 100644 --- a/tizen_src/ewk/efl_integration/eweb_context.cc +++ b/tizen_src/ewk/efl_integration/eweb_context.cc @@ -21,8 +21,8 @@ #include "browser/webdata/web_data_service_factory.h" #include "ui/gl/gl_shared_context_efl.h" #include "net/http/http_cache.h" -#include "net/proxy/proxy_config_service_fixed.h" -#include "net/proxy/proxy_service.h" +#include "net/proxy_resolution/proxy_config_service_fixed.h" +#include "net/proxy_resolution/proxy_resolution_service.h" #include "storage/browser/database/database_quota_client.h" #include "storage/browser/fileapi/file_system_quota_client.h" #include "storage/browser/quota/quota_manager.h" @@ -91,10 +91,15 @@ void SetProxyConfigCallbackOnIOThread( base::WaitableEvent* done, net::URLRequestContextGetter* url_request_context_getter, const net::ProxyConfig& proxy_config) { - net::ProxyService* proxy_service = - url_request_context_getter->GetURLRequestContext()->proxy_service(); - proxy_service->ResetConfigService( + net::ProxyResolutionService* proxy_resolution_service = + url_request_context_getter->GetURLRequestContext()->proxy_resolution_service(); +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup + proxy_resolution_service->ResetConfigService( base::WrapUnique(new net::ProxyConfigServiceFixed(proxy_config))); +#else + proxy_resolution_service->ResetConfigService( + base::WrapUnique(new net::ProxyConfigServiceFixed(net::ProxyConfigWithAnnotation()))); +#endif done->Signal(); } @@ -104,11 +109,11 @@ void OnOriginsWithApplicationCacheObtained( scoped_refptr collection, int result) { Eina_List* origins = 0; - for (map::iterator iter = - collection->infos_by_origin.begin(); - iter != collection->infos_by_origin.end(); ++iter) { - _Ewk_Security_Origin* origin = new _Ewk_Security_Origin(iter->first); - origins = eina_list_append(origins, origin); + if (collection.get()) { + for (const auto& app_origin : collection->infos_by_origin) { + _Ewk_Security_Origin* origin = new _Ewk_Security_Origin(app_origin.first.GetURL()); + origins = eina_list_append(origins, origin); + } } callback(origins, user_data); } @@ -116,10 +121,10 @@ void OnOriginsWithApplicationCacheObtained( void OnTemporaryUsageAndQuotaObtained( Ewk_Web_Application_Cache_Usage_For_Origin_Get_Callback callback, void* user_data, - storage::QuotaStatusCode status_code, + blink::mojom::QuotaStatusCode status_code, int64_t usage, int64_t quota) { - if (status_code != storage::kQuotaStatusOk) { + if (status_code != blink::mojom::QuotaStatusCode::kOk) { LOG(ERROR) << "Error in retrieving usage information"; // We still trigger callback. usage = 0; @@ -144,8 +149,8 @@ void OnGetWebDBOrigins(Ewk_Web_Database_Origins_Get_Callback callback, void GetWebDBOriginsOnDBThread(Ewk_Web_Database_Origins_Get_Callback callback, void* user_data, content::StoragePartition* partition) { - DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB)); #if !defined(EWK_BRINGUP) // FIXME: m67 bringup + DCHECK(BrowserThread::CurrentlyOn(BrowserThread::DB)); storage::DatabaseQuotaClient client(partition->GetDatabaseTracker()); client.GetOriginsForType(storage::kStorageTypeTemporary, base::Bind(&OnGetWebDBOrigins, callback, user_data)); @@ -169,14 +174,17 @@ void GetFileSystemOriginsOnFILEThread( Ewk_Web_Database_Origins_Get_Callback callback, void* user_data, content::StoragePartition* partition) { +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); +#endif std::unique_ptr client( new storage::FileSystemQuotaClient(partition->GetFileSystemContext(), false)); - +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup client->GetOriginsForType( - storage::kStorageTypeTemporary, + blink::mojom::StorageType::kTemporary, base::Bind(&OnGetFileSystemOrigins, callback, user_data)); +#endif } } // namespace @@ -433,8 +441,7 @@ void EWebContext::DeleteApplicationCacheForSite(const GURL& site) { BrowserContext::GetStoragePartitionForSite(browser_context_.get(), site); partition->ClearDataForOrigin( content::StoragePartition::REMOVE_DATA_MASK_APPCACHE, - content::StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL, site, - partition->GetURLRequestContext(), base::Bind(&base::DoNothing)); + content::StoragePartition::QUOTA_MANAGED_STORAGE_MASK_ALL, site); } void EWebContext::GetAllOriginsWithApplicationCache( @@ -465,7 +472,7 @@ void EWebContext::GetApplicationCacheUsage( BrowserThread::IO, FROM_HERE, base::Bind( &storage::QuotaManager::GetUsageAndQuota, - partition->GetQuotaManager(), url, storage::kStorageTypeTemporary, + partition->GetQuotaManager(), url, blink::mojom::StorageType::kTemporary, base::Bind(&OnTemporaryUsageAndQuotaObtained, callback, user_data))); } @@ -491,7 +498,7 @@ void EWebContext::WebStorageDeleteForOrigin(const GURL& origin) { content::StoragePartition* partition = BrowserContext::GetStoragePartition(browser_context_.get(), NULL); - partition->GetDOMStorageContext()->DeleteLocalStorage(origin); + partition->GetDOMStorageContext()->DeleteLocalStorage(origin, base::DoNothing()); } void EWebContext::WebStorageOriginsAllGet( @@ -534,11 +541,13 @@ void EWebContext::WebDBDelete(const GURL& host) { void EWebContext::GetAllOriginsWithWebDB( Ewk_Web_Database_Origins_Get_Callback callback, void* user_data) { +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup content::StoragePartition* partition = BrowserContext::GetStoragePartition(browser_context_.get(), NULL); BrowserThread::PostTask( BrowserThread::DB, FROM_HERE, base::Bind(&GetWebDBOriginsOnDBThread, callback, user_data, partition)); +#endif } void EWebContext::FileSystemDelete(const GURL& host) { @@ -556,11 +565,13 @@ void EWebContext::FileSystemDelete(const GURL& host) { void EWebContext::GetAllOriginsWithFileSystem( Ewk_Local_File_System_Origins_Get_Callback callback, void* user_data) const { +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup content::StoragePartition* partition = BrowserContext::GetStoragePartition(browser_context_.get(), NULL); BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, base::Bind(&GetFileSystemOriginsOnFILEThread, callback, user_data, partition)); +#endif } bool EWebContext::SetFaviconDatabasePath(const base::FilePath& path) { diff --git a/tizen_src/ewk/efl_integration/eweb_view.cc b/tizen_src/ewk/efl_integration/eweb_view.cc index b2e2728..d8f91ff 100644 --- a/tizen_src/ewk/efl_integration/eweb_view.cc +++ b/tizen_src/ewk/efl_integration/eweb_view.cc @@ -24,7 +24,6 @@ #include "private/webview_delegate_ewk.h" #include "web_contents_delegate_efl.h" #include "public/ewk_hit_test.h" -#include "public/platform/WebString.h" #include "base/command_line.h" #include "base/files/file_path.h" #include "base/logging.h" @@ -47,8 +46,10 @@ #include "content/public/common/user_agent.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/host_zoom_map.h" +#include "services/network/public/cpp/resource_request_body.h" #include "skia/ext/platform_canvas.h" -#include "third_party/blink/public/web/WebFindOptions.h" +#include "third_party/blink/public/platform/web_string.h" +#include "third_party/blink/public/web/web_find_options.h" #include "ui/events/event_switches.h" #include "web_contents_efl_delegate_ewk.h" #include "web_contents_view_efl_delegate_ewk.h" @@ -191,11 +192,12 @@ void EWebView::Initialize() { settings_.reset(new Ewk_Settings( evas_object_, web_contents_->GetRenderViewHost()->GetWebkitPreferences())); - +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess(); if (cmdline->HasSwitch(switches::kTouchEvents)) SetTouchEventsEnabled(true); else +#endif SetMouseEventsEnabled(true); popupMenuItems_ = 0; @@ -616,8 +618,8 @@ void EWebView::SetTouchEventsEnabled(bool enabled) { #if !defined(EWK_BRINGUP) // FIXME: m67 bringup // there is no flag touch_enabled in web preferences GetSettings()->getPreferences().touch_enabled = enabled; -#endif GetSettings()->getPreferences().double_tap_to_zoom_enabled = enabled; +#endif GetSettings()->getPreferences().editing_behavior = enabled ? content::EDITING_BEHAVIOR_ANDROID : content::EDITING_BEHAVIOR_UNIX; @@ -686,6 +688,7 @@ bool EWebView::ExecuteJavaScript(const char* script, base::string16 js_script; base::UTF8ToUTF16(script, strlen(script), &js_script); if (callback) { +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup JavaScriptCallbackDetails* script_callback_data = new JavaScriptCallbackDetails(callback, userdata, evas_object_); // In M47, it isn't possible anymore to execute javascript in the generic @@ -694,6 +697,7 @@ bool EWebView::ExecuteJavaScript(const char* script, render_frame_host->ExecuteJavaScriptWithUserGestureForTests( js_script, base::Bind(&JavaScriptComplete, base::Owned(script_callback_data))); +#endif } else { // We use ExecuteJavaScriptWithUserGestureForTests instead of // ExecuteJavaScript because @@ -712,12 +716,8 @@ bool EWebView::SetUserAgent(const char* userAgent) { bool override = userAgent && strlen(userAgent); for (int i = 0; i < controller.GetEntryCount(); ++i) controller.GetEntryAtIndex(i)->SetIsOverridingUserAgent(override); - - if (override) - web_contents_->SetUserAgentOverride(userAgent); - else - web_contents_->SetUserAgentOverride(std::string()); - + // TODO: Check if override_in_new_tabs has to be true. + web_contents_->SetUserAgentOverride(override ? userAgent : std::string(), false /* override_in_new_tabs */); return true; } @@ -1011,8 +1011,9 @@ Eina_Bool EWebView::DidSelectPopupMenuItem(int selectedIndex) { // put selectedIndex into std::vector. std::vector selectedIndices; selectedIndices.push_back(selectedIndex); - +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup render_frame_host->DidSelectPopupMenuItems(selectedIndices); +#endif return true; } @@ -1025,8 +1026,9 @@ Eina_Bool EWebView::DidMultipleSelectPopupMenuItem( if (!popupMenuItems_) return false; - +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup render_frame_host->DidSelectPopupMenuItems(selectedIndices); +#endif return true; } @@ -1052,8 +1054,9 @@ Eina_Bool EWebView::PopupMenuClose() { static_cast(web_contents_->GetMainFrame()); if (!render_frame_host) return false; - +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup render_frame_host->DidCancelPopupMenu(); +#endif return true; } @@ -1246,6 +1249,7 @@ SelectionControllerEfl* EWebView::GetSelectionController() const { } void EWebView::SelectLinkText(const gfx::Point& touch_point) { +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup float device_scale_factor = display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor(); RenderViewHost* render_view_host = web_contents_->GetRenderViewHost(); @@ -1253,6 +1257,7 @@ void EWebView::SelectLinkText(const gfx::Point& touch_point) { render_view_host->GetRoutingID(), gfx::Point(touch_point.x() / device_scale_factor, touch_point.y() / device_scale_factor))); +#endif } bool EWebView::GetSelectionRange(Eina_Rectangle* left_rect, @@ -1983,6 +1988,7 @@ void EWebView::ShowFileChooser(content::RenderFrameHost* render_frame_host, file_chooser_->Open(); } +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup void EWebView::SetViewMode(blink::WebViewMode view_mode) { RenderViewHost* render_view_host = web_contents_->GetRenderViewHost(); if (!render_view_host) @@ -1996,6 +2002,7 @@ void EWebView::SetViewMode(blink::WebViewMode view_mode) { delayed_messages_.push_back(message); } } +#endif gfx::Point EWebView::GetContextMenuPosition() const { return context_menu_position_; @@ -2210,15 +2217,15 @@ void EWebView::UrlRequestSet( content::NavigationController::LoadURLType loadtype, Eina_Hash* headers, const char* body) { - content::NavigationController::LoadURLParams params = - content::NavigationController::LoadURLParams(GURL(url)); + GURL gurl(url); + content::NavigationController::LoadURLParams params(gurl); params.load_type = loadtype; params.override_user_agent = NavigationController::UA_OVERRIDE_TRUE; if (body) { std::string s(body); params.post_data = - content::ResourceRequestBody::CreateFromBytes(s.data(), s.size()); + network::ResourceRequestBody::CreateFromBytes(s.data(), s.size()); } net::HttpRequestHeaders header; diff --git a/tizen_src/ewk/efl_integration/eweb_view.h b/tizen_src/ewk/efl_integration/eweb_view.h index e54b656..b7aeb43 100644 --- a/tizen_src/ewk/efl_integration/eweb_view.h +++ b/tizen_src/ewk/efl_integration/eweb_view.h @@ -28,7 +28,7 @@ #include "content/public/common/file_chooser_params.h" #include "content/browser/renderer_host/event_with_latency_info.h" #include "content/browser/selection/selection_controller_efl.h" -#include "content/common/input/input_event_ack_state.h" +#include "content/public/common/input_event_ack_state.h" #include "content/public/browser/navigation_controller.h" #include "content/public/browser/quota_permission_context.h" #include "content/public/browser/web_contents_delegate.h" @@ -53,7 +53,7 @@ #include "ui/gfx/geometry/point.h" #include "ui/gfx/geometry/size.h" #include "web_contents_delegate_efl.h" -#include "third_party/blink/public/web/WebViewModeEnums.h" +//#include "third_party/blink/public/web/WebViewModeEnums.h" namespace content { class RenderFrameHost; @@ -451,9 +451,9 @@ class EWebView { void QuotaRequestReply(const _Ewk_Quota_Permission_Request* request, bool allow); void QuotaRequestCancel(const _Ewk_Quota_Permission_Request* request); - +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup void SetViewMode(blink::WebViewMode view_mode); - +#endif gfx::Point GetContextMenuPosition() const; content::ContextMenuControllerEfl* GetContextMenuController() { diff --git a/tizen_src/ewk/efl_integration/ewk_global_data.cc b/tizen_src/ewk/efl_integration/ewk_global_data.cc index e3842d6..1512c33 100644 --- a/tizen_src/ewk/efl_integration/ewk_global_data.cc +++ b/tizen_src/ewk/efl_integration/ewk_global_data.cc @@ -15,12 +15,11 @@ #include "content/public/browser/browser_main_runner.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/render_process_host.h" -#include "content/public/browser/utility_process_host.h" +#include "content/browser/utility_process_host.h" #include "content/public/common/content_switches.h" #include "content/public/app/content_main.h" #include "content/renderer/in_process_renderer_thread.h" #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 "efl/window_factory.h" #include "eweb_view.h" @@ -144,7 +143,7 @@ EwkGlobalData* EwkGlobalData::GetInstance() { if (base::CommandLine::ForCurrentProcess()->HasSwitch( switches::kSingleProcess)) { - content::UtilityProcessHostImpl::RegisterUtilityMainThreadFactory( + content::UtilityProcessHost::RegisterUtilityMainThreadFactory( content::CreateInProcessUtilityThread); content::RenderProcessHostImpl::RegisterRendererMainThreadFactory( content::CreateInProcessRendererThread); diff --git a/tizen_src/ewk/efl_integration/network_delegate_efl.cc b/tizen_src/ewk/efl_integration/network_delegate_efl.cc index 94d7825..3d79355 100644 --- a/tizen_src/ewk/efl_integration/network_delegate_efl.cc +++ b/tizen_src/ewk/efl_integration/network_delegate_efl.cc @@ -31,11 +31,11 @@ bool NetworkDelegateEfl::OnCanGetCookies(const URLRequest& request, } bool NetworkDelegateEfl::OnCanSetCookie(const URLRequest& request, - const std::string& cookie_line, + const net::CanonicalCookie& cookie, CookieOptions* options) { if (!cookie_manager_.get()) return false; - return cookie_manager_->OnCanSetCookie(request, cookie_line, options); + return cookie_manager_->OnCanSetCookie(request,std::string(), options); } bool NetworkDelegateEfl::OnCanAccessFile( diff --git a/tizen_src/ewk/efl_integration/network_delegate_efl.h b/tizen_src/ewk/efl_integration/network_delegate_efl.h index 82e43b2..3e411f9 100644 --- a/tizen_src/ewk/efl_integration/network_delegate_efl.h +++ b/tizen_src/ewk/efl_integration/network_delegate_efl.h @@ -26,7 +26,7 @@ class NetworkDelegateEfl : public NetworkDelegateImpl { bool OnCanGetCookies(const URLRequest& request, const CookieList& cookie_list) override; bool OnCanSetCookie(const URLRequest& request, - const std::string& cookie_line, + const net::CanonicalCookie& cookie, CookieOptions* options) override; bool OnCanAccessFile(const URLRequest& request, const base::FilePath& original_path, 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 f0de2dc..293cb28 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 @@ -81,7 +81,7 @@ void* _Ewk_Hit_Test::GetImageBuffer() const { } size_t _Ewk_Hit_Test::GetImageBufferLength() const { - return imageData.imageBitmap.getSize(); + return imageData.imageBitmap.computeByteSize(); } const char* _Ewk_Hit_Test::GetNodeTagName() const { diff --git a/tizen_src/ewk/efl_integration/private/ewk_object_private.h b/tizen_src/ewk/efl_integration/private/ewk_object_private.h index ec1ceda..b41ec11 100644 --- a/tizen_src/ewk/efl_integration/private/ewk_object_private.h +++ b/tizen_src/ewk/efl_integration/private/ewk_object_private.h @@ -5,7 +5,7 @@ #ifndef ewk_object_private_h #define ewk_object_private_h -#include +#include class EwkObject : public RefCounted { public: 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 718cfc6..b3fdacb 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 @@ -11,7 +11,7 @@ #include "eweb_view.h" #include "net/http/http_response_headers.h" #include "private/ewk_frame_private.h" -#include "third_party/WebKit/common/mime_util/mime_util.h" +#include "third_party/blink/public/common/mime_util/mime_util.h" using content::BrowserThread; using content::RenderFrameHost; diff --git a/tizen_src/ewk/efl_integration/public/ewk_settings.cc b/tizen_src/ewk/efl_integration/public/ewk_settings.cc index 98d20b0..af4a4e4 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_settings.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_settings.cc @@ -22,12 +22,12 @@ void ewkUpdateWebkitPreferences(Evas_Object *ewkView) bool autoSelectWord = ewk_settings_select_word_automatically_get(impl->GetSettings()); // TODO(sns.park) : remove dependency to chromium internals if(autoSelectWord){ -#if !defined(EWK_BRINGUP) +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup ui::GestureConfiguration::set_double_tap_to_zoom_enabled(false); #endif } else{ -#if !defined(EWK_BRINGUP) +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup ui::GestureConfiguration::set_double_tap_to_zoom_enabled(true); #endif } @@ -38,7 +38,7 @@ void ewkUpdateWebkitPreferences(Evas_Object *ewkView) Eina_Bool ewk_settings_fullscreen_enabled_set(Ewk_Settings* settings, Eina_Bool enable) { -#if !defined(EWK_BRINGUP) +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup #pragma message "[M38] fullscreen_enabled flag has been deleted from webpreference.h" EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); settings->getPreferences().fullscreen_enabled = enable; @@ -51,7 +51,7 @@ Eina_Bool ewk_settings_fullscreen_enabled_set(Ewk_Settings* settings, Eina_Bool Eina_Bool ewk_settings_fullscreen_enabled_get(const Ewk_Settings* settings) { -#if !defined(EWK_BRINGUP) +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup #pragma message "[M38] fullscreen_enabled flag has been deleted from webpreference.h" EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); return settings->getPreferences().fullscreen_enabled; @@ -120,7 +120,7 @@ Eina_Bool ewk_settings_auto_fitting_get(const Ewk_Settings* settings) Eina_Bool ewk_settings_force_zoom_set(Ewk_Settings* settings, Eina_Bool enable) { EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); -#if !defined(EWK_BRINGUP) +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup settings->getPreferences().force_enable_zoom = enable; #endif ewkUpdateWebkitPreferences(settings->getEvasObject()); @@ -130,7 +130,7 @@ Eina_Bool ewk_settings_force_zoom_set(Ewk_Settings* settings, Eina_Bool enable) Eina_Bool ewk_settings_force_zoom_get(const Ewk_Settings* settings) { EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); -#if !defined(EWK_BRINGUP) +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup return settings->getPreferences().force_enable_zoom; #else return false; @@ -212,7 +212,7 @@ Eina_Bool ewk_settings_private_browsing_enabled_get(const Ewk_Settings* settings Eina_Bool ewk_settings_editable_link_behavior_set(Ewk_Settings* settings, Ewk_Editable_Link_Behavior behavior) { EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); -#if !defined(EWK_BRINGUP) +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup settings->getPreferences().editable_link_behavior = static_cast(behavior); #endif ewkUpdateWebkitPreferences(settings->getEvasObject()); @@ -293,7 +293,7 @@ Eina_Bool ewk_settings_link_effect_enabled_get(const Ewk_Settings* settings) Eina_Bool ewk_settings_uses_encoding_detector_set(Ewk_Settings* settings, Eina_Bool use) { EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); -#if !defined(EWK_BRINGUP) +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup settings->getPreferences().uses_encoding_detector = use; #endif ewkUpdateWebkitPreferences(settings->getEvasObject()); @@ -303,7 +303,7 @@ Eina_Bool ewk_settings_uses_encoding_detector_set(Ewk_Settings* settings, Eina_B Eina_Bool ewk_settings_uses_encoding_detector_get(const Ewk_Settings* settings) { EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); -#if !defined(EWK_BRINGUP) +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup return settings->getPreferences().uses_encoding_detector; #else return false; @@ -534,14 +534,20 @@ Eina_Bool ewk_settings_select_word_automatically_get(const Ewk_Settings* setting Ewk_List_Style_Position ewk_settings_initial_list_style_position_get(const Ewk_Settings* settings) { +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup EINA_SAFETY_ON_NULL_RETURN_VAL(settings, EWK_LIST_STYLE_POSITION_OUTSIDE); return static_cast(settings->getPreferences().initial_list_style_position); +#else + return EWK_LIST_STYLE_POSITION_OUTSIDE; +#endif } Eina_Bool ewk_settings_initial_list_style_position_set(Ewk_Settings* settings, Ewk_List_Style_Position style) { EINA_SAFETY_ON_NULL_RETURN_VAL(settings, EINA_FALSE); +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup settings->getPreferences().initial_list_style_position = static_cast(style); +#endif ewkUpdateWebkitPreferences(settings->getEvasObject()); return EINA_TRUE; } @@ -559,7 +565,7 @@ Eina_Bool ewk_settings_webkit_text_size_adjust_enabled_set(Ewk_Settings* setting void ewk_settings_detect_contents_automatically_set(Ewk_Settings* settings, Eina_Bool enable) { EINA_SAFETY_ON_NULL_RETURN(settings); -#if !defined(EWK_BRINGUP) +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup settings->setDetectContentsEnabled(enable); #endif } @@ -567,7 +573,7 @@ void ewk_settings_detect_contents_automatically_set(Ewk_Settings* settings, Eina Eina_Bool ewk_settings_detect_contents_automatically_get(const Ewk_Settings* settings) { EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); -#if !defined(EWK_BRINGUP) +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup return settings->getDetectContentsEnabled(); #else return EINA_FALSE; @@ -660,7 +666,7 @@ namespace { void Ewk_Extra_Feature_Set_ViewportQuirk(Ewk_Settings* settings, Eina_Bool value) { EINA_SAFETY_ON_NULL_RETURN(settings); -#if !defined(EWK_BRINGUP) +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup settings->getPreferences().viewport_meta_non_user_scalable_quirk = value; #endif ewkUpdateWebkitPreferences(settings->getEvasObject()); @@ -668,7 +674,7 @@ namespace { Eina_Bool Ewk_Extra_Feature_Get_ViewportQuirk(const Ewk_Settings* settings) { -#if !defined(EWK_BRINGUP) +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup EINA_SAFETY_ON_NULL_RETURN_VAL(settings, false); return settings->getPreferences().viewport_meta_non_user_scalable_quirk; #else diff --git a/tizen_src/ewk/efl_integration/public/ewk_view.cc b/tizen_src/ewk/efl_integration/public/ewk_view.cc index 278ba57..e53ab0b 100644 --- a/tizen_src/ewk/efl_integration/public/ewk_view.cc +++ b/tizen_src/ewk/efl_integration/public/ewk_view.cc @@ -1053,10 +1053,14 @@ Eina_Bool ewk_view_mode_set(Evas_Object* ewkView, Ewk_View_Mode view_mode) EWK_VIEW_IMPL_GET_OR_RETURN(ewkView, impl, EINA_FALSE); if (view_mode == EWK_VIEW_MODE_WINDOWED) { +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup impl->SetViewMode(blink::WebViewModeWindowed); +#endif return EINA_TRUE; } else if (view_mode == EWK_VIEW_MODE_FULLSCREEN) { +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup impl->SetViewMode(blink::WebViewModeFullscreen); +#endif return EINA_TRUE; } else { return EINA_FALSE; diff --git a/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc b/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc index 1b5cbcf..ed9feba 100644 --- a/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc +++ b/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.cc @@ -18,24 +18,26 @@ #include "content/public/renderer/render_thread.h" #include "content/public/renderer/render_view.h" #include "content/renderer/render_view_impl.h" -#include "content/child/request_extra_data.h" +#include "content/renderer/loader/request_extra_data.h" #include "renderer/editorclient_agent.h" #include "renderer/plugins/plugin_placeholder_efl.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/blink/public/platform/URLConversion.h" -#include "third_party/blink/public/platform/WebURLError.h" -#include "third_party/blink/public/platform/WebURLRequest.h" -#include "third_party/blink/public/platform/WebViewportStyle.h" -#include "third_party/blink/public/web/WebDocument.h" -#include "third_party/blink/public/web/WebDocumentLoader.h" -#include "third_party/blink/public/web/WebFrame.h" -#include "third_party/blink/public/web/WebLocalFrame.h" -#include "third_party/blink/public/web/WebSettings.h" -#include "third_party/blink/public/web/WebView.h" -#include "third_party/blink/public/web/WebLocalFrame.h" +#include "third_party/blink/public/platform/url_conversion.h" +#include "third_party/blink/public/platform/web_url_error.h" +#include "third_party/blink/public/platform/web_url_request.h" +#include "third_party/blink/public/web/web_document.h" +#include "third_party/blink/public/web/web_document_loader.h" +#include "third_party/blink/public/web/web_element.h" +#include "third_party/blink/public/web/web_element_collection.h" +#include "third_party/blink/public/web/web_frame.h" +#include "third_party/blink/public/web/web_form_element.h" +#include "third_party/blink/public/web/web_local_frame.h" +#include "third_party/blink/public/web/web_settings.h" +#include "third_party/blink/public/web/web_view.h" +#include "third_party/blink/public/platform/web_viewport_style.h" #include "url/gurl.h" #if defined(OS_TIZEN) @@ -166,18 +168,17 @@ bool ContentRendererClientEfl::OverrideCreatePlugin( return true; } -bool ContentRendererClientEfl::WillSendRequest(blink::WebLocalFrame* frame, - ui::PageTransition transition_type, - const blink::WebURL& url, - std::vector>* throttles, - GURL* new_url) { +void ContentRendererClientEfl::WillSendRequest(blink::WebLocalFrame* frame, + ui::PageTransition transition_type, + const blink::WebURL& url, + const url::Origin* initiator_origin, + GURL* new_url, + bool* attach_same_site_cookies) { if (wrt_widget_) { wrt_widget_->ParseUrl(url, *new_url); } else { *new_url = url; } - - return true; } void ContentRendererClientEfl::DidCreateScriptContext( @@ -200,13 +201,13 @@ void ContentRendererClientEfl::WillReleaseScriptContext( } bool ContentRendererClientEfl::HandleNavigation(content::RenderFrame* render_frame, - content::DocumentState* document_state, - bool render_view_was_created_by_renderer, - blink::WebFrame* frame, - const blink::WebURLRequest& request, - blink::WebNavigationType type, - blink::WebNavigationPolicy default_policy, - bool is_redirect) { + bool is_content_initiated, + bool render_view_was_created_by_renderer, + blink::WebFrame* frame, + const blink::WebURLRequest& request, + blink::WebNavigationType type, + blink::WebNavigationPolicy default_policy, + bool is_redirect) { const content::RenderView* render_view = content::RenderView::FromWebView(frame->View()); bool result = false; @@ -247,6 +248,7 @@ bool ContentRendererClientEfl::IsLinkVisited(unsigned long long link_hash) { return visited_link_slave_->IsVisited(link_hash); } +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup void ContentRendererClientEfl::GetNavigationErrorStrings( content::RenderFrame* render_frame, const blink::WebURLRequest& failed_request, @@ -307,6 +309,7 @@ void ContentRendererClientEfl::GetNavigationErrorStrings( ; } } +#endif std::unique_ptr ContentRendererClientEfl::OverrideSpeechSynthesizer( blink::WebSpeechSynthesizerClient* client) { diff --git a/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.h b/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.h index 9f6d70f..fe218b6 100644 --- a/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.h +++ b/tizen_src/ewk/efl_integration/renderer/content_renderer_client_efl.h @@ -59,19 +59,20 @@ class ContentRendererClientEfl : public content::ContentRendererClient void SetAllowPopup(bool value) { javascript_can_open_windows_ = value; } bool HandleNavigation(content::RenderFrame* render_frame, - content::DocumentState* document_state, - bool render_view_was_created_by_renderer, - blink::WebFrame* frame, - const blink::WebURLRequest& request, - blink::WebNavigationType type, - blink::WebNavigationPolicy default_policy, - bool is_redirect) override; - - bool WillSendRequest(blink::WebLocalFrame* frame, - ui::PageTransition transition_type, - const blink::WebURL& url, - std::vector>* throttles, - GURL* new_url) override; + bool is_content_initiated, + bool render_view_was_created_by_renderer, + blink::WebFrame* frame, + const blink::WebURLRequest& request, + blink::WebNavigationType type, + blink::WebNavigationPolicy default_policy, + bool is_redirect) override; + + void WillSendRequest(blink::WebLocalFrame* frame, + ui::PageTransition transition_type, + const blink::WebURL& url, + const url::Origin* initiator_origin, + GURL* new_url, + bool* attach_same_site_cookies) override; void DidCreateScriptContext( blink::WebFrame* frame, @@ -82,13 +83,14 @@ class ContentRendererClientEfl : public content::ContentRendererClient blink::WebFrame* frame, v8::Handle, int world_id); - +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup void GetNavigationErrorStrings( content::RenderFrame* render_frame, const blink::WebURLRequest& failed_request, const blink::WebURLError& error, std::string* error_html, base::string16* error_description) override; +#endif unsigned long long VisitedLinkHash(const char* canonical_url, size_t length) override; diff --git a/tizen_src/ewk/efl_integration/renderer/editorclient_agent.cc b/tizen_src/ewk/efl_integration/renderer/editorclient_agent.cc index f40f0a0..f8a6b09 100644 --- a/tizen_src/ewk/efl_integration/renderer/editorclient_agent.cc +++ b/tizen_src/ewk/efl_integration/renderer/editorclient_agent.cc @@ -6,7 +6,7 @@ #include "content/public/renderer/render_view.h" #include "common/editing_messages.h" -#include "third_party/blink/public/web/WebView.h" +#include "third_party/blink/public/web/web_view.h" namespace editing { diff --git a/tizen_src/ewk/efl_integration/renderer/plugins/plugin_placeholder_efl.cc b/tizen_src/ewk/efl_integration/renderer/plugins/plugin_placeholder_efl.cc index bfaafaa..7be4f4b 100644 --- a/tizen_src/ewk/efl_integration/renderer/plugins/plugin_placeholder_efl.cc +++ b/tizen_src/ewk/efl_integration/renderer/plugins/plugin_placeholder_efl.cc @@ -7,7 +7,7 @@ #include #include "gin/handle.h" -#include "third_party/blink/public/web/WebKit.h" +#include "third_party/blink/public/web/blink.h" gin::WrapperInfo PluginPlaceholderEfl::kWrapperInfo = {gin::kEmbedderNativeGin}; diff --git a/tizen_src/ewk/efl_integration/renderer/print_web_view_helper_efl.cc b/tizen_src/ewk/efl_integration/renderer/print_web_view_helper_efl.cc index 5cc296b..e5fdedf 100644 --- a/tizen_src/ewk/efl_integration/renderer/print_web_view_helper_efl.cc +++ b/tizen_src/ewk/efl_integration/renderer/print_web_view_helper_efl.cc @@ -15,9 +15,9 @@ #include "skia/ext/platform_canvas.h" #include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkRect.h" -#include "third_party/blink/public/web/WebPrintParams.h" -#include "third_party/blink/public/web/WebFrame.h" -#include "third_party/blink/public/web/WebView.h" +#include "third_party/blink/public/web/web_frame.h" +#include "third_party/blink/public/web/web_print_params.h" +#include "third_party/blink/public/web/web_view.h" namespace skia { typedef SkCanvas VectorCanvas; diff --git a/tizen_src/ewk/efl_integration/renderer/print_web_view_helper_efl.h b/tizen_src/ewk/efl_integration/renderer/print_web_view_helper_efl.h index 71def56..008b9a1 100644 --- a/tizen_src/ewk/efl_integration/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 "common/print_pages_params.h" -#include "third_party/blink/public/platform/WebCanvas.h" +#include "third_party/blink/public/platform/web_canvas.h" namespace content { class RenderView; diff --git a/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc b/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc index 09047d9..5b11ac1 100644 --- a/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc +++ b/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.cc @@ -21,15 +21,15 @@ #include "content/renderer/external_popup_menu.h" #include "common/render_messages_ewk.h" #include "renderer/content_renderer_client_efl.h" -#include "third_party/blink/public/platform/URLConversion.h" -#include "third_party/blink/public/platform/WebURLError.h" -#include "third_party/blink/public/platform/WebURLRequest.h" -#include "third_party/blink/public/web/WebDocument.h" -#include "third_party/blink/public/web/WebElement.h" -#include "third_party/blink/public/web/WebElementCollection.h" -#include "third_party/blink/public/web/WebFormElement.h" -#include "third_party/blink/public/web/WebLocalFrame.h" -#include "third_party/blink/public/web/WebView.h" +#include "third_party/blink/public/platform/url_conversion.h" +#include "third_party/blink/public/platform/web_url_error.h" +#include "third_party/blink/public/platform/web_url_request.h" +#include "third_party/blink/public/web/web_document.h" +#include "third_party/blink/public/web/web_element.h" +#include "third_party/blink/public/web/web_element_collection.h" +#include "third_party/blink/public/web/web_form_element.h" +#include "third_party/blink/public/web/web_local_frame.h" +#include "third_party/blink/public/web/web_view.h" #include "base/logging.h" @@ -79,7 +79,9 @@ bool RenderFrameObserverEfl::OnMessageReceived(const IPC::Message& message) { bool handled = true; IPC_BEGIN_MESSAGE_MAP(RenderFrameObserverEfl, message) IPC_MESSAGE_HANDLER(EwkFrameMsg_LoadNotFoundErrorPage, OnLoadNotFoundErrorPage) +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup IPC_MESSAGE_HANDLER(FrameMsg_SelectPopupMenuItems, OnSelectPopupMenuItems) +#endif IPC_MESSAGE_HANDLER(EwkFrameMsg_MoveToNextOrPreviousSelectElement, OnMoveToNextOrPreviousSelectElement) IPC_MESSAGE_HANDLER(EwkFrameMsg_RequestSelectCollectionInformation, OnRequestSelectCollectionInformation); IPC_MESSAGE_UNHANDLED(handled = false) @@ -90,6 +92,7 @@ bool RenderFrameObserverEfl::OnMessageReceived(const IPC::Message& message) { void RenderFrameObserverEfl::OnSelectPopupMenuItems( bool canceled, const std::vector& selected_indices) { +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup RenderFrameImpl* render_frame_impl_ = static_cast(render_frame()); ExternalPopupMenu* external_popup_menu_ = render_frame_impl_->external_popup_menu_.get(); if (external_popup_menu_ == NULL) @@ -102,9 +105,11 @@ void RenderFrameObserverEfl::OnSelectPopupMenuItems( external_popup_menu_->DidSelectItems(canceled, selected_indices); if (canceled) render_frame_impl_->DidHideExternalPopupMenu(); +#endif } void RenderFrameObserverEfl::OnLoadNotFoundErrorPage(std::string errorUrl) { +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup blink::WebLocalFrame* frame = render_frame()->GetWebFrame(); blink::WebURLError error; error.unreachable_url = GURL(errorUrl); @@ -119,14 +124,17 @@ void RenderFrameObserverEfl::OnLoadNotFoundErrorPage(std::string errorUrl) { GURL(kUnreachableWebDataURL), error.unreachable_url, replace); +#endif } void RenderFrameObserverEfl::OnMoveToNextOrPreviousSelectElement(bool direction) { +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup content::RenderView* render_view_ = render_frame()->GetRenderView(); if (direction) render_view_->GetWebView()->moveFocusToNext(WebView::TraverseFocusThrough::SelectElement); else render_view_->GetWebView()->moveFocusToPrevious(WebView::TraverseFocusThrough::SelectElement); +#endif } void RenderFrameObserverEfl::OnRequestSelectCollectionInformation() { @@ -170,8 +178,11 @@ void RenderFrameObserverEfl::DidChangeScrollOffset() { return; blink::WebLocalFrame* frame = render_frame()->GetWebFrame(); - +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup blink::WebSize contentsSize = frame->ContentsSize(); +#else + blink::WebSize contentsSize; +#endif blink::WebRect visibleContentRect = frame->VisibleContentRect(); blink::WebSize maximumScrollOffset( contentsSize.width - visibleContentRect.width, diff --git a/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.h b/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.h index bf45713..2a7c33a 100644 --- a/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.h +++ b/tizen_src/ewk/efl_integration/renderer/render_frame_observer_efl.h @@ -8,7 +8,7 @@ #include #include "content/public/renderer/render_frame_observer.h" -#include "third_party/blink/public/platform/WebSize.h" +#include "third_party/blink/public/platform/web_size.h" namespace blink { class WebElement; diff --git a/tizen_src/ewk/efl_integration/renderer/render_thread_observer_efl.cc b/tizen_src/ewk/efl_integration/renderer/render_thread_observer_efl.cc index 33f47d3..69aeea9 100644 --- a/tizen_src/ewk/efl_integration/renderer/render_thread_observer_efl.cc +++ b/tizen_src/ewk/efl_integration/renderer/render_thread_observer_efl.cc @@ -9,15 +9,15 @@ #include "common/content_switches_efl.h" #include "common/render_messages_ewk.h" #include "content/public/renderer/render_thread.h" -#include "third_party/blink/public/platform/WebCache.h" +#include "third_party/blink/public/platform/web_cache.h" #include "third_party/sqlite/sqlite3.h" #include "v8/include/v8.h" #include "renderer/content_renderer_client_efl.h" -#include "third_party/blink/public/platform/WebRuntimeFeatures.h" +#include "third_party/blink/public/platform/web_runtime_features.h" // XXX: config.h needs to be included before internal blink headers. // XXX2: It'd be great if we did not include internal blibk headers. -#include "third_party/WebKit/Source/platform/fonts/FontCache.h" +#include "third_party/blink/renderer/platform/fonts/font_cache.h" using blink::WebCache; using blink::WebRuntimeFeatures; diff --git a/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.cc b/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.cc index c6a7cf5..8ae2609 100644 --- a/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.cc +++ b/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.cc @@ -17,28 +17,28 @@ #include "content/public/renderer/content_renderer_client.h" #include "content/public/renderer/render_view.h" //#include "third_party/blink/public/platform/WebCString.h" -#include "third_party/blink/public/platform/WebData.h" +#include "third_party/blink/public/platform/web_content_security_policy.h" +#include "third_party/blink/public/platform/web_data.h" #include "third_party/blink/public/platform/web_input_event.h" -#include "third_party/blink/public/platform/WebPoint.h" -#include "third_party/blink/public/platform/WebSize.h" -#include "third_party/blink/public/platform/WebString.h" -#include "third_party/blink/public/platform/WebURLError.h" -#include "third_party/blink/public/platform/WebURLRequest.h" +#include "third_party/blink/public/platform/web_point.h" +#include "third_party/blink/public/platform/web_size.h" +#include "third_party/blink/public/platform/web_string.h" +#include "third_party/blink/public/platform/web_url_error.h" +#include "third_party/blink/public/platform/web_url_request.h" //#include "third_party/blink/public/web/WebDataSource.h" -#include "third_party/blink/public/web/WebDocument.h" -#include "third_party/blink/public/web/WebFormElement.h" -#include "third_party/blink/public/web/WebFrame.h" -#include "third_party/blink/public/web/WebFrameContentDumper.h" -#include "third_party/blink/public/web/WebFrameWidget.h" -#include "third_party/blink/public/web/WebHitTestResult.h" -#include "third_party/blink/public/web/WebLocalFrame.h" -#include "third_party/blink/public/web/WebSettings.h" -#include "third_party/blink/public/web/WebView.h" -#include "public/web/WebFrameContentDumper.h" +#include "third_party/blink/public/web/web_document.h" +#include "third_party/blink/public/web/web_form_element.h" +#include "third_party/blink/public/web/web_frame.h" +#include "third_party/blink/public/web/web_frame_widget.h" +#include "third_party/blink/public/web/web_hit_test_result.h" +#include "third_party/blink/public/web/web_local_frame.h" +#include "third_party/blink/public/web/web_settings.h" +#include "third_party/blink/public/web/web_view.h" +#include "third_party/blink/public/web/web_frame_content_dumper.h" // XXX: config.h needs to be included before internal blink headers. // It'd be great if we did not include not internal blibk headers. -#include "third_party/WebKit/Source/platform/fonts/FontCache.h" +#include "third_party/blink/renderer/platform/fonts/font_cache.h" using blink::WebDocumentLoader; using blink::WebURLRequest; @@ -93,8 +93,10 @@ void PopulateEwkHitTestData(const blink::WebHitTestResult& web_hit_test, Hit_Tes DCHECK(params); params->imageURI = web_hit_test.AbsoluteImageURL().GetString().Utf8(); params->linkURI = web_hit_test.AbsoluteLinkURL().GetString().Utf8(); +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup params->linkLabel = web_hit_test.textContent().Utf8(); params->linkTitle = web_hit_test.titleDisplayString().Utf8(); +#endif params->isEditable = web_hit_test.IsContentEditable(); int context = EWK_HIT_TEST_RESULT_CONTEXT_DOCUMENT; @@ -102,10 +104,12 @@ void PopulateEwkHitTestData(const blink::WebHitTestResult& web_hit_test, Hit_Tes context |= EWK_HIT_TEST_RESULT_CONTEXT_LINK; if (!web_hit_test.AbsoluteImageURL().IsEmpty()) context |= EWK_HIT_TEST_RESULT_CONTEXT_IMAGE; +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup if (!web_hit_test.absoluteMediaURL().IsEmpty()) context |= EWK_HIT_TEST_RESULT_CONTEXT_MEDIA; if (web_hit_test.isSelected()) context |= EWK_HIT_TEST_RESULT_CONTEXT_SELECTION; +#endif if (web_hit_test.IsContentEditable()) context |= EWK_HIT_TEST_RESULT_CONTEXT_EDITABLE; if (web_hit_test.GetNode().IsTextNode()) @@ -122,7 +126,9 @@ void PopulateEwkHitTestData(const blink::WebHitTestResult& web_hit_test, Hit_Tes blink::WebElement hit_element = web_hit_test.GetNode().ToConst(); params->imageData.imageBitmap = hit_element.ImageContents().GetSkBitmap(); +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup params->imageData.fileNameExtension = hit_element.imageFilenameExtension().Utf8(); +#endif } } @@ -177,7 +183,9 @@ bool RenderViewObserverEfl::OnMessageReceived(const IPC::Message& message) IPC_MESSAGE_HANDLER(EwkViewMsg_SuspendScheduledTask, OnSuspendScheduledTasks); IPC_MESSAGE_HANDLER(EwkViewMsg_ResumeScheduledTasks, OnResumeScheduledTasks); IPC_MESSAGE_HANDLER(EwkSettingsMsg_UpdateWebKitPreferencesEfl, OnUpdateWebKitPreferencesEfl); +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup IPC_MESSAGE_HANDLER(ViewMsg_SetViewMode, OnSetViewMode); +#endif IPC_MESSAGE_HANDLER(ViewMsg_SetTextZoomFactor, OnSetTextZoomFactor) IPC_MESSAGE_UNHANDLED(handled = false) @@ -193,10 +201,12 @@ void RenderViewObserverEfl::OnSetContentSecurityPolicy(const std::string& policy { blink::WebView* view = render_view()->GetWebView(); DCHECK(view); +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup blink::WebDocument document = view->FocusedFrame()->GetDocument(); document.setContentSecurityPolicyUsingHeader(blink::WebString::FromUTF8(policy), ToSecurityPolicyType(header_type)); +#endif } void RenderViewObserverEfl::OnScale(double scale_factor, int x, int y) @@ -246,6 +256,7 @@ void RenderViewObserverEfl::OnGetSelectionStyle() return; SelectionStylePrams params; +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup params.underline_state = frame->commandState(blink::WebString::FromUTF8("underline")); params.italic_state = frame->commandState(blink::WebString::FromUTF8("italic")); params.bold_state = frame->commandState(blink::WebString::FromUTF8("bold")); @@ -261,10 +272,8 @@ void RenderViewObserverEfl::OnGetSelectionStyle() params.text_align_left_state = frame->commandState(blink::WebString::FromUTF8("JustifyLeft")); params.text_align_right_state = frame->commandState(blink::WebString::FromUTF8("JustifyRight")); params.text_align_full_state = frame->commandState(blink::WebString::FromUTF8("JustifyFull")); -#if !defined(EWK_BRINGUP) // FIXME: m67 bringup - // FIXME: EWK_BRINGUP definition should be removed. - params.has_composition = frame->hasMarkedText(); -#endif // !defined(EWK_BRINGUP) +#endif + params.has_composition = frame->HasMarkedText(); Send(new EwkViewMsg_SelectionTextStyleState(render_view()->GetRoutingID(), params)); } @@ -334,6 +343,7 @@ void RenderViewObserverEfl::OnGetMHTMLData(int callback_id) Send(new EwkHostMsg_ReadMHTMLData(render_view()->GetRoutingID(), content_string, callback_id)); } +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup void RenderViewObserverEfl::DidChangePageScaleFactor() { blink::WebView* view = render_view()->GetWebView(); @@ -342,6 +352,7 @@ void RenderViewObserverEfl::DidChangePageScaleFactor() Send(new EwkHostMsg_DidChangePageScaleFactor(render_view()->GetRoutingID(), view->PageScaleFactor())); } +#endif void RenderViewObserverEfl::DidUpdateLayout() { @@ -359,8 +370,11 @@ void RenderViewObserverEfl::CheckContentsSize() blink::WebView* view = render_view()->GetWebView(); if (!view || !view->MainFrame()) return; - +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup gfx::Size contents_size = view->MainFrame()->ToWebLocalFrame()->ContentsSize(); +#else + gfx::Size contents_size; +#endif // Fall back to contentsPreferredMinimumSize if the mainFrame is reporting a // 0x0 size (this happens during initial load). @@ -519,25 +533,29 @@ void RenderViewObserverEfl::OnSetBrowserFont() void RenderViewObserverEfl::OnSuspendScheduledTasks() { +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup blink::WebView* view = render_view()->GetWebView(); if (view) view->suspendScheduledTasks(); +#endif } void RenderViewObserverEfl::OnResumeScheduledTasks() { +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup blink::WebView* view = render_view()->GetWebView(); if (view) view->resumeScheduledTasks(); +#endif } -void RenderViewObserverEfl::OnSetViewMode(blink::WebViewMode view_mode) { #if !defined(EWK_BRINGUP) // FIXME: m67 bringup +void RenderViewObserverEfl::OnSetViewMode(blink::WebViewMode view_mode) { blink::WebView* view = render_view()->GetWebView(); if (view) view->setViewMode(view_mode); -#endif } +#endif void RenderViewObserverEfl::OnUpdateWebKitPreferencesEfl(const WebPreferencesEfl& web_preferences_efl) { diff --git a/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.h b/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.h index d7d9ebd..f5f68e0 100644 --- a/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.h +++ b/tizen_src/ewk/efl_integration/renderer/render_view_observer_efl.h @@ -17,8 +17,8 @@ #include "private/ewk_hit_test_private.h" #include "public/ewk_hit_test.h" #include "public/ewk_view.h" -#include "third_party/blink/public/platform/WebSize.h" -#include "third_party/blink/public/web/WebViewModeEnums.h" +#include "third_party/blink/public/platform/web_size.h" +//#include "third_party/blink/public/web/WebViewModeEnums.h" namespace base { class FilePath; @@ -49,8 +49,9 @@ class RenderViewObserverEfl: public content::RenderViewObserver { bool OnMessageReceived(const IPC::Message& message) override; void OnDestruct() override; +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup virtual void DidChangePageScaleFactor() override; - +#endif //Changes in PageScaleFactorLimits are applied when layoutUpdated is called //So using this notification to update minimum and maximum page scale factor values virtual void DidUpdateLayout() override; @@ -82,7 +83,9 @@ class RenderViewObserverEfl: public content::RenderViewObserver { void HandleTap(const blink::WebGestureEvent& event); // This function sets CSS "view-mode" media feature value. +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup void OnSetViewMode(blink::WebViewMode view_mode); +#endif void OnSetTextZoomFactor(float zoom_factor); gfx::Size last_sent_contents_size_; diff --git a/tizen_src/ewk/efl_integration/url_request_context_getter_efl.cc b/tizen_src/ewk/efl_integration/url_request_context_getter_efl.cc index dba6d14..d607675 100644 --- a/tizen_src/ewk/efl_integration/url_request_context_getter_efl.cc +++ b/tizen_src/ewk/efl_integration/url_request_context_getter_efl.cc @@ -10,8 +10,7 @@ #include "base/files/file_util.h" #include "base/memory/ptr_util.h" #include "base/strings/string_number_conversions.h" -#include "base/threading/sequenced_worker_pool.h" -#include "chrome/common/chrome_switches.h" +//#include "base/threading/sequenced_worker_pool.h" #include "content/public/browser/cookie_store_factory.h" #include "content/public/common/content_switches.h" #include "content/public/common/url_constants.h" @@ -26,7 +25,7 @@ #include "net/http/http_auth_handler_factory.h" #include "net/http/http_cache.h" #include "net/http/http_server_properties_impl.h" -#include "net/proxy/proxy_service.h" +#include "net/proxy_resolution/proxy_resolution_service.h" #include "net/ssl/channel_id_service.h" #include "net/ssl/default_channel_id_store.h" #include "net/ssl/ssl_config_service_defaults.h" @@ -81,7 +80,7 @@ URLRequestContextGetterEfl::URLRequestContextGetterEfl( std::swap(protocol_handlers_, *protocol_handlers); proxy_config_service_ = - net::ProxyService::CreateSystemProxyConfigService(io_task_runner); + net::ProxyResolutionService::CreateSystemProxyConfigService(io_task_runner); } URLRequestContextGetterEfl::~URLRequestContextGetterEfl() {} @@ -124,8 +123,8 @@ net::URLRequestContext* URLRequestContextGetterEfl::GetURLRequestContext() { base::WrapUnique(new net::CTPolicyEnforcer)); // TODO(jam): use v8 if possible, look at chrome code. - storage_->set_proxy_service( - net::ProxyService::CreateUsingSystemProxyResolver( + storage_->set_proxy_resolution_service( + net::ProxyResolutionService::CreateUsingSystemProxyResolver( std::move(proxy_config_service_), url_request_context_->net_log())); storage_->set_ssl_config_service(new net::SSLConfigServiceDefaults); @@ -164,8 +163,8 @@ net::URLRequestContext* URLRequestContextGetterEfl::GetURLRequestContext() { network_session_context.net_log = url_request_context_->net_log(); network_session_context.host_resolver = url_request_context_->host_resolver(); - network_session_context.proxy_service = - url_request_context_->proxy_service(); + network_session_context.proxy_resolution_service = + url_request_context_->proxy_resolution_service(); network_session_context.http_server_properties = url_request_context_->http_server_properties(); @@ -186,6 +185,7 @@ net::URLRequestContext* URLRequestContextGetterEfl::GetURLRequestContext() { &value); network_session_params.testing_fixed_https_port = value; } +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup if (command_line.HasSwitch(switches::kHostResolverRules)) { std::unique_ptr mapped_host_resolver( new net::MappedHostResolver(std::move(host_resolver))); @@ -193,7 +193,7 @@ net::URLRequestContext* URLRequestContextGetterEfl::GetURLRequestContext() { command_line.GetSwitchValueASCII(switches::kHostResolverRules)); host_resolver = std::move(mapped_host_resolver); } - +#endif // Give |storage_| ownership at the end in case it's |mapped_host_resolver|. storage_->set_host_resolver(std::move(host_resolver)); @@ -287,7 +287,11 @@ void URLRequestContextGetterEfl::CreateSQLitePersistentCookieStore( const base::FilePath& cookie_path = path.AppendASCII("Cookies"); persistent_store = new net::SQLitePersistentCookieStore( cookie_path, BrowserThread::GetTaskRunnerForThread(BrowserThread::IO), +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup BrowserThread::GetTaskRunnerForThread(BrowserThread::DB), +#else + BrowserThread::GetTaskRunnerForThread(BrowserThread::UI), +#endif persist_session_cookies, NULL); } else { NOTREACHED() << "The cookie storage directory could not be created"; @@ -321,7 +325,7 @@ void URLRequestContextGetterEfl::CreatePersistentCookieStore( CookieStoreConfig config( cookie_store_path_.Append(FILE_PATH_LITERAL("Cookies")), - CookieStoreConfig::RESTORED_SESSION_COOKIES, NULL); + false, false, nullptr); cookie_store_ = CreateCookieStore(config); net::CookieMonster* cookie_monster = static_cast(cookie_store_.get()); diff --git a/tizen_src/ewk/efl_integration/url_request_context_getter_efl.h b/tizen_src/ewk/efl_integration/url_request_context_getter_efl.h index 8cd23b5..66fcd82 100644 --- a/tizen_src/ewk/efl_integration/url_request_context_getter_efl.h +++ b/tizen_src/ewk/efl_integration/url_request_context_getter_efl.h @@ -11,9 +11,9 @@ #include "content/public/browser/browser_thread.h" #include "content/public/browser/content_browser_client.h" #include "net/base/network_delegate.h" +#include "net/proxy_resolution/proxy_config_service.h" #include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_context_storage.h" -#include "net/proxy/proxy_config_service.h" #include "net/url_request/url_request_job_factory_impl.h" #include "public/ewk_cookie_manager.h" @@ -30,7 +30,7 @@ class URLRequestContextGetterEfl : public net::URLRequestContextGetter { bool ignore_certificate_errors = false, const base::FilePath& base_path = base::FilePath(), const scoped_refptr &io_task_runner = BrowserThread::GetTaskRunnerForThread(BrowserThread::IO), - const scoped_refptr &file_task_runner = BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), + const scoped_refptr &file_task_runner = BrowserThread::GetTaskRunnerForThread(BrowserThread::UI), ProtocolHandlerMap* protocol_handlers = NULL, URLRequestInterceptorScopedVector request_interceptors = URLRequestInterceptorScopedVector(), net::NetLog* net_log = NULL); diff --git a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc index 10ca641..d10b003 100644 --- a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc +++ b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc @@ -63,7 +63,9 @@ namespace content { void WritePdfDataToFile(printing::PdfMetafileSkia* metafile, const base::FilePath& filename) { +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); +#endif DCHECK(metafile); base::File file(filename, base::File::FLAG_CREATE_ALWAYS | base::File::FLAG_WRITE); @@ -589,14 +591,16 @@ void WebContentsDelegateEfl::OnPrintedMetafileReceived( } std::unique_ptr metafile( - new printing::PdfMetafileSkia(printing::SkiaDocumentType::PDF)); + new printing::PdfMetafileSkia()); if (!metafile->InitFromData(shared_buf.memory(), params.data_size)) { NOTREACHED() << "Invalid metafile header"; return; } +#if !defined(EWK_BRINGUP) // FIXME: m67 bringup BrowserThread::PostTask( BrowserThread::FILE, FROM_HERE, base::Bind(&WritePdfDataToFile, metafile.release(), params.filename)); +#endif } void WebContentsDelegateEfl::NavigationEntryCommitted( @@ -639,7 +643,7 @@ void WebContentsDelegateEfl::RunFileChooser(RenderFrameHost* render_frame_host, content::ColorChooser* WebContentsDelegateEfl::OpenColorChooser( WebContents* web_contents, SkColor color, - const std::vector& suggestions) { + const std::vector& suggestions) { ColorChooserEfl* color_chooser_efl = new ColorChooserEfl(*web_contents); web_view_->RequestColorPicker(SkColorGetR(color), SkColorGetG(color), SkColorGetB(color), SkColorGetA(color)); diff --git a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h index 6da6fb8..be14902 100644 --- a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h +++ b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.h @@ -129,14 +129,14 @@ class WebContentsDelegateEfl : public WebContentsDelegate, ColorChooser* OpenColorChooser( WebContents* web_contents, SkColor color, - const std::vector& suggestions) override; + const std::vector& suggestions) override; void OpenDateTimeDialog( ui::TextInputType dialog_type, double dialog_value, double min, double max, double step, - const std::vector& suggestions) override; + const std::vector& suggestions); bool PreHandleGestureEvent(WebContents* source, const blink::WebGestureEvent& event) override; diff --git a/tizen_src/ewk/efl_integration/wrt/wrt_file_protocol_handler.cc b/tizen_src/ewk/efl_integration/wrt/wrt_file_protocol_handler.cc index 18dba6f..a975987 100644 --- a/tizen_src/ewk/efl_integration/wrt/wrt_file_protocol_handler.cc +++ b/tizen_src/ewk/efl_integration/wrt/wrt_file_protocol_handler.cc @@ -8,7 +8,7 @@ #include "base/files/file_path.h" #include "base/memory/weak_ptr.h" -#include "base/threading/sequenced_worker_pool.h" +//#include "base/threading/sequenced_worker_pool.h" #include "content/public/browser/browser_thread.h" #include "net/base/filename_util.h" #include "net/base/net_errors.h" diff --git a/ui/base/cursor/ozone/bitmap_cursor_factory_ozone.cc b/ui/base/cursor/ozone/bitmap_cursor_factory_ozone.cc index 16afd6d..00a8420 100644 --- a/ui/base/cursor/ozone/bitmap_cursor_factory_ozone.cc +++ b/ui/base/cursor/ozone/bitmap_cursor_factory_ozone.cc @@ -21,11 +21,15 @@ PlatformCursor ToPlatformCursor(BitmapCursorOzone* cursor) { } scoped_refptr CreateDefaultBitmapCursor(CursorType type) { +#if defined(USE_EFL) + return NULL; +#else SkBitmap bitmap; gfx::Point hotspot; if (GetCursorBitmap(type, &bitmap, &hotspot)) return new BitmapCursorOzone(bitmap, hotspot); return NULL; +#endif } } // namespace -- 2.7.4