Title: [261647] branches/safari-610.1.13-branch/Source/WebKit
Revision
261647
Author
[email protected]
Date
2020-05-13 13:47:20 -0700 (Wed, 13 May 2020)

Log Message

Cherry-pick r261560. rdar://problem/63195727

    Unreviewed crash fix.

    Use correct global name for icon service in RELEASE_ASSERT.

    * WebProcess/WebPage/WebPage.cpp:
    (WebKit::WebPage::didChooseFilesForOpenPanelWithDisplayStringAndIcon):

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

Modified Paths

Diff

Modified: branches/safari-610.1.13-branch/Source/WebKit/ChangeLog (261646 => 261647)


--- branches/safari-610.1.13-branch/Source/WebKit/ChangeLog	2020-05-13 20:47:18 UTC (rev 261646)
+++ branches/safari-610.1.13-branch/Source/WebKit/ChangeLog	2020-05-13 20:47:20 UTC (rev 261647)
@@ -1,3 +1,27 @@
+2020-05-13  Alan Coon  <[email protected]>
+
+        Cherry-pick r261560. rdar://problem/63195727
+
+    Unreviewed crash fix.
+    
+    Use correct global name for icon service in RELEASE_ASSERT.
+    
+    * WebProcess/WebPage/WebPage.cpp:
+    (WebKit::WebPage::didChooseFilesForOpenPanelWithDisplayStringAndIcon):
+    
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@261560 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-05-12  Per Arne Vollan  <[email protected]>
+
+            Unreviewed crash fix.
+
+            Use correct global name for icon service in RELEASE_ASSERT.
+
+            * WebProcess/WebPage/WebPage.cpp:
+            (WebKit::WebPage::didChooseFilesForOpenPanelWithDisplayStringAndIcon):
+
 2020-05-10  Tim Horton  <[email protected]>
 
         Clicking a tel:// link on iPad with a trackpad presents different UI than tapping on it

Modified: branches/safari-610.1.13-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp (261646 => 261647)


--- branches/safari-610.1.13-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp	2020-05-13 20:47:18 UTC (rev 261646)
+++ branches/safari-610.1.13-branch/Source/WebKit/WebProcess/WebPage/WebPage.cpp	2020-05-13 20:47:20 UTC (rev 261647)
@@ -4240,7 +4240,7 @@
     }
 
     RELEASE_ASSERT(!sandbox_check(getpid(), "mach-lookup", static_cast<enum sandbox_filter_type>(SANDBOX_FILTER_GLOBAL_NAME | SANDBOX_CHECK_NO_REPORT), "com.apple.frontboard.systemappservices"));
-    RELEASE_ASSERT(!sandbox_check(getpid(), "mach-lookup", static_cast<enum sandbox_filter_type>(SANDBOX_FILTER_GLOBAL_NAME | SANDBOX_CHECK_NO_REPORT), "com.apple.frontboard.iconservices"));
+    RELEASE_ASSERT(!sandbox_check(getpid(), "mach-lookup", static_cast<enum sandbox_filter_type>(SANDBOX_FILTER_GLOBAL_NAME | SANDBOX_CHECK_NO_REPORT), "com.apple.iconservices"));
 
     RefPtr<Icon> icon;
     if (!iconData.isEmpty()) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to