Changeset 173548 in webkit

Timestamp:

Sep 11, 2014, 5:32:05 PM (12 years ago)

Author:

Chris Fleizach

Message:

AX: Size of web view in Safari as reported by AX changes when adding/removing bars is wrong
​https://bugs.webkit.org/show_bug.cgi?id=136756

Reviewed by Beth Dakin.

Source/WebCore:

topContentInset not only seems to push the scroll view's origin down, but it also shrinks its height as well, which
was not accounted for in the original fix.

Modified: platform/mac-wk2/accessibility/content-inset-scrollview-frame.html

• accessibility/AccessibilityScrollView.cpp:

(WebCore::AccessibilityScrollView::elementRect):

LayoutTests:

• platform/mac-wk2/accessibility/content-inset-scrollview-frame-expected.txt:
• platform/mac-wk2/accessibility/content-inset-scrollview-frame.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk2/accessibility/content-inset-scrollview-frame-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac-wk2/accessibility/content-inset-scrollview-frame.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityScrollView.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-09-11  Chris Fleizach  <cfleizach@apple.com>
+
+        AX: Size of web view in Safari as reported by AX changes when adding/removing bars is wrong
+        https://bugs.webkit.org/show_bug.cgi?id=136756
+
+        Reviewed by Beth Dakin.
+
+        * platform/mac-wk2/accessibility/content-inset-scrollview-frame-expected.txt:
+        * platform/mac-wk2/accessibility/content-inset-scrollview-frame.html:
+
 2014-09-11  Commit Queue  <commit-queue@webkit.org>
 

trunk/LayoutTests/platform/mac-wk2/accessibility/content-inset-scrollview-frame-expected.txt

@@ -6 +6 @@
 The position of the web area and the scroll view should be the same when there's no content inset
 PASS webX == scrollViewX && webY == scrollViewY is true
+
+
 After setting the content inset, the new y position should be less than the initial
-PASS scrollViewY - scrollView.y is 100
+PASS newScrollViewY - scrollViewY is 100
+
+
+The content inset also reduces the height of the scroll view, which should be reflected here.
+PASS scrollViewHeight > newScrollViewHeight is true
+
+
 PASS successfullyParsed is true
 

trunk/LayoutTests/platform/mac-wk2/accessibility/content-inset-scrollview-frame.html

@@ -16 +16 @@
         var webArea = accessibilityController.rootElement.childAtIndex(0);
         var webX = webArea.x;
-        var webY = webArea.y;
+        var webY = webArea.y - webArea.height;
 
         var scrollView = webArea.parentElement();
         var scrollViewX = scrollView.x;
-        var scrollViewY = scrollView.y;
-  
+        // to get what the y that we're expecting, we need to subtract the height, because Cocoa requires the bottom point to be consider the y origin.
+        var scrollViewY = scrollView.y - scrollView.height;
+        var scrollViewHeight = scrollView.height;  
+
         debug("The position of the web area and the scroll view should be the same when there's no content inset");
         shouldBeTrue("webX == scrollViewX && webY == scrollViewY");
+        debug("\n");
  
         window.internals.setTopContentInset(100);
 
+        var newScrollViewHeight = scrollView.height;
+        var newScrollViewY =  scrollView.y - scrollView.height;
         debug("After setting the content inset, the new y position should be less than the initial");
-        shouldBe("scrollViewY - scrollView.y", "100")
+        shouldBe("newScrollViewY - scrollViewY", "100")
+        debug("\n");
+
+        debug("The content inset also reduces the height of the scroll view, which should be reflected here.");
+        shouldBeTrue("scrollViewHeight > newScrollViewHeight");
+        debug("\n");
     }
 </script>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-09-11  Chris Fleizach  <cfleizach@apple.com>
+
+        AX: Size of web view in Safari as reported by AX changes when adding/removing bars is wrong
+        https://bugs.webkit.org/show_bug.cgi?id=136756
+
+        Reviewed by Beth Dakin.
+
+        topContentInset not only seems to push the scroll view's origin down, but it also shrinks its height as well, which
+        was not accounted for in the original fix.
+
+        Modified: platform/mac-wk2/accessibility/content-inset-scrollview-frame.html
+
+        * accessibility/AccessibilityScrollView.cpp:
+        (WebCore::AccessibilityScrollView::elementRect):
+
 2014-09-11  Roger Fong  <roger_fong@apple.com>
 

trunk/Source/WebCore/accessibility/AccessibilityScrollView.cpp

@@ -223 +223 @@
 
     LayoutRect rect = m_scrollView->frameRect();
-    rect.setY(rect.y() + m_scrollView->topContentInset());
+    float topContentInset = m_scrollView->topContentInset();
+    // Top content inset pushes the frame down and shrinks it.
+    rect.move(0, topContentInset);
+    rect.contract(0, topContentInset);
     return rect;
 }