Changeset 244170 in webkit
- Timestamp:
- Apr 10, 2019 4:57:30 PM (5 years ago)
- Location:
- trunk/Source/WebKit
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit/ChangeLog
r244167 r244170 1 2019-04-10 Chris Dumez <cdumez@apple.com> 2 3 Unreviewed, rolling out r244146. 4 5 Caused a few DeviceOrientation API test failures on iOS 6 7 Reverted changeset: 8 9 "Unable to run system Safari with trunk WebKit" 10 https://bugs.webkit.org/show_bug.cgi?id=196777 11 https://trac.webkit.org/changeset/244146 12 1 13 2019-04-10 Devin Rousso <drousso@apple.com> 2 14 -
trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
r244151 r244170 553 553 if (processPool && processPool != relatedWebViewProcessPool) 554 554 [NSException raise:NSInvalidArgumentException format:@"Related web view %@ has process pool %@ but configuration specifies a different process pool %@", relatedWebView, relatedWebViewProcessPool, configuration.processPool]; 555 if ([relatedWebView->_configuration websiteDataStore] != [_configuration websiteDataStore] && linkedOnOrAfter(WebKit::SDKVersion::FirstWithExceptionsForRelatedWebViewsUsingDifferentDataStores, WebKit::AssumeSafariIsAlwaysLinkedOnAfter::No))555 if ([relatedWebView->_configuration websiteDataStore] != [_configuration websiteDataStore]) 556 556 [NSException raise:NSInvalidArgumentException format:@"Related web view %@ has data store %@ but configuration specifies a different data store %@", relatedWebView, [relatedWebView->_configuration websiteDataStore], [_configuration websiteDataStore]]; 557 557 -
trunk/Source/WebKit/UIProcess/Cocoa/VersionChecks.h
r244146 r244170 40 40 #endif 41 41 42 #ifndef DYLD_IOS_VERSION_FIRST_WITH_EXCEPTIONS_FOR_RELATED_WEBVIEWS_USING_DIFFERENT_DATA_STORES43 #define DYLD_IOS_VERSION_FIRST_WITH_EXCEPTIONS_FOR_RELATED_WEBVIEWS_USING_DIFFERENT_DATA_STORES 044 #endif45 #ifndef DYLD_MACOS_VERSION_FIRST_WITH_EXCEPTIONS_FOR_RELATED_WEBVIEWS_USING_DIFFERENT_DATA_STORES46 #define DYLD_MACOS_VERSION_FIRST_WITH_EXCEPTIONS_FOR_RELATED_WEBVIEWS_USING_DIFFERENT_DATA_STORES 047 #endif48 49 42 #ifndef DYLD_IOS_VERSION_FIRST_WITH_DEVICE_ORIENTATION_AND_MOTION_PERMISSION_API 50 43 #define DYLD_IOS_VERSION_FIRST_WITH_DEVICE_ORIENTATION_AND_MOTION_PERMISSION_API 0 … … 71 64 FirstWithDeviceOrientationAndMotionPermissionAPI = DYLD_IOS_VERSION_FIRST_WITH_DEVICE_ORIENTATION_AND_MOTION_PERMISSION_API, 72 65 FirstThatDecidesPolicyBeforeLoadingQuickLookPreview = DYLD_IOS_VERSION_FIRST_THAT_DECIDES_POLICY_BEFORE_LOADING_QUICK_LOOK_PREVIEW, 73 FirstWithExceptionsForRelatedWebViewsUsingDifferentDataStores = DYLD_IOS_VERSION_FIRST_WITH_EXCEPTIONS_FOR_RELATED_WEBVIEWS_USING_DIFFERENT_DATA_STORES,74 66 #elif PLATFORM(MAC) 75 67 FirstWithNetworkCache = DYLD_MACOSX_VERSION_10_11, … … 80 72 FirstWithSnapshotAfterScreenUpdates = DYLD_MACOS_VERSION_FIRST_WITH_SNAPSHOT_AFTER_SCREEN_UPDATES, 81 73 FirstWhereDownloadAttributeDoesNotOverrideNavigationDelegate = DYLD_MACOS_VERSION_FIRST_WHERE_DOWNLOAD_ATTRIBUTE_DOES_NOT_OVERRIDE_NAVIGATION_DELEGATE, 82 FirstWithExceptionsForRelatedWebViewsUsingDifferentDataStores = DYLD_MACOS_VERSION_FIRST_WITH_EXCEPTIONS_FOR_RELATED_WEBVIEWS_USING_DIFFERENT_DATA_STORES,83 74 #endif 84 75 }; 85 76 86 enum class AssumeSafariIsAlwaysLinkedOnAfter : bool { No, Yes }; 87 bool linkedOnOrAfter(SDKVersion, AssumeSafariIsAlwaysLinkedOnAfter = AssumeSafariIsAlwaysLinkedOnAfter::Yes); 77 bool linkedOnOrAfter(SDKVersion); 88 78 89 79 } -
trunk/Source/WebKit/UIProcess/Cocoa/VersionChecks.mm
r244146 r244170 35 35 static NSString * const WebKitLinkedOnOrAfterEverythingKey = @"WebKitLinkedOnOrAfterEverything"; 36 36 37 bool linkedOnOrAfter(SDKVersion sdkVersion , AssumeSafariIsAlwaysLinkedOnAfter assumeSafariIsAlwaysLinkedOnAfter)37 bool linkedOnOrAfter(SDKVersion sdkVersion) 38 38 { 39 static bool linkedOnOrAfterEverything = false;40 static bool isSafari = false;41 static std::once_flag once;42 std::call_once(once, [] {39 static bool linkedOnOrAfterEverything; 40 static std::once_flag once; 41 std::call_once(once, [] { 42 bool isSafari = false; 43 43 #if PLATFORM(IOS_FAMILY) 44 44 if (WebCore::IOSApplication::isMobileSafari()) … … 49 49 #endif 50 50 51 if ( [[NSUserDefaults standardUserDefaults] boolForKey:WebKitLinkedOnOrAfterEverythingKey])51 if (isSafari || [[NSUserDefaults standardUserDefaults] boolForKey:WebKitLinkedOnOrAfterEverythingKey]) 52 52 linkedOnOrAfterEverything = true; 53 53 }); 54 54 55 if (UNLIKELY(linkedOnOrAfterEverything)) 56 return true; 57 58 if (isSafari && assumeSafariIsAlwaysLinkedOnAfter == AssumeSafariIsAlwaysLinkedOnAfter::Yes) 59 return true; 60 61 auto sdkVersionAsInteger = static_cast<uint32_t>(sdkVersion); 62 return sdkVersionAsInteger && dyld_get_program_sdk_version() >= sdkVersionAsInteger; 55 return linkedOnOrAfterEverything ? true : dyld_get_program_sdk_version() >= static_cast<uint32_t>(sdkVersion); 63 56 } 64 57
Note: See TracChangeset
for help on using the changeset viewer.