Changeset 289573 in webkit

Timestamp:

Feb 10, 2022, 2:06:48 PM (3 years ago)

Author:

achristensen@apple.com

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

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/PlatformHave.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Platform/spi/Cocoa/SafeBrowsingSPI.h (modified) (1 diff)
• WebKit/UIProcess/Cocoa/SafeBrowsingWarningCocoa.mm (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2022-02-10  Alex Christensen  <achristensen@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  <gavin.p@apple.com>
 

trunk/Source/WTF/wtf/PlatformHave.h

@@ -1174 +1174 @@
 #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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2022-02-10  Alex Christensen  <achristensen@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  <nham@apple.com>
 

trunk/Source/WebKit/Platform/spi/Cocoa/SafeBrowsingSPI.h

@@ -51 +51 @@
 @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
 

trunk/Source/WebKit/UIProcess/Cocoa/SafeBrowsingWarningCocoa.mm

@@ -36 +36 @@
 #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
 }