services/surfaces/surfaces_impl.cc - Issue 903273002: Update from https://crrev.com/315085

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.cc

Issue 903273002: Update from https://crrev.com/315085 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: 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 | « sandbox/linux/suid/client/setuid_sandbox_host_unittest.cc ('k') | skia/BUILD.gn » ('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 #include "services/surfaces/surfaces_impl.h"	5 #include "services/surfaces/surfaces_impl.h"

6	6

7 #include "base/debug/trace_event.h"	7 #include "base/trace_event/trace_event.h"

8 #include "cc/output/compositor_frame.h"	8 #include "cc/output/compositor_frame.h"

9 #include "cc/resources/returned_resource.h"	9 #include "cc/resources/returned_resource.h"

10 #include "cc/surfaces/display.h"	10 #include "cc/surfaces/display.h"

11 #include "cc/surfaces/surface_id_allocator.h"	11 #include "cc/surfaces/surface_id_allocator.h"

12 #include "mojo/cc/context_provider_mojo.h"	12 #include "mojo/cc/context_provider_mojo.h"

13 #include "mojo/cc/direct_output_surface.h"	13 #include "mojo/cc/direct_output_surface.h"

14 #include "mojo/converters/geometry/geometry_type_converters.h"	14 #include "mojo/converters/geometry/geometry_type_converters.h"

15 #include "mojo/converters/surfaces/surfaces_type_converters.h"	15 #include "mojo/converters/surfaces/surfaces_type_converters.h"

16	16

17 using mojo::SurfaceIdPtr;	17 using mojo::SurfaceIdPtr;

(...skipping 119 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
137 id_namespace_(id_namespace),	137 id_namespace_(id_namespace),

138 client_(client),	138 client_(client),

139 binding_(this) {	139 binding_(this) {

140 }	140 }

141	141

142 cc::SurfaceId SurfacesImpl::QualifyIdentifier(uint32_t local_id) {	142 cc::SurfaceId SurfacesImpl::QualifyIdentifier(uint32_t local_id) {

143 return cc::SurfaceId(static_cast<uint64_t>(id_namespace_) << 32 \| local_id);	143 return cc::SurfaceId(static_cast<uint64_t>(id_namespace_) << 32 \| local_id);

144 }	144 }

145	145

146 } // namespace mojo	146 } // namespace mojo

OLD	NEW