Title: [271266] branches/safari-610.4.3.1-branch/Source
- Revision
- 271266
- Author
- [email protected]
- Date
- 2021-01-07 15:17:58 -0800 (Thu, 07 Jan 2021)
Log Message
Revert "Cherry-pick r271192. rdar://problem/72894099"
This reverts commit r271251.
Modified Paths
Diff
Modified: branches/safari-610.4.3.1-branch/Source/WTF/ChangeLog (271265 => 271266)
--- branches/safari-610.4.3.1-branch/Source/WTF/ChangeLog 2021-01-07 23:17:44 UTC (rev 271265)
+++ branches/safari-610.4.3.1-branch/Source/WTF/ChangeLog 2021-01-07 23:17:58 UTC (rev 271266)
@@ -1,39 +1,3 @@
-2021-01-07 Russell Epstein <[email protected]>
-
- 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 <[email protected]>
-
- 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 <[email protected]>
Cherry-pick r269930. rdar://problem/72298580
Modified: branches/safari-610.4.3.1-branch/Source/WTF/wtf/PlatformUse.h (271265 => 271266)
--- branches/safari-610.4.3.1-branch/Source/WTF/wtf/PlatformUse.h 2021-01-07 23:17:44 UTC (rev 271265)
+++ branches/safari-610.4.3.1-branch/Source/WTF/wtf/PlatformUse.h 2021-01-07 23:17:58 UTC (rev 271266)
@@ -314,8 +314,3 @@
#define USE_PTHREAD_JIT_PERMISSIONS_API 1
#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
Modified: branches/safari-610.4.3.1-branch/Source/WebKit/ChangeLog (271265 => 271266)
--- branches/safari-610.4.3.1-branch/Source/WebKit/ChangeLog 2021-01-07 23:17:44 UTC (rev 271265)
+++ branches/safari-610.4.3.1-branch/Source/WebKit/ChangeLog 2021-01-07 23:17:58 UTC (rev 271266)
@@ -1,45 +1,3 @@
-2021-01-07 Russell Epstein <[email protected]>
-
- 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 <[email protected]>
-
- 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 <[email protected]>
Cherry-pick r270998. rdar://problem/72552852
Modified: branches/safari-610.4.3.1-branch/Source/WebKit/Shared/Cocoa/DefaultWebBrowserChecks.mm (271265 => 271266)
--- branches/safari-610.4.3.1-branch/Source/WebKit/Shared/Cocoa/DefaultWebBrowserChecks.mm 2021-01-07 23:17:44 UTC (rev 271265)
+++ branches/safari-610.4.3.1-branch/Source/WebKit/Shared/Cocoa/DefaultWebBrowserChecks.mm 2021-01-07 23:17:58 UTC (rev 271266)
@@ -112,12 +112,11 @@
if (!isFullWebBrowser(bundleIdentifier) && !hasRequestedCrossWebsiteTrackingPermission())
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
}
static dispatch_queue_t g_itpQueue;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
