| 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 283 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 return true; | 294 return true; |
| 295 } | 295 } |
| 296 | 296 |
| 297 void CompositorImpl::animate(double monotonicFrameBeginTime) { | 297 void CompositorImpl::animate(double monotonicFrameBeginTime) { |
| 298 } | 298 } |
| 299 | 299 |
| 300 void CompositorImpl::layout() { | 300 void CompositorImpl::layout() { |
| 301 } | 301 } |
| 302 | 302 |
| 303 void CompositorImpl::applyScrollAndScale(gfx::Vector2d scrollDelta, | 303 void CompositorImpl::applyScrollAndScale(gfx::Vector2d scrollDelta, |
| 304 float pageScale) { | 304 float pageScale, |
| 305 gfx::Vector2d desktopCompatibilityViewp
ortOffsetFromScrollPositionDelta) { |
| 305 } | 306 } |
| 306 | 307 |
| 307 scoped_ptr<cc::OutputSurface> CompositorImpl::createOutputSurface() { | 308 scoped_ptr<cc::OutputSurface> CompositorImpl::createOutputSurface() { |
| 308 if (g_use_direct_gl) { | 309 if (g_use_direct_gl) { |
| 309 WebKit::WebGraphicsContext3D::Attributes attrs; | 310 WebKit::WebGraphicsContext3D::Attributes attrs; |
| 310 attrs.shareResources = false; | 311 attrs.shareResources = false; |
| 311 attrs.noAutomaticFlushes = true; | 312 attrs.noAutomaticFlushes = true; |
| 312 scoped_ptr<webkit::gpu::WebGraphicsContext3DInProcessImpl> context( | 313 scoped_ptr<webkit::gpu::WebGraphicsContext3DInProcessImpl> context( |
| 313 webkit::gpu::WebGraphicsContext3DInProcessImpl::CreateForWindow( | 314 webkit::gpu::WebGraphicsContext3DInProcessImpl::CreateForWindow( |
| 314 attrs, | 315 attrs, |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 424 case ANDROID_BITMAP_FORMAT_RGBA_8888: | 425 case ANDROID_BITMAP_FORMAT_RGBA_8888: |
| 425 return GL_UNSIGNED_BYTE; | 426 return GL_UNSIGNED_BYTE; |
| 426 break; | 427 break; |
| 427 case ANDROID_BITMAP_FORMAT_RGB_565: | 428 case ANDROID_BITMAP_FORMAT_RGB_565: |
| 428 default: | 429 default: |
| 429 return GL_UNSIGNED_SHORT_5_6_5; | 430 return GL_UNSIGNED_SHORT_5_6_5; |
| 430 } | 431 } |
| 431 } | 432 } |
| 432 | 433 |
| 433 } // namespace content | 434 } // namespace content |
| OLD | NEW |