CyberKit v0.0.8 alpha

Matthew Benedict · Matthew Benedict · commit 3e4424e1b9e1 · 2023-07-17T05:50:07.000-05:00
diff --git a/Source/CyberCore/PAL/pal/spi/cf/CFNetworkSPI.h b/Source/CyberCore/PAL/pal/spi/cf/CFNetworkSPI.h
@@ -300,7 +300,7 @@ typedef NS_ENUM(NSInteger, NSURLSessionCompanionProxyPreference) {
 @interface NSURLSessionTask ()
 #if HAVE(NSURLSESSION_EFFECTIVE_CONFIGURATION_OBJECT)
 - (void)_adoptEffectiveConfiguration:(NSURLSessionEffectiveConfiguration *) newConfiguration;
-#else
+#elif HAVE(NSURLSESSION_EFFECTIVE_CONFIGURATION)
 - (void)_adoptEffectiveConfiguration:(NSURLSessionConfiguration *) newConfiguration;
 #endif
 - (NSDictionary *)_timingData;
diff --git a/Source/CyberCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm b/Source/CyberCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm
@@ -98,7 +98,10 @@
     NSError *error { nil };
     NSSet<Class> *classes = [NSSet setWithObjects:getWebFilterEvaluatorClass(), NSNumber.class, NSURL.class, NSString.class, NSMutableString.class, nil];
     NSData *data = [NSData dataWithBytesNoCopy:vector.data() length:vector.size() freeWhenDone:NO];
-    return [NSKeyedUnarchiver _strictlyUnarchivedObjectOfClasses:classes fromData:data error:&error];
+    if ([NSKeyedUnarchiver respondsToSelector:@selector(_strictlyUnarchivedObjectOfClasses:fromData:error:)])
+        return [NSKeyedUnarchiver _strictlyUnarchivedObjectOfClasses:classes fromData:data error:&error];
+    else
+        return [NSKeyedUnarchiver unarchivedObjectOfClasses:classes fromData:data error:&error];
 }
 #endif
 
diff --git a/Source/CyberCore/platform/graphics/cocoa/FontCacheCoreText.cpp b/Source/CyberCore/platform/graphics/cocoa/FontCacheCoreText.cpp
@@ -252,9 +252,13 @@ SynthesisPair computeNecessarySynthesis(CTFontRef font, const FontDescription& f
 
     CTFontSymbolicTraits actualTraits = 0;
     if (isFontWeightBold(fontDescription.weight()) || isItalic(fontDescription.italic())) {
+#if !PLATFORM(IOS_FAMILY) || __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000
         if (shouldComputePhysicalTraits == ShouldComputePhysicalTraits::Yes)
             actualTraits = CTFontGetPhysicalSymbolicTraits(font);
         else
+#else
+            UNUSED_PARAM(shouldComputePhysicalTraits);
+#endif
             actualTraits = CTFontGetSymbolicTraits(font);
     }
 
@@ -735,8 +739,13 @@ static bool isUserInstalledFont(CTFontRef font)
 static RetainPtr<CTFontRef> createFontForCharacters(CTFontRef font, CFStringRef localeString, AllowUserInstalledFonts allowUserInstalledFonts, const UChar* characters, unsigned length)
 {
     CFIndex coveredLength = 0;
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
     auto fallbackOption = allowUserInstalledFonts == AllowUserInstalledFonts::No ? kCTFontFallbackOptionSystem : kCTFontFallbackOptionDefault;
     return adoptCF(CTFontCreateForCharactersWithLanguageAndOption(font, reinterpret_cast<const UniChar*>(characters), length, localeString, fallbackOption, &coveredLength));
+#else
+    UNUSED_PARAM(allowUserInstalledFonts);
+    return adoptCF(CTFontCreateForCharactersWithLanguage(font, reinterpret_cast<const UniChar*>(characters), length, localeString, &coveredLength));
+#endif
 }
 
 static RetainPtr<CTFontRef> lookupFallbackFont(CTFontRef font, FontSelectionValue fontWeight, const AtomString& locale, AllowUserInstalledFonts allowUserInstalledFonts, const UChar* characters, unsigned length)
@@ -955,7 +964,11 @@ void FontCache::prewarm(PrewarmInformation&& prewarmInformation)
                 CFIndex coveredLength = 0;
                 UniChar character = ' ';
 
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000)
                 auto fallbackWarmingFont = adoptCF(CTFontCreateForCharactersWithLanguageAndOption(warmingFont.get(), &character, 1, nullptr, kCTFontFallbackOptionSystem, &coveredLength));
