Title: [295104] trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm
- Revision
- 295104
- Author
- [email protected]
- Date
- 2022-06-01 13:36:56 -0700 (Wed, 01 Jun 2022)
Log Message
Relax the assertions for min/max unobscured size
https://bugs.webkit.org/show_bug.cgi?id=241083
Reviewed by Tim Horton.
The assertions in _setMinimumUnobscuredSizeOverride and
_setMaximumUnobscuredSizeOverride often trigger when the current bounds are
0. This is handled acceptably, and the assertion is not necessary in that
case.
* Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm:
(-[WKWebView _setMinimumUnobscuredSizeOverride:]):
(-[WKWebView _setMaximumUnobscuredSizeOverride:]):
Canonical link: https://commits.webkit.org/251199@main
Modified Paths
Diff
Modified: trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm (295103 => 295104)
--- trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm 2022-06-01 20:17:33 UTC (rev 295103)
+++ trunk/Source/WebKit/UIProcess/API/ios/WKWebViewIOS.mm 2022-06-01 20:36:56 UTC (rev 295104)
@@ -2865,7 +2865,7 @@
- (void)_setMinimumUnobscuredSizeOverride:(CGSize)size
{
- ASSERT(size.width <= self.bounds.size.width && size.height <= self.bounds.size.height);
+ ASSERT((!self.bounds.size.width || size.width <= self.bounds.size.width) && (!self.bounds.size.height || size.height <= self.bounds.size.height));
_minimumUnobscuredSizeOverride = size;
if (_dynamicViewportUpdateMode == WebKit::DynamicViewportUpdateMode::NotResizing)
@@ -2881,7 +2881,7 @@
- (void)_setMaximumUnobscuredSizeOverride:(CGSize)size
{
- ASSERT(size.width <= self.bounds.size.width && size.height <= self.bounds.size.height);
+ ASSERT((!self.bounds.size.width || size.width <= self.bounds.size.width) && (!self.bounds.size.height || size.height <= self.bounds.size.height));
_maximumUnobscuredSizeOverride = size;
if (_dynamicViewportUpdateMode == WebKit::DynamicViewportUpdateMode::NotResizing) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
