161013 2016-08-19 14:22:55 -0700 RenderObject::containingBlock() cleanup. 2016-08-19 16:10:58 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan cdumez cmarcelo commit-queue esprehn+autocc glenn kangil.han kondapallykalyan simon.fraser oldest_to_newest 1221475 0 zalan 2016-08-19 14:22:55 -0700 and its dependencies. 1221488 1 286485 zalan 2016-08-19 14:47:25 -0700 Created attachment 286485 Patch 1221534 2 286485 commit-queue 2016-08-19 16:10:53 -0700 Comment on attachment 286485 Patch Clearing flags on attachment: 286485 Committed r204667: <http://trac.webkit.org/changeset/204667> 1221535 3 commit-queue 2016-08-19 16:10:58 -0700 All reviewed patches have been landed. Closing bug. 286485 2016-08-19 14:47:25 -0700 2016-08-19 16:10:53 -0700 Patch bug-161013-20160819144533.patch text/plain 11129 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjA0NTUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTZkNGIyNDc0YzQ3YzQ4 ZTkyOGJlNjk4ZTlhNjM1NTIzNzMwMWQ2Zi4uNTFlY2E0MGFjMTI4MjJhMzAyNWQxN2U4YjM5NjM5 ZWJjMDMxMWI5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDE2LTA4LTE5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmVuZGVyT2JqZWN0Ojpjb250 YWluaW5nQmxvY2soKSBjbGVhbnVwLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTYxMDEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgTW92ZSA6OmNvbnRhaW5pbmdCbG9ja0ZvckFic29sdXRlUG9zaXRpb24g YW5kIDo6Y29udGFpbmluZ0Jsb2NrRm9yRml4ZWRQb3NpdGlvbgorICAgICAgICB0byBSZW5kZXJF bGVtZW50IGFmdGVyIHRpZ2h0ZW5pbmcgY29udGFpbmluZ0Jsb2NrKCkgY2FsbHNpdGVzLgorCisg ICAgICAgIE5vIGNoYW5nZSBpbiBmdW5jdGlvbmFsaXR5LgorCisgICAgICAgICogZG9tL0VsZW1l bnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6bGF5b3V0T3ZlcmZsb3dSZWN0Q29udGFpbnNBbGxE ZXNjZW5kYW50cyk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6UmVuZGVyRWxlbWVudDo6Y29udGFpbmluZ0Jsb2NrRm9yRml4ZWRQb3Np dGlvbik6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJFbGVtZW50Ojpjb250YWluaW5nQmxvY2tG b3JBYnNvbHV0ZVBvc2l0aW9uKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5o OgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJJbmxpbmUuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVySW5saW5lOjpzdHlsZVdpbGxDaGFuZ2UpOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJPYmplY3QuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0Ojpjb250YWlu aW5nQmxvY2spOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyT2JqZWN0Ojpjb250YWluaW5nQmxv Y2tGb3JGaXhlZFBvc2l0aW9uKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlck9i amVjdDo6Y29udGFpbmluZ0Jsb2NrRm9yQWJzb2x1dGVQb3NpdGlvbik6IERlbGV0ZWQuCisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oOgorCiAyMDE2LTA4LTE2ICBaYWxhbiBCdWp0 YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgU3VicGl4ZWwgcmVuZGVyaW5nOiBDbGVh bnVwIFJlbmRlckxheWVyQmFja2luZzo6dXBkYXRlR2VvbWV0cnkuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9kb20vRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudC5j cHAKaW5kZXggNDQ0OTJlOWFjMTQ2MmViODdhZDkwY2RlNTYzZDE2OWY2ODM4ZTdmYi4uNDJhZmJj NTgxZWU5MDYyODhhZWU5MTVkZTYyYTZiODY0ZTQzNjNlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvZG9tL0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FbGVtZW50LmNw cApAQCAtOTc3LDM3ICs5NzcsNDAgQEAgSW50UmVjdCBFbGVtZW50Ojpib3VuZHNJblJvb3RWaWV3 U3BhY2UoKQogICAgIHJldHVybiByZXN1bHQ7CiB9CiAKLXN0YXRpYyBib29sIGxheW91dE92ZXJm bG93UmVjdENvbnRhaW5zQWxsRGVzY2VuZGFudHMoY29uc3QgUmVuZGVyRWxlbWVudCYgcmVuZGVy ZXIpCitzdGF0aWMgYm9vbCBsYXlvdXRPdmVyZmxvd1JlY3RDb250YWluc0FsbERlc2NlbmRhbnRz KGNvbnN0IFJlbmRlckJveCYgcmVuZGVyQm94KQogewotICAgIGlmIChyZW5kZXJlci5pc1JlbmRl clZpZXcoKSkKKyAgICBpZiAocmVuZGVyQm94LmlzUmVuZGVyVmlldygpKQogICAgICAgICByZXR1 cm4gdHJ1ZTsKIAotICAgIGlmICghcmVuZGVyZXIuZWxlbWVudCgpKQorICAgIGlmICghcmVuZGVy Qm94LmVsZW1lbnQoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCiAgICAgLy8gSWYgdGhlcmUg YXJlIGFueSBwb3NpdGlvbjpmaXhlZCBpbnNpZGUgb2YgdXMsIGdhbWUgb3Zlci4KLSAgICBpZiAo YXV0byB2aWV3UG9zaXRpb25lZE9iamVjdHMgPSByZW5kZXJlci52aWV3KCkucG9zaXRpb25lZE9i amVjdHMoKSkgewotICAgICAgICBmb3IgKFJlbmRlckJveCogaXQgOiAqdmlld1Bvc2l0aW9uZWRP YmplY3RzKSB7Ci0gICAgICAgICAgICBpZiAoaXQgIT0gJnJlbmRlcmVyICYmIGl0LT5zdHlsZSgp LnBvc2l0aW9uKCkgPT0gRml4ZWRQb3NpdGlvbiAmJiByZW5kZXJlci5lbGVtZW50KCktPmNvbnRh aW5zKGl0LT5lbGVtZW50KCkpKQorICAgIGlmIChhdXRvKiB2aWV3UG9zaXRpb25lZE9iamVjdHMg PSByZW5kZXJCb3gudmlldygpLnBvc2l0aW9uZWRPYmplY3RzKCkpIHsKKyAgICAgICAgZm9yIChh dXRvKiBwb3NpdGlvbmVkQm94IDogKnZpZXdQb3NpdGlvbmVkT2JqZWN0cykgeworICAgICAgICAg ICAgaWYgKHBvc2l0aW9uZWRCb3ggPT0gJnJlbmRlckJveCkKKyAgICAgICAgICAgICAgICBjb250 aW51ZTsKKyAgICAgICAgICAgIGlmIChwb3NpdGlvbmVkQm94LT5zdHlsZSgpLnBvc2l0aW9uKCkg PT0gRml4ZWRQb3NpdGlvbiAmJiByZW5kZXJCb3guZWxlbWVudCgpLT5jb250YWlucyhwb3NpdGlv bmVkQm94LT5lbGVtZW50KCkpKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAg ICAgfQogICAgIH0KIAotICAgIGlmIChyZW5kZXJlci5jYW5Db250YWluQWJzb2x1dGVseVBvc2l0 aW9uZWRPYmplY3RzKCkpIHsKKyAgICBpZiAocmVuZGVyQm94LmNhbkNvbnRhaW5BYnNvbHV0ZWx5 UG9zaXRpb25lZE9iamVjdHMoKSkgewogICAgICAgICAvLyBPdXIgbGF5b3V0IG92ZXJmbG93IHdp bGwgaW5jbHVkZSBhbGwgZGVzY2VuZGFudCBwb3NpdGlvbmVkIGVsZW1lbnRzLgogICAgICAgICBy ZXR1cm4gdHJ1ZTsKICAgICB9CiAKICAgICAvLyBUaGlzIHJlbmRlcmVyIG1heSBoYXZlIHBvc2l0 aW9uZWQgZGVzY2VuZGFudHMgd2hvc2UgY29udGFpbmluZyBibG9jayBpcyBzb21lIGFuY2VzdG9y LgotICAgIGlmIChhdXRvIGNvbnRhaW5pbmdCbG9jayA9IHJlbmRlcmVyLmNvbnRhaW5pbmdCbG9j a0ZvckFic29sdXRlUG9zaXRpb24oKSkgewotICAgICAgICBpZiAoYXV0byBwb3NpdGlvbmVkT2Jq ZWN0cyA9IGNvbnRhaW5pbmdCbG9jay0+cG9zaXRpb25lZE9iamVjdHMoKSkgewotICAgICAgICAg ICAgZm9yIChSZW5kZXJCb3gqIGl0IDogKnBvc2l0aW9uZWRPYmplY3RzKSB7Ci0gICAgICAgICAg ICAgICAgaWYgKGl0ICE9ICZyZW5kZXJlciAmJiByZW5kZXJlci5lbGVtZW50KCktPmNvbnRhaW5z KGl0LT5lbGVtZW50KCkpKQorICAgIGlmIChhdXRvKiBjb250YWluaW5nQmxvY2sgPSByZW5kZXJC b3guY29udGFpbmluZ0Jsb2NrRm9yQWJzb2x1dGVQb3NpdGlvbigpKSB7CisgICAgICAgIGlmIChh dXRvKiBwb3NpdGlvbmVkT2JqZWN0cyA9IGNvbnRhaW5pbmdCbG9jay0+cG9zaXRpb25lZE9iamVj dHMoKSkgeworICAgICAgICAgICAgZm9yIChhdXRvKiBwb3NpdGlvbmVkQm94IDogKnBvc2l0aW9u ZWRPYmplY3RzKSB7CisgICAgICAgICAgICAgICAgaWYgKHBvc2l0aW9uZWRCb3ggPT0gJnJlbmRl ckJveCkKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICAgICAgaWYg KHJlbmRlckJveC5lbGVtZW50KCktPmNvbnRhaW5zKHBvc2l0aW9uZWRCb3gtPmVsZW1lbnQoKSkp CiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgICAgIH0KICAgICAg ICAgfQogICAgIH0KLSAgICAKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmNwcAppbmRleCA0OGI0MzVmYThlYjkzNjNhZWU1M2Ri NmU0MWE4ZTY1NWNjNTQ0NWVlLi4yMGNkMDA5ZGU3NzVkZTIwNWMyNzljMjRkODA3MTdkZTA4ZjI2 ZWFiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRWxlbWVudC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuY3BwCkBAIC02 NDcsNiArNjQ3LDI5IEBAIHZvaWQgUmVuZGVyRWxlbWVudDo6cmVtb3ZlQ2hpbGRJbnRlcm5hbChS ZW5kZXJPYmplY3QmIG9sZENoaWxkLCBOb3RpZnlDaGlsZHJlblR5CiAgICAgICAgIGNhY2hlLT5j aGlsZHJlbkNoYW5nZWQodGhpcyk7CiB9CiAKK1JlbmRlckJsb2NrKiBSZW5kZXJFbGVtZW50Ojpj b250YWluaW5nQmxvY2tGb3JGaXhlZFBvc2l0aW9uKCkgY29uc3QKK3sKKyAgICBhdXRvKiByZW5k ZXJlciA9IHBhcmVudCgpOworICAgIHdoaWxlIChyZW5kZXJlciAmJiAhcmVuZGVyZXItPmNhbkNv bnRhaW5GaXhlZFBvc2l0aW9uT2JqZWN0cygpKQorICAgICAgICByZW5kZXJlciA9IHJlbmRlcmVy LT5wYXJlbnQoKTsKKworICAgIEFTU0VSVCghcmVuZGVyZXIgfHwgIXJlbmRlcmVyLT5pc0Fub255 bW91c0Jsb2NrKCkpOworICAgIHJldHVybiBkb3duY2FzdDxSZW5kZXJCbG9jaz4ocmVuZGVyZXIp OworfQorCitSZW5kZXJCbG9jayogUmVuZGVyRWxlbWVudDo6Y29udGFpbmluZ0Jsb2NrRm9yQWJz b2x1dGVQb3NpdGlvbigpIGNvbnN0Cit7CisgICAgLy8gQSByZWxhdGl2ZWx5IHBvc2l0aW9uZWQg UmVuZGVySW5saW5lIGZvcndhcmRzIGl0cyBhYnNvbHV0ZSBwb3NpdGlvbmVkIGRlc2NlbmRhbnRz IHRvCisgICAgLy8gaXRzIG5lYXJlc3Qgbm9uLWFub255bW91cyBjb250YWluaW5nIGJsb2NrICh0 byBhdm9pZCBoYXZpbmcgYSBwb3NpdGlvbmVkIG9iamVjdHMgbGlzdCBpbiBhbGwgUmVuZGVySW5s aW5lcykuCisgICAgYXV0byogcmVuZGVyZXIgPSBpc1JlbmRlcklubGluZSgpID8gY29uc3RfY2Fz dDxSZW5kZXJFbGVtZW50Kj4oZG93bmNhc3Q8UmVuZGVyRWxlbWVudD4odGhpcykpIDogcGFyZW50 KCk7CisgICAgd2hpbGUgKHJlbmRlcmVyICYmICFyZW5kZXJlci0+Y2FuQ29udGFpbkFic29sdXRl bHlQb3NpdGlvbmVkT2JqZWN0cygpKQorICAgICAgICByZW5kZXJlciA9IHJlbmRlcmVyLT5wYXJl bnQoKTsKKyAgICAvLyBNYWtlIHN1cmUgd2Ugb25seSByZXR1cm4gbm9uLWFub255bW91cyBSZW5k ZXJCbG9jayBhcyBjb250YWluaW5nIGJsb2NrLgorICAgIHdoaWxlIChyZW5kZXJlciAmJiAoIWlz PFJlbmRlckJsb2NrPigqcmVuZGVyZXIpIHx8IHJlbmRlcmVyLT5pc0Fub255bW91c0Jsb2NrKCkp KQorICAgICAgICByZW5kZXJlciA9IHJlbmRlcmVyLT5jb250YWluaW5nQmxvY2soKTsKKyAgICBy ZXR1cm4gZG93bmNhc3Q8UmVuZGVyQmxvY2s+KHJlbmRlcmVyKTsKK30KKwogc3RhdGljIHZvaWQg YWRkTGF5ZXJzKFJlbmRlckVsZW1lbnQmIHJlbmRlcmVyLCBSZW5kZXJMYXllciogcGFyZW50TGF5 ZXIsIFJlbmRlckVsZW1lbnQqJiBuZXdPYmplY3QsIFJlbmRlckxheWVyKiYgYmVmb3JlQ2hpbGQp CiB7CiAgICAgaWYgKHJlbmRlcmVyLmhhc0xheWVyKCkpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyRWxlbWVudC5oCmluZGV4IGM4MGVkYzY3OTQwZWE5MTNmZTNlMDRhYjAyMTVlZGJl OGQ4MDI3YjMuLjVkYjZhMmM5NzUyMGJiNDMwMTY1NWE4YjUyYmViNjNiYjVmZDlhMTggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJFbGVtZW50LmgKKysrIGIvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckVsZW1lbnQuaApAQCAtMjE4LDYgKzIxOCw4IEBA IHB1YmxpYzoKICAgICB2b2lkIGFkanVzdENvbXB1dGVkRm9udFNpemVzT25CbG9ja3MoZmxvYXQg c2l6ZSwgZmxvYXQgdmlzaWJsZVdpZHRoKTsKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHJlc2V0 VGV4dEF1dG9zaXppbmcoKTsKICNlbmRpZgorICAgIFJlbmRlckJsb2NrKiBjb250YWluaW5nQmxv Y2tGb3JGaXhlZFBvc2l0aW9uKCkgY29uc3Q7CisgICAgUmVuZGVyQmxvY2sqIGNvbnRhaW5pbmdC bG9ja0ZvckFic29sdXRlUG9zaXRpb24oKSBjb25zdDsKIAogcHJvdGVjdGVkOgogICAgIGVudW0g QmFzZVR5cGVGbGFnIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJJbmxpbmUuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAK aW5kZXggYWRhYjY0ODVjYWRjYTIxYzZlNTQzODQ3ZGNiMTIyNDdiMDJlMTkyZi4uOTRhNzM0M2Qx MjY4ZjljZjlhZmQ3MzEzYmIyNWY0MWMzM2UzYTJmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlcklubGluZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlcklubGluZS5jcHAKQEAgLTE2OCwxMCArMTY4LDkgQEAgc3RhdGljIHZvaWQgdXBk YXRlU3R5bGVPZkFub255bW91c0Jsb2NrQ29udGludWF0aW9ucyhjb25zdCBSZW5kZXJCbG9jayYg YmxvY2ssIGMKIHZvaWQgUmVuZGVySW5saW5lOjpzdHlsZVdpbGxDaGFuZ2UoU3R5bGVEaWZmZXJl bmNlIGRpZmYsIGNvbnN0IFJlbmRlclN0eWxlJiBuZXdTdHlsZSkKIHsKICAgICBSZW5kZXJCb3hN b2RlbE9iamVjdDo6c3R5bGVXaWxsQ2hhbmdlKGRpZmYsIG5ld1N0eWxlKTsKLQotICAgIC8vIENo ZWNrIGlmIHRoaXMgaW5saW5lIGNhbiBob2xkIGFic29sdXRlIHBvc2l0aW9uZWQgZWxtZW1lbnRz IGV2ZW4gYWZ0ZXIgdGhlIHN0eWxlIGNoYW5nZS4KKyAgICAvLyBSZW5kZXJJbmxpbmVzIGZvcndh cmQgdGhlaXIgYWJzb2x1dGUgcG9zaXRpb25lZCBkZXNjZW5kYW50cyB0byB0aGVpciAobm9uLWFu b255bW91cykgY29udGFpbmluZyBibG9jay4KKyAgICAvLyBDaGVjayBpZiB0aGlzIG5vbi1hbm9u eW1vdXMgY29udGFpbmluZyBibG9jayBjYW4gaG9sZCB0aGUgYWJzb2x1dGUgcG9zaXRpb25lZCBl bGVtZW50cyB3aGVuIHRoZSBpbmxpbmUgaXMgbm8gbG9uZ2VyIHBvc2l0aW9uZWQuCiAgICAgaWYg KGNhbkNvbnRhaW5BYnNvbHV0ZWx5UG9zaXRpb25lZE9iamVjdHMoKSAmJiBuZXdTdHlsZS5wb3Np dGlvbigpID09IFN0YXRpY1Bvc2l0aW9uKSB7Ci0gICAgICAgIC8vIFJlbmRlcklubGluZXMgZm9y d2FyZCB0aGVpciBhYnNvbHV0ZSBwb3NpdGlvbmVkIGRlc2NlbmRhbnRzIHRvIHRoZWlyIChub24t YW5vbnltb3VzKSBjb250YWluaW5nIGJsb2NrLgogICAgICAgICBhdXRvKiBjb250YWluZXIgPSBj b250YWluaW5nQmxvY2tGb3JBYnNvbHV0ZVBvc2l0aW9uKCk7CiAgICAgICAgIGlmIChjb250YWlu ZXIgJiYgIWNvbnRhaW5lci0+Y2FuQ29udGFpbkFic29sdXRlbHlQb3NpdGlvbmVkT2JqZWN0cygp KQogICAgICAgICAgICAgY29udGFpbmVyLT5yZW1vdmVQb3NpdGlvbmVkT2JqZWN0cyhudWxscHRy LCBOZXdDb250YWluaW5nQmxvY2spOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlck9iamVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2Jq ZWN0LmNwcAppbmRleCBhYzMxMjI2MjYwNGEyZDNlMTRhMWJjZTVjM2JkZTdlMWRkZWU1N2YwLi5i NzNhY2U4NWZkMWE5OWEzYjJhZWVjMjU5MmEzZDZmY2YyYjc2MjRmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyT2JqZWN0LmNwcApAQCAtNTY4LDcgKzU2OCw3IEBAIHZvaWQgUmVu ZGVyT2JqZWN0OjpzZXRMYXllck5lZWRzRnVsbFJlcGFpbnRGb3JQb3NpdGlvbmVkTW92ZW1lbnRM YXlvdXQoKQogCiBSZW5kZXJCbG9jayogUmVuZGVyT2JqZWN0Ojpjb250YWluaW5nQmxvY2soKSBj b25zdAogewotICAgIGF1dG8gY29udGFpbmluZ0Jsb2NrRm9yUmVuZGVyZXIgPSBbXShjb25zdCBS ZW5kZXJPYmplY3QmIHJlbmRlcmVyKQorICAgIGF1dG8gY29udGFpbmluZ0Jsb2NrRm9yUmVuZGVy ZXIgPSBbXShjb25zdCBSZW5kZXJFbGVtZW50JiByZW5kZXJlcikKICAgICB7CiAgICAgICAgIGF1 dG8mIHN0eWxlID0gcmVuZGVyZXIuc3R5bGUoKTsKICAgICAgICAgaWYgKHN0eWxlLnBvc2l0aW9u KCkgPT0gQWJzb2x1dGVQb3NpdGlvbikKQEAgLTU4Miw0MiArNTgyLDExIEBAIFJlbmRlckJsb2Nr KiBSZW5kZXJPYmplY3Q6OmNvbnRhaW5pbmdCbG9jaygpIGNvbnN0CiAgICAgICAgIHJldHVybiBj b250YWluaW5nQmxvY2tGb3JPYmplY3RJbkZsb3coKTsKIAogICAgIGlmICghcGFyZW50KCkgJiYg aXM8UmVuZGVyU2Nyb2xsYmFyUGFydD4oKnRoaXMpKSB7Ci0gICAgICAgIGlmIChhdXRvKiByZW5k ZXJlciA9IGRvd25jYXN0PFJlbmRlclNjcm9sbGJhclBhcnQ+KCp0aGlzKS5yZW5kZXJlck93bmlu Z1Njcm9sbGJhcigpKQotICAgICAgICAgICAgcmV0dXJuIGNvbnRhaW5pbmdCbG9ja0ZvclJlbmRl cmVyKCpyZW5kZXJlcik7CisgICAgICAgIGlmIChhdXRvKiBzY3JvbGxiYXJQYXJ0ID0gZG93bmNh c3Q8UmVuZGVyU2Nyb2xsYmFyUGFydD4oKnRoaXMpLnJlbmRlcmVyT3duaW5nU2Nyb2xsYmFyKCkp CisgICAgICAgICAgICByZXR1cm4gY29udGFpbmluZ0Jsb2NrRm9yUmVuZGVyZXIoKnNjcm9sbGJh clBhcnQpOwogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9Ci0gICAgcmV0dXJuIGNvbnRh aW5pbmdCbG9ja0ZvclJlbmRlcmVyKCp0aGlzKTsKLX0KLQotUmVuZGVyQmxvY2sqIFJlbmRlck9i amVjdDo6Y29udGFpbmluZ0Jsb2NrRm9yRml4ZWRQb3NpdGlvbigpIGNvbnN0Ci17Ci0gICAgYXV0 byogcmVuZGVyZXIgPSBwYXJlbnQoKTsKLSAgICB3aGlsZSAocmVuZGVyZXIgJiYgIXJlbmRlcmVy LT5jYW5Db250YWluRml4ZWRQb3NpdGlvbk9iamVjdHMoKSkKLSAgICAgICAgcmVuZGVyZXIgPSBy ZW5kZXJlci0+cGFyZW50KCk7Ci0KLSAgICBBU1NFUlQoIXJlbmRlcmVyIHx8ICFyZW5kZXJlci0+ aXNBbm9ueW1vdXNCbG9jaygpKTsKLSAgICByZXR1cm4gZG93bmNhc3Q8UmVuZGVyQmxvY2s+KHJl bmRlcmVyKTsKLX0KLQotUmVuZGVyQmxvY2sqIFJlbmRlck9iamVjdDo6Y29udGFpbmluZ0Jsb2Nr Rm9yQWJzb2x1dGVQb3NpdGlvbigpIGNvbnN0Ci17Ci0gICAgLy8gUmVuZGVySW5saW5lcyBmb3J3 YXJkIHRoZWlyIGFic29sdXRlIHBvc2l0aW9uZWQgZGVzY2VuZGFudHMgdG8gdGhlIGNvbnRhaW5p bmcgYmxvY2ssIHNvCi0gICAgLy8gd2UgbmVlZCB0byBzdGFydCBzZWFyY2hpbmcgZnJvbSAndGhp cycgYW5kIG5vdCBmcm9tICdwYXJlbnQoKScuCi0gICAgYXV0byogcmVuZGVyZXIgPSBpc1JlbmRl cklubGluZSgpID8gY29uc3RfY2FzdDxSZW5kZXJFbGVtZW50Kj4oZG93bmNhc3Q8UmVuZGVyRWxl bWVudD4odGhpcykpIDogcGFyZW50KCk7Ci0gICAgd2hpbGUgKHJlbmRlcmVyICYmICFyZW5kZXJl ci0+Y2FuQ29udGFpbkFic29sdXRlbHlQb3NpdGlvbmVkT2JqZWN0cygpKQotICAgICAgICByZW5k ZXJlciA9IHJlbmRlcmVyLT5wYXJlbnQoKTsKLQotICAgIC8vIEZvciBhIHJlbGF0aXZlbHkgcG9z aXRpb25lZCBpbmxpbmUsIHJldHVybiBpdHMgbmVhcmVzdCBub24tYW5vbnltb3VzIGNvbnRhaW5p bmcgYmxvY2ssCi0gICAgLy8gbm90IHRoZSBpbmxpbmUgaXRzZWxmLCB0byBhdm9pZCBoYXZpbmcg YSBwb3NpdGlvbmVkIG9iamVjdHMgbGlzdCBpbiBhbGwgUmVuZGVySW5saW5lcwotICAgIC8vIGFu ZCB1c2UgUmVuZGVyQmxvY2sqIGFzIFJlbmRlckVsZW1lbnQ6OmNvbnRhaW5pbmdCbG9jaydzIHJl dHVybiB0eXBlLgotICAgIC8vIFVzZSBSZW5kZXJCbG9jazo6Y29udGFpbmVyKCkgdG8gb2J0YWlu IHRoZSBpbmxpbmUuCi0gICAgaWYgKHJlbmRlcmVyICYmICFpczxSZW5kZXJCbG9jaz4oKnJlbmRl cmVyKSkKLSAgICAgICAgcmVuZGVyZXIgPSByZW5kZXJlci0+Y29udGFpbmluZ0Jsb2NrKCk7Ci0K LSAgICB3aGlsZSAocmVuZGVyZXIgJiYgcmVuZGVyZXItPmlzQW5vbnltb3VzQmxvY2soKSkKLSAg ICAgICAgcmVuZGVyZXIgPSByZW5kZXJlci0+Y29udGFpbmluZ0Jsb2NrKCk7Ci0KLSAgICByZXR1 cm4gZG93bmNhc3Q8UmVuZGVyQmxvY2s+KHJlbmRlcmVyKTsKKyAgICByZXR1cm4gY29udGFpbmlu Z0Jsb2NrRm9yUmVuZGVyZXIoZG93bmNhc3Q8UmVuZGVyRWxlbWVudD4oKnRoaXMpKTsKIH0KIAog UmVuZGVyQmxvY2sqIFJlbmRlck9iamVjdDo6Y29udGFpbmluZ0Jsb2NrRm9yT2JqZWN0SW5GbG93 KCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmpl Y3QuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaAppbmRleCA0MTE2 YTUwYjBmYTBkNzI5MDE4ZTk3MWY1NDQ0NTljMDNlODhjNGY1Li5lMzQyOTgxYWM5M2YyNGY2YWRi MjhkYzE0ZTVhOTczZGRkODVlNWE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyT2JqZWN0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9i amVjdC5oCkBAIC02MDAsOCArNjAwLDYgQEAgcHVibGljOgogCiAgICAgLy8gcmV0dXJucyB0aGUg Y29udGFpbmluZyBibG9jayBsZXZlbCBlbGVtZW50IGZvciB0aGlzIGVsZW1lbnQuCiAgICAgUmVu ZGVyQmxvY2sqIGNvbnRhaW5pbmdCbG9jaygpIGNvbnN0OwotICAgIFJlbmRlckJsb2NrKiBjb250 YWluaW5nQmxvY2tGb3JGaXhlZFBvc2l0aW9uKCkgY29uc3Q7Ci0gICAgUmVuZGVyQmxvY2sqIGNv bnRhaW5pbmdCbG9ja0ZvckFic29sdXRlUG9zaXRpb24oKSBjb25zdDsKICAgICBSZW5kZXJCbG9j ayogY29udGFpbmluZ0Jsb2NrRm9yT2JqZWN0SW5GbG93KCkgY29uc3Q7CiAKICAgICAvLyBDb252 ZXJ0IHRoZSBnaXZlbiBsb2NhbCBwb2ludCB0byBhYnNvbHV0ZSBjb29yZGluYXRlcy4gSWYgTWFw Q29vcmRpbmF0ZXNGbGFncyBpbmNsdWRlcyBVc2VUcmFuc2Zvcm1zLCB0YWtlIHRyYW5zZm9ybXMg aW50byBhY2NvdW50Lgo=