From 0146dd0ce5b859994bd352bff8e19119e01534b9 Mon Sep 17 00:00:00 2001
From: "bajones@chromium.org"
 <bajones@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 18 Dec 2013 21:40:16 +0000
Subject: Updated Khronos GLES2 headers.

There was a type conflict between the previous, out of date headers and the more
recent ones included in ANGLE that was causing failures on 64-bit Windows.

BUG=326382
R=kbr@chromium.org, piman@chromium.org, raymes@chromium.org
TBR=robertphillips@google.com

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@241661 0039d316-1c4b-4281-b951-d872f2087c98
---
 skia/config/SkUserConfig.h | 18 ++++++++++++++++++
 skia/skia_library.gypi     |  3 ---
 2 files changed, 18 insertions(+), 3 deletions(-)

(limited to 'skia')

diff --git a/skia/config/SkUserConfig.h b/skia/config/SkUserConfig.h
index d15882c..052c5c1 100644
--- a/skia/config/SkUserConfig.h
+++ b/skia/config/SkUserConfig.h
@@ -226,6 +226,24 @@ SK_API void SkDebugf_FileLine(const char* file, int line, bool fatal,
 // tracing.
 // #define SK_USER_TRACE_INCLUDE_FILE "skia/ext/skia_trace_shim.h"
 
+#ifndef SK_ATOMICS_PLATFORM_H
+#  if defined(SK_BUILD_FOR_WIN)
+#    define SK_ATOMICS_PLATFORM_H "third_party/skia/src/ports/SkAtomics_win.h"
+#  elif defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)
+#    define SK_ATOMICS_PLATFORM_H "third_party/skia/src/ports/SkAtomics_android.h"
+#  else
+#    define SK_ATOMICS_PLATFORM_H "third_party/skia/src/ports/SkAtomics_sync.h"
+#  endif
+#endif
+
+#ifndef SK_MUTEX_PLATFORM_H
+#  if defined(SK_BUILD_FOR_WIN)
+#    define SK_MUTEX_PLATFORM_H "third_party/skia/src/ports/SkMutex_win.h"
+#  else
+#    define SK_MUTEX_PLATFORM_H "third_party/skia/src/ports/SkMutex_pthread.h"
+#  endif
+#endif
+
 // ===== End Chrome-specific definitions =====
 
 #endif
diff --git a/skia/skia_library.gypi b/skia/skia_library.gypi
index 229f73f..02fa247 100644
--- a/skia/skia_library.gypi
+++ b/skia/skia_library.gypi
@@ -54,8 +54,6 @@
     '../third_party/skia/src/ports/SkOSFile_posix.cpp',
     '../third_party/skia/src/ports/SkOSFile_stdio.cpp',
     '../third_party/skia/src/ports/SkOSFile_win.cpp',
-    '../third_party/skia/src/ports/SkThread_pthread.cpp',
-    '../third_party/skia/src/ports/SkThread_win.cpp',
     '../third_party/skia/src/ports/SkTime_Unix.cpp',
     '../third_party/skia/src/ports/SkTLS_pthread.cpp',
     '../third_party/skia/src/ports/SkTLS_win.cpp',
@@ -270,7 +268,6 @@
     [ 'OS == "win"', {
       'sources!': [
         '../third_party/skia/src/ports/SkOSFile_posix.cpp',
-        '../third_party/skia/src/ports/SkThread_pthread.cpp',
         '../third_party/skia/src/ports/SkTime_Unix.cpp',
         '../third_party/skia/src/ports/SkTLS_pthread.cpp',
       ],
-- 
cgit v1.1