| Index: cc/output/output_surface.h
|
| diff --git a/cc/output/output_surface.h b/cc/output/output_surface.h
|
| index 9a3d8ce6802ebfcea3b4903fa6ac3a1cbe87957b..00dd801d87fe0bd3840cb07399104658181f0914 100644
|
| --- a/cc/output/output_surface.h
|
| +++ b/cc/output/output_surface.h
|
| @@ -99,10 +99,6 @@ class CC_EXPORT OutputSurface : public base::trace_event::MemoryDumpProvider {
|
| // OutputSurfaces.
|
| virtual void BindFramebuffer() = 0;
|
|
|
| - const gfx::ColorSpace& device_color_space() const {
|
| - return device_color_space_;
|
| - }
|
| -
|
| // Get the class capable of informing cc of hardware overlay capability.
|
| virtual OverlayCandidateValidator* GetOverlayCandidateValidator() const = 0;
|
|
|
| @@ -116,9 +112,9 @@ class CC_EXPORT OutputSurface : public base::trace_event::MemoryDumpProvider {
|
| virtual bool SurfaceIsSuspendForRecycle() const = 0;
|
|
|
| virtual void Reshape(const gfx::Size& size,
|
| - float scale_factor,
|
| + float device_scale_factor,
|
| const gfx::ColorSpace& color_space,
|
| - bool alpha);
|
| + bool has_alpha) = 0;
|
|
|
| virtual bool HasExternalStencilTest() const = 0;
|
| virtual void ApplyExternalStencil() = 0;
|
| @@ -150,11 +146,6 @@ class CC_EXPORT OutputSurface : public base::trace_event::MemoryDumpProvider {
|
| scoped_refptr<ContextProvider> context_provider_;
|
| scoped_refptr<VulkanContextProvider> vulkan_context_provider_;
|
| std::unique_ptr<SoftwareOutputDevice> software_device_;
|
| - gfx::Size surface_size_;
|
| - float device_scale_factor_ = -1;
|
| - gfx::ColorSpace device_color_space_;
|
| - bool has_alpha_ = true;
|
| - gfx::ColorSpace color_space_;
|
| base::ThreadChecker thread_checker_;
|
|
|
| private:
|
|
|