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 #include "CCLayerImpl.h" | 7 #include "CCLayerImpl.h" |
8 | 8 |
9 #include "base/debug/trace_event.h" | 9 #include "base/debug/trace_event.h" |
10 #include "base/stringprintf.h" | 10 #include "base/stringprintf.h" |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
52 , m_drawOpacityIsAnimating(false) | 52 , m_drawOpacityIsAnimating(false) |
53 , m_debugBorderColor(0) | 53 , m_debugBorderColor(0) |
54 , m_debugBorderWidth(0) | 54 , m_debugBorderWidth(0) |
55 , m_drawTransformIsAnimating(false) | 55 , m_drawTransformIsAnimating(false) |
56 , m_screenSpaceTransformIsAnimating(false) | 56 , m_screenSpaceTransformIsAnimating(false) |
57 #ifndef NDEBUG | 57 #ifndef NDEBUG |
58 , m_betweenWillDrawAndDidDraw(false) | 58 , m_betweenWillDrawAndDidDraw(false) |
59 #endif | 59 #endif |
60 , m_layerAnimationController(CCLayerAnimationController::create(this)) | 60 , m_layerAnimationController(CCLayerAnimationController::create(this)) |
61 { | 61 { |
62 ASSERT(CCProxy::isImplThread()); | 62 DCHECK(CCProxy::isImplThread()); |
63 ASSERT(m_layerId > 0); | 63 DCHECK(m_layerId > 0); |
64 } | 64 } |
65 | 65 |
66 CCLayerImpl::~CCLayerImpl() | 66 CCLayerImpl::~CCLayerImpl() |
67 { | 67 { |
68 ASSERT(CCProxy::isImplThread()); | 68 DCHECK(CCProxy::isImplThread()); |
69 #ifndef NDEBUG | 69 #ifndef NDEBUG |
70 ASSERT(!m_betweenWillDrawAndDidDraw); | 70 DCHECK(!m_betweenWillDrawAndDidDraw); |
71 #endif | 71 #endif |
72 } | 72 } |
73 | 73 |
74 void CCLayerImpl::addChild(scoped_ptr<CCLayerImpl> child) | 74 void CCLayerImpl::addChild(scoped_ptr<CCLayerImpl> child) |
75 { | 75 { |
76 child->setParent(this); | 76 child->setParent(this); |
77 m_children.append(child.Pass()); | 77 m_children.append(child.Pass()); |
78 } | 78 } |
79 | 79 |
80 void CCLayerImpl::removeFromParent() | 80 void CCLayerImpl::removeFromParent() |
(...skipping 18 matching lines...) Expand all Loading... |
99 m_children[0]->removeFromParent(); | 99 m_children[0]->removeFromParent(); |
100 } | 100 } |
101 | 101 |
102 void CCLayerImpl::clearChildList() | 102 void CCLayerImpl::clearChildList() |
103 { | 103 { |
104 m_children.clear(); | 104 m_children.clear(); |
105 } | 105 } |
106 | 106 |
107 void CCLayerImpl::createRenderSurface() | 107 void CCLayerImpl::createRenderSurface() |
108 { | 108 { |
109 ASSERT(!m_renderSurface); | 109 DCHECK(!m_renderSurface); |
110 m_renderSurface = make_scoped_ptr(new CCRenderSurface(this)); | 110 m_renderSurface = make_scoped_ptr(new CCRenderSurface(this)); |
111 setRenderTarget(this); | 111 setRenderTarget(this); |
112 } | 112 } |
113 | 113 |
114 bool CCLayerImpl::descendantDrawsContent() | 114 bool CCLayerImpl::descendantDrawsContent() |
115 { | 115 { |
116 for (size_t i = 0; i < m_children.size(); ++i) { | 116 for (size_t i = 0; i < m_children.size(); ++i) { |
117 if (m_children[i]->drawsContent() || m_children[i]->descendantDrawsConte
nt()) | 117 if (m_children[i]->drawsContent() || m_children[i]->descendantDrawsConte
nt()) |
118 return true; | 118 return true; |
119 } | 119 } |
120 return false; | 120 return false; |
121 } | 121 } |
122 | 122 |
123 scoped_ptr<CCSharedQuadState> CCLayerImpl::createSharedQuadState() const | 123 scoped_ptr<CCSharedQuadState> CCLayerImpl::createSharedQuadState() const |
124 { | 124 { |
125 return CCSharedQuadState::create(m_drawTransform, m_visibleContentRect, m_dr
awableContentRect, m_drawOpacity, m_contentsOpaque); | 125 return CCSharedQuadState::create(m_drawTransform, m_visibleContentRect, m_dr
awableContentRect, m_drawOpacity, m_contentsOpaque); |
126 } | 126 } |
127 | 127 |
128 void CCLayerImpl::willDraw(CCResourceProvider*) | 128 void CCLayerImpl::willDraw(CCResourceProvider*) |
129 { | 129 { |
130 #ifndef NDEBUG | 130 #ifndef NDEBUG |
131 // willDraw/didDraw must be matched. | 131 // willDraw/didDraw must be matched. |
132 ASSERT(!m_betweenWillDrawAndDidDraw); | 132 DCHECK(!m_betweenWillDrawAndDidDraw); |
133 m_betweenWillDrawAndDidDraw = true; | 133 m_betweenWillDrawAndDidDraw = true; |
134 #endif | 134 #endif |
135 } | 135 } |
136 | 136 |
137 void CCLayerImpl::didDraw(CCResourceProvider*) | 137 void CCLayerImpl::didDraw(CCResourceProvider*) |
138 { | 138 { |
139 #ifndef NDEBUG | 139 #ifndef NDEBUG |
140 ASSERT(m_betweenWillDrawAndDidDraw); | 140 DCHECK(m_betweenWillDrawAndDidDraw); |
141 m_betweenWillDrawAndDidDraw = false; | 141 m_betweenWillDrawAndDidDraw = false; |
142 #endif | 142 #endif |
143 } | 143 } |
144 | 144 |
145 void CCLayerImpl::appendDebugBorderQuad(CCQuadSink& quadList, const CCSharedQuad
State* sharedQuadState, CCAppendQuadsData& appendQuadsData) const | 145 void CCLayerImpl::appendDebugBorderQuad(CCQuadSink& quadList, const CCSharedQuad
State* sharedQuadState, CCAppendQuadsData& appendQuadsData) const |
146 { | 146 { |
147 if (!hasDebugBorders()) | 147 if (!hasDebugBorders()) |
148 return; | 148 return; |
149 | 149 |
150 IntRect contentRect(IntPoint(), contentBounds()); | 150 IntRect contentRect(IntPoint(), contentBounds()); |
(...skipping 10 matching lines...) Expand all Loading... |
161 return CCRenderPass::Id(0, 0); | 161 return CCRenderPass::Id(0, 0); |
162 } | 162 } |
163 | 163 |
164 CCRenderPass::Id CCLayerImpl::nextContributingRenderPassId(CCRenderPass::Id) con
st | 164 CCRenderPass::Id CCLayerImpl::nextContributingRenderPassId(CCRenderPass::Id) con
st |
165 { | 165 { |
166 return CCRenderPass::Id(0, 0); | 166 return CCRenderPass::Id(0, 0); |
167 } | 167 } |
168 | 168 |
169 CCResourceProvider::ResourceId CCLayerImpl::contentsResourceId() const | 169 CCResourceProvider::ResourceId CCLayerImpl::contentsResourceId() const |
170 { | 170 { |
171 ASSERT_NOT_REACHED(); | 171 NOTREACHED(); |
172 return 0; | 172 return 0; |
173 } | 173 } |
174 | 174 |
175 FloatSize CCLayerImpl::scrollBy(const FloatSize& scroll) | 175 FloatSize CCLayerImpl::scrollBy(const FloatSize& scroll) |
176 { | 176 { |
177 IntSize minDelta = -toSize(m_scrollPosition); | 177 IntSize minDelta = -toSize(m_scrollPosition); |
178 IntSize maxDelta = m_maxScrollPosition - toSize(m_scrollPosition); | 178 IntSize maxDelta = m_maxScrollPosition - toSize(m_scrollPosition); |
179 // Clamp newDelta so that position + delta stays within scroll bounds. | 179 // Clamp newDelta so that position + delta stays within scroll bounds. |
180 FloatSize newDelta = (m_scrollDelta + scroll).expandedTo(minDelta).shrunkTo(
maxDelta); | 180 FloatSize newDelta = (m_scrollDelta + scroll).expandedTo(minDelta).shrunkTo(
maxDelta); |
181 FloatSize unscrolled = m_scrollDelta + scroll - newDelta; | 181 FloatSize unscrolled = m_scrollDelta + scroll - newDelta; |
(...skipping 489 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
671 | 671 |
672 void CCLayerImpl::setVerticalScrollbarLayer(CCScrollbarLayerImpl* scrollbarLayer
) | 672 void CCLayerImpl::setVerticalScrollbarLayer(CCScrollbarLayerImpl* scrollbarLayer
) |
673 { | 673 { |
674 if (!m_scrollbarAnimationController) | 674 if (!m_scrollbarAnimationController) |
675 m_scrollbarAnimationController = CCScrollbarAnimationController::create(
this); | 675 m_scrollbarAnimationController = CCScrollbarAnimationController::create(
this); |
676 m_scrollbarAnimationController->setVerticalScrollbarLayer(scrollbarLayer); | 676 m_scrollbarAnimationController->setVerticalScrollbarLayer(scrollbarLayer); |
677 m_scrollbarAnimationController->updateScrollOffset(this); | 677 m_scrollbarAnimationController->updateScrollOffset(this); |
678 } | 678 } |
679 | 679 |
680 } | 680 } |
OLD | NEW |