Clean-up inline members of nested classes (gpu/)

Due to a bug, the Clang-plugin style checker failed to warn about
inline constructors, destructors, non-empty virtual methods, etc.
for nested classes.

The plugin has been fixed, and this patch is part of a clean-up of all
the code that now causes the plugin to issue errors.

BUG=139346


Review URL: https://chromiumcodereview.appspot.com/10834248

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150920 0039d316-1c4b-4281-b951-d872f2087c98

gpu/command_buffer/client/gles2_implementation.cc

@@ -366,6 +366,21 @@ const size_t GLES2Implementation::kMaxSizeOfSimpleResult;
 const unsigned int GLES2Implementation::kStartingOffset;
 #endif
 
+GLES2Implementation::GLCachedState::IntState::IntState()
+    : max_combined_texture_image_units(0),
+      max_cube_map_texture_size(0),
+      max_fragment_uniform_vectors(0),
+      max_renderbuffer_size(0),
+      max_texture_image_units(0),
+      max_texture_size(0),
+      max_varying_vectors(0),
+      max_vertex_attribs(0),
+      max_vertex_texture_image_units(0),
+      max_vertex_uniform_vectors(0),
+      num_compressed_texture_formats(0),
+      num_shader_binary_formats(0) {
+}
+
 GLES2Implementation::SingleThreadChecker::SingleThreadChecker(
     GLES2Implementation* gles2_implementation)
     : gles2_implementation_(gles2_implementation) {

gpu/command_buffer/client/gles2_implementation.h

@@ -103,22 +103,8 @@ class GLES2_IMPL_EXPORT GLES2Implementation {
 
   // Stores client side cached GL state.
   struct GLCachedState {
-    struct IntState {
-      IntState()
-          : max_combined_texture_image_units(0),
-            max_cube_map_texture_size(0),
-            max_fragment_uniform_vectors(0),
-            max_renderbuffer_size(0),
-            max_texture_image_units(0),
-            max_texture_size(0),
-            max_varying_vectors(0),
-            max_vertex_attribs(0),
-            max_vertex_texture_image_units(0),
-            max_vertex_uniform_vectors(0),
-            num_compressed_texture_formats(0),
-            num_shader_binary_formats(0) {
-      }
-
+    struct GLES2_IMPL_EXPORT IntState {
+      IntState();
       GLint max_combined_texture_image_units;
       GLint max_cube_map_texture_size;
       GLint max_fragment_uniform_vectors;

gpu/command_buffer/client/query_tracker.cc

@@ -55,6 +55,19 @@ void QuerySyncManager::Free(const QuerySyncManager::QueryInfo& info) {
   free_queries_.push(info);
 }
 
+QueryTracker::Query::Query(GLuint id, GLenum target,
+                           const QuerySyncManager::QueryInfo& info)
+    : id_(id),
+      target_(target),
+      info_(info),
+      state_(kUninitialized),
+      submit_count_(0),
+      token_(0),
+      flushed_(false),
+      result_(0) {
+    }
+
+
 void QueryTracker::Query::Begin(GLES2Implementation* gl) {
   // init memory, inc count
   MarkAsActive();
@@ -165,4 +178,3 @@ void QueryTracker::RemoveQuery(GLuint client_id, bool context_lost) {
 
 }  // namespace gles2
 }  // namespace gpu
-

gpu/command_buffer/client/query_tracker.h

@@ -70,16 +70,7 @@ class GLES2_IMPL_EXPORT QueryTracker {
       kComplete        // completed
     };
 
-    Query(GLuint id, GLenum target, const QuerySyncManager::QueryInfo& info)
-        : id_(id),
-          target_(target),
-          info_(info),
-          state_(kUninitialized),
-          submit_count_(0),
-          token_(0),
-          flushed_(false),
-          result_(0) {
-    }
+    Query(GLuint id, GLenum target, const QuerySyncManager::QueryInfo& info);
 
     GLenum target() const {
       return target_;

gpu/command_buffer/service/feature_info.cc

@@ -64,6 +64,28 @@ class StringSet {
 
 }  // anonymous namespace.
 
+FeatureInfo::FeatureFlags::FeatureFlags()
+    : chromium_framebuffer_multisample(false),
+      oes_standard_derivatives(false),
+      oes_egl_image_external(false),
+      npot_ok(false),
+      enable_texture_float_linear(false),
+      enable_texture_half_float_linear(false),
+      chromium_webglsl(false),
+      chromium_stream_texture(false),
+      angle_translated_shader_source(false),
+      angle_pack_reverse_row_order(false),
+      arb_texture_rectangle(false),
+      angle_instanced_arrays(false),
+      occlusion_query_boolean(false),
+      use_arb_occlusion_query2_for_occlusion_query_boolean(false),
+      use_arb_occlusion_query_for_occlusion_query_boolean(false),
+      disable_workarounds(false),
+      is_intel(false),
+      is_nvidia(false),
+      is_amd(false) {
+}
+
 FeatureInfo::FeatureInfo() {
   static const GLenum kAlphaTypes[] = {
       GL_UNSIGNED_BYTE,

gpu/command_buffer/service/feature_info.h

@@ -21,27 +21,7 @@ class GPU_EXPORT FeatureInfo : public base::RefCounted<FeatureInfo> {
   typedef scoped_refptr<FeatureInfo> Ref;
 
   struct FeatureFlags {
-    FeatureFlags()
-        : chromium_framebuffer_multisample(false),
-          oes_standard_derivatives(false),
-          oes_egl_image_external(false),
-          npot_ok(false),
-          enable_texture_float_linear(false),
-          enable_texture_half_float_linear(false),
-          chromium_webglsl(false),
-          chromium_stream_texture(false),
-          angle_translated_shader_source(false),
-          angle_pack_reverse_row_order(false),
-          arb_texture_rectangle(false),
-          angle_instanced_arrays(false),
-          occlusion_query_boolean(false),
-          use_arb_occlusion_query2_for_occlusion_query_boolean(false),
-          use_arb_occlusion_query_for_occlusion_query_boolean(false),
-          disable_workarounds(false),
-          is_intel(false),
-          is_nvidia(false),
-          is_amd(false) {
-    }
+    FeatureFlags();
 
     bool chromium_framebuffer_multisample;
     bool oes_standard_derivatives;
@@ -119,5 +99,3 @@ class GPU_EXPORT FeatureInfo : public base::RefCounted<FeatureInfo> {
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_FEATURE_INFO_H_
-
-

gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.cc

@@ -1336,6 +1336,45 @@ void GLES2DecoderTestBase::AddExpectationsForSimulatedAttrib0(
       num_vertices, buffer_id, GL_NO_ERROR);
 }
 
+GLES2DecoderWithShaderTestBase::MockCommandBufferEngine::
+MockCommandBufferEngine() {
+  data_.reset(new int8[kSharedBufferSize]);
+  ClearSharedMemory();
+  valid_buffer_.ptr = data_.get();
+  valid_buffer_.size = kSharedBufferSize;
+}
+
+GLES2DecoderWithShaderTestBase::MockCommandBufferEngine::
+~MockCommandBufferEngine() {}
+
+Buffer
+GLES2DecoderWithShaderTestBase::MockCommandBufferEngine::GetSharedMemoryBuffer(
+    int32 shm_id) {
+  return shm_id == kSharedMemoryId ? valid_buffer_ : invalid_buffer_;
+}
+
+void GLES2DecoderWithShaderTestBase::MockCommandBufferEngine::set_token(
+    int32 token) {
+  DCHECK(false);
+}
+
+bool GLES2DecoderWithShaderTestBase::MockCommandBufferEngine::SetGetBuffer(
+    int32 /* transfer_buffer_id */) {
+  DCHECK(false);
+  return false;
+}
+
+bool GLES2DecoderWithShaderTestBase::MockCommandBufferEngine::SetGetOffset(
+   int32 offset) {
+  DCHECK(false);
+  return false;
+}
+
+int32 GLES2DecoderWithShaderTestBase::MockCommandBufferEngine::GetGetOffset() {
+  DCHECK(false);
+  return 0;
+}
+
 void GLES2DecoderWithShaderTestBase::SetUp() {
   GLES2DecoderTestBase::SetUp();
   SetupDefaultProgram();

gpu/command_buffer/service/gles2_cmd_decoder_unittest_base.h

@@ -471,44 +471,25 @@ class GLES2DecoderTestBase : public testing::Test {
  private:
   class MockCommandBufferEngine : public CommandBufferEngine {
    public:
-    MockCommandBufferEngine() {
-      data_.reset(new int8[kSharedBufferSize]);
-      ClearSharedMemory();
-      valid_buffer_.ptr = data_.get();
-      valid_buffer_.size = kSharedBufferSize;
-    }
+    MockCommandBufferEngine();
 
-    virtual ~MockCommandBufferEngine() {
-    }
+    virtual ~MockCommandBufferEngine();
 
-    virtual Buffer GetSharedMemoryBuffer(int32 shm_id) OVERRIDE {
-      return shm_id == kSharedMemoryId ? valid_buffer_ : invalid_buffer_;
-    }
+    virtual Buffer GetSharedMemoryBuffer(int32 shm_id) OVERRIDE;
 
     void ClearSharedMemory() {
       memset(data_.get(), kInitialMemoryValue, kSharedBufferSize);
     }
 
-    virtual void set_token(int32 token) OVERRIDE {
-      DCHECK(false);
-    }
+    virtual void set_token(int32 token) OVERRIDE;
 
-    virtual bool SetGetBuffer(int32 /* transfer_buffer_id */) OVERRIDE {
-      DCHECK(false);
-      return false;
-    }
+    virtual bool SetGetBuffer(int32 /* transfer_buffer_id */) OVERRIDE;
 
     // Overridden from CommandBufferEngine.
-    virtual bool SetGetOffset(int32 offset) OVERRIDE {
-      DCHECK(false);
-      return false;
-    }
+    virtual bool SetGetOffset(int32 offset) OVERRIDE;
 
     // Overridden from CommandBufferEngine.
-    virtual int32 GetGetOffset() OVERRIDE {
-      DCHECK(false);
-      return 0;
-    }
+    virtual int32 GetGetOffset() OVERRIDE;
 
    private:
     scoped_array<int8> data_;

gpu/command_buffer/service/texture_manager.cc

@@ -125,6 +125,34 @@ TextureManager::TextureInfo::~TextureInfo() {
   }
 }
 
+TextureManager::TextureInfo::LevelInfo::LevelInfo()
+    : cleared(true),
+      target(0),
+      level(-1),
+      internal_format(0),
+      width(0),
+      height(0),
+      depth(0),
+      border(0),
+      format(0),
+      type(0),
+      estimated_size(0) {
+}
+
+TextureManager::TextureInfo::LevelInfo::LevelInfo(const LevelInfo& rhs)
+    : cleared(rhs.cleared),
+      target(rhs.target),
+      level(rhs.level),
+      internal_format(rhs.internal_format),
+      width(rhs.width),
+      height(rhs.height),
+      depth(rhs.depth),
+      border(rhs.border),
+      format(rhs.format),
+      type(rhs.type),
+      estimated_size(rhs.estimated_size) {
+}
+
 bool TextureManager::TextureInfo::CanRender(
     const FeatureInfo* feature_info) const {
   if (target_ == 0) {
@@ -1049,5 +1077,3 @@ GLsizei TextureManager::ComputeMipMapCount(
 
 }  // namespace gles2
 }  // namespace gpu
-
-

gpu/command_buffer/service/texture_manager.h

@@ -188,33 +188,8 @@ class GPU_EXPORT TextureManager {
     ~TextureInfo();
 
     struct LevelInfo {
-      LevelInfo()
-         : cleared(true),
-           target(0),
-           level(-1),
-           internal_format(0),
-           width(0),
-           height(0),
-           depth(0),
-           border(0),
-           format(0),
-           type(0),
-           estimated_size(0) {
-      }
-
-      LevelInfo(const LevelInfo& rhs)
-         : cleared(rhs.cleared),
-           target(rhs.target),
-           level(rhs.level),
-           internal_format(rhs.internal_format),
-           width(rhs.width),
-           height(rhs.height),
-           depth(rhs.depth),
-           border(rhs.border),
-           format(rhs.format),
-           type(rhs.type),
-           estimated_size(rhs.estimated_size) {
-      }
+      LevelInfo();
+      LevelInfo(const LevelInfo& rhs);
 
       bool cleared;
       GLenum target;