| 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/layers/layer_impl.h" | 5 #include "cc/layers/layer_impl.h" |
| 6 | 6 |
| 7 #include "base/debug/trace_event.h" | 7 #include "base/debug/trace_event.h" |
| 8 #include "base/debug/trace_event_argument.h" | 8 #include "base/debug/trace_event_argument.h" |
| 9 #include "base/json/json_reader.h" | 9 #include "base/json/json_reader.h" |
| 10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" |
| (...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 342 } | 342 } |
| 343 | 343 |
| 344 RenderPassId LayerImpl::FirstContributingRenderPassId() const { | 344 RenderPassId LayerImpl::FirstContributingRenderPassId() const { |
| 345 return RenderPassId(0, 0); | 345 return RenderPassId(0, 0); |
| 346 } | 346 } |
| 347 | 347 |
| 348 RenderPassId LayerImpl::NextContributingRenderPassId(RenderPassId id) const { | 348 RenderPassId LayerImpl::NextContributingRenderPassId(RenderPassId id) const { |
| 349 return RenderPassId(0, 0); | 349 return RenderPassId(0, 0); |
| 350 } | 350 } |
| 351 | 351 |
| 352 ResourceProvider::ResourceId LayerImpl::ContentsResourceId() const { | 352 void LayerImpl::GetContentsResourceId(ResourceProvider::ResourceId* resource_id, |
| 353 gfx::Size* resource_size) const { |
| 353 NOTREACHED(); | 354 NOTREACHED(); |
| 354 return 0; | 355 *resource_id = 0; |
| 355 } | 356 } |
| 356 | 357 |
| 357 void LayerImpl::SetSentScrollDelta(const gfx::Vector2dF& sent_scroll_delta) { | 358 void LayerImpl::SetSentScrollDelta(const gfx::Vector2dF& sent_scroll_delta) { |
| 358 // Pending tree never has sent scroll deltas | 359 // Pending tree never has sent scroll deltas |
| 359 DCHECK(layer_tree_impl()->IsActiveTree()); | 360 DCHECK(layer_tree_impl()->IsActiveTree()); |
| 360 | 361 |
| 361 if (sent_scroll_delta_ == sent_scroll_delta) | 362 if (sent_scroll_delta_ == sent_scroll_delta) |
| 362 return; | 363 return; |
| 363 | 364 |
| 364 sent_scroll_delta_ = sent_scroll_delta; | 365 sent_scroll_delta_ = sent_scroll_delta; |
| (...skipping 1208 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1573 } | 1574 } |
| 1574 | 1575 |
| 1575 void LayerImpl::NotifyAnimationFinished( | 1576 void LayerImpl::NotifyAnimationFinished( |
| 1576 base::TimeTicks monotonic_time, | 1577 base::TimeTicks monotonic_time, |
| 1577 Animation::TargetProperty target_property) { | 1578 Animation::TargetProperty target_property) { |
| 1578 if (target_property == Animation::ScrollOffset) | 1579 if (target_property == Animation::ScrollOffset) |
| 1579 layer_tree_impl_->InputScrollAnimationFinished(); | 1580 layer_tree_impl_->InputScrollAnimationFinished(); |
| 1580 } | 1581 } |
| 1581 | 1582 |
| 1582 } // namespace cc | 1583 } // namespace cc |
| OLD | NEW |