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 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
138 } | 138 } |
139 | 139 |
140 void CCLayerImpl::didDraw(CCResourceProvider*) | 140 void CCLayerImpl::didDraw(CCResourceProvider*) |
141 { | 141 { |
142 #ifndef NDEBUG | 142 #ifndef NDEBUG |
143 ASSERT(m_betweenWillDrawAndDidDraw); | 143 ASSERT(m_betweenWillDrawAndDidDraw); |
144 m_betweenWillDrawAndDidDraw = false; | 144 m_betweenWillDrawAndDidDraw = false; |
145 #endif | 145 #endif |
146 } | 146 } |
147 | 147 |
148 void CCLayerImpl::appendDebugBorderQuad(CCQuadSink& quadList, const CCSharedQuad
State* sharedQuadState) const | 148 void CCLayerImpl::appendDebugBorderQuad(CCQuadSink& quadList, const CCSharedQuad
State* sharedQuadState, CCAppendQuadsData& appendQuadsData) const |
149 { | 149 { |
150 if (!hasDebugBorders()) | 150 if (!hasDebugBorders()) |
151 return; | 151 return; |
152 | 152 |
153 IntRect contentRect(IntPoint(), contentBounds()); | 153 IntRect contentRect(IntPoint(), contentBounds()); |
154 quadList.append(CCDebugBorderDrawQuad::create(sharedQuadState, contentRect,
debugBorderColor(), debugBorderWidth())); | 154 quadList.append(CCDebugBorderDrawQuad::create(sharedQuadState, contentRect,
debugBorderColor(), debugBorderWidth()), appendQuadsData); |
155 } | 155 } |
156 | 156 |
157 CCResourceProvider::ResourceId CCLayerImpl::contentsResourceId() const | 157 CCResourceProvider::ResourceId CCLayerImpl::contentsResourceId() const |
158 { | 158 { |
159 ASSERT_NOT_REACHED(); | 159 ASSERT_NOT_REACHED(); |
160 return 0; | 160 return 0; |
161 } | 161 } |
162 | 162 |
163 void CCLayerImpl::scrollBy(const FloatSize& scroll) | 163 void CCLayerImpl::scrollBy(const FloatSize& scroll) |
164 { | 164 { |
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
617 if (!m_scrollbarAnimationController) | 617 if (!m_scrollbarAnimationController) |
618 m_scrollbarAnimationController = CCScrollbarAnimationController::create(
this); | 618 m_scrollbarAnimationController = CCScrollbarAnimationController::create(
this); |
619 m_scrollbarAnimationController->setVerticalScrollbarLayer(scrollbarLayer); | 619 m_scrollbarAnimationController->setVerticalScrollbarLayer(scrollbarLayer); |
620 m_scrollbarAnimationController->updateScrollOffset(this); | 620 m_scrollbarAnimationController->updateScrollOffset(this); |
621 } | 621 } |
622 | 622 |
623 } | 623 } |
624 | 624 |
625 | 625 |
626 #endif // USE(ACCELERATED_COMPOSITING) | 626 #endif // USE(ACCELERATED_COMPOSITING) |
OLD | NEW |