Changeset 211990 in webkit
- Timestamp:
- Feb 9, 2017 1:47:14 PM (7 years ago)
- Location:
- trunk/Source
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WTF/ChangeLog
r211989 r211990 1 2017-02-09 Commit Queue <commit-queue@webkit.org> 2 3 Unreviewed, rolling out r211980 and r211987. 4 https://bugs.webkit.org/show_bug.cgi?id=168072 5 6 Caused API test WebKit2.DuplicateCompletionHandlerCalls to 7 fail (Requested by ryanhaddad on #webkit). 8 9 Reverted changesets: 10 11 "Transition "WebKit Library Version" checks to SDK version 12 checks." 13 https://bugs.webkit.org/show_bug.cgi?id=168056 14 http://trac.webkit.org/changeset/211980 15 16 "Build fix for APPLE_INTERNAL_SDK builds after r211980." 17 http://trac.webkit.org/changeset/211987 18 1 19 2017-02-09 Alexey Proskuryakov <ap@apple.com> 2 20 -
trunk/Source/WTF/wtf/spi/darwin/dyldSPI.h
r211987 r211990 1 1 /* 2 * Copyright (C) 2016 -2017Apple Inc. All rights reserved.2 * Copyright (C) 2016 Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 38 38 #endif 39 39 40 #ifndef DYLD_MACOSX_VERSION_10_12_441 #define DYLD_MACOSX_VERSION_10_12_4 0x000A0C0442 #endif43 44 40 #else 45 41 … … 51 47 #define DYLD_IOS_VERSION_9_0 0x00090000 52 48 #define DYLD_IOS_VERSION_10_0 0x000A0000 53 #define DYLD_IOS_VERSION_10_3 0x000A030054 49 55 #define DYLD_MACOSX_VERSION_10_11 0x000A0B0056 50 #define DYLD_MACOSX_VERSION_10_12 0x000A0C00 57 #define DYLD_MACOSX_VERSION_10_12_4 0x000A0C0458 51 59 52 #endif -
trunk/Source/WebKit2/ChangeLog
r211980 r211990 1 2017-02-09 Commit Queue <commit-queue@webkit.org> 2 3 Unreviewed, rolling out r211980 and r211987. 4 https://bugs.webkit.org/show_bug.cgi?id=168072 5 6 Caused API test WebKit2.DuplicateCompletionHandlerCalls to 7 fail (Requested by ryanhaddad on #webkit). 8 9 Reverted changesets: 10 11 "Transition "WebKit Library Version" checks to SDK version 12 checks." 13 https://bugs.webkit.org/show_bug.cgi?id=168056 14 http://trac.webkit.org/changeset/211980 15 16 "Build fix for APPLE_INTERNAL_SDK builds after r211980." 17 http://trac.webkit.org/changeset/211987 18 1 19 2017-02-09 Brady Eidson <beidson@apple.com> 2 20 -
trunk/Source/WebKit2/Shared/Cocoa/CompletionHandlerCallChecker.mm
r211980 r211990 68 68 static std::once_flag once; 69 69 std::call_once(once, [] { 70 shouldThrowException = linkedOnOrAfter( SDKVersion::FirstWithExceptionsForDuplicateCompletionHandlerCalls);70 shouldThrowException = linkedOnOrAfter(LibraryVersion::FirstWithExceptionsForDuplicateCompletionHandlerCalls); 71 71 }); 72 72 return shouldThrowException; -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm
r211980 r211990 146 146 _allowsInlineMediaPlaybackAfterFullscreen = !_allowsInlineMediaPlayback; 147 147 _mediaDataLoadsAutomatically = NO; 148 if (linkedOnOrAfter(WebKit:: SDKVersion::FirstWithMediaTypesRequiringUserActionForPlayback))148 if (linkedOnOrAfter(WebKit::LibraryVersion::FirstWithMediaTypesRequiringUserActionForPlayback)) 149 149 _mediaTypesRequiringUserActionForPlayback = WKAudiovisualMediaTypeAudio; 150 150 else -
trunk/Source/WebKit2/UIProcess/Cocoa/VersionChecks.h
r211980 r211990 1 1 /* 2 * Copyright (C) 2015 -2017Apple Inc. All rights reserved.2 * Copyright (C) 2015 Apple Inc. All rights reserved. 3 3 * 4 4 * Redistribution and use in source and binary forms, with or without … … 26 26 #pragma once 27 27 28 #import <wtf/spi/darwin/dyldSPI.h>29 30 28 namespace WebKit { 31 29 32 enum class SDKVersion : uint32_t {33 #if PLATFORM(IOS)34 FirstWithNetworkCache = DYLD_IOS_VERSION_9_0,35 FirstWithMediaTypesRequiringUserActionForPlayback = DYLD_IOS_VERSION_10_0,36 FirstWithExceptionsForDuplicateCompletionHandlerCalls = DYLD_IOS_VERSION_10_3,37 #elif PLATFORM(MAC)38 FirstWithNetworkCache = DYLD_MACOSX_VERSION_10_11,39 FirstWithMediaTypesRequiringUserActionForPlayback = DYLD_MACOSX_VERSION_10_12,40 FirstWithExceptionsForDuplicateCompletionHandlerCalls = DYLD_MACOSX_VERSION_10_12_4,41 #endif42 };43 44 bool linkedOnOrAfter(SDKVersion);45 46 30 /* 47 During ToT WebKit development is is not always possible to use an SDK version, so we instead use 48 WebKit Library Version numbering. 49 50 This technique has a big drawback; The check will fail if the application doesn't directly link 51 against WebKit (e.g., It links to a different framework which links to WebKit). 52 53 Once a new WebKit Library Version is released in an SDK, all linkedOnOrAfter checks should be moved 54 from LibraryVersions to SDKVersions. 55 56 Library version numbers are based on the 'current library version' specified in the WebKit build rules. 31 Version numbers are based on the 'current library version' specified in the WebKit build rules. 57 32 All of these methods return or take version numbers with each part shifted to the left 2 bytes. 58 33 For example the version 1.2.3 is returned as 0x00010203 and version 200.3.5 is returned as 0x00C80305 59 34 A version of -1 is returned if the main executable did not link against WebKit. 60 35 61 Use the current WebKit version number, available in WebKit2/Configurations/Version.xcconfig,36 Please use the current WebKit version number, available in WebKit2/Configurations/Version.xcconfig, 62 37 when adding a new version constant. 63 38 */ 64 65 39 enum class LibraryVersion { 40 FirstWithNetworkCache = 0x02590116, // 601.1.22 41 FirstWithMediaTypesRequiringUserActionForPlayback = 0x025A0121, // 602.1.33 42 FirstWithExceptionsForDuplicateCompletionHandlerCalls = 0x025B0111, // 603.1.17 66 43 }; 67 44 -
trunk/Source/WebKit2/UIProcess/Cocoa/VersionChecks.mm
r211980 r211990 56 56 } 57 57 58 bool linkedOnOrAfter(SDKVersion version)59 {60 return dyld_get_program_sdk_version() >= static_cast<uint32_t>(version);61 58 } 62 63 } -
trunk/Source/WebKit2/UIProcess/Cocoa/WebProcessPoolCocoa.mm
r211980 r211990 463 463 bool networkCacheEnabledByDefaults = [defaults boolForKey:WebKitNetworkCacheEnabledDefaultsKey]; 464 464 465 return networkCacheEnabledByDefaults && linkedOnOrAfter( SDKVersion::FirstWithNetworkCache);465 return networkCacheEnabledByDefaults && linkedOnOrAfter(LibraryVersion::FirstWithNetworkCache); 466 466 #else 467 467 return false;
Note: See TracChangeset
for help on using the changeset viewer.