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

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, 2 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 class OnscreenDisplayClient; 19 class OnscreenDisplayClient;
20 20
21 // This class is maps a compositor OutputSurface to the surface system's Display 21 // This class is maps a compositor OutputSurface to the surface system's Display
22 // concept, allowing a compositor client to submit frames for a native root 22 // concept, allowing a compositor client to submit frames for a native root
23 // window or physical display. 23 // window or physical display.
24 class SurfaceDisplayOutputSurface : public cc::OutputSurface, 24 class SurfaceDisplayOutputSurface : public cc::OutputSurface,
25 public cc::SurfaceFactoryClient { 25 public cc::SurfaceFactoryClient {
26 public: 26 public:
27 // The underlying cc::Display and cc::SurfaceManager must outlive this class. 27 // The underlying cc::Display and cc::SurfaceManager must outlive this class.
28 SurfaceDisplayOutputSurface( 28 SurfaceDisplayOutputSurface(
29 cc::SurfaceManager* surface_manager, 29 cc::SurfaceManager* surface_manager,
30 uint32_t surface_id_namespace, 30 cc::SurfaceIdAllocator* allocator,
31 const scoped_refptr<cc::ContextProvider>& context_provider); 31 const scoped_refptr<cc::ContextProvider>& context_provider);
32 virtual ~SurfaceDisplayOutputSurface(); 32 virtual ~SurfaceDisplayOutputSurface();
33 33
34 void set_display_client(OnscreenDisplayClient* display_client) { 34 void set_display_client(OnscreenDisplayClient* display_client) {
35 display_client_ = display_client; 35 display_client_ = display_client;
36 } 36 }
37 cc::SurfaceFactory* factory() { return &factory_; } 37 cc::SurfaceFactory* factory() { return &factory_; }
38 void ReceivedVSyncParameters(base::TimeTicks timebase, 38 void ReceivedVSyncParameters(base::TimeTicks timebase,
39 base::TimeDelta interval); 39 base::TimeDelta interval);
40 40
41 // cc::OutputSurface implementation. 41 // cc::OutputSurface implementation.
42 virtual void SwapBuffers(cc::CompositorFrame* frame) override; 42 virtual void SwapBuffers(cc::CompositorFrame* frame) override;
43 virtual bool BindToClient(cc::OutputSurfaceClient* client) override; 43 virtual bool BindToClient(cc::OutputSurfaceClient* client) override;
44 44
45 // cc::SurfaceFactoryClient implementation. 45 // cc::SurfaceFactoryClient implementation.
46 virtual void ReturnResources( 46 virtual void ReturnResources(
47 const cc::ReturnedResourceArray& resources) override; 47 const cc::ReturnedResourceArray& resources) override;
48 48
49 private: 49 private:
50 void SwapBuffersComplete(); 50 void SwapBuffersComplete();
51 51
52 OnscreenDisplayClient* display_client_; 52 OnscreenDisplayClient* display_client_;
53 cc::SurfaceManager* surface_manager_; 53 cc::SurfaceManager* surface_manager_;
54 cc::SurfaceFactory factory_; 54 cc::SurfaceFactory factory_;
55 gfx::Size display_size_; 55 gfx::Size display_size_;
56 cc::SurfaceId surface_id_; 56 cc::SurfaceId surface_id_;
57 cc::SurfaceIdAllocator allocator_; 57 cc::SurfaceIdAllocator* allocator_;
58 58
59 DISALLOW_COPY_AND_ASSIGN(SurfaceDisplayOutputSurface); 59 DISALLOW_COPY_AND_ASSIGN(SurfaceDisplayOutputSurface);
60 }; 60 };
61 61
62 } // namespace content 62 } // namespace content
63 63
64 #endif // CONTENT_BROWSER_COMPOSITOR_SURFACE_DISPLAY_OUTPUT_SURFACE_H_ 64 #endif // CONTENT_BROWSER_COMPOSITOR_SURFACE_DISPLAY_OUTPUT_SURFACE_H_
OLDNEW
« no previous file with comments | « content/browser/compositor/image_transport_factory.h ('k') | content/browser/compositor/surface_display_output_surface.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698