| Index: ui/compositor/layer.cc
|
| diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
|
| index 3a76901f83140a1c37396de7e7704ffb9f005a3f..c80912f2a30df9c6711ebbd16cbe7f528df06182 100644
|
| --- a/ui/compositor/layer.cc
|
| +++ b/ui/compositor/layer.cc
|
| @@ -95,7 +95,7 @@ Layer::~Layer() {
|
| // Destroying the animator may cause observers to use the layer (and
|
| // indirectly the WebLayer). Destroy the animator first so that the WebLayer
|
| // is still around.
|
| - if (animator_)
|
| + if (animator_.get())
|
| animator_->SetDelegate(NULL);
|
| animator_ = NULL;
|
| if (compositor_)
|
| @@ -428,7 +428,7 @@ void Layer::SetColor(SkColor color) {
|
| }
|
|
|
| bool Layer::SchedulePaint(const gfx::Rect& invalid_rect) {
|
| - if (type_ == LAYER_SOLID_COLOR || (!delegate_ && !texture_))
|
| + if (type_ == LAYER_SOLID_COLOR || (!delegate_ && !texture_.get()))
|
| return false;
|
|
|
| damaged_region_.op(invalid_rect.x(),
|
| @@ -447,7 +447,7 @@ void Layer::ScheduleDraw() {
|
| }
|
|
|
| void Layer::SendDamagedRects() {
|
| - if ((delegate_ || texture_) && !damaged_region_.isEmpty()) {
|
| + if ((delegate_ || texture_.get()) && !damaged_region_.isEmpty()) {
|
| for (SkRegion::Iterator iter(damaged_region_);
|
| !iter.done(); iter.next()) {
|
| const SkIRect& sk_damaged = iter.rect();
|
|
|