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

Unified Diff: cc/prioritized_texture.cc

Issue 11189043: cc: Rename cc classes and members to match filenames (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
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 side-by-side diff with in-line comments
Download patch
Index: cc/prioritized_texture.cc
diff --git a/cc/prioritized_texture.cc b/cc/prioritized_texture.cc
index 37ad64fedf8c11781c3fc2e36390e75c017168ca..1cb08a137d3765309c35d7e5191a847b1ea65651 100644
--- a/cc/prioritized_texture.cc
+++ b/cc/prioritized_texture.cc
@@ -15,11 +15,11 @@ using namespace std;
namespace cc {
-CCPrioritizedTexture::CCPrioritizedTexture(CCPrioritizedTextureManager* manager, IntSize size, GC3Denum format)
+PrioritizedTexture::PrioritizedTexture(PrioritizedTextureManager* manager, IntSize size, GC3Denum format)
: m_size(size)
, m_format(format)
, m_bytes(0)
- , m_priority(CCPriorityCalculator::lowestPriority())
+ , m_priority(PriorityCalculator::lowestPriority())
, m_isAbovePriorityCutoff(false)
, m_isSelfManaged(false)
, m_backing(0)
@@ -28,18 +28,18 @@ CCPrioritizedTexture::CCPrioritizedTexture(CCPrioritizedTextureManager* manager,
// m_manager is set in registerTexture() so validity can be checked.
ASSERT(format || size.isEmpty());
if (format)
- m_bytes = CCTexture::memorySizeBytes(size, format);
+ m_bytes = Texture::memorySizeBytes(size, format);
if (manager)
manager->registerTexture(this);
}
-CCPrioritizedTexture::~CCPrioritizedTexture()
+PrioritizedTexture::~PrioritizedTexture()
{
if (m_manager)
m_manager->unregisterTexture(this);
}
-void CCPrioritizedTexture::setTextureManager(CCPrioritizedTextureManager* manager)
+void PrioritizedTexture::setTextureManager(PrioritizedTextureManager* manager)
{
if (m_manager == manager)
return;
@@ -49,46 +49,46 @@ void CCPrioritizedTexture::setTextureManager(CCPrioritizedTextureManager* manage
manager->registerTexture(this);
}
-void CCPrioritizedTexture::setDimensions(IntSize size, GC3Denum format)
+void PrioritizedTexture::setDimensions(IntSize size, GC3Denum format)
{
if (m_format != format || m_size != size) {
m_isAbovePriorityCutoff = false;
m_format = format;
m_size = size;
- m_bytes = CCTexture::memorySizeBytes(size, format);
+ m_bytes = Texture::memorySizeBytes(size, format);
ASSERT(m_manager || !m_backing);
if (m_manager)
m_manager->returnBackingTexture(this);
}
}
-bool CCPrioritizedTexture::requestLate()
+bool PrioritizedTexture::requestLate()
{
if (!m_manager)
return false;
return m_manager->requestLate(this);
}
-bool CCPrioritizedTexture::backingResourceWasEvicted() const
+bool PrioritizedTexture::backingResourceWasEvicted() const
{
return m_backing ? m_backing->resourceHasBeenDeleted() : false;
}
-void CCPrioritizedTexture::acquireBackingTexture(CCResourceProvider* resourceProvider)
+void PrioritizedTexture::acquireBackingTexture(ResourceProvider* resourceProvider)
{
ASSERT(m_isAbovePriorityCutoff);
if (m_isAbovePriorityCutoff)
m_manager->acquireBackingTextureIfNeeded(this, resourceProvider);
}
-CCResourceProvider::ResourceId CCPrioritizedTexture::resourceId() const
+ResourceProvider::ResourceId PrioritizedTexture::resourceId() const
{
if (m_backing)
return m_backing->id();
return 0;
}
-void CCPrioritizedTexture::upload(CCResourceProvider* resourceProvider,
+void PrioritizedTexture::upload(ResourceProvider* resourceProvider,
const uint8_t* image, const IntRect& imageRect,
const IntRect& sourceRect, const IntSize& destOffset)
{
@@ -99,7 +99,7 @@ void CCPrioritizedTexture::upload(CCResourceProvider* resourceProvider,
resourceProvider->upload(resourceId(), image, imageRect, sourceRect, destOffset);
}
-void CCPrioritizedTexture::link(Backing* backing)
+void PrioritizedTexture::link(Backing* backing)
{
ASSERT(backing);
ASSERT(!backing->m_owner);
@@ -109,7 +109,7 @@ void CCPrioritizedTexture::link(Backing* backing)
m_backing->m_owner = this;
}
-void CCPrioritizedTexture::unlink()
+void PrioritizedTexture::unlink()
{
ASSERT(m_backing);
ASSERT(m_backing->m_owner == this);
@@ -118,17 +118,17 @@ void CCPrioritizedTexture::unlink()
m_backing = 0;
}
-void CCPrioritizedTexture::setToSelfManagedMemoryPlaceholder(size_t bytes)
+void PrioritizedTexture::setToSelfManagedMemoryPlaceholder(size_t bytes)
{
setDimensions(IntSize(), GraphicsContext3D::RGBA);
setIsSelfManaged(true);
m_bytes = bytes;
}
-CCPrioritizedTexture::Backing::Backing(unsigned id, CCResourceProvider* resourceProvider, IntSize size, GC3Denum format)
- : CCTexture(id, size, format)
+PrioritizedTexture::Backing::Backing(unsigned id, ResourceProvider* resourceProvider, IntSize size, GC3Denum format)
+ : Texture(id, size, format)
, m_owner(0)
- , m_priorityAtLastPriorityUpdate(CCPriorityCalculator::lowestPriority())
+ , m_priorityAtLastPriorityUpdate(PriorityCalculator::lowestPriority())
, m_wasAbovePriorityCutoffAtLastPriorityUpdate(false)
, m_inDrawingImplTree(false)
, m_resourceHasBeenDeleted(false)
@@ -138,15 +138,15 @@ CCPrioritizedTexture::Backing::Backing(unsigned id, CCResourceProvider* resource
{
}
-CCPrioritizedTexture::Backing::~Backing()
+PrioritizedTexture::Backing::~Backing()
{
ASSERT(!m_owner);
ASSERT(m_resourceHasBeenDeleted);
}
-void CCPrioritizedTexture::Backing::deleteResource(CCResourceProvider* resourceProvider)
+void PrioritizedTexture::Backing::deleteResource(ResourceProvider* resourceProvider)
{
- ASSERT(CCProxy::isImplThread());
+ ASSERT(Proxy::isImplThread());
ASSERT(!m_resourceHasBeenDeleted);
#ifndef NDEBUG
ASSERT(resourceProvider == m_resourceProvider);
@@ -157,36 +157,36 @@ void CCPrioritizedTexture::Backing::deleteResource(CCResourceProvider* resourceP
m_resourceHasBeenDeleted = true;
}
-bool CCPrioritizedTexture::Backing::resourceHasBeenDeleted() const
+bool PrioritizedTexture::Backing::resourceHasBeenDeleted() const
{
- ASSERT(CCProxy::isImplThread());
+ ASSERT(Proxy::isImplThread());
return m_resourceHasBeenDeleted;
}
-bool CCPrioritizedTexture::Backing::canBeRecycled() const
+bool PrioritizedTexture::Backing::canBeRecycled() const
{
- ASSERT(CCProxy::isImplThread());
+ ASSERT(Proxy::isImplThread());
return !m_wasAbovePriorityCutoffAtLastPriorityUpdate && !m_inDrawingImplTree;
}
-void CCPrioritizedTexture::Backing::updatePriority()
+void PrioritizedTexture::Backing::updatePriority()
{
- ASSERT(CCProxy::isImplThread() && CCProxy::isMainThreadBlocked());
+ ASSERT(Proxy::isImplThread() && Proxy::isMainThreadBlocked());
if (m_owner) {
m_priorityAtLastPriorityUpdate = m_owner->requestPriority();
m_wasAbovePriorityCutoffAtLastPriorityUpdate = m_owner->isAbovePriorityCutoff();
} else {
- m_priorityAtLastPriorityUpdate = CCPriorityCalculator::lowestPriority();
+ m_priorityAtLastPriorityUpdate = PriorityCalculator::lowestPriority();
m_wasAbovePriorityCutoffAtLastPriorityUpdate = false;
}
}
-void CCPrioritizedTexture::Backing::updateInDrawingImplTree()
+void PrioritizedTexture::Backing::updateInDrawingImplTree()
{
- ASSERT(CCProxy::isImplThread() && CCProxy::isMainThreadBlocked());
+ ASSERT(Proxy::isImplThread() && Proxy::isMainThreadBlocked());
m_inDrawingImplTree = !!owner();
if (!m_inDrawingImplTree)
- ASSERT(m_priorityAtLastPriorityUpdate == CCPriorityCalculator::lowestPriority());
+ ASSERT(m_priorityAtLastPriorityUpdate == PriorityCalculator::lowestPriority());
}
} // namespace cc

Powered by Google App Engine
This is Rietveld 408576698