<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[173548] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/173548">173548</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2014-09-11 17:32:05 -0700 (Thu, 11 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2accessibilitycontentinsetscrollviewframeexpectedtxt">trunk/LayoutTests/platform/mac-wk2/accessibility/content-inset-scrollview-frame-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2accessibilitycontentinsetscrollviewframehtml">trunk/LayoutTests/platform/mac-wk2/accessibility/content-inset-scrollview-frame.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityScrollViewcpp">trunk/Source/WebCore/accessibility/AccessibilityScrollView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (173547 => 173548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-09-11 23:12:53 UTC (rev 173547)
+++ trunk/LayoutTests/ChangeLog 2014-09-12 00:32:05 UTC (rev 173548)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+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:
+
</ins><span class="cx"> 2014-09-11 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r173530.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2accessibilitycontentinsetscrollviewframeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/accessibility/content-inset-scrollview-frame-expected.txt (173547 => 173548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/accessibility/content-inset-scrollview-frame-expected.txt 2014-09-11 23:12:53 UTC (rev 173547)
+++ trunk/LayoutTests/platform/mac-wk2/accessibility/content-inset-scrollview-frame-expected.txt 2014-09-12 00:32:05 UTC (rev 173548)
</span><span class="lines">@@ -5,8 +5,16 @@
</span><span class="cx">
</span><span class="cx"> The position of the web area and the scroll view should be the same when there's no content inset
</span><span class="cx"> PASS webX == scrollViewX && webY == scrollViewY is true
</span><ins>+
+
</ins><span class="cx"> After setting the content inset, the new y position should be less than the initial
</span><del>-PASS scrollViewY - scrollView.y is 100
</del><ins>+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
+
+
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2accessibilitycontentinsetscrollviewframehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/accessibility/content-inset-scrollview-frame.html (173547 => 173548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/accessibility/content-inset-scrollview-frame.html 2014-09-11 23:12:53 UTC (rev 173547)
+++ trunk/LayoutTests/platform/mac-wk2/accessibility/content-inset-scrollview-frame.html 2014-09-12 00:32:05 UTC (rev 173548)
</span><span class="lines">@@ -15,19 +15,29 @@
</span><span class="cx"> if (window.accessibilityController) {
</span><span class="cx"> var webArea = accessibilityController.rootElement.childAtIndex(0);
</span><span class="cx"> var webX = webArea.x;
</span><del>- var webY = webArea.y;
</del><ins>+ var webY = webArea.y - webArea.height;
</ins><span class="cx">
</span><span class="cx"> var scrollView = webArea.parentElement();
</span><span class="cx"> var scrollViewX = scrollView.x;
</span><del>- var scrollViewY = scrollView.y;
-
</del><ins>+ // 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;
+
</ins><span class="cx"> debug("The position of the web area and the scroll view should be the same when there's no content inset");
</span><span class="cx"> shouldBeTrue("webX == scrollViewX && webY == scrollViewY");
</span><ins>+ debug("\n");
</ins><span class="cx">
</span><span class="cx"> window.internals.setTopContentInset(100);
</span><span class="cx">
</span><ins>+ var newScrollViewHeight = scrollView.height;
+ var newScrollViewY = scrollView.y - scrollView.height;
</ins><span class="cx"> debug("After setting the content inset, the new y position should be less than the initial");
</span><del>- shouldBe("scrollViewY - scrollView.y", "100")
</del><ins>+ 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");
</ins><span class="cx"> }
</span><span class="cx"> </script>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173547 => 173548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-09-11 23:12:53 UTC (rev 173547)
+++ trunk/Source/WebCore/ChangeLog 2014-09-12 00:32:05 UTC (rev 173548)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+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):
+
</ins><span class="cx"> 2014-09-11 Roger Fong <roger_fong@apple.com>
</span><span class="cx">
</span><span class="cx"> [Windows] Unreviewed build fix.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityScrollViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityScrollView.cpp (173547 => 173548)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityScrollView.cpp 2014-09-11 23:12:53 UTC (rev 173547)
+++ trunk/Source/WebCore/accessibility/AccessibilityScrollView.cpp 2014-09-12 00:32:05 UTC (rev 173548)
</span><span class="lines">@@ -222,7 +222,10 @@
</span><span class="cx"> return LayoutRect();
</span><span class="cx">
</span><span class="cx"> LayoutRect rect = m_scrollView->frameRect();
</span><del>- rect.setY(rect.y() + m_scrollView->topContentInset());
</del><ins>+ float topContentInset = m_scrollView->topContentInset();
+ // Top content inset pushes the frame down and shrinks it.
+ rect.move(0, topContentInset);
+ rect.contract(0, topContentInset);
</ins><span class="cx"> return rect;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>