Patch from https://codereview.chromium.org/11111005/ without actual file deletes

cc/prioritized_texture.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "CCPrioritizedTexture.h"
 
 #include "CCPrioritizedTextureManager.h"
 #include "CCPriorityCalculator.h"
 #include "CCProxy.h"
 #include <algorithm>
 
 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)
     , m_priority(CCPriorityCalculator::lowestPriority())
     , m_isAbovePriorityCutoff(false)
     , m_isSelfManaged(false)
     , m_backing(0)
     , m_manager(0)
 {
     // m_manager is set in registerTexture() so validity can be checked.
@@ skipping 13 matching lines @@
 void CCPrioritizedTexture::setTextureManager(CCPrioritizedTextureManager* manager)
 {
     if (m_manager == manager)
         return;
     if (m_manager)
         m_manager->unregisterTexture(this);
     if (manager)
         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;
         m_format = format;
         m_size = size;
         m_bytes = CCTexture::memorySizeBytes(size, format);
         ASSERT(m_manager || !m_backing);
         if (m_manager)
             m_manager->returnBackingTexture(this);
     }
@@ skipping 50 matching lines @@
 {
     ASSERT(m_backing);
     ASSERT(m_backing->m_owner == this);
 
     m_backing->m_owner = 0;
     m_backing = 0;
 }
 
 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())
     , m_wasAbovePriorityCutoffAtLastPriorityUpdate(false)
     , m_inDrawingImplTree(false)
     , m_resourceHasBeenDeleted(false)
 #ifndef NDEBUG
     , m_resourceProvider(resourceProvider)
 #endif
 {
@@ skipping 44 matching lines @@
 
 void CCPrioritizedTexture::Backing::updateInDrawingImplTree()
 {
     ASSERT(CCProxy::isImplThread() && CCProxy::isMainThreadBlocked());
     m_inDrawingImplTree = !!owner();
     if (!m_inDrawingImplTree)
         ASSERT(m_priorityAtLastPriorityUpdate == CCPriorityCalculator::lowestPriority());
 }
 
 } // namespace cc