Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

Side by Side Diff: skia/config/SkUserConfig.h

Issue 866183002: Roll Chrome into Mojo. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006 The Android Open Source Project 2 * Copyright (C) 2006 The Android Open Source Project
3 * 3 *
4 * Licensed under the Apache License, Version 2.0 (the "License"); 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 * you may not use this file except in compliance with the License. 5 * you may not use this file except in compliance with the License.
6 * You may obtain a copy of the License at 6 * You may obtain a copy of the License at
7 * 7 *
8 * http://www.apache.org/licenses/LICENSE-2.0 8 * http://www.apache.org/licenses/LICENSE-2.0
9 * 9 *
10 * Unless required by applicable law or agreed to in writing, software 10 * Unless required by applicable law or agreed to in writing, software
(...skipping 214 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 #error Read the comment at this location 225 #error Read the comment at this location
226 #endif 226 #endif
227 227
228 #endif 228 #endif
229 229
230 // The default crash macro writes to badbeef which can cause some strange 230 // The default crash macro writes to badbeef which can cause some strange
231 // problems. Instead, pipe this through to the logging function as a fatal 231 // problems. Instead, pipe this through to the logging function as a fatal
232 // assertion. 232 // assertion.
233 #define SK_CRASH() SkDebugf_FileLine(__FILE__, __LINE__, true, "SK_CRASH") 233 #define SK_CRASH() SkDebugf_FileLine(__FILE__, __LINE__, true, "SK_CRASH")
234 234
235 #ifndef SK_ATOMICS_PLATFORM_H
236 # if defined(SK_BUILD_FOR_WIN)
237 # define SK_ATOMICS_PLATFORM_H "third_party/skia/src/ports/SkAtomics_win.h"
238 # elif defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)
239 # define SK_ATOMICS_PLATFORM_H "third_party/skia/src/ports/SkAtomics_android. h"
240 # else
241 # define SK_ATOMICS_PLATFORM_H "third_party/skia/src/ports/SkAtomics_sync.h"
242 # endif
243 #endif
244
245 #ifndef SK_MUTEX_PLATFORM_H
246 # if defined(SK_BUILD_FOR_WIN)
247 # define SK_MUTEX_PLATFORM_H "third_party/skia/src/ports/SkMutex_win.h"
248 # else
249 # define SK_MUTEX_PLATFORM_H "third_party/skia/src/ports/SkMutex_pthread.h"
250 # endif
251 #endif
252
253 // These flags are no longer defined in Skia, but we have them (temporarily) 235 // These flags are no longer defined in Skia, but we have them (temporarily)
254 // until we update our call-sites (typically these are for API changes). 236 // until we update our call-sites (typically these are for API changes).
255 // 237 //
256 // Remove these as we update our sites. 238 // Remove these as we update our sites.
257 // 239 //
258 #ifndef SK_SUPPORT_LEGACY_GETTOPDEVICE 240 #ifndef SK_SUPPORT_LEGACY_GETTOPDEVICE
259 # define SK_SUPPORT_LEGACY_GETTOPDEVICE 241 # define SK_SUPPORT_LEGACY_GETTOPDEVICE
260 #endif 242 #endif
261 243
262 #ifndef SK_SUPPORT_LEGACY_GETDEVICE 244 #ifndef SK_SUPPORT_LEGACY_GETDEVICE
(...skipping 21 matching lines...) Expand all
284 #endif 266 #endif
285 267
286 // If this goes well, we can have Skia respect DYNAMIC_ANNOTATIONS_ENABLED direc tly. 268 // If this goes well, we can have Skia respect DYNAMIC_ANNOTATIONS_ENABLED direc tly.
287 #if DYNAMIC_ANNOTATIONS_ENABLED 269 #if DYNAMIC_ANNOTATIONS_ENABLED
288 # define SK_DYNAMIC_ANNOTATIONS_ENABLED 1 270 # define SK_DYNAMIC_ANNOTATIONS_ENABLED 1
289 #endif 271 #endif
290 272
291 // ===== End Chrome-specific definitions ===== 273 // ===== End Chrome-specific definitions =====
292 274
293 #endif 275 #endif
OLDNEW
« no previous file with comments | « skia/BUILD.gn ('k') | testing/android/java/src/org/chromium/native_test/ChromeNativeTestActivity.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698