Title: [273260] branches/safari-611-branch/Source/WebKit
Revision
273260
Author
[email protected]
Date
2021-02-22 09:55:17 -0800 (Mon, 22 Feb 2021)

Log Message

Cherry-pick r272355. rdar://problem/74032694

    ASSERTION FAILED: !size.isEmpty() under platformInitializeWebProcess

    * WebProcess/cocoa/WebProcessCocoa.mm:
    (WebKit::WebProcess::platformInitializeWebProcess):
    Follow-up to r272335; don't call IOSurface::setMaximumSize if the UI process
    did not send us a size. Caused all Web Content processes to assert in debug on launch.

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@272355 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Modified Paths

Diff

Modified: branches/safari-611-branch/Source/WebKit/ChangeLog (273259 => 273260)


--- branches/safari-611-branch/Source/WebKit/ChangeLog	2021-02-22 17:55:15 UTC (rev 273259)
+++ branches/safari-611-branch/Source/WebKit/ChangeLog	2021-02-22 17:55:17 UTC (rev 273260)
@@ -1,3 +1,25 @@
+2021-02-18  Ruben Turcios  <[email protected]>
+
+        Cherry-pick r272355. rdar://problem/74032694
+
+    ASSERTION FAILED: !size.isEmpty() under platformInitializeWebProcess
+    
+    * WebProcess/cocoa/WebProcessCocoa.mm:
+    (WebKit::WebProcess::platformInitializeWebProcess):
+    Follow-up to r272335; don't call IOSurface::setMaximumSize if the UI process
+    did not send us a size. Caused all Web Content processes to assert in debug on launch.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@272355 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-02-03  Timothy Horton  <[email protected]>
+
+            ASSERTION FAILED: !size.isEmpty() under platformInitializeWebProcess
+
+            * WebProcess/cocoa/WebProcessCocoa.mm:
+            (WebKit::WebProcess::platformInitializeWebProcess):
+            Follow-up to r272335; don't call IOSurface::setMaximumSize if the UI process
+            did not send us a size. Caused all Web Content processes to assert in debug on launch.
+
 2021-02-17  Ruben Turcios  <[email protected]>
 
         Cherry-pick r272165. rdar://problem/74032536

Modified: branches/safari-611-branch/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm (273259 => 273260)


--- branches/safari-611-branch/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	2021-02-22 17:55:15 UTC (rev 273259)
+++ branches/safari-611-branch/Source/WebKit/WebProcess/cocoa/WebProcessCocoa.mm	2021-02-22 17:55:17 UTC (rev 273260)
@@ -405,7 +405,8 @@
     _LSSetApplicationLaunchServicesServerConnectionStatus(kLSServerConnectionStatusDoNotConnectToServerMask, nullptr);
 #endif
 
-    WebCore::IOSurface::setMaximumSize(parameters.maximumIOSurfaceSize);
+    if (!parameters.maximumIOSurfaceSize.isEmpty())
+        WebCore::IOSurface::setMaximumSize(parameters.maximumIOSurfaceSize);
 }
 
 void WebProcess::platformSetWebsiteDataStoreParameters(WebProcessDataStoreParameters&& parameters)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to