Changeset 161853 in webkit
- Timestamp:
- Jan 12, 2014 6:42:54 PM (10 years ago)
- Location:
- trunk/Source
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WTF/ChangeLog
r161852 r161853 1 2014-01-12 Darin Adler <darin@apple.com> 2 3 Add PLATFORM(COCOA) and USE(FOUNDATION) 4 https://bugs.webkit.org/show_bug.cgi?id=126859 5 6 Reviewed by Anders Carlsson. 7 8 * wtf/Platform.h: Added PLATFORM(COCOA), which for now is set at exactly the same 9 times that PLATFORM(MAC) is. Added USE(FOUNDATION), which is set at the same times 10 that PLATFORM(COCOA) is. Re-organize the PLATFORM(MAC) and PLATFORM(IOS) settings 11 in the header so they are a bit easier to read. Put HAVE_LANGINFO_H in with the 12 rest of the OS(UNIX) settings and put HAVE_READLINE in with the rest of the 13 OS(DARWIN) settings. Tweak formatting a bit. 14 1 15 2014-01-12 Anders Carlsson <andersca@apple.com> 2 16 -
trunk/Source/WTF/wtf/Platform.h
r161672 r161853 1 1 /* 2 * Copyright (C) 2006, 2007, 2008, 2009, 2013 Apple Inc. All rights reserved.2 * Copyright (C) 2006, 2007, 2008, 2009, 2013, 2014 Apple Inc. All rights reserved. 3 3 * Copyright (C) 2007-2009 Torch Mobile, Inc. 4 4 * Copyright (C) 2010, 2011 Research In Motion Limited. All rights reserved. … … 430 430 #include "nix/PlatformNix.h" 431 431 #elif OS(DARWIN) 432 #define WTF_PLATFORM_COCOA 1 432 433 #define WTF_PLATFORM_MAC 1 433 434 #elif OS(WINDOWS) … … 476 477 #endif 477 478 479 #if PLATFORM(COCOA) 480 481 #define WTF_USE_CF 1 482 #define WTF_USE_FOUNDATION 1 483 484 #endif 485 478 486 #if PLATFORM(MAC) && !PLATFORM(IOS) 479 #if CPU(X86_64) 480 #define WTF_USE_PLUGIN_HOST_PROCESS 1 481 #endif 482 #define WTF_USE_CF 1 483 #define HAVE_READLINE 1 487 488 #define WTF_USE_APPKIT 1 484 489 #define HAVE_RUNLOOP_TIMER 1 485 490 #define HAVE_SEC_IDENTITY 1 486 491 #define HAVE_SEC_KEYCHAIN 1 492 493 #if CPU(X86_64) 494 #define WTF_USE_PLUGIN_HOST_PROCESS 1 495 #endif 496 487 497 #if __MAC_OS_X_VERSION_MIN_REQUIRED >= 1080 488 498 #define HAVE_LAYER_HOSTING_IN_WINDOW_SERVER 1 489 499 #endif 490 #define WTF_USE_APPKIT 1491 500 492 501 /* OS X defines a series of platform macros for debugging. */ … … 495 504 #undef __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 496 505 #define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES 0 506 497 507 #endif /* PLATFORM(MAC) && !PLATFORM(IOS) */ 498 499 #if PLATFORM(IOS)500 #define DONT_FINALIZE_ON_MAIN_THREAD 1501 #endif502 508 503 509 #if OS(DARWIN) && !PLATFORM(GTK) … … 506 512 507 513 #if PLATFORM(IOS) 514 515 #define DONT_FINALIZE_ON_MAIN_THREAD 1 508 516 #define HAVE_READLINE 1 509 #define WTF_USE_APPKIT 0510 #define WTF_USE_CF 1511 517 #define WTF_USE_CFNETWORK 1 512 518 #define WTF_USE_NETWORK_CFDATA_ARRAY_CALLBACK 1 … … 516 522 #define ENABLE_JIT_CONSTANT_BLINDING 0 517 523 #endif 524 518 525 #endif /* PLATFORM(IOS) */ 519 526 … … 538 545 #if OS(UNIX) 539 546 #define HAVE_ERRNO_H 1 540 #define HAVE_MMAP 1 547 #define HAVE_LANGINFO_H 1 548 #define HAVE_MMAP 1 541 549 #define HAVE_SIGNAL_H 1 542 550 #define HAVE_STRINGS_H 1 … … 546 554 #endif /* OS(UNIX) */ 547 555 548 #if OS(UNIX)549 #define HAVE_LANGINFO_H 1550 #endif551 552 556 #if (OS(FREEBSD) || OS(OPENBSD)) && !defined(__GLIBC__) 553 557 #define HAVE_PTHREAD_NP_H 1 … … 579 583 #define HAVE_MERGESORT 1 580 584 #define HAVE_PTHREAD_SETNAME_NP 1 585 #define HAVE_READLINE 1 581 586 #define HAVE_SYS_TIMEB_H 1 582 587 #define WTF_USE_ACCELERATE 1 … … 584 589 #if !PLATFORM(IOS) 585 590 #define HAVE_HOSTED_CORE_ANIMATION 1 586 #endif /* !PLATFORM(IOS) */591 #endif 587 592 588 593 #endif /* OS(DARWIN) */ 589 594 590 595 #if OS(WINDOWS) && !OS(WINCE) 596 591 597 #define HAVE_SYS_TIMEB_H 1 592 598 #define HAVE_ALIGNED_MALLOC 1 -
trunk/Source/WebCore/ChangeLog
r161851 r161853 1 2014-01-12 Darin Adler <darin@apple.com> 2 3 Add PLATFORM(COCOA) and USE(FOUNDATION) 4 https://bugs.webkit.org/show_bug.cgi?id=126859 5 6 Reviewed by Anders Carlsson. 7 8 * config.h: Use PLATFORM(COCOA) instead of PLATFORM(MAC) || PLATFORM(IOS) 9 to set USE(FILE_LOCK). Would be nice to use OS(DARWIN), but that would be 10 a change in behavior that might be incorrect. Removed bogus comments in 11 the USE(NEW_THEME) setting code. Removed redundant code to set USE(CA), 12 which exactly duplicates code that already exists in Platform.h. 13 1 14 2014-01-12 Darin Adler <darin@apple.com> 2 15 -
trunk/Source/WebCore/config.h
r161638 r161853 1 1 /* 2 * Copyright (C) 2004, 2005, 2006, 2013 Apple Inc.2 * Copyright (C) 2004, 2005, 2006, 2013, 2014 Apple Inc. All rights reserved. 3 3 * Copyright (C) 2009 Google Inc. All rights reserved. 4 4 * … … 30 30 #include <wtf/Platform.h> 31 31 32 #if PLATFORM( MAC) || PLATFORM(IOS)32 #if PLATFORM(COCOA) 33 33 #define WTF_USE_FILE_LOCK 1 34 34 #endif … … 102 102 103 103 #if PLATFORM(MAC) && !PLATFORM(IOS) 104 // New theme105 104 #define WTF_USE_NEW_THEME 1 106 #endif // PLATFORM(MAC)105 #endif 107 106 108 107 #if USE(CG) … … 119 118 #if PLATFORM(WIN) && USE(CG) 120 119 #define WTF_USE_SAFARI_THEME 1 121 #endif122 123 // CoreAnimation is available to IOS, Mac and Windows if using CG124 #if PLATFORM(MAC) || PLATFORM(IOS) || (PLATFORM(WIN) && USE(CG))125 #define WTF_USE_CA 1126 120 #endif 127 121
Note: See TracChangeset
for help on using the changeset viewer.