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

Side by Side Diff: content/browser/renderer_host/compositor_impl_android.h

Issue 1962493002: Make Mac swap code like other platforms (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix android build Created 4 years, 7 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_ 5 #ifndef CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
6 #define CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_ 6 #define CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <memory> 10 #include <memory>
(...skipping 20 matching lines...) Expand all
31 struct ANativeWindow; 31 struct ANativeWindow;
32 32
33 namespace cc { 33 namespace cc {
34 class Layer; 34 class Layer;
35 class LayerTreeHost; 35 class LayerTreeHost;
36 class OnscreenDisplayClient; 36 class OnscreenDisplayClient;
37 class SurfaceIdAllocator; 37 class SurfaceIdAllocator;
38 class SurfaceManager; 38 class SurfaceManager;
39 } 39 }
40 40
41 namespace gpu {
42 struct GpuProcessHostedCALayerTreeParamsMac;
43 }
piman 2016/05/09 16:23:59 nit: doesn't look like it's used here.
ccameron 2016/05/09 18:40:36 You're right -- it can go down into the .cc file.
44
41 namespace content { 45 namespace content {
42 class CompositorClient; 46 class CompositorClient;
43 47
44 // ----------------------------------------------------------------------------- 48 // -----------------------------------------------------------------------------
45 // Browser-side compositor that manages a tree of content and UI layers. 49 // Browser-side compositor that manages a tree of content and UI layers.
46 // ----------------------------------------------------------------------------- 50 // -----------------------------------------------------------------------------
47 class CONTENT_EXPORT CompositorImpl 51 class CONTENT_EXPORT CompositorImpl
48 : public Compositor, 52 : public Compositor,
49 public cc::LayerTreeHostClient, 53 public cc::LayerTreeHostClient,
50 public cc::LayerTreeHostSingleThreadClient, 54 public cc::LayerTreeHostSingleThreadClient,
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 gpu::Capabilities gpu_capabilities_; 172 gpu::Capabilities gpu_capabilities_;
169 bool needs_begin_frames_; 173 bool needs_begin_frames_;
170 base::WeakPtrFactory<CompositorImpl> weak_factory_; 174 base::WeakPtrFactory<CompositorImpl> weak_factory_;
171 175
172 DISALLOW_COPY_AND_ASSIGN(CompositorImpl); 176 DISALLOW_COPY_AND_ASSIGN(CompositorImpl);
173 }; 177 };
174 178
175 } // namespace content 179 } // namespace content
176 180
177 #endif // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_ 181 #endif // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698