services/surfaces/surfaces_impl.h - Issue 920063002: Fix surface crash.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: services/surfaces/surfaces_impl.h

Issue 920063002: Fix surface crash. (Closed) Base URL: https://github.com/domokit/mojo.git@background_crash_takes3

Patch Set: Delete display instead of resetting the id. Created 5 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

« no previous file with comments | « no previous file | services/surfaces/surfaces_impl.cc » ('j') | no next file with comments »

OLD	NEW
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 SERVICES_SURFACES_SURFACES_IMPL_H_	5 #ifndef SERVICES_SURFACES_SURFACES_IMPL_H_

6 #define SERVICES_SURFACES_SURFACES_IMPL_H_	6 #define SERVICES_SURFACES_SURFACES_IMPL_H_

7	7

8 #include "cc/surfaces/display_client.h"	8 #include "cc/surfaces/display_client.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"

(...skipping 76 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
87 SurfacesImpl(cc::SurfaceManager* manager,	87 SurfacesImpl(cc::SurfaceManager* manager,

88 uint32_t id_namespace,	88 uint32_t id_namespace,

89 Client* client);	89 Client* client);

90	90

91 cc::SurfaceId QualifyIdentifier(uint32_t local_id);	91 cc::SurfaceId QualifyIdentifier(uint32_t local_id);

92	92

93 cc::SurfaceManager* manager_;	93 cc::SurfaceManager* manager_;

94 cc::SurfaceFactory factory_;	94 cc::SurfaceFactory factory_;

95 const uint32_t id_namespace_;	95 const uint32_t id_namespace_;

96 Client* client_;	96 Client* client_;

	97 uint32_t displayed_surface_;

97 scoped_ptr<cc::Display> display_;	98 scoped_ptr<cc::Display> display_;

98 mojo::ScopedMessagePipeHandle command_buffer_handle_;	99 mojo::ScopedMessagePipeHandle command_buffer_handle_;

99 mojo::WeakBindingSet<ViewportParameterListener> parameter_listeners_;	100 mojo::WeakBindingSet<ViewportParameterListener> parameter_listeners_;

100 mojo::ResourceReturnerPtr returner_;	101 mojo::ResourceReturnerPtr returner_;

101 mojo::StrongBinding<Surface> binding_;	102 mojo::StrongBinding<Surface> binding_;

102	103

103 DISALLOW_COPY_AND_ASSIGN(SurfacesImpl);	104 DISALLOW_COPY_AND_ASSIGN(SurfacesImpl);

104 };	105 };

105	106

106 } // namespace surfaces	107 } // namespace surfaces

107	108

108 #endif // SERVICES_SURFACES_SURFACES_IMPL_H_	109 #endif // SERVICES_SURFACES_SURFACES_IMPL_H_

OLD	NEW