Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(697)

Side by Side Diff: cc/output/software_renderer.h

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « cc/output/software_output_device.h ('k') | cc/output/software_renderer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CC_OUTPUT_SOFTWARE_RENDERER_H_ 5 #ifndef CC_OUTPUT_SOFTWARE_RENDERER_H_
6 #define CC_OUTPUT_SOFTWARE_RENDERER_H_ 6 #define CC_OUTPUT_SOFTWARE_RENDERER_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "cc/base/cc_export.h" 9 #include "cc/base/cc_export.h"
10 #include "cc/output/compositor_frame.h" 10 #include "cc/output/compositor_frame.h"
11 #include "cc/output/direct_renderer.h" 11 #include "cc/output/direct_renderer.h"
12 12
13 namespace cc { 13 namespace cc {
14 14
15 class OutputSurface; 15 class OutputSurface;
16 class RendererClient; 16 class RendererClient;
17 class ResourceProvider; 17 class ResourceProvider;
18 class SoftwareOutputDevice; 18 class SoftwareOutputDevice;
19 19
20 class DebugBorderDrawQuad; 20 class DebugBorderDrawQuad;
21 class PictureDrawQuad; 21 class PictureDrawQuad;
22 class RenderPassDrawQuad; 22 class RenderPassDrawQuad;
23 class SolidColorDrawQuad; 23 class SolidColorDrawQuad;
24 class TextureDrawQuad; 24 class TextureDrawQuad;
25 class TileDrawQuad; 25 class TileDrawQuad;
26 26
27 class CC_EXPORT SoftwareRenderer : public DirectRenderer { 27 class CC_EXPORT SoftwareRenderer : public DirectRenderer {
28 public: 28 public:
29 static scoped_ptr<SoftwareRenderer> Create( 29 static std::unique_ptr<SoftwareRenderer> Create(
30 RendererClient* client, 30 RendererClient* client,
31 const RendererSettings* settings, 31 const RendererSettings* settings,
32 OutputSurface* output_surface, 32 OutputSurface* output_surface,
33 ResourceProvider* resource_provider); 33 ResourceProvider* resource_provider);
34 34
35 ~SoftwareRenderer() override; 35 ~SoftwareRenderer() override;
36 const RendererCapabilitiesImpl& Capabilities() const override; 36 const RendererCapabilitiesImpl& Capabilities() const override;
37 void Finish() override; 37 void Finish() override;
38 void SwapBuffers(const CompositorFrameMetadata& metadata) override; 38 void SwapBuffers(const CompositorFrameMetadata& metadata) override;
39 void DiscardBackbuffer() override; 39 void DiscardBackbuffer() override;
(...skipping 11 matching lines...) Expand all
51 void DoDrawQuad(DrawingFrame* frame, 51 void DoDrawQuad(DrawingFrame* frame,
52 const DrawQuad* quad, 52 const DrawQuad* quad,
53 const gfx::QuadF* draw_region) override; 53 const gfx::QuadF* draw_region) override;
54 void BeginDrawingFrame(DrawingFrame* frame) override; 54 void BeginDrawingFrame(DrawingFrame* frame) override;
55 void FinishDrawingFrame(DrawingFrame* frame) override; 55 void FinishDrawingFrame(DrawingFrame* frame) override;
56 bool FlippedFramebuffer(const DrawingFrame* frame) const override; 56 bool FlippedFramebuffer(const DrawingFrame* frame) const override;
57 void EnsureScissorTestEnabled() override; 57 void EnsureScissorTestEnabled() override;
58 void EnsureScissorTestDisabled() override; 58 void EnsureScissorTestDisabled() override;
59 void CopyCurrentRenderPassToBitmap( 59 void CopyCurrentRenderPassToBitmap(
60 DrawingFrame* frame, 60 DrawingFrame* frame,
61 scoped_ptr<CopyOutputRequest> request) override; 61 std::unique_ptr<CopyOutputRequest> request) override;
62 62
63 SoftwareRenderer(RendererClient* client, 63 SoftwareRenderer(RendererClient* client,
64 const RendererSettings* settings, 64 const RendererSettings* settings,
65 OutputSurface* output_surface, 65 OutputSurface* output_surface,
66 ResourceProvider* resource_provider); 66 ResourceProvider* resource_provider);
67 67
68 void DidChangeVisibility() override; 68 void DidChangeVisibility() override;
69 69
70 private: 70 private:
71 void ClearCanvas(SkColor color); 71 void ClearCanvas(SkColor color);
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 103
104 RendererCapabilitiesImpl capabilities_; 104 RendererCapabilitiesImpl capabilities_;
105 bool is_scissor_enabled_; 105 bool is_scissor_enabled_;
106 bool is_backbuffer_discarded_; 106 bool is_backbuffer_discarded_;
107 gfx::Rect scissor_rect_; 107 gfx::Rect scissor_rect_;
108 108
109 SoftwareOutputDevice* output_device_; 109 SoftwareOutputDevice* output_device_;
110 SkCanvas* root_canvas_; 110 SkCanvas* root_canvas_;
111 SkCanvas* current_canvas_; 111 SkCanvas* current_canvas_;
112 SkPaint current_paint_; 112 SkPaint current_paint_;
113 scoped_ptr<ResourceProvider::ScopedWriteLockSoftware> 113 std::unique_ptr<ResourceProvider::ScopedWriteLockSoftware>
114 current_framebuffer_lock_; 114 current_framebuffer_lock_;
115 skia::RefPtr<SkCanvas> current_framebuffer_canvas_; 115 skia::RefPtr<SkCanvas> current_framebuffer_canvas_;
116 116
117 DISALLOW_COPY_AND_ASSIGN(SoftwareRenderer); 117 DISALLOW_COPY_AND_ASSIGN(SoftwareRenderer);
118 }; 118 };
119 119
120 } // namespace cc 120 } // namespace cc
121 121
122 #endif // CC_OUTPUT_SOFTWARE_RENDERER_H_ 122 #endif // CC_OUTPUT_SOFTWARE_RENDERER_H_
OLDNEW
« no previous file with comments | « cc/output/software_output_device.h ('k') | cc/output/software_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698