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

Unified Diff: chrome/browser/android/compositor/layer/toolbar_layer.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
Index: chrome/browser/android/compositor/layer/toolbar_layer.cc
diff --git a/chrome/browser/android/compositor/layer/toolbar_layer.cc b/chrome/browser/android/compositor/layer/toolbar_layer.cc
index 10ef0cf51923fda94486979c3e9d1f3ca31fa664..085286cb4e24c9d86624693e8f2a259bfe1eaf9e 100644
--- a/chrome/browser/android/compositor/layer/toolbar_layer.cc
+++ b/chrome/browser/android/compositor/layer/toolbar_layer.cc
@@ -6,6 +6,7 @@
#include "cc/layers/solid_color_layer.h"
#include "cc/layers/ui_resource_layer.h"
+#include "content/public/browser/android/compositor.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/android/resources/resource_manager.h"
#include "ui/android/resources/ui_resource_android.h"
@@ -64,11 +65,15 @@ void ToolbarLayer::PushResource(
}
ToolbarLayer::ToolbarLayer()
- : layer_(cc::Layer::Create()),
- bitmap_layer_(cc::UIResourceLayer::Create()),
- progress_layer_(cc::UIResourceLayer::Create()),
- anonymize_layer_(cc::SolidColorLayer::Create()),
- debug_layer_(cc::SolidColorLayer::Create()) {
+ : layer_(cc::Layer::Create(content::Compositor::LayerSettings())),
+ bitmap_layer_(
+ cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
+ progress_layer_(
+ cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
+ anonymize_layer_(
+ cc::SolidColorLayer::Create(content::Compositor::LayerSettings())),
+ debug_layer_(
+ cc::SolidColorLayer::Create(content::Compositor::LayerSettings())) {
bitmap_layer_->SetIsDrawable(true);
layer_->AddChild(bitmap_layer_);

Powered by Google App Engine
This is Rietveld 408576698