Changeset 196339 in webkit

Timestamp:

Feb 9, 2016 2:58:18 PM (8 years ago)

Author:

n_wang@apple.com

Message:

[iOS Simulator] accessibility/text-marker/text-marker-range-stale-node-crash.html crashing
​https://bugs.webkit.org/show_bug.cgi?id=154039

Reviewed by Chris Fleizach.

We are accessing the derefed node in the CharacterOffset object, we should create an empty
CharacterOffset object if the node is not in use.

It's covered by the test accessibility/text-marker/text-marker-range-stale-node-crash.html.

• accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:

(-[WebAccessibilityTextMarker characterOffset]):
(-[WebAccessibilityTextMarker isIgnored]):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-02-09  Nan Wang  <n_wang@apple.com>
+
+        [iOS Simulator] accessibility/text-marker/text-marker-range-stale-node-crash.html crashing
+        https://bugs.webkit.org/show_bug.cgi?id=154039
+
+        Reviewed by Chris Fleizach.
+
+        We are accessing the derefed node in the CharacterOffset object, we should create an empty
+        CharacterOffset object if the node is not in use.
+
+        It's covered by the test accessibility/text-marker/text-marker-range-stale-node-crash.html.
+
+        * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+        (-[WebAccessibilityTextMarker characterOffset]):
+        (-[WebAccessibilityTextMarker isIgnored]):
+
 2016-02-09  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm

@@ -220 +220 @@
 - (CharacterOffset)characterOffset
 {
-    if (_textMarkerData.ignored)
-        return CharacterOffset();
-    return CharacterOffset(_textMarkerData.node, _textMarkerData.characterStartIndex, _textMarkerData.characterOffset);
+    return _cache->characterOffsetForTextMarkerData(_textMarkerData);
 }