diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-02-23 17:11:05 +0100 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-27 09:13:09 +0000 |
commit | bce063054682e590e9fa8aa9d2ec19ca26ea3d49 (patch) | |
tree | 72eafcf4e0d2c6518ffd38772f7f5758bf6a4137 /src/core/renderer | |
parent | 817c117cf89f15e1877107597c8daeff956fd1a6 (diff) |
Adaptations for Chromium 56
Change-Id: I78240d7956de4716757761fc6517f031b4adb822
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/renderer')
-rw-r--r-- | src/core/renderer/content_renderer_client_qt.cpp | 23 | ||||
-rw-r--r-- | src/core/renderer/print_web_view_helper_delegate_qt.cpp | 3 | ||||
-rw-r--r-- | src/core/renderer/print_web_view_helper_delegate_qt.h | 7 |
3 files changed, 18 insertions, 15 deletions
diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp index ee6ffe420..09d47380f 100644 --- a/src/core/renderer/content_renderer_client_qt.cpp +++ b/src/core/renderer/content_renderer_client_qt.cpp @@ -40,6 +40,7 @@ #include "renderer/content_renderer_client_qt.h" #include "common/qt_messages.h" +#include "printing/features/features.h" #include "base/strings/string_split.h" #include "base/strings/utf_string_conversions.h" @@ -50,9 +51,9 @@ #include "components/cdm/renderer/widevine_key_system_properties.h" #include "components/error_page/common/error_page_params.h" #include "components/error_page/common/localized_error.h" -#if defined (ENABLE_BASIC_PRINTING) +#if BUILDFLAG(ENABLE_BASIC_PRINTING) #include "components/printing/renderer/print_web_view_helper.h" -#endif // if defined(ENABLE_BASIC_PRINTING) +#endif // if BUILDFLAG(ENABLE_BASIC_PRINTING) #include "components/visitedlink/renderer/visitedlink_slave.h" #include "components/web_cache/renderer/web_cache_impl.h" #include "content/public/renderer/render_frame.h" @@ -67,15 +68,15 @@ #include "ui/base/webui/jstemplate_builder.h" #include "content/public/common/web_preferences.h" -#include "renderer/web_channel_ipc_transport.h" -#if defined (ENABLE_BASIC_PRINTING) +#if BUILDFLAG(ENABLE_BASIC_PRINTING) #include "renderer/print_web_view_helper_delegate_qt.h" -#endif // if defined(ENABLE_BASIC_PRINTING) +#endif // if BUILDFLAG(ENABLE_BASIC_PRINTING) #include "renderer/render_frame_observer_qt.h" #include "renderer/render_view_observer_qt.h" #include "renderer/user_resource_controller.h" -#include "services/shell/public/cpp/interface_registry.h" +#include "renderer/web_channel_ipc_transport.h" +#include "services/service_manager/public/cpp/interface_registry.h" #include "components/grit/components_resources.h" @@ -123,16 +124,16 @@ void ContentRendererClientQt::RenderViewCreated(content::RenderView* render_view new SpellCheckProvider(render_view, m_spellCheck.data()); #endif -#if defined(ENABLE_BASIC_PRINTING) - new printing::PrintWebViewHelper( - render_view, - base::WrapUnique(new PrintWebViewHelperDelegateQt())); -#endif // defined(ENABLE_BASIC_PRINTING) } void ContentRendererClientQt::RenderFrameCreated(content::RenderFrame* render_frame) { new QtWebEngineCore::RenderFrameObserverQt(render_frame); +#if BUILDFLAG(ENABLE_BASIC_PRINTING) + new printing::PrintWebViewHelper( + render_frame, + base::WrapUnique(new PrintWebViewHelperDelegateQt())); +#endif // BUILDFLAG(ENABLE_BASIC_PRINTING) } void ContentRendererClientQt::RunScriptsAtDocumentStart(content::RenderFrame* render_frame) diff --git a/src/core/renderer/print_web_view_helper_delegate_qt.cpp b/src/core/renderer/print_web_view_helper_delegate_qt.cpp index 872ab1c9a..c42972502 100644 --- a/src/core/renderer/print_web_view_helper_delegate_qt.cpp +++ b/src/core/renderer/print_web_view_helper_delegate_qt.cpp @@ -48,8 +48,7 @@ PrintWebViewHelperDelegateQt::~PrintWebViewHelperDelegateQt() } -bool PrintWebViewHelperDelegateQt::CancelPrerender(content::RenderView* render_view, - int routing_id) +bool PrintWebViewHelperDelegateQt::CancelPrerender(content::RenderFrame *) { return true; } diff --git a/src/core/renderer/print_web_view_helper_delegate_qt.h b/src/core/renderer/print_web_view_helper_delegate_qt.h index a854242ba..514e5632d 100644 --- a/src/core/renderer/print_web_view_helper_delegate_qt.h +++ b/src/core/renderer/print_web_view_helper_delegate_qt.h @@ -43,6 +43,10 @@ #include "components/printing/renderer/print_web_view_helper.h" +namespace content { +class RenderView; +} + namespace QtWebEngineCore { class PrintWebViewHelperDelegateQt : public printing::PrintWebViewHelper::Delegate @@ -50,8 +54,7 @@ class PrintWebViewHelperDelegateQt : public printing::PrintWebViewHelper::Delega public: ~PrintWebViewHelperDelegateQt() override; - bool CancelPrerender(content::RenderView* render_view, - int routing_id) override; + bool CancelPrerender(content::RenderFrame* render_frame) override; blink::WebElement GetPdfElement(blink::WebLocalFrame* frame) override; |