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

Unified Diff: chrome/browser/android/compositor/layer/reader_mode_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/reader_mode_layer.cc
diff --git a/chrome/browser/android/compositor/layer/reader_mode_layer.cc b/chrome/browser/android/compositor/layer/reader_mode_layer.cc
index 76a175903dc1bdf4f1fb48c0d71defdf7e819d77..54a3b578196bf3feef55a0a0d5ecc1cea3a448c5 100644
--- a/chrome/browser/android/compositor/layer/reader_mode_layer.cc
+++ b/chrome/browser/android/compositor/layer/reader_mode_layer.cc
@@ -10,6 +10,7 @@
#include "cc/layers/ui_resource_layer.h"
#include "cc/output/filter_operation.h"
#include "cc/output/filter_operations.h"
+#include "content/public/browser/android/compositor.h"
#include "content/public/browser/android/content_view_core.h"
#include "content/public/browser/web_contents.h"
#include "third_party/skia/include/core/SkColor.h"
@@ -115,15 +116,19 @@ void ReaderModeLayer::SetProperties(
layer_->SetPosition(gfx::PointF(x, 0.f));
}
-ReaderModeLayer::ReaderModeLayer(
- ui::ResourceManager* resource_manager)
+ReaderModeLayer::ReaderModeLayer(ui::ResourceManager* resource_manager)
: resource_manager_(resource_manager),
- layer_(cc::Layer::Create()),
- panel_background_(cc::NinePatchLayer::Create()),
- panel_text_(cc::UIResourceLayer::Create()),
- content_shadow_(cc::NinePatchLayer::Create()),
- content_solid_(cc::SolidColorLayer::Create()),
- content_view_container_(cc::Layer::Create()) {
+ layer_(cc::Layer::Create(content::Compositor::LayerSettings())),
+ panel_background_(
+ cc::NinePatchLayer::Create(content::Compositor::LayerSettings())),
+ panel_text_(
+ cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
+ content_shadow_(
+ cc::NinePatchLayer::Create(content::Compositor::LayerSettings())),
+ content_solid_(
+ cc::SolidColorLayer::Create(content::Compositor::LayerSettings())),
+ content_view_container_(
+ cc::Layer::Create(content::Compositor::LayerSettings())) {
layer_->SetMasksToBounds(false);
// Reader Mode Background
« no previous file with comments | « chrome/browser/android/compositor/layer/layer.h ('k') | chrome/browser/android/compositor/layer/tab_handle_layer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698