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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "chrome/browser/android/compositor/layer/reader_mode_layer.h" 5 #include "chrome/browser/android/compositor/layer/reader_mode_layer.h"
6 6
7 #include "cc/layers/layer.h" 7 #include "cc/layers/layer.h"
8 #include "cc/layers/nine_patch_layer.h" 8 #include "cc/layers/nine_patch_layer.h"
9 #include "cc/layers/solid_color_layer.h" 9 #include "cc/layers/solid_color_layer.h"
10 #include "cc/layers/ui_resource_layer.h" 10 #include "cc/layers/ui_resource_layer.h"
11 #include "cc/output/filter_operation.h" 11 #include "cc/output/filter_operation.h"
12 #include "cc/output/filter_operations.h" 12 #include "cc/output/filter_operations.h"
13 #include "content/public/browser/android/compositor.h"
13 #include "content/public/browser/android/content_view_core.h" 14 #include "content/public/browser/android/content_view_core.h"
14 #include "content/public/browser/web_contents.h" 15 #include "content/public/browser/web_contents.h"
15 #include "third_party/skia/include/core/SkColor.h" 16 #include "third_party/skia/include/core/SkColor.h"
16 #include "ui/android/resources/resource_manager.h" 17 #include "ui/android/resources/resource_manager.h"
17 #include "ui/android/resources/ui_resource_android.h" 18 #include "ui/android/resources/ui_resource_android.h"
18 19
19 namespace chrome { 20 namespace chrome {
20 namespace android { 21 namespace android {
21 22
22 // static 23 // static
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
108 } else { 109 } else {
109 content_view_container_->RemoveAllChildren(); 110 content_view_container_->RemoveAllChildren();
110 } 111 }
111 112
112 // --------------------------------------------------------------------------- 113 // ---------------------------------------------------------------------------
113 // Reader Mode Panel. 114 // Reader Mode Panel.
114 // --------------------------------------------------------------------------- 115 // ---------------------------------------------------------------------------
115 layer_->SetPosition(gfx::PointF(x, 0.f)); 116 layer_->SetPosition(gfx::PointF(x, 0.f));
116 } 117 }
117 118
118 ReaderModeLayer::ReaderModeLayer( 119 ReaderModeLayer::ReaderModeLayer(ui::ResourceManager* resource_manager)
119 ui::ResourceManager* resource_manager)
120 : resource_manager_(resource_manager), 120 : resource_manager_(resource_manager),
121 layer_(cc::Layer::Create()), 121 layer_(cc::Layer::Create(content::Compositor::LayerSettings())),
122 panel_background_(cc::NinePatchLayer::Create()), 122 panel_background_(
123 panel_text_(cc::UIResourceLayer::Create()), 123 cc::NinePatchLayer::Create(content::Compositor::LayerSettings())),
124 content_shadow_(cc::NinePatchLayer::Create()), 124 panel_text_(
125 content_solid_(cc::SolidColorLayer::Create()), 125 cc::UIResourceLayer::Create(content::Compositor::LayerSettings())),
126 content_view_container_(cc::Layer::Create()) { 126 content_shadow_(
127 cc::NinePatchLayer::Create(content::Compositor::LayerSettings())),
128 content_solid_(
129 cc::SolidColorLayer::Create(content::Compositor::LayerSettings())),
130 content_view_container_(
131 cc::Layer::Create(content::Compositor::LayerSettings())) {
127 layer_->SetMasksToBounds(false); 132 layer_->SetMasksToBounds(false);
128 133
129 // Reader Mode Background 134 // Reader Mode Background
130 panel_background_->SetIsDrawable(true); 135 panel_background_->SetIsDrawable(true);
131 panel_background_->SetFillCenter(true); 136 panel_background_->SetFillCenter(true);
132 layer_->AddChild(panel_background_); 137 layer_->AddChild(panel_background_);
133 138
134 // Reader Mode Text 139 // Reader Mode Text
135 panel_text_->SetIsDrawable(true); 140 panel_text_->SetIsDrawable(true);
136 layer_->AddChild(panel_text_); 141 layer_->AddChild(panel_text_);
(...skipping 13 matching lines...) Expand all
150 155
151 ReaderModeLayer::~ReaderModeLayer() { 156 ReaderModeLayer::~ReaderModeLayer() {
152 } 157 }
153 158
154 scoped_refptr<cc::Layer> ReaderModeLayer::layer() { 159 scoped_refptr<cc::Layer> ReaderModeLayer::layer() {
155 return layer_; 160 return layer_;
156 } 161 }
157 162
158 } // namespace android 163 } // namespace android
159 } // namespace chrome 164 } // namespace chrome
OLDNEW
« 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