| 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 644 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 655 | 655 |
| 656 cc::SurfaceManager* manager = GetSurfaceManager(); | 656 cc::SurfaceManager* manager = GetSurfaceManager(); |
| 657 if (manager) { | 657 if (manager) { |
| 658 display_client_.reset(new cc::OnscreenDisplayClient( | 658 display_client_.reset(new cc::OnscreenDisplayClient( |
| 659 real_output_surface.Pass(), manager, HostSharedBitmapManager::current(), | 659 real_output_surface.Pass(), manager, HostSharedBitmapManager::current(), |
| 660 BrowserGpuMemoryBufferManager::current(), | 660 BrowserGpuMemoryBufferManager::current(), |
| 661 host_->settings().renderer_settings, | 661 host_->settings().renderer_settings, |
| 662 base::ThreadTaskRunnerHandle::Get())); | 662 base::ThreadTaskRunnerHandle::Get())); |
| 663 scoped_ptr<cc::SurfaceDisplayOutputSurface> surface_output_surface( | 663 scoped_ptr<cc::SurfaceDisplayOutputSurface> surface_output_surface( |
| 664 new cc::SurfaceDisplayOutputSurface( | 664 new cc::SurfaceDisplayOutputSurface( |
| 665 manager, surface_id_allocator_.get(), context_provider)); | 665 manager, surface_id_allocator_.get(), context_provider, nullptr)); |
| 666 | 666 |
| 667 display_client_->set_surface_output_surface(surface_output_surface.get()); | 667 display_client_->set_surface_output_surface(surface_output_surface.get()); |
| 668 surface_output_surface->set_display_client(display_client_.get()); | 668 surface_output_surface->set_display_client(display_client_.get()); |
| 669 display_client_->display()->Resize(size_); | 669 display_client_->display()->Resize(size_); |
| 670 host_->SetOutputSurface(surface_output_surface.Pass()); | 670 host_->SetOutputSurface(surface_output_surface.Pass()); |
| 671 } else { | 671 } else { |
| 672 host_->SetOutputSurface(real_output_surface.Pass()); | 672 host_->SetOutputSurface(real_output_surface.Pass()); |
| 673 } | 673 } |
| 674 } | 674 } |
| 675 | 675 |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 763 | 763 |
| 764 void CompositorImpl::SetNeedsAnimate() { | 764 void CompositorImpl::SetNeedsAnimate() { |
| 765 needs_animate_ = true; | 765 needs_animate_ = true; |
| 766 if (!host_) | 766 if (!host_) |
| 767 return; | 767 return; |
| 768 | 768 |
| 769 host_->SetNeedsAnimate(); | 769 host_->SetNeedsAnimate(); |
| 770 } | 770 } |
| 771 | 771 |
| 772 } // namespace content | 772 } // namespace content |
| OLD | NEW |