Title: [241073] branches/safari-607-branch
- Revision
- 241073
- Author
- alanc...@apple.com
- Date
- 2019-02-06 14:17:07 -0800 (Wed, 06 Feb 2019)
Log Message
Cherry-pick r240773. rdar://problem/47774755
ASSERTION FAILED: cache under WebCore::AXObjectCache::postTextStateChangePlatformNotification
https://bugs.webkit.org/show_bug.cgi?id=189094
<rdar://problem/43853526>
Reviewed by Zalan Bujtas.
Source/WebCore:
Protect against access to objects and cache's that can be removed while an object is still in memory.
Unskipped flaky tests on mac-wk2.
* accessibility/mac/AXObjectCacheMac.mm:
(WebCore::AXObjectCache::postTextStateChangePlatformNotification):
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(textMarkerForVisiblePosition):
(textMarkerRangeFromVisiblePositions):
LayoutTests:
Unskip flaky test with crash resolved.
* platform/mac-wk2/TestExpectations:
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240773 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-607-branch/LayoutTests/ChangeLog (241072 => 241073)
--- branches/safari-607-branch/LayoutTests/ChangeLog 2019-02-06 22:17:04 UTC (rev 241072)
+++ branches/safari-607-branch/LayoutTests/ChangeLog 2019-02-06 22:17:07 UTC (rev 241073)
@@ -1,5 +1,48 @@
2019-02-05 Alan Coon <alanc...@apple.com>
+ Cherry-pick r240773. rdar://problem/47774755
+
+ ASSERTION FAILED: cache under WebCore::AXObjectCache::postTextStateChangePlatformNotification
+ https://bugs.webkit.org/show_bug.cgi?id=189094
+ <rdar://problem/43853526>
+
+ Reviewed by Zalan Bujtas.
+
+ Source/WebCore:
+
+ Protect against access to objects and cache's that can be removed while an object is still in memory.
+
+ Unskipped flaky tests on mac-wk2.
+
+ * accessibility/mac/AXObjectCacheMac.mm:
+ (WebCore::AXObjectCache::postTextStateChangePlatformNotification):
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (textMarkerForVisiblePosition):
+ (textMarkerRangeFromVisiblePositions):
+
+ LayoutTests:
+
+ Unskip flaky test with crash resolved.
+
+ * platform/mac-wk2/TestExpectations:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240773 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-01-31 Chris Fleizach <cfleiz...@apple.com>
+
+ ASSERTION FAILED: cache under WebCore::AXObjectCache::postTextStateChangePlatformNotification
+ https://bugs.webkit.org/show_bug.cgi?id=189094
+ <rdar://problem/43853526>
+
+ Reviewed by Zalan Bujtas.
+
+ Unskip flaky test with crash resolved.
+
+ * platform/mac-wk2/TestExpectations:
+
+2019-02-05 Alan Coon <alanc...@apple.com>
+
Cherry-pick r240750. rdar://problem/47774507
Regression(PSON) History navigations to twitter.com lead to a 403 HTTP error
Modified: branches/safari-607-branch/LayoutTests/platform/mac-wk2/TestExpectations (241072 => 241073)
--- branches/safari-607-branch/LayoutTests/platform/mac-wk2/TestExpectations 2019-02-06 22:17:04 UTC (rev 241072)
+++ branches/safari-607-branch/LayoutTests/platform/mac-wk2/TestExpectations 2019-02-06 22:17:07 UTC (rev 241073)
@@ -894,8 +894,6 @@
imported/w3c/web-platform-tests/payment-request/user-abort-algorithm-manual.https.html [ Skip ]
imported/w3c/web-platform-tests/payment-request/user-accepts-payment-request-algo-manual.https.html [ Skip ]
-webkit.org/b/189094 [ HighSierra+ ] accessibility/mac/focus-setting-selection-syncronizing-not-clearing.html [ Skip ]
-
webkit.org/b/189598 compositing/backing/backing-store-attachment-fill-forwards-animation.html [ Pass Failure ]
# Skip local authenticator tests for mac now.
Modified: branches/safari-607-branch/Source/WebCore/ChangeLog (241072 => 241073)
--- branches/safari-607-branch/Source/WebCore/ChangeLog 2019-02-06 22:17:04 UTC (rev 241072)
+++ branches/safari-607-branch/Source/WebCore/ChangeLog 2019-02-06 22:17:07 UTC (rev 241073)
@@ -1,5 +1,54 @@
2019-02-05 Alan Coon <alanc...@apple.com>
+ Cherry-pick r240773. rdar://problem/47774755
+
+ ASSERTION FAILED: cache under WebCore::AXObjectCache::postTextStateChangePlatformNotification
+ https://bugs.webkit.org/show_bug.cgi?id=189094
+ <rdar://problem/43853526>
+
+ Reviewed by Zalan Bujtas.
+
+ Source/WebCore:
+
+ Protect against access to objects and cache's that can be removed while an object is still in memory.
+
+ Unskipped flaky tests on mac-wk2.
+
+ * accessibility/mac/AXObjectCacheMac.mm:
+ (WebCore::AXObjectCache::postTextStateChangePlatformNotification):
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (textMarkerForVisiblePosition):
+ (textMarkerRangeFromVisiblePositions):
+
+ LayoutTests:
+
+ Unskip flaky test with crash resolved.
+
+ * platform/mac-wk2/TestExpectations:
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240773 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-01-31 Chris Fleizach <cfleiz...@apple.com>
+
+ ASSERTION FAILED: cache under WebCore::AXObjectCache::postTextStateChangePlatformNotification
+ https://bugs.webkit.org/show_bug.cgi?id=189094
+ <rdar://problem/43853526>
+
+ Reviewed by Zalan Bujtas.
+
+ Protect against access to objects and cache's that can be removed while an object is still in memory.
+
+ Unskipped flaky tests on mac-wk2.
+
+ * accessibility/mac/AXObjectCacheMac.mm:
+ (WebCore::AXObjectCache::postTextStateChangePlatformNotification):
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (textMarkerForVisiblePosition):
+ (textMarkerRangeFromVisiblePositions):
+
+2019-02-05 Alan Coon <alanc...@apple.com>
+
Cherry-pick r240750. rdar://problem/47774507
Regression(PSON) History navigations to twitter.com lead to a 403 HTTP error
Modified: branches/safari-607-branch/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm (241072 => 241073)
--- branches/safari-607-branch/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm 2019-02-06 22:17:04 UTC (rev 241072)
+++ branches/safari-607-branch/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm 2019-02-06 22:17:07 UTC (rev 241073)
@@ -399,9 +399,11 @@
if (id wrapper = object->wrapper())
[userInfo setObject:wrapper forKey:NSAccessibilityTextChangeElement];
- AXPostNotificationWithUserInfo(rootWebArea()->wrapper(), NSAccessibilitySelectedTextChangedNotification, userInfo);
- if (rootWebArea()->wrapper() != object->wrapper())
- AXPostNotificationWithUserInfo(object->wrapper(), NSAccessibilitySelectedTextChangedNotification, userInfo);
+ if (auto root = rootWebArea()) {
+ AXPostNotificationWithUserInfo(rootWebArea()->wrapper(), NSAccessibilitySelectedTextChangedNotification, userInfo);
+ if (root->wrapper() != object->wrapper())
+ AXPostNotificationWithUserInfo(object->wrapper(), NSAccessibilitySelectedTextChangedNotification, userInfo);
+ }
[userInfo release];
}
Modified: branches/safari-607-branch/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (241072 => 241073)
--- branches/safari-607-branch/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2019-02-06 22:17:04 UTC (rev 241072)
+++ branches/safari-607-branch/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2019-02-06 22:17:07 UTC (rev 241073)
@@ -709,7 +709,9 @@
static id textMarkerForVisiblePosition(AXObjectCache* cache, const VisiblePosition& visiblePos)
{
ASSERT(cache);
-
+ if (!cache)
+ return nil;
+
auto textMarkerData = cache->textMarkerDataForVisiblePosition(visiblePos);
if (!textMarkerData)
return nil;
@@ -1107,6 +1109,9 @@
static id textMarkerRangeFromVisiblePositions(AXObjectCache* cache, const VisiblePosition& startPosition, const VisiblePosition& endPosition)
{
+ if (!cache)
+ return nil;
+
id startTextMarker = textMarkerForVisiblePosition(cache, startPosition);
id endTextMarker = textMarkerForVisiblePosition(cache, endPosition);
return textMarkerRangeFromMarkers(startTextMarker, endTextMarker);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
