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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
110 | 110 |
111 HardwareRenderer::~HardwareRenderer() { | 111 HardwareRenderer::~HardwareRenderer() { |
112 SetFrameData(); | 112 SetFrameData(); |
113 | 113 |
114 // Must reset everything before |resource_collection_| to ensure all | 114 // Must reset everything before |resource_collection_| to ensure all |
115 // resources are returned before resetting |resource_collection_| client. | 115 // resources are returned before resetting |resource_collection_| client. |
116 layer_tree_host_.reset(); | 116 layer_tree_host_.reset(); |
117 root_layer_ = NULL; | 117 root_layer_ = NULL; |
118 delegated_layer_ = NULL; | 118 delegated_layer_ = NULL; |
119 frame_provider_ = NULL; | 119 frame_provider_ = NULL; |
120 #if DCHECK_IS_ON | 120 #if !DCHECK_IS_OFF |
Nico
2015/01/06 23:46:15
Can we make DCHECK_IS_ON a function-style macro? `
danakj
2015/01/06 23:55:10
Oh that's a good point. I thought no, because we u
| |
121 // Check collection is empty. | 121 // Check collection is empty. |
122 cc::ReturnedResourceArray returned_resources; | 122 cc::ReturnedResourceArray returned_resources; |
123 resource_collection_->TakeUnusedResourcesForChildCompositor( | 123 resource_collection_->TakeUnusedResourcesForChildCompositor( |
124 &returned_resources); | 124 &returned_resources); |
125 DCHECK_EQ(0u, returned_resources.size()); | 125 DCHECK_EQ(0u, returned_resources.size()); |
126 #endif // DCHECK_IS_ON | 126 #endif // !DCHECK_IS_OFF |
127 | 127 |
128 resource_collection_->SetClient(NULL); | 128 resource_collection_->SetClient(NULL); |
129 | 129 |
130 // Reset draw constraints. | 130 // Reset draw constraints. |
131 shared_renderer_state_->UpdateDrawConstraintsOnRT( | 131 shared_renderer_state_->UpdateDrawConstraintsOnRT( |
132 ParentCompositorDrawConstraints()); | 132 ParentCompositorDrawConstraints()); |
133 } | 133 } |
134 | 134 |
135 void HardwareRenderer::DidBeginMainFrame() { | 135 void HardwareRenderer::DidBeginMainFrame() { |
136 // This is called after OutputSurface is created, but before the impl frame | 136 // This is called after OutputSurface is created, but before the impl frame |
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
268 } | 268 } |
269 | 269 |
270 void HardwareRenderer::UnusedResourcesAreAvailable() { | 270 void HardwareRenderer::UnusedResourcesAreAvailable() { |
271 cc::ReturnedResourceArray returned_resources; | 271 cc::ReturnedResourceArray returned_resources; |
272 resource_collection_->TakeUnusedResourcesForChildCompositor( | 272 resource_collection_->TakeUnusedResourcesForChildCompositor( |
273 &returned_resources); | 273 &returned_resources); |
274 shared_renderer_state_->InsertReturnedResourcesOnRT(returned_resources); | 274 shared_renderer_state_->InsertReturnedResourcesOnRT(returned_resources); |
275 } | 275 } |
276 | 276 |
277 } // namespace android_webview | 277 } // namespace android_webview |
OLD | NEW |