| 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 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 DCHECK(!m_drawProperties.render_surface); | 114 DCHECK(!m_drawProperties.render_surface); |
| 115 m_drawProperties.render_surface = make_scoped_ptr(new RenderSurfaceImpl(this
)); | 115 m_drawProperties.render_surface = make_scoped_ptr(new RenderSurfaceImpl(this
)); |
| 116 m_drawProperties.render_target = this; | 116 m_drawProperties.render_target = this; |
| 117 } | 117 } |
| 118 | 118 |
| 119 scoped_ptr<SharedQuadState> LayerImpl::createSharedQuadState() const | 119 scoped_ptr<SharedQuadState> LayerImpl::createSharedQuadState() const |
| 120 { | 120 { |
| 121 scoped_ptr<SharedQuadState> state = SharedQuadState::Create(); | 121 scoped_ptr<SharedQuadState> state = SharedQuadState::Create(); |
| 122 state->SetAll(m_drawProperties.target_space_transform, | 122 state->SetAll(m_drawProperties.target_space_transform, |
| 123 m_drawProperties.visible_content_rect, | 123 m_drawProperties.visible_content_rect, |
| 124 m_drawProperties.drawable_content_rect, | |
| 125 m_drawProperties.clip_rect, | 124 m_drawProperties.clip_rect, |
| 126 m_drawProperties.is_clipped, | 125 m_drawProperties.is_clipped, |
| 127 m_drawProperties.opacity); | 126 m_drawProperties.opacity); |
| 128 return state.Pass(); | 127 return state.Pass(); |
| 129 } | 128 } |
| 130 | 129 |
| 131 void LayerImpl::willDraw(ResourceProvider*) | 130 void LayerImpl::willDraw(ResourceProvider*) |
| 132 { | 131 { |
| 133 #ifndef NDEBUG | 132 #ifndef NDEBUG |
| 134 // willDraw/didDraw must be matched. | 133 // willDraw/didDraw must be matched. |
| (...skipping 744 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 879 { | 878 { |
| 880 m_horizontalScrollbarLayer = scrollbarLayer; | 879 m_horizontalScrollbarLayer = scrollbarLayer; |
| 881 } | 880 } |
| 882 | 881 |
| 883 void LayerImpl::setVerticalScrollbarLayer(ScrollbarLayerImpl* scrollbarLayer) | 882 void LayerImpl::setVerticalScrollbarLayer(ScrollbarLayerImpl* scrollbarLayer) |
| 884 { | 883 { |
| 885 m_verticalScrollbarLayer = scrollbarLayer; | 884 m_verticalScrollbarLayer = scrollbarLayer; |
| 886 } | 885 } |
| 887 | 886 |
| 888 } // namespace cc | 887 } // namespace cc |
| OLD | NEW |