OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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/layer_impl.h" | 5 #include "cc/layer_impl.h" |
6 | 6 |
7 #include "base/debug/trace_event.h" | 7 #include "base/debug/trace_event.h" |
8 #include "base/stringprintf.h" | 8 #include "base/stringprintf.h" |
9 #include "base/values.h" | 9 #include "base/values.h" |
10 #include "cc/animation_registrar.h" | 10 #include "cc/animation_registrar.h" |
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
115 { | 115 { |
116 DCHECK(!m_drawProperties.render_surface); | 116 DCHECK(!m_drawProperties.render_surface); |
117 m_drawProperties.render_surface = make_scoped_ptr(new RenderSurfaceImpl(this
)); | 117 m_drawProperties.render_surface = make_scoped_ptr(new RenderSurfaceImpl(this
)); |
118 m_drawProperties.render_target = this; | 118 m_drawProperties.render_target = this; |
119 } | 119 } |
120 | 120 |
121 scoped_ptr<SharedQuadState> LayerImpl::createSharedQuadState() const | 121 scoped_ptr<SharedQuadState> LayerImpl::createSharedQuadState() const |
122 { | 122 { |
123 scoped_ptr<SharedQuadState> state = SharedQuadState::Create(); | 123 scoped_ptr<SharedQuadState> state = SharedQuadState::Create(); |
124 state->SetAll(m_drawProperties.target_space_transform, | 124 state->SetAll(m_drawProperties.target_space_transform, |
| 125 m_drawProperties.content_bounds, |
125 m_drawProperties.visible_content_rect, | 126 m_drawProperties.visible_content_rect, |
126 m_drawProperties.clip_rect, | 127 m_drawProperties.clip_rect, |
127 m_drawProperties.is_clipped, | 128 m_drawProperties.is_clipped, |
128 m_drawProperties.opacity); | 129 m_drawProperties.opacity); |
129 return state.Pass(); | 130 return state.Pass(); |
130 } | 131 } |
131 | 132 |
132 void LayerImpl::willDraw(ResourceProvider*) | 133 void LayerImpl::willDraw(ResourceProvider*) |
133 { | 134 { |
134 #ifndef NDEBUG | 135 #ifndef NDEBUG |
(...skipping 849 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
984 } | 985 } |
985 | 986 |
986 scoped_ptr<base::Value> LayerImpl::AsValue() const | 987 scoped_ptr<base::Value> LayerImpl::AsValue() const |
987 { | 988 { |
988 scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue()); | 989 scoped_ptr<base::DictionaryValue> state(new base::DictionaryValue()); |
989 AsValueInto(state.get()); | 990 AsValueInto(state.get()); |
990 return state.PassAs<base::Value>(); | 991 return state.PassAs<base::Value>(); |
991 } | 992 } |
992 | 993 |
993 } // namespace cc | 994 } // namespace cc |
OLD | NEW |