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

Unified Diff: cc/prioritized_texture.cc

Issue 11150025: Patch from https://codereview.chromium.org/11111005/ without actual file deletes (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
« no previous file with comments | « cc/prioritized_texture.h ('k') | cc/prioritized_texture_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/prioritized_texture.cc
diff --git a/cc/prioritized_texture.cc b/cc/prioritized_texture.cc
index f1a7cf4578db2f60c9b78276310f14f3ccc89f44..a5d8fbfe5ba29db558ff89f58cb6cb8dfd53e56e 100644
--- a/cc/prioritized_texture.cc
+++ b/cc/prioritized_texture.cc
@@ -15,7 +15,7 @@ using namespace std;
namespace cc {
-CCPrioritizedTexture::CCPrioritizedTexture(CCPrioritizedTextureManager* manager, IntSize size, GC3Denum format)
+CCPrioritizedTexture::CCPrioritizedTexture(CCPrioritizedTextureManager* manager, IntSize size, GLenum format)
: m_size(size)
, m_format(format)
, m_bytes(0)
@@ -49,7 +49,7 @@ void CCPrioritizedTexture::setTextureManager(CCPrioritizedTextureManager* manage
manager->registerTexture(this);
}
-void CCPrioritizedTexture::setDimensions(IntSize size, GC3Denum format)
+void CCPrioritizedTexture::setDimensions(IntSize size, GLenum format)
{
if (m_format != format || m_size != size) {
m_isAbovePriorityCutoff = false;
@@ -120,12 +120,12 @@ void CCPrioritizedTexture::unlink()
void CCPrioritizedTexture::setToSelfManagedMemoryPlaceholder(size_t bytes)
{
- setDimensions(IntSize(), GraphicsContext3D::RGBA);
+ setDimensions(IntSize(), GL_RGBA);
setIsSelfManaged(true);
m_bytes = bytes;
}
-CCPrioritizedTexture::Backing::Backing(unsigned id, CCResourceProvider* resourceProvider, IntSize size, GC3Denum format)
+CCPrioritizedTexture::Backing::Backing(unsigned id, CCResourceProvider* resourceProvider, IntSize size, GLenum format)
: CCTexture(id, size, format)
, m_owner(0)
, m_priorityAtLastPriorityUpdate(CCPriorityCalculator::lowestPriority())
« no previous file with comments | « cc/prioritized_texture.h ('k') | cc/prioritized_texture_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698