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 "android_webview/browser/aw_gl_surface.h" | 7 #include "android_webview/browser/aw_gl_surface.h" |
8 #include "android_webview/browser/deferred_gpu_command_service.h" | 8 #include "android_webview/browser/deferred_gpu_command_service.h" |
9 #include "android_webview/browser/parent_output_surface.h" | 9 #include "android_webview/browser/parent_output_surface.h" |
10 #include "android_webview/browser/shared_renderer_state.h" | 10 #include "android_webview/browser/shared_renderer_state.h" |
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
139 output_surface_->SetExternalStencilTest(stencil_enabled_); | 139 output_surface_->SetExternalStencilTest(stencil_enabled_); |
140 output_surface_->SetDrawConstraints(viewport_, clip_); | 140 output_surface_->SetDrawConstraints(viewport_, clip_); |
141 } | 141 } |
142 | 142 |
143 void HardwareRenderer::CommitFrame() { | 143 void HardwareRenderer::CommitFrame() { |
144 scroll_offset_ = shared_renderer_state_->GetScrollOffset(); | 144 scroll_offset_ = shared_renderer_state_->GetScrollOffset(); |
145 if (committed_frame_.get()) { | 145 if (committed_frame_.get()) { |
146 TRACE_EVENT_INSTANT0("android_webview", | 146 TRACE_EVENT_INSTANT0("android_webview", |
147 "EarlyOut_PreviousFrameUnconsumed", | 147 "EarlyOut_PreviousFrameUnconsumed", |
148 TRACE_EVENT_SCOPE_THREAD); | 148 TRACE_EVENT_SCOPE_THREAD); |
| 149 shared_renderer_state_->DidSkipCommitFrame(); |
149 return; | 150 return; |
150 } | 151 } |
151 | 152 |
152 committed_frame_ = shared_renderer_state_->PassCompositorFrame(); | 153 committed_frame_ = shared_renderer_state_->PassCompositorFrame(); |
153 // Happens with empty global visible rect. | 154 // Happens with empty global visible rect. |
154 if (!committed_frame_.get()) | 155 if (!committed_frame_.get()) |
155 return; | 156 return; |
156 | 157 |
157 DCHECK(!committed_frame_->gl_frame_data); | 158 DCHECK(!committed_frame_->gl_frame_data); |
158 DCHECK(!committed_frame_->software_frame_data); | 159 DCHECK(!committed_frame_->software_frame_data); |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
264 } | 265 } |
265 | 266 |
266 void HardwareRenderer::UnusedResourcesAreAvailable() { | 267 void HardwareRenderer::UnusedResourcesAreAvailable() { |
267 cc::ReturnedResourceArray returned_resources; | 268 cc::ReturnedResourceArray returned_resources; |
268 resource_collection_->TakeUnusedResourcesForChildCompositor( | 269 resource_collection_->TakeUnusedResourcesForChildCompositor( |
269 &returned_resources); | 270 &returned_resources); |
270 shared_renderer_state_->InsertReturnedResources(returned_resources); | 271 shared_renderer_state_->InsertReturnedResources(returned_resources); |
271 } | 272 } |
272 | 273 |
273 } // namespace android_webview | 274 } // namespace android_webview |
OLD | NEW |