Title: [258292] branches/safari-610.1.7-branch/Source/WebKit
- Revision
- 258292
- Author
- alanc...@apple.com
- Date
- 2020-03-11 15:26:13 -0700 (Wed, 11 Mar 2020)
Log Message
Cherry-pick r258289. rdar://problem/60341123
[macOS] Crash under WebKit::WebProcessPool::platformInitialize()
https://bugs.webkit.org/show_bug.cgi?id=208945
Unreviewed temporary compile fix.
* UIProcess/Cocoa/WebProcessProxyCocoa.mm:
(WebKit::WebProcessProxy::unblockAccessibilityServerIfNeeded):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@258289 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610.1.7-branch/Source/WebKit/ChangeLog (258291 => 258292)
--- branches/safari-610.1.7-branch/Source/WebKit/ChangeLog 2020-03-11 22:26:10 UTC (rev 258291)
+++ branches/safari-610.1.7-branch/Source/WebKit/ChangeLog 2020-03-11 22:26:13 UTC (rev 258292)
@@ -1,5 +1,31 @@
2020-03-11 Alan Coon <alanc...@apple.com>
+ Cherry-pick r258289. rdar://problem/60341123
+
+ [macOS] Crash under WebKit::WebProcessPool::platformInitialize()
+ https://bugs.webkit.org/show_bug.cgi?id=208945
+
+ Unreviewed temporary compile fix.
+
+ * UIProcess/Cocoa/WebProcessProxyCocoa.mm:
+ (WebKit::WebProcessProxy::unblockAccessibilityServerIfNeeded):
+
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@258289 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-03-11 Per Arne Vollan <pvol...@apple.com>
+
+ [macOS] Crash under WebKit::WebProcessPool::platformInitialize()
+ https://bugs.webkit.org/show_bug.cgi?id=208945
+
+ Unreviewed temporary compile fix.
+
+ * UIProcess/Cocoa/WebProcessProxyCocoa.mm:
+ (WebKit::WebProcessProxy::unblockAccessibilityServerIfNeeded):
+
+2020-03-11 Alan Coon <alanc...@apple.com>
+
Cherry-pick r258288. rdar://problem/60341123
[macOS] Crash under WebKit::WebProcessPool::platformInitialize()
Modified: branches/safari-610.1.7-branch/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm (258291 => 258292)
--- branches/safari-610.1.7-branch/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm 2020-03-11 22:26:10 UTC (rev 258291)
+++ branches/safari-610.1.7-branch/Source/WebKit/UIProcess/Cocoa/WebProcessProxyCocoa.mm 2020-03-11 22:26:13 UTC (rev 258292)
@@ -44,12 +44,12 @@
#import <_javascript_Core/RemoteInspectorConstants.h>
#endif
-#if PLATFORM(COCOA)
+namespace WebKit {
+
+#if PLATFORM(MAC)
SOFT_LINK_LIBRARY_OPTIONAL(libAccessibility)
#endif
-namespace WebKit {
-
static const Seconds unexpectedActivityDuration = 10_s;
const HashSet<String>& WebProcessProxy::platformPathsWithAssumedReadAccess()
@@ -234,8 +234,10 @@
{
if (m_hasSentMessageToUnblockAccessibilityServer)
return;
- if (!libAccessibilityLibrary())
+#if PLATFORM(MAC)
+ if (!WebKit::libAccessibilityLibrary())
return;
+#endif
if (!_AXSApplicationAccessibilityEnabled())
return;
if (!processIdentifier())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
