| 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 579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 590 weak_factory_.GetWeakPtr())); | 590 weak_factory_.GetWeakPtr())); |
| 591 | 591 |
| 592 cc::SurfaceManager* manager = GetSurfaceManager(); | 592 cc::SurfaceManager* manager = GetSurfaceManager(); |
| 593 if (manager) { | 593 if (manager) { |
| 594 display_client_.reset( | 594 display_client_.reset( |
| 595 new OnscreenDisplayClient(real_output_surface.Pass(), manager, | 595 new OnscreenDisplayClient(real_output_surface.Pass(), manager, |
| 596 host_->settings().renderer_settings, | 596 host_->settings().renderer_settings, |
| 597 base::MessageLoopProxy::current())); | 597 base::MessageLoopProxy::current())); |
| 598 scoped_ptr<SurfaceDisplayOutputSurface> surface_output_surface( | 598 scoped_ptr<SurfaceDisplayOutputSurface> surface_output_surface( |
| 599 new SurfaceDisplayOutputSurface(manager, surface_id_allocator_.get(), | 599 new SurfaceDisplayOutputSurface(manager, surface_id_allocator_.get(), |
| 600 context_provider)); | 600 context_provider, nullptr)); |
| 601 | 601 |
| 602 display_client_->set_surface_output_surface(surface_output_surface.get()); | 602 display_client_->set_surface_output_surface(surface_output_surface.get()); |
| 603 surface_output_surface->set_display_client(display_client_.get()); | 603 surface_output_surface->set_display_client(display_client_.get()); |
| 604 display_client_->display()->Resize(size_); | 604 display_client_->display()->Resize(size_); |
| 605 host_->SetOutputSurface(surface_output_surface.Pass()); | 605 host_->SetOutputSurface(surface_output_surface.Pass()); |
| 606 } else { | 606 } else { |
| 607 host_->SetOutputSurface(real_output_surface.Pass()); | 607 host_->SetOutputSurface(real_output_surface.Pass()); |
| 608 } | 608 } |
| 609 } | 609 } |
| 610 | 610 |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 698 | 698 |
| 699 void CompositorImpl::SetNeedsAnimate() { | 699 void CompositorImpl::SetNeedsAnimate() { |
| 700 needs_animate_ = true; | 700 needs_animate_ = true; |
| 701 if (!host_) | 701 if (!host_) |
| 702 return; | 702 return; |
| 703 | 703 |
| 704 host_->SetNeedsAnimate(); | 704 host_->SetNeedsAnimate(); |
| 705 } | 705 } |
| 706 | 706 |
| 707 } // namespace content | 707 } // namespace content |
| OLD | NEW |