Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Side by Side Diff: android_webview/browser/hardware_renderer.cc

Issue 1122393003: CC: Plumb LayerSettings parameter for cc::Layer construction. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | cc/blink/web_content_layer_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/aw_render_thread_context_provider.h" 8 #include "android_webview/browser/aw_render_thread_context_provider.h"
9 #include "android_webview/browser/child_frame.h" 9 #include "android_webview/browser/child_frame.h"
10 #include "android_webview/browser/deferred_gpu_command_service.h" 10 #include "android_webview/browser/deferred_gpu_command_service.h"
(...skipping 13 matching lines...) Expand all
24 #include "cc/trees/layer_tree_host.h" 24 #include "cc/trees/layer_tree_host.h"
25 #include "cc/trees/layer_tree_settings.h" 25 #include "cc/trees/layer_tree_settings.h"
26 #include "gpu/command_buffer/client/gl_in_process_context.h" 26 #include "gpu/command_buffer/client/gl_in_process_context.h"
27 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 27 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
28 #include "ui/gfx/frame_time.h" 28 #include "ui/gfx/frame_time.h"
29 #include "ui/gfx/geometry/rect_conversions.h" 29 #include "ui/gfx/geometry/rect_conversions.h"
30 #include "ui/gfx/geometry/rect_f.h" 30 #include "ui/gfx/geometry/rect_f.h"
31 #include "ui/gfx/transform.h" 31 #include "ui/gfx/transform.h"
32 #include "ui/gl/gl_bindings.h" 32 #include "ui/gl/gl_bindings.h"
33 33
34 namespace {
35 cc::LayerSettings HardwareRendererLayerSettings() {
36 return cc::LayerSettings();
37 }
38 }
39
34 namespace android_webview { 40 namespace android_webview {
35 41
36 HardwareRenderer::HardwareRenderer(SharedRendererState* state) 42 HardwareRenderer::HardwareRenderer(SharedRendererState* state)
37 : shared_renderer_state_(state), 43 : shared_renderer_state_(state),
38 last_egl_context_(eglGetCurrentContext()), 44 last_egl_context_(eglGetCurrentContext()),
39 stencil_enabled_(false), 45 stencil_enabled_(false),
40 viewport_clip_valid_for_dcheck_(false), 46 viewport_clip_valid_for_dcheck_(false),
41 gl_surface_(new AwGLSurface), 47 gl_surface_(new AwGLSurface),
42 root_layer_(cc::Layer::Create()), 48 root_layer_(cc::Layer::Create(HardwareRendererLayerSettings())),
43 resource_collection_(new cc::DelegatedFrameResourceCollection), 49 resource_collection_(new cc::DelegatedFrameResourceCollection),
44 output_surface_(NULL) { 50 output_surface_(NULL) {
45 DCHECK(last_egl_context_); 51 DCHECK(last_egl_context_);
46 52
47 resource_collection_->SetClient(this); 53 resource_collection_->SetClient(this);
48 54
49 cc::LayerTreeSettings settings; 55 cc::LayerTreeSettings settings;
50 56
51 // Should be kept in sync with compositor_impl_android.cc. 57 // Should be kept in sync with compositor_impl_android.cc.
52 settings.renderer_settings.allow_antialiasing = false; 58 settings.renderer_settings.allow_antialiasing = false;
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 frame_size_ = frame_size; 133 frame_size_ = frame_size;
128 134
129 if (!frame_provider_.get() || size_changed) { 135 if (!frame_provider_.get() || size_changed) {
130 if (delegated_layer_.get()) { 136 if (delegated_layer_.get()) {
131 delegated_layer_->RemoveFromParent(); 137 delegated_layer_->RemoveFromParent();
132 } 138 }
133 139
134 frame_provider_ = new cc::DelegatedFrameProvider( 140 frame_provider_ = new cc::DelegatedFrameProvider(
135 resource_collection_.get(), frame->delegated_frame_data.Pass()); 141 resource_collection_.get(), frame->delegated_frame_data.Pass());
136 142
137 delegated_layer_ = cc::DelegatedRendererLayer::Create(frame_provider_); 143 delegated_layer_ = cc::DelegatedRendererLayer::Create(
144 HardwareRendererLayerSettings(), frame_provider_);
138 delegated_layer_->SetBounds(frame_size_); 145 delegated_layer_->SetBounds(frame_size_);
139 delegated_layer_->SetIsDrawable(true); 146 delegated_layer_->SetIsDrawable(true);
140 147
141 root_layer_->AddChild(delegated_layer_); 148 root_layer_->AddChild(delegated_layer_);
142 } else { 149 } else {
143 frame_provider_->SetFrameData(frame->delegated_frame_data.Pass()); 150 frame_provider_->SetFrameData(frame->delegated_frame_data.Pass());
144 } 151 }
145 } 152 }
146 153
147 void HardwareRenderer::DrawGL(bool stencil_enabled, 154 void HardwareRenderer::DrawGL(bool stencil_enabled,
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 } 217 }
211 218
212 void HardwareRenderer::UnusedResourcesAreAvailable() { 219 void HardwareRenderer::UnusedResourcesAreAvailable() {
213 cc::ReturnedResourceArray returned_resources; 220 cc::ReturnedResourceArray returned_resources;
214 resource_collection_->TakeUnusedResourcesForChildCompositor( 221 resource_collection_->TakeUnusedResourcesForChildCompositor(
215 &returned_resources); 222 &returned_resources);
216 shared_renderer_state_->InsertReturnedResourcesOnRT(returned_resources); 223 shared_renderer_state_->InsertReturnedResourcesOnRT(returned_resources);
217 } 224 }
218 225
219 } // namespace android_webview 226 } // namespace android_webview
OLDNEW
« no previous file with comments | « no previous file | cc/blink/web_content_layer_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698