148313 2015-08-21 10:40:56 -0700 AX: Fix accessibility/mac/search-with-frames.html test 2015-08-24 18:48:37 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 n_wang webkit-unassigned aboxhall apinheiro cfleizach commit-queue dmazzoni jcraig jdiggs mario n_wang samuel_white thorton webkit-bug-importer oldest_to_newest 1119800 0 n_wang 2015-08-21 10:40:56 -0700 The test is marked Pass/Failure in TestExpectation file. 1119807 1 259632 n_wang 2015-08-21 10:46:42 -0700 Created attachment 259632 patch 1119880 2 259632 commit-queue 2015-08-21 13:00:59 -0700 Comment on attachment 259632 patch Clearing flags on attachment: 259632 Committed r188770: <http://trac.webkit.org/changeset/188770> 1119881 3 commit-queue 2015-08-21 13:01:02 -0700 All reviewed patches have been landed. Closing bug. 1119995 4 ap 2015-08-21 16:43:48 -0700 The test is still failing, although not as frequently as before. It should be marked as flaky again. 1119996 5 thorton 2015-08-21 16:47:05 -0700 I remarked it in http://trac.webkit.org/changeset/188800 1119997 6 n_wang 2015-08-21 16:48:02 -0700 (In reply to comment #4) > The test is still failing, although not as frequently as before. It should > be marked as flaky again. I'll investigate. 1120471 7 259795 n_wang 2015-08-24 17:19:16 -0700 Created attachment 259795 patch 1120478 8 259795 cfleizach 2015-08-24 17:53:21 -0700 Comment on attachment 259795 patch View in context: https://bugs.webkit.org/attachment.cgi?id=259795&action=review > LayoutTests/accessibility/mac/search-with-frames.html:42 > + if(ifrm.name == "frame1a") need a space after if and before ( i would also rename ifrm -> "iframe" just for clarity > LayoutTests/accessibility/mac/search-with-frames.html:44 > + else if(ifrm.name == "frame2a") ditto about spacing > LayoutTests/accessibility/mac/search-with-frames.html:49 > + // call runTest() when all frames have been loaded make this a full sentence "Call runTest... have been loaded." 1120479 9 259799 n_wang 2015-08-24 17:59:03 -0700 Created attachment 259799 patch 1120491 10 259799 commit-queue 2015-08-24 18:48:32 -0700 Comment on attachment 259799 patch Clearing flags on attachment: 259799 Committed r188901: <http://trac.webkit.org/changeset/188901> 1120492 11 commit-queue 2015-08-24 18:48:37 -0700 All reviewed patches have been landed. Closing bug. 259632 2015-08-21 10:46:42 -0700 2015-08-24 17:19:16 -0700 patch patch.txt text/plain 4745 n_wang SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE4ODc1NykKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE1LTA4LTIxICBOYW4gV2FuZyAgPG5fd2Fu Z0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEZpeCBhY2Nlc3NpYmlsaXR5L21hYy9zZWFyY2gt d2l0aC1mcmFtZXMuaHRtbCB0ZXN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNDgzMTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICB1aUVsZW1lbnRGb3JTZWFyY2hQcmVkaWNhdGUgZnVuY3Rpb24gbmVlZHMg Zml2ZSBwYXJhbWV0ZXJzIGZvciBEdW1wUmVuZGVyVHJlZS4KKworICAgICAgICAqIGFjY2Vzc2li aWxpdHkvbWFjL3NlYXJjaC13aXRoLWZyYW1lcy5odG1sOgorICAgICAgICAqIHBsYXRmb3JtL21h Yy9UZXN0RXhwZWN0YXRpb25zOgorCiAyMDE1LTA4LTIwICBCcmlhbiBCdXJnICA8YmJ1cmdAYXBw bGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IGFkZCBhIHJlZ3Jlc3Npb24gdGVzdCBm b3IgdGhlIGZpeCBpbnRyb2R1Y2VkIGluIHIxODg2NzkKSW5kZXg6IExheW91dFRlc3RzL2FjY2Vz c2liaWxpdHkvbWFjL3NlYXJjaC13aXRoLWZyYW1lcy5odG1sCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91 dFRlc3RzL2FjY2Vzc2liaWxpdHkvbWFjL3NlYXJjaC13aXRoLWZyYW1lcy5odG1sCShyZXZpc2lv biAxODg3MDQpCisrKyBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L21hYy9zZWFyY2gtd2l0aC1m cmFtZXMuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtNDUsNyArNDUsOCBAQCB2YXIgc3VjY2Vzc2Z1 bGx5UGFyc2VkID0gZmFsc2U7CiAgICAgICAgICAgdGhpcy5jb250ZW50RG9jdW1lbnQuY2hpbGRO b2Rlc1swXS5jaGlsZE5vZGVzWzFdLmFwcGVuZENoaWxkKGlmcm0pOyAKICAgICAgICAgICBpZiAo ZS50YXJnZXQuaWQgPT0gImZyYW1lMyIpIHsKICAgICAgICAgICAgICBpZnJtLm9ubG9hZCA9IGZ1 bmN0aW9uKCkgewotICAgICAgICAgICAgICAgICBydW5UZXN0KCk7CisgICAgICAgICAgICAgICAg IC8vIHJ1blRlc3QoKSBtaWdodCBydW4gb24gdGhlIHNhbWUgY2FsbCBzdGFjayBhbmQgdGhlIGZy YW1lIGlzIG5vdCBhY3R1YWxseSBmaW5pc2hlZCBsb2FkaW5nLgorICAgICAgICAgICAgICAgICBz ZXRUaW1lb3V0KCJydW5UZXN0KCkiLCAwKTsKICAgICAgICAgICAgICB9OwogICAgICAgICAgIH0K ICAgICAgICB9OwpAQCAtNjUsMzYgKzY2LDM2IEBAIGZ1bmN0aW9uIHJ1blRlc3QoKSB7CiAKICAg ICAgICAgLy8gU2VhcmNoIGZvciB0aGUgYnV0dG9ucy4gVGhpcyB0ZXN0cyBzZWFyY2hpbmcgdGhy b3VnaCB0aGUgZnJhbWVzLgogICAgICAgICBzZWFyY2hLZXkgPSAiQVhCdXR0b25TZWFyY2hLZXki OwotICAgICAgICByZXN1bHRFbGVtZW50ID0gYm9keS51aUVsZW1lbnRGb3JTZWFyY2hQcmVkaWNh dGUoIiIsIHRydWUsIHNlYXJjaEtleSwgIiIpOworICAgICAgICByZXN1bHRFbGVtZW50ID0gYm9k eS51aUVsZW1lbnRGb3JTZWFyY2hQcmVkaWNhdGUoIiIsIHRydWUsIHNlYXJjaEtleSwgIiIsIGZh bHNlKTsKICAgICAgICAgc2hvdWxkQmUoInJlc3VsdEVsZW1lbnQucm9sZSIsICInQVhSb2xlOiBB WEJ1dHRvbiciKTsKICAgICAgICAgc2hvdWxkQmUoInJlc3VsdEVsZW1lbnQudGl0bGUiLCAiJ0FY VGl0bGU6IGJ1dHRvbjEnIik7CiAKLSAgICAgICAgcmVzdWx0RWxlbWVudCA9IGJvZHkudWlFbGVt ZW50Rm9yU2VhcmNoUHJlZGljYXRlKHJlc3VsdEVsZW1lbnQsIHRydWUsIHNlYXJjaEtleSwgIiIp OworICAgICAgICByZXN1bHRFbGVtZW50ID0gYm9keS51aUVsZW1lbnRGb3JTZWFyY2hQcmVkaWNh dGUocmVzdWx0RWxlbWVudCwgdHJ1ZSwgc2VhcmNoS2V5LCAiIiwgZmFsc2UpOwogICAgICAgICBz aG91bGRCZSgicmVzdWx0RWxlbWVudC5yb2xlIiwgIidBWFJvbGU6IEFYQnV0dG9uJyIpOwogICAg ICAgICBzaG91bGRCZSgicmVzdWx0RWxlbWVudC50aXRsZSIsICInQVhUaXRsZTogYnV0dG9uMici KTsKIAotICAgICAgICByZXN1bHRFbGVtZW50ID0gYm9keS51aUVsZW1lbnRGb3JTZWFyY2hQcmVk aWNhdGUocmVzdWx0RWxlbWVudCwgdHJ1ZSwgc2VhcmNoS2V5LCAiIik7CisgICAgICAgIHJlc3Vs dEVsZW1lbnQgPSBib2R5LnVpRWxlbWVudEZvclNlYXJjaFByZWRpY2F0ZShyZXN1bHRFbGVtZW50 LCB0cnVlLCBzZWFyY2hLZXksICIiLCBmYWxzZSk7CiAgICAgICAgIHNob3VsZEJlKCJyZXN1bHRF bGVtZW50LnJvbGUiLCAiJ0FYUm9sZTogQVhCdXR0b24nIik7CiAgICAgICAgIHNob3VsZEJlKCJy ZXN1bHRFbGVtZW50LnRpdGxlIiwgIidBWFRpdGxlOiBidXR0b24zJyIpOwogCiAgICAgICAgIC8v IE5vdyBzZWFyY2ggYmFja3dhcmRzLgotICAgICAgICByZXN1bHRFbGVtZW50ID0gYm9keS51aUVs ZW1lbnRGb3JTZWFyY2hQcmVkaWNhdGUocmVzdWx0RWxlbWVudCwgZmFsc2UsIHNlYXJjaEtleSwg IiIpOworICAgICAgICByZXN1bHRFbGVtZW50ID0gYm9keS51aUVsZW1lbnRGb3JTZWFyY2hQcmVk aWNhdGUocmVzdWx0RWxlbWVudCwgZmFsc2UsIHNlYXJjaEtleSwgIiIsIGZhbHNlKTsKICAgICAg ICAgc2hvdWxkQmUoInJlc3VsdEVsZW1lbnQucm9sZSIsICInQVhSb2xlOiBBWEJ1dHRvbiciKTsK ICAgICAgICAgc2hvdWxkQmUoInJlc3VsdEVsZW1lbnQudGl0bGUiLCAiJ0FYVGl0bGU6IGJ1dHRv bjInIik7CiAKICAgICAgICAgLy8gU2VhcmNoIGZvciB0aGUgZnJhbWVzLiBGaXJzdCBvbmUgaXMg ZnJhbWUxCiAgICAgICAgIHNlYXJjaEtleSA9ICJBWEZyYW1lU2VhcmNoS2V5IjsKLSAgICAgICAg cmVzdWx0RWxlbWVudCA9IGJvZHkudWlFbGVtZW50Rm9yU2VhcmNoUHJlZGljYXRlKCIiLCB0cnVl LCBzZWFyY2hLZXksICIiKTsKKyAgICAgICAgcmVzdWx0RWxlbWVudCA9IGJvZHkudWlFbGVtZW50 Rm9yU2VhcmNoUHJlZGljYXRlKCIiLCB0cnVlLCBzZWFyY2hLZXksICIiLCBmYWxzZSk7CiAgICAg ICAgIHNob3VsZEJlKCJyZXN1bHRFbGVtZW50LnJvbGUiLCAiJ0FYUm9sZTogQVhXZWJBcmVhJyIp OwogICAgICAgICBzaG91bGRCZSgicmVzdWx0RWxlbWVudC5kZXNjcmlwdGlvbiIsICInQVhEZXNj cmlwdGlvbjogZnJhbWUxJyIpOwogCiAgICAgICAgIC8vIE5leHQgd2Ugc2hvdWxkIGZpbmQgdGhl IGZyYW1lIGluc2lkZSBvZiBmcmFtZTEuCi0gICAgICAgIHJlc3VsdEVsZW1lbnQgPSBib2R5LnVp RWxlbWVudEZvclNlYXJjaFByZWRpY2F0ZShyZXN1bHRFbGVtZW50LCB0cnVlLCBzZWFyY2hLZXks ICIiKTsKKyAgICAgICAgcmVzdWx0RWxlbWVudCA9IGJvZHkudWlFbGVtZW50Rm9yU2VhcmNoUHJl ZGljYXRlKHJlc3VsdEVsZW1lbnQsIHRydWUsIHNlYXJjaEtleSwgIiIsIGZhbHNlKTsKICAgICAg ICAgc2hvdWxkQmUoInJlc3VsdEVsZW1lbnQucm9sZSIsICInQVhSb2xlOiBBWFdlYkFyZWEnIik7 CiAgICAgICAgIHNob3VsZEJlKCJyZXN1bHRFbGVtZW50LmRlc2NyaXB0aW9uIiwgIidBWERlc2Ny aXB0aW9uOiBmcmFtZTFhJyIpOwogCiAgICAgICAgIC8vIFRoZW4gd2Ugc2hvdWxkIGZpbmQgdGhl IGZyYW1lIGFmdGVyIGZyYW1lMS4KLSAgICAgICAgcmVzdWx0RWxlbWVudCA9IGJvZHkudWlFbGVt ZW50Rm9yU2VhcmNoUHJlZGljYXRlKHJlc3VsdEVsZW1lbnQsIHRydWUsIHNlYXJjaEtleSwgIiIp OworICAgICAgICByZXN1bHRFbGVtZW50ID0gYm9keS51aUVsZW1lbnRGb3JTZWFyY2hQcmVkaWNh dGUocmVzdWx0RWxlbWVudCwgdHJ1ZSwgc2VhcmNoS2V5LCAiIiwgZmFsc2UpOwogICAgICAgICBz aG91bGRCZSgicmVzdWx0RWxlbWVudC5yb2xlIiwgIidBWFJvbGU6IEFYV2ViQXJlYSciKTsKICAg ICAgICAgc2hvdWxkQmUoInJlc3VsdEVsZW1lbnQuZGVzY3JpcHRpb24iLCAiJ0FYRGVzY3JpcHRp b246IGZyYW1lMiciKTsKICAgICB9CkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvVGVz dEV4cGVjdGF0aW9ucwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvVGVz dEV4cGVjdGF0aW9ucwkocmV2aXNpb24gMTg4NzIyKQorKysgTGF5b3V0VGVzdHMvcGxhdGZvcm0v bWFjL1Rlc3RFeHBlY3RhdGlvbnMJKHdvcmtpbmcgY29weSkKQEAgLTQ5MSw4ICs0OTEsNiBAQCB3 ZWJraXQub3JnL2IvOTY4Mjggd2ViZ2wvMS4wLjIvY29uZm9ybWFuCiBodHRwL3Rlc3RzL21pc2Mv d2lsbENhY2hlUmVzcG9uc2UtZGVsZWdhdGUtY2FsbGJhY2suaHRtbCBbIEZhaWx1cmUgXQogaHR0 cC90ZXN0cy94bWxodHRwcmVxdWVzdC9iYXNpYy1hdXRoLW5vcGFzc3dvcmQuaHRtbCBbIEZhaWx1 cmUgXQogCi1hY2Nlc3NpYmlsaXR5L21hYy9zZWFyY2gtd2l0aC1mcmFtZXMuaHRtbCBbIFBhc3Mg RmFpbHVyZSBdCi0KICMgLS0tIFBsdWdpbnMgLS0tCiAjIFdlYktpdDEgT09QIHBsdWctaW5zOiBD YW4ndCBldmFsdWF0ZSBKYXZhU2NyaXB0IGZyb20gTlBQX0Rlc3Ryb3kuCiBwbHVnaW5zL2RvY3Vt ZW50LW9wZW4uaHRtbAo= 259795 2015-08-24 17:19:16 -0700 2015-08-24 17:59:03 -0700 patch patch.txt text/plain 3277 n_wang SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE4ODg5NykKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE1LTA4LTI0ICBOYW4gV2FuZyAgPG5fd2Fu Z0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEZpeCBhY2Nlc3NpYmlsaXR5L21hYy9zZWFyY2gt d2l0aC1mcmFtZXMuaHRtbCB0ZXN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNDgzMTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBGaXhlZCB0aGUgdGVzdCBieSBtYWtpbmcgc3VyZSB0aGF0IHNlYXJjaCBp cyBwZXJmb3JtZWQgYWZ0ZXIgYWxsIGZyYW1lcworICAgICAgICBoYXZlIGJlZW4gbG9hZGVkLgor CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9tYWMvc2VhcmNoLXdpdGgtZnJhbWVzLmh0bWw6Cisg ICAgICAgICogcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIwMTUtMDgtMjQgIEJy aWFuIEJ1cmcgIDxiYnVyZ0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogYWRk IHByb3RvY29sIHRlc3QgZm9yIGV4aXN0aW5nIGVycm9yIGhhbmRsaW5nIHBlcmZvcm1lZCBieSB0 aGUgYmFja2VuZApJbmRleDogTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9tYWMvc2VhcmNoLXdp dGgtZnJhbWVzLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9t YWMvc2VhcmNoLXdpdGgtZnJhbWVzLmh0bWwJKHJldmlzaW9uIDE4ODg4MSkKKysrIExheW91dFRl c3RzL2FjY2Vzc2liaWxpdHkvbWFjL3NlYXJjaC13aXRoLWZyYW1lcy5odG1sCSh3b3JraW5nIGNv cHkpCkBAIC0yNSw2ICsyNSwxMCBAQCB2YXIgc3VjY2Vzc2Z1bGx5UGFyc2VkID0gZmFsc2U7CiAK IDwvc2NyaXB0PgogPHNjcmlwdD4KKyAgIHZhciBmcmFtZTFhTG9hZGVkID0gZmFsc2U7CisgICB2 YXIgZnJhbWUyYUxvYWRlZCA9IGZhbHNlOworICAgdmFyIGZyYW1lM2FMb2FkZWQgPSBmYWxzZTsK KyAgIAogICAgZm9yICh2YXIgayA9IDE7IGsgPD0gMzsgaysrKSB7CiAKICAgICAgIC8vIFRoaXMg YmxvY2sgYWRkcyBzdWIgZnJhbWVzIHRvIGVhY2ggb2YgdGhlIGZyYW1lcywgd2l0aCBzb21lIGNv bnRlbnQgaW4gdGhlbS4gCkBAIC0zNCw2ICszOCwxOSBAQCB2YXIgc3VjY2Vzc2Z1bGx5UGFyc2Vk ID0gZmFsc2U7CiAgICAgICAgICAgdmFyIGlmcm0gPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJp ZnJhbWUiKTsgCiAgICAgICAgICAgaWZybS5zZXRBdHRyaWJ1dGUoIm5hbWUiLCBlLnRhcmdldC5p ZCArICJhIik7CiAKKyAgICAgICAgICBpZnJtLm9ubG9hZCA9IGZ1bmN0aW9uKCkgeworICAgICAg ICAgICAgICBpZihpZnJtLm5hbWUgPT0gImZyYW1lMWEiKQorICAgICAgICAgICAgICAgICAgZnJh bWUxYUxvYWRlZCA9IHRydWU7CisgICAgICAgICAgICAgIGVsc2UgaWYoaWZybS5uYW1lID09ICJm cmFtZTJhIikKKyAgICAgICAgICAgICAgICAgIGZyYW1lMmFMb2FkZWQgPSB0cnVlOworICAgICAg ICAgICAgICBlbHNlIGlmKGlmcm0ubmFtZSA9PSAiZnJhbWUzYSIpCisgICAgICAgICAgICAgICAg ICBmcmFtZTNhTG9hZGVkID0gdHJ1ZTsKKyAgICAgICAgICAgICAgCisgICAgICAgICAgICAgIC8v IGNhbGwgcnVuVGVzdCgpIHdoZW4gYWxsIGZyYW1lcyBoYXZlIGJlZW4gbG9hZGVkCisgICAgICAg ICAgICAgIGlmIChmcmFtZTFhTG9hZGVkICYmIGZyYW1lMmFMb2FkZWQgJiYgZnJhbWUzYUxvYWRl ZCkKKyAgICAgICAgICAgICAgICAgIHJ1blRlc3QoKTsKKyAgICAgICAgICB9OworCiAgICAgICAg ICAgaWYgKGUudGFyZ2V0LmlkID09ICJmcmFtZTIiKSB7CiAgICAgICAgICAgICAgIGlmcm0uc2V0 QXR0cmlidXRlKCJzcmMiLCAiZGF0YTp0ZXh0L2h0bWwsPGJvZHk+PGJ1dHRvbiBpZD1idXR0b24y PmJ1dHRvbjI8L2J1dHRvbj48L2JvZHk+Iik7IAogICAgICAgICAgIH0gZWxzZSB7CkBAIC00Mywx MiArNjAsNiBAQCB2YXIgc3VjY2Vzc2Z1bGx5UGFyc2VkID0gZmFsc2U7CiAgICAgICAgICAgaWZy bS5zdHlsZS53aWR0aCA9ICIyMDAiOyAKICAgICAgICAgICBpZnJtLnN0eWxlLmhlaWdodCA9ICIy MDAiOyAKICAgICAgICAgICB0aGlzLmNvbnRlbnREb2N1bWVudC5jaGlsZE5vZGVzWzBdLmNoaWxk Tm9kZXNbMV0uYXBwZW5kQ2hpbGQoaWZybSk7IAotICAgICAgICAgIGlmIChlLnRhcmdldC5pZCA9 PSAiZnJhbWUzIikgewotICAgICAgICAgICAgIGlmcm0ub25sb2FkID0gZnVuY3Rpb24oKSB7Ci0g ICAgICAgICAgICAgICAgIC8vIHJ1blRlc3QoKSBtaWdodCBydW4gb24gdGhlIHNhbWUgY2FsbCBz dGFjayBhbmQgdGhlIGZyYW1lIGlzIG5vdCBhY3R1YWxseSBmaW5pc2hlZCBsb2FkaW5nLgotICAg ICAgICAgICAgICAgICBzZXRUaW1lb3V0KCJydW5UZXN0KCkiLCAwKTsKLSAgICAgICAgICAgICB9 OwotICAgICAgICAgIH0KICAgICAgICB9OwogICAgIH0KIApJbmRleDogTGF5b3V0VGVzdHMvcGxh dGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxh dGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnMJKHJldmlzaW9uIDE4ODg4MSkKKysrIExheW91dFRl c3RzL3BsYXRmb3JtL21hYy9UZXN0RXhwZWN0YXRpb25zCSh3b3JraW5nIGNvcHkpCkBAIC00ODUs OCArNDg1LDYgQEAgd2Via2l0Lm9yZy9iLzk2ODI4IHdlYmdsLzEuMC4yL2NvbmZvcm1hbgogaHR0 cC90ZXN0cy9taXNjL3dpbGxDYWNoZVJlc3BvbnNlLWRlbGVnYXRlLWNhbGxiYWNrLmh0bWwgWyBG YWlsdXJlIF0KIGh0dHAvdGVzdHMveG1saHR0cHJlcXVlc3QvYmFzaWMtYXV0aC1ub3Bhc3N3b3Jk Lmh0bWwgWyBGYWlsdXJlIF0KIAotYWNjZXNzaWJpbGl0eS9tYWMvc2VhcmNoLXdpdGgtZnJhbWVz Lmh0bWwgWyBQYXNzIEZhaWx1cmUgXSAKLQogIyAtLS0gUGx1Z2lucyAtLS0KICMgV2ViS2l0MSBP T1AgcGx1Zy1pbnM6IENhbid0IGV2YWx1YXRlIEphdmFTY3JpcHQgZnJvbSBOUFBfRGVzdHJveS4K IHBsdWdpbnMvZG9jdW1lbnQtb3Blbi5odG1sCg== 259799 2015-08-24 17:59:03 -0700 2015-08-24 18:48:32 -0700 patch patch.txt text/plain 3878 n_wang SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDE4ODg5NykKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDE1LTA4LTI0ICBOYW4gV2FuZyAgPG5fd2Fu Z0BhcHBsZS5jb20+CisKKyAgICAgICAgQVg6IEZpeCBhY2Nlc3NpYmlsaXR5L21hYy9zZWFyY2gt d2l0aC1mcmFtZXMuaHRtbCB0ZXN0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNDgzMTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBGaXhlZCB0aGUgdGVzdCBieSBtYWtpbmcgc3VyZSB0aGF0IHNlYXJjaCBp cyBwZXJmb3JtZWQgYWZ0ZXIgYWxsIGZyYW1lcworICAgICAgICBoYXZlIGJlZW4gbG9hZGVkLgor CisgICAgICAgICogYWNjZXNzaWJpbGl0eS9tYWMvc2VhcmNoLXdpdGgtZnJhbWVzLmh0bWw6Cisg ICAgICAgICogcGxhdGZvcm0vbWFjL1Rlc3RFeHBlY3RhdGlvbnM6CisKIDIwMTUtMDgtMjQgIEJy aWFuIEJ1cmcgIDxiYnVyZ0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogYWRk IHByb3RvY29sIHRlc3QgZm9yIGV4aXN0aW5nIGVycm9yIGhhbmRsaW5nIHBlcmZvcm1lZCBieSB0 aGUgYmFja2VuZApJbmRleDogTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9tYWMvc2VhcmNoLXdp dGgtZnJhbWVzLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS9t YWMvc2VhcmNoLXdpdGgtZnJhbWVzLmh0bWwJKHJldmlzaW9uIDE4ODg4MSkKKysrIExheW91dFRl c3RzL2FjY2Vzc2liaWxpdHkvbWFjL3NlYXJjaC13aXRoLWZyYW1lcy5odG1sCSh3b3JraW5nIGNv cHkpCkBAIC0yNSwzMCArMjUsNDEgQEAgdmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IGZhbHNlOwog CiA8L3NjcmlwdD4KIDxzY3JpcHQ+CisgICB2YXIgZnJhbWUxYUxvYWRlZCA9IGZhbHNlOworICAg dmFyIGZyYW1lMmFMb2FkZWQgPSBmYWxzZTsKKyAgIHZhciBmcmFtZTNhTG9hZGVkID0gZmFsc2U7 CisgICAKICAgIGZvciAodmFyIGsgPSAxOyBrIDw9IDM7IGsrKykgewogCiAgICAgICAvLyBUaGlz IGJsb2NrIGFkZHMgc3ViIGZyYW1lcyB0byBlYWNoIG9mIHRoZSBmcmFtZXMsIHdpdGggc29tZSBj b250ZW50IGluIHRoZW0uIAogICAgICAgLy8gV2hlbiB0aGUgbGFzdCBmcmFtZSBsb2FkcywgaXQg cnVucyB0aGUgdGVzdC4KIAogICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImZyYW1lIiAr IGspLm9ubG9hZCA9IGZ1bmN0aW9uKGUpIHsgCi0gICAgICAgICAgdmFyIGlmcm0gPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJpZnJhbWUiKTsgCi0gICAgICAgICAgaWZybS5zZXRBdHRyaWJ1dGUo Im5hbWUiLCBlLnRhcmdldC5pZCArICJhIik7CisgICAgICAgICAgdmFyIGlmcmFtZSA9IGRvY3Vt ZW50LmNyZWF0ZUVsZW1lbnQoImlmcmFtZSIpOyAKKyAgICAgICAgICBpZnJhbWUuc2V0QXR0cmli dXRlKCJuYW1lIiwgZS50YXJnZXQuaWQgKyAiYSIpOworCisgICAgICAgICAgaWZyYW1lLm9ubG9h ZCA9IGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgICBpZiAoaWZyYW1lLm5hbWUgPT0gImZyYW1l MWEiKQorICAgICAgICAgICAgICAgICAgZnJhbWUxYUxvYWRlZCA9IHRydWU7CisgICAgICAgICAg ICAgIGVsc2UgaWYgKGlmcmFtZS5uYW1lID09ICJmcmFtZTJhIikKKyAgICAgICAgICAgICAgICAg IGZyYW1lMmFMb2FkZWQgPSB0cnVlOworICAgICAgICAgICAgICBlbHNlIGlmIChpZnJhbWUubmFt ZSA9PSAiZnJhbWUzYSIpCisgICAgICAgICAgICAgICAgICBmcmFtZTNhTG9hZGVkID0gdHJ1ZTsK KyAgICAgICAgICAgICAgCisgICAgICAgICAgICAgIC8vIENhbGwgcnVuVGVzdCgpIHdoZW4gYWxs IGZyYW1lcyBoYXZlIGJlZW4gbG9hZGVkLgorICAgICAgICAgICAgICBpZiAoZnJhbWUxYUxvYWRl ZCAmJiBmcmFtZTJhTG9hZGVkICYmIGZyYW1lM2FMb2FkZWQpCisgICAgICAgICAgICAgICAgICBy dW5UZXN0KCk7CisgICAgICAgICAgfTsKIAogICAgICAgICAgIGlmIChlLnRhcmdldC5pZCA9PSAi ZnJhbWUyIikgewotICAgICAgICAgICAgICBpZnJtLnNldEF0dHJpYnV0ZSgic3JjIiwgImRhdGE6 dGV4dC9odG1sLDxib2R5PjxidXR0b24gaWQ9YnV0dG9uMj5idXR0b24yPC9idXR0b24+PC9ib2R5 PiIpOyAKKyAgICAgICAgICAgICAgaWZyYW1lLnNldEF0dHJpYnV0ZSgic3JjIiwgImRhdGE6dGV4 dC9odG1sLDxib2R5PjxidXR0b24gaWQ9YnV0dG9uMj5idXR0b24yPC9idXR0b24+PC9ib2R5PiIp OyAKICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICBpZnJtLnNldEF0dHJpYnV0ZSgi c3JjIiwgImRhdGE6dGV4dC9odG1sLDxib2R5PnRleHQ8L2JvZHk+Iik7IAorICAgICAgICAgICAg ICBpZnJhbWUuc2V0QXR0cmlidXRlKCJzcmMiLCAiZGF0YTp0ZXh0L2h0bWwsPGJvZHk+dGV4dDwv Ym9keT4iKTsgCiAgICAgICAgICAgfQogCi0gICAgICAgICAgaWZybS5zdHlsZS53aWR0aCA9ICIy MDAiOyAKLSAgICAgICAgICBpZnJtLnN0eWxlLmhlaWdodCA9ICIyMDAiOyAKLSAgICAgICAgICB0 aGlzLmNvbnRlbnREb2N1bWVudC5jaGlsZE5vZGVzWzBdLmNoaWxkTm9kZXNbMV0uYXBwZW5kQ2hp bGQoaWZybSk7IAotICAgICAgICAgIGlmIChlLnRhcmdldC5pZCA9PSAiZnJhbWUzIikgewotICAg ICAgICAgICAgIGlmcm0ub25sb2FkID0gZnVuY3Rpb24oKSB7Ci0gICAgICAgICAgICAgICAgIC8v IHJ1blRlc3QoKSBtaWdodCBydW4gb24gdGhlIHNhbWUgY2FsbCBzdGFjayBhbmQgdGhlIGZyYW1l IGlzIG5vdCBhY3R1YWxseSBmaW5pc2hlZCBsb2FkaW5nLgotICAgICAgICAgICAgICAgICBzZXRU aW1lb3V0KCJydW5UZXN0KCkiLCAwKTsKLSAgICAgICAgICAgICB9OwotICAgICAgICAgIH0KKyAg ICAgICAgICBpZnJhbWUuc3R5bGUud2lkdGggPSAiMjAwIjsgCisgICAgICAgICAgaWZyYW1lLnN0 eWxlLmhlaWdodCA9ICIyMDAiOyAKKyAgICAgICAgICB0aGlzLmNvbnRlbnREb2N1bWVudC5jaGls ZE5vZGVzWzBdLmNoaWxkTm9kZXNbMV0uYXBwZW5kQ2hpbGQoaWZyYW1lKTsgCiAgICAgICAgfTsK ICAgICB9CiAKSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9UZXN0RXhwZWN0YXRpb25z Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9UZXN0RXhwZWN0YXRpb25z CShyZXZpc2lvbiAxODg4ODEpCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvVGVzdEV4cGVj dGF0aW9ucwkod29ya2luZyBjb3B5KQpAQCAtNDg1LDggKzQ4NSw2IEBAIHdlYmtpdC5vcmcvYi85 NjgyOCB3ZWJnbC8xLjAuMi9jb25mb3JtYW4KIGh0dHAvdGVzdHMvbWlzYy93aWxsQ2FjaGVSZXNw b25zZS1kZWxlZ2F0ZS1jYWxsYmFjay5odG1sIFsgRmFpbHVyZSBdCiBodHRwL3Rlc3RzL3htbGh0 dHByZXF1ZXN0L2Jhc2ljLWF1dGgtbm9wYXNzd29yZC5odG1sIFsgRmFpbHVyZSBdCiAKLWFjY2Vz c2liaWxpdHkvbWFjL3NlYXJjaC13aXRoLWZyYW1lcy5odG1sIFsgUGFzcyBGYWlsdXJlIF0gCi0K ICMgLS0tIFBsdWdpbnMgLS0tCiAjIFdlYktpdDEgT09QIHBsdWctaW5zOiBDYW4ndCBldmFsdWF0 ZSBKYXZhU2NyaXB0IGZyb20gTlBQX0Rlc3Ryb3kuCiBwbHVnaW5zL2RvY3VtZW50LW9wZW4uaHRt bAo=