111222 2013-03-01 14:35:15 -0800 AX: aria-label does not override text content on iOS 2013-03-05 09:28:20 -0800 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cfleizach cfleizach aboxhall apinheiro ddkilzer dmazzoni jdiggs webkit.review.bot oldest_to_newest 845510 0 cfleizach 2013-03-01 14:35:15 -0800 iOS needs to use the text alternative computation rules already being used by the Mac 845540 1 191046 cfleizach 2013-03-01 15:02:06 -0800 Created attachment 191046 patch 846903 2 191046 ddkilzer 2013-03-04 15:16:23 -0800 Comment on attachment 191046 patch View in context: https://bugs.webkit.org/attachment.cgi?id=191046&action=review r=me, but consider expanding the layout test to cover all four scenarios if possible. > Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:685 > + if ([axTitle length] && [axDescription length]) > + return [axTitle stringByAppendingFormat:@", %@", axDescription]; > + else if ([axTitle length]) > + return axTitle; > + else if ([axDescription length]) > + return axDescription; Nit: Might be worth pulling [axTitle length] and [axDescription length] into local variables since they're used multiple times here. > Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:687 > + else if ([self stringValueShouldBeUsedInLabel]) > + return m_object->stringValue(); Also, is it possible to test all of these code paths (title and description, title only, description only, neither) using a layout test? If so, the layout test should be changed to test all four scenarios. 846916 3 cfleizach 2013-03-04 15:29:20 -0800 (In reply to comment #2) > (From update of attachment 191046 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=191046&action=review > > r=me, but consider expanding the layout test to cover all four scenarios if possible. > > > Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:685 > > + if ([axTitle length] && [axDescription length]) > > + return [axTitle stringByAppendingFormat:@", %@", axDescription]; > > + else if ([axTitle length]) > > + return axTitle; > > + else if ([axDescription length]) > > + return axDescription; > > Nit: Might be worth pulling [axTitle length] and [axDescription length] into local variables since they're used multiple times here. > > > Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:687 > > + else if ([self stringValueShouldBeUsedInLabel]) > > + return m_object->stringValue(); > > Also, is it possible to test all of these code paths (title and description, title only, description only, neither) using a layout test? > > If so, the layout test should be changed to test all four scenarios. Yep, I'll fix up this layout test to test all 4 scenarios. Thanks! 847744 4 cfleizach 2013-03-05 09:28:20 -0800 http://trac.webkit.org/changeset/144766 191046 2013-03-01 15:02:06 -0800 2013-03-04 15:16:23 -0800 patch patch text/plain 6391 cfleizach SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0NDUxMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDEzLTAzLTAxICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IGFyaWEtbGFiZWwg ZG9lcyBub3Qgb3ZlcnJpZGUgdGV4dCBjb250ZW50IG9uIGlPUworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTExMjIyCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSBpT1MgdXNlIHRoZSBzYW1lIHRleHQg YWx0ZXJuYXRpdmUgY29tcHV0YXRpb24gdGhhdCBNYWMgaXMgdXNpbmcuIFRoZSBtYWluIGRpZmZl cmVuY2UKKyAgICAgICAgaXMgdGhhdCBkZXNjcmlwdGlvbiBhbmQgdGl0bGUgbmVlZCB0byBiZSBj b25jYXRlbmF0ZWQsIGJlY2F1c2UgaU9TIGRvZXNuJ3QgaGF2ZSB0d28gYXR0cmlidXRlcworICAg ICAgICB0byByZXR1cm4gdGhvc2UgdmFsdWVzLgorCisgICAgICAgIFRlc3Q6IHBsYXRmb3JtL2lw aG9uZS1zaW11bGF0b3IvYWNjZXNzaWJpbGl0eS9hcmlhLWxhYmVsLXdpdGgtaW50ZXJuYWwtdGV4 dC5odG1sCisKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L2lvcy9XZWJBY2Nlc3NpYmlsaXR5T2Jq ZWN0V3JhcHBlcklPUy5tbToKKyAgICAgICAgKC1bV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBw ZXIgc3RyaW5nVmFsdWVTaG91bGRCZVVzZWRJbkxhYmVsXSk6CisgICAgICAgICgtW1dlYkFjY2Vz c2liaWxpdHlPYmplY3RXcmFwcGVyIGFjY2Vzc2liaWxpdHlMYWJlbF0pOgorICAgICAgICAoLVtX ZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlciBhY2Nlc3NpYmlsaXR5SGludF0pOgorICAgICAg ICAqIGFjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZS5o OgorCiAyMDEzLTAzLTAxICBWaWN0b3IgQ2FyYnVuZSAgPHZjYXJidW5lQGNocm9taXVtLm9yZz4K IAogICAgICAgICBTdXBwb3J0IHBhZGRpbmcsIG1hcmdpbiBhbmQgYm9yZGVyIGZvciBpbnRlcm5h bCBVQSBjdWUgc3R5bGluZwpJbmRleDogU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMv V2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJC YXNlLmgJKHJldmlzaW9uIDE0NDUxMCkKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv bWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyQmFzZS5oCSh3b3JraW5nIGNvcHkpCkBA IC00Myw2ICs0MywxMCBAQAogLSAoV2ViQ29yZTo6QWNjZXNzaWJpbGl0eU9iamVjdCopYWNjZXNz aWJpbGl0eU9iamVjdDsKIC0gKEJPT0wpdXBkYXRlT2JqZWN0QmFja2luZ1N0b3JlOwogCistIChO U1N0cmluZyAqKWFjY2Vzc2liaWxpdHlUaXRsZTsKKy0gKE5TU3RyaW5nICopYWNjZXNzaWJpbGl0 eURlc2NyaXB0aW9uOworLSAoTlNTdHJpbmcgKilhY2Nlc3NpYmlsaXR5SGVscFRleHQ7CisKIC0g KGlkKWF0dGFjaG1lbnRWaWV3OwogLy8gVXNlZCB0byBpbmZvcm0gYW4gZWxlbWVudCB3aGVuIGEg bm90aWZpY2F0aW9uIGlzIHBvc3RlZCBmb3IgaXQuIFVzZWQgYnkgRFJULgogLSAodm9pZClhY2Nl c3NpYmlsaXR5UG9zdGVkTm90aWZpY2F0aW9uOihOU1N0cmluZyAqKW5vdGlmaWNhdGlvbk5hbWU7 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L2lvcy9XZWJBY2Nlc3NpYmlsaXR5 T2JqZWN0V3JhcHBlcklPUy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3Np YmlsaXR5L2lvcy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlcklPUy5tbQkocmV2aXNpb24g MTQ0NTEwKQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9pb3MvV2ViQWNjZXNzaWJp bGl0eU9iamVjdFdyYXBwZXJJT1MubW0JKHdvcmtpbmcgY29weSkKQEAgLTY1OCw3ICs2NTgsNyBA QAogICAgICAgICByZXR1cm4gTk87CiAgICAgaWYgKG1fb2JqZWN0LT5yb2xlVmFsdWUoKSA9PSBQ b3BVcEJ1dHRvblJvbGUpCiAgICAgICAgIHJldHVybiBOTzsKLSAgICAKKwogICAgIHJldHVybiBZ RVM7CiB9CiAKQEAgLTY3MiwxNSArNjcyLDIxIEBACiAgICAgaWYgKGxhYmVsKQogICAgICAgICBy ZXR1cm4gbGFiZWw7CiAKLSAgICBOU1N0cmluZyogdGl0bGUgPSBtX29iamVjdC0+dGl0bGUoKTsK LSAgICBpZiAoIVt0aXRsZSBsZW5ndGhdKQotICAgICAgICB0aXRsZSA9IG1fb2JqZWN0LT5hY2Nl c3NpYmlsaXR5RGVzY3JpcHRpb24oKTsKLQotICAgIC8vIEV2ZXJ5dGhpbmcgZXhjZXB0IGEgdGV4 dCBjb250cm9sIG5lZWRzIHRvIHJldHVybiB0aGVpciBzdHJpbmcgdmFsdWUgaW4gdGhlIGF4TGFi ZWwgKHBlciBpUGhvbmUgQVggQVBJKS4KLSAgICBpZiAoIVt0aXRsZSBsZW5ndGhdICYmIFtzZWxm IHN0cmluZ1ZhbHVlU2hvdWxkQmVVc2VkSW5MYWJlbF0pCi0gICAgICAgIHRpdGxlID0gbV9vYmpl Y3QtPnN0cmluZ1ZhbHVlKCk7CisgICAgLy8gaU9TIGRvZXNuJ3QgZGlzdGluZ3Vpc2ggYmV0d2Vl biBhIHRpdGxlIGFuZCBkZXNjcmlwdGlvbiBmaWVsZCwKKyAgICAvLyBzbyBjb25jYXRlbnRhdGlv biB3aWxsIHlpZWxkIHRoZSBiZXN0IHJlc3VsdC4KKyAgICBOU1N0cmluZyAqYXhUaXRsZSA9IFtz ZWxmIGFjY2Vzc2liaWxpdHlUaXRsZV07CisgICAgTlNTdHJpbmcgKmF4RGVzY3JpcHRpb24gPSBb c2VsZiBhY2Nlc3NpYmlsaXR5RGVzY3JpcHRpb25dOwogICAgIAotICAgIHJldHVybiB0aXRsZTsK KyAgICBpZiAoW2F4VGl0bGUgbGVuZ3RoXSAmJiBbYXhEZXNjcmlwdGlvbiBsZW5ndGhdKQorICAg ICAgICByZXR1cm4gW2F4VGl0bGUgc3RyaW5nQnlBcHBlbmRpbmdGb3JtYXQ6QCIsICVAIiwgYXhE ZXNjcmlwdGlvbl07CisgICAgZWxzZSBpZiAoW2F4VGl0bGUgbGVuZ3RoXSkKKyAgICAgICAgcmV0 dXJuIGF4VGl0bGU7CisgICAgZWxzZSBpZiAoW2F4RGVzY3JpcHRpb24gbGVuZ3RoXSkKKyAgICAg ICAgcmV0dXJuIGF4RGVzY3JpcHRpb247CisgICAgZWxzZSBpZiAoW3NlbGYgc3RyaW5nVmFsdWVT aG91bGRCZVVzZWRJbkxhYmVsXSkKKyAgICAgICAgcmV0dXJuIG1fb2JqZWN0LT5zdHJpbmdWYWx1 ZSgpOworICAgIAorICAgIHJldHVybiBuaWw7CiB9CiAKIC0gKEFjY2Vzc2liaWxpdHlUYWJsZUNl bGwqKXRhYmxlQ2VsbFBhcmVudApAQCAtODk0LDcgKzkwMCw3IEBACiAgICAgaWYgKCFbc2VsZiBf cHJlcGFyZUFjY2Vzc2liaWxpdHlDYWxsXSkKICAgICAgICAgcmV0dXJuIG5pbDsKIAotICAgIHJl dHVybiBtX29iamVjdC0+aGVscFRleHQoKTsKKyAgICByZXR1cm4gW3NlbGYgYWNjZXNzaWJpbGl0 eUhlbHBUZXh0XTsKIH0KIAogLSAoTlNVUkwgKilhY2Nlc3NpYmlsaXR5VVJMCkluZGV4OiBMYXlv dXRUZXN0cy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCShy ZXZpc2lvbiAxNDQ1MTApCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkK QEAgLTEsMyArMSwxMyBAQAorMjAxMy0wMy0wMSAgQ2hyaXMgRmxlaXphY2ggIDxjZmxlaXphY2hA YXBwbGUuY29tPgorCisgICAgICAgIEFYOiBhcmlhLWxhYmVsIGRvZXMgbm90IG92ZXJyaWRlIHRl eHQgY29udGVudCBvbiBpT1MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTExMTIyMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogcGxhdGZvcm0vaXBob25lLXNpbXVsYXRvci9hY2Nlc3NpYmlsaXR5L2FyaWEt bGFiZWwtd2l0aC1pbnRlcm5hbC10ZXh0LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICog cGxhdGZvcm0vaXBob25lLXNpbXVsYXRvci9hY2Nlc3NpYmlsaXR5L2FyaWEtbGFiZWwtd2l0aC1p bnRlcm5hbC10ZXh0Lmh0bWw6IEFkZGVkLgorCiAyMDEzLTAzLTAxICBBZHJpZW5uZSBXYWxrZXIg IDxlbm5lQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIE1hcmsgbW9yZSBmbGFr eSB0ZXN0cyByZWxhdGVkIHRvIHNjcm9sbGJhciBvcmRlcmluZwpJbmRleDogTGF5b3V0VGVzdHMv cGxhdGZvcm0vaXBob25lLXNpbXVsYXRvci9hY2Nlc3NpYmlsaXR5L2FyaWEtbGFiZWwtd2l0aC1p bnRlcm5hbC10ZXh0LWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0 Zm9ybS9pcGhvbmUtc2ltdWxhdG9yL2FjY2Vzc2liaWxpdHkvYXJpYS1sYWJlbC13aXRoLWludGVy bmFsLXRleHQtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvcGxhdGZv cm0vaXBob25lLXNpbXVsYXRvci9hY2Nlc3NpYmlsaXR5L2FyaWEtbGFiZWwtd2l0aC1pbnRlcm5h bC10ZXh0LWV4cGVjdGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDExIEBACisxCitU aGlzIHRlc3RzIHRoYXQgaWYgYW4gZWxlbWVudCBoYXMgYXJpYS1sYWJlbCwgaXQgd2lsbCBvdmVy cmlkZSB0aGUgdmlzaWJsZSB0ZXh0IGFzIG5lY2Vzc2FyeS4KKworT24gc3VjY2VzcywgeW91IHdp bGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09N UExFVEUiLgorCisKK1BBU1MgYnV0dG9uMS5pcGhvbmVMYWJlbCBpcyAnQVhMYWJlbDogUExBWScK K1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCkluZGV4 OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9pcGhvbmUtc2ltdWxhdG9yL2FjY2Vzc2liaWxpdHkvYXJp YS1sYWJlbC13aXRoLWludGVybmFsLXRleHQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0 cy9wbGF0Zm9ybS9pcGhvbmUtc2ltdWxhdG9yL2FjY2Vzc2liaWxpdHkvYXJpYS1sYWJlbC13aXRo LWludGVybmFsLXRleHQuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL3BsYXRmb3Jt L2lwaG9uZS1zaW11bGF0b3IvYWNjZXNzaWJpbGl0eS9hcmlhLWxhYmVsLXdpdGgtaW50ZXJuYWwt dGV4dC5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0wLDAgKzEsMzQgQEAKKzwhRE9DVFlQRSBIVE1M IFBVQkxJQyAiLS8vSUVURi8vRFREIEhUTUwvL0VOIj4KKzxodG1sPgorPGhlYWQ+Cis8bGluayBy ZWw9InN0eWxlc2hlZXQiIGhyZWY9Ii4uLy4uLy4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3Qt c3R5bGUuY3NzIj4KKzxzY3JpcHQgc3JjPSIuLi8uLi8uLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10 ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgordmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9 IGZhbHNlOworPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBpZD0iYm9keSI+CisKKzxkaXYgaWQ9 ImJ1dHRvbiIgcm9sZT0iYnV0dG9uIiBhcmlhLWxhYmVsPSJQTEFZIj48c3Bhbj4xPC9zcGFuPjwv ZGl2PgorCis8cCBpZD0iZGVzY3JpcHRpb24iPjwvcD4KKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2 PgorCis8c2NyaXB0PgorCisgICAgZGVzY3JpcHRpb24oIlRoaXMgdGVzdHMgdGhhdCBpZiBhbiBl bGVtZW50IGhhcyBhcmlhLWxhYmVsLCBpdCB3aWxsIG92ZXJyaWRlIHRoZSB2aXNpYmxlIHRleHQg YXMgbmVjZXNzYXJ5LiIpOworCisgICAgaWYgKHdpbmRvdy5hY2Nlc3NpYmlsaXR5Q29udHJvbGxl cikgeworCisgICAgICAgIHZhciBidXR0b24xID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNj ZXNzaWJsZUVsZW1lbnRCeUlkKCJidXR0b24iKTsKKyAgICAgICAgc2hvdWxkQmUoImJ1dHRvbjEu aXBob25lTGFiZWwiLCAiJ0FYTGFiZWw6IFBMQVknIik7CisgICAgfQorCisgICAgc3VjY2Vzc2Z1 bGx5UGFyc2VkID0gdHJ1ZTsKKzwvc2NyaXB0PgorCis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vZmFz dC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKworPC9ib2R5PgorPC9o dG1sPgorCg==