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

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

Issue 12472028: Part 1 of cc/ directory shuffles: base (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 | Annotate | Revision Log
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 #include "content/browser/renderer_host/compositor_impl_android.h" 5 #include "content/browser/renderer_host/compositor_impl_android.h"
6 6
7 #include <android/bitmap.h> 7 #include <android/bitmap.h>
8 #include <android/native_window_jni.h> 8 #include <android/native_window_jni.h>
9 #include <map> 9 #include <map>
10 10
11 #include "base/android/jni_android.h" 11 #include "base/android/jni_android.h"
12 #include "base/android/scoped_java_ref.h" 12 #include "base/android/scoped_java_ref.h"
13 #include "base/bind.h" 13 #include "base/bind.h"
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/lazy_instance.h" 15 #include "base/lazy_instance.h"
16 #include "base/logging.h" 16 #include "base/logging.h"
17 #include "base/synchronization/lock.h" 17 #include "base/synchronization/lock.h"
18 #include "cc/base/thread_impl.h"
18 #include "cc/context_provider.h" 19 #include "cc/context_provider.h"
19 #include "cc/input_handler.h" 20 #include "cc/input_handler.h"
20 #include "cc/layer.h" 21 #include "cc/layer.h"
21 #include "cc/layer_tree_host.h" 22 #include "cc/layer_tree_host.h"
22 #include "cc/output_surface.h" 23 #include "cc/output_surface.h"
23 #include "cc/thread_impl.h"
24 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" 24 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
25 #include "content/browser/gpu/gpu_surface_tracker.h" 25 #include "content/browser/gpu/gpu_surface_tracker.h"
26 #include "content/browser/renderer_host/image_transport_factory_android.h" 26 #include "content/browser/renderer_host/image_transport_factory_android.h"
27 #include "content/common/gpu/client/gl_helper.h" 27 #include "content/common/gpu/client/gl_helper.h"
28 #include "content/common/gpu/client/gpu_channel_host.h" 28 #include "content/common/gpu/client/gpu_channel_host.h"
29 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" 29 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
30 #include "content/common/gpu/gpu_process_launch_causes.h" 30 #include "content/common/gpu/gpu_process_launch_causes.h"
31 #include "content/public/common/content_switches.h" 31 #include "content/public/common/content_switches.h"
32 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3 D.h"
32 #include "third_party/khronos/GLES2/gl2.h" 33 #include "third_party/khronos/GLES2/gl2.h"
33 #include "third_party/khronos/GLES2/gl2ext.h" 34 #include "third_party/khronos/GLES2/gl2ext.h"
34 #include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3 D.h"
35 #include "ui/gfx/android/java_bitmap.h" 35 #include "ui/gfx/android/java_bitmap.h"
36 #include "webkit/glue/webthread_impl.h" 36 #include "webkit/glue/webthread_impl.h"
37 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h" 37 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
38 38
39 namespace gfx { 39 namespace gfx {
40 class JavaBitmap; 40 class JavaBitmap;
41 } 41 }
42 42
43 namespace { 43 namespace {
44 44
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 case ANDROID_BITMAP_FORMAT_RGBA_8888: 478 case ANDROID_BITMAP_FORMAT_RGBA_8888:
479 return GL_UNSIGNED_BYTE; 479 return GL_UNSIGNED_BYTE;
480 break; 480 break;
481 case ANDROID_BITMAP_FORMAT_RGB_565: 481 case ANDROID_BITMAP_FORMAT_RGB_565:
482 default: 482 default:
483 return GL_UNSIGNED_SHORT_5_6_5; 483 return GL_UNSIGNED_SHORT_5_6_5;
484 } 484 }
485 } 485 }
486 486
487 } // namespace content 487 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698