139469 2014-12-09 19:16:55 -0800 Simple line layout: Add 16bit support. 2014-12-12 03:49:22 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan commit-queue esprehn+autocc glenn koivisto kondapallykalyan mmaxfield oldest_to_newest 1054023 0 zalan 2014-12-09 19:16:55 -0800 16bit support was temporarily removed at bug 138796. 1054340 1 243077 zalan 2014-12-10 16:12:27 -0800 Created attachment 243077 Patch 1054399 2 zalan 2014-12-10 20:40:02 -0800 rdar://problem/19210121 1054492 3 243077 koivisto 2014-12-11 08:37:08 -0800 Comment on attachment 243077 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243077&action=review r=me > Source/WebCore/rendering/SimpleLineLayoutFlowContents.h:84 > + template <typename CharacterType> > float runWidth(const String&, unsigned from, unsigned to, float xPosition) const; could put this on the same line 1054571 4 243077 mmaxfield 2014-12-11 12:04:03 -0800 Comment on attachment 243077 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=243077&action=review > Source/WebCore/rendering/SimpleLineLayoutFlowContents.cpp:137 > + runWidth<UChar>(segment->text, from - segment->start, fragmentEnd - segment->start, xPosition + textWidth); Yuck. 1054586 5 243139 zalan 2014-12-11 12:40:48 -0800 Created attachment 243139 Patch 1054806 6 243139 commit-queue 2014-12-12 03:49:17 -0800 Comment on attachment 243139 Patch Clearing flags on attachment: 243139 Committed r177219: <http://trac.webkit.org/changeset/177219> 1054807 7 commit-queue 2014-12-12 03:49:22 -0800 All reviewed patches have been landed. Closing bug. 243077 2014-12-10 16:12:27 -0800 2014-12-11 12:40:46 -0800 Patch bug-139469-20141210161309.patch text/plain 11624 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3MDU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzliOTU4ZTdiNzNmNGY1 MWNlOGRjMzNlOTg0N2EyNzAzZDQ1ZmVhNi4uNmQxZDBmYzllMjFiZWU1ZmMxZDM4MGQ0MjhkMzJk MTBkZjZkZDk2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTEyLTEwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxlIGxpbmUgbGF5b3V0 OiBBZGQgMTZiaXQgc3VwcG9ydC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzOTQ2OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoaXMgcGF0Y2ggYWRkcyB0aGUgMTZiaXQgc3VwcG9ydCB0byBzaW1wbGUg bGluZSBsYXlvdXQuCisKKyAgICAgICAgVGVzdDogZmFzdC9pbmxpbmUvc2ltcGxlLWxpbmUtbGF5 b3V0LTE2Yml0LWNvbnRlbnQuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1NpbXBsZUxpbmVM YXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6Y2FuVXNlRm9y KToKKyAgICAgICAgKiByZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZsb3dDb250ZW50cy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0OjpuZXh0QnJlYWthYmxlUG9zaXRp b24pOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6Rmxvd0NvbnRlbnRzOjpm aW5kTmV4dEJyZWFrYWJsZVBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVM YXlvdXQ6OmZpbmROZXh0Tm9uV2hpdGVzcGFjZSk6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVM aW5lTGF5b3V0OjpGbG93Q29udGVudHM6OmZpbmROZXh0Tm9uV2hpdGVzcGFjZVBvc2l0aW9uKToK KyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OkZsb3dDb250ZW50czo6dGV4dFdp ZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OkZsb3dDb250ZW50czo6 cnVuV2lkdGgpOgorICAgICAgICAqIHJlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0Rmxvd0NvbnRl bnRzLmg6CisgICAgICAgICogcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNvbHZlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0OjpSdW5SZXNvbHZlcjo6UnVuOjp0 ZXh0KToKKwogMjAxNC0xMi0wOCAgUGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5j b20+CiAKICAgICAgICAgW0dTdHJlYW1lcl0gQXVkaW9Tb3VyY2VQcm92aWRlciBzdXBwb3J0IGlu IHRoZSBNZWRpYVBsYXllcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Np bXBsZUxpbmVMYXlvdXQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVM YXlvdXQuY3BwCmluZGV4IDIzNTkxMzI2NzNjZmNlZThlMmIwOGI3NTMzNDc1NGYwOWU0ODBmYTku LmM5ZTM4M2RmYWVhMWRmNThmZjY4Mjc0M2I2MmNhYTA4NjkzZTU4MzggMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dC5jcHAKQEAgLTk3LDcgKzk3LDcgQEAg Ym9vbCBjYW5Vc2VGb3IoY29uc3QgUmVuZGVyQmxvY2tGbG93JiBmbG93KQogICAgIC8vIFRoaXMg Y3VycmVudGx5IGNvdmVycyA8YmxvY2tmbG93PiN0ZXh0PC9ibG9ja2Zsb3c+IGFuZCBtdXRpcGxl IChzaWJsaW5nKSBSZW5kZXJUZXh0IGNhc2VzLgogICAgIC8vIFRoZSA8YmxvY2tmbG93Pjxpbmxp bmU+I3RleHQ8L2lubGluZT48L2Jsb2NrZmxvdz4gY2FzZSBpcyBhbHNvIHBvcHVsYXIgYW5kIHNo b3VsZCBiZSByZWxhdGl2ZWx5IGVhc3kgdG8gY292ZXIuCiAgICAgZm9yIChjb25zdCBhdXRvJiBy ZW5kZXJlciA6IGNoaWxkcmVuT2ZUeXBlPFJlbmRlck9iamVjdD4oZmxvdykpIHsKLSAgICAgICAg aWYgKCFpczxSZW5kZXJUZXh0PihyZW5kZXJlcikgfHwgIWRvd25jYXN0PFJlbmRlclRleHQ+KHJl bmRlcmVyKS50ZXh0KCktPmlzOEJpdCgpKQorICAgICAgICBpZiAoIWlzPFJlbmRlclRleHQ+KHJl bmRlcmVyKSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAgICAgaWYgKCFmbG93 LmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZsb3dDb250ZW50cy5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZsb3dDb250ZW50cy5jcHAKaW5kZXggMTk1ZWRl ZjM0N2JmMTc0NWVlYWQ3MDJmZWVkMzY4OTcxMWQ1MjQ1My4uNGMwMzFkYzM3YjBiZWM0MjU2YmY3 Y2EzN2M4NGZiMTUzN2ZiM2JjOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1NpbXBsZUxpbmVMYXlvdXRGbG93Q29udGVudHMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0Rmxvd0NvbnRlbnRzLmNwcApAQCAtNjYsNiArNjYsMTUg QEAgRmxvd0NvbnRlbnRzOjpGbG93Q29udGVudHMoY29uc3QgUmVuZGVyQmxvY2tGbG93JiBmbG93 KQogewogfQogCit0ZW1wbGF0ZSA8dHlwZW5hbWUgQ2hhcmFjdGVyVHlwZT4KK3N0YXRpYyB1bnNp Z25lZCBuZXh0QnJlYWthYmxlUG9zaXRpb24oTGF6eUxpbmVCcmVha0l0ZXJhdG9yJiBsaW5lQnJl YWtJdGVhcmF0b3IsIGNvbnN0IEZsb3dDb250ZW50czo6U2VnbWVudCYgc2VnbWVudCwgdW5zaWdu ZWQgcG9zaXRpb24pCit7CisgICAgY29uc3QgYXV0byogY2hhcmFjdGVycyA9IHNlZ21lbnQudGV4 dC5jaGFyYWN0ZXJzPENoYXJhY3RlclR5cGU+KCk7CisgICAgdW5zaWduZWQgc2VnbWVudExlbmd0 aCA9IHNlZ21lbnQuZW5kIC0gc2VnbWVudC5zdGFydDsKKyAgICB1bnNpZ25lZCBzZWdtZW50UG9z aXRpb24gPSBwb3NpdGlvbiAtIHNlZ21lbnQuc3RhcnQ7CisgICAgcmV0dXJuIG5leHRCcmVha2Fi bGVQb3NpdGlvbk5vbkxvb3NlbHk8Q2hhcmFjdGVyVHlwZSwgTkJTUEJlaGF2aW9yOjpJZ25vcmVO QlNQPihsaW5lQnJlYWtJdGVhcmF0b3IsIGNoYXJhY3RlcnMsIHNlZ21lbnRMZW5ndGgsIHNlZ21l bnRQb3NpdGlvbik7Cit9CisKIHVuc2lnbmVkIEZsb3dDb250ZW50czo6ZmluZE5leHRCcmVha2Fi bGVQb3NpdGlvbih1bnNpZ25lZCBwb3NpdGlvbikgY29uc3QKIHsKICAgICB3aGlsZSAoIWlzRW5k KHBvc2l0aW9uKSkgewpAQCAtNzcsMTAgKzg2LDcgQEAgdW5zaWduZWQgRmxvd0NvbnRlbnRzOjpm aW5kTmV4dEJyZWFrYWJsZVBvc2l0aW9uKHVuc2lnbmVkIHBvc2l0aW9uKSBjb25zdAogICAgICAg ICAgICAgbV9saW5lQnJlYWtJdGVyYXRvci5yZXNldFN0cmluZ0FuZFJlbGVhc2VJdGVyYXRvcihz ZWdtZW50LnRleHQsIG1fc3R5bGUubG9jYWxlLCBMaW5lQnJlYWtJdGVyYXRvck1vZGVVQVgxNCk7 CiAgICAgICAgIH0KIAotICAgICAgICBhdXRvKiBjaGFyYWN0ZXJzID0gc2VnbWVudC50ZXh0LmNo YXJhY3RlcnM4KCk7Ci0gICAgICAgIHVuc2lnbmVkIHNlZ21lbnRMZW5ndGggPSBzZWdtZW50LmVu ZCAtIHNlZ21lbnQuc3RhcnQ7Ci0gICAgICAgIHVuc2lnbmVkIHNlZ21lbnRQb3NpdGlvbiA9IHBv c2l0aW9uIC0gc2VnbWVudC5zdGFydDsKLSAgICAgICAgdW5zaWduZWQgYnJlYWthYmxlID0gbmV4 dEJyZWFrYWJsZVBvc2l0aW9uTm9uTG9vc2VseTxMQ2hhciwgTkJTUEJlaGF2aW9yOjpJZ25vcmVO QlNQPihtX2xpbmVCcmVha0l0ZXJhdG9yLCBjaGFyYWN0ZXJzLCBzZWdtZW50TGVuZ3RoLCBzZWdt ZW50UG9zaXRpb24pOworICAgICAgICB1bnNpZ25lZCBicmVha2FibGUgPSBzZWdtZW50LnRleHQu aXM4Qml0KCkgPyBuZXh0QnJlYWthYmxlUG9zaXRpb248TENoYXI+KG1fbGluZUJyZWFrSXRlcmF0 b3IsIHNlZ21lbnQsIHBvc2l0aW9uKSA6IG5leHRCcmVha2FibGVQb3NpdGlvbjxVQ2hhcj4obV9s aW5lQnJlYWtJdGVyYXRvciwgc2VnbWVudCwgcG9zaXRpb24pOwogICAgICAgICBwb3NpdGlvbiA9 IHNlZ21lbnQuc3RhcnQgKyBicmVha2FibGU7CiAgICAgICAgIGlmIChwb3NpdGlvbiA8IHNlZ21l bnQuZW5kKQogICAgICAgICAgICAgYnJlYWs7CkBAIC04OCw5ICs5NCwxMCBAQCB1bnNpZ25lZCBG bG93Q29udGVudHM6OmZpbmROZXh0QnJlYWthYmxlUG9zaXRpb24odW5zaWduZWQgcG9zaXRpb24p IGNvbnN0CiAgICAgcmV0dXJuIHBvc2l0aW9uOwogfQogCit0ZW1wbGF0ZSA8dHlwZW5hbWUgQ2hh cmFjdGVyVHlwZT4KIHN0YXRpYyBib29sIGZpbmROZXh0Tm9uV2hpdGVzcGFjZShjb25zdCBGbG93 Q29udGVudHM6OlNlZ21lbnQmIHNlZ21lbnQsIGNvbnN0IEZsb3dDb250ZW50czo6U3R5bGUmIHN0 eWxlLCB1bnNpZ25lZCYgcG9zaXRpb24sIHVuc2lnbmVkJiBzcGFjZUNvdW50KQogewotICAgIGNv bnN0IExDaGFyKiB0ZXh0ID0gc2VnbWVudC50ZXh0LmNoYXJhY3RlcnM4KCk7CisgICAgY29uc3Qg YXV0byogdGV4dCA9IHNlZ21lbnQudGV4dC5jaGFyYWN0ZXJzPENoYXJhY3RlclR5cGU+KCk7CiAg ICAgZm9yICg7IHBvc2l0aW9uIDwgc2VnbWVudC5lbmQ7ICsrcG9zaXRpb24pIHsKICAgICAgICAg YXV0byBjaGFyYWN0ZXIgPSB0ZXh0W3Bvc2l0aW9uIC0gc2VnbWVudC5zdGFydF07CiAgICAgICAg IGJvb2wgaXNTcGFjZSA9IGNoYXJhY3RlciA9PSAnICc7CkBAIC0xMDYsNyArMTEzLDkgQEAgc3Rh dGljIGJvb2wgZmluZE5leHROb25XaGl0ZXNwYWNlKGNvbnN0IEZsb3dDb250ZW50czo6U2VnbWVu dCYgc2VnbWVudCwgY29uc3QgRmwKIHVuc2lnbmVkIEZsb3dDb250ZW50czo6ZmluZE5leHROb25X aGl0ZXNwYWNlUG9zaXRpb24odW5zaWduZWQgcG9zaXRpb24sIHVuc2lnbmVkJiBzcGFjZUNvdW50 KSBjb25zdAogewogICAgIGZvciAodW5zaWduZWQgaSA9IHNlZ21lbnRJbmRleEZvclBvc2l0aW9u KHBvc2l0aW9uKTsgaSA8IG1fc2VnbWVudHMuc2l6ZSgpOyArK2kpIHsKLSAgICAgICAgaWYgKGZp bmROZXh0Tm9uV2hpdGVzcGFjZShtX3NlZ21lbnRzW2ldLCBtX3N0eWxlLCBwb3NpdGlvbiwgc3Bh Y2VDb3VudCkpCisgICAgICAgIGJvb2wgZm91bmROb25XaGl0ZXNwYWNlID0gbV9zZWdtZW50c1tp XS50ZXh0LmlzOEJpdCgpID8gZmluZE5leHROb25XaGl0ZXNwYWNlPExDaGFyPihtX3NlZ21lbnRz W2ldLCBtX3N0eWxlLCBwb3NpdGlvbiwgc3BhY2VDb3VudCkgOgorICAgICAgICAgICAgZmluZE5l eHROb25XaGl0ZXNwYWNlPFVDaGFyPihtX3NlZ21lbnRzW2ldLCBtX3N0eWxlLCBwb3NpdGlvbiwg c3BhY2VDb3VudCk7CisgICAgICAgIGlmIChmb3VuZE5vbldoaXRlc3BhY2UpCiAgICAgICAgICAg ICBicmVhazsKICAgICB9CiAgICAgcmV0dXJuIHBvc2l0aW9uOwpAQCAtMTE0LDE3ICsxMjMsMTgg QEAgdW5zaWduZWQgRmxvd0NvbnRlbnRzOjpmaW5kTmV4dE5vbldoaXRlc3BhY2VQb3NpdGlvbih1 bnNpZ25lZCBwb3NpdGlvbiwgdW5zaWduZWQKIAogZmxvYXQgRmxvd0NvbnRlbnRzOjp0ZXh0V2lk dGgodW5zaWduZWQgZnJvbSwgdW5zaWduZWQgdG8sIGZsb2F0IHhQb3NpdGlvbikgY29uc3QKIHsK LSAgICBhdXRvJiBmcm9tU2VnbWVudCA9IHNlZ21lbnRGb3JQb3NpdGlvbihmcm9tKTsKKyAgICBj b25zdCBhdXRvJiBmcm9tU2VnbWVudCA9IHNlZ21lbnRGb3JQb3NpdGlvbihmcm9tKTsKIAogICAg IGlmICgobV9zdHlsZS5mb250LmlzRml4ZWRQaXRjaCgpICYmIGZyb21TZWdtZW50LmVuZCA+PSB0 bykgfHwgKGZyb20gPT0gZnJvbVNlZ21lbnQuc3RhcnQgJiYgdG8gPT0gZnJvbVNlZ21lbnQuZW5k KSkKICAgICAgICAgcmV0dXJuIGZyb21TZWdtZW50LnJlbmRlcmVyLndpZHRoKGZyb20gLSBmcm9t U2VnbWVudC5zdGFydCwgdG8gLSBmcm9tLCBtX3N0eWxlLmZvbnQsIHhQb3NpdGlvbiwgbnVsbHB0 ciwgbnVsbHB0cik7CiAKLSAgICBhdXRvKiBzZWdtZW50ID0gJmZyb21TZWdtZW50OworICAgIGNv bnN0IGF1dG8qIHNlZ21lbnQgPSAmZnJvbVNlZ21lbnQ7CiAgICAgZmxvYXQgdGV4dFdpZHRoID0g MDsKICAgICB1bnNpZ25lZCBmcmFnbWVudEVuZCA9IDA7CiAgICAgd2hpbGUgKHRydWUpIHsKICAg ICAgICAgZnJhZ21lbnRFbmQgPSBzdGQ6Om1pbih0bywgc2VnbWVudC0+ZW5kKTsKLSAgICAgICAg dGV4dFdpZHRoICs9IHJ1bldpZHRoKHNlZ21lbnQtPnRleHQsIGZyb20gLSBzZWdtZW50LT5zdGFy dCwgZnJhZ21lbnRFbmQgLSBzZWdtZW50LT5zdGFydCwgeFBvc2l0aW9uICsgdGV4dFdpZHRoKTsK KyAgICAgICAgdGV4dFdpZHRoICs9IHNlZ21lbnQtPnRleHQuaXM4Qml0KCkgPyBydW5XaWR0aDxM Q2hhcj4oc2VnbWVudC0+dGV4dCwgZnJvbSAtIHNlZ21lbnQtPnN0YXJ0LCBmcmFnbWVudEVuZCAt IHNlZ21lbnQtPnN0YXJ0LCB4UG9zaXRpb24gKyB0ZXh0V2lkdGgpIDoKKyAgICAgICAgICAgIHJ1 bldpZHRoPFVDaGFyPihzZWdtZW50LT50ZXh0LCBmcm9tIC0gc2VnbWVudC0+c3RhcnQsIGZyYWdt ZW50RW5kIC0gc2VnbWVudC0+c3RhcnQsIHhQb3NpdGlvbiArIHRleHRXaWR0aCk7CiAgICAgICAg IGlmIChmcmFnbWVudEVuZCA9PSB0bykKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICBmcm9t ID0gZnJhZ21lbnRFbmQ7CkBAIC0xNTUsMTMgKzE2NSwxNCBAQCBjb25zdCBGbG93Q29udGVudHM6 OlNlZ21lbnQmIEZsb3dDb250ZW50czo6c2VnbWVudEZvclJlbmRlcmVyKGNvbnN0IFJlbmRlclRl eHQmCiAgICAgcmV0dXJuIG1fc2VnbWVudHMubGFzdCgpOwogfQogCit0ZW1wbGF0ZSA8dHlwZW5h bWUgQ2hhcmFjdGVyVHlwZT4KIGZsb2F0IEZsb3dDb250ZW50czo6cnVuV2lkdGgoY29uc3QgU3Ry aW5nJiB0ZXh0LCB1bnNpZ25lZCBmcm9tLCB1bnNpZ25lZCB0bywgZmxvYXQgeFBvc2l0aW9uKSBj b25zdAogewogICAgIEFTU0VSVChmcm9tIDwgdG8pOwogICAgIGJvb2wgbWVhc3VyZVdpdGhFbmRT cGFjZSA9IG1fc3R5bGUuY29sbGFwc2VXaGl0ZXNwYWNlICYmIHRvIDwgdGV4dC5sZW5ndGgoKSAm JiB0ZXh0W3RvXSA9PSAnICc7CiAgICAgaWYgKG1lYXN1cmVXaXRoRW5kU3BhY2UpCiAgICAgICAg ICsrdG87Ci0gICAgVGV4dFJ1biBydW4odGV4dC5jaGFyYWN0ZXJzOCgpICsgZnJvbSwgdG8gLSBm cm9tKTsKKyAgICBUZXh0UnVuIHJ1bih0ZXh0LmNoYXJhY3RlcnM8Q2hhcmFjdGVyVHlwZT4oKSAr IGZyb20sIHRvIC0gZnJvbSk7CiAgICAgcnVuLnNldFhQb3MoeFBvc2l0aW9uKTsKICAgICBydW4u c2V0VGFiU2l6ZSghIW1fc3R5bGUudGFiV2lkdGgsIG1fc3R5bGUudGFiV2lkdGgpOwogICAgIGZs b2F0IHdpZHRoID0gbV9zdHlsZS5mb250LndpZHRoKHJ1bik7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZsb3dDb250ZW50cy5oIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGbG93Q29udGVudHMuaAppbmRleCBl N2I2ZTEzYzgzYjQ4NzlmZjczYmE5YmI2ZTE2NGQ3ZGE4ZmM5YzZlLi42NTYyMmQ4NTIyMmU4YzE3 NTYyZDg0NzQ2MDEwMjUyN2QxYTJlYjNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvU2ltcGxlTGluZUxheW91dEZsb3dDb250ZW50cy5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0Rmxvd0NvbnRlbnRzLmgKQEAgLTgwLDYgKzgwLDcg QEAgcHJpdmF0ZToKICAgICB1bnNpZ25lZCBzZWdtZW50SW5kZXhGb3JQb3NpdGlvblNsb3codW5z aWduZWQgcG9zaXRpb24pIGNvbnN0OwogCiAgICAgVUNoYXIgY2hhcmFjdGVyQXQodW5zaWduZWQg cG9zaXRpb24pIGNvbnN0OworICAgIHRlbXBsYXRlIDx0eXBlbmFtZSBDaGFyYWN0ZXJUeXBlPgog ICAgIGZsb2F0IHJ1bldpZHRoKGNvbnN0IFN0cmluZyYsIHVuc2lnbmVkIGZyb20sIHVuc2lnbmVk IHRvLCBmbG9hdCB4UG9zaXRpb24pIGNvbnN0OwogCiAgICAgY29uc3QgU3R5bGUgbV9zdHlsZTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UmVz b2x2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNv bHZlci5jcHAKaW5kZXggNzA0MGQxZTI4ZjdiNzhjZGE1ZTBmZDRiOTViZTEwY2RjMTY5YmQ2OC4u MjY4YWMxOWIwOTM4ZTE0MDdlMDZiNDI1ZWE0YTU5YmY2YWYyYTAxZCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNvbHZlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNvbHZlci5jcHAKQEAg LTc3LDEwICs3NywxMSBAQCBTdHJpbmdWaWV3IFJ1blJlc29sdmVyOjpSdW46OnRleHQoKSBjb25z dAogICAgIGF1dG8mIHJlc29sdmVyID0gbV9pdGVyYXRvci5yZXNvbHZlcigpOwogICAgIGF1dG8m IHJ1biA9IG1faXRlcmF0b3Iuc2ltcGxlUnVuKCk7CiAgICAgYXV0byYgc2VnbWVudCA9IHJlc29s dmVyLm1fZmxvd0NvbnRlbnRzLnNlZ21lbnRGb3JQb3NpdGlvbihydW4uc3RhcnQpOwotICAgIEFT U0VSVChzZWdtZW50LnJlbmRlcmVyLmlzOEJpdCgpKTsKICAgICAvLyBXZSBjdXJyZW50bHkgc3Bs aXQgcnVucyBvbiBzZWdtZW50IGJvdW5kYXJpZXMgKGRpZmZlcmVudCBSZW5kZXJUZXh0KS4KICAg ICBBU1NFUlQocnVuLmVuZCA8PSBzZWdtZW50LmVuZCk7Ci0gICAgcmV0dXJuIFN0cmluZ1ZpZXco c2VnbWVudC5yZW5kZXJlci5jaGFyYWN0ZXJzOCgpLCBzZWdtZW50LnJlbmRlcmVyLnRleHRMZW5n dGgoKSkuc3Vic3RyaW5nKHJ1bi5zdGFydCAtIHNlZ21lbnQuc3RhcnQsIHJ1bi5lbmQgLSBydW4u c3RhcnQpOworICAgIGlmIChzZWdtZW50LnJlbmRlcmVyLmlzOEJpdCgpKQorICAgICAgICByZXR1 cm4gU3RyaW5nVmlldyhzZWdtZW50LnJlbmRlcmVyLmNoYXJhY3RlcnM4KCksIHNlZ21lbnQucmVu ZGVyZXIudGV4dExlbmd0aCgpKS5zdWJzdHJpbmcocnVuLnN0YXJ0IC0gc2VnbWVudC5zdGFydCwg cnVuLmVuZCAtIHJ1bi5zdGFydCk7CisgICAgcmV0dXJuIFN0cmluZ1ZpZXcoc2VnbWVudC5yZW5k ZXJlci5jaGFyYWN0ZXJzMTYoKSwgc2VnbWVudC5yZW5kZXJlci50ZXh0TGVuZ3RoKCkpLnN1YnN0 cmluZyhydW4uc3RhcnQgLSBzZWdtZW50LnN0YXJ0LCBydW4uZW5kIC0gcnVuLnN0YXJ0KTsKIH0K IAogUnVuUmVzb2x2ZXI6Okl0ZXJhdG9yOjpJdGVyYXRvcihjb25zdCBSdW5SZXNvbHZlciYgcmVz b2x2ZXIsIHVuc2lnbmVkIHJ1bkluZGV4LCB1bnNpZ25lZCBsaW5lSW5kZXgpCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggMWRi YjNjZDJlYTA2MzYyOTFjMDZhYzg1OTFhYzQ1MjE0MWY3YTM1My4uMmQyMWZmMzc4NjY5YjYzZDU3 MTQ4YWRlYmVmZDczOTBiMTkxYjYyOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE0LTEyLTEw ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxlIGxpbmUg bGF5b3V0OiBBZGQgMTZiaXQgc3VwcG9ydC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTEzOTQ2OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoaXMgcGF0Y2ggYWRkcyB0aGUgMTZiaXQgc3VwcG9ydCB0byBz aW1wbGUgbGluZSBsYXlvdXQuCisKKyAgICAgICAgKiBmYXN0L2lubGluZS9zaW1wbGUtbGluZS1s YXlvdXQtMTZiaXQtY29udGVudC1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0 L2lubGluZS9zaW1wbGUtbGluZS1sYXlvdXQtMTZiaXQtY29udGVudC5odG1sOiBBZGRlZC4KKwog MjAxNC0xMi0wOSAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAgICAg ICBVbnNraXAgbW9yZSBtdWx0aXBhcnQgdGVzdHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvaW5saW5lL3NpbXBsZS1saW5lLWxheW91dC0xNmJpdC1jb250ZW50LWV4cGVjdGVkLmh0bWwg Yi9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS9zaW1wbGUtbGluZS1sYXlvdXQtMTZiaXQtY29udGVu dC1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmY1NDJjN2Y0NDFhMDQ4ZjJjZjUzNmIxNmJlYjhm Yjc5Y2NhNzQwMjQKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS9z aW1wbGUtbGluZS1sYXlvdXQtMTZiaXQtY29udGVudC1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEs MTggQEAKKzwhZG9jdHlwZSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzx0aXRsZT5UaGlzIHRlc3Rz IHRoYXQgd2UgdXNlIHNpbXBsZSBsaW5lIGxheW91dCB0byBsYXlvdXQvcmVuZGVyIDE2Yml0IGNv bnRlbnQuPC90aXRsZT4KKzxzdHlsZT4KKyAgZGl2IHsKKyAgICBjb2xvcjogd2hpdGU7CisgIH0K Kzwvc3R5bGU+Cis8c2NyaXB0PgorICBpZiAod2luZG93LmludGVybmFscykKKyAgICBpbnRlcm5h bHMuc2V0dGluZ3Muc2V0U2ltcGxlTGluZUxheW91dERlYnVnQm9yZGVyc0VuYWJsZWQodHJ1ZSk7 Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorICA8ZGl2PnV1dW9vb29hYWVlPC9kaXY+Cis8 L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS9zaW1w bGUtbGluZS1sYXlvdXQtMTZiaXQtY29udGVudC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxp bmUvc2ltcGxlLWxpbmUtbGF5b3V0LTE2Yml0LWNvbnRlbnQuaHRtbApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zMGM2 Y2I4MThiOTYzODBiMjVmODQyYTAxOGU2ZGZiOWQzOWE2MDViCi0tLSAvZGV2L251bGwKKysrIGIv TGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvc2ltcGxlLWxpbmUtbGF5b3V0LTE2Yml0LWNvbnRlbnQu aHRtbApAQCAtMCwwICsxLDE5IEBACis8IWRvY3R5cGUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8 dGl0bGU+VGhpcyB0ZXN0cyB0aGF0IHdlIHVzZSBzaW1wbGUgbGluZSBsYXlvdXQgdG8gbGF5b3V0 L3JlbmRlciAxNmJpdCBjb250ZW50LjwvdGl0bGU+Cis8bWV0YSBodHRwLWVxdWl2PSJDb250ZW50 LXR5cGUiIGNvbnRlbnQ9InRleHQvaHRtbDsgY2hhcnNldD11dGYtOCIgLz4KKzxzdHlsZT4KKyAg ZGl2IHsKKyAgICBjb2xvcjogd2hpdGU7CisgIH0KKzwvc3R5bGU+Cis8c2NyaXB0PgorICBpZiAo d2luZG93LmludGVybmFscykKKyAgICBpbnRlcm5hbHMuc2V0dGluZ3Muc2V0U2ltcGxlTGluZUxh eW91dERlYnVnQm9yZGVyc0VuYWJsZWQodHJ1ZSk7Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5 PgorICA8ZGl2PnXDvMO6b8O2w7PFkWHDoWXDqTwvZGl2PgorPC9ib2R5PgorPC9odG1sPgo= 243139 2014-12-11 12:40:48 -0800 2014-12-12 03:49:17 -0800 Patch bug-139469-20141211124132.patch text/plain 11754 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMTc3MTUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDk5M2Q3OWIzODJmNmVh YWQ3ODgxMTA0YWZhZWQxZTZjNTdlMTI2NS4uYWExOTY2NDI0ZWM3MmRiMDliMmUyMTE0NzJjNTZj NmYwMTU4NDk2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0LTEyLTExICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxlIGxpbmUgbGF5b3V0 OiBBZGQgMTZiaXQgc3VwcG9ydC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTEzOTQ2OQorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3Rv LgorCisgICAgICAgIFRoaXMgcGF0Y2ggYWRkcyB0aGUgMTZiaXQgc3VwcG9ydCB0byBzaW1wbGUg bGluZSBsYXlvdXQuCisKKyAgICAgICAgVGVzdDogZmFzdC9pbmxpbmUvc2ltcGxlLWxpbmUtbGF5 b3V0LTE2Yml0LWNvbnRlbnQuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1NpbXBsZUxpbmVM YXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6Y2FuVXNlRm9y KToKKyAgICAgICAgKiByZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZsb3dDb250ZW50cy5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0OjpuZXh0QnJlYWthYmxlUG9zaXRp b24pOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6Rmxvd0NvbnRlbnRzOjpm aW5kTmV4dEJyZWFrYWJsZVBvc2l0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVM YXlvdXQ6OmZpbmROZXh0Tm9uV2hpdGVzcGFjZSk6CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVM aW5lTGF5b3V0OjpGbG93Q29udGVudHM6OmZpbmROZXh0Tm9uV2hpdGVzcGFjZVBvc2l0aW9uKToK KyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OkZsb3dDb250ZW50czo6dGV4dFdp ZHRoKToKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OkZsb3dDb250ZW50czo6 cnVuV2lkdGgpOgorICAgICAgICAqIHJlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0Rmxvd0NvbnRl bnRzLmg6CisgICAgICAgICogcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNvbHZlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0OjpSdW5SZXNvbHZlcjo6UnVuOjp0 ZXh0KToKKwogMjAxNC0xMi0xMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxp YS5jb20+CiAKICAgICAgICAgW0dUS10gTW92ZSBjbGljayBjb3VudGVyIGxvZ2ljIGJhY2sgdG8g V2ViS2l0V2ViVmlld0Jhc2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9T aW1wbGVMaW5lTGF5b3V0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5l TGF5b3V0LmNwcAppbmRleCAyMzU5MTMyNjczY2ZjZWU4ZTJiMDhiNzUzMzQ3NTRmMDllNDgwZmE5 Li5jOWUzODNkZmFlYTFkZjU4ZmY2ODI3NDNiNjJjYWEwODY5M2U1ODM4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXQuY3BwCkBAIC05Nyw3ICs5Nyw3IEBA IGJvb2wgY2FuVXNlRm9yKGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgZmxvdykKICAgICAvLyBUaGlz IGN1cnJlbnRseSBjb3ZlcnMgPGJsb2NrZmxvdz4jdGV4dDwvYmxvY2tmbG93PiBhbmQgbXV0aXBs ZSAoc2libGluZykgUmVuZGVyVGV4dCBjYXNlcy4KICAgICAvLyBUaGUgPGJsb2NrZmxvdz48aW5s aW5lPiN0ZXh0PC9pbmxpbmU+PC9ibG9ja2Zsb3c+IGNhc2UgaXMgYWxzbyBwb3B1bGFyIGFuZCBz aG91bGQgYmUgcmVsYXRpdmVseSBlYXN5IHRvIGNvdmVyLgogICAgIGZvciAoY29uc3QgYXV0byYg cmVuZGVyZXIgOiBjaGlsZHJlbk9mVHlwZTxSZW5kZXJPYmplY3Q+KGZsb3cpKSB7Ci0gICAgICAg IGlmICghaXM8UmVuZGVyVGV4dD4ocmVuZGVyZXIpIHx8ICFkb3duY2FzdDxSZW5kZXJUZXh0Pihy ZW5kZXJlcikudGV4dCgpLT5pczhCaXQoKSkKKyAgICAgICAgaWYgKCFpczxSZW5kZXJUZXh0Pihy ZW5kZXJlcikpCiAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogICAgIGlmICghZmxv dy5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGbG93Q29udGVudHMuY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGbG93Q29udGVudHMuY3BwCmluZGV4IDE5NWVk ZWYzNDdiZjE3NDVlZWFkNzAyZmVlZDM2ODk3MTFkNTI0NTMuLjRjMDMxZGMzN2IwYmVjNDI1NmJm N2NhMzdjODRmYjE1MzdmYjNiYzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9TaW1wbGVMaW5lTGF5b3V0Rmxvd0NvbnRlbnRzLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZsb3dDb250ZW50cy5jcHAKQEAgLTY2LDYgKzY2LDE1 IEBAIEZsb3dDb250ZW50czo6Rmxvd0NvbnRlbnRzKGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgZmxv dykKIHsKIH0KIAordGVtcGxhdGUgPHR5cGVuYW1lIENoYXJhY3RlclR5cGU+CitzdGF0aWMgdW5z aWduZWQgbmV4dEJyZWFrYWJsZVBvc2l0aW9uKExhenlMaW5lQnJlYWtJdGVyYXRvciYgbGluZUJy ZWFrSXRlYXJhdG9yLCBjb25zdCBGbG93Q29udGVudHM6OlNlZ21lbnQmIHNlZ21lbnQsIHVuc2ln bmVkIHBvc2l0aW9uKQoreworICAgIGNvbnN0IGF1dG8qIGNoYXJhY3RlcnMgPSBzZWdtZW50LnRl eHQuY2hhcmFjdGVyczxDaGFyYWN0ZXJUeXBlPigpOworICAgIHVuc2lnbmVkIHNlZ21lbnRMZW5n dGggPSBzZWdtZW50LmVuZCAtIHNlZ21lbnQuc3RhcnQ7CisgICAgdW5zaWduZWQgc2VnbWVudFBv c2l0aW9uID0gcG9zaXRpb24gLSBzZWdtZW50LnN0YXJ0OworICAgIHJldHVybiBuZXh0QnJlYWth YmxlUG9zaXRpb25Ob25Mb29zZWx5PENoYXJhY3RlclR5cGUsIE5CU1BCZWhhdmlvcjo6SWdub3Jl TkJTUD4obGluZUJyZWFrSXRlYXJhdG9yLCBjaGFyYWN0ZXJzLCBzZWdtZW50TGVuZ3RoLCBzZWdt ZW50UG9zaXRpb24pOworfQorCiB1bnNpZ25lZCBGbG93Q29udGVudHM6OmZpbmROZXh0QnJlYWth YmxlUG9zaXRpb24odW5zaWduZWQgcG9zaXRpb24pIGNvbnN0CiB7CiAgICAgd2hpbGUgKCFpc0Vu ZChwb3NpdGlvbikpIHsKQEAgLTc3LDEwICs4Niw3IEBAIHVuc2lnbmVkIEZsb3dDb250ZW50czo6 ZmluZE5leHRCcmVha2FibGVQb3NpdGlvbih1bnNpZ25lZCBwb3NpdGlvbikgY29uc3QKICAgICAg ICAgICAgIG1fbGluZUJyZWFrSXRlcmF0b3IucmVzZXRTdHJpbmdBbmRSZWxlYXNlSXRlcmF0b3Io c2VnbWVudC50ZXh0LCBtX3N0eWxlLmxvY2FsZSwgTGluZUJyZWFrSXRlcmF0b3JNb2RlVUFYMTQp OwogICAgICAgICB9CiAKLSAgICAgICAgYXV0byogY2hhcmFjdGVycyA9IHNlZ21lbnQudGV4dC5j aGFyYWN0ZXJzOCgpOwotICAgICAgICB1bnNpZ25lZCBzZWdtZW50TGVuZ3RoID0gc2VnbWVudC5l bmQgLSBzZWdtZW50LnN0YXJ0OwotICAgICAgICB1bnNpZ25lZCBzZWdtZW50UG9zaXRpb24gPSBw b3NpdGlvbiAtIHNlZ21lbnQuc3RhcnQ7Ci0gICAgICAgIHVuc2lnbmVkIGJyZWFrYWJsZSA9IG5l eHRCcmVha2FibGVQb3NpdGlvbk5vbkxvb3NlbHk8TENoYXIsIE5CU1BCZWhhdmlvcjo6SWdub3Jl TkJTUD4obV9saW5lQnJlYWtJdGVyYXRvciwgY2hhcmFjdGVycywgc2VnbWVudExlbmd0aCwgc2Vn bWVudFBvc2l0aW9uKTsKKyAgICAgICAgdW5zaWduZWQgYnJlYWthYmxlID0gc2VnbWVudC50ZXh0 LmlzOEJpdCgpID8gbmV4dEJyZWFrYWJsZVBvc2l0aW9uPExDaGFyPihtX2xpbmVCcmVha0l0ZXJh dG9yLCBzZWdtZW50LCBwb3NpdGlvbikgOiBuZXh0QnJlYWthYmxlUG9zaXRpb248VUNoYXI+KG1f bGluZUJyZWFrSXRlcmF0b3IsIHNlZ21lbnQsIHBvc2l0aW9uKTsKICAgICAgICAgcG9zaXRpb24g PSBzZWdtZW50LnN0YXJ0ICsgYnJlYWthYmxlOwogICAgICAgICBpZiAocG9zaXRpb24gPCBzZWdt ZW50LmVuZCkKICAgICAgICAgICAgIGJyZWFrOwpAQCAtODgsOSArOTQsMTAgQEAgdW5zaWduZWQg Rmxvd0NvbnRlbnRzOjpmaW5kTmV4dEJyZWFrYWJsZVBvc2l0aW9uKHVuc2lnbmVkIHBvc2l0aW9u KSBjb25zdAogICAgIHJldHVybiBwb3NpdGlvbjsKIH0KIAordGVtcGxhdGUgPHR5cGVuYW1lIENo YXJhY3RlclR5cGU+CiBzdGF0aWMgYm9vbCBmaW5kTmV4dE5vbldoaXRlc3BhY2UoY29uc3QgRmxv d0NvbnRlbnRzOjpTZWdtZW50JiBzZWdtZW50LCBjb25zdCBGbG93Q29udGVudHM6OlN0eWxlJiBz dHlsZSwgdW5zaWduZWQmIHBvc2l0aW9uLCB1bnNpZ25lZCYgc3BhY2VDb3VudCkKIHsKLSAgICBj b25zdCBMQ2hhciogdGV4dCA9IHNlZ21lbnQudGV4dC5jaGFyYWN0ZXJzOCgpOworICAgIGNvbnN0 IGF1dG8qIHRleHQgPSBzZWdtZW50LnRleHQuY2hhcmFjdGVyczxDaGFyYWN0ZXJUeXBlPigpOwog ICAgIGZvciAoOyBwb3NpdGlvbiA8IHNlZ21lbnQuZW5kOyArK3Bvc2l0aW9uKSB7CiAgICAgICAg IGF1dG8gY2hhcmFjdGVyID0gdGV4dFtwb3NpdGlvbiAtIHNlZ21lbnQuc3RhcnRdOwogICAgICAg ICBib29sIGlzU3BhY2UgPSBjaGFyYWN0ZXIgPT0gJyAnOwpAQCAtMTA2LDcgKzExMyw5IEBAIHN0 YXRpYyBib29sIGZpbmROZXh0Tm9uV2hpdGVzcGFjZShjb25zdCBGbG93Q29udGVudHM6OlNlZ21l bnQmIHNlZ21lbnQsIGNvbnN0IEZsCiB1bnNpZ25lZCBGbG93Q29udGVudHM6OmZpbmROZXh0Tm9u V2hpdGVzcGFjZVBvc2l0aW9uKHVuc2lnbmVkIHBvc2l0aW9uLCB1bnNpZ25lZCYgc3BhY2VDb3Vu dCkgY29uc3QKIHsKICAgICBmb3IgKHVuc2lnbmVkIGkgPSBzZWdtZW50SW5kZXhGb3JQb3NpdGlv bihwb3NpdGlvbik7IGkgPCBtX3NlZ21lbnRzLnNpemUoKTsgKytpKSB7Ci0gICAgICAgIGlmIChm aW5kTmV4dE5vbldoaXRlc3BhY2UobV9zZWdtZW50c1tpXSwgbV9zdHlsZSwgcG9zaXRpb24sIHNw YWNlQ291bnQpKQorICAgICAgICBib29sIGZvdW5kTm9uV2hpdGVzcGFjZSA9IG1fc2VnbWVudHNb aV0udGV4dC5pczhCaXQoKSA/IGZpbmROZXh0Tm9uV2hpdGVzcGFjZTxMQ2hhcj4obV9zZWdtZW50 c1tpXSwgbV9zdHlsZSwgcG9zaXRpb24sIHNwYWNlQ291bnQpIDoKKyAgICAgICAgICAgIGZpbmRO ZXh0Tm9uV2hpdGVzcGFjZTxVQ2hhcj4obV9zZWdtZW50c1tpXSwgbV9zdHlsZSwgcG9zaXRpb24s IHNwYWNlQ291bnQpOworICAgICAgICBpZiAoZm91bmROb25XaGl0ZXNwYWNlKQogICAgICAgICAg ICAgYnJlYWs7CiAgICAgfQogICAgIHJldHVybiBwb3NpdGlvbjsKQEAgLTExNCwxNyArMTIzLDE4 IEBAIHVuc2lnbmVkIEZsb3dDb250ZW50czo6ZmluZE5leHROb25XaGl0ZXNwYWNlUG9zaXRpb24o dW5zaWduZWQgcG9zaXRpb24sIHVuc2lnbmVkCiAKIGZsb2F0IEZsb3dDb250ZW50czo6dGV4dFdp ZHRoKHVuc2lnbmVkIGZyb20sIHVuc2lnbmVkIHRvLCBmbG9hdCB4UG9zaXRpb24pIGNvbnN0CiB7 Ci0gICAgYXV0byYgZnJvbVNlZ21lbnQgPSBzZWdtZW50Rm9yUG9zaXRpb24oZnJvbSk7CisgICAg Y29uc3QgYXV0byYgZnJvbVNlZ21lbnQgPSBzZWdtZW50Rm9yUG9zaXRpb24oZnJvbSk7CiAKICAg ICBpZiAoKG1fc3R5bGUuZm9udC5pc0ZpeGVkUGl0Y2goKSAmJiBmcm9tU2VnbWVudC5lbmQgPj0g dG8pIHx8IChmcm9tID09IGZyb21TZWdtZW50LnN0YXJ0ICYmIHRvID09IGZyb21TZWdtZW50LmVu ZCkpCiAgICAgICAgIHJldHVybiBmcm9tU2VnbWVudC5yZW5kZXJlci53aWR0aChmcm9tIC0gZnJv bVNlZ21lbnQuc3RhcnQsIHRvIC0gZnJvbSwgbV9zdHlsZS5mb250LCB4UG9zaXRpb24sIG51bGxw dHIsIG51bGxwdHIpOwogCi0gICAgYXV0byogc2VnbWVudCA9ICZmcm9tU2VnbWVudDsKKyAgICBj b25zdCBhdXRvKiBzZWdtZW50ID0gJmZyb21TZWdtZW50OwogICAgIGZsb2F0IHRleHRXaWR0aCA9 IDA7CiAgICAgdW5zaWduZWQgZnJhZ21lbnRFbmQgPSAwOwogICAgIHdoaWxlICh0cnVlKSB7CiAg ICAgICAgIGZyYWdtZW50RW5kID0gc3RkOjptaW4odG8sIHNlZ21lbnQtPmVuZCk7Ci0gICAgICAg IHRleHRXaWR0aCArPSBydW5XaWR0aChzZWdtZW50LT50ZXh0LCBmcm9tIC0gc2VnbWVudC0+c3Rh cnQsIGZyYWdtZW50RW5kIC0gc2VnbWVudC0+c3RhcnQsIHhQb3NpdGlvbiArIHRleHRXaWR0aCk7 CisgICAgICAgIHRleHRXaWR0aCArPSBzZWdtZW50LT50ZXh0LmlzOEJpdCgpID8gcnVuV2lkdGg8 TENoYXI+KHNlZ21lbnQtPnRleHQsIGZyb20gLSBzZWdtZW50LT5zdGFydCwgZnJhZ21lbnRFbmQg LSBzZWdtZW50LT5zdGFydCwgeFBvc2l0aW9uICsgdGV4dFdpZHRoKSA6CisgICAgICAgICAgICBy dW5XaWR0aDxVQ2hhcj4oc2VnbWVudC0+dGV4dCwgZnJvbSAtIHNlZ21lbnQtPnN0YXJ0LCBmcmFn bWVudEVuZCAtIHNlZ21lbnQtPnN0YXJ0LCB4UG9zaXRpb24gKyB0ZXh0V2lkdGgpOwogICAgICAg ICBpZiAoZnJhZ21lbnRFbmQgPT0gdG8pCiAgICAgICAgICAgICBicmVhazsKICAgICAgICAgZnJv bSA9IGZyYWdtZW50RW5kOwpAQCAtMTU1LDEzICsxNjUsMTQgQEAgY29uc3QgRmxvd0NvbnRlbnRz OjpTZWdtZW50JiBGbG93Q29udGVudHM6OnNlZ21lbnRGb3JSZW5kZXJlcihjb25zdCBSZW5kZXJU ZXh0JgogICAgIHJldHVybiBtX3NlZ21lbnRzLmxhc3QoKTsKIH0KIAordGVtcGxhdGUgPHR5cGVu YW1lIENoYXJhY3RlclR5cGU+CiBmbG9hdCBGbG93Q29udGVudHM6OnJ1bldpZHRoKGNvbnN0IFN0 cmluZyYgdGV4dCwgdW5zaWduZWQgZnJvbSwgdW5zaWduZWQgdG8sIGZsb2F0IHhQb3NpdGlvbikg Y29uc3QKIHsKICAgICBBU1NFUlQoZnJvbSA8IHRvKTsKICAgICBib29sIG1lYXN1cmVXaXRoRW5k U3BhY2UgPSBtX3N0eWxlLmNvbGxhcHNlV2hpdGVzcGFjZSAmJiB0byA8IHRleHQubGVuZ3RoKCkg JiYgdGV4dFt0b10gPT0gJyAnOwogICAgIGlmIChtZWFzdXJlV2l0aEVuZFNwYWNlKQogICAgICAg ICArK3RvOwotICAgIFRleHRSdW4gcnVuKHRleHQuY2hhcmFjdGVyczgoKSArIGZyb20sIHRvIC0g ZnJvbSk7CisgICAgVGV4dFJ1biBydW4odGV4dC5jaGFyYWN0ZXJzPENoYXJhY3RlclR5cGU+KCkg KyBmcm9tLCB0byAtIGZyb20pOwogICAgIHJ1bi5zZXRYUG9zKHhQb3NpdGlvbik7CiAgICAgcnVu LnNldFRhYlNpemUoISFtX3N0eWxlLnRhYldpZHRoLCBtX3N0eWxlLnRhYldpZHRoKTsKICAgICBm bG9hdCB3aWR0aCA9IG1fc3R5bGUuZm9udC53aWR0aChydW4pOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGbG93Q29udGVudHMuaCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0Rmxvd0NvbnRlbnRzLmgKaW5kZXgg ZTdiNmUxM2M4M2I0ODc5ZmY3M2JhOWJiNmUxNjRkN2RhOGZjOWM2ZS4uZjUyNWI5M2E2NTNhOWVh YTE4YjhiODJjNmVlZjcwM2EyMGFmYmQxOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGbG93Q29udGVudHMuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZsb3dDb250ZW50cy5oCkBAIC04MCw3ICs4MCw3 IEBAIHByaXZhdGU6CiAgICAgdW5zaWduZWQgc2VnbWVudEluZGV4Rm9yUG9zaXRpb25TbG93KHVu c2lnbmVkIHBvc2l0aW9uKSBjb25zdDsKIAogICAgIFVDaGFyIGNoYXJhY3RlckF0KHVuc2lnbmVk IHBvc2l0aW9uKSBjb25zdDsKLSAgICBmbG9hdCBydW5XaWR0aChjb25zdCBTdHJpbmcmLCB1bnNp Z25lZCBmcm9tLCB1bnNpZ25lZCB0bywgZmxvYXQgeFBvc2l0aW9uKSBjb25zdDsKKyAgICB0ZW1w bGF0ZSA8dHlwZW5hbWUgQ2hhcmFjdGVyVHlwZT4gZmxvYXQgcnVuV2lkdGgoY29uc3QgU3RyaW5n JiwgdW5zaWduZWQgZnJvbSwgdW5zaWduZWQgdG8sIGZsb2F0IHhQb3NpdGlvbikgY29uc3Q7CiAK ICAgICBjb25zdCBTdHlsZSBtX3N0eWxlOwogICAgIGNvbnN0IFZlY3RvcjxTZWdtZW50LCA4PiBt X3NlZ21lbnRzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxp bmVMYXlvdXRSZXNvbHZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGlu ZUxheW91dFJlc29sdmVyLmNwcAppbmRleCA3MDQwZDFlMjhmN2I3OGNkYTVlMGZkNGI5NWJlMTBj ZGMxNjliZDY4Li4yNjhhYzE5YjA5MzhlMTQwN2UwNmI0MjVlYTRhNTliZjZhZjJhMDFkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dFJlc29sdmVy LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dFJlc29s dmVyLmNwcApAQCAtNzcsMTAgKzc3LDExIEBAIFN0cmluZ1ZpZXcgUnVuUmVzb2x2ZXI6OlJ1bjo6 dGV4dCgpIGNvbnN0CiAgICAgYXV0byYgcmVzb2x2ZXIgPSBtX2l0ZXJhdG9yLnJlc29sdmVyKCk7 CiAgICAgYXV0byYgcnVuID0gbV9pdGVyYXRvci5zaW1wbGVSdW4oKTsKICAgICBhdXRvJiBzZWdt ZW50ID0gcmVzb2x2ZXIubV9mbG93Q29udGVudHMuc2VnbWVudEZvclBvc2l0aW9uKHJ1bi5zdGFy dCk7Ci0gICAgQVNTRVJUKHNlZ21lbnQucmVuZGVyZXIuaXM4Qml0KCkpOwogICAgIC8vIFdlIGN1 cnJlbnRseSBzcGxpdCBydW5zIG9uIHNlZ21lbnQgYm91bmRhcmllcyAoZGlmZmVyZW50IFJlbmRl clRleHQpLgogICAgIEFTU0VSVChydW4uZW5kIDw9IHNlZ21lbnQuZW5kKTsKLSAgICByZXR1cm4g U3RyaW5nVmlldyhzZWdtZW50LnJlbmRlcmVyLmNoYXJhY3RlcnM4KCksIHNlZ21lbnQucmVuZGVy ZXIudGV4dExlbmd0aCgpKS5zdWJzdHJpbmcocnVuLnN0YXJ0IC0gc2VnbWVudC5zdGFydCwgcnVu LmVuZCAtIHJ1bi5zdGFydCk7CisgICAgaWYgKHNlZ21lbnQucmVuZGVyZXIuaXM4Qml0KCkpCisg ICAgICAgIHJldHVybiBTdHJpbmdWaWV3KHNlZ21lbnQucmVuZGVyZXIuY2hhcmFjdGVyczgoKSwg c2VnbWVudC5yZW5kZXJlci50ZXh0TGVuZ3RoKCkpLnN1YnN0cmluZyhydW4uc3RhcnQgLSBzZWdt ZW50LnN0YXJ0LCBydW4uZW5kIC0gcnVuLnN0YXJ0KTsKKyAgICByZXR1cm4gU3RyaW5nVmlldyhz ZWdtZW50LnJlbmRlcmVyLmNoYXJhY3RlcnMxNigpLCBzZWdtZW50LnJlbmRlcmVyLnRleHRMZW5n dGgoKSkuc3Vic3RyaW5nKHJ1bi5zdGFydCAtIHNlZ21lbnQuc3RhcnQsIHJ1bi5lbmQgLSBydW4u c3RhcnQpOwogfQogCiBSdW5SZXNvbHZlcjo6SXRlcmF0b3I6Okl0ZXJhdG9yKGNvbnN0IFJ1blJl c29sdmVyJiByZXNvbHZlciwgdW5zaWduZWQgcnVuSW5kZXgsIHVuc2lnbmVkIGxpbmVJbmRleCkK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAxOTk1NWYzMzVmYjMzNzdjNWJlY2MwY2EwODgzMGI4MGVjMjQyNGU5Li42OTE0MDcw MTU3N2U3YWU4Y2NiZDQ0MDQ2YTQ2YWFhMDU5ZWE3NjExIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAK KzIwMTQtMTItMTEgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKworICAgICAgICBT aW1wbGUgbGluZSBsYXlvdXQ6IEFkZCAxNmJpdCBzdXBwb3J0LgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5NDY5CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgQW50dGkgS29pdmlzdG8uCisKKyAgICAgICAgVGhpcyBwYXRjaCBhZGRzIHRoZSAxNmJpdCBz dXBwb3J0IHRvIHNpbXBsZSBsaW5lIGxheW91dC4KKworICAgICAgICAqIGZhc3QvaW5saW5lL3Np bXBsZS1saW5lLWxheW91dC0xNmJpdC1jb250ZW50LWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAg ICAgICAqIGZhc3QvaW5saW5lL3NpbXBsZS1saW5lLWxheW91dC0xNmJpdC1jb250ZW50Lmh0bWw6 IEFkZGVkLgorCiAyMDE0LTEyLTEwICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgogCiAgICAgICAgIE1hYyB0ZXN0IGV4cGVjdGF0aW9ucyBnYXJkZW5pbmcuCmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9mYXN0L2lubGluZS9zaW1wbGUtbGluZS1sYXlvdXQtMTZiaXQtY29udGVu dC1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9pbmxpbmUvc2ltcGxlLWxpbmUtbGF5 b3V0LTE2Yml0LWNvbnRlbnQtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5mNTQyYzdmNDQxYTA0 OGYyY2Y1MzZiMTZiZWI4ZmI3OWNjYTc0MDI0Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvZmFzdC9pbmxpbmUvc2ltcGxlLWxpbmUtbGF5b3V0LTE2Yml0LWNvbnRlbnQtZXhwZWN0ZWQu aHRtbApAQCAtMCwwICsxLDE4IEBACis8IWRvY3R5cGUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8 dGl0bGU+VGhpcyB0ZXN0cyB0aGF0IHdlIHVzZSBzaW1wbGUgbGluZSBsYXlvdXQgdG8gbGF5b3V0 L3JlbmRlciAxNmJpdCBjb250ZW50LjwvdGl0bGU+Cis8c3R5bGU+CisgIGRpdiB7CisgICAgY29s b3I6IHdoaXRlOworICB9Cis8L3N0eWxlPgorPHNjcmlwdD4KKyAgaWYgKHdpbmRvdy5pbnRlcm5h bHMpCisgICAgaW50ZXJuYWxzLnNldHRpbmdzLnNldFNpbXBsZUxpbmVMYXlvdXREZWJ1Z0JvcmRl cnNFbmFibGVkKHRydWUpOworPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgPGRpdj51dXVv b29vYWFlZTwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZmFzdC9pbmxpbmUvc2ltcGxlLWxpbmUtbGF5b3V0LTE2Yml0LWNvbnRlbnQuaHRtbCBiL0xheW91 dFRlc3RzL2Zhc3QvaW5saW5lL3NpbXBsZS1saW5lLWxheW91dC0xNmJpdC1jb250ZW50Lmh0bWwK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uMzBjNmNiODE4Yjk2MzgwYjI1Zjg0MmEwMThlNmRmYjlkMzlhNjA1YgotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvaW5saW5lL3NpbXBsZS1saW5lLWxheW91 dC0xNmJpdC1jb250ZW50Lmh0bWwKQEAgLTAsMCArMSwxOSBAQAorPCFkb2N0eXBlIGh0bWw+Cis8 aHRtbD4KKzxoZWFkPgorPHRpdGxlPlRoaXMgdGVzdHMgdGhhdCB3ZSB1c2Ugc2ltcGxlIGxpbmUg bGF5b3V0IHRvIGxheW91dC9yZW5kZXIgMTZiaXQgY29udGVudC48L3RpdGxlPgorPG1ldGEgaHR0 cC1lcXVpdj0iQ29udGVudC10eXBlIiBjb250ZW50PSJ0ZXh0L2h0bWw7IGNoYXJzZXQ9dXRmLTgi IC8+Cis8c3R5bGU+CisgIGRpdiB7CisgICAgY29sb3I6IHdoaXRlOworICB9Cis8L3N0eWxlPgor PHNjcmlwdD4KKyAgaWYgKHdpbmRvdy5pbnRlcm5hbHMpCisgICAgaW50ZXJuYWxzLnNldHRpbmdz LnNldFNpbXBsZUxpbmVMYXlvdXREZWJ1Z0JvcmRlcnNFbmFibGVkKHRydWUpOworPC9zY3JpcHQ+ Cis8L2hlYWQ+Cis8Ym9keT4KKyAgPGRpdj51w7zDum/DtsOzxZFhw6Flw6k8L2Rpdj4KKzwvYm9k eT4KKzwvaHRtbD4K