| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/content_layer.h" | 5 #include "chrome/browser/android/compositor/layer/content_layer.h" |
| 6 | 6 |
| 7 #include "base/lazy_instance.h" |
| 7 #include "cc/layers/layer.h" | 8 #include "cc/layers/layer.h" |
| 8 #include "cc/layers/layer_lists.h" | 9 #include "cc/layers/layer_lists.h" |
| 9 #include "chrome/browser/android/compositor/layer/thumbnail_layer.h" | 10 #include "chrome/browser/android/compositor/layer/thumbnail_layer.h" |
| 10 #include "chrome/browser/android/compositor/tab_content_manager.h" | 11 #include "chrome/browser/android/compositor/tab_content_manager.h" |
| 12 #include "content/public/browser/android/compositor.h" |
| 11 #include "ui/gfx/geometry/size.h" | 13 #include "ui/gfx/geometry/size.h" |
| 12 | 14 |
| 13 namespace chrome { | 15 namespace chrome { |
| 14 namespace android { | 16 namespace android { |
| 15 | 17 |
| 16 // static | 18 // static |
| 17 scoped_refptr<ContentLayer> ContentLayer::Create( | 19 scoped_refptr<ContentLayer> ContentLayer::Create( |
| 18 TabContentManager* tab_content_manager) { | 20 TabContentManager* tab_content_manager) { |
| 19 return make_scoped_refptr(new ContentLayer(tab_content_manager)); | 21 return make_scoped_refptr(new ContentLayer(tab_content_manager)); |
| 20 } | 22 } |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 if (content_attached_ && DoesLeafDrawContents(layer()->children()[0])) | 156 if (content_attached_ && DoesLeafDrawContents(layer()->children()[0])) |
| 155 return layer_->children()[0]->bounds(); | 157 return layer_->children()[0]->bounds(); |
| 156 return gfx::Size(0, 0); | 158 return gfx::Size(0, 0); |
| 157 } | 159 } |
| 158 | 160 |
| 159 scoped_refptr<cc::Layer> ContentLayer::layer() { | 161 scoped_refptr<cc::Layer> ContentLayer::layer() { |
| 160 return layer_; | 162 return layer_; |
| 161 } | 163 } |
| 162 | 164 |
| 163 ContentLayer::ContentLayer(TabContentManager* tab_content_manager) | 165 ContentLayer::ContentLayer(TabContentManager* tab_content_manager) |
| 164 : layer_(cc::Layer::Create()), | 166 : layer_(cc::Layer::Create(content::Compositor::LayerSettings())), |
| 165 content_attached_(false), | 167 content_attached_(false), |
| 166 static_attached_(false), | 168 static_attached_(false), |
| 167 tab_content_manager_(tab_content_manager) { | 169 tab_content_manager_(tab_content_manager) { |
| 168 } | 170 } |
| 169 | 171 |
| 170 ContentLayer::~ContentLayer() { | 172 ContentLayer::~ContentLayer() { |
| 171 } | 173 } |
| 172 | 174 |
| 173 void ContentLayer::SetContentLayer(scoped_refptr<cc::Layer> layer) { | 175 void ContentLayer::SetContentLayer(scoped_refptr<cc::Layer> layer) { |
| 174 // Check indices | 176 // Check indices |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 246 | 248 |
| 247 void ContentLayer::ClipStaticLayer(scoped_refptr<ThumbnailLayer> static_layer, | 249 void ContentLayer::ClipStaticLayer(scoped_refptr<ThumbnailLayer> static_layer, |
| 248 gfx::Rect clipping) { | 250 gfx::Rect clipping) { |
| 249 if (!static_layer.get()) | 251 if (!static_layer.get()) |
| 250 return; | 252 return; |
| 251 static_layer->Clip(clipping); | 253 static_layer->Clip(clipping); |
| 252 } | 254 } |
| 253 | 255 |
| 254 } // namespace android | 256 } // namespace android |
| 255 } // namespace chrome | 257 } // namespace chrome |
| OLD | NEW |