| Index: cc/texture_update_queue.cc
|
| diff --git a/cc/texture_update_queue.cc b/cc/texture_update_queue.cc
|
| index bd48d774cf30c6f2e1a1adf7c7425debbae11775..d0d474067d95c88de0ae168c57b1bbbeb7925571 100644
|
| --- a/cc/texture_update_queue.cc
|
| +++ b/cc/texture_update_queue.cc
|
| @@ -10,36 +10,36 @@
|
|
|
| namespace cc {
|
|
|
| -CCTextureUpdateQueue::CCTextureUpdateQueue()
|
| +TextureUpdateQueue::TextureUpdateQueue()
|
| {
|
| }
|
|
|
| -CCTextureUpdateQueue::~CCTextureUpdateQueue()
|
| +TextureUpdateQueue::~TextureUpdateQueue()
|
| {
|
| }
|
|
|
| -void CCTextureUpdateQueue::appendFullUpload(TextureUploader::Parameters upload)
|
| +void TextureUpdateQueue::appendFullUpload(TextureUploader::Parameters upload)
|
| {
|
| m_fullEntries.push_back(upload);
|
| }
|
|
|
| -void CCTextureUpdateQueue::appendPartialUpload(TextureUploader::Parameters upload)
|
| +void TextureUpdateQueue::appendPartialUpload(TextureUploader::Parameters upload)
|
| {
|
| m_partialEntries.push_back(upload);
|
| }
|
|
|
| -void CCTextureUpdateQueue::appendCopy(TextureCopier::Parameters copy)
|
| +void TextureUpdateQueue::appendCopy(TextureCopier::Parameters copy)
|
| {
|
| m_copyEntries.push_back(copy);
|
| }
|
|
|
| -void CCTextureUpdateQueue::clearUploadsToEvictedResources()
|
| +void TextureUpdateQueue::clearUploadsToEvictedResources()
|
| {
|
| clearUploadsToEvictedResources(m_fullEntries);
|
| clearUploadsToEvictedResources(m_partialEntries);
|
| }
|
|
|
| -void CCTextureUpdateQueue::clearUploadsToEvictedResources(std::deque<TextureUploader::Parameters>& entryQueue)
|
| +void TextureUpdateQueue::clearUploadsToEvictedResources(std::deque<TextureUploader::Parameters>& entryQueue)
|
| {
|
| std::deque<TextureUploader::Parameters> temp;
|
| entryQueue.swap(temp);
|
| @@ -51,28 +51,28 @@ void CCTextureUpdateQueue::clearUploadsToEvictedResources(std::deque<TextureUplo
|
| }
|
| }
|
|
|
| -TextureUploader::Parameters CCTextureUpdateQueue::takeFirstFullUpload()
|
| +TextureUploader::Parameters TextureUpdateQueue::takeFirstFullUpload()
|
| {
|
| TextureUploader::Parameters first = m_fullEntries.front();
|
| m_fullEntries.pop_front();
|
| return first;
|
| }
|
|
|
| -TextureUploader::Parameters CCTextureUpdateQueue::takeFirstPartialUpload()
|
| +TextureUploader::Parameters TextureUpdateQueue::takeFirstPartialUpload()
|
| {
|
| TextureUploader::Parameters first = m_partialEntries.front();
|
| m_partialEntries.pop_front();
|
| return first;
|
| }
|
|
|
| -TextureCopier::Parameters CCTextureUpdateQueue::takeFirstCopy()
|
| +TextureCopier::Parameters TextureUpdateQueue::takeFirstCopy()
|
| {
|
| TextureCopier::Parameters first = m_copyEntries.front();
|
| m_copyEntries.pop_front();
|
| return first;
|
| }
|
|
|
| -bool CCTextureUpdateQueue::hasMoreUpdates() const
|
| +bool TextureUpdateQueue::hasMoreUpdates() const
|
| {
|
| return m_fullEntries.size() || m_partialEntries.size() || m_copyEntries.size();
|
| }
|
|
|