Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b

cc/resources/prioritized_resource_manager.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 "cc/resources/prioritized_resource_manager.h"
 
 #include <algorithm>
 
 #include "base/trace_event/trace_event.h"
 #include "cc/resources/prioritized_resource.h"
@@ skipping 433 matching lines @@
 }
 
 PrioritizedResource::Backing* PrioritizedResourceManager::CreateBacking(
     const gfx::Size& size,
     ResourceFormat format,
     ResourceProvider* resource_provider) {
   DCHECK(proxy_->IsImplThread() && proxy_->IsMainThreadBlocked());
   DCHECK(resource_provider);
   ResourceProvider::ResourceId resource_id =
       resource_provider->CreateManagedResource(
-          size,
-          GL_TEXTURE_2D,
-          GL_CLAMP_TO_EDGE,
-          ResourceProvider::TextureHintImmutable,
-          format);
+          size, GL_TEXTURE_2D, GL_CLAMP_TO_EDGE,
+          ResourceProvider::TEXTURE_HINT_IMMUTABLE, format);
   PrioritizedResource::Backing* backing = new PrioritizedResource::Backing(
       resource_id, resource_provider, size, format);
   memory_use_bytes_ += backing->bytes();
   return backing;
 }
 
 void PrioritizedResourceManager::EvictFirstBackingResource(
     ResourceProvider* resource_provider) {
   DCHECK(proxy_->IsImplThread());
   DCHECK(resource_provider);
@@ skipping 72 matching lines @@
     previous_backing = backing;
   }
 #endif  // DCHECK_IS_ON()
 }
 
 const Proxy* PrioritizedResourceManager::ProxyForDebug() const {
   return proxy_;
 }
 
 }  // namespace cc