From dca5aca1ce5f781760a7262cecf46fd872c997fd Mon Sep 17 00:00:00 2001 From: James Magahern Date: Wed, 19 Apr 2023 11:40:57 -0700 Subject: [PATCH] UIGraphicsImageContext: both dimensions must be > 0 --- App/Common UI/GradientView.swift | 2 +- App/Find on Page/FindOnPageViewController.swift | 6 +++--- App/Titlebar and URL Bar/URLBar.swift | 2 +- App/Web Process Bundle Bridge/SBRScriptPolicy.m | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/App/Common UI/GradientView.swift b/App/Common UI/GradientView.swift index 15fcf4a..3291af1 100644 --- a/App/Common UI/GradientView.swift +++ b/App/Common UI/GradientView.swift @@ -31,7 +31,7 @@ class GradientView: UIImageView } private func gradientImage(forSize size: CGSize) -> UIImage? { - guard size != .zero else { return nil } + guard size.width > .leastNonzeroMagnitude && size.height > .leastNonzeroMagnitude else { return nil } var image: UIImage? = nil UIGraphicsBeginImageContext(size) diff --git a/App/Find on Page/FindOnPageViewController.swift b/App/Find on Page/FindOnPageViewController.swift index d73dcda..0588642 100644 --- a/App/Find on Page/FindOnPageViewController.swift +++ b/App/Find on Page/FindOnPageViewController.swift @@ -41,7 +41,7 @@ class FindOnPageViewController: UIViewController, _WKFindDelegate findOnPageView.textField.addAction(UIAction(handler: { [unowned self] _ in self.findString = findOnPageView.textField.text - webView?._find(self.findString, options: self.findOptions, maxCount: self.maxCount) + webView?._find(self.findString, options: self.findOptions, maxCount: Int(self.maxCount)) }), for: .editingChanged) findOnPageView.prevResultButton.addAction(UIAction(handler: { [unowned self] _ in @@ -82,13 +82,13 @@ class FindOnPageViewController: UIViewController, _WKFindDelegate @objc override func findNext(_ sender: Any?) { - webView?._find(self.findString, options: self.findOptions, maxCount: self.maxCount) + webView?._find(self.findString, options: self.findOptions, maxCount: Int(self.maxCount)) } @objc override func findPrevious(_ sender: Any?) { let options: _WKFindOptions = self.findOptions.union(.backwards) - webView?._find(self.findString, options: options, maxCount: self.maxCount) + webView?._find(self.findString, options: options, maxCount: Int(self.maxCount)) } func _webView(_ webView: WKWebView!, didFailToFind string: String!) { diff --git a/App/Titlebar and URL Bar/URLBar.swift b/App/Titlebar and URL Bar/URLBar.swift index cf60064..44fcb80 100644 --- a/App/Titlebar and URL Bar/URLBar.swift +++ b/App/Titlebar and URL Bar/URLBar.swift @@ -281,7 +281,7 @@ class URLBar: ReliefButton } private func fadeBackgroundImageForSize(_ size: CGSize, cutoffLocation: CGFloat) -> UIImage? { - guard size != .zero else { return nil } + guard size.width > .leastNonzeroMagnitude && size.height > .leastNonzeroMagnitude else { return nil } var image: UIImage? = nil UIGraphicsBeginImageContext(CGSize(width: size.width, height: 1.0)) diff --git a/App/Web Process Bundle Bridge/SBRScriptPolicy.m b/App/Web Process Bundle Bridge/SBRScriptPolicy.m index b3d9237..fa9547d 100644 --- a/App/Web Process Bundle Bridge/SBRScriptPolicy.m +++ b/App/Web Process Bundle Bridge/SBRScriptPolicy.m @@ -77,7 +77,7 @@ static CGFloat RoundToScale(CGFloat v, CGFloat s) { + (UIImage *)iconRepresentationForPolicyType:(SBRScriptOriginPolicyType)policyType withConfiguration:(nonnull SBRScriptPolicyIconConfiguration *)configuration { const CGSize size = [configuration size]; - if (CGSizeEqualToSize(size, CGSizeZero)) { + if (size.width < CGFLOAT_EPSILON || size.height < CGFLOAT_EPSILON) { return nil; }