<!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>[182465] releases/WebKitGTK/webkit-2.4</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/182465">182465</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-04-07 05:27:43 -0700 (Tue, 07 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/176254">r176254</a> - AX: [ATK] Crash getting the orientation of a MenuListOption after the MenuList was removed from the document
https://bugs.webkit.org/show_bug.cgi?id=138727
Reviewed by Chris Fleizach.
Source/WebCore:
AccessibilityMenuListOption::elementRect() returns the value of the
grandparent MenuList, asserting that the grandparent exists with that
role. But it is possible to have an existing MenuListOption and remove
the element which had been backing that MenuList from the document.
Adding null checks prior to the assertions prevents our crashing if the
parent or grandparent was removed.
Test: platform/gtk/accessibility/combobox-descendants-orientation-crash.html
* accessibility/AccessibilityMenuListOption.cpp:
(WebCore::AccessibilityMenuListOption::elementRect):
LayoutTests:
* platform/gtk/accessibility/combobox-descendants-orientation-crash-expected.txt: Added.
* platform/gtk/accessibility/combobox-descendants-orientation-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreaccessibilityAccessibilityMenuListOptioncpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/accessibility/AccessibilityMenuListOption.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestsplatformgtkaccessibilitycomboboxdescendantsorientationcrashexpectedtxt">releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/combobox-descendants-orientation-crash-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestsplatformgtkaccessibilitycomboboxdescendantsorientationcrashhtml">releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/combobox-descendants-orientation-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog (182464 => 182465)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog 2015-04-07 12:25:26 UTC (rev 182464)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog 2015-04-07 12:27:43 UTC (rev 182465)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-11-18 Joanmarie Diggs <jdiggs@igalia.com>
+
+ AX: [ATK] Crash getting the orientation of a MenuListOption after the MenuList was removed from the document
+ https://bugs.webkit.org/show_bug.cgi?id=138727
+
+ Reviewed by Chris Fleizach.
+
+ * platform/gtk/accessibility/combobox-descendants-orientation-crash-expected.txt: Added.
+ * platform/gtk/accessibility/combobox-descendants-orientation-crash.html: Added.
+
</ins><span class="cx"> 2014-11-13 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> AX: [ATK] Do not return ATK_ROLE_UNKNOWN for null or otherwise invalid accessible objects
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24LayoutTestsplatformgtkaccessibilitycomboboxdescendantsorientationcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/combobox-descendants-orientation-crash-expected.txt (0 => 182465)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/combobox-descendants-orientation-crash-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/combobox-descendants-orientation-crash-expected.txt 2015-04-07 12:27:43 UTC (rev 182465)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+This verifies that getting the orientation of combobox descendants won't crash if the combobox is removed from the document.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+AXRole: AXComboBox has orientation: AXOrientation: AXHorizontalOrientation
+
+Before combobox removal
+AXRole: AXMenu has orientation: AXOrientation: AXHorizontalOrientation
+AXRole: AXMenuItem has orientation: AXOrientation: AXHorizontalOrientation
+
+After combobox removal
+AXRole: AXInvalid has orientation: AXOrientation: AXHorizontalOrientation
+AXRole: AXInvalid has orientation: AXOrientation: AXHorizontalOrientation
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit24LayoutTestsplatformgtkaccessibilitycomboboxdescendantsorientationcrashhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/combobox-descendants-orientation-crash.html (0 => 182465)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/combobox-descendants-orientation-crash.html (rev 0)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/combobox-descendants-orientation-crash.html 2015-04-07 12:27:43 UTC (rev 182465)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../../resources/js-test-pre.js"></script>
+</head>
+<body>
+<select id="combobox">
+<option value="foo">foo</option>
+<option value="bar">bar</option>
+</select>
+<p id="description"></p>
+<div id="console"></div>
+<script>
+description("This verifies that getting the orientation of combobox descendants won't crash if the combobox is removed from the document.");
+
+if (window.testRunner && window.accessibilityController) {
+ var combobox = document.getElementById("combobox");
+ combobox.focus();
+
+ var axCombobox = accessibilityController.focusedElement;
+ var axMenu = axCombobox.childAtIndex(0);
+ var axMenuItem = axMenu.childAtIndex(0);
+
+ debug(axCombobox.role + " has orientation: " + axCombobox.orientation);
+
+ debug("\nBefore combobox removal");
+ debug(axMenu.role + " has orientation: " + axMenu.orientation);
+ debug(axMenuItem.role + " has orientation: " + axMenuItem.orientation);
+
+ document.body.removeChild(combobox);
+ debug("\nAfter combobox removal");
+ debug(axMenu.role + " has orientation: " + axMenu.orientation);
+ debug(axMenuItem.role + " has orientation: " + axMenuItem.orientation);
+}
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (182464 => 182465)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-04-07 12:25:26 UTC (rev 182464)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-04-07 12:27:43 UTC (rev 182465)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-11-18 Joanmarie Diggs <jdiggs@igalia.com>
+
+ AX: [ATK] Crash getting the orientation of a MenuListOption after the MenuList was removed from the document
+ https://bugs.webkit.org/show_bug.cgi?id=138727
+
+ Reviewed by Chris Fleizach.
+
+ AccessibilityMenuListOption::elementRect() returns the value of the
+ grandparent MenuList, asserting that the grandparent exists with that
+ role. But it is possible to have an existing MenuListOption and remove
+ the element which had been backing that MenuList from the document.
+ Adding null checks prior to the assertions prevents our crashing if the
+ parent or grandparent was removed.
+
+ Test: platform/gtk/accessibility/combobox-descendants-orientation-crash.html
+
+ * accessibility/AccessibilityMenuListOption.cpp:
+ (WebCore::AccessibilityMenuListOption::elementRect):
+
</ins><span class="cx"> 2014-11-13 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> AX: [ATK] Do not return ATK_ROLE_UNKNOWN for null or otherwise invalid accessible objects
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreaccessibilityAccessibilityMenuListOptioncpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/accessibility/AccessibilityMenuListOption.cpp (182464 => 182465)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/accessibility/AccessibilityMenuListOption.cpp 2015-04-07 12:25:26 UTC (rev 182464)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/accessibility/AccessibilityMenuListOption.cpp 2015-04-07 12:27:43 UTC (rev 182465)
</span><span class="lines">@@ -104,9 +104,13 @@
</span><span class="cx"> LayoutRect AccessibilityMenuListOption::elementRect() const
</span><span class="cx"> {
</span><span class="cx"> AccessibilityObject* parent = parentObject();
</span><ins>+ if (!parent)
+ return boundingBoxRect();
</ins><span class="cx"> ASSERT(parent->isMenuListPopup());
</span><span class="cx">
</span><span class="cx"> AccessibilityObject* grandparent = parent->parentObject();
</span><ins>+ if (!grandparent)
+ return boundingBoxRect();
</ins><span class="cx"> ASSERT(grandparent->isMenuList());
</span><span class="cx">
</span><span class="cx"> return grandparent->elementRect();
</span></span></pre>
</div>
</div>
</body>
</html>