+#else
+                auto fallbackWarmingFont = adoptCF(CTFontCreateForCharactersWithLanguage(warmingFont.get(), &character, 1, nullptr, &coveredLength));
+#endif
             }
         }
     });
diff --git a/Source/CyberCore/platform/graphics/cocoa/GraphicsContextCocoa.mm b/Source/CyberCore/platform/graphics/cocoa/GraphicsContextCocoa.mm
@@ -157,7 +157,7 @@ static inline void drawDotsForDocumentMarker(CGContextRef context, const FloatRe
 
 void GraphicsContextCG::convertToDestinationColorSpaceIfNeeded(RetainPtr<CGImageRef>& image)
 {
-#if HAVE(CORE_ANIMATION_FIX_FOR_RADAR_93560567)
+#if HAVE(CORE_ANIMATION_FIX_FOR_RADAR_93560567) || ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED < 140000)
     UNUSED_PARAM(image);
 #else
     if (!CGColorSpaceUsesITUR_2100TF(CGImageGetColorSpace(image.get())))
diff --git a/Source/CyberKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm b/Source/CyberKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm
@@ -429,6 +429,7 @@ static inline bool computeIsAlwaysOnLoggingAllowed(NetworkSession& session)
 
     WTFBeginSignpost(m_task.get(), "DataTask", "%" PUBLIC_LOG_STRING " %" PRIVATE_LOG_STRING " pri: %.2f preconnect: %d", request.httpMethod().utf8().data(), url.string().utf8().data(), toNSURLSessionTaskPriority(request.priority()), parameters.shouldPreconnectOnly == PreconnectOnly::Yes);
 
+#if HAVE(NSURLSESSION_EFFECTIVE_CONFIGURATION)
     switch (parameters.storedCredentialsPolicy) {
     case CyberCore::StoredCredentialsPolicy::Use:
         ASSERT(m_sessionWrapper->session.get().configuration.URLCredentialStorage);
@@ -449,6 +450,7 @@ static inline bool computeIsAlwaysOnLoggingAllowed(NetworkSession& session)
 #endif
         break;
     };
+#endif
 
     RELEASE_ASSERT(!m_sessionWrapper->dataTaskMap.contains([m_task taskIdentifier]));
     m_sessionWrapper->dataTaskMap.add([m_task taskIdentifier], this);
diff --git a/Source/CyberKit/NetworkProcess/cocoa/NetworkSessionCocoa.h b/Source/CyberKit/NetworkProcess/cocoa/NetworkSessionCocoa.h
@@ -75,6 +75,9 @@ struct IsolatedSession {
     WTF_MAKE_FAST_ALLOCATED;
 public:
     SessionWrapper sessionWithCredentialStorage;
+#if !HAVE(NSURLSESSION_EFFECTIVE_CONFIGURATION)
+    SessionWrapper sessionWithoutCredentialStorage;
+#endif
     WallTime lastUsed;
 };
 
@@ -93,6 +96,9 @@ struct SessionSet : public RefCounted<SessionSet>, public CanMakeWeakPtr<Session
     std::unique_ptr<IsolatedSession> appBoundSession;
 
     SessionWrapper sessionWithCredentialStorage;
+#if !HAVE(NSURLSESSION_EFFECTIVE_CONFIGURATION)
+    SessionWrapper sessionWithoutCredentialStorage;
+#endif
     SessionWrapper ephemeralStatelessSession;
 
 private:
diff --git a/Source/CyberKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm b/Source/CyberKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
@@ -1513,6 +1513,10 @@ static void activateSessionCleanup(NetworkSessionCocoa& session, const NetworkSe
     auto cookieAcceptPolicy = configuration.HTTPCookieStorage.cookieAcceptPolicy;
     LOG(NetworkSession, "Created NetworkSession with cookieAcceptPolicy %lu", cookieAcceptPolicy);
     RELEASE_LOG_IF(cookieAcceptPolicy == NSHTTPCookieAcceptPolicyNever, NetworkSession, "Creating network session with ID %" PRIu64 " that will not accept cookies.", m_sessionID.toUInt64());
+#if !HAVE(NSURLSESSION_EFFECTIVE_CONFIGURATION)
+    configuration.URLCredentialStorage = nil;
+    sessionSet.sessionWithoutCredentialStorage.initialize(configuration, *this, CyberCore::StoredCredentialsPolicy::DoNotUse, NavigatingToAppBoundDomain::No);
+#endif
 }
 
 SessionSet& NetworkSessionCocoa::sessionSetForPage(WebPageProxyIdentifier webPageProxyID)
@@ -1538,7 +1542,11 @@ static void activateSessionCleanup(NetworkSessionCocoa& session, const NetworkSe
         return ephemeralStatelessSession;
 
     NSURLSessionConfiguration *configuration = [NSURLSessionConfiguration ephemeralSessionConfiguration];
+#if HAVE(NSURLSESSION_EFFECTIVE_CONFIGURATION)
     NSURLSessionConfiguration *existingConfiguration = sessionWithCredentialStorage.session.get().configuration;
+#else
+    NSURLSessionConfiguration *existingConfiguration = sessionWithoutCredentialStorage.session.get().configuration;
+#endif
 
     configuration.HTTPCookieAcceptPolicy = NSHTTPCookieAcceptPolicyNever;
     configuration.URLCredentialStorage = nil;
@@ -1582,8 +1590,13 @@ static void activateSessionCleanup(NetworkSessionCocoa& session, const NetworkSe
 
     switch (storedCredentialsPolicy) {
     case CyberCore::StoredCredentialsPolicy::Use:
+        return sessionSetForPage(webPageProxyID).sessionWithCredentialStorage;
     case CyberCore::StoredCredentialsPolicy::DoNotUse:
+#if HAVE(NSURLSESSION_EFFECTIVE_CONFIGURATION)
         return sessionSetForPage(webPageProxyID).sessionWithCredentialStorage;
+#else
+            return sessionSetForPage(webPageProxyID).sessionWithoutCredentialStorage;
+#endif
     case CyberCore::StoredCredentialsPolicy::EphemeralStateless:
         return initializeEphemeralStatelessSessionIfNeeded(webPageProxyID, NavigatingToAppBoundDomain::No);
     }
@@ -1597,14 +1610,26 @@ static void activateSessionCleanup(NetworkSessionCocoa& session, const NetworkSe
     if (!sessionSet.appBoundSession) {
         sessionSet.appBoundSession = makeUnique<IsolatedSession>();
         sessionSet.appBoundSession->sessionWithCredentialStorage.initialize(sessionSet.sessionWithCredentialStorage.session.get().configuration, *this, CyberCore::StoredCredentialsPolicy::Use, NavigatingToAppBoundDomain::Yes);
+#if !HAVE(NSURLSESSION_EFFECTIVE_CONFIGURATION)
+        sessionSet.appBoundSession->sessionWithoutCredentialStorage.initialize(sessionSet.sessionWithoutCredentialStorage.session.get().configuration, *this, CyberCore::StoredCredentialsPolicy::DoNotUse, NavigatingToAppBoundDomain::Yes);
+#endif
     }
 
     auto& sessionWrapper = [&] (auto storedCredentialsPolicy) -> SessionWrapper& {
         switch (storedCredentialsPolicy) {
         case CyberCore::StoredCredentialsPolicy::Use:
+#if !HAVE(NSURLSESSION_EFFECTIVE_CONFIGURATION)
+            LOG(NetworkSession, "Using app-bound NSURLSession with credential storage.");
+            return sessionSet.appBoundSession->sessionWithCredentialStorage;
+#endif
         case CyberCore::StoredCredentialsPolicy::DoNotUse:
+#if HAVE(NSURLSESSION_EFFECTIVE_CONFIGURATION)
             LOG(NetworkSession, "Using app-bound NSURLSession.");
             return sessionSet.appBoundSession->sessionWithCredentialStorage;
+#else
+            LOG(NetworkSession, "Using app-bound NSURLSession without credential storage.");
+            return sessionSet.appBoundSession->sessionWithoutCredentialStorage;
+#endif
         case CyberCore::StoredCredentialsPolicy::EphemeralStateless:
             return initializeEphemeralStatelessSessionIfNeeded(webPageProxyID, NavigatingToAppBoundDomain::Yes);
         }
@@ -1643,6 +1668,9 @@ static void activateSessionCleanup(NetworkSessionCocoa& session, const NetworkSe
     auto& entry = isolatedSessions.ensure(firstPartyDomain, [this, &session, isNavigatingToAppBoundDomain] {
         auto newEntry = makeUnique<IsolatedSession>();
         newEntry->sessionWithCredentialStorage.initialize(sessionWithCredentialStorage.session.get().configuration, session, CyberCore::StoredCredentialsPolicy::Use, isNavigatingToAppBoundDomain);
+#if !HAVE(NSURLSESSION_EFFECTIVE_CONFIGURATION)
+        newEntry->sessionWithoutCredentialStorage.initialize(sessionWithoutCredentialStorage.session.get().configuration, session, CyberCore::StoredCredentialsPolicy::DoNotUse, isNavigatingToAppBoundDomain);
+#endif
         return newEntry;
     }).iterator->value;
 
@@ -1651,9 +1679,18 @@ static void activateSessionCleanup(NetworkSessionCocoa& session, const NetworkSe
     auto& sessionWrapper = [&] (auto storedCredentialsPolicy) -> SessionWrapper& {
         switch (storedCredentialsPolicy) {
         case CyberCore::StoredCredentialsPolicy::Use:
+    #if !HAVE(NSURLSESSION_EFFECTIVE_CONFIGURATION)
+            LOG(NetworkSession, "Using app-bound NSURLSession with credential storage.");
+            return entry->sessionWithCredentialStorage;
+    #endif
         case CyberCore::StoredCredentialsPolicy::DoNotUse:
-            LOG(NetworkSession, "Using isolated NSURLSession.");
+    #if HAVE(NSURLSESSION_EFFECTIVE_CONFIGURATION)
+            LOG(NetworkSession, "Using app-bound NSURLSession.");
             return entry->sessionWithCredentialStorage;
+    #else
+            LOG(NetworkSession, "Using app-bound NSURLSession without credential storage.");
+            return entry->sessionWithoutCredentialStorage;
+    #endif
         case CyberCore::StoredCredentialsPolicy::EphemeralStateless:
             return initializeEphemeralStatelessSessionIfNeeded(isNavigatingToAppBoundDomain, session);
         }
@@ -1700,19 +1737,33 @@ static void activateSessionCleanup(NetworkSessionCocoa& session, const NetworkSe
 void NetworkSessionCocoa::invalidateAndCancelSessionSet(SessionSet& sessionSet)
 {
     [sessionSet.sessionWithCredentialStorage.session invalidateAndCancel];
+#if !HAVE(NSURLSESSION_EFFECTIVE_CONFIGURATION)
+    [sessionSet.sessionWithoutCredentialStorage.session invalidateAndCancel];
+#endif
     [sessionSet.ephemeralStatelessSession.session invalidateAndCancel];
     [sessionSet.sessionWithCredentialStorage.delegate sessionInvalidated];
+#if !HAVE(NSURLSESSION_EFFECTIVE_CONFIGURATION)
+    [sessionSet.sessionWithoutCredentialStorage.delegate sessionInvalidated];
+#endif
     [sessionSet.ephemeralStatelessSession.delegate sessionInvalidated];
 
     for (auto& session : sessionSet.isolatedSessions.values()) {
         [session->sessionWithCredentialStorage.session invalidateAndCancel];
         [session->sessionWithCredentialStorage.delegate sessionInvalidated];
+#if !HAVE(NSURLSESSION_EFFECTIVE_CONFIGURATION)
+        [session->sessionWithoutCredentialStorage.session invalidateAndCancel];
+        [session->sessionWithoutCredentialStorage.delegate sessionInvalidated];
+#endif
     }
     sessionSet.isolatedSessions.clear();
 
     if (sessionSet.appBoundSession) {
         [sessionSet.appBoundSession->sessionWithCredentialStorage.session invalidateAndCancel];
         [sessionSet.appBoundSession->sessionWithCredentialStorage.delegate sessionInvalidated];
+#if !HAVE(NSURLSESSION_EFFECTIVE_CONFIGURATION)
+        [sessionSet.appBoundSession->sessionWithoutCredentialStorage.session invalidateAndCancel];
+        [sessionSet.appBoundSession->sessionWithoutCredentialStorage.delegate sessionInvalidated];
+#endif
     }
 }
 
diff --git a/Source/CyberKit/Platform/spi/ios/UIKitSPI.h b/Source/CyberKit/Platform/spi/ios/UIKitSPI.h
@@ -605,6 +605,12 @@ typedef NS_ENUM(NSUInteger, UIScrollPhase) {
 - (CGSize)_legacy_sizeWithFont:(UIFont *)font minFontSize:(CGFloat)minFontSize actualFontSize:(CGFloat *)actualFontSize forWidth:(CGFloat)width lineBreakMode:(NSLineBreakMode)lineBreakMode;
 @end
 
+@interface UIGestureRecognizer ()
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 130400
+@property (nonatomic, readonly) UIKeyModifierFlags _modifierFlags;
+#endif
+@end
+
 @interface UITableView ()
 @property (nonatomic, getter=_sectionContentInsetFollowsLayoutMargins, setter=_setSectionContentInsetFollowsLayoutMargins:) BOOL sectionContentInsetFollowsLayoutMargins;
 @end
diff --git a/Source/CyberKit/Shared/Cocoa/AuxiliaryProcessCocoa.mm b/Source/CyberKit/Shared/Cocoa/AuxiliaryProcessCocoa.mm
@@ -171,7 +171,11 @@ static void initializeTimerCoalescingPolicy()
         NSMutableData.class,
     nil];
     NSError *error { nil };
-    id result = [NSKeyedUnarchiver _strictlyUnarchivedObjectOfClasses:classes fromData:encodedData.get() error:&error];
+    id result;
+    if ([NSKeyedUnarchiver respondsToSelector:@selector(_strictlyUnarchivedObjectOfClasses:fromData:error:)])
+        result = [NSKeyedUnarchiver _strictlyUnarchivedObjectOfClasses:classes fromData:encodedData.get() error:&error];
+    else
+        result = [NSKeyedUnarchiver unarchivedObjectOfClasses:classes fromData:encodedData.get() error:&error];
     ASSERT(!error);
     return result;
 }
diff --git a/Source/CyberKit/UIProcess/Cocoa/ProcessAssertionCocoa.mm b/Source/CyberKit/UIProcess/Cocoa/ProcessAssertionCocoa.mm
@@ -127,7 +127,11 @@ - (instancetype)init
     }];
 
     [[NSNotificationCenter defaultCenter] addObserverForName:UIApplicationDidEnterBackgroundNotification object:[UIApplication sharedApplication] queue:nil usingBlock:^(NSNotification *) {
+#if HAVE(RUNNINGBOARD_VISIBILITY_ASSERTIONS)
         if (![self _hasBackgroundTask])
+#else
+        if (_backgroundTask == UIBackgroundTaskInvalid)
+#endif
             CyberKit::WebProcessPool::notifyProcessPoolsApplicationIsAboutToSuspend();
     }];
 
@@ -197,7 +201,11 @@ - (BOOL)_hasBackgroundTask
 
 - (void)_updateBackgroundTask
 {
+#if HAVE(RUNNINGBOARD_VISIBILITY_ASSERTIONS)
     if (!_assertionsNeedingBackgroundTask.isEmptyIgnoringNullReferences() && (![self _hasBackgroundTask] || _backgroundTaskWasInvalidated)) {
+#else
+    if (!_assertionsNeedingBackgroundTask.isEmptyIgnoringNullReferences() && (_backgroundTask == UIBackgroundTaskInvalid || _backgroundTaskWasInvalidated)) {
+#endif
         if (processHasActiveRunTimeLimitation()) {
             RELEASE_LOG(ProcessSuspension, "%p - WKProcessAssertionBackgroundTaskManager: Ignored request to start a new background task because RunningBoard has already started the expiration timer", self);
             return;
@@ -278,7 +286,11 @@ - (void)_handleBackgroundTaskExpirationOnMainThread
 
 - (void)_releaseBackgroundTask
 {
+#if HAVE(RUNNINGBOARD_VISIBILITY_ASSERTIONS)
     if (![self _hasBackgroundTask])
+#else
+    if (_backgroundTask == UIBackgroundTaskInvalid)
+#endif
         return;
 
     RELEASE_LOG(ProcessSuspension, "%p - WKProcessAssertionBackgroundTaskManager: endBackgroundTask", self);
@@ -405,6 +417,7 @@ static BKSProcessAssertionFlags flagsForAssertionType(ProcessAssertionType asser
     case ProcessAssertionType::MediaPlayback:
         return foregroundTabFlags;
     case ProcessAssertionType::FinishTaskInterruptable:
+        return backgroundTabFlags;
     case ProcessAssertionType::BoostedJetsam:
         ASSERT_NOT_REACHED();
         return 0;
@@ -423,6 +436,7 @@ static BKSProcessAssertionReason toBKSProcessAssertionReason(ProcessAssertionTyp
     case ProcessAssertionType::MediaPlayback:
         return BKSProcessAssertionReasonMediaPlayback;
     case ProcessAssertionType::FinishTaskInterruptable:
+        return BKSProcessAssertionReasonFinishTask;
     case ProcessAssertionType::BoostedJetsam:
         ASSERT_NOT_REACHED();
         return 0;
diff --git a/Source/CyberKit/UIProcess/ios/WKContentViewInteraction.mm b/Source/CyberKit/UIProcess/ios/WKContentViewInteraction.mm
diff --git a/Source/CyberKit/UIProcess/ios/WKSyntheticTapGestureRecognizer.mm b/Source/CyberKit/UIProcess/ios/WKSyntheticTapGestureRecognizer.mm
diff --git a/Source/WTF/wtf/PlatformHave.h b/Source/WTF/wtf/PlatformHave.h
diff --git a/Tools/MobileMiniBrowser/Assets.xcassets/AppIcon.appiconset/CydiaIcon.png b/Tools/MobileMiniBrowser/Assets.xcassets/AppIcon.appiconset/CydiaIcon.png

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ static inline void drawDotsForDocumentMarker(CGContextRef context, const FloatRe`
`157`	`157`
`158`	`158`	`void GraphicsContextCG::convertToDestinationColorSpaceIfNeeded(RetainPtr<CGImageRef>& image)`
`159`	`159`	`{`
`160`		`-#if HAVE(CORE_ANIMATION_FIX_FOR_RADAR_93560567)`
	`160`	`+#if HAVE(CORE_ANIMATION_FIX_FOR_RADAR_93560567) \|\| ((PLATFORM(IOS) \|\| PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MIN_REQUIRED < 140000)`
`161`	`161`	`UNUSED_PARAM(image);`
`162`	`162`	`#else`
`163`	`163`	`if (!CGColorSpaceUsesITUR_2100TF(CGImageGetColorSpace(image.get())))`