Changeset 294888 in webkit

Timestamp:

May 26, 2022, 12:50:46 PM (4 years ago)

Author:

Devin Rousso

Message:

spurious RELEASE_LOG when creating a WKWebView with an empty frame
​https://bugs.webkit.org/show_bug.cgi?id=240959

Reviewed by Tim Horton.

• Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _recalculateViewportSizesWithMinimumViewportInset:maximumViewportInset:throwOnInvalidInput:]):
Don't RELEASE_LOG (or throw) unless a minimumViewportInset/maximumViewportInset has been specified.

Canonical link: ​https://commits.webkit.org/251015@main

File:

• trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm

@@ -1603 +1603 @@
     auto frame = WebCore::FloatSize(self.frame.size);
 
-    auto minimumUnobscuredSize = frame - WebCore::FloatSize(maximumViewportInset.left + maximumViewportInset.right, maximumViewportInset.top + maximumViewportInset.bottom);
+    auto maximumViewportInsetSize = WebCore::FloatSize(maximumViewportInset.left + maximumViewportInset.right, maximumViewportInset.top + maximumViewportInset.bottom);
+    auto minimumUnobscuredSize = frame - maximumViewportInsetSize;
     if (minimumUnobscuredSize.isEmpty()) {
-        if (throwOnInvalidInput) {
-            [NSException raise:NSInvalidArgumentException format:@"maximumViewportInset cannot be larger than frame"];
-            return;
+        if (!maximumViewportInsetSize.isEmpty()) {
+            if (throwOnInvalidInput) {
+                [NSException raise:NSInvalidArgumentException format:@"maximumViewportInset cannot be larger than frame"];
+                return;
+            }
+
+            RELEASE_LOG_ERROR(ViewportSizing, "maximumViewportInset cannot be larger than frame");
         }
 
-        RELEASE_LOG_ERROR(ViewportSizing, "maximumViewportInset cannot be larger than frame");
         minimumUnobscuredSize = frame;
     }
 
-    auto maximumUnobscuredSize = frame - WebCore::FloatSize(minimumViewportInset.left + minimumViewportInset.right, minimumViewportInset.top + minimumViewportInset.bottom);
+    auto minimumViewportInsetSize = WebCore::FloatSize(minimumViewportInset.left + minimumViewportInset.right, minimumViewportInset.top + minimumViewportInset.bottom);
+    auto maximumUnobscuredSize = frame - minimumViewportInsetSize;
     if (maximumUnobscuredSize.isEmpty()) {
-        if (throwOnInvalidInput) {
-            [NSException raise:NSInvalidArgumentException format:@"minimumViewportInset cannot be larger than frame"];
-            return;
+        if (!minimumViewportInsetSize.isEmpty()) {
+            if (throwOnInvalidInput) {
+                [NSException raise:NSInvalidArgumentException format:@"minimumViewportInset cannot be larger than frame"];
+                return;
+            }
+
+            RELEASE_LOG_ERROR(ViewportSizing, "minimumViewportInset cannot be larger than frame");
         }
 
-        RELEASE_LOG_ERROR(ViewportSizing, "minimumViewportInset cannot be larger than frame");
         maximumUnobscuredSize = frame;
     }