Remove SK_OFFSETOF from SkTypes, clean up offsetof usage.

src/animator/SkMemberInfo.h

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkMemberInfo_DEFINED
@@ skipping 86 matching lines @@
     static const SkMemberInfo* Find(const SkMemberInfo [], int count, int* index);
     static const SkMemberInfo* Find(const SkMemberInfo [], int count, const char** name);
 #else
     static const SkMemberInfo* Find(SkDisplayTypes type, int* index);
     static const SkMemberInfo* Find(SkDisplayTypes type, const char** name);
 #endif
     static size_t GetSize(SkDisplayTypes type); // size of simple types only
 //  static bool SetValue(void* value, const char* name, SkDisplayTypes , int count);
 };
 
+#ifndef SK_OFFSETOF
+    // This is offsetof for types which are not standard layout.
+    #define SK_OFFSETOF(type, field) (size_t)((char*)&(((type*)1024)->field) - (char*)1024)
+#endif
+
 #define SK_MEMBER(_member, _type) \
     { #_member, SK_OFFSETOF(BASE_CLASS, _member), SkType_##_type, \
-    sizeof(((BASE_CLASS*) 1)->_member) / sizeof(SkScalar) }
+    sizeof(skstd::declval<BASE_CLASS>()._member) / sizeof(SkScalar) }
 
 #define SK_MEMBER_ALIAS(_member, _alias, _type) \
     { #_member, SK_OFFSETOF(BASE_CLASS, _alias), SkType_##_type, \
-    sizeof(((BASE_CLASS*) 1)->_alias) / sizeof(SkScalar) }
+    sizeof(skstd::declval<BASE_CLASS>()._alias) / sizeof(SkScalar) }
 
 #define SK_MEMBER_ARRAY(_member, _type) \
     { #_member, SK_OFFSETOF(BASE_CLASS, _member), SkType_Array, \
     (int) SkType_##_type }
 
 #define SK_MEMBER_INHERITED \
     { (const char*) INHERITED::fInfo, 0, SkType_BaseClassInfo, INHERITED::fInfoCount }
 
 // #define SK_MEMBER_KEY_TYPE(_member, _type)
 //  {#_member, (size_t) -1, SkType_##_type, 0}
@@ skipping 137 matching lines @@
 #define DECLARE_NO_VIRTUALS_MEMBER_INFO(_type) \
 public: \
     typedef Sk##_type BASE_CLASS
 
 #define DEFINE_GET_MEMBER(_class)
 #define DEFINE_NO_VIRTUALS_GET_MEMBER(_class)
 
 #endif
 
 #endif // SkMemberInfo_DEFINED