Title: [289573] trunk/Source
- Revision
- 289573
- Author
- achristen...@apple.com
- Date
- 2022-02-10 14:06:48 -0800 (Thu, 10 Feb 2022)
Log Message
Unreviewed, reverting r289485.
Internal SDKs not quiiiite ready yet
Reverted changeset:
"Move Safe Browsing knowledge into SafariSafeBrowsing
framework"
https://bugs.webkit.org/show_bug.cgi?id=231692
https://commits.webkit.org/r289485
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (289572 => 289573)
--- trunk/Source/WTF/ChangeLog 2022-02-10 21:09:19 UTC (rev 289572)
+++ trunk/Source/WTF/ChangeLog 2022-02-10 22:06:48 UTC (rev 289573)
@@ -1,3 +1,16 @@
+2022-02-10 Alex Christensen <achristen...@webkit.org>
+
+ Unreviewed, reverting r289485.
+
+ Internal SDKs not quiiiite ready yet
+
+ Reverted changeset:
+
+ "Move Safe Browsing knowledge into SafariSafeBrowsing
+ framework"
+ https://bugs.webkit.org/show_bug.cgi?id=231692
+ https://commits.webkit.org/r289485
+
2022-02-10 Gavin Phillips <gavi...@apple.com>
Introduce SignedPtrTraits which enables Ref pointers to be protected with PtrTags.
Modified: trunk/Source/WTF/wtf/PlatformHave.h (289572 => 289573)
--- trunk/Source/WTF/wtf/PlatformHave.h 2022-02-10 21:09:19 UTC (rev 289572)
+++ trunk/Source/WTF/wtf/PlatformHave.h 2022-02-10 22:06:48 UTC (rev 289573)
@@ -1173,7 +1173,3 @@
#if ((PLATFORM(IOS) || PLATFORM(MACCATALYST)) && __IPHONE_OS_VERSION_MAX_ALLOWED >= 150400)
#define HAVE_UIACTIVITYTYPE_SHAREPLAY 1
#endif
-
-#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 130000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 160000) || (PLATFORM(WATCHOS) && __WATCH_OS_VERSION_MIN_REQUIRED >= 90000)
-#define HAVE_SAFE_BROWSING_RESULT_DETAILS 1
-#endif
Modified: trunk/Source/WebKit/ChangeLog (289572 => 289573)
--- trunk/Source/WebKit/ChangeLog 2022-02-10 21:09:19 UTC (rev 289572)
+++ trunk/Source/WebKit/ChangeLog 2022-02-10 22:06:48 UTC (rev 289573)
@@ -1,3 +1,16 @@
+2022-02-10 Alex Christensen <achristen...@webkit.org>
+
+ Unreviewed, reverting r289485.
+
+ Internal SDKs not quiiiite ready yet
+
+ Reverted changeset:
+
+ "Move Safe Browsing knowledge into SafariSafeBrowsing
+ framework"
+ https://bugs.webkit.org/show_bug.cgi?id=231692
+ https://commits.webkit.org/r289485
+
2022-02-10 Ben Nham <n...@apple.com>
Apply default sandbox to webpushd on Mac
Modified: trunk/Source/WebKit/Platform/spi/Cocoa/SafeBrowsingSPI.h (289572 => 289573)
--- trunk/Source/WebKit/Platform/spi/Cocoa/SafeBrowsingSPI.h 2022-02-10 21:09:19 UTC (rev 289572)
+++ trunk/Source/WebKit/Platform/spi/Cocoa/SafeBrowsingSPI.h 2022-02-10 22:06:48 UTC (rev 289573)
@@ -50,13 +50,6 @@
@property (nonatomic, readonly, getter=isMalware) BOOL malware;
@property (nonatomic, readonly, getter=isUnwantedSoftware) BOOL unwantedSoftware;
-#if HAVE(SAFE_BROWSING_RESULT_DETAILS)
-@property (nonatomic, readonly) NSString *malwareDetailsBaseURLString;
-@property (nonatomic, readonly) NSURL *learnMoreURL;
-@property (nonatomic, readonly) NSString *reportAnErrorBaseURLString;
-@property (nonatomic, readonly) NSString *localizedProviderDisplayName;
-#endif
-
@end
@interface SSBLookupResult : NSObject <NSCopying, NSSecureCoding>
Modified: trunk/Source/WebKit/UIProcess/Cocoa/SafeBrowsingWarningCocoa.mm (289572 => 289573)
--- trunk/Source/WebKit/UIProcess/Cocoa/SafeBrowsingWarningCocoa.mm 2022-02-10 21:09:19 UTC (rev 289572)
+++ trunk/Source/WebKit/UIProcess/Cocoa/SafeBrowsingWarningCocoa.mm 2022-02-10 22:06:48 UTC (rev 289573)
@@ -35,48 +35,34 @@
#if HAVE(SAFE_BROWSING)
-static String malwareDetailsBase(SSBServiceLookupResult *result)
+// FIXME: These four functions ought to be API calls to the SafariSafeBrowsing framework when such SPI is available.
+// That way WebKit does not need to know about the SafariSafeBrowsing framework's possible providers.
+static const char* malwareDetailsBase(SSBServiceLookupResult *result)
{
-#if HAVE(SAFE_BROWSING_RESULT_DETAILS)
- return result.malwareDetailsBaseURLString;
-#else
if ([result.provider isEqualToString:SSBProviderTencent])
return "https://www.urlsec.qq.com/check.html?tpl=safari";
return "https://google.com/safebrowsing/diagnostic?tpl=safari";
-#endif
}
static NSURL *learnMoreURL(SSBServiceLookupResult *result)
{
-#if HAVE(SAFE_BROWSING_RESULT_DETAILS)
- return result.learnMoreURL;
-#else
if ([result.provider isEqualToString:SSBProviderTencent])
return [NSURL URLWithString:@"https://www.urlsec.qq.com/standard/s1.html?tpl=safari"];
return [NSURL URLWithString:@"https://www.google.com/support/bin/answer.py?answer=106318"];
-#endif
}
-static String reportAnErrorBase(SSBServiceLookupResult *result)
+static const char* reportAnErrorBase(SSBServiceLookupResult *result)
{
-#if HAVE(SAFE_BROWSING_RESULT_DETAILS)
- return result.reportAnErrorBaseURLString;
-#else
if ([result.provider isEqualToString:SSBProviderTencent])
return "https://www.urlsec.qq.com/complain.html?tpl=safari";
return "https://www.google.com/safebrowsing/report_error/?tpl=safari";
-#endif
}
static String localizedProvider(SSBServiceLookupResult *result)
{
-#if HAVE(SAFE_BROWSING_RESULT_DETAILS)
- return result.localizedProviderDisplayName;
-#else
if ([result.provider isEqualToString:SSBProviderTencent])
return WEB_UI_NSSTRING(@"Tencent Safe Browsing", "Tencent Safe Browsing");
return WEB_UI_NSSTRING(@"Google Safe Browsing", "Google Safe Browsing");
-#endif
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
