diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-06-18 14:10:49 +0200 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-06-18 13:53:24 +0000 |
commit | 813fbf95af77a531c57a8c497345ad2c61d475b3 (patch) | |
tree | 821b2c8de8365f21b6c9ba17a236fb3006a1d506 /chromium/content/utility/utility_thread_impl.h | |
parent | af6588f8d723931a298c995fa97259bb7f7deb55 (diff) | |
download | qtwebengine-chromium-813fbf95af77a531c57a8c497345ad2c61d475b3.tar.gz |
BASELINE: Update chromium to 44.0.2403.47
Change-Id: Ie056fedba95cf5e5c76b30c4b2c80fca4764aa2f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/content/utility/utility_thread_impl.h')
-rw-r--r-- | chromium/content/utility/utility_thread_impl.h | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/chromium/content/utility/utility_thread_impl.h b/chromium/content/utility/utility_thread_impl.h index 5b186fc21cf..3b1d66d65d4 100644 --- a/chromium/content/utility/utility_thread_impl.h +++ b/chromium/content/utility/utility_thread_impl.h @@ -10,7 +10,7 @@ #include "base/basictypes.h" #include "base/compiler_specific.h" -#include "content/child/child_thread.h" +#include "content/child/child_thread_impl.h" #include "content/common/content_export.h" #include "content/public/utility/utility_thread.h" @@ -20,23 +20,25 @@ class FilePath; namespace content { class BlinkPlatformImpl; +class UtilityBlinkPlatformImpl; + +#if defined(COMPILER_MSVC) +// See explanation for other RenderViewHostImpl which is the same issue. +#pragma warning(push) +#pragma warning(disable: 4250) +#endif // This class represents the background thread where the utility task runs. class UtilityThreadImpl : public UtilityThread, - public ChildThread { + public ChildThreadImpl { public: UtilityThreadImpl(); // Constructor that's used when running in single process mode. - explicit UtilityThreadImpl(const std::string& channel_name); + explicit UtilityThreadImpl(const InProcessChildThreadParams& params); ~UtilityThreadImpl() override; void Shutdown() override; - bool Send(IPC::Message* msg) override; void ReleaseProcessIfNeeded() override; -#if defined(OS_WIN) - virtual void PreCacheFont(const LOGFONT& log_font) override; - virtual void ReleaseCachedFonts() override; -#endif private: void Init(); @@ -55,14 +57,15 @@ class UtilityThreadImpl : public UtilityThread, // True when we're running in batch mode. bool batch_mode_; - // True if running in single process mode. - bool single_process_; - - scoped_ptr<BlinkPlatformImpl> blink_platform_impl_; + scoped_ptr<UtilityBlinkPlatformImpl> blink_platform_impl_; DISALLOW_COPY_AND_ASSIGN(UtilityThreadImpl); }; +#if defined(COMPILER_MSVC) +#pragma warning(pop) +#endif + } // namespace content #endif // CONTENT_UTILITY_UTILITY_THREAD_IMPL_H_ |