169477 2017-03-10 11:20:45 -0800 Simple line layout: Check how many orphans needed on the current page before breaking. 2017-03-10 16:33:26 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan bfulgham commit-queue simon.fraser zalan oldest_to_newest 1285858 0 zalan 2017-03-10 11:20:45 -0800 SSIA. 1285860 1 304057 zalan 2017-03-10 11:23:17 -0800 Created attachment 304057 Patch 1285867 2 304057 koivisto 2017-03-10 11:39:54 -0800 Comment on attachment 304057 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=304057&action=review > Source/WebCore/rendering/SimpleLineLayoutPagination.cpp:73 > + int windowsOnTheNextPage = lineCount - breakCandidate; I think you want "widows" not "windows". 1285868 3 304058 zalan 2017-03-10 11:44:44 -0800 Created attachment 304058 Patch 1285887 4 304063 zalan 2017-03-10 12:27:03 -0800 Created attachment 304063 Patch 1285973 5 304063 commit-queue 2017-03-10 16:33:22 -0800 Comment on attachment 304063 Patch Clearing flags on attachment: 304063 Committed r213733: <http://trac.webkit.org/changeset/213733> 1285974 6 commit-queue 2017-03-10 16:33:26 -0800 All reviewed patches have been landed. Closing bug. 304057 2017-03-10 11:23:17 -0800 2017-03-10 11:44:41 -0800 Patch bug-169477-20170310112317.patch text/plain 6523 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzNzEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjVlNjBmNDQ0YjBmNDg0 YmRkYzU3NGUyM2IxOGJmNmJhYTA3NDBmYi4uYzY0ZmI0MzY3MmU3YzYwMThlOWUxMTA2YTI2Mjg3 Yjg4NmM1NGI5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE3LTAzLTEwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxlIGxpbmUgbGF5b3V0 OiBDaGVjayBob3cgbWFueSBvcnBoYW5zIG5lZWRlZCBvbiB0aGUgY3VycmVudCBwYWdlIGJlZm9y ZSBicmVha2luZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE2OTQ3NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEJlZm9yZSBicmVha2luZyBmb3IgdGhlIHdpZG93cyB3ZSBhY3R1YWxseSBuZWVkIHRvIGNo ZWNrIGZvciBvcnBoYW5zIGZpcnN0LgorCisgICAgICAgIFRlc3Q6IGZhc3QvbXVsdGljb2wvc2lt cGxlLWxpbmUtbGF5b3V0LW9ycGhhbnMtYW5kLXdpZG93cy5odG1sCisKKyAgICAgICAgKiByZW5k ZXJpbmcvU2ltcGxlTGluZUxheW91dFBhZ2luYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U2ltcGxlTGluZUxheW91dDo6Y29tcHV0ZUxpbmVCcmVha0luZGV4KToKKyAgICAgICAgKFdlYkNv cmU6OlNpbXBsZUxpbmVMYXlvdXQ6OmFkanVzdExpbmVQb3NpdGlvbnNGb3JQYWdpbmF0aW9uKToK KwogMjAxNy0wMy0xMCAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAg ICAgQWxsb3cgdGhlIHBhZ2UgdG8gcmVuZGVyIGJlZm9yZSA8bGluaz4gc3R5bGVzaGVldCB0YWdz IGluIGJvZHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5l TGF5b3V0UGFnaW5hdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGlu ZUxheW91dFBhZ2luYXRpb24uY3BwCmluZGV4IDExNzM5YzQ2MjY0MTY5MTlhMmM2MzI3MWZhYzdh MGM1ZmQwZDkwZDcuLmQ4MzE4MzYzZjdlZTVmOGVjYTliYjE2MTI0Njc4MGQzMWNjNWJkMzMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UGFnaW5h dGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRQ YWdpbmF0aW9uLmNwcApAQCAtNjMsMTggKzYzLDIwIEBAIHN0YXRpYyBQYWdpbmF0ZWRMaW5lIGNv bXB1dGVMaW5lVG9wQW5kQm90dG9tV2l0aE92ZXJmbG93KGNvbnN0IFJlbmRlckJsb2NrRmxvdyYK ICAgICByZXR1cm4geyB0b3BQb3NpdGlvbiwgYm90dG9tUG9zaXRpb24sIGJvdHRvbVBvc2l0aW9u IC0gdG9wUG9zaXRpb24gfTsKIH0KIAotc3RhdGljIHVuc2lnbmVkIGNvbXB1dGVMaW5lQnJlYWtJ bmRleCh1bnNpZ25lZCBicmVha0NhbmRpZGF0ZSwgdW5zaWduZWQgbGluZUNvdW50LCB1bnNpZ25l ZCB3aWRvd3MsIGNvbnN0IExheW91dDo6U2ltcGxlTGluZVN0cnV0cyYgc3RydXRzKQorc3RhdGlj IHVuc2lnbmVkIGNvbXB1dGVMaW5lQnJlYWtJbmRleCh1bnNpZ25lZCBicmVha0NhbmRpZGF0ZSwg dW5zaWduZWQgbGluZUNvdW50LCBpbnQgb3JwaGFuc05lZWRlZCwgaW50IHdpZG93c05lZWRlZCwK KyAgICBjb25zdCBMYXlvdXQ6OlNpbXBsZUxpbmVTdHJ1dHMmIHN0cnV0cykKIHsKICAgICAvLyBG aXJzdCBsaW5lIGRvZXMgbm90IGZpdCB0aGUgY3VycmVudCBwYWdlLgogICAgIGlmICghYnJlYWtD YW5kaWRhdGUpCiAgICAgICAgIHJldHVybiBicmVha0NhbmRpZGF0ZTsKICAgICAKLSAgICBhdXRv IHJlbWFpbmluZ0xpbmVDb3VudCA9IGxpbmVDb3VudCAtIGJyZWFrQ2FuZGlkYXRlOwotICAgIGlm ICh3aWRvd3MgPD0gcmVtYWluaW5nTGluZUNvdW50KQorICAgIGludCB3aW5kb3dzT25UaGVOZXh0 UGFnZSA9IGxpbmVDb3VudCAtIGJyZWFrQ2FuZGlkYXRlOworICAgIGlmICh3aWRvd3NOZWVkZWQg PD0gd2luZG93c09uVGhlTmV4dFBhZ2UpCiAgICAgICAgIHJldHVybiBicmVha0NhbmRpZGF0ZTsK LSAgICAKICAgICAvLyBPbmx5IGJyZWFrIGFmdGVyIHRoZSBmaXJzdCBsaW5lIHdpdGggd2lkb3dz LgotICAgIGF1dG8gbGluZUJyZWFrID0gc3RkOjptYXg8aW50PihsaW5lQ291bnQgLSB3aWRvd3Ms IDEpOworICAgIGF1dG8gbGluZUJyZWFrID0gc3RkOjptYXg8aW50PihsaW5lQ291bnQgLSB3aWRv d3NOZWVkZWQsIDEpOworICAgIGlmIChvcnBoYW5zTmVlZGVkID4gbGluZUJyZWFrKQorICAgICAg ICByZXR1cm4gYnJlYWtDYW5kaWRhdGU7CiAgICAgLy8gQnJlYWsgb24gY3VycmVudCBwYWdlIG9u bHkuCiAgICAgaWYgKHN0cnV0cy5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVybiBsaW5lQnJlYWs7 CkBAIC0xMzAsNiArMTMyLDcgQEAgdm9pZCBhZGp1c3RMaW5lUG9zaXRpb25zRm9yUGFnaW5hdGlv bihTaW1wbGVMaW5lTGF5b3V0OjpMYXlvdXQmIHNpbXBsZUxpbmVzLCBSZW4KICAgICAgICAgcmV0 dXJuOwogICAgIHVuc2lnbmVkIGxpbmVJbmRleCA9IDA7CiAgICAgYXV0byB3aWRvd3MgPSBmbG93 LnN0eWxlKCkuaGFzQXV0b1dpZG93cygpID8gMSA6IHN0ZDo6bWF4PGludD4oZmxvdy5zdHlsZSgp LndpZG93cygpLCAxKTsKKyAgICBhdXRvIG9ycGhhbnMgPSBmbG93LnN0eWxlKCkuaGFzQXV0b09y cGhhbnMoKSA/IDEgOiBzdGQ6Om1heDxpbnQ+KGZsb3cuc3R5bGUoKS5vcnBoYW5zKCksIDEpOwog ICAgIFBhZ2luYXRlZExpbmVzIGxpbmVzOwogICAgIGZvciAodW5zaWduZWQgcnVuSW5kZXggPSAw OyBydW5JbmRleCA8IHNpbXBsZUxpbmVzLnJ1bkNvdW50KCk7ICsrcnVuSW5kZXgpIHsKICAgICAg ICAgYXV0byYgcnVuID0gc2ltcGxlTGluZXMucnVuQXQocnVuSW5kZXgpOwpAQCAtMTQxLDcgKzE0 NCw3IEBAIHZvaWQgYWRqdXN0TGluZVBvc2l0aW9uc0ZvclBhZ2luYXRpb24oU2ltcGxlTGluZUxh eW91dDo6TGF5b3V0JiBzaW1wbGVMaW5lcywgUmVuCiAgICAgICAgIGF1dG8gcmVtYWluaW5nSGVp Z2h0ID0gZmxvdy5wYWdlUmVtYWluaW5nTG9naWNhbEhlaWdodEZvck9mZnNldChsaW5lLnRvcCwg UmVuZGVyQmxvY2tGbG93OjpFeGNsdWRlUGFnZUJvdW5kYXJ5KTsKICAgICAgICAgYXV0byBhdFRo ZVRvcE9mQ29sdW1uT3JQYWdlID0gZmxvdy5wYWdlTG9naWNhbEhlaWdodEZvck9mZnNldChsaW5l LnRvcCkgPT0gcmVtYWluaW5nSGVpZ2h0OwogICAgICAgICBpZiAobGluZS5oZWlnaHQgPiByZW1h aW5pbmdIZWlnaHQgfHwgKGF0VGhlVG9wT2ZDb2x1bW5PclBhZ2UgJiYgbGluZUluZGV4KSkgewot ICAgICAgICAgICAgYXV0byBsaW5lQnJlYWtJbmRleCA9IGNvbXB1dGVMaW5lQnJlYWtJbmRleChs aW5lSW5kZXgsIGxpbmVDb3VudCwgd2lkb3dzLCBzdHJ1dHMpOworICAgICAgICAgICAgYXV0byBs aW5lQnJlYWtJbmRleCA9IGNvbXB1dGVMaW5lQnJlYWtJbmRleChsaW5lSW5kZXgsIGxpbmVDb3Vu dCwgb3JwaGFucywgd2lkb3dzLCBzdHJ1dHMpOwogICAgICAgICAgICAgLy8gQXJlIHdlIHN0aWxs IGF0IHRoZSB0b3Agb2YgdGhlIGNvbHVtbi9wYWdlPwogICAgICAgICAgICAgYXRUaGVUb3BPZkNv bHVtbk9yUGFnZSA9IGF0VGhlVG9wT2ZDb2x1bW5PclBhZ2UgPyBsaW5lSW5kZXggPT0gbGluZUJy ZWFrSW5kZXggOiBmYWxzZTsKICAgICAgICAgICAgIHNldFBhZ2VCcmVha0ZvckxpbmUobGluZUJy ZWFrSW5kZXgsIGxpbmVzLCBmbG93LCBzdHJ1dHMsIGF0VGhlVG9wT2ZDb2x1bW5PclBhZ2UpOwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CmluZGV4IGM3Y2VjYTkxMTgxYTc4YzE5ZTJkNWZkZGFjOTA3MDUwMDc4ZjlmNzAuLmNhNDkzMTMw MWEzODk2YzY3M2UxMWZmYmNlNDhmYTU3MzZhNjU0YjIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAor MjAxNy0wMy0xMCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCisgICAgICAgIFNp bXBsZSBsaW5lIGxheW91dDogQ2hlY2sgaG93IG1hbnkgb3JwaGFucyBuZWVkZWQgb24gdGhlIGN1 cnJlbnQgcGFnZSBiZWZvcmUgYnJlYWtpbmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNjk0NzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIGZhc3QvbXVsdGljb2wvc2ltcGxlLWxpbmUtbGF5b3V0LW9y cGhhbnMtYW5kLXdpZG93cy1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L211 bHRpY29sL3NpbXBsZS1saW5lLWxheW91dC1vcnBoYW5zLWFuZC13aWRvd3MuaHRtbDogQWRkZWQu CisKIDIwMTctMDMtMTAgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAg ICAgIExvYWRpbmcgaW4tYm9keSBzdHlsZXNoZWV0cyBzaG91bGQgbm90IGJsb2NrIHJlbmRlcmlu ZyBvZiBlbGVtZW50cyBiZWZvcmUgdGhlbQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9t dWx0aWNvbC9zaW1wbGUtbGluZS1sYXlvdXQtb3JwaGFucy1hbmQtd2lkb3dzLWV4cGVjdGVkLmh0 bWwgYi9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL3NpbXBsZS1saW5lLWxheW91dC1vcnBoYW5z LWFuZC13aWRvd3MtZXhwZWN0ZWQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi43MGE5ZTFlZDNkMDg5NTM4Mzk2 NTI4NjdjMGU2NDE2ODdlNzNlMTZjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFz dC9tdWx0aWNvbC9zaW1wbGUtbGluZS1sYXlvdXQtb3JwaGFucy1hbmQtd2lkb3dzLWV4cGVjdGVk Lmh0bWwKQEAgLTAsMCArMSwyNCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgor PHRpdGxlPlRoaXMgdGVzdHMgb3JwaGFucyBoYW5kbGluZyB3aXRoIHNpbXBsZSBsaW5lIGxheW91 dC48L3RpdGxlPgorPHNjcmlwdD4KKyAgICBpZiAod2luZG93LmludGVybmFscykKKyAgICAgICAg aW50ZXJuYWxzLnNldFBhZ2luYXRpb24oIkxlZnRUb1JpZ2h0UGFnaW5hdGVkIiwgMCk7Cis8L3Nj cmlwdD4KKzxzdHlsZT4KK2JvZHkgeworCXdpZHRoOiA0OTRweDsKK30KKworZGl2IHsKKwlmb250 LXNpemU6IDU0cHg7CisJbWFyZ2luOiAwcHg7Cit9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+ Cis8ZGl2PmZvb2JhciBmb29iYXIgZm9vYmFyIGZvb2JhciBmb29iYXIgZm9vYmFyIGZvb2JhciBm b29iYXIgZm9vYmFyIGZvb2JhciBmb29iYXIgZm9vYmFyIGZvb2JhciBmb29iYXIgZm9vYmFyIGZv b2JhciBmb29iYXIgZm9vYmFyIGZvb2JhcjwvZGl2PgorPGRpdj5mb29iYXIgZm9vYmFyIGZvb2Jh ciBmb29iYXIgZm9vYmFyIGZvb2JhciBmb29iYXI8L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbXVsdGljb2wvc2ltcGxlLWxpbmUtbGF5b3V0LW9y cGhhbnMtYW5kLXdpZG93cy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9zaW1wbGUt bGluZS1sYXlvdXQtb3JwaGFucy1hbmQtd2lkb3dzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMzUwNWNlNzRl ZjA5YjgyNWIwMjFjMjkzNmU5ZjE0MGY3NGM3ZWQ1NgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2Zhc3QvbXVsdGljb2wvc2ltcGxlLWxpbmUtbGF5b3V0LW9ycGhhbnMtYW5kLXdpZG93 cy5odG1sCkBAIC0wLDAgKzEsMjYgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4K Kzx0aXRsZT5UaGlzIHRlc3RzIG9ycGhhbnMgaGFuZGxpbmcgd2l0aCBzaW1wbGUgbGluZSBsYXlv dXQuPC90aXRsZT4KKzxzY3JpcHQ+CisgICAgaWYgKHdpbmRvdy5pbnRlcm5hbHMpCisgICAgICAg IGludGVybmFscy5zZXRQYWdpbmF0aW9uKCJMZWZ0VG9SaWdodFBhZ2luYXRlZCIsIDApOworPC9z Y3JpcHQ+Cis8c3R5bGU+Citib2R5IHsKKwlvcnBoYW5zOiAyOworCXdpZG93czogMzsKKwl3aWR0 aDogNDk0cHg7Cit9CisKK2RpdiB7CisJZm9udC1zaXplOiA1NHB4OworCW1hcmdpbjogMHB4Owor fQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorPGRpdj5mb29iYXIgZm9vYmFyIGZvb2JhciBm b29iYXIgZm9vYmFyIGZvb2JhciBmb29iYXIgZm9vYmFyIGZvb2JhciBmb29iYXIgZm9vYmFyIGZv b2JhciBmb29iYXIgZm9vYmFyIGZvb2JhciBmb29iYXIgZm9vYmFyIGZvb2JhciBmb29iYXI8L2Rp dj4KKzxkaXY+Zm9vYmFyIGZvb2JhciBmb29iYXIgZm9vYmFyIGZvb2JhciBmb29iYXIgZm9vYmFy PC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+Cg== 304058 2017-03-10 11:44:44 -0800 2017-03-10 12:27:01 -0800 Patch bug-169477-20170310114443.patch text/plain 7788 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzNzEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjVlNjBmNDQ0YjBmNDg0 YmRkYzU3NGUyM2IxOGJmNmJhYTA3NDBmYi4uMGU1YmQzNDk2NTg2NTUyZjhjODdhYjMzMWEzZjg5 OGViZjNhYWY5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE3LTAzLTEwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxlIGxpbmUgbGF5b3V0 OiBDaGVjayBob3cgbWFueSBvcnBoYW5zIG5lZWRlZCBvbiB0aGUgY3VycmVudCBwYWdlIGJlZm9y ZSBicmVha2luZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE2OTQ3NworCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAg ICAgIEJlZm9yZSBicmVha2luZyBmb3IgdGhlIHdpZG93cyB3ZSBhY3R1YWxseSBuZWVkIHRvIGNo ZWNrIGZvciBvcnBoYW5zIGZpcnN0LgorCisgICAgICAgIFRlc3Q6IGZhc3QvbXVsdGljb2wvc2lt cGxlLWxpbmUtbGF5b3V0LW9ycGhhbnMtYW5kLXdpZG93cy5odG1sCisKKyAgICAgICAgKiByZW5k ZXJpbmcvU2ltcGxlTGluZUxheW91dFBhZ2luYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U2ltcGxlTGluZUxheW91dDo6Y29tcHV0ZUxpbmVCcmVha0luZGV4KToKKyAgICAgICAgKFdlYkNv cmU6OlNpbXBsZUxpbmVMYXlvdXQ6OmFkanVzdExpbmVQb3NpdGlvbnNGb3JQYWdpbmF0aW9uKToK KwogMjAxNy0wMy0xMCAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAg ICAgQWxsb3cgdGhlIHBhZ2UgdG8gcmVuZGVyIGJlZm9yZSA8bGluaz4gc3R5bGVzaGVldCB0YWdz IGluIGJvZHkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5l TGF5b3V0UGFnaW5hdGlvbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGlu ZUxheW91dFBhZ2luYXRpb24uY3BwCmluZGV4IDExNzM5YzQ2MjY0MTY5MTlhMmM2MzI3MWZhYzdh MGM1ZmQwZDkwZDcuLmZlNTZiYzk4N2Q4Zjc5MmVlMDE1NDY5YTdmYmQ3Y2I4Njg5MWExMTMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UGFnaW5h dGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRQ YWdpbmF0aW9uLmNwcApAQCAtNjMsMTggKzYzLDIwIEBAIHN0YXRpYyBQYWdpbmF0ZWRMaW5lIGNv bXB1dGVMaW5lVG9wQW5kQm90dG9tV2l0aE92ZXJmbG93KGNvbnN0IFJlbmRlckJsb2NrRmxvdyYK ICAgICByZXR1cm4geyB0b3BQb3NpdGlvbiwgYm90dG9tUG9zaXRpb24sIGJvdHRvbVBvc2l0aW9u IC0gdG9wUG9zaXRpb24gfTsKIH0KIAotc3RhdGljIHVuc2lnbmVkIGNvbXB1dGVMaW5lQnJlYWtJ bmRleCh1bnNpZ25lZCBicmVha0NhbmRpZGF0ZSwgdW5zaWduZWQgbGluZUNvdW50LCB1bnNpZ25l ZCB3aWRvd3MsIGNvbnN0IExheW91dDo6U2ltcGxlTGluZVN0cnV0cyYgc3RydXRzKQorc3RhdGlj IHVuc2lnbmVkIGNvbXB1dGVMaW5lQnJlYWtJbmRleCh1bnNpZ25lZCBicmVha0NhbmRpZGF0ZSwg dW5zaWduZWQgbGluZUNvdW50LCBpbnQgb3JwaGFuc05lZWRlZCwgaW50IHdpZG93c05lZWRlZCwK KyAgICBjb25zdCBMYXlvdXQ6OlNpbXBsZUxpbmVTdHJ1dHMmIHN0cnV0cykKIHsKICAgICAvLyBG aXJzdCBsaW5lIGRvZXMgbm90IGZpdCB0aGUgY3VycmVudCBwYWdlLgogICAgIGlmICghYnJlYWtD YW5kaWRhdGUpCiAgICAgICAgIHJldHVybiBicmVha0NhbmRpZGF0ZTsKICAgICAKLSAgICBhdXRv IHJlbWFpbmluZ0xpbmVDb3VudCA9IGxpbmVDb3VudCAtIGJyZWFrQ2FuZGlkYXRlOwotICAgIGlm ICh3aWRvd3MgPD0gcmVtYWluaW5nTGluZUNvdW50KQorICAgIGludCB3aWRvd3NPblRoZU5leHRQ YWdlID0gbGluZUNvdW50IC0gYnJlYWtDYW5kaWRhdGU7CisgICAgaWYgKHdpZG93c05lZWRlZCA8 PSB3aWRvd3NPblRoZU5leHRQYWdlKQogICAgICAgICByZXR1cm4gYnJlYWtDYW5kaWRhdGU7Ci0g ICAgCiAgICAgLy8gT25seSBicmVhayBhZnRlciB0aGUgZmlyc3QgbGluZSB3aXRoIHdpZG93cy4K LSAgICBhdXRvIGxpbmVCcmVhayA9IHN0ZDo6bWF4PGludD4obGluZUNvdW50IC0gd2lkb3dzLCAx KTsKKyAgICBhdXRvIGxpbmVCcmVhayA9IHN0ZDo6bWF4PGludD4obGluZUNvdW50IC0gd2lkb3dz TmVlZGVkLCAxKTsKKyAgICBpZiAob3JwaGFuc05lZWRlZCA+IGxpbmVCcmVhaykKKyAgICAgICAg cmV0dXJuIGJyZWFrQ2FuZGlkYXRlOwogICAgIC8vIEJyZWFrIG9uIGN1cnJlbnQgcGFnZSBvbmx5 LgogICAgIGlmIChzdHJ1dHMuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4gbGluZUJyZWFrOwpA QCAtOTcsOSArOTksOSBAQCBzdGF0aWMgdm9pZCBzZXRQYWdlQnJlYWtGb3JMaW5lKHVuc2lnbmVk IGxpbmVCcmVha0luZGV4LCBQYWdpbmF0ZWRMaW5lcyYgbGluZXMsCiAgICAgYXV0byBsaW5lID0g bGluZXMuYXQobGluZUJyZWFrSW5kZXgpOwogICAgIGF1dG8gcmVtYWluaW5nTG9naWNhbEhlaWdo dCA9IGZsb3cucGFnZVJlbWFpbmluZ0xvZ2ljYWxIZWlnaHRGb3JPZmZzZXQobGluZS50b3AsIFJl bmRlckJsb2NrRmxvdzo6RXhjbHVkZVBhZ2VCb3VuZGFyeSk7CiAgICAgYXV0byYgc3R5bGUgPSBm bG93LnN0eWxlKCk7Ci0gICAgYXV0byBmaXJzdExpbmVXaXRoRG9lc05vdEZpdCA9ICFsaW5lQnJl YWtJbmRleCAmJiBsaW5lLmhlaWdodCA8IGZsb3cucGFnZUxvZ2ljYWxIZWlnaHRGb3JPZmZzZXQo bGluZS50b3ApOworICAgIGF1dG8gZmlyc3RMaW5lRG9lc05vdEZpdCA9ICFsaW5lQnJlYWtJbmRl eCAmJiBsaW5lLmhlaWdodCA8IGZsb3cucGFnZUxvZ2ljYWxIZWlnaHRGb3JPZmZzZXQobGluZS50 b3ApOwogICAgIGF1dG8gb3JwaGFuRG9lc05vdEZpdCA9ICFzdHlsZS5oYXNBdXRvT3JwaGFucygp ICYmIHN0eWxlLm9ycGhhbnMoKSA+IChzaG9ydClsaW5lQnJlYWtJbmRleDsKLSAgICBpZiAoZmly c3RMaW5lV2l0aERvZXNOb3RGaXQgfHwgb3JwaGFuRG9lc05vdEZpdCkgeworICAgIGlmIChmaXJz dExpbmVEb2VzTm90Rml0IHx8IG9ycGhhbkRvZXNOb3RGaXQpIHsKICAgICAgICAgZmxvdy5zZXRQ YWdlQnJlYWsobGluZS50b3AsIGxpbmUuaGVpZ2h0IC0gcmVtYWluaW5nTG9naWNhbEhlaWdodCk7 CiAgICAgICAgIGZsb3cuc2V0UGFnaW5hdGlvblN0cnV0KGxpbmUudG9wICsgcmVtYWluaW5nTG9n aWNhbEhlaWdodCk7CiAgICAgICAgIHJldHVybjsKQEAgLTEzMCw2ICsxMzIsNyBAQCB2b2lkIGFk anVzdExpbmVQb3NpdGlvbnNGb3JQYWdpbmF0aW9uKFNpbXBsZUxpbmVMYXlvdXQ6OkxheW91dCYg c2ltcGxlTGluZXMsIFJlbgogICAgICAgICByZXR1cm47CiAgICAgdW5zaWduZWQgbGluZUluZGV4 ID0gMDsKICAgICBhdXRvIHdpZG93cyA9IGZsb3cuc3R5bGUoKS5oYXNBdXRvV2lkb3dzKCkgPyAx IDogc3RkOjptYXg8aW50PihmbG93LnN0eWxlKCkud2lkb3dzKCksIDEpOworICAgIGF1dG8gb3Jw aGFucyA9IGZsb3cuc3R5bGUoKS5oYXNBdXRvT3JwaGFucygpID8gMSA6IHN0ZDo6bWF4PGludD4o Zmxvdy5zdHlsZSgpLm9ycGhhbnMoKSwgMSk7CiAgICAgUGFnaW5hdGVkTGluZXMgbGluZXM7CiAg ICAgZm9yICh1bnNpZ25lZCBydW5JbmRleCA9IDA7IHJ1bkluZGV4IDwgc2ltcGxlTGluZXMucnVu Q291bnQoKTsgKytydW5JbmRleCkgewogICAgICAgICBhdXRvJiBydW4gPSBzaW1wbGVMaW5lcy5y dW5BdChydW5JbmRleCk7CkBAIC0xNDEsMTEgKzE0NCwxMSBAQCB2b2lkIGFkanVzdExpbmVQb3Np dGlvbnNGb3JQYWdpbmF0aW9uKFNpbXBsZUxpbmVMYXlvdXQ6OkxheW91dCYgc2ltcGxlTGluZXMs IFJlbgogICAgICAgICBhdXRvIHJlbWFpbmluZ0hlaWdodCA9IGZsb3cucGFnZVJlbWFpbmluZ0xv Z2ljYWxIZWlnaHRGb3JPZmZzZXQobGluZS50b3AsIFJlbmRlckJsb2NrRmxvdzo6RXhjbHVkZVBh Z2VCb3VuZGFyeSk7CiAgICAgICAgIGF1dG8gYXRUaGVUb3BPZkNvbHVtbk9yUGFnZSA9IGZsb3cu cGFnZUxvZ2ljYWxIZWlnaHRGb3JPZmZzZXQobGluZS50b3ApID09IHJlbWFpbmluZ0hlaWdodDsK ICAgICAgICAgaWYgKGxpbmUuaGVpZ2h0ID4gcmVtYWluaW5nSGVpZ2h0IHx8IChhdFRoZVRvcE9m Q29sdW1uT3JQYWdlICYmIGxpbmVJbmRleCkpIHsKLSAgICAgICAgICAgIGF1dG8gbGluZUJyZWFr SW5kZXggPSBjb21wdXRlTGluZUJyZWFrSW5kZXgobGluZUluZGV4LCBsaW5lQ291bnQsIHdpZG93 cywgc3RydXRzKTsKKyAgICAgICAgICAgIGF1dG8gbGluZUJyZWFrSW5kZXggPSBjb21wdXRlTGlu ZUJyZWFrSW5kZXgobGluZUluZGV4LCBsaW5lQ291bnQsIG9ycGhhbnMsIHdpZG93cywgc3RydXRz KTsKICAgICAgICAgICAgIC8vIEFyZSB3ZSBzdGlsbCBhdCB0aGUgdG9wIG9mIHRoZSBjb2x1bW4v cGFnZT8KICAgICAgICAgICAgIGF0VGhlVG9wT2ZDb2x1bW5PclBhZ2UgPSBhdFRoZVRvcE9mQ29s dW1uT3JQYWdlID8gbGluZUluZGV4ID09IGxpbmVCcmVha0luZGV4IDogZmFsc2U7CiAgICAgICAg ICAgICBzZXRQYWdlQnJlYWtGb3JMaW5lKGxpbmVCcmVha0luZGV4LCBsaW5lcywgZmxvdywgc3Ry dXRzLCBhdFRoZVRvcE9mQ29sdW1uT3JQYWdlKTsKLSAgICAgICAgICAgIC8vIFJlY29tcHV0ZSBs aW5lIHBvc2l0aW9ucyB0aGF0IHdlIGFscmVhZHkgdmlzaXRlZCBidXQgd2luZG93IGJyZWFrIHB1 c2hlZCB0aGVtIHRvIGEgbmV3IHBhZ2UuCisgICAgICAgICAgICAvLyBSZWNvbXB1dGUgbGluZSBw b3NpdGlvbnMgdGhhdCB3ZSBhbHJlYWR5IHZpc2l0ZWQgYnV0IHdpZG93IGJyZWFrIHB1c2hlZCB0 aGVtIHRvIGEgbmV3IHBhZ2UuCiAgICAgICAgICAgICBmb3IgKGF1dG8gaSA9IGxpbmVCcmVha0lu ZGV4OyBpIDwgbGluZXMuc2l6ZSgpOyArK2kpCiAgICAgICAgICAgICAgICAgbGluZXMuYXQoaSkg PSBjb21wdXRlTGluZVRvcEFuZEJvdHRvbVdpdGhPdmVyZmxvdyhmbG93LCBpLCBzdHJ1dHMpOwog ICAgICAgICB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKaW5kZXggYzdjZWNhOTExODFhNzhjMTllMmQ1ZmRkYWM5MDcwNTAwNzhmOWY3 MC4uZWU0YWYzZDFjZjlkZGFhNzQ3OTIxMjU5ZDVkOGZhM2NjNDI2YTJjOCAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDEzIEBACisyMDE3LTAzLTEwICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisK KyAgICAgICAgU2ltcGxlIGxpbmUgbGF5b3V0OiBDaGVjayBob3cgbWFueSBvcnBoYW5zIG5lZWRl ZCBvbiB0aGUgY3VycmVudCBwYWdlIGJlZm9yZSBicmVha2luZy4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2OTQ3NworCisgICAgICAgIFJldmlld2Vk IGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAgICAgICogZmFzdC9tdWx0aWNvbC9zaW1wbGUtbGlu ZS1sYXlvdXQtb3JwaGFucy1hbmQtd2lkb3dzLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAg ICAqIGZhc3QvbXVsdGljb2wvc2ltcGxlLWxpbmUtbGF5b3V0LW9ycGhhbnMtYW5kLXdpZG93cy5o dG1sOiBBZGRlZC4KKwogMjAxNy0wMy0xMCAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5j b20+CiAKICAgICAgICAgTG9hZGluZyBpbi1ib2R5IHN0eWxlc2hlZXRzIHNob3VsZCBub3QgYmxv Y2sgcmVuZGVyaW5nIG9mIGVsZW1lbnRzIGJlZm9yZSB0aGVtCmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9mYXN0L211bHRpY29sL3NpbXBsZS1saW5lLWxheW91dC1vcnBoYW5zLWFuZC13aWRvd3Mt ZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbXVsdGljb2wvc2ltcGxlLWxpbmUtbGF5 b3V0LW9ycGhhbnMtYW5kLXdpZG93cy1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjcwYTllMWVk M2QwODk1MzgzOTY1Mjg2N2MwZTY0MTY4N2U3M2UxNmMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlv dXRUZXN0cy9mYXN0L211bHRpY29sL3NpbXBsZS1saW5lLWxheW91dC1vcnBoYW5zLWFuZC13aWRv d3MtZXhwZWN0ZWQuaHRtbApAQCAtMCwwICsxLDI0IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1s PgorPGhlYWQ+Cis8dGl0bGU+VGhpcyB0ZXN0cyBvcnBoYW5zIGhhbmRsaW5nIHdpdGggc2ltcGxl IGxpbmUgbGF5b3V0LjwvdGl0bGU+Cis8c2NyaXB0PgorICAgIGlmICh3aW5kb3cuaW50ZXJuYWxz KQorICAgICAgICBpbnRlcm5hbHMuc2V0UGFnaW5hdGlvbigiTGVmdFRvUmlnaHRQYWdpbmF0ZWQi LCAwKTsKKzwvc2NyaXB0PgorPHN0eWxlPgorYm9keSB7CisJd2lkdGg6IDQ5NHB4OworfQorCitk aXYgeworCWZvbnQtc2l6ZTogNTRweDsKKwltYXJnaW46IDBweDsKK30KKzwvc3R5bGU+Cis8L2hl YWQ+Cis8Ym9keT4KKzxkaXY+Zm9vYmFyIGZvb2JhciBmb29iYXIgZm9vYmFyIGZvb2JhciBmb29i YXIgZm9vYmFyIGZvb2JhciBmb29iYXIgZm9vYmFyIGZvb2JhciBmb29iYXIgZm9vYmFyIGZvb2Jh ciBmb29iYXIgZm9vYmFyIGZvb2JhciBmb29iYXIgZm9vYmFyPC9kaXY+Cis8ZGl2PmZvb2JhciBm b29iYXIgZm9vYmFyIGZvb2JhciBmb29iYXIgZm9vYmFyIGZvb2JhcjwvZGl2PgorPC9ib2R5Pgor PC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9zaW1wbGUtbGlu ZS1sYXlvdXQtb3JwaGFucy1hbmQtd2lkb3dzLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L211bHRp Y29sL3NpbXBsZS1saW5lLWxheW91dC1vcnBoYW5zLWFuZC13aWRvd3MuaHRtbApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li4zNTA1Y2U3NGVmMDliODI1YjAyMWMyOTM2ZTlmMTQwZjc0YzdlZDU2Ci0tLSAvZGV2L251bGwK KysrIGIvTGF5b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9zaW1wbGUtbGluZS1sYXlvdXQtb3JwaGFu cy1hbmQtd2lkb3dzLmh0bWwKQEAgLTAsMCArMSwyNiBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRt bD4KKzxoZWFkPgorPHRpdGxlPlRoaXMgdGVzdHMgb3JwaGFucyBoYW5kbGluZyB3aXRoIHNpbXBs ZSBsaW5lIGxheW91dC48L3RpdGxlPgorPHNjcmlwdD4KKyAgICBpZiAod2luZG93LmludGVybmFs cykKKyAgICAgICAgaW50ZXJuYWxzLnNldFBhZ2luYXRpb24oIkxlZnRUb1JpZ2h0UGFnaW5hdGVk IiwgMCk7Cis8L3NjcmlwdD4KKzxzdHlsZT4KK2JvZHkgeworCW9ycGhhbnM6IDI7CisJd2lkb3dz OiAzOworCXdpZHRoOiA0OTRweDsKK30KKworZGl2IHsKKwlmb250LXNpemU6IDU0cHg7CisJbWFy Z2luOiAwcHg7Cit9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+Cis8ZGl2PmZvb2JhciBmb29i YXIgZm9vYmFyIGZvb2JhciBmb29iYXIgZm9vYmFyIGZvb2JhciBmb29iYXIgZm9vYmFyIGZvb2Jh ciBmb29iYXIgZm9vYmFyIGZvb2JhciBmb29iYXIgZm9vYmFyIGZvb2JhciBmb29iYXIgZm9vYmFy IGZvb2JhcjwvZGl2PgorPGRpdj5mb29iYXIgZm9vYmFyIGZvb2JhciBmb29iYXIgZm9vYmFyIGZv b2JhciBmb29iYXI8L2Rpdj4KKzwvYm9keT4KKzwvaHRtbD4K 304063 2017-03-10 12:27:03 -0800 2017-03-10 16:33:22 -0800 Patch bug-169477-20170310122703.patch text/plain 7997 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzNzI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjJmZDJiN2VmNzEyNTBl MzI0NGY1ZDBkMDk1ZWE0YzkzMzFiZWJhYy4uYmI4NDcxMTk4ZjQyYjhkZGE3Y2U1ODA2ZjEzOTdl YTFiOGRkY2Q2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIwIEBACiAyMDE3LTAzLTEwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKKyAgICAgICAgU2ltcGxlIGxpbmUgbGF5b3V0 OiBDaGVjayBob3cgbWFueSBvcnBoYW5zIG5lZWRlZCBvbiB0aGUgY3VycmVudCBwYWdlIGJlZm9y ZSBicmVha2luZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE2OTQ3NworCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZpc3RvLgorCisgICAg ICAgIEJlZm9yZSBicmVha2luZyBmb3IgdGhlIHdpZG93cyB3ZSBhY3R1YWxseSBuZWVkIHRvIGNo ZWNrIGZvciBvcnBoYW5zIGZpcnN0LgorCisgICAgICAgIFRlc3Q6IGZhc3QvbXVsdGljb2wvc2lt cGxlLWxpbmUtbGF5b3V0LW9ycGhhbnMtYW5kLXdpZG93cy5odG1sCisKKyAgICAgICAgKiByZW5k ZXJpbmcvU2ltcGxlTGluZUxheW91dFBhZ2luYXRpb24uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U2ltcGxlTGluZUxheW91dDo6Y29tcHV0ZUxpbmVCcmVha0luZGV4KToKKyAgICAgICAgKFdlYkNv cmU6OlNpbXBsZUxpbmVMYXlvdXQ6OmFkanVzdExpbmVQb3NpdGlvbnNGb3JQYWdpbmF0aW9uKToK KworMjAxNy0wMy0xMCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCiAgICAgICAg IFNpbXBsZSBsaW5lIGxheW91dDogT3ByaGFuIGxpbmVzIHdpdGggdmlzdWFsIG92ZXJmbG93IGRv ZXMgbm90IHdvcmsgcHJvcGVybHkuCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNjk0MDkKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1NpbXBsZUxpbmVMYXlvdXRQYWdpbmF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9TaW1wbGVMaW5lTGF5b3V0UGFnaW5hdGlvbi5jcHAKaW5kZXggYmM2ZmRkZGFjMjZkMzZj MDkyMDg3MTMzMDExNjkyMjdkZjRhYWVlMC4uNTVmMzdjYzFjZmE1MzEzYzYyYmRmODEzZDg1OTdm OGE1MmQwZjFmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxp bmVMYXlvdXRQYWdpbmF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2lt cGxlTGluZUxheW91dFBhZ2luYXRpb24uY3BwCkBAIC02MywxOCArNjMsMjAgQEAgc3RhdGljIFBh Z2luYXRlZExpbmUgY29tcHV0ZUxpbmVUb3BBbmRCb3R0b21XaXRoT3ZlcmZsb3coY29uc3QgUmVu ZGVyQmxvY2tGbG93JgogICAgIHJldHVybiB7IHRvcFBvc2l0aW9uLCBib3R0b21Qb3NpdGlvbiwg Ym90dG9tUG9zaXRpb24gLSB0b3BQb3NpdGlvbiB9OwogfQogCi1zdGF0aWMgdW5zaWduZWQgY29t cHV0ZUxpbmVCcmVha0luZGV4KHVuc2lnbmVkIGJyZWFrQ2FuZGlkYXRlLCB1bnNpZ25lZCBsaW5l Q291bnQsIHVuc2lnbmVkIHdpZG93cywgY29uc3QgTGF5b3V0OjpTaW1wbGVMaW5lU3RydXRzJiBz dHJ1dHMpCitzdGF0aWMgdW5zaWduZWQgY29tcHV0ZUxpbmVCcmVha0luZGV4KHVuc2lnbmVkIGJy ZWFrQ2FuZGlkYXRlLCB1bnNpZ25lZCBsaW5lQ291bnQsIGludCBvcnBoYW5zTmVlZGVkLCBpbnQg d2lkb3dzTmVlZGVkLAorICAgIGNvbnN0IExheW91dDo6U2ltcGxlTGluZVN0cnV0cyYgc3RydXRz KQogewogICAgIC8vIEZpcnN0IGxpbmUgZG9lcyBub3QgZml0IHRoZSBjdXJyZW50IHBhZ2UuCiAg ICAgaWYgKCFicmVha0NhbmRpZGF0ZSkKICAgICAgICAgcmV0dXJuIGJyZWFrQ2FuZGlkYXRlOwog ICAgIAotICAgIGF1dG8gcmVtYWluaW5nTGluZUNvdW50ID0gbGluZUNvdW50IC0gYnJlYWtDYW5k aWRhdGU7Ci0gICAgaWYgKHdpZG93cyA8PSByZW1haW5pbmdMaW5lQ291bnQpCisgICAgaW50IHdp ZG93c09uVGhlTmV4dFBhZ2UgPSBsaW5lQ291bnQgLSBicmVha0NhbmRpZGF0ZTsKKyAgICBpZiAo d2lkb3dzTmVlZGVkIDw9IHdpZG93c09uVGhlTmV4dFBhZ2UpCiAgICAgICAgIHJldHVybiBicmVh a0NhbmRpZGF0ZTsKLSAgICAKICAgICAvLyBPbmx5IGJyZWFrIGFmdGVyIHRoZSBmaXJzdCBsaW5l IHdpdGggd2lkb3dzLgotICAgIGF1dG8gbGluZUJyZWFrID0gc3RkOjptYXg8aW50PihsaW5lQ291 bnQgLSB3aWRvd3MsIDEpOworICAgIGF1dG8gbGluZUJyZWFrID0gc3RkOjptYXg8aW50PihsaW5l Q291bnQgLSB3aWRvd3NOZWVkZWQsIDEpOworICAgIGlmIChvcnBoYW5zTmVlZGVkID4gbGluZUJy ZWFrKQorICAgICAgICByZXR1cm4gYnJlYWtDYW5kaWRhdGU7CiAgICAgLy8gQnJlYWsgb24gY3Vy cmVudCBwYWdlIG9ubHkuCiAgICAgaWYgKHN0cnV0cy5pc0VtcHR5KCkpCiAgICAgICAgIHJldHVy biBsaW5lQnJlYWs7CkBAIC05Nyw5ICs5OSw5IEBAIHN0YXRpYyB2b2lkIHNldFBhZ2VCcmVha0Zv ckxpbmUodW5zaWduZWQgbGluZUJyZWFrSW5kZXgsIFBhZ2luYXRlZExpbmVzJiBsaW5lcywKICAg ICBhdXRvIGxpbmUgPSBsaW5lcy5hdChsaW5lQnJlYWtJbmRleCk7CiAgICAgYXV0byByZW1haW5p bmdMb2dpY2FsSGVpZ2h0ID0gZmxvdy5wYWdlUmVtYWluaW5nTG9naWNhbEhlaWdodEZvck9mZnNl dChsaW5lLnRvcCwgUmVuZGVyQmxvY2tGbG93OjpFeGNsdWRlUGFnZUJvdW5kYXJ5KTsKICAgICBh dXRvJiBzdHlsZSA9IGZsb3cuc3R5bGUoKTsKLSAgICBhdXRvIGZpcnN0TGluZVdpdGhEb2VzTm90 Rml0ID0gIWxpbmVCcmVha0luZGV4ICYmIGxpbmUuaGVpZ2h0IDwgZmxvdy5wYWdlTG9naWNhbEhl aWdodEZvck9mZnNldChsaW5lLnRvcCk7CisgICAgYXV0byBmaXJzdExpbmVEb2VzTm90Rml0ID0g IWxpbmVCcmVha0luZGV4ICYmIGxpbmUuaGVpZ2h0IDwgZmxvdy5wYWdlTG9naWNhbEhlaWdodEZv ck9mZnNldChsaW5lLnRvcCk7CiAgICAgYXV0byBvcnBoYW5Eb2VzTm90Rml0ID0gIXN0eWxlLmhh c0F1dG9PcnBoYW5zKCkgJiYgc3R5bGUub3JwaGFucygpID4gKHNob3J0KWxpbmVCcmVha0luZGV4 OwotICAgIGlmIChmaXJzdExpbmVXaXRoRG9lc05vdEZpdCB8fCBvcnBoYW5Eb2VzTm90Rml0KSB7 CisgICAgaWYgKGZpcnN0TGluZURvZXNOb3RGaXQgfHwgb3JwaGFuRG9lc05vdEZpdCkgewogICAg ICAgICBhdXRvIGZpcnN0TGluZSA9IGxpbmVzLmZpcnN0KCk7CiAgICAgICAgIGF1dG8gZmlyc3RM aW5lT3ZlcmZsb3dSZWN0ID0gY29tcHV0ZU92ZXJmbG93KGZsb3csIExheW91dFJlY3QoMCwgZmly c3RMaW5lLnRvcCwgMCwgZmlyc3RMaW5lLmhlaWdodCkpOwogICAgICAgICBhdXRvIGZpcnN0TGlu ZVVwcGVyT3ZlcmhhbmcgPSBzdGQ6Om1heDxMYXlvdXRVbml0PigtZmlyc3RMaW5lT3ZlcmZsb3dS ZWN0LnkoKSwgMCk7CkBAIC0xMzIsNiArMTM0LDcgQEAgdm9pZCBhZGp1c3RMaW5lUG9zaXRpb25z Rm9yUGFnaW5hdGlvbihTaW1wbGVMaW5lTGF5b3V0OjpMYXlvdXQmIHNpbXBsZUxpbmVzLCBSZW4K ICAgICAgICAgcmV0dXJuOwogICAgIHVuc2lnbmVkIGxpbmVJbmRleCA9IDA7CiAgICAgYXV0byB3 aWRvd3MgPSBmbG93LnN0eWxlKCkuaGFzQXV0b1dpZG93cygpID8gMSA6IHN0ZDo6bWF4PGludD4o Zmxvdy5zdHlsZSgpLndpZG93cygpLCAxKTsKKyAgICBhdXRvIG9ycGhhbnMgPSBmbG93LnN0eWxl KCkuaGFzQXV0b09ycGhhbnMoKSA/IDEgOiBzdGQ6Om1heDxpbnQ+KGZsb3cuc3R5bGUoKS5vcnBo YW5zKCksIDEpOwogICAgIFBhZ2luYXRlZExpbmVzIGxpbmVzOwogICAgIGZvciAodW5zaWduZWQg cnVuSW5kZXggPSAwOyBydW5JbmRleCA8IHNpbXBsZUxpbmVzLnJ1bkNvdW50KCk7ICsrcnVuSW5k ZXgpIHsKICAgICAgICAgYXV0byYgcnVuID0gc2ltcGxlTGluZXMucnVuQXQocnVuSW5kZXgpOwpA QCAtMTQzLDExICsxNDYsMTEgQEAgdm9pZCBhZGp1c3RMaW5lUG9zaXRpb25zRm9yUGFnaW5hdGlv bihTaW1wbGVMaW5lTGF5b3V0OjpMYXlvdXQmIHNpbXBsZUxpbmVzLCBSZW4KICAgICAgICAgYXV0 byByZW1haW5pbmdIZWlnaHQgPSBmbG93LnBhZ2VSZW1haW5pbmdMb2dpY2FsSGVpZ2h0Rm9yT2Zm c2V0KGxpbmUudG9wLCBSZW5kZXJCbG9ja0Zsb3c6OkV4Y2x1ZGVQYWdlQm91bmRhcnkpOwogICAg ICAgICBhdXRvIGF0VGhlVG9wT2ZDb2x1bW5PclBhZ2UgPSBmbG93LnBhZ2VMb2dpY2FsSGVpZ2h0 Rm9yT2Zmc2V0KGxpbmUudG9wKSA9PSByZW1haW5pbmdIZWlnaHQ7CiAgICAgICAgIGlmIChsaW5l LmhlaWdodCA+IHJlbWFpbmluZ0hlaWdodCB8fCAoYXRUaGVUb3BPZkNvbHVtbk9yUGFnZSAmJiBs aW5lSW5kZXgpKSB7Ci0gICAgICAgICAgICBhdXRvIGxpbmVCcmVha0luZGV4ID0gY29tcHV0ZUxp bmVCcmVha0luZGV4KGxpbmVJbmRleCwgbGluZUNvdW50LCB3aWRvd3MsIHN0cnV0cyk7CisgICAg ICAgICAgICBhdXRvIGxpbmVCcmVha0luZGV4ID0gY29tcHV0ZUxpbmVCcmVha0luZGV4KGxpbmVJ bmRleCwgbGluZUNvdW50LCBvcnBoYW5zLCB3aWRvd3MsIHN0cnV0cyk7CiAgICAgICAgICAgICAv LyBBcmUgd2Ugc3RpbGwgYXQgdGhlIHRvcCBvZiB0aGUgY29sdW1uL3BhZ2U/CiAgICAgICAgICAg ICBhdFRoZVRvcE9mQ29sdW1uT3JQYWdlID0gYXRUaGVUb3BPZkNvbHVtbk9yUGFnZSA/IGxpbmVJ bmRleCA9PSBsaW5lQnJlYWtJbmRleCA6IGZhbHNlOwogICAgICAgICAgICAgc2V0UGFnZUJyZWFr Rm9yTGluZShsaW5lQnJlYWtJbmRleCwgbGluZXMsIGZsb3csIHN0cnV0cywgYXRUaGVUb3BPZkNv bHVtbk9yUGFnZSk7Ci0gICAgICAgICAgICAvLyBSZWNvbXB1dGUgbGluZSBwb3NpdGlvbnMgdGhh dCB3ZSBhbHJlYWR5IHZpc2l0ZWQgYnV0IHdpbmRvdyBicmVhayBwdXNoZWQgdGhlbSB0byBhIG5l dyBwYWdlLgorICAgICAgICAgICAgLy8gUmVjb21wdXRlIGxpbmUgcG9zaXRpb25zIHRoYXQgd2Ug YWxyZWFkeSB2aXNpdGVkIGJ1dCB3aWRvdyBicmVhayBwdXNoZWQgdGhlbSB0byBhIG5ldyBwYWdl LgogICAgICAgICAgICAgZm9yIChhdXRvIGkgPSBsaW5lQnJlYWtJbmRleDsgaSA8IGxpbmVzLnNp emUoKTsgKytpKQogICAgICAgICAgICAgICAgIGxpbmVzLmF0KGkpID0gY29tcHV0ZUxpbmVUb3BB bmRCb3R0b21XaXRoT3ZlcmZsb3coZmxvdywgaSwgc3RydXRzKTsKICAgICAgICAgfQpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4 IDk0ZmMzOWY3MDZjZjU3NzMwNWIyY2VjNjU1NzAzNWU5ZDJlNmJlNTQuLmM2ZmYxMTliMjY5NDUy Yzk4OGMyNzhiNzZiYjIyNzVmZTA1MGJkZWQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxNSBAQAogMjAxNy0w My0xMCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCisgICAgICAgIFNpbXBsZSBs aW5lIGxheW91dDogQ2hlY2sgaG93IG1hbnkgb3JwaGFucyBuZWVkZWQgb24gdGhlIGN1cnJlbnQg cGFnZSBiZWZvcmUgYnJlYWtpbmcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNjk0NzcKKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0 by4KKworICAgICAgICAqIGZhc3QvbXVsdGljb2wvc2ltcGxlLWxpbmUtbGF5b3V0LW9ycGhhbnMt YW5kLXdpZG93cy1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L211bHRpY29s L3NpbXBsZS1saW5lLWxheW91dC1vcnBoYW5zLWFuZC13aWRvd3MuaHRtbDogQWRkZWQuCisKKzIw MTctMDMtMTAgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KKwogICAgICAgICBTaW1w bGUgbGluZSBsYXlvdXQ6IE9wcmhhbiBsaW5lcyB3aXRoIHZpc3VhbCBvdmVyZmxvdyBkb2VzIG5v dCB3b3JrIHByb3Blcmx5LgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTY5NDA5CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbXVsdGljb2wv c2ltcGxlLWxpbmUtbGF5b3V0LW9ycGhhbnMtYW5kLXdpZG93cy1leHBlY3RlZC5odG1sIGIvTGF5 b3V0VGVzdHMvZmFzdC9tdWx0aWNvbC9zaW1wbGUtbGluZS1sYXlvdXQtb3JwaGFucy1hbmQtd2lk b3dzLWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNzBhOWUxZWQzZDA4OTUzODM5NjUyODY3YzBl NjQxNjg3ZTczZTE2YwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvbXVsdGlj b2wvc2ltcGxlLWxpbmUtbGF5b3V0LW9ycGhhbnMtYW5kLXdpZG93cy1leHBlY3RlZC5odG1sCkBA IC0wLDAgKzEsMjQgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzx0aXRsZT5U aGlzIHRlc3RzIG9ycGhhbnMgaGFuZGxpbmcgd2l0aCBzaW1wbGUgbGluZSBsYXlvdXQuPC90aXRs ZT4KKzxzY3JpcHQ+CisgICAgaWYgKHdpbmRvdy5pbnRlcm5hbHMpCisgICAgICAgIGludGVybmFs cy5zZXRQYWdpbmF0aW9uKCJMZWZ0VG9SaWdodFBhZ2luYXRlZCIsIDApOworPC9zY3JpcHQ+Cis8 c3R5bGU+Citib2R5IHsKKwl3aWR0aDogNDk0cHg7Cit9CisKK2RpdiB7CisJZm9udC1zaXplOiA1 NHB4OworCW1hcmdpbjogMHB4OworfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorPGRpdj5m b29iYXIgZm9vYmFyIGZvb2JhciBmb29iYXIgZm9vYmFyIGZvb2JhciBmb29iYXIgZm9vYmFyIGZv b2JhciBmb29iYXIgZm9vYmFyIGZvb2JhciBmb29iYXIgZm9vYmFyIGZvb2JhciBmb29iYXIgZm9v YmFyIGZvb2JhciBmb29iYXI8L2Rpdj4KKzxkaXY+Zm9vYmFyIGZvb2JhciBmb29iYXIgZm9vYmFy IGZvb2JhciBmb29iYXIgZm9vYmFyPC9kaXY+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9mYXN0L211bHRpY29sL3NpbXBsZS1saW5lLWxheW91dC1vcnBoYW5zLWFu ZC13aWRvd3MuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3QvbXVsdGljb2wvc2ltcGxlLWxpbmUtbGF5 b3V0LW9ycGhhbnMtYW5kLXdpZG93cy5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjM1MDVjZTc0ZWYwOWI4MjVi MDIxYzI5MzZlOWYxNDBmNzRjN2VkNTYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L211bHRpY29sL3NpbXBsZS1saW5lLWxheW91dC1vcnBoYW5zLWFuZC13aWRvd3MuaHRtbApA QCAtMCwwICsxLDI2IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8dGl0bGU+ VGhpcyB0ZXN0cyBvcnBoYW5zIGhhbmRsaW5nIHdpdGggc2ltcGxlIGxpbmUgbGF5b3V0LjwvdGl0 bGU+Cis8c2NyaXB0PgorICAgIGlmICh3aW5kb3cuaW50ZXJuYWxzKQorICAgICAgICBpbnRlcm5h bHMuc2V0UGFnaW5hdGlvbigiTGVmdFRvUmlnaHRQYWdpbmF0ZWQiLCAwKTsKKzwvc2NyaXB0Pgor PHN0eWxlPgorYm9keSB7CisJb3JwaGFuczogMjsKKwl3aWRvd3M6IDM7CisJd2lkdGg6IDQ5NHB4 OworfQorCitkaXYgeworCWZvbnQtc2l6ZTogNTRweDsKKwltYXJnaW46IDBweDsKK30KKzwvc3R5 bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKzxkaXY+Zm9vYmFyIGZvb2JhciBmb29iYXIgZm9vYmFyIGZv b2JhciBmb29iYXIgZm9vYmFyIGZvb2JhciBmb29iYXIgZm9vYmFyIGZvb2JhciBmb29iYXIgZm9v YmFyIGZvb2JhciBmb29iYXIgZm9vYmFyIGZvb2JhciBmb29iYXIgZm9vYmFyPC9kaXY+Cis8ZGl2 PmZvb2JhciBmb29iYXIgZm9vYmFyIGZvb2JhciBmb29iYXIgZm9vYmFyIGZvb2JhcjwvZGl2Pgor PC9ib2R5PgorPC9odG1sPgo=