| OLD | NEW | 
|    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  | 
| (...skipping 16 matching lines...) Expand all  Loading... | 
|   27 #include "cc/trees/layer_tree_host.h" |   27 #include "cc/trees/layer_tree_host.h" | 
|   28 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" |   28 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" | 
|   29 #include "content/browser/gpu/gpu_surface_tracker.h" |   29 #include "content/browser/gpu/gpu_surface_tracker.h" | 
|   30 #include "content/common/gpu/client/command_buffer_proxy_impl.h" |   30 #include "content/common/gpu/client/command_buffer_proxy_impl.h" | 
|   31 #include "content/common/gpu/client/context_provider_command_buffer.h" |   31 #include "content/common/gpu/client/context_provider_command_buffer.h" | 
|   32 #include "content/common/gpu/client/gl_helper.h" |   32 #include "content/common/gpu/client/gl_helper.h" | 
|   33 #include "content/common/gpu/client/gpu_channel_host.h" |   33 #include "content/common/gpu/client/gpu_channel_host.h" | 
|   34 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" |   34 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h" | 
|   35 #include "content/common/gpu/gpu_process_launch_causes.h" |   35 #include "content/common/gpu/gpu_process_launch_causes.h" | 
|   36 #include "content/public/browser/android/compositor_client.h" |   36 #include "content/public/browser/android/compositor_client.h" | 
 |   37 #include "content/public/browser/android/compositor_observer.h" | 
|   37 #include "content/public/common/content_switches.h" |   38 #include "content/public/common/content_switches.h" | 
|   38 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" |   39 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h" | 
|   39 #include "third_party/khronos/GLES2/gl2.h" |   40 #include "third_party/khronos/GLES2/gl2.h" | 
|   40 #include "third_party/khronos/GLES2/gl2ext.h" |   41 #include "third_party/khronos/GLES2/gl2ext.h" | 
|   41 #include "ui/gfx/android/device_display_info.h" |   42 #include "ui/gfx/android/device_display_info.h" | 
|   42 #include "ui/gfx/android/java_bitmap.h" |   43 #include "ui/gfx/android/java_bitmap.h" | 
|   43 #include "ui/gfx/frame_time.h" |   44 #include "ui/gfx/frame_time.h" | 
|   44 #include "webkit/common/gpu/context_provider_in_process.h" |   45 #include "webkit/common/gpu/context_provider_in_process.h" | 
|   45 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.
     h" |   46 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.
     h" | 
|   46  |   47  | 
| (...skipping 427 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  474       break; |  475       break; | 
|  475     case ANDROID_BITMAP_FORMAT_RGBA_8888: |  476     case ANDROID_BITMAP_FORMAT_RGBA_8888: | 
|  476       return GL_UNSIGNED_BYTE; |  477       return GL_UNSIGNED_BYTE; | 
|  477       break; |  478       break; | 
|  478     case ANDROID_BITMAP_FORMAT_RGB_565: |  479     case ANDROID_BITMAP_FORMAT_RGB_565: | 
|  479     default: |  480     default: | 
|  480       return GL_UNSIGNED_SHORT_5_6_5; |  481       return GL_UNSIGNED_SHORT_5_6_5; | 
|  481   } |  482   } | 
|  482 } |  483 } | 
|  483  |  484  | 
 |  485 void CompositorImpl::AddObserver(CompositorObserver* observer) { | 
 |  486   if (!HasObserver(observer)) | 
 |  487     observer_list_.AddObserver(observer); | 
 |  488 } | 
 |  489  | 
 |  490 void CompositorImpl::RemoveObserver(CompositorObserver* observer) { | 
 |  491   observer_list_.RemoveObserver(observer); | 
 |  492 } | 
 |  493  | 
 |  494 bool CompositorImpl::HasObserver(CompositorObserver* observer) { | 
 |  495   return observer_list_.HasObserver(observer); | 
 |  496 } | 
 |  497  | 
 |  498 void CompositorImpl::DidCommit() { | 
 |  499   FOR_EACH_OBSERVER(CompositorObserver, | 
 |  500                     observer_list_, | 
 |  501                     OnCompositingDidCommit(this)); | 
 |  502 } | 
 |  503  | 
|  484 } // namespace content |  504 } // namespace content | 
| OLD | NEW |