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 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
11 #include "base/command_line.h" | 11 #include "base/command_line.h" |
12 #include "base/lazy_instance.h" | 12 #include "base/lazy_instance.h" |
13 #include "base/logging.h" | 13 #include "base/logging.h" |
14 #include "cc/font_atlas.h" | |
15 #include "cc/input_handler.h" | 14 #include "cc/input_handler.h" |
16 #include "cc/layer.h" | 15 #include "cc/layer.h" |
17 #include "cc/layer_tree_host.h" | 16 #include "cc/layer_tree_host.h" |
18 #include "cc/output_surface.h" | 17 #include "cc/output_surface.h" |
19 #include "cc/thread_impl.h" | 18 #include "cc/thread_impl.h" |
20 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" | 19 #include "content/browser/gpu/browser_gpu_channel_host_factory.h" |
21 #include "content/browser/gpu/gpu_surface_tracker.h" | 20 #include "content/browser/gpu/gpu_surface_tracker.h" |
22 #include "content/browser/renderer_host/image_transport_factory_android.h" | 21 #include "content/browser/renderer_host/image_transport_factory_android.h" |
23 #include "content/common/gpu/client/gl_helper.h" | 22 #include "content/common/gpu/client/gl_helper.h" |
24 #include "content/common/gpu/client/gpu_channel_host.h" | 23 #include "content/common/gpu/client/gpu_channel_host.h" |
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
354 } | 353 } |
355 | 354 |
356 void CompositorImpl::didCompleteSwapBuffers() { | 355 void CompositorImpl::didCompleteSwapBuffers() { |
357 client_->OnSwapBuffersCompleted(); | 356 client_->OnSwapBuffersCompleted(); |
358 } | 357 } |
359 | 358 |
360 void CompositorImpl::scheduleComposite() { | 359 void CompositorImpl::scheduleComposite() { |
361 client_->ScheduleComposite(); | 360 client_->ScheduleComposite(); |
362 } | 361 } |
363 | 362 |
364 scoped_ptr<cc::FontAtlas> CompositorImpl::createFontAtlas() { | |
365 return scoped_ptr<cc::FontAtlas>(); | |
366 } | |
367 | |
368 void CompositorImpl::OnViewContextSwapBuffersPosted() { | 363 void CompositorImpl::OnViewContextSwapBuffersPosted() { |
369 TRACE_EVENT0("compositor", "CompositorImpl::OnViewContextSwapBuffersPosted"); | 364 TRACE_EVENT0("compositor", "CompositorImpl::OnViewContextSwapBuffersPosted"); |
370 } | 365 } |
371 | 366 |
372 void CompositorImpl::OnViewContextSwapBuffersComplete() { | 367 void CompositorImpl::OnViewContextSwapBuffersComplete() { |
373 TRACE_EVENT0("compositor", | 368 TRACE_EVENT0("compositor", |
374 "CompositorImpl::OnViewContextSwapBuffersComplete"); | 369 "CompositorImpl::OnViewContextSwapBuffersComplete"); |
375 client_->OnSwapBuffersCompleted(); | 370 client_->OnSwapBuffersCompleted(); |
376 } | 371 } |
377 | 372 |
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
424 case ANDROID_BITMAP_FORMAT_RGBA_8888: | 419 case ANDROID_BITMAP_FORMAT_RGBA_8888: |
425 return GL_UNSIGNED_BYTE; | 420 return GL_UNSIGNED_BYTE; |
426 break; | 421 break; |
427 case ANDROID_BITMAP_FORMAT_RGB_565: | 422 case ANDROID_BITMAP_FORMAT_RGB_565: |
428 default: | 423 default: |
429 return GL_UNSIGNED_SHORT_5_6_5; | 424 return GL_UNSIGNED_SHORT_5_6_5; |
430 } | 425 } |
431 } | 426 } |
432 | 427 |
433 } // namespace content | 428 } // namespace content |
OLD | NEW |