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

Side by Side Diff: services/ui/surfaces/display_compositor.h

Issue 2673823002: display compositor: Fix a use-after-free when a frame sink is destroyed. (Closed)
Patch Set: Created 3 years, 10 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 SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_ 5 #ifndef SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_
6 #define SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_ 6 #define SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_
7 7
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 void CreateCompositorFrameSinkInternal( 92 void CreateCompositorFrameSinkInternal(
93 const cc::FrameSinkId& frame_sink_id, 93 const cc::FrameSinkId& frame_sink_id,
94 gpu::SurfaceHandle surface_handle, 94 gpu::SurfaceHandle surface_handle,
95 std::unique_ptr<cc::Display> display, 95 std::unique_ptr<cc::Display> display,
96 std::unique_ptr<cc::SyntheticBeginFrameSource> begin_frame_source, 96 std::unique_ptr<cc::SyntheticBeginFrameSource> begin_frame_source,
97 cc::mojom::MojoCompositorFrameSinkRequest request, 97 cc::mojom::MojoCompositorFrameSinkRequest request,
98 cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request, 98 cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request,
99 cc::mojom::MojoCompositorFrameSinkClientPtr client, 99 cc::mojom::MojoCompositorFrameSinkClientPtr client,
100 cc::mojom::DisplayPrivateRequest display_private_request); 100 cc::mojom::DisplayPrivateRequest display_private_request);
101 101
102 void DestroyCompositorFrameSink(const cc::FrameSinkId& frame_sink_id);
103
102 // cc::SurfaceObserver implementation. 104 // cc::SurfaceObserver implementation.
103 void OnSurfaceCreated(const cc::SurfaceInfo& surface_info) override; 105 void OnSurfaceCreated(const cc::SurfaceInfo& surface_info) override;
104 void OnSurfaceDamaged(const cc::SurfaceId& surface_id, 106 void OnSurfaceDamaged(const cc::SurfaceId& surface_id,
105 bool* changed) override; 107 bool* changed) override;
106 108
107 // SurfaceManager should be the first object constructed and the last object 109 // SurfaceManager should be the first object constructed and the last object
108 // destroyed in order to ensure that all other objects that depend on it have 110 // destroyed in order to ensure that all other objects that depend on it have
109 // access to a valid pointer for the entirety of their liftimes. 111 // access to a valid pointer for the entirety of their liftimes.
110 cc::SurfaceManager manager_; 112 cc::SurfaceManager manager_;
111 113
(...skipping 13 matching lines...) Expand all
125 127
126 cc::mojom::DisplayCompositorClientPtr client_; 128 cc::mojom::DisplayCompositorClientPtr client_;
127 mojo::Binding<cc::mojom::DisplayCompositor> binding_; 129 mojo::Binding<cc::mojom::DisplayCompositor> binding_;
128 130
129 DISALLOW_COPY_AND_ASSIGN(DisplayCompositor); 131 DISALLOW_COPY_AND_ASSIGN(DisplayCompositor);
130 }; 132 };
131 133
132 } // namespace ui 134 } // namespace ui
133 135
134 #endif // SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_ 136 #endif // SERVICES_UI_SURFACES_DISPLAY_COMPOSITOR_H_
OLDNEW
« no previous file with comments | « no previous file | services/ui/surfaces/display_compositor.cc » ('j') | services/ui/surfaces/display_compositor.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698