99825 2012-10-19 03:00:43 -0700 [ATK] accessibility/title-ui-element-correctness.html fails 2013-11-06 10:15:10 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Gtk, LayoutTestFailure P2 Normal --- 1 zan webkit-unassigned aboxhall apinheiro cfleizach commit-queue dmazzoni jcraig jdiggs k.czech mario mpakulavelrutka samuel_white oldest_to_newest 746176 0 zan 2012-10-19 03:00:43 -0700 The accessibility/title-ui-element-correctness.html test that was added in r131871 is failing on the GTK 64-bit release builder. The debug builder hasn't processed the commit yet. http://trac.webkit.org/changeset/131871 http://test-results.appspot.com/dashboards/flakiness_dashboard.html#group=%40ToT%20-%20webkit.org&tests=accessibility%2Ftitle-ui-element-correctness.html Here's the diff: --- /home/slave/webkitgtk/gtk-linux-64-release/build/layout-test-results/accessibility/title-ui-element-correctness-expected.txt +++ /home/slave/webkitgtk/gtk-linux-64-release/build/layout-test-results/accessibility/title-ui-element-correctness-actual.txt @@ -5,13 +5,13 @@ PASS axElement('control1').titleUIElement().isEqual(axElement('label1')) is true PASS axElement('control2').titleUIElement().isEqual(axElement('label2')) is true -PASS hasTitleUIElement(axElement('control3')) is false +FAIL hasTitleUIElement(axElement('control3')) should be false. Was true. PASS document.getElementById('label3').setAttribute('for', 'control3'); axElement('control3').titleUIElement().isEqual(axElement('label3')) is true -PASS var label4Element = createLabelWithIdAndForAttribute('label4', 'control4'); hasTitleUIElement(axElement('control4')) is false +FAIL var label4Element = createLabelWithIdAndForAttribute('label4', 'control4'); hasTitleUIElement(axElement('control4')) should be false. Was true. PASS document.getElementById('container').appendChild(label4Element); hasTitleUIElement(axElement('control4')) is true PASS axElement('control4').titleUIElement().isEqual(axElement('label4')) is true -PASS label4Element.parentElement.removeChild(label4Element); hasTitleUIElement(axElement('control4')) is false -PASS hasTitleUIElement(axElement('control5')) is false +FAIL label4Element.parentElement.removeChild(label4Element); hasTitleUIElement(axElement('control4')) should be false. Was true. +FAIL hasTitleUIElement(axElement('control5')) should be false. Was true. PASS reparentNodeIntoContainer(document.getElementById('control5'), document.getElementById('label5')); axElement('control5').titleUIElement() != null is true PASS axElement('control5').titleUIElement().isEqual(axElement('label5')) is true PASS axElement('control6').titleUIElement().isEqual(axElement('label6b')) is true 937846 1 k.czech 2013-10-09 01:55:45 -0700 *** Bug 112019 has been marked as a duplicate of this bug. *** 947649 2 mpakulavelrutka 2013-11-06 03:23:59 -0800 Currently only one test case fails: PASS reparentNodeIntoContainer(document.getElementById('control5'), document.getElementById('label5')); axElement('control5').titleUIElement() != null is true PASS axElement('control5').titleUIElement().isEqual(axElement('label5')) is true PASS axElement('control6').titleUIElement().isEqual(axElement('label6b')) is true -PASS newLabel6Element = createLabelWithIdAndForAttribute('label6a', 'control6'); document.body.insertBefore(newLabel6Element, document.body.firstChild); axElement('control6').titleUIElement().isEqual(axElement('label6a')) is true +FAIL newLabel6Element = createLabelWithIdAndForAttribute('label6a', 'control6'); document.body.insertBefore(newLabel6Element, document.body.firstChild); axElement('control6').titleUIElement().isEqual(axElement('label6a')) should be true. Was false. PASS document.body.removeChild(newLabel6Element); axElement('control6').titleUIElement().isEqual(axElement('label6b')) is true PASS successfullyParsed is true In this test case a new label for control6 element is added before the existing one, and it should be returned when calling titleUIElement. When setting a new relation for an object which currently has one, atk_relation_set_add_relation_by_type adds a relation as next element of relation's target list, while in DRT/WTR implementation we take into account only the first target. 947656 3 216163 mpakulavelrutka 2013-11-06 04:11:55 -0800 Created attachment 216163 proposed patch This patch fixes the bug by removing current relations before adding a new one. 947671 4 216163 mario 2013-11-06 05:17:30 -0800 Comment on attachment 216163 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=216163&action=review > Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp:194 > +static void removeAtkRelationFromRelationSetByType(AtkRelationSet* relationSet, AtkRelationType relationType) I think removeAtkRelationByType is enough for the name > Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp:199 > + if (atk_relation_get_relation_type(relation) == ATK_RELATION_LABELLED_BY) { You should be comparing against your relationType parameter, not that hardcoded case > Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp:201 > + break; You should not break here, as the same type of AtkRelation might exist between one base object and one or more target objects. So, if you are removing by type you should remove them all the relationships matching that type 947677 5 216163 mpakulavelrutka 2013-11-06 05:45:56 -0800 Comment on attachment 216163 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=216163&action=review >> Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp:194 >> +static void removeAtkRelationFromRelationSetByType(AtkRelationSet* relationSet, AtkRelationType relationType) > > I think removeAtkRelationByType is enough for the name OK >> Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp:199 >> + if (atk_relation_get_relation_type(relation) == ATK_RELATION_LABELLED_BY) { > > You should be comparing against your relationType parameter, not that hardcoded case my bad, I will fix it >> Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp:201 >> + break; > > You should not break here, as the same type of AtkRelation might exist between one base object and one or more target objects. So, if you are removing by type you should remove them all the relationships matching that type I am not sure about it. In atk_relation_set_add_relation_by_type, there is a check if relation of that type is present in relation set. If yes, a new target is added, but no new relation is added to relation set - so I assume there should be only one relation of given type in relation set. 947691 6 mario 2013-11-06 07:26:15 -0800 (In reply to comment #5) > [...] > > You should not break here, as the same type of AtkRelation might exist > > between one base object and one or more target objects. So, if you are > > removing by type you should remove them all the relationships matching that > > type > > I am not sure about it. In atk_relation_set_add_relation_by_type, there is a > check if relation of that type is present in relation set. If yes, a new > target is added, but no new relation is added to relation set - so I assume > there should be only one relation of given type in relation set. You are right. I've checked the code in atkrelationset.c and it's quite clear about that. Thanks for noticing 947692 7 216174 mpakulavelrutka 2013-11-06 07:37:12 -0800 Created attachment 216174 fixes after review 947765 8 216174 commit-queue 2013-11-06 10:15:06 -0800 Comment on attachment 216174 fixes after review Clearing flags on attachment: 216174 Committed r158757: <http://trac.webkit.org/changeset/158757> 947766 9 commit-queue 2013-11-06 10:15:10 -0800 All reviewed patches have been landed. Closing bug. 216163 2013-11-06 04:11:55 -0800 2013-11-06 07:37:12 -0800 proposed patch accessibility.diff text/plain 6276 mpakulavelrutka ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA4ZjFkMjk0Li5mZDk4ZWJiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTMtMTEt MDUgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1zdW5nLmNvbT4KKwor ICAgICAgICBbQVRLXSBhY2Nlc3NpYmlsaXR5L3RpdGxlLXVpLWVsZW1lbnQtY29ycmVjdG5lc3Mu aHRtbCBmYWlscworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTk4MjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBSZW1vdmUgZmFpbHVyZSB0ZXN0IGV4cGVjdGF0aW9uIGZvciB0aGUgdGVzdCBmaXhlZCBieSB0 aGlzIHBhdGNoLgorCisgICAgICAgICogcGxhdGZvcm0vZWZsLXdrMS9UZXN0RXhwZWN0YXRpb25z OgorICAgICAgICAqIHBsYXRmb3JtL2VmbC13azIvVGVzdEV4cGVjdGF0aW9uczoKKyAgICAgICAg KiBwbGF0Zm9ybS9ndGsvVGVzdEV4cGVjdGF0aW9uczoKKwogMjAxMy0xMS0wNiAgUGlvdHIgR3Jh ZCAgPHAuZ3JhZEBzYW1zdW5nLmNvbT4KIAogICAgICAgICBUZXN0IGZvciBzZWVrIG5vdCB3b3Jr aW5nIHByb3Blcmx5IHdpdGggbmVnYXRpdmUgcGxheWJhY2sgcmF0ZS4KZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL3BsYXRmb3JtL2VmbC13azEvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3Rz L3BsYXRmb3JtL2VmbC13azEvVGVzdEV4cGVjdGF0aW9ucwppbmRleCA5Yjc0NGJhLi5kZGFmZTMx IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwtd2sxL1Rlc3RFeHBlY3RhdGlv bnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsLXdrMS9UZXN0RXhwZWN0YXRpb25zCkBA IC0xMzEsNyArMTMxLDYgQEAgd2Via2l0Lm9yZy9iLzExMjAwOCBhY2Nlc3NpYmlsaXR5L3NwaW5i dXR0b24tdmFsdWUuaHRtbCBbIEZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzExMjAxMiBhY2Nlc3Np YmlsaXR5L3N2Zy1ib3VuZHMuaHRtbCBbIEZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzExMjAxNCBh Y2Nlc3NpYmlsaXR5L3RleHRhcmVhLWluc2VydGlvbi1wb2ludC1saW5lLW51bWJlci5odG1sIFsg RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMTEyMDE4IGFjY2Vzc2liaWxpdHkvdGgtYXMtdGl0bGUt dWkuaHRtbCBbIEZhaWx1cmUgXQotd2Via2l0Lm9yZy9iLzExMjAxOSBhY2Nlc3NpYmlsaXR5L3Rp dGxlLXVpLWVsZW1lbnQtY29ycmVjdG5lc3MuaHRtbCBbIEZhaWx1cmUgXQogd2Via2l0Lm9yZy9i LzExMjAyMSBhY2Nlc3NpYmlsaXR5L3Zpc2libGUtZWxlbWVudHMuaHRtbCBbIEZhaWx1cmUgQ3Jh c2ggXQogCiBhY2Nlc3NpYmlsaXR5L2FyaWEtY2hlY2tib3gtc2VuZHMtbm90aWZpY2F0aW9uLmh0 bWwgWyBTa2lwIF0KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2VmbC13azIvVGVz dEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2VmbC13azIvVGVzdEV4cGVjdGF0 aW9ucwppbmRleCBmNmYwODllLi4yYzQxZjUzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0 Zm9ybS9lZmwtd2syL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0v ZWZsLXdrMi9UZXN0RXhwZWN0YXRpb25zCkBAIC0xNjMsNyArMTYzLDYgQEAgd2Via2l0Lm9yZy9i LzExMjAwOCBhY2Nlc3NpYmlsaXR5L3NwaW5idXR0b24tdmFsdWUuaHRtbCBbIEZhaWx1cmUgXQog d2Via2l0Lm9yZy9iLzExMjAxMiBhY2Nlc3NpYmlsaXR5L3N2Zy1ib3VuZHMuaHRtbCBbIEZhaWx1 cmUgXQogd2Via2l0Lm9yZy9iLzExMjAxNCBhY2Nlc3NpYmlsaXR5L3RleHRhcmVhLWluc2VydGlv bi1wb2ludC1saW5lLW51bWJlci5odG1sIFsgRmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMTEyMDE4 IGFjY2Vzc2liaWxpdHkvdGgtYXMtdGl0bGUtdWkuaHRtbCBbIEZhaWx1cmUgXQotd2Via2l0Lm9y Zy9iLzExMjAxOSBhY2Nlc3NpYmlsaXR5L3RpdGxlLXVpLWVsZW1lbnQtY29ycmVjdG5lc3MuaHRt bCBbIEZhaWx1cmUgXQogd2Via2l0Lm9yZy9iLzExMjAyMSBhY2Nlc3NpYmlsaXR5L3Zpc2libGUt ZWxlbWVudHMuaHRtbCBbIEZhaWx1cmUgQ3Jhc2ggXQogCiAjIE5ldyBhY2Nlc3NpYmlsaXR5IHRl c3QgYWRkZWQgaW4gcjE0OTg1OCB0aGF0IGlzIGZhaWxpbmcgZm9yIEVGTC4KZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMv cGxhdGZvcm0vZ3RrL1Rlc3RFeHBlY3RhdGlvbnMKaW5kZXggZmU1Y2VjNy4uNjg4NjI0NiAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIv TGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTEyMjQsOCArMTIy NCw2IEBAIHdlYmtpdC5vcmcvYi85ODYxMyBjc3MzL21hc2tpbmcvY2xpcC1wYXRoLXJlZmVyZW5j ZS5odG1sIFsgSW1hZ2VPbmx5RmFpbHVyZSBdCiAKIHdlYmtpdC5vcmcvYi85ODk1MCB0cmFuc2l0 aW9ucy9ibGVuZG1vZGUtdHJhbnNpdGlvbnMuaHRtbCBbIEZhaWx1cmUgXQogCi13ZWJraXQub3Jn L2IvOTk4MjUgYWNjZXNzaWJpbGl0eS90aXRsZS11aS1lbGVtZW50LWNvcnJlY3RuZXNzLmh0bWwg WyBGYWlsdXJlIF0KLQogd2Via2l0Lm9yZy9iLzk4NzE4IHN2Zy9hbmltYXRpb25zL2FuaW1hdGUt Y3NzLXhtbC1hdHRyaWJ1dGVUeXBlLmh0bWwgWyBGYWlsdXJlIF0KIAogd2Via2l0Lm9yZy9iLzEw MDQyNCBlZGl0aW5nL3NlbGVjdGlvbi91c2VyLXNlbGVjdC1hbGwtc2VsZWN0aW9uLmh0bWwgWyBG YWlsdXJlIF0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhZmQyYTI2Li4yODJhNzVkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjMgQEAKKzIwMTMtMTEtMDUgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBh a3VsYUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbQVRLXSBhY2Nlc3NpYmlsaXR5L3RpdGxlLXVp LWVsZW1lbnQtY29ycmVjdG5lc3MuaHRtbCBmYWlscworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTk4MjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBXaGVuIGNhbGxpbmcgc2V0QXRrUmVsYXRpb25TZXRGcm9t Q29yZU9iamVjdCBhIG5ldyBBVEtfTEFCRUxMRURfQllfUkVMQVRJT04KKyAgICAgICAgaXMgYWRk ZWQsIGFkZGluZyBwcm9wZXIgbGFiZWwgZWxlbWVudCBhcyBhIHJlbGF0aW9uLiBXaGVuIHRoZSBk b2N1bWVudCBzdHJ1Y3R1cmUKKyAgICAgICAgaGFzIGJlZW4gY2hhbmdlZCBhbmQgYSBkaWZmZXJl bnQgbGFiZWwgc2hvdWxkIGJlIGxpbmtlZCBhcyBhIHJlbGF0aW9uLCBjdXJyZW50IEFUSworICAg ICAgICBpbXBsZW1lbnRhdGlvbiBhZGRzIGl0IGFzIGEgbmV4dCB0YXJnZXQgb24gcmVsYXRpb24n cyB0YXJnZXQgbGlzdCwgd2hpbGUKKyAgICAgICAgV1RSL0R1bXBSZW5kZXJUcmVlIGltcGxlbWVu dGF0aW9uIHRha2VzIG9ubHkgZmlyc3Qgb25lIGludG8gYWNjb3VudC4KKyAgICAgICAgVGhpcyBw YXRjaCBhZGRzIGEgbmV3IGZ1bmN0aW9uIHJlbW92aW5nIGN1cnJlbnQgcmVsYXRpb25zIGJlZm9y ZSBhZGRpbmcgbmV3IG9uZXMuCisKKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cy4K KworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvYXRrL1dlYktpdEFjY2Vzc2libGVXcmFwcGVyQXRr LmNwcDoKKyAgICAgICAgKHJlbW92ZUF0a1JlbGF0aW9uRnJvbVJlbGF0aW9uU2V0QnlUeXBlKToK KyAgICAgICAgKHNldEF0a1JlbGF0aW9uU2V0RnJvbUNvcmVPYmplY3QpOgorCiAyMDEzLTExLTA2 ICBBbmRyZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBBZGQgSW5saW5l RWxlbWVudEJveCBhbmQgc3RvcCBpbnN0YW50aWF0aW5nIElubGluZUJveCBkaXJlY3RseS4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRrL1dlYktpdEFjY2Vzc2li bGVXcmFwcGVyQXRrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvYXRrL1dlYktp dEFjY2Vzc2libGVXcmFwcGVyQXRrLmNwcAppbmRleCBhYWQxYTMyLi5kZTlhMTQxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2F0ay9XZWJLaXRBY2Nlc3NpYmxlV3Jh cHBlckF0ay5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9hdGsvV2ViS2l0 QWNjZXNzaWJsZVdyYXBwZXJBdGsuY3BwCkBAIC0xOTEsMTIgKzE5MSwyNiBAQCBzdGF0aWMgY29u c3QgZ2NoYXIqIHdlYmtpdEFjY2Vzc2libGVHZXREZXNjcmlwdGlvbihBdGtPYmplY3QqIG9iamVj dCkKICAgICByZXR1cm4gY2FjaGVBbmRSZXR1cm5BdGtQcm9wZXJ0eShvYmplY3QsIEF0a0NhY2hl ZEFjY2Vzc2libGVEZXNjcmlwdGlvbiwgYWNjZXNzaWJpbGl0eURlc2NyaXB0aW9uKGNvcmVPYmpl Y3QpKTsKIH0KIAorc3RhdGljIHZvaWQgcmVtb3ZlQXRrUmVsYXRpb25Gcm9tUmVsYXRpb25TZXRC eVR5cGUoQXRrUmVsYXRpb25TZXQqIHJlbGF0aW9uU2V0LCBBdGtSZWxhdGlvblR5cGUgcmVsYXRp b25UeXBlKQoreworICAgIGludCBjb3VudCA9IGF0a19yZWxhdGlvbl9zZXRfZ2V0X25fcmVsYXRp b25zKHJlbGF0aW9uU2V0KTsKKyAgICBmb3IgKGludCBpID0gMDsgaSA8IGNvdW50OyBpKyspIHsK KyAgICAgICAgQXRrUmVsYXRpb24qIHJlbGF0aW9uID0gYXRrX3JlbGF0aW9uX3NldF9nZXRfcmVs YXRpb24ocmVsYXRpb25TZXQsIGkpOworICAgICAgICBpZiAoYXRrX3JlbGF0aW9uX2dldF9yZWxh dGlvbl90eXBlKHJlbGF0aW9uKSA9PSBBVEtfUkVMQVRJT05fTEFCRUxMRURfQlkpIHsKKyAgICAg ICAgICAgIGF0a19yZWxhdGlvbl9zZXRfcmVtb3ZlKHJlbGF0aW9uU2V0LCByZWxhdGlvbik7Cisg ICAgICAgICAgICBicmVhazsKKyAgICAgICAgfQorICAgIH0KK30KKwogc3RhdGljIHZvaWQgc2V0 QXRrUmVsYXRpb25TZXRGcm9tQ29yZU9iamVjdChBY2Nlc3NpYmlsaXR5T2JqZWN0KiBjb3JlT2Jq ZWN0LCBBdGtSZWxhdGlvblNldCogcmVsYXRpb25TZXQpCiB7CiAgICAgaWYgKGNvcmVPYmplY3Qt PmlzRmllbGRzZXQoKSkgewogICAgICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBsYWJlbCA9IGNv cmVPYmplY3QtPnRpdGxlVUlFbGVtZW50KCk7Ci0gICAgICAgIGlmIChsYWJlbCkKKyAgICAgICAg aWYgKGxhYmVsKSB7CisgICAgICAgICAgICByZW1vdmVBdGtSZWxhdGlvbkZyb21SZWxhdGlvblNl dEJ5VHlwZShyZWxhdGlvblNldCwgQVRLX1JFTEFUSU9OX0xBQkVMTEVEX0JZKTsKICAgICAgICAg ICAgIGF0a19yZWxhdGlvbl9zZXRfYWRkX3JlbGF0aW9uX2J5X3R5cGUocmVsYXRpb25TZXQsIEFU S19SRUxBVElPTl9MQUJFTExFRF9CWSwgbGFiZWwtPndyYXBwZXIoKSk7CisgICAgICAgIH0KICAg ICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMjEyLDggKzIyNiwxMCBAQCBzdGF0aWMgdm9pZCBz ZXRBdGtSZWxhdGlvblNldEZyb21Db3JlT2JqZWN0KEFjY2Vzc2liaWxpdHlPYmplY3QqIGNvcmVP YmplY3QsIEF0awogCiAgICAgaWYgKGNvcmVPYmplY3QtPmlzQ29udHJvbCgpKSB7CiAgICAgICAg IEFjY2Vzc2liaWxpdHlPYmplY3QqIGxhYmVsID0gY29yZU9iamVjdC0+Y29ycmVzcG9uZGluZ0xh YmVsRm9yQ29udHJvbEVsZW1lbnQoKTsKLSAgICAgICAgaWYgKGxhYmVsKQorICAgICAgICBpZiAo bGFiZWwpIHsKKyAgICAgICAgICAgIHJlbW92ZUF0a1JlbGF0aW9uRnJvbVJlbGF0aW9uU2V0QnlU eXBlKHJlbGF0aW9uU2V0LCBBVEtfUkVMQVRJT05fTEFCRUxMRURfQlkpOwogICAgICAgICAgICAg YXRrX3JlbGF0aW9uX3NldF9hZGRfcmVsYXRpb25fYnlfdHlwZShyZWxhdGlvblNldCwgQVRLX1JF TEFUSU9OX0xBQkVMTEVEX0JZLCBsYWJlbC0+d3JhcHBlcigpKTsKKyAgICAgICAgfQogICAgIH0g ZWxzZSB7CiAgICAgICAgIEFjY2Vzc2liaWxpdHlPYmplY3QqIGNvbnRyb2wgPSBjb3JlT2JqZWN0 LT5jb3JyZXNwb25kaW5nQ29udHJvbEZvckxhYmVsRWxlbWVudCgpOwogICAgICAgICBpZiAoY29u dHJvbCkK 216174 2013-11-06 07:37:12 -0800 2013-11-06 10:15:06 -0800 fixes after review accessibility2.diff text/plain 6247 mpakulavelrutka ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBlNDk0Mjk0Li5jYjU1OWI5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTMtMTEt MDYgIE1pY2hhxYIgUGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1zdW5nLmNvbT4KKwor ICAgICAgICBbQVRLXSBhY2Nlc3NpYmlsaXR5L3RpdGxlLXVpLWVsZW1lbnQtY29ycmVjdG5lc3Mu aHRtbCBmYWlscworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTk4MjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBSZW1vdmUgZmFpbHVyZSB0ZXN0IGV4cGVjdGF0aW9uIGZvciB0aGUgdGVzdCBmaXhlZCBieSB0 aGlzIHBhdGNoLgorCisgICAgICAgICogcGxhdGZvcm0vZWZsLXdrMS9UZXN0RXhwZWN0YXRpb25z OgorICAgICAgICAqIHBsYXRmb3JtL2VmbC13azIvVGVzdEV4cGVjdGF0aW9uczoKKyAgICAgICAg KiBwbGF0Zm9ybS9ndGsvVGVzdEV4cGVjdGF0aW9uczoKKwogMjAxMy0xMS0wNiAgS3J6eXN6dG9m IEN6ZWNoICA8ay5jemVjaEBzYW1zdW5nLmNvbT4KIAogICAgICAgICBbQVRLXSBhY2Nlc3NpYmls aXR5L3RhYmluZGV4LWVsZW1lbnRzLWFyZS1hY2Nlc3NpYmxlLmh0bWwgaXMgZmFpbGluZwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsLXdrMS9UZXN0RXhwZWN0YXRpb25zIGIv TGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsLXdrMS9UZXN0RXhwZWN0YXRpb25zCmluZGV4IDliNzQ0 YmEuLmRkYWZlMzEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2VmbC13azEvVGVz dEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9lZmwtd2sxL1Rlc3RFeHBl Y3RhdGlvbnMKQEAgLTEzMSw3ICsxMzEsNiBAQCB3ZWJraXQub3JnL2IvMTEyMDA4IGFjY2Vzc2li aWxpdHkvc3BpbmJ1dHRvbi12YWx1ZS5odG1sIFsgRmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMTEy MDEyIGFjY2Vzc2liaWxpdHkvc3ZnLWJvdW5kcy5odG1sIFsgRmFpbHVyZSBdCiB3ZWJraXQub3Jn L2IvMTEyMDE0IGFjY2Vzc2liaWxpdHkvdGV4dGFyZWEtaW5zZXJ0aW9uLXBvaW50LWxpbmUtbnVt YmVyLmh0bWwgWyBGYWlsdXJlIF0KIHdlYmtpdC5vcmcvYi8xMTIwMTggYWNjZXNzaWJpbGl0eS90 aC1hcy10aXRsZS11aS5odG1sIFsgRmFpbHVyZSBdCi13ZWJraXQub3JnL2IvMTEyMDE5IGFjY2Vz c2liaWxpdHkvdGl0bGUtdWktZWxlbWVudC1jb3JyZWN0bmVzcy5odG1sIFsgRmFpbHVyZSBdCiB3 ZWJraXQub3JnL2IvMTEyMDIxIGFjY2Vzc2liaWxpdHkvdmlzaWJsZS1lbGVtZW50cy5odG1sIFsg RmFpbHVyZSBDcmFzaCBdCiAKIGFjY2Vzc2liaWxpdHkvYXJpYS1jaGVja2JveC1zZW5kcy1ub3Rp ZmljYXRpb24uaHRtbCBbIFNraXAgXQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0v ZWZsLXdrMi9UZXN0RXhwZWN0YXRpb25zIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZWZsLXdrMi9U ZXN0RXhwZWN0YXRpb25zCmluZGV4IGY2ZjA4OWUuLjJjNDFmNTMgMTAwNjQ0Ci0tLSBhL0xheW91 dFRlc3RzL3BsYXRmb3JtL2VmbC13azIvVGVzdEV4cGVjdGF0aW9ucworKysgYi9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9lZmwtd2syL1Rlc3RFeHBlY3RhdGlvbnMKQEAgLTE2Myw3ICsxNjMsNiBAQCB3 ZWJraXQub3JnL2IvMTEyMDA4IGFjY2Vzc2liaWxpdHkvc3BpbmJ1dHRvbi12YWx1ZS5odG1sIFsg RmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMTEyMDEyIGFjY2Vzc2liaWxpdHkvc3ZnLWJvdW5kcy5o dG1sIFsgRmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMTEyMDE0IGFjY2Vzc2liaWxpdHkvdGV4dGFy ZWEtaW5zZXJ0aW9uLXBvaW50LWxpbmUtbnVtYmVyLmh0bWwgWyBGYWlsdXJlIF0KIHdlYmtpdC5v cmcvYi8xMTIwMTggYWNjZXNzaWJpbGl0eS90aC1hcy10aXRsZS11aS5odG1sIFsgRmFpbHVyZSBd Ci13ZWJraXQub3JnL2IvMTEyMDE5IGFjY2Vzc2liaWxpdHkvdGl0bGUtdWktZWxlbWVudC1jb3Jy ZWN0bmVzcy5odG1sIFsgRmFpbHVyZSBdCiB3ZWJraXQub3JnL2IvMTEyMDIxIGFjY2Vzc2liaWxp dHkvdmlzaWJsZS1lbGVtZW50cy5odG1sIFsgRmFpbHVyZSBDcmFzaCBdCiAKICMgTmV3IGFjY2Vz c2liaWxpdHkgdGVzdCBhZGRlZCBpbiByMTQ5ODU4IHRoYXQgaXMgZmFpbGluZyBmb3IgRUZMLgpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Rlc3RFeHBlY3RhdGlvbnMgYi9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvVGVzdEV4cGVjdGF0aW9ucwppbmRleCA1ZDk3ZjhjLi5k MzY4ZmIxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvVGVzdEV4cGVjdGF0 aW9ucworKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvVGVzdEV4cGVjdGF0aW9ucwpAQCAt MTIyNCw4ICsxMjI0LDYgQEAgd2Via2l0Lm9yZy9iLzk4NjEzIGNzczMvbWFza2luZy9jbGlwLXBh dGgtcmVmZXJlbmNlLmh0bWwgWyBJbWFnZU9ubHlGYWlsdXJlIF0KIAogd2Via2l0Lm9yZy9iLzk4 OTUwIHRyYW5zaXRpb25zL2JsZW5kbW9kZS10cmFuc2l0aW9ucy5odG1sIFsgRmFpbHVyZSBdCiAK LXdlYmtpdC5vcmcvYi85OTgyNSBhY2Nlc3NpYmlsaXR5L3RpdGxlLXVpLWVsZW1lbnQtY29ycmVj dG5lc3MuaHRtbCBbIEZhaWx1cmUgXQotCiB3ZWJraXQub3JnL2IvOTg3MTggc3ZnL2FuaW1hdGlv bnMvYW5pbWF0ZS1jc3MteG1sLWF0dHJpYnV0ZVR5cGUuaHRtbCBbIEZhaWx1cmUgXQogCiB3ZWJr aXQub3JnL2IvMTAwNDI0IGVkaXRpbmcvc2VsZWN0aW9uL3VzZXItc2VsZWN0LWFsbC1zZWxlY3Rp b24uaHRtbCBbIEZhaWx1cmUgXQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n IGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDhlYTU2OWUuLjQzODUwYTEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMy0xMS0wNiAgTWljaGHFgiBQYWt1xYJhIHZlbCBS dXRrYSAgPG0ucGFrdWxhQHNhbXN1bmcuY29tPgorCisgICAgICAgIFtBVEtdIGFjY2Vzc2liaWxp dHkvdGl0bGUtdWktZWxlbWVudC1jb3JyZWN0bmVzcy5odG1sIGZhaWxzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05OTgyNQorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gY2FsbGluZyBzZXRBdGtSZWxh dGlvblNldEZyb21Db3JlT2JqZWN0IGEgbmV3IEFUS19MQUJFTExFRF9CWV9SRUxBVElPTgorICAg ICAgICBpcyBhZGRlZCwgYWRkaW5nIHByb3BlciBsYWJlbCBlbGVtZW50IGFzIGEgcmVsYXRpb24u IFdoZW4gdGhlIGRvY3VtZW50IHN0cnVjdHVyZQorICAgICAgICBoYXMgYmVlbiBjaGFuZ2VkIGFu ZCBhIGRpZmZlcmVudCBsYWJlbCBzaG91bGQgYmUgbGlua2VkIGFzIGEgcmVsYXRpb24sIGN1cnJl bnQgQVRLCisgICAgICAgIGltcGxlbWVudGF0aW9uIGFkZHMgaXQgYXMgYSBuZXh0IHRhcmdldCBv biByZWxhdGlvbidzIHRhcmdldCBsaXN0LCB3aGlsZQorICAgICAgICBXVFIvRHVtcFJlbmRlclRy ZWUgaW1wbGVtZW50YXRpb24gdGFrZXMgb25seSBmaXJzdCBvbmUgaW50byBhY2NvdW50LgorICAg ICAgICBUaGlzIHBhdGNoIGFkZHMgYSBuZXcgZnVuY3Rpb24gcmVtb3ZpbmcgY3VycmVudCByZWxh dGlvbnMgYmVmb3JlIGFkZGluZyBuZXcgb25lcy4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0 aW5nIHRlc3RzLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9hdGsvV2ViS2l0QWNjZXNzaWJs ZVdyYXBwZXJBdGsuY3BwOgorICAgICAgICAocmVtb3ZlQXRrUmVsYXRpb25Gcm9tUmVsYXRpb25T ZXRCeVR5cGUpOgorICAgICAgICAoc2V0QXRrUmVsYXRpb25TZXRGcm9tQ29yZU9iamVjdCk6CisK IDIwMTMtMTEtMDYgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAg Tm90aWZ5IG5vZGVzIHJlbW92YWwgdG8gUmFuZ2UvU2VsZWN0aW9uIGFmdGVyIGRpc3BhdGNoaW5n IGJsdXIgYW5kIG11dGF0aW9uIGV2ZW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nl c3NpYmlsaXR5L2F0ay9XZWJLaXRBY2Nlc3NpYmxlV3JhcHBlckF0ay5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9hY2Nlc3NpYmlsaXR5L2F0ay9XZWJLaXRBY2Nlc3NpYmxlV3JhcHBlckF0ay5jcHAKaW5k ZXggYWFkMWEzMi4uNGNiOTkxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJp bGl0eS9hdGsvV2ViS2l0QWNjZXNzaWJsZVdyYXBwZXJBdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2FjY2Vzc2liaWxpdHkvYXRrL1dlYktpdEFjY2Vzc2libGVXcmFwcGVyQXRrLmNwcApAQCAt MTkxLDEyICsxOTEsMjYgQEAgc3RhdGljIGNvbnN0IGdjaGFyKiB3ZWJraXRBY2Nlc3NpYmxlR2V0 RGVzY3JpcHRpb24oQXRrT2JqZWN0KiBvYmplY3QpCiAgICAgcmV0dXJuIGNhY2hlQW5kUmV0dXJu QXRrUHJvcGVydHkob2JqZWN0LCBBdGtDYWNoZWRBY2Nlc3NpYmxlRGVzY3JpcHRpb24sIGFjY2Vz c2liaWxpdHlEZXNjcmlwdGlvbihjb3JlT2JqZWN0KSk7CiB9CiAKK3N0YXRpYyB2b2lkIHJlbW92 ZUF0a1JlbGF0aW9uQnlUeXBlKEF0a1JlbGF0aW9uU2V0KiByZWxhdGlvblNldCwgQXRrUmVsYXRp b25UeXBlIHJlbGF0aW9uVHlwZSkKK3sKKyAgICBpbnQgY291bnQgPSBhdGtfcmVsYXRpb25fc2V0 X2dldF9uX3JlbGF0aW9ucyhyZWxhdGlvblNldCk7CisgICAgZm9yIChpbnQgaSA9IDA7IGkgPCBj b3VudDsgaSsrKSB7CisgICAgICAgIEF0a1JlbGF0aW9uKiByZWxhdGlvbiA9IGF0a19yZWxhdGlv bl9zZXRfZ2V0X3JlbGF0aW9uKHJlbGF0aW9uU2V0LCBpKTsKKyAgICAgICAgaWYgKGF0a19yZWxh dGlvbl9nZXRfcmVsYXRpb25fdHlwZShyZWxhdGlvbikgPT0gcmVsYXRpb25UeXBlKSB7CisgICAg ICAgICAgICBhdGtfcmVsYXRpb25fc2V0X3JlbW92ZShyZWxhdGlvblNldCwgcmVsYXRpb24pOwor ICAgICAgICAgICAgYnJlYWs7CisgICAgICAgIH0KKyAgICB9Cit9CisKIHN0YXRpYyB2b2lkIHNl dEF0a1JlbGF0aW9uU2V0RnJvbUNvcmVPYmplY3QoQWNjZXNzaWJpbGl0eU9iamVjdCogY29yZU9i amVjdCwgQXRrUmVsYXRpb25TZXQqIHJlbGF0aW9uU2V0KQogewogICAgIGlmIChjb3JlT2JqZWN0 LT5pc0ZpZWxkc2V0KCkpIHsKICAgICAgICAgQWNjZXNzaWJpbGl0eU9iamVjdCogbGFiZWwgPSBj b3JlT2JqZWN0LT50aXRsZVVJRWxlbWVudCgpOwotICAgICAgICBpZiAobGFiZWwpCisgICAgICAg IGlmIChsYWJlbCkgeworICAgICAgICAgICAgcmVtb3ZlQXRrUmVsYXRpb25CeVR5cGUocmVsYXRp b25TZXQsIEFUS19SRUxBVElPTl9MQUJFTExFRF9CWSk7CiAgICAgICAgICAgICBhdGtfcmVsYXRp b25fc2V0X2FkZF9yZWxhdGlvbl9ieV90eXBlKHJlbGF0aW9uU2V0LCBBVEtfUkVMQVRJT05fTEFC RUxMRURfQlksIGxhYmVsLT53cmFwcGVyKCkpOworICAgICAgICB9CiAgICAgICAgIHJldHVybjsK ICAgICB9CiAKQEAgLTIxMiw4ICsyMjYsMTAgQEAgc3RhdGljIHZvaWQgc2V0QXRrUmVsYXRpb25T ZXRGcm9tQ29yZU9iamVjdChBY2Nlc3NpYmlsaXR5T2JqZWN0KiBjb3JlT2JqZWN0LCBBdGsKIAog ICAgIGlmIChjb3JlT2JqZWN0LT5pc0NvbnRyb2woKSkgewogICAgICAgICBBY2Nlc3NpYmlsaXR5 T2JqZWN0KiBsYWJlbCA9IGNvcmVPYmplY3QtPmNvcnJlc3BvbmRpbmdMYWJlbEZvckNvbnRyb2xF bGVtZW50KCk7Ci0gICAgICAgIGlmIChsYWJlbCkKKyAgICAgICAgaWYgKGxhYmVsKSB7CisgICAg ICAgICAgICByZW1vdmVBdGtSZWxhdGlvbkJ5VHlwZShyZWxhdGlvblNldCwgQVRLX1JFTEFUSU9O X0xBQkVMTEVEX0JZKTsKICAgICAgICAgICAgIGF0a19yZWxhdGlvbl9zZXRfYWRkX3JlbGF0aW9u X2J5X3R5cGUocmVsYXRpb25TZXQsIEFUS19SRUxBVElPTl9MQUJFTExFRF9CWSwgbGFiZWwtPndy YXBwZXIoKSk7CisgICAgICAgIH0KICAgICB9IGVsc2UgewogICAgICAgICBBY2Nlc3NpYmlsaXR5 T2JqZWN0KiBjb250cm9sID0gY29yZU9iamVjdC0+Y29ycmVzcG9uZGluZ0NvbnRyb2xGb3JMYWJl bEVsZW1lbnQoKTsKICAgICAgICAgaWYgKGNvbnRyb2wpCg==