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

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"
11 #include "android_webview/browser/parent_compositor_draw_constraints.h" 11 #include "android_webview/browser/parent_compositor_draw_constraints.h"
12 #include "android_webview/browser/parent_output_surface.h" 12 #include "android_webview/browser/parent_output_surface.h"
13 #include "android_webview/browser/shared_renderer_state.h" 13 #include "android_webview/browser/shared_renderer_state.h"
14 #include "android_webview/public/browser/draw_gl.h" 14 #include "android_webview/public/browser/draw_gl.h"
15 #include "base/auto_reset.h" 15 #include "base/auto_reset.h"
16 #include "base/lazy_instance.h"
16 #include "base/strings/string_number_conversions.h" 17 #include "base/strings/string_number_conversions.h"
17 #include "base/trace_event/trace_event.h" 18 #include "base/trace_event/trace_event.h"
18 #include "cc/layers/delegated_frame_provider.h" 19 #include "cc/layers/delegated_frame_provider.h"
19 #include "cc/layers/delegated_renderer_layer.h" 20 #include "cc/layers/delegated_renderer_layer.h"
20 #include "cc/layers/layer.h" 21 #include "cc/layers/layer.h"
21 #include "cc/output/compositor_frame.h" 22 #include "cc/output/compositor_frame.h"
22 #include "cc/output/output_surface.h" 23 #include "cc/output/output_surface.h"
23 #include "cc/scheduler/begin_frame_source.h" 24 #include "cc/scheduler/begin_frame_source.h"
24 #include "cc/trees/layer_tree_host.h" 25 #include "cc/trees/layer_tree_host.h"
25 #include "cc/trees/layer_tree_settings.h" 26 #include "cc/trees/layer_tree_settings.h"
26 #include "gpu/command_buffer/client/gl_in_process_context.h" 27 #include "gpu/command_buffer/client/gl_in_process_context.h"
27 #include "gpu/command_buffer/common/gles2_cmd_utils.h" 28 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
28 #include "ui/gfx/frame_time.h" 29 #include "ui/gfx/frame_time.h"
29 #include "ui/gfx/geometry/rect_conversions.h" 30 #include "ui/gfx/geometry/rect_conversions.h"
30 #include "ui/gfx/geometry/rect_f.h" 31 #include "ui/gfx/geometry/rect_f.h"
31 #include "ui/gfx/transform.h" 32 #include "ui/gfx/transform.h"
32 #include "ui/gl/gl_bindings.h" 33 #include "ui/gl/gl_bindings.h"
33 34
34 namespace android_webview { 35 namespace android_webview {
35 36
37 base::LazyInstance<cc::LayerSettings> g_layer_settings =
38 LAZY_INSTANCE_INITIALIZER;
boliu 2015/05/20 15:51:02 Lazy instance feels over kill here. I don't think
loyso (OOO) 2015/05/21 05:12:35 Yes, thread-safety is over kill here. Our style gu
boliu 2015/05/21 05:23:32 That's definitely not allowed. Having the construc
39
36 HardwareRenderer::HardwareRenderer(SharedRendererState* state) 40 HardwareRenderer::HardwareRenderer(SharedRendererState* state)
37 : shared_renderer_state_(state), 41 : shared_renderer_state_(state),
38 last_egl_context_(eglGetCurrentContext()), 42 last_egl_context_(eglGetCurrentContext()),
39 stencil_enabled_(false), 43 stencil_enabled_(false),
40 viewport_clip_valid_for_dcheck_(false), 44 viewport_clip_valid_for_dcheck_(false),
41 gl_surface_(new AwGLSurface), 45 gl_surface_(new AwGLSurface),
42 root_layer_(cc::Layer::Create()), 46 root_layer_(cc::Layer::Create(g_layer_settings.Get())),
43 resource_collection_(new cc::DelegatedFrameResourceCollection), 47 resource_collection_(new cc::DelegatedFrameResourceCollection),
44 output_surface_(NULL) { 48 output_surface_(NULL) {
45 DCHECK(last_egl_context_); 49 DCHECK(last_egl_context_);
46 50
47 resource_collection_->SetClient(this); 51 resource_collection_->SetClient(this);
48 52
49 cc::LayerTreeSettings settings; 53 cc::LayerTreeSettings settings;
50 54
51 // Should be kept in sync with compositor_impl_android.cc. 55 // Should be kept in sync with compositor_impl_android.cc.
52 settings.renderer_settings.allow_antialiasing = false; 56 settings.renderer_settings.allow_antialiasing = false;
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
127 frame_size_ = frame_size; 131 frame_size_ = frame_size;
128 132
129 if (!frame_provider_.get() || size_changed) { 133 if (!frame_provider_.get() || size_changed) {
130 if (delegated_layer_.get()) { 134 if (delegated_layer_.get()) {
131 delegated_layer_->RemoveFromParent(); 135 delegated_layer_->RemoveFromParent();
132 } 136 }
133 137
134 frame_provider_ = new cc::DelegatedFrameProvider( 138 frame_provider_ = new cc::DelegatedFrameProvider(
135 resource_collection_.get(), frame->delegated_frame_data.Pass()); 139 resource_collection_.get(), frame->delegated_frame_data.Pass());
136 140
137 delegated_layer_ = cc::DelegatedRendererLayer::Create(frame_provider_); 141 delegated_layer_ = cc::DelegatedRendererLayer::Create(
142 g_layer_settings.Get(), frame_provider_);
138 delegated_layer_->SetBounds(frame_size_); 143 delegated_layer_->SetBounds(frame_size_);
139 delegated_layer_->SetIsDrawable(true); 144 delegated_layer_->SetIsDrawable(true);
140 145
141 root_layer_->AddChild(delegated_layer_); 146 root_layer_->AddChild(delegated_layer_);
142 } else { 147 } else {
143 frame_provider_->SetFrameData(frame->delegated_frame_data.Pass()); 148 frame_provider_->SetFrameData(frame->delegated_frame_data.Pass());
144 } 149 }
145 } 150 }
146 151
147 void HardwareRenderer::DrawGL(bool stencil_enabled, 152 void HardwareRenderer::DrawGL(bool stencil_enabled,
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
210 } 215 }
211 216
212 void HardwareRenderer::UnusedResourcesAreAvailable() { 217 void HardwareRenderer::UnusedResourcesAreAvailable() {
213 cc::ReturnedResourceArray returned_resources; 218 cc::ReturnedResourceArray returned_resources;
214 resource_collection_->TakeUnusedResourcesForChildCompositor( 219 resource_collection_->TakeUnusedResourcesForChildCompositor(
215 &returned_resources); 220 &returned_resources);
216 shared_renderer_state_->InsertReturnedResourcesOnRT(returned_resources); 221 shared_renderer_state_->InsertReturnedResourcesOnRT(returned_resources);
217 } 222 }
218 223
219 } // namespace android_webview 224 } // 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