| 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 "config.h" | 5 #include "config.h" |
| 6 | 6 |
| 7 #if USE(ACCELERATED_COMPOSITING) | 7 #if USE(ACCELERATED_COMPOSITING) |
| 8 | 8 |
| 9 #include "CCLayerImpl.h" | 9 #include "CCLayerImpl.h" |
| 10 | 10 |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 115 | 115 |
| 116 bool CCLayerImpl::descendantDrawsContent() | 116 bool CCLayerImpl::descendantDrawsContent() |
| 117 { | 117 { |
| 118 for (size_t i = 0; i < m_children.size(); ++i) { | 118 for (size_t i = 0; i < m_children.size(); ++i) { |
| 119 if (m_children[i]->drawsContent() || m_children[i]->descendantDrawsConte
nt()) | 119 if (m_children[i]->drawsContent() || m_children[i]->descendantDrawsConte
nt()) |
| 120 return true; | 120 return true; |
| 121 } | 121 } |
| 122 return false; | 122 return false; |
| 123 } | 123 } |
| 124 | 124 |
| 125 PassOwnPtr<CCSharedQuadState> CCLayerImpl::createSharedQuadState() const | 125 scoped_ptr<CCSharedQuadState> CCLayerImpl::createSharedQuadState() const |
| 126 { | 126 { |
| 127 return CCSharedQuadState::create(m_drawTransform, m_visibleContentRect, m_dr
awableContentRect, m_drawOpacity, m_opaque); | 127 return CCSharedQuadState::create(m_drawTransform, m_visibleContentRect, m_dr
awableContentRect, m_drawOpacity, m_opaque); |
| 128 } | 128 } |
| 129 | 129 |
| 130 void CCLayerImpl::willDraw(CCResourceProvider*) | 130 void CCLayerImpl::willDraw(CCResourceProvider*) |
| 131 { | 131 { |
| 132 #ifndef NDEBUG | 132 #ifndef NDEBUG |
| 133 // willDraw/didDraw must be matched. | 133 // willDraw/didDraw must be matched. |
| 134 ASSERT(!m_betweenWillDrawAndDidDraw); | 134 ASSERT(!m_betweenWillDrawAndDidDraw); |
| 135 m_betweenWillDrawAndDidDraw = true; | 135 m_betweenWillDrawAndDidDraw = true; |
| 136 #endif | 136 #endif |
| 137 } | 137 } |
| 138 | 138 |
| 139 void CCLayerImpl::didDraw(CCResourceProvider*) | 139 void CCLayerImpl::didDraw(CCResourceProvider*) |
| 140 { | 140 { |
| 141 #ifndef NDEBUG | 141 #ifndef NDEBUG |
| 142 ASSERT(m_betweenWillDrawAndDidDraw); | 142 ASSERT(m_betweenWillDrawAndDidDraw); |
| 143 m_betweenWillDrawAndDidDraw = false; | 143 m_betweenWillDrawAndDidDraw = false; |
| 144 #endif | 144 #endif |
| 145 } | 145 } |
| 146 | 146 |
| 147 void CCLayerImpl::appendDebugBorderQuad(CCQuadSink& quadList, const CCSharedQuad
State* sharedQuadState, CCAppendQuadsData& appendQuadsData) const | 147 void CCLayerImpl::appendDebugBorderQuad(CCQuadSink& quadList, const CCSharedQuad
State* sharedQuadState, CCAppendQuadsData& appendQuadsData) const |
| 148 { | 148 { |
| 149 if (!hasDebugBorders()) | 149 if (!hasDebugBorders()) |
| 150 return; | 150 return; |
| 151 | 151 |
| 152 IntRect contentRect(IntPoint(), contentBounds()); | 152 IntRect contentRect(IntPoint(), contentBounds()); |
| 153 quadList.append(CCDebugBorderDrawQuad::create(sharedQuadState, contentRect,
debugBorderColor(), debugBorderWidth()), appendQuadsData); | 153 quadList.append(CCDebugBorderDrawQuad::create(sharedQuadState, contentRect,
debugBorderColor(), debugBorderWidth()).PassAs<CCDrawQuad>(), appendQuadsData); |
| 154 } | 154 } |
| 155 | 155 |
| 156 bool CCLayerImpl::hasContributingDelegatedRenderPasses() const | 156 bool CCLayerImpl::hasContributingDelegatedRenderPasses() const |
| 157 { | 157 { |
| 158 return false; | 158 return false; |
| 159 } | 159 } |
| 160 | 160 |
| 161 CCRenderPass::Id CCLayerImpl::firstContributingRenderPassId() const | 161 CCRenderPass::Id CCLayerImpl::firstContributingRenderPassId() const |
| 162 { | 162 { |
| 163 return CCRenderPass::Id(0, 0); | 163 return CCRenderPass::Id(0, 0); |
| (...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 668 if (!m_scrollbarAnimationController) | 668 if (!m_scrollbarAnimationController) |
| 669 m_scrollbarAnimationController = CCScrollbarAnimationController::create(
this); | 669 m_scrollbarAnimationController = CCScrollbarAnimationController::create(
this); |
| 670 m_scrollbarAnimationController->setVerticalScrollbarLayer(scrollbarLayer); | 670 m_scrollbarAnimationController->setVerticalScrollbarLayer(scrollbarLayer); |
| 671 m_scrollbarAnimationController->updateScrollOffset(this); | 671 m_scrollbarAnimationController->updateScrollOffset(this); |
| 672 } | 672 } |
| 673 | 673 |
| 674 } | 674 } |
| 675 | 675 |
| 676 | 676 |
| 677 #endif // USE(ACCELERATED_COMPOSITING) | 677 #endif // USE(ACCELERATED_COMPOSITING) |
| OLD | NEW |