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

Side by Side Diff: content/browser/compositor/offscreen_browser_compositor_output_surface.h

Issue 1874893002: Convert //content/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 CONTENT_BROWSER_COMPOSITOR_OFFSCREEN_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H _ 5 #ifndef CONTENT_BROWSER_COMPOSITOR_OFFSCREEN_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H _
6 #define CONTENT_BROWSER_COMPOSITOR_OFFSCREEN_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H _ 6 #define CONTENT_BROWSER_COMPOSITOR_OFFSCREEN_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H _
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory>
11
10 #include "base/cancelable_callback.h" 12 #include "base/cancelable_callback.h"
11 #include "base/macros.h" 13 #include "base/macros.h"
12 #include "base/memory/scoped_ptr.h"
13 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
14 #include "build/build_config.h" 15 #include "build/build_config.h"
15 #include "content/browser/compositor/browser_compositor_output_surface.h" 16 #include "content/browser/compositor/browser_compositor_output_surface.h"
16 17
17 namespace ui { 18 namespace ui {
18 class CompositorVSyncManager; 19 class CompositorVSyncManager;
19 } 20 }
20 21
21 namespace content { 22 namespace content {
22 class CommandBufferProxyImpl; 23 class CommandBufferProxyImpl;
23 class ReflectorTexture; 24 class ReflectorTexture;
24 25
25 class OffscreenBrowserCompositorOutputSurface 26 class OffscreenBrowserCompositorOutputSurface
26 : public BrowserCompositorOutputSurface { 27 : public BrowserCompositorOutputSurface {
27 public: 28 public:
28 OffscreenBrowserCompositorOutputSurface( 29 OffscreenBrowserCompositorOutputSurface(
29 const scoped_refptr<ContextProviderCommandBuffer>& context, 30 const scoped_refptr<ContextProviderCommandBuffer>& context,
30 const scoped_refptr<ContextProviderCommandBuffer>& worker_context, 31 const scoped_refptr<ContextProviderCommandBuffer>& worker_context,
31 const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager, 32 const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager,
32 scoped_ptr<BrowserCompositorOverlayCandidateValidator> 33 std::unique_ptr<BrowserCompositorOverlayCandidateValidator>
33 overlay_candidate_validator); 34 overlay_candidate_validator);
34 35
35 ~OffscreenBrowserCompositorOutputSurface() override; 36 ~OffscreenBrowserCompositorOutputSurface() override;
36 37
37 protected: 38 protected:
38 // cc::OutputSurface: 39 // cc::OutputSurface:
39 void EnsureBackbuffer() override; 40 void EnsureBackbuffer() override;
40 void DiscardBackbuffer() override; 41 void DiscardBackbuffer() override;
41 void Reshape(const gfx::Size& size, float scale_factor, bool alpha) override; 42 void Reshape(const gfx::Size& size, float scale_factor, bool alpha) override;
42 void BindFramebuffer() override; 43 void BindFramebuffer() override;
43 void SwapBuffers(cc::CompositorFrame* frame) override; 44 void SwapBuffers(cc::CompositorFrame* frame) override;
44 45
45 // BrowserCompositorOutputSurface 46 // BrowserCompositorOutputSurface
46 void OnReflectorChanged() override; 47 void OnReflectorChanged() override;
47 base::Closure CreateCompositionStartedCallback() override; 48 base::Closure CreateCompositionStartedCallback() override;
48 void OnGpuSwapBuffersCompleted( 49 void OnGpuSwapBuffersCompleted(
49 const std::vector<ui::LatencyInfo>& latency_info, 50 const std::vector<ui::LatencyInfo>& latency_info,
50 gfx::SwapResult result) override{}; 51 gfx::SwapResult result) override{};
51 #if defined(OS_MACOSX) 52 #if defined(OS_MACOSX)
52 void SetSurfaceSuspendedForRecycle(bool suspended) override {}; 53 void SetSurfaceSuspendedForRecycle(bool suspended) override {};
53 bool SurfaceShouldNotShowFramesAfterSuspendForRecycle() const override; 54 bool SurfaceShouldNotShowFramesAfterSuspendForRecycle() const override;
54 #endif 55 #endif
55 56
56 uint32_t fbo_; 57 uint32_t fbo_;
57 bool is_backbuffer_discarded_; 58 bool is_backbuffer_discarded_;
58 scoped_ptr<ReflectorTexture> reflector_texture_; 59 std::unique_ptr<ReflectorTexture> reflector_texture_;
59 60
60 base::WeakPtrFactory<OffscreenBrowserCompositorOutputSurface> 61 base::WeakPtrFactory<OffscreenBrowserCompositorOutputSurface>
61 weak_ptr_factory_; 62 weak_ptr_factory_;
62 63
63 private: 64 private:
64 DISALLOW_COPY_AND_ASSIGN(OffscreenBrowserCompositorOutputSurface); 65 DISALLOW_COPY_AND_ASSIGN(OffscreenBrowserCompositorOutputSurface);
65 }; 66 };
66 67
67 } // namespace content 68 } // namespace content
68 69
69 #endif // CONTENT_BROWSER_COMPOSITOR_OFFSCREEN_BROWSER_COMPOSITOR_OUTPUT_SURFAC E_H_ 70 #endif // CONTENT_BROWSER_COMPOSITOR_OFFSCREEN_BROWSER_COMPOSITOR_OUTPUT_SURFAC E_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698