Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / include / core / SkPostConfig.h

diff --git a/src/third_party/skia/include/core/SkPostConfig.h b/src/third_party/skia/include/core/SkPostConfig.h
index d513d20..2d6ab44 100644 (file)
--- a/src/third_party/skia/include/core/SkPostConfig.h
+++ b/src/third_party/skia/include/core/SkPostConfig.h
@@ -126,10 +126,10 @@
  * Defaults to 1 in DEBUG and 0 in RELEASE.
  */
 #ifndef SK_ENABLE_INST_COUNT
-#  ifdef SK_DEBUG
 // Only enabled for static builds, because instance counting relies on static
 // variables in functions defined in header files.
-#    define SK_ENABLE_INST_COUNT !defined(SKIA_DLL)
+#  if defined(SK_DEBUG) && !defined(SKIA_DLL)
+#    define SK_ENABLE_INST_COUNT 1
 #  else
 #    define SK_ENABLE_INST_COUNT 0
 #  endif
@@ -411,6 +411,15 @@
 #  endif
 #endif
 
+//////////////////////////////////////////////////////////////////////
+
+#ifndef SK_EGL
+#  if defined(SK_BUILD_FOR_ANDROID) || defined(SK_BUILD_FOR_NACL)
+#    define SK_EGL 1
+#  else
+#    define SK_EGL 0
+#  endif
+#endif
 
 //////////////////////////////////////////////////////////////////////