| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 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 "cc/picture_layer.h" | 5 #include "cc/picture_layer.h" |
| 6 #include "cc/picture_layer_impl.h" | 6 #include "cc/picture_layer_impl.h" |
| 7 #include "ui/gfx/rect_conversions.h" | 7 #include "ui/gfx/rect_conversions.h" |
| 8 | 8 |
| 9 namespace cc { | 9 namespace cc { |
| 10 | 10 |
| 11 scoped_refptr<PictureLayer> PictureLayer::create(ContentLayerClient* client) { | 11 scoped_refptr<PictureLayer> PictureLayer::create(ContentLayerClient* client) { |
| 12 return make_scoped_refptr(new PictureLayer(client)); | 12 return make_scoped_refptr(new PictureLayer(client)); |
| 13 } | 13 } |
| 14 | 14 |
| 15 PictureLayer::PictureLayer(ContentLayerClient* client) : | 15 PictureLayer::PictureLayer(ContentLayerClient* client) : |
| 16 client_(client) { | 16 client_(client) { |
| 17 } | 17 } |
| 18 | 18 |
| 19 PictureLayer::~PictureLayer() { | 19 PictureLayer::~PictureLayer() { |
| 20 } | 20 } |
| 21 | 21 |
| 22 bool PictureLayer::drawsContent() const { | 22 bool PictureLayer::drawsContent() const { |
| 23 return Layer::drawsContent() && client_; | 23 return Layer::drawsContent() && client_; |
| 24 } | 24 } |
| 25 | 25 |
| 26 scoped_ptr<LayerImpl> PictureLayer::createLayerImpl() { | 26 scoped_ptr<LayerImpl> PictureLayer::createLayerImpl(LayerTreeHostImpl* host) { |
| 27 return PictureLayerImpl::create(id()).PassAs<LayerImpl>(); | 27 return PictureLayerImpl::create(host, id()).PassAs<LayerImpl>(); |
| 28 } | 28 } |
| 29 | 29 |
| 30 void PictureLayer::pushPropertiesTo(LayerImpl* base_layer) { | 30 void PictureLayer::pushPropertiesTo(LayerImpl* base_layer) { |
| 31 Layer::pushPropertiesTo(base_layer); | 31 Layer::pushPropertiesTo(base_layer); |
| 32 PictureLayerImpl* layer_impl = static_cast<PictureLayerImpl*>(base_layer); | 32 PictureLayerImpl* layer_impl = static_cast<PictureLayerImpl*>(base_layer); |
| 33 pile_.PushPropertiesTo(layer_impl->pile_); | 33 pile_.PushPropertiesTo(layer_impl->pile_); |
| 34 | 34 |
| 35 // TODO(enne): Once we have two trees on the impl side, we need to | 35 // TODO(enne): Once we have two trees on the impl side, we need to |
| 36 // sync the active layer's tiles prior to this Invalidate call since it | 36 // sync the active layer's tiles prior to this Invalidate call since it |
| 37 // will make new tiles for anything intersecting the invalidation. | 37 // will make new tiles for anything intersecting the invalidation. |
| (...skipping 16 matching lines...) Expand all Loading... |
| 54 | 54 |
| 55 // Calling paint in WebKit can sometimes cause invalidations, so save | 55 // Calling paint in WebKit can sometimes cause invalidations, so save |
| 56 // off the invalidation prior to calling update. | 56 // off the invalidation prior to calling update. |
| 57 pile_invalidation_.Swap(pending_invalidation_); | 57 pile_invalidation_.Swap(pending_invalidation_); |
| 58 pending_invalidation_.Clear(); | 58 pending_invalidation_.Clear(); |
| 59 | 59 |
| 60 pile_.Update(client_, pile_invalidation_, stats); | 60 pile_.Update(client_, pile_invalidation_, stats); |
| 61 } | 61 } |
| 62 | 62 |
| 63 } // namespace cc | 63 } // namespace cc |
| OLD | NEW |