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

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

Issue 929903002: Remove cc dependency from ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert changes in ui/PRESUBMIT.py 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
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 "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/cancelable_callback.h" 9 #include "base/cancelable_callback.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/memory/weak_ptr.h" 12 #include "base/memory/weak_ptr.h"
13 #include "base/timer/timer.h" 13 #include "base/timer/timer.h"
14 #include "cc/trees/layer_tree_host_client.h" 14 #include "cc/trees/layer_tree_host_client.h"
15 #include "cc/trees/layer_tree_host_single_thread_client.h" 15 #include "cc/trees/layer_tree_host_single_thread_client.h"
16 #include "content/common/content_export.h" 16 #include "content/common/content_export.h"
17 #include "content/common/gpu/client/context_provider_command_buffer.h" 17 #include "content/common/gpu/client/context_provider_command_buffer.h"
18 #include "content/public/browser/android/compositor.h" 18 #include "content/public/browser/android/compositor.h"
19 #include "gpu/command_buffer/common/capabilities.h" 19 #include "gpu/command_buffer/common/capabilities.h"
20 #include "third_party/khronos/GLES2/gl2.h" 20 #include "third_party/khronos/GLES2/gl2.h"
21 #include "ui/android/resources/resource_manager_impl.h" 21 #include "ui/android/resources/resource_manager_impl.h"
22 #include "ui/android/resources/ui_resource_provider.h" 22 #include "ui/android/resources/ui_resource_provider.h"
23 #include "ui/base/android/window_android_compositor.h" 23 #include "ui/android/window_android_compositor.h"
24 24
25 class SkBitmap; 25 class SkBitmap;
26 struct ANativeWindow; 26 struct ANativeWindow;
27 27
28 namespace cc { 28 namespace cc {
29 class Layer; 29 class Layer;
30 class LayerTreeHost; 30 class LayerTreeHost;
31 class OnscreenDisplayClient; 31 class OnscreenDisplayClient;
32 class SurfaceIdAllocator; 32 class SurfaceIdAllocator;
33 } 33 }
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after
200 bool output_surface_request_pending_; 200 bool output_surface_request_pending_;
201 201
202 base::WeakPtrFactory<CompositorImpl> weak_factory_; 202 base::WeakPtrFactory<CompositorImpl> weak_factory_;
203 203
204 DISALLOW_COPY_AND_ASSIGN(CompositorImpl); 204 DISALLOW_COPY_AND_ASSIGN(CompositorImpl);
205 }; 205 };
206 206
207 } // namespace content 207 } // namespace content
208 208
209 #endif // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_ 209 #endif // CONTENT_BROWSER_RENDERER_HOST_COMPOSITOR_IMPL_ANDROID_H_
OLDNEW
« no previous file with comments | « content/browser/power_save_blocker_android.cc ('k') | content/browser/renderer_host/compositor_impl_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698