Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / gpu / GrTemplates.h

diff --git a/src/third_party/skia/src/gpu/GrTemplates.h b/src/third_party/skia/src/gpu/GrTemplates.h
index 5a009df..8e43a15 100644 (file)
--- a/src/third_party/skia/src/gpu/GrTemplates.h
+++ b/src/third_party/skia/src/gpu/GrTemplates.h
@@ -35,26 +35,26 @@ template <typename Dst, typename Src> Dst GrTCast(Src src) {
  *      ...
  * }  // fCount is restored
  */
-template <typename T> class GrAutoTRestore : public SkNoncopyable {
+template <typename T> class GrAutoTRestore : SkNoncopyable {
 public:
     GrAutoTRestore() : fPtr(NULL), fVal() {}
 
     GrAutoTRestore(T* ptr) {
         fPtr = ptr;
-        if (NULL != ptr) {
+        if (ptr) {
             fVal = *ptr;
         }
     }
 
     ~GrAutoTRestore() {
-        if (NULL != fPtr) {
+        if (fPtr) {
             *fPtr = fVal;
         }
     }
 
     // restores previously saved value (if any) and saves value for passed T*
     void reset(T* ptr) {
-        if (NULL != fPtr) {
+        if (fPtr) {
             *fPtr = fVal;
         }
         fPtr = ptr;