| 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 451 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 462 output_surface_request_pending_ = false; | 462 output_surface_request_pending_ = false; |
| 463 display_client_.reset(); | 463 display_client_.reset(); |
| 464 if (current_composite_task_) { | 464 if (current_composite_task_) { |
| 465 current_composite_task_->Cancel(); | 465 current_composite_task_->Cancel(); |
| 466 current_composite_task_.reset(); | 466 current_composite_task_.reset(); |
| 467 } | 467 } |
| 468 } else if (!host_) { | 468 } else if (!host_) { |
| 469 CreateLayerTreeHost(); | 469 CreateLayerTreeHost(); |
| 470 ui_resource_provider_.SetLayerTreeHost(host_.get()); | 470 ui_resource_provider_.SetLayerTreeHost(host_.get()); |
| 471 } | 471 } |
| 472 root_window_->OnVisibilityChanged(visible); |
| 472 } | 473 } |
| 473 | 474 |
| 474 void CompositorImpl::setDeviceScaleFactor(float factor) { | 475 void CompositorImpl::setDeviceScaleFactor(float factor) { |
| 475 device_scale_factor_ = factor; | 476 device_scale_factor_ = factor; |
| 476 if (host_) | 477 if (host_) |
| 477 host_->SetDeviceScaleFactor(factor); | 478 host_->SetDeviceScaleFactor(factor); |
| 478 } | 479 } |
| 479 | 480 |
| 480 void CompositorImpl::SetWindowBounds(const gfx::Size& size) { | 481 void CompositorImpl::SetWindowBounds(const gfx::Size& size) { |
| 481 if (size_ == size) | 482 if (size_ == size) |
| (...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 727 | 728 |
| 728 void CompositorImpl::SetNeedsAnimate() { | 729 void CompositorImpl::SetNeedsAnimate() { |
| 729 needs_animate_ = true; | 730 needs_animate_ = true; |
| 730 if (!host_) | 731 if (!host_) |
| 731 return; | 732 return; |
| 732 | 733 |
| 733 host_->SetNeedsAnimate(); | 734 host_->SetNeedsAnimate(); |
| 734 } | 735 } |
| 735 | 736 |
| 736 } // namespace content | 737 } // namespace content |
| OLD | NEW |