| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "android_webview/browser/render_thread_manager.h" | 5 #include "android_webview/browser/render_thread_manager.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "android_webview/browser/child_frame.h" | 9 #include "android_webview/browser/child_frame.h" |
| 10 #include "android_webview/browser/compositor_frame_producer.h" | 10 #include "android_webview/browser/compositor_frame_producer.h" |
| (...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 190 frame_future_ = std::move(frame_future); | 190 frame_future_ = std::move(frame_future); |
| 191 } | 191 } |
| 192 | 192 |
| 193 std::unique_ptr<ChildFrame> RenderThreadManager::GetSynchronousCompositorFrame( | 193 std::unique_ptr<ChildFrame> RenderThreadManager::GetSynchronousCompositorFrame( |
| 194 scoped_refptr<content::SynchronousCompositor::FrameFuture> frame_future, | 194 scoped_refptr<content::SynchronousCompositor::FrameFuture> frame_future, |
| 195 std::unique_ptr<ChildFrame> child_frame) { | 195 std::unique_ptr<ChildFrame> child_frame) { |
| 196 if (!frame_future) | 196 if (!frame_future) |
| 197 return nullptr; | 197 return nullptr; |
| 198 DCHECK(!child_frame->frame.get()); | 198 DCHECK(!child_frame->frame.get()); |
| 199 std::unique_ptr<content::SynchronousCompositor::Frame> frame = | 199 std::unique_ptr<content::SynchronousCompositor::Frame> frame = |
| 200 frame_future->getFrame(); | 200 frame_future->GetFrame(); |
| 201 std::unique_ptr<cc::CompositorFrame> compositor_frame = | 201 std::unique_ptr<cc::CompositorFrame> compositor_frame = |
| 202 std::move(frame->frame); | 202 std::move(frame->frame); |
| 203 return base::MakeUnique<ChildFrame>( | 203 return base::MakeUnique<ChildFrame>( |
| 204 frame->compositor_frame_sink_id, std::move(compositor_frame), | 204 frame->compositor_frame_sink_id, std::move(compositor_frame), |
| 205 child_frame->compositor_id, | 205 child_frame->compositor_id, |
| 206 child_frame->viewport_rect_for_tile_priority_empty, | 206 child_frame->viewport_rect_for_tile_priority_empty, |
| 207 child_frame->transform_for_tile_priority, | 207 child_frame->transform_for_tile_priority, |
| 208 child_frame->offscreen_pre_raster, child_frame->is_layer); | 208 child_frame->offscreen_pre_raster, child_frame->is_layer); |
| 209 } | 209 } |
| 210 | 210 |
| (...skipping 216 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 427 : render_thread_manager_(render_thread_manager) { | 427 : render_thread_manager_(render_thread_manager) { |
| 428 DCHECK(!render_thread_manager_->IsInsideHardwareRelease()); | 428 DCHECK(!render_thread_manager_->IsInsideHardwareRelease()); |
| 429 render_thread_manager_->SetInsideHardwareRelease(true); | 429 render_thread_manager_->SetInsideHardwareRelease(true); |
| 430 } | 430 } |
| 431 | 431 |
| 432 RenderThreadManager::InsideHardwareReleaseReset::~InsideHardwareReleaseReset() { | 432 RenderThreadManager::InsideHardwareReleaseReset::~InsideHardwareReleaseReset() { |
| 433 render_thread_manager_->SetInsideHardwareRelease(false); | 433 render_thread_manager_->SetInsideHardwareRelease(false); |
| 434 } | 434 } |
| 435 | 435 |
| 436 } // namespace android_webview | 436 } // namespace android_webview |
| OLD | NEW |