| OLD | NEW | 
|---|
| 1 |  | 
| 2 /* | 1 /* | 
| 3  * Copyright 2006 The Android Open Source Project | 2  * Copyright 2006 The Android Open Source Project | 
| 4  * | 3  * | 
| 5  * Use of this source code is governed by a BSD-style license that can be | 4  * Use of this source code is governed by a BSD-style license that can be | 
| 6  * found in the LICENSE file. | 5  * found in the LICENSE file. | 
| 7  */ | 6  */ | 
| 8 | 7 | 
| 9 |  | 
| 10 #ifndef SkPreConfig_DEFINED | 8 #ifndef SkPreConfig_DEFINED | 
| 11 #define SkPreConfig_DEFINED | 9 #define SkPreConfig_DEFINED | 
| 12 | 10 | 
| 13 #ifdef WEBKIT_VERSION_MIN_REQUIRED |  | 
| 14     #include "config.h" |  | 
| 15 #endif |  | 
| 16 |  | 
| 17 // Allows embedders that want to disable macros that take arguments to just | 11 // Allows embedders that want to disable macros that take arguments to just | 
| 18 // define that symbol to be one of these | 12 // define that symbol to be one of these | 
| 19 // |  | 
| 20 #define SK_NOTHING_ARG1(arg1) | 13 #define SK_NOTHING_ARG1(arg1) | 
| 21 #define SK_NOTHING_ARG2(arg1, arg2) | 14 #define SK_NOTHING_ARG2(arg1, arg2) | 
| 22 #define SK_NOTHING_ARG3(arg1, arg2, arg3) | 15 #define SK_NOTHING_ARG3(arg1, arg2, arg3) | 
| 23 | 16 | 
| 24 ////////////////////////////////////////////////////////////////////// | 17 ////////////////////////////////////////////////////////////////////// | 
| 25 | 18 | 
| 26 #if !defined(SK_BUILD_FOR_ANDROID) && !defined(SK_BUILD_FOR_IOS) && !defined(SK_
     BUILD_FOR_WIN32) && !defined(SK_BUILD_FOR_UNIX) && !defined(SK_BUILD_FOR_MAC) | 19 #if !defined(SK_BUILD_FOR_ANDROID) && !defined(SK_BUILD_FOR_IOS) && !defined(SK_
     BUILD_FOR_WIN32) && !defined(SK_BUILD_FOR_UNIX) && !defined(SK_BUILD_FOR_MAC) | 
| 27 | 20 | 
| 28     #ifdef __APPLE__ | 21     #ifdef __APPLE__ | 
| 29         #include "TargetConditionals.h" | 22         #include "TargetConditionals.h" | 
| (...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 256  * | 249  * | 
| 257  * NOTE: Clang/ARM (r161757) does not support the 'optimize' attribute. | 250  * NOTE: Clang/ARM (r161757) does not support the 'optimize' attribute. | 
| 258  */ | 251  */ | 
| 259 #if SK_HAS_ATTRIBUTE(optimize) | 252 #if SK_HAS_ATTRIBUTE(optimize) | 
| 260 #   define SK_ATTRIBUTE_OPTIMIZE_O1 __attribute__((optimize("O1"))) | 253 #   define SK_ATTRIBUTE_OPTIMIZE_O1 __attribute__((optimize("O1"))) | 
| 261 #else | 254 #else | 
| 262 #   define SK_ATTRIBUTE_OPTIMIZE_O1 /* nothing */ | 255 #   define SK_ATTRIBUTE_OPTIMIZE_O1 /* nothing */ | 
| 263 #endif | 256 #endif | 
| 264 | 257 | 
| 265 #endif | 258 #endif | 
| OLD | NEW | 
|---|