Title: [278319] trunk/Source/WebKit
- Revision
- 278319
- Author
- [email protected]
- Date
- 2021-06-01 12:04:12 -0700 (Tue, 01 Jun 2021)
Log Message
Unreviewed build fix after r278253.
Revert changes to ObjectiveCBlockConversions.swift and this is Swift's Optional<> not WTF's.
* SwiftOverlay/SwiftOverlay/ObjectiveCBlockConversions.swift:
(ObjCBlockConversion.boxingNilAsAnyForCompatibility(_:Error:Error:)):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (278318 => 278319)
--- trunk/Source/WebKit/ChangeLog 2021-06-01 19:02:38 UTC (rev 278318)
+++ trunk/Source/WebKit/ChangeLog 2021-06-01 19:04:12 UTC (rev 278319)
@@ -1,5 +1,14 @@
2021-06-01 Chris Dumez <[email protected]>
+ Unreviewed build fix after r278253.
+
+ Revert changes to ObjectiveCBlockConversions.swift and this is Swift's Optional<> not WTF's.
+
+ * SwiftOverlay/SwiftOverlay/ObjectiveCBlockConversions.swift:
+ (ObjCBlockConversion.boxingNilAsAnyForCompatibility(_:Error:Error:)):
+
+2021-06-01 Chris Dumez <[email protected]>
+
REGRESSION (iOS 14.5): Can't go back and render previous page properly after "location.href"
https://bugs.webkit.org/show_bug.cgi?id=226323
<rdar://problem/78623536>
Modified: trunk/Source/WebKit/SwiftOverlay/SwiftOverlay/ObjectiveCBlockConversions.swift (278318 => 278319)
--- trunk/Source/WebKit/SwiftOverlay/SwiftOverlay/ObjectiveCBlockConversions.swift 2021-06-01 19:02:38 UTC (rev 278318)
+++ trunk/Source/WebKit/SwiftOverlay/SwiftOverlay/ObjectiveCBlockConversions.swift 2021-06-01 19:04:12 UTC (rev 278319)
@@ -70,7 +70,7 @@
/// Converts a block from `(Result<Value, Error>) -> Void` to `(Value?, Error) -> Void`.
///
/// This performs the same conversion as `Self.exclusive(_:)`, but if the result block is called
- /// with `(nil, nil)` then `handler` is called with `.success(std::optional<Any>.none as Any)`. This
+ /// with `(nil, nil)` then `handler` is called with `.success(Optional<Any>.none as Any)`. This
/// is a compatibility behavior for http://webkit.org/b/216198, and should not be adopted by
/// new code.
static func boxingNilAsAnyForCompatibility(_ handler: @escaping (Result<Any, Error>) -> Void) -> (Any?, Error?) -> Void {
@@ -80,7 +80,7 @@
} else if let success = value {
handler(.success(success))
} else {
- handler(.success(std::optional<Any>.none as Any))
+ handler(.success(Optional<Any>.none as Any))
}
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
