Removing more static initializers

content/common/gpu/gpu_memory_manager.cc

 // Copyright (c) 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 "content/common/gpu/gpu_memory_manager.h"
 
 #if defined(ENABLE_GPU)
 
 #include <set>
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "content/common/gpu/gpu_command_buffer_stub.h"
 #include "content/common/gpu/gpu_memory_allocation.h"
 
 namespace {
 
 // These are predefined values (in bytes) for
 // GpuMemoryAllocation::gpuResourceSizeInBytes.  Currently, the value is only
 // used to check if it is 0 or non-0.  In the future, these values will not
 // come from constants, but rather will be distributed dynamically.
-const uint32 kResourceSizeNonHibernatedTab = 1;
-const uint32 kResourceSizeHibernatedTab = 0;
-
-// Set up three allocation values for the three possible stub states
-const GpuMemoryAllocation all_buffers_allocation(
-    kResourceSizeNonHibernatedTab, true, true);
-const GpuMemoryAllocation front_buffers_allocation(
-    kResourceSizeNonHibernatedTab, true, false);
-const GpuMemoryAllocation no_buffers_allocation(
-    kResourceSizeHibernatedTab, false, false);
+enum {
+  kResourceSizeNonHibernatedTab = 1,
+  kResourceSizeHibernatedTab = 0
+};
 
 }
 
 GpuMemoryManager::GpuMemoryManager(GpuMemoryManagerClient* client,
         size_t max_surfaces_with_frontbuffer_soft_limit)
     : client_(client),
       manage_scheduled_(false),
       max_surfaces_with_frontbuffer_soft_limit_(
           max_surfaces_with_frontbuffer_soft_limit),
       weak_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
@@ skipping 35 matching lines @@
 //                 * Must have both front and back buffer.
 //
 //  2. Background: Non visible surfaces, which have not surpassed the
 //                 max_surfaces_with_frontbuffer_soft_limit_ limit.
 //                 * Will have only a frontbuffer.
 //
 //  3. Hibernated: Non visible surfaces, which have surpassed the
 //                 max_surfaces_with_frontbuffer_soft_limit_ limit.
 //                 * Will not have either buffer.
 void GpuMemoryManager::Manage() {
+  // Set up three allocation values for the three possible stub states
+  const GpuMemoryAllocation all_buffers_allocation(
+      kResourceSizeNonHibernatedTab, true, true);
+  const GpuMemoryAllocation front_buffers_allocation(
+      kResourceSizeNonHibernatedTab, true, false);
+  const GpuMemoryAllocation no_buffers_allocation(
+      kResourceSizeHibernatedTab, false, false);
+
   manage_scheduled_ = false;
 
   // Create stub lists by separating out the two types received from client
   std::vector<GpuCommandBufferStubBase*> stubs_with_surface;
   {
     std::vector<GpuCommandBufferStubBase*> stubs;
     client_->AppendAllCommandBufferStubs(stubs);
 
     for (std::vector<GpuCommandBufferStubBase*>::iterator it = stubs.begin();
         it != stubs.end(); ++it) {
@@ skipping 21 matching lines @@
       front_buffers.insert(stub->surface_state().surface_id);
       stub->SendMemoryAllocationToProxy(front_buffers_allocation);
     } else {
       no_buffers.insert(stub->surface_state().surface_id);
       stub->SendMemoryAllocationToProxy(no_buffers_allocation);
     }
   }
 }
 
 #endif