remove now-dead flags

include/core/SkImageInfo.h

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkImageInfo_DEFINED
 #define SkImageInfo_DEFINED
 
@@ skipping 281 matching lines @@
         return sk_64_asS32(size);
     }
 
     bool validRowBytes(size_t rowBytes) const {
         uint64_t rb = sk_64_mul(fWidth, this->bytesPerPixel());
         return rowBytes >= rb;
     }
 
     SkDEBUGCODE(void validate() const;)
 
-#ifdef SK_SUPPORT_LEGACY_PUBLIC_IMAGEINFO_FIELDS
-public:
-#else
 private:
-#endif
     int                 fWidth;
     int                 fHeight;
     SkColorType         fColorType;
     SkAlphaType         fAlphaType;
+    SkColorProfileType  fProfileType;
 
-private:
     SkImageInfo(int width, int height, SkColorType ct, SkAlphaType at, SkColorProfileType pt)
         : fWidth(width)
         , fHeight(height)
         , fColorType(ct)
         , fAlphaType(at)
         , fProfileType(pt)
     {}
-
-    SkColorProfileType  fProfileType;
 };
 
 #endif