| 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" |
| (...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 331 } | 331 } |
| 332 | 332 |
| 333 void CompositorImpl::scheduleComposite() { | 333 void CompositorImpl::scheduleComposite() { |
| 334 client_->ScheduleComposite(); | 334 client_->ScheduleComposite(); |
| 335 } | 335 } |
| 336 | 336 |
| 337 scoped_ptr<cc::FontAtlas> CompositorImpl::createFontAtlas() { | 337 scoped_ptr<cc::FontAtlas> CompositorImpl::createFontAtlas() { |
| 338 return scoped_ptr<cc::FontAtlas>(); | 338 return scoped_ptr<cc::FontAtlas>(); |
| 339 } | 339 } |
| 340 | 340 |
| 341 void CompositorImpl::onReceivedLatencyInfo(const WebKit::WebLatencyInfoImpl&) { |
| 342 } |
| 343 |
| 341 void CompositorImpl::OnViewContextSwapBuffersPosted() { | 344 void CompositorImpl::OnViewContextSwapBuffersPosted() { |
| 342 TRACE_EVENT0("compositor", "CompositorImpl::OnViewContextSwapBuffersPosted"); | 345 TRACE_EVENT0("compositor", "CompositorImpl::OnViewContextSwapBuffersPosted"); |
| 343 } | 346 } |
| 344 | 347 |
| 345 void CompositorImpl::OnViewContextSwapBuffersComplete() { | 348 void CompositorImpl::OnViewContextSwapBuffersComplete() { |
| 346 TRACE_EVENT0("compositor", | 349 TRACE_EVENT0("compositor", |
| 347 "CompositorImpl::OnViewContextSwapBuffersComplete"); | 350 "CompositorImpl::OnViewContextSwapBuffersComplete"); |
| 348 client_->OnSwapBuffersCompleted(); | 351 client_->OnSwapBuffersCompleted(); |
| 349 } | 352 } |
| 350 | 353 |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 397 case ANDROID_BITMAP_FORMAT_RGBA_8888: | 400 case ANDROID_BITMAP_FORMAT_RGBA_8888: |
| 398 return GL_UNSIGNED_BYTE; | 401 return GL_UNSIGNED_BYTE; |
| 399 break; | 402 break; |
| 400 case ANDROID_BITMAP_FORMAT_RGB_565: | 403 case ANDROID_BITMAP_FORMAT_RGB_565: |
| 401 default: | 404 default: |
| 402 return GL_UNSIGNED_SHORT_5_6_5; | 405 return GL_UNSIGNED_SHORT_5_6_5; |
| 403 } | 406 } |
| 404 } | 407 } |
| 405 | 408 |
| 406 } // namespace content | 409 } // namespace content |
| OLD | NEW |