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

Side by Side Diff: services/native_viewport/viewport_surface.h

Issue 807733002: Split surface id and simplify connecting to surfaces service (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years 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 SERVICES_NATIVE_VIEWPORT_VIEWPORT_SURFACE_H_ 5 #ifndef SERVICES_NATIVE_VIEWPORT_VIEWPORT_SURFACE_H_
6 #define SERVICES_NATIVE_VIEWPORT_VIEWPORT_SURFACE_H_ 6 #define SERVICES_NATIVE_VIEWPORT_VIEWPORT_SURFACE_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/memory/weak_ptr.h" 9 #include "base/memory/weak_ptr.h"
10 #include "cc/surfaces/surface_id.h" 10 #include "cc/surfaces/surface_id.h"
(...skipping 22 matching lines...) Expand all
33 void SetSize(const gfx::Size& size); 33 void SetSize(const gfx::Size& size);
34 void SetChildId(cc::SurfaceId child_id); 34 void SetChildId(cc::SurfaceId child_id);
35 35
36 private: 36 private:
37 void OnSurfaceConnectionCreated(mojo::SurfacePtr surface, 37 void OnSurfaceConnectionCreated(mojo::SurfacePtr surface,
38 uint32_t id_namespace); 38 uint32_t id_namespace);
39 void BindSurfaceToNativeViewport(); 39 void BindSurfaceToNativeViewport();
40 void SubmitFrame(); 40 void SubmitFrame();
41 41
42 // SurfaceClient implementation. 42 // SurfaceClient implementation.
43 void SetIdNamespace(uint32_t id_namespace) override;
43 void ReturnResources( 44 void ReturnResources(
44 mojo::Array<mojo::ReturnedResourcePtr> resources) override; 45 mojo::Array<mojo::ReturnedResourcePtr> resources) override;
45 46
46 mojo::SurfacePtr surface_; 47 mojo::SurfacePtr surface_;
47 mojo::Gpu* gpu_service_; 48 mojo::Gpu* gpu_service_;
48 uint64_t widget_id_; 49 uint64_t widget_id_;
49 gfx::Size size_; 50 gfx::Size size_;
50 scoped_ptr<cc::SurfaceIdAllocator> id_allocator_; 51 scoped_ptr<cc::SurfaceIdAllocator> id_allocator_;
51 cc::SurfaceId id_; 52 cc::SurfaceId id_;
52 cc::SurfaceId child_id_; 53 cc::SurfaceId child_id_;
53 base::WeakPtrFactory<ViewportSurface> weak_factory_; 54 base::WeakPtrFactory<ViewportSurface> weak_factory_;
54 55
55 DISALLOW_COPY_AND_ASSIGN(ViewportSurface); 56 DISALLOW_COPY_AND_ASSIGN(ViewportSurface);
56 }; 57 };
57 58
58 } // namespace native_viewport 59 } // namespace native_viewport
59 60
60 #endif // SERVICES_NATIVE_VIEWPORT_VIEWPORT_SURFACE_H_ 61 #endif // SERVICES_NATIVE_VIEWPORT_VIEWPORT_SURFACE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698