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

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

Issue 553213003: Avoid destroying surface before the parent surface stops referencing it. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_SURFACE_DISPLAY_OUTPUT_SURFACE_H_ 5 #ifndef CONTENT_BROWSER_COMPOSITOR_SURFACE_DISPLAY_OUTPUT_SURFACE_H_
6 #define CONTENT_BROWSER_COMPOSITOR_SURFACE_DISPLAY_OUTPUT_SURFACE_H_ 6 #define CONTENT_BROWSER_COMPOSITOR_SURFACE_DISPLAY_OUTPUT_SURFACE_H_
7 7
8 #include "cc/output/output_surface.h" 8 #include "cc/output/output_surface.h"
9 #include "cc/surfaces/surface_factory.h" 9 #include "cc/surfaces/surface_factory.h"
10 #include "cc/surfaces/surface_factory_client.h" 10 #include "cc/surfaces/surface_factory_client.h"
11 #include "cc/surfaces/surface_id_allocator.h" 11 #include "cc/surfaces/surface_id_allocator.h"
12 12
13 namespace cc { 13 namespace cc {
14 class Display; 14 class Display;
15 class SurfaceManager; 15 class SurfaceManager;
16 } 16 }
17 17
18 namespace content { 18 namespace content {
19 19
20 // This class is maps a compositor OutputSurface to the surface system's Display 20 // This class is maps a compositor OutputSurface to the surface system's Display
21 // concept, allowing a compositor client to submit frames for a native root 21 // concept, allowing a compositor client to submit frames for a native root
22 // window or physical display. 22 // window or physical display.
23 class SurfaceDisplayOutputSurface : public cc::OutputSurface, 23 class SurfaceDisplayOutputSurface : public cc::OutputSurface,
24 public cc::SurfaceFactoryClient { 24 public cc::SurfaceFactoryClient {
25 public: 25 public:
26 // The underlying cc::Display and cc::SurfaceManager must outlive this class. 26 // The underlying cc::Display and cc::SurfaceManager must outlive this class.
27 SurfaceDisplayOutputSurface( 27 SurfaceDisplayOutputSurface(
28 cc::SurfaceManager* surface_manager, 28 cc::SurfaceManager* surface_manager,
29 uint32_t surface_id_namespace, 29 cc::SurfaceIdAllocator* allocator,
30 const scoped_refptr<cc::ContextProvider>& context_provider); 30 const scoped_refptr<cc::ContextProvider>& context_provider);
31 virtual ~SurfaceDisplayOutputSurface(); 31 virtual ~SurfaceDisplayOutputSurface();
32 32
33 void set_display(cc::Display* display) { display_ = display; } 33 void set_display(cc::Display* display) { display_ = display; }
34 cc::SurfaceFactory* factory() { return &factory_; } 34 cc::SurfaceFactory* factory() { return &factory_; }
35 35
36 // cc::OutputSurface implementation. 36 // cc::OutputSurface implementation.
37 virtual void SwapBuffers(cc::CompositorFrame* frame) OVERRIDE; 37 virtual void SwapBuffers(cc::CompositorFrame* frame) OVERRIDE;
38 38
39 // cc::SurfaceFactoryClient implementation. 39 // cc::SurfaceFactoryClient implementation.
40 virtual void ReturnResources( 40 virtual void ReturnResources(
41 const cc::ReturnedResourceArray& resources) OVERRIDE; 41 const cc::ReturnedResourceArray& resources) OVERRIDE;
42 42
43 private: 43 private:
44 void SwapBuffersComplete(); 44 void SwapBuffersComplete();
45 45
46 cc::Display* display_; 46 cc::Display* display_;
47 cc::SurfaceManager* surface_manager_; 47 cc::SurfaceManager* surface_manager_;
48 cc::SurfaceFactory factory_; 48 cc::SurfaceFactory factory_;
49 gfx::Size display_size_; 49 gfx::Size display_size_;
50 cc::SurfaceId surface_id_; 50 cc::SurfaceId surface_id_;
51 cc::SurfaceIdAllocator allocator_; 51 cc::SurfaceIdAllocator* allocator_;
52 52
53 DISALLOW_COPY_AND_ASSIGN(SurfaceDisplayOutputSurface); 53 DISALLOW_COPY_AND_ASSIGN(SurfaceDisplayOutputSurface);
54 }; 54 };
55 55
56 } // namespace content 56 } // namespace content
57 57
58 #endif // CONTENT_BROWSER_COMPOSITOR_SURFACE_DISPLAY_OUTPUT_SURFACE_H_ 58 #endif // CONTENT_BROWSER_COMPOSITOR_SURFACE_DISPLAY_OUTPUT_SURFACE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698