Switched cc::Resource and cc::ScopedResource to Chrome coding style.

cc/scoped_resource.h

 // 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.
 
 #ifndef CC_SCOPED_RESOURCE_H_
 #define CC_SCOPED_RESOURCE_H_
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "cc/cc_export.h"
 #include "cc/resource.h"
 
 #ifndef NDEBUG
 #include "base/threading/platform_thread.h"
 #endif
 
 namespace cc {
 
-class CC_EXPORT ScopedResource : protected Resource {
-public:
-    static scoped_ptr<ScopedResource> create(ResourceProvider* resourceProvider) { return make_scoped_ptr(new ScopedResource(resourceProvider)); }
-    virtual ~ScopedResource();
+class CC_EXPORT ScopedResource : public Resource {
+ public:
+  static scoped_ptr<ScopedResource> create(ResourceProvider* resource_provider) {

[tfarina, 2012/11/15 23:46:11]

static void Foo(Bar* bar) {
                ^If it doesn't fit, move to the next line and indent 4 spaces.
...
}

?

+    return make_scoped_ptr(new ScopedResource(resource_provider));
+  }
+  virtual ~ScopedResource();
 
-    using Resource::id;
-    using Resource::size;
-    using Resource::format;
-    using Resource::bytes;
+  bool Allocate(int pool, const gfx::Size&, GLenum format, ResourceProvider::TextureUsageHint);

[tfarina, 2012/11/15 23:46:11]

do want to fix this while you are here?

Write one arg per line. and respect the 80-char columns.

+  void Free();
+  void Leak();
 
-    bool allocate(int pool, const gfx::Size&, GLenum format, ResourceProvider::TextureUsageHint);
-    void free();
-    void leak();
+ protected:
+  explicit ScopedResource(ResourceProvider*);
 
-protected:
-    explicit ScopedResource(ResourceProvider*);
-
-private:
-    ResourceProvider* m_resourceProvider;
+ private:
+  ResourceProvider* resource_provider_;
 
 #ifndef NDEBUG
-    base::PlatformThreadId m_allocateThreadIdentifier;
+  base::PlatformThreadId allocate_thread_id_;
 #endif
 
-    DISALLOW_COPY_AND_ASSIGN(ScopedResource);
+  DISALLOW_COPY_AND_ASSIGN(ScopedResource);
 };
 
 }
 
 #endif  // CC_SCOPED_RESOURCE_H_