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

Unified Diff: chrome/browser/android/compositor/layer/tab_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/tab_layer.cc
diff --git a/chrome/browser/android/compositor/layer/tab_layer.cc b/chrome/browser/android/compositor/layer/tab_layer.cc
index 7061166f6197afbae738bd39dd523ddf93c966c1..a95fdd4a50696af3acfaa5041675966474fbab85 100644
--- a/chrome/browser/android/compositor/layer/tab_layer.cc
+++ b/chrome/browser/android/compositor/layer/tab_layer.cc
@@ -16,6 +16,7 @@
#include "chrome/browser/android/compositor/layer/toolbar_layer.h"
#include "chrome/browser/android/compositor/layer_title_cache.h"
#include "chrome/browser/android/compositor/tab_content_manager.h"
+#include "content/public/browser/android/compositor.h"
#include "ui/android/resources/resource_manager.h"
#include "ui/android/resources/ui_resource_android.h"
#include "ui/base/l10n/l10n_util_android.h"
@@ -530,16 +531,21 @@ TabLayer::TabLayer(bool incognito,
: incognito_(incognito),
resource_manager_(resource_manager),
layer_title_cache_(layer_title_cache),
- layer_(cc::Layer::Create()),
+ layer_(cc::Layer::Create(content::Compositor::LayerSettings())),
toolbar_layer_(ToolbarLayer::Create()),
- title_(cc::Layer::Create()),
+ title_(cc::Layer::Create(content::Compositor::LayerSettings())),
content_(ContentLayer::Create(tab_content_manager)),
- padding_(cc::SolidColorLayer::Create()),
- close_button_(cc::UIResourceLayer::Create()),
- front_border_(cc::NinePatchLayer::Create()),
- contour_shadow_(cc::NinePatchLayer::Create()),
- shadow_(cc::NinePatchLayer::Create()),
- back_logo_(cc::UIResourceLayer::Create()),
+ padding_(
+ cc::SolidColorLayer::Create(content::Compositor::LayerSettings())),
+ close_button_(
+ cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
+ front_border_(
+ cc::NinePatchLayer::Create(content::Compositor::LayerSettings())),
+ contour_shadow_(
+ cc::NinePatchLayer::Create(content::Compositor::LayerSettings())),
+ shadow_(cc::NinePatchLayer::Create(content::Compositor::LayerSettings())),
+ back_logo_(
+ cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
brightness_(1.f) {
layer_->AddChild(shadow_);
layer_->AddChild(contour_shadow_);

Powered by Google App Engine
This is Rietveld 408576698