68038 2011-09-13 16:06:56 -0700 Media element tests should look up controller element locations 2011-09-14 15:44:07 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 68034 1 eric.carlson eric.carlson abarth dglazkov webkit.review.bot oldest_to_newest 466639 0 eric.carlson 2011-09-13 16:06:56 -0700 Some media element layout tests still make assumptions about the location of the default controls. They should not. 466670 1 107255 eric.carlson 2011-09-13 16:35:25 -0700 Created attachment 107255 Proposed patch. 466678 2 eric.carlson 2011-09-13 16:38:47 -0700 <rdar://problem/7499935> 466770 3 107255 webkit.review.bot 2011-09-13 18:40:42 -0700 Comment on attachment 107255 Proposed patch. Attachment 107255 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/9654395 New failing tests: platform/chromium/fast/text/text-stroke-with-border.html media/controls-drag-timebar.html scrollbars/disabled-scrollbar.html printing/return-from-printing-mode.html media/controls-right-click-on-timebar.html scrollbars/listbox-scrollbar-combinations.html platform/mac-snowleopard/platform/mac/fast/text/international/Geeza-Pro-vertical-metrics-adjustment.html scrollbars/overflow-scrollbar-combinations.html scrollbars/basic-scrollbar.html media/audio-delete-while-slider-thumb-clicked.html 466791 4 eric.carlson 2011-09-13 19:58:57 -0700 (In reply to comment #3) > (From update of attachment 107255 [details]) > Attachment 107255 [details] did not pass chromium-ews (chromium-xvfb): > Output: http://queues.webkit.org/results/9654395 > > New failing tests: > platform/chromium/fast/text/text-stroke-with-border.html > media/controls-drag-timebar.html > scrollbars/disabled-scrollbar.html > printing/return-from-printing-mode.html > media/controls-right-click-on-timebar.html > scrollbars/listbox-scrollbar-combinations.html > platform/mac-snowleopard/platform/mac/fast/text/international/Geeza-Pro-vertical-metrics-adjustment.html > scrollbars/overflow-scrollbar-combinations.html > scrollbars/basic-scrollbar.html > media/audio-delete-while-slider-thumb-clicked.html I call BS on most of these "new failing tests", it isn't possible for changes in html files in LayoutTests/media/ to break tests in other directories. The warnings about media/controls-right-click-on-timebar.html and media/audio-delete-while-slider-thumb-clicked.htm are legitimate because they won't work without https://bugs.webkit.org/show_bug.cgi?id=68034. 466844 5 abarth 2011-09-13 22:29:46 -0700 > I call BS on most of these "new failing tests" Thanks. We probably have a problem where we're reporting failures that occur even without your patch. 467429 6 eric.carlson 2011-09-14 15:44:07 -0700 http://trac.webkit.org/changeset/95133 107255 2011-09-13 16:35:25 -0700 2011-09-13 18:40:42 -0700 Proposed patch. patch_2.txt text/plain 10716 eric.carlson SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDk1MDU1KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDktMTMgIEVyaWMgQ2FybHNvbiAgPGVy aWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgTWVkaWEgZWxlbWVudCB0ZXN0cyBzaG91 bGQgbG9vayB1cCBjb250cm9sbGVyIGVsZW1lbnQgbG9jYXRpb25zCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02ODAzOAorCisgICAgICAgIEdldCB0aGUg cG9zaXRpb24gb2YgY29udHJvbGxlciBlbGVtZW50cyBmcm9tIHRoZSBzaGFkb3cgRE9NLgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogbWVkaWEvYXVk aW8tZGVsZXRlLXdoaWxlLXNsaWRlci10aHVtYi1jbGlja2VkLmh0bWw6CisgICAgICAgICogbWVk aWEvYXVkaW8tZGVsZXRlLXdoaWxlLXN0ZXAtYnV0dG9uLWNsaWNrZWQuaHRtbDoKKyAgICAgICAg KiBtZWRpYS9jb250cm9scy1kcmFnLXRpbWViYXIuaHRtbDoKKyAgICAgICAgKiBtZWRpYS9jb250 cm9scy1yaWdodC1jbGljay1vbi10aW1lYmFyLmh0bWw6CisgICAgICAgICogbWVkaWEvdmlkZW8t Y29udHJvbHMtdHJhbnNmb3JtZWQuaHRtbDoKKyAgICAgICAgKiBtZWRpYS92aWRlby1jb250cm9s cy12aXNpYmxlLWF1ZGlvLW9ubHkuaHRtbDoKKyAgICAgICAgKiBtZWRpYS92aWRlby1jb250cm9s cy16b29tZWQuaHRtbDoKKyAgICAgICAgKiBtZWRpYS92aWRlby12b2x1bWUtc2xpZGVyLmh0bWw6 CisKIDIwMTEtMDgtMTEgIENyaXMgTmVja2FyICA8Y2RuQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBUZXN0IGZvciBjcmFzaCB3aGVuIHJlcGFyZW50aW5nIHRhYmxlIGVsZW1lbnRzIHdpdGggYXNz b2NpYXRlZCBjb3VudGVycyBvdXRzaWRlIHRoZSB0YWJsZS4KSW5kZXg6IExheW91dFRlc3RzL21l ZGlhL2F1ZGlvLWRlbGV0ZS13aGlsZS1zbGlkZXItdGh1bWItY2xpY2tlZC5odG1sCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIExheW91dFRlc3RzL21lZGlhL2F1ZGlvLWRlbGV0ZS13aGlsZS1zbGlkZXItdGh1bWIt Y2xpY2tlZC5odG1sCShyZXZpc2lvbiA5NDc2MSkKKysrIExheW91dFRlc3RzL21lZGlhL2F1ZGlv LWRlbGV0ZS13aGlsZS1zbGlkZXItdGh1bWItY2xpY2tlZC5odG1sCSh3b3JraW5nIGNvcHkpCkBA IC0yLDYgKzIsOCBAQAogPGh0bWw+CiAgICAgPGhlYWQ+CiAgICAgICAgIDxzY3JpcHQgc3JjPW1l ZGlhLWZpbGUuanM+PC9zY3JpcHQ+CisgICAgICAgIDxzY3JpcHQgc3JjPXZpZGVvLXRlc3QuanM+ PC9zY3JpcHQ+CisgICAgICAgIDxzY3JpcHQgc3JjPW1lZGlhLWNvbnRyb2xzLmpzPjwvc2NyaXB0 PgogICAgICAgICA8c2NyaXB0PgogICAgICAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29u dHJvbGxlcikgewogICAgICAgICAgICAgICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1Rl eHQoKTsKQEAgLTM2LDcgKzM4LDYgQEAKICAgICAgICAgICAgICAgICBpZiAoIWF1ZGlvKQogICAg ICAgICAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgICAgICAgICAvLyBkZWxldGUgdGhl IHNlYXJjaAogICAgICAgICAgICAgICAgIGxvZygiPGJyPmRlbGV0aW5nIGF1ZGlvIGVsZW1lbnQi KTsKICAgICAgICAgICAgICAgICBhdWRpby5wYXJlbnROb2RlLnJlbW92ZUNoaWxkKGF1ZGlvKTsK IApAQCAtNTIsMTkgKzUzLDIzIEBACiAgICAgICAgICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xs ZXIud2FpdFVudGlsRG9uZSgpOwogCiAgICAgICAgICAgICAgICAgdmFyIGF1ZGlvID0gZG9jdW1l bnQuZ2V0RWxlbWVudEJ5SWQoJ2F1ZGlvJyk7CisgICAgICAgICAgICAgICAgdmFyIHNlZWtDb29y ZHM7CisgICAgICAgICAgICAgICAgdHJ5IHsKKyAgICAgICAgICAgICAgICAgICAgc2Vla0Nvb3Jk cyA9IG1lZGlhQ29udHJvbHNCdXR0b25Db29yZGluYXRlcyhhdWRpbywgInRpbWVsaW5lIik7Cisg ICAgICAgICAgICAgICAgfSBjYXRjaCAoZXhjZXB0aW9uKSB7CisgICAgICAgICAgICAgICAgICAg IGZhaWxUZXN0KGV4Y2VwdGlvbi5kZXNjcmlwdGlvbik7CisgICAgICAgICAgICAgICAgICAgIHJl dHVybjsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgdmFyIHggPSBzZWVrQ29v cmRzWzBdOworICAgICAgICAgICAgICAgIHZhciB5ID0gc2Vla0Nvb3Jkc1sxXTsKIAotICAgICAg ICAgICAgICAgIHZhciBjZW50ZXIgPSBhdWRpby5vZmZzZXRMZWZ0ICsgKGF1ZGlvLm9mZnNldFdp ZHRoIC8gMik7Ci0gICAgICAgICAgICAgICAgdmFyIG1pZGRsZSA9IGF1ZGlvLm9mZnNldFRvcCAr IChhdWRpby5vZmZzZXRIZWlnaHQgLyAyKTsKLSAgICAgICAgICAgICAgICAKLSAgICAgICAgICAg ICAgICB2YXIgeCA9IGNlbnRlciArIDE2ICsgMTYgKyA4OwotICAgICAgICAgICAgICAgIHZhciB5 ID0gbWlkZGxlOwotCi0gICAgICAgICAgICAgICAgLy8gZHJhZyBzbGlkZXIsIGxlYXZlIHRoZSBt b3VzZSBkb3duCisgICAgICAgICAgICAgICAgLy8gQ2xpY2sgaW4gdGhlIHNsaWRlciB0byBnZXQg dGhlIHRodW1iIHVuZGVyIHRoZSBtb3VzZS4KICAgICAgICAgICAgICAgICBsb2coImNsaWNraW5n IGluIGNvbnRyb2xsZXIiKTsKICAgICAgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVU byh4LCB5KTsKICAgICAgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZURvd24oKTsKICAgICAg ICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVVwKCk7CiAKKyAgICAgICAgICAgICAgICAvLyBD bGljayBzbGlkZXIgdG8gc2NydWIsIGxlYXZlIHRoZSBtb3VzZSBkb3duLgogICAgICAgICAgICAg ICAgIGxvZygiY2xpY2tpbmcgb24gdGh1bWIiKTsKICAgICAgICAgICAgICAgICBldmVudFNlbmRl ci5tb3VzZURvd24oKTsKICAgICAgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyh4 LCB5ICsgMjApOwpJbmRleDogTGF5b3V0VGVzdHMvbWVkaWEvYXVkaW8tZGVsZXRlLXdoaWxlLXN0 ZXAtYnV0dG9uLWNsaWNrZWQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9tZWRpYS9h dWRpby1kZWxldGUtd2hpbGUtc3RlcC1idXR0b24tY2xpY2tlZC5odG1sCShyZXZpc2lvbiA5NDc2 MSkKKysrIExheW91dFRlc3RzL21lZGlhL2F1ZGlvLWRlbGV0ZS13aGlsZS1zdGVwLWJ1dHRvbi1j bGlja2VkLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTUzLDEwICs1MywxMiBAQAogCiAgICAgICAg ICAgICAgICAgdmFyIGF1ZGlvID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ2F1ZGlvJyk7CiAK LSAgICAgICAgICAgICAgICB0cnkgewotICAgICAgICAgICAgICAgICAgICB2YXIgc2Vla0Nvb3Jk cyA9IG1lZGlhQ29udHJvbHNCdXR0b25Db29yZGluYXRlcyhhdWRpbywgInNlZWstZm9yd2FyZC1i dXR0b24iKTsKLSAgICAgICAgICAgICAgICB9IGNhdGNoIChleGNlcHRpb24pIHsKKyAgICAgICAg ICAgICAgICB2YXIgc2Vla0Nvb3JkcworICAgICAgICAgICAgICAgIHRyeQorICAgICAgICAgICAg ICAgICAgICBzZWVrQ29vcmRzID0gbWVkaWFDb250cm9sc0J1dHRvbkNvb3JkaW5hdGVzKGF1ZGlv LCAic2Vlay1mb3J3YXJkLWJ1dHRvbiIpOworICAgICAgICAgICAgICAgIGNhdGNoIChleGNlcHRp b24pIHsKICAgICAgICAgICAgICAgICAgICAgZmFpbFRlc3QoZXhjZXB0aW9uLmRlc2NyaXB0aW9u KTsKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgICAgIH0KICAgICAg ICAgICAgICAgICB2YXIgeCA9IHNlZWtDb29yZHNbMF07CiAgICAgICAgICAgICAgICAgdmFyIHkg PSBzZWVrQ29vcmRzWzFdOwpJbmRleDogTGF5b3V0VGVzdHMvbWVkaWEvY29udHJvbHMtZHJhZy10 aW1lYmFyLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvbWVkaWEvY29udHJvbHMtZHJh Zy10aW1lYmFyLmh0bWwJKHJldmlzaW9uIDk0NzYxKQorKysgTGF5b3V0VGVzdHMvbWVkaWEvY29u dHJvbHMtZHJhZy10aW1lYmFyLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTIsNiArMiw3IEBACiA8 aHRtbD4KICAgICA8aGVhZD4KICAgICAgICAgPHRpdGxlPmRyYWcgdGltZWJhciB0ZXN0PC90aXRs ZT4KKyAgICAgICAgPHNjcmlwdCBzcmM9bWVkaWEtY29udHJvbHMuanM+PC9zY3JpcHQ+CiAgICAg ICAgIDxzY3JpcHQgc3JjPW1lZGlhLWZpbGUuanM+PC9zY3JpcHQ+CiAgICAgICAgIDxzY3JpcHQg c3JjPXZpZGVvLXRlc3QuanM+PC9zY3JpcHQ+CiAgICAgICAgIDxzY3JpcHQ+CkBAIC0xOSw4ICsy MCwxNiBAQAogICAgICAgICAgICAgICAgIG1vdmVDb3VudCA9IDA7CiAKICAgICAgICAgICAgICAg ICBpZiAod2luZG93LmV2ZW50U2VuZGVyKSB7Ci0gICAgICAgICAgICAgICAgICAgIHggPSB2aWRl by5vZmZzZXRMZWZ0ICsgKHZpZGVvLm9mZnNldFdpZHRoIC8gMik7Ci0gICAgICAgICAgICAgICAg ICAgIHkgPSB2aWRlby5vZmZzZXRUb3AgKyB2aWRlby5vZmZzZXRIZWlnaHQgLSAxMDsKKworICAg ICAgICAgICAgICAgICAgICB2YXIgc2Vla0Nvb3JkczsKKyAgICAgICAgICAgICAgICAgICAgdHJ5 IHsKKyAgICAgICAgICAgICAgICAgICAgICAgIHNlZWtDb29yZHMgPSBtZWRpYUNvbnRyb2xzQnV0 dG9uQ29vcmRpbmF0ZXModmlkZW8sICJ0aW1lbGluZSIpOworICAgICAgICAgICAgICAgICAgICB9 IGNhdGNoIChleGNlcHRpb24pIHsKKyAgICAgICAgICAgICAgICAgICAgICAgIGZhaWxUZXN0KGV4 Y2VwdGlvbi5kZXNjcmlwdGlvbik7CisgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm47Cisg ICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgeCA9IHNlZWtDb29yZHNb MF07CisgICAgICAgICAgICAgICAgICAgIHkgPSBzZWVrQ29vcmRzWzFdOwogCiAgICAgICAgICAg ICAgICAgICAgIGV2ZW50U2VuZGVyLmRyYWdNb2RlID0gZmFsc2U7CiAgICAgICAgICAgICAgICAg ICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHgsIHkpOwpAQCAtNDIsMTcgKzUxLDIwIEBACiAg ICAgICAgICAgICAgICAgaWYgKHdpbmRvdy5ldmVudFNlbmRlcikgewogICAgICAgICAgICAgICAg ICAgICB4ICs9IGRlbHRhOwogICAgICAgICAgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZU1v dmVUbyh4LCB5KTsKLSAgICAgICAgICAgICAgICAgICAgd2luZG93LnNldFRpbWVvdXQoIm1vdmUo KSIsIDEwMCk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQogCiAgICAgICAgICAg ICBmdW5jdGlvbiBzZWVrZWQoKQogICAgICAgICAgICAgewotICAgICAgICAgICAgICAgIGlmICgr K3NlZWtDb3VudCA9PSA2KSB7Ci0gICAgICAgICAgICAgICAgICAgIGlmICh3aW5kb3cuZXZlbnRT ZW5kZXIpCi0gICAgICAgICAgICAgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZVVwKCk7Ci0g ICAgICAgICAgICAgICAgICAgIGVuZFRlc3QoKTsKKyAgICAgICAgICAgICAgICArK3NlZWtDb3Vu dDsKKyAgICAgICAgICAgICAgICBpZiAoc2Vla0NvdW50IDwgNikgeworICAgICAgICAgICAgICAg ICAgICB3aW5kb3cuc2V0VGltZW91dCgibW92ZSgpIiwgMTAwKTsKKyAgICAgICAgICAgICAgICAg ICAgcmV0dXJuOwogICAgICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgICAgIGlmICh3aW5k b3cuZXZlbnRTZW5kZXIpCisgICAgICAgICAgICAgICAgICAgIGV2ZW50U2VuZGVyLm1vdXNlVXAo KTsKKyAgICAgICAgICAgICAgICBlbmRUZXN0KCk7CiAgICAgICAgICAgICB9CiAKICAgICAgICAg ICAgIGZ1bmN0aW9uIHN0YXJ0KCkKSW5kZXg6IExheW91dFRlc3RzL21lZGlhL2NvbnRyb2xzLXJp Z2h0LWNsaWNrLW9uLXRpbWViYXIuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9tZWRp YS9jb250cm9scy1yaWdodC1jbGljay1vbi10aW1lYmFyLmh0bWwJKHJldmlzaW9uIDk0NzYxKQor KysgTGF5b3V0VGVzdHMvbWVkaWEvY29udHJvbHMtcmlnaHQtY2xpY2stb24tdGltZWJhci5odG1s CSh3b3JraW5nIGNvcHkpCkBAIC0xLDYgKzEsNyBAQAogPGh0bWw+CiAgICAgPGhlYWQ+CiAgICAg ICAgIDx0aXRsZT5yaWdodCBjbGljayBvbiB0aW1lYmFyIHRlc3Q8L3RpdGxlPgorICAgICAgICA8 c2NyaXB0IHNyYz1tZWRpYS1jb250cm9scy5qcz48L3NjcmlwdD4KICAgICAgICAgPHNjcmlwdCBz cmM9bWVkaWEtZmlsZS5qcz48L3NjcmlwdD4KICAgICAgICAgPHNjcmlwdCBzcmM9dmlkZW8tdGVz dC5qcz48L3NjcmlwdD4KICAgICAgICAgPHNjcmlwdD4KQEAgLTEwLDggKzExLDE2IEBACiAgICAg ICAgICAgICBmdW5jdGlvbiBjbGljaygpCiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAg aWYgKHdpbmRvdy5ldmVudFNlbmRlcikgewotICAgICAgICAgICAgICAgICAgICB2YXIgeCA9IHZp ZGVvLm9mZnNldExlZnQgKyB2aWRlby5vZmZzZXRXaWR0aCAvIDI7Ci0gICAgICAgICAgICAgICAg ICAgIHZhciB5ID0gdmlkZW8ub2Zmc2V0VG9wICsgdmlkZW8ub2Zmc2V0SGVpZ2h0IC0gMTA7Cisg ICAgICAgICAgICAgICAgICAgIHZhciBzZWVrQ29vcmRzOworICAgICAgICAgICAgICAgICAgICB0 cnkgeworICAgICAgICAgICAgICAgICAgICAgICAgc2Vla0Nvb3JkcyA9IG1lZGlhQ29udHJvbHNC dXR0b25Db29yZGluYXRlcyh2aWRlbywgInRpbWVsaW5lIik7CisgICAgICAgICAgICAgICAgICAg IH0gY2F0Y2ggKGV4Y2VwdGlvbikgeworICAgICAgICAgICAgICAgICAgICAgICAgZmFpbFRlc3Qo ZXhjZXB0aW9uLmRlc2NyaXB0aW9uKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgICAgICB2YXIgeCA9IHNlZWtD b29yZHNbMF07CisgICAgICAgICAgICAgICAgICAgIHZhciB5ID0gc2Vla0Nvb3Jkc1sxXTsKKwog ICAgICAgICAgICAgICAgICAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyh4LCB5KTsKICAgICAg ICAgICAgICAgICAgICAgZXZlbnRTZW5kZXIuY29udGV4dENsaWNrKCk7CiAgICAgICAgICAgICAg ICAgfQpJbmRleDogTGF5b3V0VGVzdHMvbWVkaWEvdmlkZW8tY29udHJvbHMtdHJhbnNmb3JtZWQu aHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9tZWRpYS92aWRlby1jb250cm9scy10cmFu c2Zvcm1lZC5odG1sCShyZXZpc2lvbiA5NDc2MSkKKysrIExheW91dFRlc3RzL21lZGlhL3ZpZGVv LWNvbnRyb2xzLXRyYW5zZm9ybWVkLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTIwLDEwICsyMCwx MiBAQAogICAgICAgICB3YWl0Rm9yRXZlbnQoJ2NhbnBsYXl0aHJvdWdoJywgZnVuY3Rpb24gKCkg ewogICAgICAgICAgICAgaWYgKHdpbmRvdy5ldmVudFNlbmRlcikgewogICAgICAgICAgICAgICAg IC8vIEZpbmQgdGhlIHBsYXkgYnV0dG9uIGFuZCBjbGljayB0aGUgbWlkZGxlIG9mIGl0cyBib3Vu ZGluZyBib3guCisgICAgICAgICAgICAgICAgdmFyIHBsYXlDb29yZHM7CiAgICAgICAgICAgICAg ICAgdHJ5IHsKLSAgICAgICAgICAgICAgICAgICAgdmFyIHBsYXlDb29yZHMgPSBtZWRpYUNvbnRy b2xzQnV0dG9uQ29vcmRpbmF0ZXModmlkZW8sICJwbGF5LWJ1dHRvbiIpOworICAgICAgICAgICAg ICAgICAgICBwbGF5Q29vcmRzID0gbWVkaWFDb250cm9sc0J1dHRvbkNvb3JkaW5hdGVzKHZpZGVv LCAicGxheS1idXR0b24iKTsKICAgICAgICAgICAgICAgICB9IGNhdGNoIChleGNlcHRpb24pIHsK ICAgICAgICAgICAgICAgICAgICAgZmFpbFRlc3QoZXhjZXB0aW9uLmRlc2NyaXB0aW9uKTsKKyAg ICAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAg ICAgICB2YXIgY2xpY2tYID0gcGxheUNvb3Jkc1swXTsKICAgICAgICAgICAgICAgICB2YXIgY2xp Y2tZID0gcGxheUNvb3Jkc1sxXTsKSW5kZXg6IExheW91dFRlc3RzL21lZGlhL3ZpZGVvLWNvbnRy b2xzLXZpc2libGUtYXVkaW8tb25seS5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL21l ZGlhL3ZpZGVvLWNvbnRyb2xzLXZpc2libGUtYXVkaW8tb25seS5odG1sCShyZXZpc2lvbiA5NDc2 MSkKKysrIExheW91dFRlc3RzL21lZGlhL3ZpZGVvLWNvbnRyb2xzLXZpc2libGUtYXVkaW8tb25s eS5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC0zOCwxMSArMzgsMTMgQEAKICAgICAgICAgICAgICAg ICAgICAgcmV0dXJuOwogCiAgICAgICAgICAgICAgICAgLy8gc3RhcnQgcGxheWJhY2sKKyAgICAg ICAgICAgICAgICB2YXIgcGxheUNvb3JkcwogICAgICAgICAgICAgICAgIHRyeSB7Ci0gICAgICAg ICAgICAgICAgICAgIHZhciBwbGF5Q29vcmRzID0gbWVkaWFDb250cm9sc0J1dHRvbkNvb3JkaW5h dGVzKHZpZGVvLCAicGxheS1idXR0b24iKTsKKyAgICAgICAgICAgICAgICAgICAgcGxheUNvb3Jk cyA9IG1lZGlhQ29udHJvbHNCdXR0b25Db29yZGluYXRlcyh2aWRlbywgInBsYXktYnV0dG9uIik7 CiAgICAgICAgICAgICAgICAgfSBjYXRjaCAoZXhjZXB0aW9uKSB7CiAgICAgICAgICAgICAgICAg ICAgIGNvbnNvbGVXcml0ZShleGNlcHRpb24uZGVzY3JpcHRpb24pOwogICAgICAgICAgICAgICAg ICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25lKCk7CisgICAgICAgICAgICAgICAg ICAgIHJldHVybjsKICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgdmFyIGNsaWNr WCA9IHBsYXlDb29yZHNbMF07CiAgICAgICAgICAgICAgICAgdmFyIGNsaWNrWSA9IHBsYXlDb29y ZHNbMV07CkluZGV4OiBMYXlvdXRUZXN0cy9tZWRpYS92aWRlby1jb250cm9scy16b29tZWQuaHRt bAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9tZWRpYS92aWRlby1jb250cm9scy16b29tZWQu aHRtbAkocmV2aXNpb24gOTQ3NjEpCisrKyBMYXlvdXRUZXN0cy9tZWRpYS92aWRlby1jb250cm9s cy16b29tZWQuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMjEsMTAgKzIxLDEyIEBACiAgICAgICAg IGlmICh3aW5kb3cuZXZlbnRTZW5kZXIpCiAgICAgICAgIHsKICAgICAgICAgICAgIC8vIEZpbmQg dGhlIHBsYXkgYnV0dG9uIGFuZCBjbGljayB0aGUgbWlkZGxlIG9mIGl0cyBib3VuZGluZyBib3gu CisgICAgICAgICAgICB2YXIgcGxheUNvb3JkczsKICAgICAgICAgICAgIHRyeSB7Ci0gICAgICAg ICAgICAgICAgdmFyIHBsYXlDb29yZHMgPSBtZWRpYUNvbnRyb2xzQnV0dG9uQ29vcmRpbmF0ZXMo dmlkZW8sICJwbGF5LWJ1dHRvbiIpOworICAgICAgICAgICAgICAgIHBsYXlDb29yZHMgPSBtZWRp YUNvbnRyb2xzQnV0dG9uQ29vcmRpbmF0ZXModmlkZW8sICJwbGF5LWJ1dHRvbiIpOwogICAgICAg ICAgICAgfSBjYXRjaCAoZXhjZXB0aW9uKSB7CiAgICAgICAgICAgICAgICAgZmFpbFRlc3QoZXhj ZXB0aW9uLmRlc2NyaXB0aW9uKTsKKyAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAg ICB9CiAgICAgICAgICAgICB2YXIgY2xpY2tYID0gcGxheUNvb3Jkc1swXTsKICAgICAgICAgICAg IHZhciBjbGlja1kgPSBwbGF5Q29vcmRzWzFdOwpJbmRleDogTGF5b3V0VGVzdHMvbWVkaWEvdmlk ZW8tdm9sdW1lLXNsaWRlci5odG1sCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL21lZGlhL3Zp ZGVvLXZvbHVtZS1zbGlkZXIuaHRtbAkocmV2aXNpb24gOTQ3NjEpCisrKyBMYXlvdXRUZXN0cy9t ZWRpYS92aWRlby12b2x1bWUtc2xpZGVyLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTIwLDEwICsy MCwxMiBAQAogICAgICAgICAgICAgdmlkZW8udm9sdW1lID0gMC43OwogCiAgICAgICAgICAgICBp ZiAod2luZG93LmV2ZW50U2VuZGVyKSB7CisgICAgICAgICAgICAgICAgdmFyIG11dGVDb29yZHM7 CiAgICAgICAgICAgICAgICAgdHJ5IHsKICAgICAgICAgICAgICAgICAgICAgbXV0ZUNvb3JkcyA9 IG1lZGlhQ29udHJvbHNCdXR0b25Db29yZGluYXRlcyh2aWRlbywgIm11dGUtYnV0dG9uIik7CiAg ICAgICAgICAgICAgICAgfSBjYXRjaCAoZXhjZXB0aW9uKSB7CiAgICAgICAgICAgICAgICAgICAg IGxheW91dFRlc3RDb250cm9sbGVyLm5vdGlmeURvbmUoKTsKKyAgICAgICAgICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgICAgICBldmVudFNlbmRlci5t b3VzZU1vdmVUbyhtdXRlQ29vcmRzWzBdLCBtdXRlQ29vcmRzWzFdKTsKICAgICAgICAgICAgIH0K