5 files changed, 27 insertions, 26 deletions
diff --git a/gpu/command_buffer/service/buffer_manager.cc b/gpu/command_buffer/service/buffer_manager.cc
index 07a9753..de188c6 100644
--- a/gpu/command_buffer/service/buffer_manager.cc
+++ b/gpu/command_buffer/service/buffer_manager.cc
@@ -54,6 +54,11 @@ void BufferManager::RemoveBufferInfo(GLuint client_id) {
   }
 }
 
+void BufferManager::BufferInfo::set_target(GLenum target) {
+  DCHECK_EQ(target_, 0u);  // you can only set this once.
+  target_ = target;
+}
+
 BufferManager::BufferInfo::BufferInfo(GLuint service_id)
     : service_id_(service_id),
       target_(0),
@@ -206,5 +211,3 @@ bool BufferManager::SetTarget(BufferManager::BufferInfo* info, GLenum target) {
 
 }  // namespace gles2
 }  // namespace gpu
-
-
diff --git a/gpu/command_buffer/service/buffer_manager.h b/gpu/command_buffer/service/buffer_manager.h
index 81ad2af..d28a618 100644
--- a/gpu/command_buffer/service/buffer_manager.h
+++ b/gpu/command_buffer/service/buffer_manager.h
@@ -95,10 +95,7 @@ class BufferManager {
       return target_;
     }
 
-    void set_target(GLenum target) {
-      DCHECK_EQ(target_, 0u);  // you can only set this once.
-      target_ = target;
-    }
+    void set_target(GLenum target);
 
     bool shadowed() const {
       return shadowed_;
@@ -182,5 +179,3 @@ class BufferManager {
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_BUFFER_MANAGER_H_
-
-
diff --git a/gpu/command_buffer/service/command_buffer_service.h b/gpu/command_buffer/service/command_buffer_service.h
index d9be20a..9a62df6 100644
--- a/gpu/command_buffer/service/command_buffer_service.h
+++ b/gpu/command_buffer/service/command_buffer_service.h
@@ -12,7 +12,6 @@
 #include "base/linked_ptr.h"
 #include "base/scoped_ptr.h"
 #include "base/shared_memory.h"
-#include "base/task.h"
 #include "gpu/command_buffer/common/command_buffer.h"
 
 namespace gpu {
diff --git a/gpu/command_buffer/service/texture_manager.cc b/gpu/command_buffer/service/texture_manager.cc
index 250da70..07728b4 100644
--- a/gpu/command_buffer/service/texture_manager.cc
+++ b/gpu/command_buffer/service/texture_manager.cc
@@ -3,7 +3,11 @@
 // found in the LICENSE file.
 
 #include "gpu/command_buffer/service/texture_manager.h"
+
+#include <algorithm>
+
 #include "base/bits.h"
+#include "base/logging.h"
 #include "gpu/command_buffer/common/gles2_cmd_utils.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
@@ -277,6 +281,16 @@ void TextureManager::TextureInfo::SetParameter(
   Update(feature_info);
 }
 
+void TextureManager::TextureInfo::SetTarget(GLenum target, GLint max_levels) {
+  DCHECK_EQ(0u, target_);  // you can only set this once.
+  target_ = target;
+  size_t num_faces = (target == GL_TEXTURE_2D) ? 1 : 6;
+  level_infos_.resize(num_faces);
+  for (size_t ii = 0; ii < num_faces; ++ii) {
+    level_infos_[ii].resize(max_levels);
+  }
+}
+
 void TextureManager::TextureInfo::Update(const FeatureInfo* feature_info) {
   // Update npot status.
   npot_ = false;
@@ -426,6 +440,11 @@ bool TextureManager::ValidForTarget(
          (target != GL_TEXTURE_2D || (depth == 1));
 }
 
+void TextureManager::SetInfoTarget(TextureInfo* info, GLenum target) {
+  DCHECK(info);
+  info->SetTarget(target, MaxLevelsForTarget(target));
+}
+
 void TextureManager::SetLevelInfo(
     const FeatureInfo* feature_info,
     TextureManager::TextureInfo* info,
@@ -526,5 +545,3 @@ bool TextureManager::GetClientId(GLuint service_id, GLuint* client_id) const {
 
 }  // namespace gles2
 }  // namespace gpu
-
-
diff --git a/gpu/command_buffer/service/texture_manager.h b/gpu/command_buffer/service/texture_manager.h
index 182e0d1..7e07422 100644
--- a/gpu/command_buffer/service/texture_manager.h
+++ b/gpu/command_buffer/service/texture_manager.h
@@ -8,7 +8,6 @@
 #include <map>
 #include <vector>
 #include "base/basictypes.h"
-#include "base/logging.h"
 #include "base/ref_counted.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 
@@ -167,15 +166,7 @@ class TextureManager {
     // Parameters:
     //   target: GL_TEXTURE_2D or GL_TEXTURE_CUBE_MAP
     //   max_levels: The maximum levels this type of target can have.
-    void SetTarget(GLenum target, GLint max_levels) {
-      DCHECK_EQ(0u, target_);  // you can only set this once.
-      target_ = target;
-      size_t num_faces = (target == GL_TEXTURE_2D) ? 1 : 6;
-      level_infos_.resize(num_faces);
-      for (size_t ii = 0; ii < num_faces; ++ii) {
-        level_infos_[ii].resize(max_levels);
-      }
-    }
+    void SetTarget(GLenum target, GLint max_levels);
 
     // Update info about this texture.
     void Update(const FeatureInfo* feature_info);
@@ -244,10 +235,7 @@ class TextureManager {
   // Parameters:
   //   target: GL_TEXTURE_2D or GL_TEXTURE_CUBE_MAP
   //   max_levels: The maximum levels this type of target can have.
-  void SetInfoTarget(TextureInfo* info, GLenum target) {
-    DCHECK(info);
-    info->SetTarget(target, MaxLevelsForTarget(target));
-  }
+  void SetInfoTarget(TextureInfo* info, GLenum target);
 
   // Set the info for a particular level in a TexureInfo.
   void SetLevelInfo(
@@ -332,4 +320,3 @@ class TextureManager {
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_
-