Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(238)

Side by Side Diff: cc/prioritized_texture.cc

Issue 11232051: Remove static thread pointers from CC (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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 "cc/prioritized_texture.h" 7 #include "cc/prioritized_texture.h"
8 8
9 #include "cc/prioritized_texture_manager.h" 9 #include "cc/prioritized_texture_manager.h"
10 #include "cc/priority_calculator.h" 10 #include "cc/priority_calculator.h"
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 } 139 }
140 140
141 CCPrioritizedTexture::Backing::~Backing() 141 CCPrioritizedTexture::Backing::~Backing()
142 { 142 {
143 DCHECK(!m_owner); 143 DCHECK(!m_owner);
144 DCHECK(m_resourceHasBeenDeleted); 144 DCHECK(m_resourceHasBeenDeleted);
145 } 145 }
146 146
147 void CCPrioritizedTexture::Backing::deleteResource(CCResourceProvider* resourceP rovider) 147 void CCPrioritizedTexture::Backing::deleteResource(CCResourceProvider* resourceP rovider)
148 { 148 {
149 DCHECK(CCProxy::isImplThread()); 149 DCHECK(resourceProvider->proxy()->isImplThread());
150 DCHECK(!m_resourceHasBeenDeleted); 150 DCHECK(!m_resourceHasBeenDeleted);
151 #ifndef NDEBUG 151 #ifndef NDEBUG
152 DCHECK(resourceProvider == m_resourceProvider); 152 DCHECK(resourceProvider == m_resourceProvider);
153 #endif 153 #endif
154 154
155 resourceProvider->deleteResource(id()); 155 resourceProvider->deleteResource(id());
156 setId(0); 156 setId(0);
157 m_resourceHasBeenDeleted = true; 157 m_resourceHasBeenDeleted = true;
158 } 158 }
159 159
160 bool CCPrioritizedTexture::Backing::resourceHasBeenDeleted() const 160 bool CCPrioritizedTexture::Backing::resourceHasBeenDeleted() const
161 { 161 {
162 DCHECK(CCProxy::isImplThread()); 162 // DCHECK(m_manager->proxy()->isImplThread());
163 return m_resourceHasBeenDeleted; 163 return m_resourceHasBeenDeleted;
164 } 164 }
165 165
166 bool CCPrioritizedTexture::Backing::canBeRecycled() const 166 bool CCPrioritizedTexture::Backing::canBeRecycled() const
167 { 167 {
168 DCHECK(CCProxy::isImplThread()); 168 // DCHECK(m_manager->proxy()->isImplThread());
169 return !m_wasAbovePriorityCutoffAtLastPriorityUpdate && !m_inDrawingImplTree ; 169 return !m_wasAbovePriorityCutoffAtLastPriorityUpdate && !m_inDrawingImplTree ;
170 } 170 }
171 171
172 void CCPrioritizedTexture::Backing::updatePriority() 172 void CCPrioritizedTexture::Backing::updatePriority()
173 { 173 {
174 DCHECK(CCProxy::isImplThread() && CCProxy::isMainThreadBlocked()); 174 // DCHECK(m_manager->proxy()->isImplThread() && m_manager->proxy()->isMainThr eadBlocked());
175 if (m_owner) { 175 if (m_owner) {
176 m_priorityAtLastPriorityUpdate = m_owner->requestPriority(); 176 m_priorityAtLastPriorityUpdate = m_owner->requestPriority();
177 m_wasAbovePriorityCutoffAtLastPriorityUpdate = m_owner->isAbovePriorityC utoff(); 177 m_wasAbovePriorityCutoffAtLastPriorityUpdate = m_owner->isAbovePriorityC utoff();
178 } else { 178 } else {
179 m_priorityAtLastPriorityUpdate = CCPriorityCalculator::lowestPriority(); 179 m_priorityAtLastPriorityUpdate = CCPriorityCalculator::lowestPriority();
180 m_wasAbovePriorityCutoffAtLastPriorityUpdate = false; 180 m_wasAbovePriorityCutoffAtLastPriorityUpdate = false;
181 } 181 }
182 } 182 }
183 183
184 void CCPrioritizedTexture::Backing::updateInDrawingImplTree() 184 void CCPrioritizedTexture::Backing::updateInDrawingImplTree()
185 { 185 {
186 DCHECK(CCProxy::isImplThread() && CCProxy::isMainThreadBlocked()); 186 // DCHECK(m_manager->proxy()->isImplThread() && m_manager->proxy()->isMainThr eadBlocked());
187 m_inDrawingImplTree = !!owner(); 187 m_inDrawingImplTree = !!owner();
188 if (!m_inDrawingImplTree) 188 if (!m_inDrawingImplTree)
189 DCHECK(m_priorityAtLastPriorityUpdate == CCPriorityCalculator::lowestPri ority()); 189 DCHECK(m_priorityAtLastPriorityUpdate == CCPriorityCalculator::lowestPri ority());
190 } 190 }
191 191
192 } // namespace cc 192 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698