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

Side by Side Diff: content/renderer/child_frame_compositing_helper.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, 6 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
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 "content/renderer/child_frame_compositing_helper.h" 5 #include "content/renderer/child_frame_compositing_helper.h"
6 6
7 #include "cc/blink/web_layer_impl.h" 7 #include "cc/blink/web_layer_impl.h"
8 #include "cc/layers/delegated_frame_provider.h" 8 #include "cc/layers/delegated_frame_provider.h"
9 #include "cc/layers/delegated_frame_resource_collection.h" 9 #include "cc/layers/delegated_frame_resource_collection.h"
10 #include "cc/layers/delegated_renderer_layer.h" 10 #include "cc/layers/delegated_renderer_layer.h"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 resource_collection_->TakeUnusedResourcesForChildCompositor( 126 resource_collection_->TakeUnusedResourcesForChildCompositor(
127 &params.ack.resources); 127 &params.ack.resources);
128 128
129 SendCompositorFrameSwappedACKToBrowser(params); 129 SendCompositorFrameSwappedACKToBrowser(params);
130 130
131 ack_pending_ = false; 131 ack_pending_ = false;
132 } 132 }
133 133
134 void ChildFrameCompositingHelper::EnableCompositing(bool enable) { 134 void ChildFrameCompositingHelper::EnableCompositing(bool enable) {
135 if (enable && !background_layer_.get()) { 135 if (enable && !background_layer_.get()) {
136 background_layer_ = cc::SolidColorLayer::Create(); 136 background_layer_ =
137 cc::SolidColorLayer::Create(cc_blink::WebLayerImpl::LayerSettings());
137 background_layer_->SetMasksToBounds(true); 138 background_layer_->SetMasksToBounds(true);
138 background_layer_->SetBackgroundColor( 139 background_layer_->SetBackgroundColor(
139 SkColorSetARGBInline(255, 255, 255, 255)); 140 SkColorSetARGBInline(255, 255, 255, 255));
140 web_layer_.reset(new cc_blink::WebLayerImpl(background_layer_)); 141 web_layer_.reset(new cc_blink::WebLayerImpl(background_layer_));
141 } 142 }
142 143
143 if (GetContainer()) { 144 if (GetContainer()) {
144 GetContainer()->setWebLayer(enable ? web_layer_.get() : NULL); 145 GetContainer()->setWebLayer(enable ? web_layer_.get() : NULL);
145 } else if (frame_) { 146 } else if (frame_) {
146 frame_->setRemoteWebLayer(enable ? web_layer_.get() : NULL); 147 frame_->setRemoteWebLayer(enable ? web_layer_.get() : NULL);
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 } 234 }
234 if (!resource_collection_.get()) { 235 if (!resource_collection_.get()) {
235 resource_collection_ = new cc::DelegatedFrameResourceCollection; 236 resource_collection_ = new cc::DelegatedFrameResourceCollection;
236 resource_collection_->SetClient(this); 237 resource_collection_->SetClient(this);
237 } 238 }
238 if (!frame_provider_.get() || frame_provider_->frame_size() != frame_size) { 239 if (!frame_provider_.get() || frame_provider_->frame_size() != frame_size) {
239 frame_provider_ = new cc::DelegatedFrameProvider( 240 frame_provider_ = new cc::DelegatedFrameProvider(
240 resource_collection_.get(), frame->delegated_frame_data.Pass()); 241 resource_collection_.get(), frame->delegated_frame_data.Pass());
241 if (delegated_layer_.get()) 242 if (delegated_layer_.get())
242 delegated_layer_->RemoveFromParent(); 243 delegated_layer_->RemoveFromParent();
243 delegated_layer_ = 244 delegated_layer_ = cc::DelegatedRendererLayer::Create(
244 cc::DelegatedRendererLayer::Create(frame_provider_.get()); 245 cc_blink::WebLayerImpl::LayerSettings(), frame_provider_.get());
245 delegated_layer_->SetIsDrawable(true); 246 delegated_layer_->SetIsDrawable(true);
246 buffer_size_ = gfx::Size(); 247 buffer_size_ = gfx::Size();
247 SetContentsOpaque(opaque_); 248 SetContentsOpaque(opaque_);
248 background_layer_->AddChild(delegated_layer_); 249 background_layer_->AddChild(delegated_layer_);
249 } else { 250 } else {
250 frame_provider_->SetFrameData(frame->delegated_frame_data.Pass()); 251 frame_provider_->SetFrameData(frame->delegated_frame_data.Pass());
251 } 252 }
252 253
253 CheckSizeAndAdjustLayerProperties( 254 CheckSizeAndAdjustLayerProperties(
254 frame_data->render_pass_list.back()->output_rect.size(), 255 frame_data->render_pass_list.back()->output_rect.size(),
(...skipping 28 matching lines...) Expand all
283 SendReclaimCompositorResourcesToBrowser(params); 284 SendReclaimCompositorResourcesToBrowser(params);
284 } 285 }
285 286
286 void ChildFrameCompositingHelper::SetContentsOpaque(bool opaque) { 287 void ChildFrameCompositingHelper::SetContentsOpaque(bool opaque) {
287 opaque_ = opaque; 288 opaque_ = opaque;
288 if (delegated_layer_.get()) 289 if (delegated_layer_.get())
289 delegated_layer_->SetContentsOpaque(opaque_); 290 delegated_layer_->SetContentsOpaque(opaque_);
290 } 291 }
291 292
292 } // namespace content 293 } // namespace content
OLDNEW
« no previous file with comments | « content/public/test/layouttest_support.h ('k') | content/renderer/gpu/render_widget_compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698