0

cc: Minor clean ups to ETC1PixelRef header.

- remove unnecessary includes
- use chromium OVERRIDE macro instead of skia SK_OVERRIDE.
- use DISALLOW_COPY_AND_ASSIGN macro.

BUG=None
TEST=cc_unittests
R=enne@chromium.org,jamesr@chromium.org

Review URL: https://codereview.chromium.org/67613002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@234110 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
tfarina@chromium.org
2013-11-09 05:14:31 +00:00
parent adf84448bd
commit a96479c256

@ -5,11 +5,10 @@
#ifndef CC_RESOURCES_ETC1_PIXEL_REF_H_
#define CC_RESOURCES_ETC1_PIXEL_REF_H_
#include "base/logging.h"
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "cc/base/cc_export.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "third_party/skia/include/core/SkFlattenable.h"
#include "third_party/skia/include/core/SkPixelRef.h"
namespace cc {
@ -21,15 +20,17 @@ class CC_EXPORT ETC1PixelRef : public SkPixelRef {
virtual ~ETC1PixelRef();
// SK_DECLARE_UNFLATTENABLE_OBJECT
virtual Factory getFactory() const SK_OVERRIDE;
virtual Factory getFactory() const OVERRIDE;
protected:
// Implementation of SkPixelRef.
virtual void* onLockPixels(SkColorTable** color_table) SK_OVERRIDE;
virtual void onUnlockPixels() SK_OVERRIDE;
virtual void* onLockPixels(SkColorTable** color_table) OVERRIDE;
virtual void onUnlockPixels() OVERRIDE;
private:
scoped_ptr<uint8_t[]> pixels_;
DISALLOW_COPY_AND_ASSIGN(ETC1PixelRef);
};
} // namespace cc