148458 2015-08-25 18:26:03 -0700 AX: Enable accessibility/aria-controls.html test for mac 2015-08-25 23:50:05 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All All RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=127908 InRadar P2 Normal --- 1 n_wang webkit-unassigned aboxhall apinheiro cfleizach commit-queue dmazzoni jcraig jdiggs mario n_wang samuel_white webkit-bug-importer oldest_to_newest 1120800 0 n_wang 2015-08-25 18:26:03 -0700 The test is marked Skip in TestExpectation file. 1120801 1 259910 n_wang 2015-08-25 18:31:41 -0700 Created attachment 259910 patch 1120821 2 cfleizach 2015-08-25 20:32:32 -0700 How come you're not using the string value in the test like the other platform That looks like a good check because it's able to validate that the element at that index is actually the right one 1120827 3 n_wang 2015-08-25 21:02:49 -0700 (In reply to comment #2) > How come you're not using the string value in the test like the other > platform > That looks like a good check because it's able to validate that the element > at that index is actually the right one On Mac, the string value for the div is empty. Should I change the element type? 1120841 4 cfleizach 2015-08-25 22:01:38 -0700 That's probably because a div is being returned On Mac platform we should get the child of that object and check the string value I think 1120847 5 259926 n_wang 2015-08-25 22:23:44 -0700 Created attachment 259926 patch 1120866 6 259926 commit-queue 2015-08-25 23:50:01 -0700 Comment on attachment 259926 patch Clearing flags on attachment: 259926 Committed r188947: <http://trac.webkit.org/changeset/188947> 1120867 7 commit-queue 2015-08-25 23:50:05 -0700 All reviewed patches have been landed. Closing bug. 259910 2015-08-25 18:31:41 -0700 2015-08-25 22:23:44 -0700 patch patch.txt text/plain 7590 n_wang SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4ODk0MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE1LTA4LTI1ICBOYW4gV2Fu ZyAgPG5fd2FuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEVuYWJsZSBhY2Nlc3NpYmlsaXR5 L2FyaWEtY29udHJvbHMuaHRtbCB0ZXN0IGZvciBtYWMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODQ1OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlLWVuYWJsZWQgYWNjZXNzaWJpbGl0eS9hcmlhLWNv bnRyb2xzLmh0bWwgdGVzdCBmb3IgbWFjLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9tYWMv V2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW06CisgICAgICAgICgtW1dlYkFjY2Vz c2liaWxpdHlPYmplY3RXcmFwcGVyIGFjY2Vzc2liaWxpdHlBdHRyaWJ1dGVWYWx1ZTpdKToKKwog MjAxNS0wOC0yNSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFVz aW5nIHRoZSBmaWx0ZXIgZnVuY3Rpb25hbCBub3RhdGlvbiBmb3IgYmFja2dyb3VuZCBpbWFnZXMg cmVzdWx0cyBpbiB3cm9uZyBiYWNrZ3JvdW5kLXNpemUgcmVuZGVyaW5nCkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1h Yy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJB Y2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlck1hYy5tbQkocmV2aXNpb24gMTg4OTMxKQorKysgU291 cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBw ZXJNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTI0MSw2ICsyNDEsMTAgQEAgdXNpbmcgbmFtZXNw YWNlIEhUTUxOYW1lczsKICNkZWZpbmUgTlNBY2Nlc3NpYmlsaXR5RG9jdW1lbnRFbmNvZGluZ0F0 dHJpYnV0ZSBAIkFYRG9jdW1lbnRFbmNvZGluZyIKICNlbmRpZgogCisjaWZuZGVmIE5TQWNjZXNz aWJpbGl0eUFyaWFDb250cm9sc0F0dHJpYnV0ZQorI2RlZmluZSBOU0FjY2Vzc2liaWxpdHlBcmlh Q29udHJvbHNBdHRyaWJ1dGUgQCJBWEFSSUFDb250cm9scyIKKyNlbmRpZgorCiAjZGVmaW5lIE5T QWNjZXNzaWJpbGl0eURPTUlkZW50aWZpZXJBdHRyaWJ1dGUgQCJBWERPTUlkZW50aWZpZXIiCiAj ZGVmaW5lIE5TQWNjZXNzaWJpbGl0eURPTUNsYXNzTGlzdEF0dHJpYnV0ZSBAIkFYRE9NQ2xhc3NM aXN0IgogCkBAIC0zMDY4LDYgKzMwNzIsMTMgQEAgLSAoaWQpYWNjZXNzaWJpbGl0eUF0dHJpYnV0 ZVZhbHVlOihOU1N0cgogICAgICAgICByZXR1cm4gbmlsOwogICAgIH0KICAgICAKKyAgICAvLyBB cmlhIGNvbnRyb2xzIGVsZW1lbnQKKyAgICBpZiAoW2F0dHJpYnV0ZU5hbWUgaXNFcXVhbFRvU3Ry aW5nOk5TQWNjZXNzaWJpbGl0eUFyaWFDb250cm9sc0F0dHJpYnV0ZV0pIHsKKyAgICAgICAgQWNj ZXNzaWJpbGl0eU9iamVjdDo6QWNjZXNzaWJpbGl0eUNoaWxkcmVuVmVjdG9yIGFyaWFDb250cm9s czsKKyAgICAgICAgbV9vYmplY3QtPmFyaWFDb250cm9sc0VsZW1lbnRzKGFyaWFDb250cm9scyk7 CisgICAgICAgIHJldHVybiBjb252ZXJ0VG9OU0FycmF5KGFyaWFDb250cm9scyk7CisgICAgfQor ICAgIAogICAgIHJldHVybiBuaWw7CiB9CiAKSW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4ODk0MCkKKysrIFRvb2xzL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE1LTA4LTI1ICBOYW4gV2Fu ZyAgPG5fd2FuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEVuYWJsZSBhY2Nlc3NpYmlsaXR5 L2FyaWEtY29udHJvbHMuaHRtbCB0ZXN0IGZvciBtYWMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODQ1OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudGVkIGFyaWFDb250cm9sc0VsZW1lbnRB dEluZGV4KHVuc2lnbmVkIGluZGV4KS4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL21hYy9B Y2Nlc3NpYmlsaXR5VUlFbGVtZW50TWFjLm1tOgorICAgICAgICAoQWNjZXNzaWJpbGl0eVVJRWxl bWVudDo6YXJpYUNvbnRyb2xzRWxlbWVudEF0SW5kZXgpOgorICAgICAgICAoQWNjZXNzaWJpbGl0 eVVJRWxlbWVudDo6ZGlzY2xvc2VkUm93QXRJbmRleCk6CisgICAgICAgICogV2ViS2l0VGVzdFJ1 bm5lci9JbmplY3RlZEJ1bmRsZS9tYWMvQWNjZXNzaWJpbGl0eVVJRWxlbWVudE1hYy5tbToKKyAg ICAgICAgKFdUUjo6QWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6YXJpYUNvbnRyb2xzRWxlbWVudEF0 SW5kZXgpOgorCiAyMDE1LTA4LTI1ICBHeXV5b3VuZyBLaW0gIDxneXV5b3VuZy5raW1Ad2Via2l0 Lm9yZz4KIAogICAgICAgICBSZW1vdmUgUGFzc1JlZlB0ciBzdHlsZSBjaGVjayBydWxlCkluZGV4 OiBUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMvQWNjZXNzaWJpbGl0eVVJRWxlbWVudE1hYy5tbQo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMvQWNjZXNzaWJpbGl0eVVJRWxl bWVudE1hYy5tbQkocmV2aXNpb24gMTg4OTMxKQorKysgVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFj L0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTM5NSw4ICsz OTUsMTMgQEAgQWNjZXNzaWJpbGl0eVVJRWxlbWVudCBBY2Nlc3NpYmlsaXR5VUlFbAogCiBBY2Nl c3NpYmlsaXR5VUlFbGVtZW50IEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ6OmFyaWFDb250cm9sc0Vs ZW1lbnRBdEluZGV4KHVuc2lnbmVkIGluZGV4KQogewotICAgIC8vIEZJWE1FOiBpbXBsZW1lbnQK LSAgICByZXR1cm4gMDsKKyAgICBCRUdJTl9BWF9PQkpDX0VYQ0VQVElPTlMKKyAgICBOU0FycmF5 KiBhcmlhQ29udHJvbHMgPSBbbV9lbGVtZW50IGFjY2Vzc2liaWxpdHlBdHRyaWJ1dGVWYWx1ZTpA IkFYQVJJQUNvbnRyb2xzIl07CisgICAgaWYgKGluZGV4IDwgW2FyaWFDb250cm9scyBjb3VudF0p CisgICAgICAgIHJldHVybiBbYXJpYUNvbnRyb2xzIG9iamVjdEF0SW5kZXg6aW5kZXhdOworICAg IEVORF9BWF9PQkpDX0VYQ0VQVElPTlMKKyAgICAKKyAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAog QWNjZXNzaWJpbGl0eVVJRWxlbWVudCBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjpkaXNjbG9zZWRS b3dBdEluZGV4KHVuc2lnbmVkIGluZGV4KQpJbmRleDogVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9J bmplY3RlZEJ1bmRsZS9tYWMvQWNjZXNzaWJpbGl0eVVJRWxlbWVudE1hYy5tbQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL21hYy9BY2Nlc3NpYmls aXR5VUlFbGVtZW50TWFjLm1tCShyZXZpc2lvbiAxODg5MzEpCisrKyBUb29scy9XZWJLaXRUZXN0 UnVubmVyL0luamVjdGVkQnVuZGxlL21hYy9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50TWFjLm1tCSh3 b3JraW5nIGNvcHkpCkBAIC00NTgsNyArNDU4LDExIEBAIFBhc3NSZWZQdHI8QWNjZXNzaWJpbGl0 eVVJRWxlbWVudD4gQWNjZXMKIAogUGFzc1JlZlB0cjxBY2Nlc3NpYmlsaXR5VUlFbGVtZW50PiBB Y2Nlc3NpYmlsaXR5VUlFbGVtZW50OjphcmlhQ29udHJvbHNFbGVtZW50QXRJbmRleCh1bnNpZ25l ZCBpbmRleCkKIHsKLSAgICAvLyBGSVhNRTogaW1wbGVtZW50CisgICAgQkVHSU5fQVhfT0JKQ19F WENFUFRJT05TCisgICAgTlNBcnJheSogYXJpYUNvbnRyb2xzID0gW21fZWxlbWVudCBhY2Nlc3Np YmlsaXR5QXR0cmlidXRlVmFsdWU6QCJBWEFSSUFDb250cm9scyJdOworICAgIGlmIChpbmRleCA8 IFthcmlhQ29udHJvbHMgY291bnRdKQorICAgICAgICByZXR1cm4gQWNjZXNzaWJpbGl0eVVJRWxl bWVudDo6Y3JlYXRlKFthcmlhQ29udHJvbHMgb2JqZWN0QXRJbmRleDppbmRleF0pOworICAgIEVO RF9BWF9PQkpDX0VYQ0VQVElPTlMKICAgICByZXR1cm4gbnVsbHB0cjsKIH0KIApJbmRleDogTGF5 b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0NoYW5nZUxvZwko cmV2aXNpb24gMTg4OTQwKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp CkBAIC0xLDMgKzEsMTQgQEAKKzIwMTUtMDgtMjUgIE5hbiBXYW5nICA8bl93YW5nQGFwcGxlLmNv bT4KKworICAgICAgICBBWDogRW5hYmxlIGFjY2Vzc2liaWxpdHkvYXJpYS1jb250cm9scy5odG1s IHRlc3QgZm9yIG1hYworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTQ4NDU4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBhY2Nlc3NpYmlsaXR5L2FyaWEtY29udHJvbHMuaHRtbDoKKyAgICAgICAgKiBwbGF0 Zm9ybS9tYWMvVGVzdEV4cGVjdGF0aW9uczoKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvYWNjZXNz aWJpbGl0eS9hcmlhLWNvbnRyb2xzLWV4cGVjdGVkLnR4dDogQWRkZWQuCisKIDIwMTUtMDgtMjUg IFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAogICAgICAgICBVc2luZyB0aGUgZmls dGVyIGZ1bmN0aW9uYWwgbm90YXRpb24gZm9yIGJhY2tncm91bmQgaW1hZ2VzIHJlc3VsdHMgaW4g d3JvbmcgYmFja2dyb3VuZC1zaXplIHJlbmRlcmluZwpJbmRleDogTGF5b3V0VGVzdHMvYWNjZXNz aWJpbGl0eS9hcmlhLWNvbnRyb2xzLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvYWNj ZXNzaWJpbGl0eS9hcmlhLWNvbnRyb2xzLmh0bWwJKHJldmlzaW9uIDE4ODkzMSkKKysrIExheW91 dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1jb250cm9scy5odG1sCSh3b3JraW5nIGNvcHkpCkBA IC0yMiw4ICsyMiwxMyBAQAogICAgICAgICB2YXIgdGFibGlzdCA9IGFjY2Vzc2liaWxpdHlDb250 cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgidGFibGlzdCIpOwogICAgICAgICB2YXIgdGFi MSA9IHRhYmxpc3QuY2hpbGRBdEluZGV4KDApOwogCi0gICAgICAgIHNob3VsZEJlKCJ0YWIxLmFy aWFDb250cm9sc0VsZW1lbnRBdEluZGV4KDApLnN0cmluZ1ZhbHVlIiwgIidBWFZhbHVlOiBQYW5l bCAxJyIpOwotICAgICAgICBzaG91bGRCZSgidGFiMS5hcmlhQ29udHJvbHNFbGVtZW50QXRJbmRl eCgxKS5zdHJpbmdWYWx1ZSIsICInQVhWYWx1ZTogUGFuZWwgMiciKTsKKyAgICAgICAgaWYgKGFj Y2Vzc2liaWxpdHlDb250cm9sbGVyLnBsYXRmb3JtTmFtZSA9PSAibWFjIikgeworICAgICAgICAg ICAgc2hvdWxkQmUoInRhYjEuYXJpYUNvbnRyb2xzRWxlbWVudEF0SW5kZXgoMCkucm9sZSIsICIn QVhSb2xlOiBBWEdyb3VwJyIpOworICAgICAgICAgICAgc2hvdWxkQmUoInRhYjEuYXJpYUNvbnRy b2xzRWxlbWVudEF0SW5kZXgoMSkucm9sZSIsICInQVhSb2xlOiBBWEdyb3VwJyIpOworICAgICAg ICB9IGVsc2UgeworICAgICAgICAgICAgc2hvdWxkQmUoInRhYjEuYXJpYUNvbnRyb2xzRWxlbWVu dEF0SW5kZXgoMCkuc3RyaW5nVmFsdWUiLCAiJ0FYVmFsdWU6IFBhbmVsIDEnIik7CisgICAgICAg ICAgICBzaG91bGRCZSgidGFiMS5hcmlhQ29udHJvbHNFbGVtZW50QXRJbmRleCgxKS5zdHJpbmdW YWx1ZSIsICInQVhWYWx1ZTogUGFuZWwgMiciKTsKKyAgICAgICAgfQogICAgIH0KIAogPC9zY3Jp cHQ+CkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvVGVzdEV4cGVjdGF0aW9ucwo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvVGVzdEV4cGVjdGF0aW9ucwkocmV2 aXNpb24gMTg4OTMxKQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlv bnMJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDkgKzQ3LDYgQEAgYWNjZXNzaWJpbGl0eS9tdWx0aXNl bGVjdC1saXN0LXJlcG9ydHMtYQogIyBNaXNzaW5nIGltcGxlbWVudGF0aW9uIG9mIHNvbWUgZnVu Y3Rpb25zIGluIG1hYy4KIHdlYmtpdC5vcmcvYi8xMjkwMzkgYWNjZXNzaWJpbGl0eS9zZWxlY3Qt ZWxlbWVudC1hdC1pbmRleC5odG1sIFsgU2tpcCBdCiAKLSMgYXJpYUNvbnRyb2xzRWxlbWVudEF0 SW5kZXggaXMgbm90IGltcGxlbWVudGVkIGluIG1hYwotd2Via2l0Lm9yZy9iLzEyNzkwOCBhY2Nl c3NpYmlsaXR5L2FyaWEtY29udHJvbHMuaHRtbCBbIFNraXAgXQotCiAjIE5lZWQgdG8gYWRkIGZ1 bmN0aW9uYWxpdHkgdG8gRHVtcFJlbmRlclRyZWUgdG8gaGFuZGxlIGVycm9yIHBhZ2VzCiBmYXN0 L2hpc3RvcnkvYmFjay1mb3J3YXJkLXJlc2V0LWFmdGVyLWVycm9yLWhhbmRsaW5nLmh0bWwKIApJ bmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvYXJpYS1jb250cm9s cy1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2Fj Y2Vzc2liaWxpdHkvYXJpYS1jb250cm9scy1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBM YXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9hcmlhLWNvbnRyb2xzLWV4cGVj dGVkLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDEzIEBACitQYW5lbCAxCitQYW5lbCAy CitUaGlzIHRlc3RzIHRoYXQgYXJpYS1jb250cm9scyByZXR1cm5zIGNvcnJlY3QgZWxlbWVudCBh dCB0aGUgZ2l2ZW4gaW5kZXgKKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9m ICJQQVNTIiBtZXNzYWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1Mg dGFiMS5hcmlhQ29udHJvbHNFbGVtZW50QXRJbmRleCgwKS5yb2xlIGlzICdBWFJvbGU6IEFYR3Jv dXAnCitQQVNTIHRhYjEuYXJpYUNvbnRyb2xzRWxlbWVudEF0SW5kZXgoMSkucm9sZSBpcyAnQVhS b2xlOiBBWEdyb3VwJworUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENP TVBMRVRFCisK 259926 2015-08-25 22:23:44 -0700 2015-08-25 23:50:01 -0700 patch patch.txt text/plain 7648 n_wang SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4ODkzNCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE1LTA4LTI1ICBOYW4gV2Fu ZyAgPG5fd2FuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEVuYWJsZSBhY2Nlc3NpYmlsaXR5 L2FyaWEtY29udHJvbHMuaHRtbCB0ZXN0IGZvciBtYWMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODQ1OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlLWVuYWJsZWQgYWNjZXNzaWJpbGl0eS9hcmlhLWNv bnRyb2xzLmh0bWwgdGVzdCBmb3IgbWFjLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9tYWMv V2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJNYWMubW06CisgICAgICAgICgtW1dlYkFjY2Vz c2liaWxpdHlPYmplY3RXcmFwcGVyIGFjY2Vzc2liaWxpdHlBdHRyaWJ1dGVWYWx1ZTpdKToKKwog MjAxNS0wOC0yNSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAK ICAgICAgICAgSWNvbkRhdGFiYXNlOiBzeW5jVGhyZWFkTWFpbkxvb3AoKSBpcyB1bmxvY2tpbmcg bV9zeW5jTG9jayB0d2ljZSB3aGVuIHRocmVhZCB0ZXJtaW5hdGlvbiBpcyByZXF1ZXN0ZWQKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmpl Y3RXcmFwcGVyTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvbWFjL1dlYkFjY2Vzc2liaWxpdHlPYmplY3RXcmFwcGVyTWFjLm1tCShyZXZpc2lvbiAxODg5 MzQpCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5 T2JqZWN0V3JhcHBlck1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtMjQxLDYgKzI0MSwxMCBAQCB1 c2luZyBuYW1lc3BhY2UgSFRNTE5hbWVzOwogI2RlZmluZSBOU0FjY2Vzc2liaWxpdHlEb2N1bWVu dEVuY29kaW5nQXR0cmlidXRlIEAiQVhEb2N1bWVudEVuY29kaW5nIgogI2VuZGlmCiAKKyNpZm5k ZWYgTlNBY2Nlc3NpYmlsaXR5QXJpYUNvbnRyb2xzQXR0cmlidXRlCisjZGVmaW5lIE5TQWNjZXNz aWJpbGl0eUFyaWFDb250cm9sc0F0dHJpYnV0ZSBAIkFYQVJJQUNvbnRyb2xzIgorI2VuZGlmCisK ICNkZWZpbmUgTlNBY2Nlc3NpYmlsaXR5RE9NSWRlbnRpZmllckF0dHJpYnV0ZSBAIkFYRE9NSWRl bnRpZmllciIKICNkZWZpbmUgTlNBY2Nlc3NpYmlsaXR5RE9NQ2xhc3NMaXN0QXR0cmlidXRlIEAi QVhET01DbGFzc0xpc3QiCiAKQEAgLTMwNjgsNiArMzA3MiwxMyBAQCAtIChpZClhY2Nlc3NpYmls aXR5QXR0cmlidXRlVmFsdWU6KE5TU3RyCiAgICAgICAgIHJldHVybiBuaWw7CiAgICAgfQogICAg IAorICAgIC8vIEFyaWEgY29udHJvbHMgZWxlbWVudAorICAgIGlmIChbYXR0cmlidXRlTmFtZSBp c0VxdWFsVG9TdHJpbmc6TlNBY2Nlc3NpYmlsaXR5QXJpYUNvbnRyb2xzQXR0cmlidXRlXSkgewor ICAgICAgICBBY2Nlc3NpYmlsaXR5T2JqZWN0OjpBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3Ig YXJpYUNvbnRyb2xzOworICAgICAgICBtX29iamVjdC0+YXJpYUNvbnRyb2xzRWxlbWVudHMoYXJp YUNvbnRyb2xzKTsKKyAgICAgICAgcmV0dXJuIGNvbnZlcnRUb05TQXJyYXkoYXJpYUNvbnRyb2xz KTsKKyAgICB9CisgICAgCiAgICAgcmV0dXJuIG5pbDsKIH0KIApJbmRleDogVG9vbHMvQ2hhbmdl TG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMTg4OTM0KQorKysg VG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTUtMDgt MjUgIE5hbiBXYW5nICA8bl93YW5nQGFwcGxlLmNvbT4KKworICAgICAgICBBWDogRW5hYmxlIGFj Y2Vzc2liaWxpdHkvYXJpYS1jb250cm9scy5odG1sIHRlc3QgZm9yIG1hYworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTQ4NDU4CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSW1wbGVtZW50ZWQgYXJpYUNvbnRy b2xzRWxlbWVudEF0SW5kZXgodW5zaWduZWQgaW5kZXgpLgorCisgICAgICAgICogRHVtcFJlbmRl clRyZWUvbWFjL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRNYWMubW06CisgICAgICAgIChBY2Nlc3Np YmlsaXR5VUlFbGVtZW50OjphcmlhQ29udHJvbHNFbGVtZW50QXRJbmRleCk6CisgICAgICAgIChB Y2Nlc3NpYmlsaXR5VUlFbGVtZW50OjpkaXNjbG9zZWRSb3dBdEluZGV4KToKKyAgICAgICAgKiBX ZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL21hYy9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50 TWFjLm1tOgorICAgICAgICAoV1RSOjpBY2Nlc3NpYmlsaXR5VUlFbGVtZW50OjphcmlhQ29udHJv bHNFbGVtZW50QXRJbmRleCk6CisKIDIwMTUtMDgtMjUgIE5hbiBXYW5nICA8bl93YW5nQGFwcGxl LmNvbT4KIAogICAgICAgICBbTWFjXSBhY2Nlc3NpYmlsaXR5L2RvY3VtZW50LWF0dHJpYnV0ZXMu aHRtbCBmYWlscwpJbmRleDogVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0FjY2Vzc2liaWxpdHlV SUVsZW1lbnRNYWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0Fj Y2Vzc2liaWxpdHlVSUVsZW1lbnRNYWMubW0JKHJldmlzaW9uIDE4ODkzNCkKKysrIFRvb2xzL0R1 bXBSZW5kZXJUcmVlL21hYy9BY2Nlc3NpYmlsaXR5VUlFbGVtZW50TWFjLm1tCSh3b3JraW5nIGNv cHkpCkBAIC0zOTUsOCArMzk1LDEzIEBAIEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQgQWNjZXNzaWJp bGl0eVVJRWwKIAogQWNjZXNzaWJpbGl0eVVJRWxlbWVudCBBY2Nlc3NpYmlsaXR5VUlFbGVtZW50 OjphcmlhQ29udHJvbHNFbGVtZW50QXRJbmRleCh1bnNpZ25lZCBpbmRleCkKIHsKLSAgICAvLyBG SVhNRTogaW1wbGVtZW50Ci0gICAgcmV0dXJuIDA7CisgICAgQkVHSU5fQVhfT0JKQ19FWENFUFRJ T05TCisgICAgTlNBcnJheSogYXJpYUNvbnRyb2xzID0gW21fZWxlbWVudCBhY2Nlc3NpYmlsaXR5 QXR0cmlidXRlVmFsdWU6QCJBWEFSSUFDb250cm9scyJdOworICAgIGlmIChpbmRleCA8IFthcmlh Q29udHJvbHMgY291bnRdKQorICAgICAgICByZXR1cm4gW2FyaWFDb250cm9scyBvYmplY3RBdElu ZGV4OmluZGV4XTsKKyAgICBFTkRfQVhfT0JKQ19FWENFUFRJT05TCisgICAgCisgICAgcmV0dXJu IG51bGxwdHI7CiB9CiAKIEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQgQWNjZXNzaWJpbGl0eVVJRWxl bWVudDo6ZGlzY2xvc2VkUm93QXRJbmRleCh1bnNpZ25lZCBpbmRleCkKSW5kZXg6IFRvb2xzL1dl YktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvbWFjL0FjY2Vzc2liaWxpdHlVSUVsZW1lbnRN YWMubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRs ZS9tYWMvQWNjZXNzaWJpbGl0eVVJRWxlbWVudE1hYy5tbQkocmV2aXNpb24gMTg4OTM0KQorKysg VG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9tYWMvQWNjZXNzaWJpbGl0eVVJ RWxlbWVudE1hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtNDU4LDcgKzQ1OCwxMSBAQCBQYXNzUmVm UHRyPEFjY2Vzc2liaWxpdHlVSUVsZW1lbnQ+IEFjY2VzCiAKIFBhc3NSZWZQdHI8QWNjZXNzaWJp bGl0eVVJRWxlbWVudD4gQWNjZXNzaWJpbGl0eVVJRWxlbWVudDo6YXJpYUNvbnRyb2xzRWxlbWVu dEF0SW5kZXgodW5zaWduZWQgaW5kZXgpCiB7Ci0gICAgLy8gRklYTUU6IGltcGxlbWVudAorICAg IEJFR0lOX0FYX09CSkNfRVhDRVBUSU9OUworICAgIE5TQXJyYXkqIGFyaWFDb250cm9scyA9IFtt X2VsZW1lbnQgYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVZhbHVlOkAiQVhBUklBQ29udHJvbHMiXTsK KyAgICBpZiAoaW5kZXggPCBbYXJpYUNvbnRyb2xzIGNvdW50XSkKKyAgICAgICAgcmV0dXJuIEFj Y2Vzc2liaWxpdHlVSUVsZW1lbnQ6OmNyZWF0ZShbYXJpYUNvbnRyb2xzIG9iamVjdEF0SW5kZXg6 aW5kZXhdKTsKKyAgICBFTkRfQVhfT0JKQ19FWENFUFRJT05TCiAgICAgcmV0dXJuIG51bGxwdHI7 CiB9CiAKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRU ZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4ODkzNCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisyMDE1LTA4LTI1ICBOYW4gV2FuZyAg PG5fd2FuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEVuYWJsZSBhY2Nlc3NpYmlsaXR5L2Fy aWEtY29udHJvbHMuaHRtbCB0ZXN0IGZvciBtYWMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE0ODQ1OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9hcmlhLWNvbnRyb2xzLmh0bWw6 CisgICAgICAgICogcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnM6CisgICAgICAgICogcGxh dGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvYXJpYS1jb250cm9scy1leHBlY3RlZC50eHQ6IEFkZGVk LgorCiAyMDE1LTA4LTI1ICBOYW4gV2FuZyAgPG5fd2FuZ0BhcHBsZS5jb20+CiAKICAgICAgICAg W01hY10gYWNjZXNzaWJpbGl0eS9kb2N1bWVudC1hdHRyaWJ1dGVzLmh0bWwgZmFpbHMKSW5kZXg6 IExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1jb250cm9scy5odG1sCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIExheW91dFRlc3RzL2FjY2Vzc2liaWxpdHkvYXJpYS1jb250cm9scy5odG1sCShyZXZpc2lv biAxODg5MzQpCisrKyBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L2FyaWEtY29udHJvbHMuaHRt bAkod29ya2luZyBjb3B5KQpAQCAtMjIsOCArMjIsMTMgQEAKICAgICAgICAgdmFyIHRhYmxpc3Qg PSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxlRWxlbWVudEJ5SWQoInRhYmxpc3Qi KTsKICAgICAgICAgdmFyIHRhYjEgPSB0YWJsaXN0LmNoaWxkQXRJbmRleCgwKTsKIAotICAgICAg ICBzaG91bGRCZSgidGFiMS5hcmlhQ29udHJvbHNFbGVtZW50QXRJbmRleCgwKS5zdHJpbmdWYWx1 ZSIsICInQVhWYWx1ZTogUGFuZWwgMSciKTsKLSAgICAgICAgc2hvdWxkQmUoInRhYjEuYXJpYUNv bnRyb2xzRWxlbWVudEF0SW5kZXgoMSkuc3RyaW5nVmFsdWUiLCAiJ0FYVmFsdWU6IFBhbmVsIDIn Iik7CisgICAgICAgIGlmIChhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5wbGF0Zm9ybU5hbWUgPT0g Im1hYyIpIHsKKyAgICAgICAgICAgIHNob3VsZEJlKCJ0YWIxLmFyaWFDb250cm9sc0VsZW1lbnRB dEluZGV4KDApLmNoaWxkQXRJbmRleCgwKS5zdHJpbmdWYWx1ZSIsICInQVhWYWx1ZTogUGFuZWwg MSciKTsKKyAgICAgICAgICAgIHNob3VsZEJlKCJ0YWIxLmFyaWFDb250cm9sc0VsZW1lbnRBdElu ZGV4KDEpLmNoaWxkQXRJbmRleCgwKS5zdHJpbmdWYWx1ZSIsICInQVhWYWx1ZTogUGFuZWwgMici KTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIHNob3VsZEJlKCJ0YWIxLmFyaWFDb250 cm9sc0VsZW1lbnRBdEluZGV4KDApLnN0cmluZ1ZhbHVlIiwgIidBWFZhbHVlOiBQYW5lbCAxJyIp OworICAgICAgICAgICAgc2hvdWxkQmUoInRhYjEuYXJpYUNvbnRyb2xzRWxlbWVudEF0SW5kZXgo MSkuc3RyaW5nVmFsdWUiLCAiJ0FYVmFsdWU6IFBhbmVsIDInIik7CisgICAgICAgIH0KICAgICB9 CiAKIDwvc2NyaXB0PgpJbmRleDogTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3Rh dGlvbnMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3Rh dGlvbnMJKHJldmlzaW9uIDE4ODkzNCkKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9UZXN0 RXhwZWN0YXRpb25zCSh3b3JraW5nIGNvcHkpCkBAIC00Nyw5ICs0Nyw2IEBAIGFjY2Vzc2liaWxp dHkvbXVsdGlzZWxlY3QtbGlzdC1yZXBvcnRzLWEKICMgTWlzc2luZyBpbXBsZW1lbnRhdGlvbiBv ZiBzb21lIGZ1bmN0aW9ucyBpbiBtYWMuCiB3ZWJraXQub3JnL2IvMTI5MDM5IGFjY2Vzc2liaWxp dHkvc2VsZWN0LWVsZW1lbnQtYXQtaW5kZXguaHRtbCBbIFNraXAgXQogCi0jIGFyaWFDb250cm9s c0VsZW1lbnRBdEluZGV4IGlzIG5vdCBpbXBsZW1lbnRlZCBpbiBtYWMKLXdlYmtpdC5vcmcvYi8x Mjc5MDggYWNjZXNzaWJpbGl0eS9hcmlhLWNvbnRyb2xzLmh0bWwgWyBTa2lwIF0KLQogIyBOZWVk IHRvIGFkZCBmdW5jdGlvbmFsaXR5IHRvIER1bXBSZW5kZXJUcmVlIHRvIGhhbmRsZSBlcnJvciBw YWdlcwogZmFzdC9oaXN0b3J5L2JhY2stZm9yd2FyZC1yZXNldC1hZnRlci1lcnJvci1oYW5kbGlu Zy5odG1sCiAKSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2Fy aWEtY29udHJvbHMtZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRm b3JtL21hYy9hY2Nlc3NpYmlsaXR5L2FyaWEtY29udHJvbHMtZXhwZWN0ZWQudHh0CShyZXZpc2lv biAwKQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvYXJpYS1jb250 cm9scy1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwxMyBAQAorUGFuZWwg MQorUGFuZWwgMgorVGhpcyB0ZXN0cyB0aGF0IGFyaWEtY29udHJvbHMgcmV0dXJucyBjb3JyZWN0 IGVsZW1lbnQgYXQgdGhlIGdpdmVuIGluZGV4CisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBh IHNlcmllcyBvZiAiUEFTUyIgbWVzc2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4K KworCitQQVNTIHRhYjEuYXJpYUNvbnRyb2xzRWxlbWVudEF0SW5kZXgoMCkuY2hpbGRBdEluZGV4 KDApLnN0cmluZ1ZhbHVlIGlzICdBWFZhbHVlOiBQYW5lbCAxJworUEFTUyB0YWIxLmFyaWFDb250 cm9sc0VsZW1lbnRBdEluZGV4KDEpLmNoaWxkQXRJbmRleCgwKS5zdHJpbmdWYWx1ZSBpcyAnQVhW YWx1ZTogUGFuZWwgMicKK1BBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBD T01QTEVURQorCg==