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/content_browser_client_qt.cpp | |
| parent | 817c117cf89f15e1877107597c8daeff956fd1a6 (diff) | |
Adaptations for Chromium 56
Change-Id: I78240d7956de4716757761fc6517f031b4adb822
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'src/core/content_browser_client_qt.cpp')
| -rw-r--r-- | src/core/content_browser_client_qt.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/core/content_browser_client_qt.cpp b/src/core/content_browser_client_qt.cpp index f031da904..8dbfc8ab2 100644 --- a/src/core/content_browser_client_qt.cpp +++ b/src/core/content_browser_client_qt.cpp @@ -85,9 +85,10 @@ #include "device/geolocation/location_provider.h" #endif #include "media_capture_devices_dispatcher.h" -#if defined(ENABLE_BASIC_PRINTING) +#include "printing/features/features.h" +#if BUILDFLAG(ENABLE_BASIC_PRINTING) #include "printing_message_filter_qt.h" -#endif // defined(ENABLE_BASIC_PRINTING) +#endif // BUILDFLAG(ENABLE_BASIC_PRINTING) #include "qrc_protocol_handler_qt.h" #include "renderer_host/resource_dispatcher_host_delegate_qt.h" #include "renderer_host/user_resource_controller_host.h" @@ -331,7 +332,7 @@ public: virtual bool WasAllocatedUsingRobustnessExtension() { return false; } // We don't care about the rest, this context shouldn't be used except for its handle. - virtual bool Initialize(gl::GLSurface *, gl::GpuPreference) Q_DECL_OVERRIDE { Q_UNREACHABLE(); return false; } + virtual bool Initialize(gl::GLSurface *, const gl::GLContextAttribs &) Q_DECL_OVERRIDE { Q_UNREACHABLE(); return false; } virtual bool MakeCurrent(gl::GLSurface *) Q_DECL_OVERRIDE { Q_UNREACHABLE(); return false; } virtual void ReleaseCurrent(gl::GLSurface *) Q_DECL_OVERRIDE { Q_UNREACHABLE(); } virtual bool IsCurrent(gl::GLSurface *) Q_DECL_OVERRIDE { Q_UNREACHABLE(); return false; } @@ -415,9 +416,9 @@ void ContentBrowserClientQt::RenderProcessWillLaunch(content::RenderProcessHost* #if defined(Q_OS_MACOS) && defined(ENABLE_SPELLCHECK) && defined(USE_BROWSER_SPELLCHECKER) host->AddFilter(new SpellCheckMessageFilterPlatform(id)); #endif -#if defined(ENABLE_BASIC_PRINTING) +#if BUILDFLAG(ENABLE_BASIC_PRINTING) host->AddFilter(new PrintingMessageFilterQt(host->GetID())); -#endif // defined(ENABLE_BASIC_PRINTING) +#endif // BUILDFLAG(ENABLE_BASIC_PRINTING) } void ContentBrowserClientQt::ResourceDispatcherHostCreated() |