Changeset 206854 in webkit

Timestamp:

Oct 6, 2016 1:03:43 AM (8 years ago)

Author:

n_wang@apple.com

Message:

AX:[Mac] Unable to edit text input, textarea fields in iframe using VO naivgation
​https://bugs.webkit.org/show_bug.cgi?id=162999

Reviewed by Chris Fleizach.

Source/WebCore:

In WebKit1, the top web area setting the selection to an input element inside an iframe
will make the input field not editable. The issue is that when the web area and the input element
have different documents, the setSelection function in FrameSelection will set the selection on
the input's frame and cause the caret to disappear. I fixed it by not setting the selection in such case.

Test: accessibility/mac/wk1-set-selected-text-marker-range-input-element.html

• accessibility/AccessibilityRenderObject.cpp:

(WebCore::AccessibilityRenderObject::setSelectedVisiblePositionRange):

LayoutTests:

• accessibility/mac/wk1-set-selected-text-marker-range-input-element-expected.txt: Added.
• accessibility/mac/wk1-set-selected-text-marker-range-input-element.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/mac/wk1-set-selected-text-marker-range-input-element-expected.txt (added)
• LayoutTests/accessibility/mac/wk1-set-selected-text-marker-range-input-element.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityRenderObject.cpp (modified) (2 diffs)
• Source/WebCore/accessibility/AccessibilityRenderObject.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-10-06  Nan Wang  <n_wang@apple.com>
+
+        AX:[Mac] Unable to edit text input, textarea fields in iframe using VO naivgation
+        https://bugs.webkit.org/show_bug.cgi?id=162999
+
+        Reviewed by Chris Fleizach.
+
+        * accessibility/mac/wk1-set-selected-text-marker-range-input-element-expected.txt: Added.
+        * accessibility/mac/wk1-set-selected-text-marker-range-input-element.html: Added.
+
 2016-10-05  Yusuke Suzuki  <utatane.tea@gmail.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-06  Nan Wang  <n_wang@apple.com>
+
+        AX:[Mac] Unable to edit text input, textarea fields in iframe using VO naivgation
+        https://bugs.webkit.org/show_bug.cgi?id=162999
+
+        Reviewed by Chris Fleizach.
+
+        In WebKit1, the top web area setting the selection to an input element inside an iframe
+        will make the input field not editable. The issue is that when the web area and the input element
+        have different documents, the setSelection function in FrameSelection will set the selection on
+        the input's frame and cause the caret to disappear. I fixed it by not setting the selection in such case.
+
+        Test: accessibility/mac/wk1-set-selected-text-marker-range-input-element.html
+
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::setSelectedVisiblePositionRange):
+
 2016-10-05  Commit Queue  <commit-queue@webkit.org>
 

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -2035 +2035 @@
     return boundsForRects(rect1, rect2, range);
 }
+
+bool AccessibilityRenderObject::isVisiblePositionRangeInDifferentDocument(const VisiblePositionRange& range) const
+{
+    if (range.start.isNull() || range.end.isNull())
+        return false;
+    
+    VisibleSelection newSelection = VisibleSelection(range.start, range.end);
+    if (Document* newSelectionDocument = newSelection.base().document()) {
+        if (RefPtr<Frame> newSelectionFrame = newSelectionDocument->frame()) {
+            Frame* frame = this->frame();
+            if (!frame || (newSelectionFrame != frame && newSelectionDocument != frame->document()))
+                return true;
+        }
+    }
+    
+    return false;
+}
     
 void AccessibilityRenderObject::setSelectedVisiblePositionRange(const VisiblePositionRange& range) const
@@ -2040 +2057 @@
     if (range.start.isNull() || range.end.isNull())
         return;
+    
+    // In WebKit1, when the top web area sets the selection to be an input element in an iframe, the caret will disappear.
+    // FrameSelection::setSelectionWithoutUpdatingAppearance is setting the selection on the new frame in this case, and causing this behavior.
+    if (isWebArea() && parentObject() && parentObject()->isAttachment()) {
+        if (isVisiblePositionRangeInDifferentDocument(range))
+            return;
+    }
 
     // make selection and tell the document to use it. if it's zero length, then move to that position

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h

@@ -174 +174 @@
     IntRect boundsForRects(LayoutRect&, LayoutRect&, RefPtr<Range>) const;
     void setSelectedVisiblePositionRange(const VisiblePositionRange&) const override;
+    bool isVisiblePositionRangeInDifferentDocument(const VisiblePositionRange&) const;
     bool ariaHasPopup() const override;