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

Unified 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, 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 side-by-side diff with in-line comments
Download patch
« 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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/child_frame_compositing_helper.cc
diff --git a/content/renderer/child_frame_compositing_helper.cc b/content/renderer/child_frame_compositing_helper.cc
index 4ac2315b6fa2d9ac92545a44cd8f294d6ad92d34..550152b699278132fcfbb2731b851391be736d55 100644
--- a/content/renderer/child_frame_compositing_helper.cc
+++ b/content/renderer/child_frame_compositing_helper.cc
@@ -133,7 +133,8 @@ void ChildFrameCompositingHelper::DidCommitCompositorFrame() {
void ChildFrameCompositingHelper::EnableCompositing(bool enable) {
if (enable && !background_layer_.get()) {
- background_layer_ = cc::SolidColorLayer::Create();
+ background_layer_ =
+ cc::SolidColorLayer::Create(cc_blink::WebLayerImpl::LayerSettings());
background_layer_->SetMasksToBounds(true);
background_layer_->SetBackgroundColor(
SkColorSetARGBInline(255, 255, 255, 255));
@@ -240,8 +241,8 @@ void ChildFrameCompositingHelper::OnCompositorFrameSwapped(
resource_collection_.get(), frame->delegated_frame_data.Pass());
if (delegated_layer_.get())
delegated_layer_->RemoveFromParent();
- delegated_layer_ =
- cc::DelegatedRendererLayer::Create(frame_provider_.get());
+ delegated_layer_ = cc::DelegatedRendererLayer::Create(
+ cc_blink::WebLayerImpl::LayerSettings(), frame_provider_.get());
delegated_layer_->SetIsDrawable(true);
buffer_size_ = gfx::Size();
SetContentsOpaque(opaque_);
« 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