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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: Source/JavaScriptCore/wtf/Platform.h

Issue 7134051: Merge 88396 - 2011-06-08 Sailesh Agrawal <sail@chromium.org> (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/782/
Patch Set: Created 9 years, 6 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
« no previous file with comments | « Source/JavaScriptCore/ChangeLog ('k') | Source/WebCore/ChangeLog » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * Copyright (C) 2007-2009 Torch Mobile, Inc. 3 * Copyright (C) 2007-2009 Torch Mobile, Inc.
4 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
5 * 5 *
6 * Redistribution and use in source and binary forms, with or without 6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions 7 * modification, are permitted provided that the following conditions
8 * are met: 8 * are met:
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 622 matching lines...) Expand 10 before | Expand all | Expand 10 after
633 #define HAVE_RUNLOOP_TIMER 1 633 #define HAVE_RUNLOOP_TIMER 1
634 #define ENABLE_FULLSCREEN_API 1 634 #define ENABLE_FULLSCREEN_API 1
635 #define ENABLE_SMOOTH_SCROLLING 1 635 #define ENABLE_SMOOTH_SCROLLING 1
636 #define ENABLE_WEB_ARCHIVE 1 636 #define ENABLE_WEB_ARCHIVE 1
637 #endif /* PLATFORM(MAC) && !PLATFORM(IOS) */ 637 #endif /* PLATFORM(MAC) && !PLATFORM(IOS) */
638 638
639 #if PLATFORM(CHROMIUM) && OS(DARWIN) 639 #if PLATFORM(CHROMIUM) && OS(DARWIN)
640 #define WTF_USE_CF 1 640 #define WTF_USE_CF 1
641 #define WTF_USE_PTHREADS 1 641 #define WTF_USE_PTHREADS 1
642 #define HAVE_PTHREAD_RWLOCK 1 642 #define HAVE_PTHREAD_RWLOCK 1
643
644 #define WTF_USE_WK_SCROLLBAR_PAINTER 1
643 #endif 645 #endif
644 646
645 #if PLATFORM(BREWMP) 647 #if PLATFORM(BREWMP)
646 #define ENABLE_SINGLE_THREADED 1 648 #define ENABLE_SINGLE_THREADED 1
647 #endif 649 #endif
648 650
649 #if PLATFORM(QT) && OS(DARWIN) 651 #if PLATFORM(QT) && OS(DARWIN)
650 #define WTF_USE_CF 1 652 #define WTF_USE_CF 1
651 #endif 653 #endif
652 654
(...skipping 561 matching lines...) Expand 10 before | Expand all | Expand 10 after
1214 #define WTF_USE_UNIX_DOMAIN_SOCKETS 1 1216 #define WTF_USE_UNIX_DOMAIN_SOCKETS 1
1215 #endif 1217 #endif
1216 1218
1217 #ifndef NDEBUG 1219 #ifndef NDEBUG
1218 #ifndef ENABLE_GC_VALIDATION 1220 #ifndef ENABLE_GC_VALIDATION
1219 #define ENABLE_GC_VALIDATION 1 1221 #define ENABLE_GC_VALIDATION 1
1220 #endif 1222 #endif
1221 #endif 1223 #endif
1222 1224
1223 #endif /* WTF_Platform_h */ 1225 #endif /* WTF_Platform_h */
OLDNEW
« no previous file with comments | « Source/JavaScriptCore/ChangeLog ('k') | Source/WebCore/ChangeLog » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698