| 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/json/json_reader.h" | 8 #include "base/json/json_reader.h" |
| 9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
| 10 #include "cc/animation/animation_registrar.h" | 10 #include "cc/animation/animation_registrar.h" |
| (...skipping 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 360 RenderPass::Id LayerImpl::NextContributingRenderPassId(RenderPass::Id id) | 360 RenderPass::Id LayerImpl::NextContributingRenderPassId(RenderPass::Id id) |
| 361 const { | 361 const { |
| 362 return RenderPass::Id(0, 0); | 362 return RenderPass::Id(0, 0); |
| 363 } | 363 } |
| 364 | 364 |
| 365 ResourceProvider::ResourceId LayerImpl::ContentsResourceId() const { | 365 ResourceProvider::ResourceId LayerImpl::ContentsResourceId() const { |
| 366 NOTREACHED(); | 366 NOTREACHED(); |
| 367 return 0; | 367 return 0; |
| 368 } | 368 } |
| 369 | 369 |
| 370 void LayerImpl::SetSentScrollDelta(gfx::Vector2d sent_scroll_delta) { | 370 void LayerImpl::SetSentScrollDelta(const gfx::Vector2d& sent_scroll_delta) { |
| 371 // Pending tree never has sent scroll deltas | 371 // Pending tree never has sent scroll deltas |
| 372 DCHECK(layer_tree_impl()->IsActiveTree()); | 372 DCHECK(layer_tree_impl()->IsActiveTree()); |
| 373 | 373 |
| 374 if (sent_scroll_delta_ == sent_scroll_delta) | 374 if (sent_scroll_delta_ == sent_scroll_delta) |
| 375 return; | 375 return; |
| 376 | 376 |
| 377 sent_scroll_delta_ = sent_scroll_delta; | 377 sent_scroll_delta_ = sent_scroll_delta; |
| 378 } | 378 } |
| 379 | 379 |
| 380 gfx::Vector2dF LayerImpl::ScrollBy(const gfx::Vector2dF& scroll) { | 380 gfx::Vector2dF LayerImpl::ScrollBy(const gfx::Vector2dF& scroll) { |
| (...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1047 scroll_offset_delegate_ = scroll_offset_delegate; | 1047 scroll_offset_delegate_ = scroll_offset_delegate; |
| 1048 if (scroll_offset_delegate_) | 1048 if (scroll_offset_delegate_) |
| 1049 scroll_offset_delegate_->SetTotalScrollOffset(total_offset); | 1049 scroll_offset_delegate_->SetTotalScrollOffset(total_offset); |
| 1050 } | 1050 } |
| 1051 | 1051 |
| 1052 bool LayerImpl::IsExternalFlingActive() const { | 1052 bool LayerImpl::IsExternalFlingActive() const { |
| 1053 return scroll_offset_delegate_ && | 1053 return scroll_offset_delegate_ && |
| 1054 scroll_offset_delegate_->IsExternalFlingActive(); | 1054 scroll_offset_delegate_->IsExternalFlingActive(); |
| 1055 } | 1055 } |
| 1056 | 1056 |
| 1057 void LayerImpl::SetScrollOffset(gfx::Vector2d scroll_offset) { | 1057 void LayerImpl::SetScrollOffset(const gfx::Vector2d& scroll_offset) { |
| 1058 SetScrollOffsetAndDelta(scroll_offset, ScrollDelta()); | 1058 SetScrollOffsetAndDelta(scroll_offset, ScrollDelta()); |
| 1059 } | 1059 } |
| 1060 | 1060 |
| 1061 void LayerImpl::SetScrollOffsetAndDelta(gfx::Vector2d scroll_offset, | 1061 void LayerImpl::SetScrollOffsetAndDelta(const gfx::Vector2d& scroll_offset, |
| 1062 const gfx::Vector2dF& scroll_delta) { | 1062 const gfx::Vector2dF& scroll_delta) { |
| 1063 bool changed = false; | 1063 bool changed = false; |
| 1064 | 1064 |
| 1065 last_scroll_offset_ = scroll_offset; | 1065 last_scroll_offset_ = scroll_offset; |
| 1066 | 1066 |
| 1067 if (scroll_offset_ != scroll_offset) { | 1067 if (scroll_offset_ != scroll_offset) { |
| 1068 changed = true; | 1068 changed = true; |
| 1069 scroll_offset_ = scroll_offset; | 1069 scroll_offset_ = scroll_offset; |
| 1070 | 1070 |
| 1071 if (scroll_offset_delegate_) | 1071 if (scroll_offset_delegate_) |
| (...skipping 399 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1471 | 1471 |
| 1472 scoped_ptr<base::Value> LayerImpl::AsValue() const { | 1472 scoped_ptr<base::Value> LayerImpl::AsValue() const { |
| 1473 scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue()); | 1473 scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue()); |
| 1474 AsValueInto(state.get()); | 1474 AsValueInto(state.get()); |
| 1475 return state.PassAs<base::Value>(); | 1475 return state.PassAs<base::Value>(); |
| 1476 } | 1476 } |
| 1477 | 1477 |
| 1478 void LayerImpl::RunMicroBenchmark(MicroBenchmarkImpl* benchmark) { | 1478 void LayerImpl::RunMicroBenchmark(MicroBenchmarkImpl* benchmark) { |
| 1479 benchmark->RunOnLayer(this); | 1479 benchmark->RunOnLayer(this); |
| 1480 } | 1480 } |
| 1481 | |
| 1482 } // namespace cc | 1481 } // namespace cc |
| OLD | NEW |