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 "cc/debug_border_draw_quad.h" | 9 #include "cc/debug_border_draw_quad.h" |
10 #include "cc/debug_colors.h" | 10 #include "cc/debug_colors.h" |
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
118 { | 118 { |
119 for (size_t i = 0; i < m_children.size(); ++i) { | 119 for (size_t i = 0; i < m_children.size(); ++i) { |
120 if (m_children[i]->drawsContent() || m_children[i]->descendantDrawsConte
nt()) | 120 if (m_children[i]->drawsContent() || m_children[i]->descendantDrawsConte
nt()) |
121 return true; | 121 return true; |
122 } | 122 } |
123 return false; | 123 return false; |
124 } | 124 } |
125 | 125 |
126 scoped_ptr<SharedQuadState> LayerImpl::createSharedQuadState() const | 126 scoped_ptr<SharedQuadState> LayerImpl::createSharedQuadState() const |
127 { | 127 { |
128 return SharedQuadState::create(m_drawTransform, m_visibleContentRect, m_draw
ableContentRect, m_drawOpacity); | 128 scoped_ptr<SharedQuadState> state = SharedQuadState::Create(); |
| 129 state->SetAll(m_drawTransform, m_visibleContentRect, m_drawableContentRect, m_
drawOpacity); |
| 130 return state.Pass(); |
129 } | 131 } |
130 | 132 |
131 void LayerImpl::willDraw(ResourceProvider*) | 133 void LayerImpl::willDraw(ResourceProvider*) |
132 { | 134 { |
133 #ifndef NDEBUG | 135 #ifndef NDEBUG |
134 // willDraw/didDraw must be matched. | 136 // willDraw/didDraw must be matched. |
135 DCHECK(!m_betweenWillDrawAndDidDraw); | 137 DCHECK(!m_betweenWillDrawAndDidDraw); |
136 m_betweenWillDrawAndDidDraw = true; | 138 m_betweenWillDrawAndDidDraw = true; |
137 #endif | 139 #endif |
138 } | 140 } |
(...skipping 573 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
712 | 714 |
713 void LayerImpl::setVerticalScrollbarLayer(ScrollbarLayerImpl* scrollbarLayer) | 715 void LayerImpl::setVerticalScrollbarLayer(ScrollbarLayerImpl* scrollbarLayer) |
714 { | 716 { |
715 if (!m_scrollbarAnimationController) | 717 if (!m_scrollbarAnimationController) |
716 m_scrollbarAnimationController = ScrollbarAnimationController::create(th
is); | 718 m_scrollbarAnimationController = ScrollbarAnimationController::create(th
is); |
717 m_scrollbarAnimationController->setVerticalScrollbarLayer(scrollbarLayer); | 719 m_scrollbarAnimationController->setVerticalScrollbarLayer(scrollbarLayer); |
718 m_scrollbarAnimationController->updateScrollOffset(this); | 720 m_scrollbarAnimationController->updateScrollOffset(this); |
719 } | 721 } |
720 | 722 |
721 } // namespace cc | 723 } // namespace cc |
OLD | NEW |