Changeset 271266 in webkit

Timestamp:

Jan 7, 2021, 3:17:58 PM (6 years ago)

Author:

Russell Epstein

Message:

Revert "Cherry-pick r271192. rdar://problem/72894099"

This reverts commit r271251.

Location:

branches/safari-610.4.3.1-branch/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/PlatformUse.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Shared/Cocoa/DefaultWebBrowserChecks.mm (modified) (1 diff)

branches/safari-610.4.3.1-branch/Source/WTF/ChangeLog

@@ -1 @@
-2021-01-07  Russell Epstein  <repstein@apple.com>
-
-        Cherry-pick r271192. rdar://problem/72894099
-
-    NSCrossWebsiteTrackingUsageDescription is not working on Mac, ITP is always enabled
-    https://bugs.webkit.org/show_bug.cgi?id=220190
-    <rdar://problem/72744909>
-    
-    Reviewed by Brent Fulgham.
-    
-    Source/WebKit:
-    
-    Consider the presence of the NSCrossWebsiteTrackingUsageDescription
-    key as an indication to disable ITP for WKWebView until we implement
-    a mechanism for disabling it in WKWebView like we do for iOS to avoid
-    compatibility bugs.
-    
-    * Shared/Cocoa/DefaultWebBrowserChecks.mm:
-    (WebKit::determineITPStateInternal):
-    
-    Source/WTF:
-    
-    * wtf/PlatformUse.h:
-    
-    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@271192 268f45cc-cd09-0410-ab3c-d52691b4dbfc
-
-    2021-01-05  Kate Cheney  <katherine_cheney@apple.com>
-
-            NSCrossWebsiteTrackingUsageDescription is not working on Mac, ITP is always enabled
-            https://bugs.webkit.org/show_bug.cgi?id=220190
-            <rdar://problem/72744909>
-
-            Reviewed by Brent Fulgham.
-
-            * wtf/PlatformUse.h:
-
 2020-12-16  Alan Coon  <alancoon@apple.com>
 

branches/safari-610.4.3.1-branch/Source/WTF/wtf/PlatformUse.h

@@ -315 +315 @@
 #endif
 #endif
-
-#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000) || PLATFORM(MACCATALYST)
-// FIXME: Include macOS once <rdar://problem/72817121> is fixed.
-#define USE_ITP_TCC_CHECK 1
-#endif

branches/safari-610.4.3.1-branch/Source/WebKit/ChangeLog

@@ -1 @@
-2021-01-07  Russell Epstein  <repstein@apple.com>
-
-        Cherry-pick r271192. rdar://problem/72894099
-
-    NSCrossWebsiteTrackingUsageDescription is not working on Mac, ITP is always enabled
-    https://bugs.webkit.org/show_bug.cgi?id=220190
-    <rdar://problem/72744909>
-    
-    Reviewed by Brent Fulgham.
-    
-    Source/WebKit:
-    
-    Consider the presence of the NSCrossWebsiteTrackingUsageDescription
-    key as an indication to disable ITP for WKWebView until we implement
-    a mechanism for disabling it in WKWebView like we do for iOS to avoid
-    compatibility bugs.
-    
-    * Shared/Cocoa/DefaultWebBrowserChecks.mm:
-    (WebKit::determineITPStateInternal):
-    
-    Source/WTF:
-    
-    * wtf/PlatformUse.h:
-    
-    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@271192 268f45cc-cd09-0410-ab3c-d52691b4dbfc
-
-    2021-01-05  Kate Cheney  <katherine_cheney@apple.com>
-
-            NSCrossWebsiteTrackingUsageDescription is not working on Mac, ITP is always enabled
-            https://bugs.webkit.org/show_bug.cgi?id=220190
-            <rdar://problem/72744909>
-
-            Reviewed by Brent Fulgham.
-
-            Consider the presence of the NSCrossWebsiteTrackingUsageDescription
-            key as an indication to disable ITP for WKWebView until we implement
-            a mechanism for disabling it in WKWebView like we do for iOS to avoid
-            compatibility bugs.
-
-            * Shared/Cocoa/DefaultWebBrowserChecks.mm:
-            (WebKit::determineITPStateInternal):
-
 2020-12-21  Alan Coon  <alancoon@apple.com>
 

branches/safari-610.4.3.1-branch/Source/WebKit/Shared/Cocoa/DefaultWebBrowserChecks.mm

@@ -113 +113 @@
         return true;
 
-#if USE(ITP_TCC_CHECK)
-    TCCAccessPreflightResult result = TCCAccessPreflight(getkTCCServiceWebKitIntelligentTrackingPrevention(), nullptr);
+    TCCAccessPreflightResult result = kTCCAccessPreflightDenied;
+#if (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 140000) || (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 110000)
+    result = TCCAccessPreflight(getkTCCServiceWebKitIntelligentTrackingPrevention(), nullptr);
+#endif
     return result != kTCCAccessPreflightDenied;
-#else
-    return false;
-#endif
 }