| 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/android/jni_android.h" | 10 #include "base/android/jni_android.h" |
| (...skipping 656 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 667 | 667 |
| 668 cc::SurfaceManager* manager = GetSurfaceManager(); | 668 cc::SurfaceManager* manager = GetSurfaceManager(); |
| 669 if (manager) { | 669 if (manager) { |
| 670 display_client_.reset(new cc::OnscreenDisplayClient( | 670 display_client_.reset(new cc::OnscreenDisplayClient( |
| 671 real_output_surface.Pass(), manager, HostSharedBitmapManager::current(), | 671 real_output_surface.Pass(), manager, HostSharedBitmapManager::current(), |
| 672 BrowserGpuMemoryBufferManager::current(), | 672 BrowserGpuMemoryBufferManager::current(), |
| 673 host_->settings().renderer_settings, | 673 host_->settings().renderer_settings, |
| 674 base::ThreadTaskRunnerHandle::Get())); | 674 base::ThreadTaskRunnerHandle::Get())); |
| 675 scoped_ptr<cc::SurfaceDisplayOutputSurface> surface_output_surface( | 675 scoped_ptr<cc::SurfaceDisplayOutputSurface> surface_output_surface( |
| 676 new cc::SurfaceDisplayOutputSurface( | 676 new cc::SurfaceDisplayOutputSurface( |
| 677 manager, surface_id_allocator_.get(), context_provider)); | 677 manager, surface_id_allocator_.get(), context_provider, nullptr)); |
| 678 | 678 |
| 679 display_client_->set_surface_output_surface(surface_output_surface.get()); | 679 display_client_->set_surface_output_surface(surface_output_surface.get()); |
| 680 surface_output_surface->set_display_client(display_client_.get()); | 680 surface_output_surface->set_display_client(display_client_.get()); |
| 681 display_client_->display()->Resize(size_); | 681 display_client_->display()->Resize(size_); |
| 682 host_->SetOutputSurface(surface_output_surface.Pass()); | 682 host_->SetOutputSurface(surface_output_surface.Pass()); |
| 683 } else { | 683 } else { |
| 684 host_->SetOutputSurface(real_output_surface.Pass()); | 684 host_->SetOutputSurface(real_output_surface.Pass()); |
| 685 } | 685 } |
| 686 } | 686 } |
| 687 | 687 |
| (...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 786 | 786 |
| 787 void CompositorImpl::SetNeedsAnimate() { | 787 void CompositorImpl::SetNeedsAnimate() { |
| 788 needs_animate_ = true; | 788 needs_animate_ = true; |
| 789 if (!host_) | 789 if (!host_) |
| 790 return; | 790 return; |
| 791 | 791 |
| 792 host_->SetNeedsAnimate(); | 792 host_->SetNeedsAnimate(); |
| 793 } | 793 } |
| 794 | 794 |
| 795 } // namespace content | 795 } // namespace content |
| OLD | NEW |