| 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/hardware_renderer.h" | 5 #include "android_webview/browser/hardware_renderer.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "android_webview/browser/aw_gl_surface.h" | 9 #include "android_webview/browser/aw_gl_surface.h" |
| 10 #include "android_webview/browser/aw_render_thread_context_provider.h" | 10 #include "android_webview/browser/aw_render_thread_context_provider.h" |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 | 68 |
| 69 void HardwareRenderer::DrawGL(AwDrawGLInfo* draw_info) { | 69 void HardwareRenderer::DrawGL(AwDrawGLInfo* draw_info) { |
| 70 TRACE_EVENT0("android_webview", "HardwareRenderer::DrawGL"); | 70 TRACE_EVENT0("android_webview", "HardwareRenderer::DrawGL"); |
| 71 | 71 |
| 72 if (frame_future_) { | 72 if (frame_future_) { |
| 73 TRACE_EVENT0("android_webview", "GetFrame"); | 73 TRACE_EVENT0("android_webview", "GetFrame"); |
| 74 DCHECK(child_frame_); | 74 DCHECK(child_frame_); |
| 75 DCHECK(!child_frame_->frame); | 75 DCHECK(!child_frame_->frame); |
| 76 | 76 |
| 77 std::unique_ptr<content::SynchronousCompositor::Frame> frame = | 77 std::unique_ptr<content::SynchronousCompositor::Frame> frame = |
| 78 frame_future_->getFrame(); | 78 frame_future_->GetFrame(); |
| 79 if (frame) { | 79 if (frame) { |
| 80 child_frame_->compositor_frame_sink_id = frame->compositor_frame_sink_id; | 80 child_frame_->compositor_frame_sink_id = frame->compositor_frame_sink_id; |
| 81 child_frame_->frame = std::move(frame->frame); | 81 child_frame_->frame = std::move(frame->frame); |
| 82 } else { | 82 } else { |
| 83 child_frame_.reset(); | 83 child_frame_.reset(); |
| 84 } | 84 } |
| 85 frame_future_ = nullptr; | 85 frame_future_ = nullptr; |
| 86 } | 86 } |
| 87 | 87 |
| 88 if (child_frame_) { | 88 if (child_frame_) { |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 const cc::ReturnedResourceArray& resources, | 218 const cc::ReturnedResourceArray& resources, |
| 219 const CompositorID& compositor_id, | 219 const CompositorID& compositor_id, |
| 220 uint32_t compositor_frame_sink_id) { | 220 uint32_t compositor_frame_sink_id) { |
| 221 if (compositor_frame_sink_id != last_committed_compositor_frame_sink_id_) | 221 if (compositor_frame_sink_id != last_committed_compositor_frame_sink_id_) |
| 222 return; | 222 return; |
| 223 render_thread_manager_->InsertReturnedResourcesOnRT(resources, compositor_id, | 223 render_thread_manager_->InsertReturnedResourcesOnRT(resources, compositor_id, |
| 224 compositor_frame_sink_id); | 224 compositor_frame_sink_id); |
| 225 } | 225 } |
| 226 | 226 |
| 227 } // namespace android_webview | 227 } // namespace android_webview |
| OLD | NEW |