168729 2017-02-22 09:34:08 -0800 Simple line layout: ensureLineBoxes for paginated content. 2017-02-22 11:34:53 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue esprehn+autocc glenn hyatt koivisto kondapallykalyan mmaxfield simon.fraser webkit-bug-importer zalan oldest_to_newest 1279928 0 zalan 2017-02-22 09:34:08 -0800 When we need to switch over from simple line runs to inline tree for paginated content. 1279929 1 webkit-bug-importer 2017-02-22 09:34:50 -0800 <rdar://problem/30654400> 1279946 2 302408 zalan 2017-02-22 10:13:56 -0800 Created attachment 302408 Patch 1279955 3 302408 koivisto 2017-02-22 10:38:20 -0800 Comment on attachment 302408 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=302408&action=review > Source/WebCore/rendering/RenderView.cpp:1240 > + m_layoutState->m_pageLogicalHeight = LayoutUnit(1); Can we do something less magical with this? At least a comment would be good. 1279969 4 302417 zalan 2017-02-22 11:06:46 -0800 Created attachment 302417 Patch 1279977 5 302417 commit-queue 2017-02-22 11:34:48 -0800 Comment on attachment 302417 Patch Clearing flags on attachment: 302417 Committed r212843: <http://trac.webkit.org/changeset/212843> 1279978 6 commit-queue 2017-02-22 11:34:53 -0800 All reviewed patches have been landed. Closing bug. 302408 2017-02-22 10:13:56 -0800 2017-02-22 11:06:40 -0800 Patch bug-168729-20170222101057.patch text/plain 9331 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyNzEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjFjMjk2NDg4ZDIyNjBi YzI1ZWM5MTJiZDJkNTYwMzMzMGNjZjIxMS4uMGMwNDJjNjZmYWM2ZjJhOWJhMTYyM2UyODMyODcw Njg0NDBkYWE2NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE3LTAyLTIyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxlIGxpbmUgbGF5b3V0 OiBlbnN1cmVMaW5lQm94ZXMgZm9yIHBhZ2luYXRlZCBjb250ZW50LgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY4NzI5CisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS8zMDY1NDQwMD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUaGlzIHBhdGNoIHNldHMgdGhlIGxheW91dCBzdGF0ZSBiaXRzIGZvciBwYWdp bmF0ZWQgc3VidHJlZSBsYXlvdXQsIHdoZW4gd2UgYXJlIHN3aXRjaGluZworICAgICAgICBvdmVy IGZyb20gc2ltcGxlIGxpbmUgcnVucyB0byBpbmxpbmUgdHJlZS4gCisKKyAgICAgICAgTm90IGVu YWJsZWQgeWV0LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OmVuc3VyZUxpbmVCb3hlcyk6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy Vmlldzo6cHVzaExheW91dFN0YXRlRm9yUGFnaW5hdGlvbik6IExheW91dFVuaXQoMSkgaXMgbm90 IHRoZSByZWFsIGhlaWdodCwgaXQncyBqdXN0CisgICAgICAgIGFuIGluZGljYXRvciB0aGF0IHdl J3ZlIGdvdCBwYWdpbmF0ZWQgY29udGVudC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVmll dy5oOgorICAgICAgICAqIHJlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpT aW1wbGVMaW5lTGF5b3V0OjpMYXlvdXQ6OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpTaW1w bGVMaW5lTGF5b3V0OjpMYXlvdXQ6OkxheW91dCk6CisgICAgICAgICogcmVuZGVyaW5nL1NpbXBs ZUxpbmVMYXlvdXQuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OkxheW91 dDo6aXNQYWdpbmF0ZWQpOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6TGF5 b3V0OjpoYXNQYWdpbmF0aW9uU3RydXRzKToKKyAgICAgICAgKiByZW5kZXJpbmcvU2ltcGxlTGlu ZUxheW91dEZ1bmN0aW9ucy5oOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6 Y29tcHV0ZUZsb3dIZWlnaHQpOgorICAgICAgICAqIHJlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0 UmVzb2x2ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OlJ1blJlc29s dmVyOjpSdW46OmNvbXB1dGVCYXNlbGluZVBvc2l0aW9uKToKKwogMjAxNy0wMi0yMSAgQ2FybG9z IEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lP TihyMjEyNjgxKTogQ3Jhc2ggd2hlbiBkcmFnZ2luZyBsaW5rcyB3aXRob3V0IGEgZHJhZyBpbWFn ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAppbmRleCA4 YWEyOWJjNjgzZTk5MjhiZTllYzFiNGFhN2NhMjQ5NjdhYTViOGY4Li45MjI1YjA0ZDQ0YTM0Zjk0 MThkYTAzMTcyNjJlNDc2YzlhNjQ3MmQzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQmxvY2tGbG93LmNwcApAQCAtMzcwMCw2ICszNzAwLDcgQEAgdm9pZCBSZW5kZXJCbG9j a0Zsb3c6OmVuc3VyZUxpbmVCb3hlcygpCiAgICAgc2V0TGluZUxheW91dFBhdGgoRm9yY2VMaW5l Qm94ZXNQYXRoKTsKICAgICBpZiAoIW1fc2ltcGxlTGluZUxheW91dCkKICAgICAgICAgcmV0dXJu OworICAgIGJvb2wgaXNQYWdpbmF0ZWQgPSBtX3NpbXBsZUxpbmVMYXlvdXQtPmlzUGFnaW5hdGVk KCk7CiAgICAgbV9zaW1wbGVMaW5lTGF5b3V0ID0gbnVsbHB0cjsKIAogI2lmICFBU1NFUlRfRElT QUJMRUQKQEAgLTM3MTAsNyArMzcxMSwxMiBAQCB2b2lkIFJlbmRlckJsb2NrRmxvdzo6ZW5zdXJl TGluZUJveGVzKCkKICAgICBib29sIHJlbGF5b3V0Q2hpbGRyZW4gPSBmYWxzZTsKICAgICBMYXlv dXRVbml0IHJlcGFpbnRMb2dpY2FsVG9wOwogICAgIExheW91dFVuaXQgcmVwYWludExvZ2ljYWxC b3R0b207Ci0gICAgbGF5b3V0TGluZUJveGVzKHJlbGF5b3V0Q2hpbGRyZW4sIHJlcGFpbnRMb2dp Y2FsVG9wLCByZXBhaW50TG9naWNhbEJvdHRvbSk7CisgICAgaWYgKGlzUGFnaW5hdGVkKSB7Cisg ICAgICAgIHZpZXcoKS5wdXNoTGF5b3V0U3RhdGVGb3JQYWdpbmF0aW9uKCp0aGlzKTsKKyAgICAg ICAgbGF5b3V0TGluZUJveGVzKHJlbGF5b3V0Q2hpbGRyZW4sIHJlcGFpbnRMb2dpY2FsVG9wLCBy ZXBhaW50TG9naWNhbEJvdHRvbSk7CisgICAgICAgIHZpZXcoKS5wb3BMYXlvdXRTdGF0ZSgqdGhp cyk7CisgICAgfSBlbHNlCisgICAgICAgIGxheW91dExpbmVCb3hlcyhyZWxheW91dENoaWxkcmVu LCByZXBhaW50TG9naWNhbFRvcCwgcmVwYWludExvZ2ljYWxCb3R0b20pOwogCiAgICAgdXBkYXRl TG9naWNhbEhlaWdodCgpOwogICAgIEFTU0VSVChkaWROZWVkTGF5b3V0IHx8IGxvZ2ljYWxIZWln aHQoKSA9PSBvbGRIZWlnaHQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlclZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3Bw CmluZGV4IDZjYTM4YWFkMmE5Zjc2NTlmNTMwNzdjYjk0NWM4MzJlMjhjZTc1NzQuLjYxZThlYjY5 MTM4OGM0ZTI0MDdiNTdkYTgwMGJjMDJhNjZiZGVhOGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyVmlldy5jcHAKQEAgLTEyMzIsNiArMTIzMiwxNCBAQCB2b2lkIFJlbmRlclZpZXc6 OnB1c2hMYXlvdXRTdGF0ZShSZW5kZXJPYmplY3QmIHJvb3QpCiAgICAgcHVzaExheW91dFN0YXRl Rm9yQ3VycmVudEZsb3dUaHJlYWQocm9vdCk7CiB9CiAKK3ZvaWQgUmVuZGVyVmlldzo6cHVzaExh eW91dFN0YXRlRm9yUGFnaW5hdGlvbihSZW5kZXJCbG9ja0Zsb3cmIGxheW91dFJvb3QpCit7Cisg ICAgcHVzaExheW91dFN0YXRlKGxheW91dFJvb3QpOworICAgIEFTU0VSVChtX2xheW91dFN0YXRl KTsKKyAgICBtX2xheW91dFN0YXRlLT5tX2lzUGFnaW5hdGVkID0gdHJ1ZTsKKyAgICBtX2xheW91 dFN0YXRlLT5tX3BhZ2VMb2dpY2FsSGVpZ2h0ID0gTGF5b3V0VW5pdCgxKTsKK30KKwogSW50U2l6 ZSBSZW5kZXJWaWV3Ojp2aWV3cG9ydFNpemVGb3JDU1NWaWV3cG9ydFVuaXRzKCkgY29uc3QKIHsK ICAgICByZXR1cm4gZnJhbWVWaWV3KCkudmlld3BvcnRTaXplRm9yQ1NTVmlld3BvcnRVbml0cygp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuaCBiL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmgKaW5kZXggZDFhYWE2YzU1ZWUxZTA0 OTEwZTcwYmQ3NTY3OWQyYzdiNWUxNDdjZi4uMmU1NDM1NWUwODNjMGEzMzc3ZDU1NWU5NWFmMTU1 MDU3MjQ0NzRiNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZp ZXcuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCkBAIC0xMzIs NiArMTMyLDcgQEAgcHVibGljOgogCiAgICAgLy8gU3VidHJlZSBwdXNoL3BvcAogICAgIHZvaWQg cHVzaExheW91dFN0YXRlKFJlbmRlck9iamVjdCYpOworICAgIHZvaWQgcHVzaExheW91dFN0YXRl Rm9yUGFnaW5hdGlvbihSZW5kZXJCbG9ja0Zsb3cmKTsKICAgICB2b2lkIHBvcExheW91dFN0YXRl KFJlbmRlck9iamVjdCYpIHsgcmV0dXJuIHBvcExheW91dFN0YXRlKCk7IH0gLy8gSnVzdCBkb2lu ZyB0aGlzIHRvIGtlZXAgcG9wTGF5b3V0U3RhdGUoKSBwcml2YXRlIGFuZCB0byBtYWtlIHRoZSBz dWJ0cmVlIGNhbGxzIHN5bW1ldHJpY2FsLgogCiAgICAgLy8gUmV0dXJucyB0cnVlIGlmIGxheW91 dFN0YXRlIHNob3VsZCBiZSB1c2VkIGZvciBpdHMgY2FjaGVkIG9mZnNldCBhbmQgY2xpcC4KZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0LmNwcCBi L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0LmNwcAppbmRleCBiNzU2 YWIwN2JjYTFmMTg4NDJmMTY4NWNmMmU3MTlhY2ZhMzY5Yjg5Li40YjhkOWE3ZDEzNGM1NWY3NmRk OWU2NDI2OWUzNDM5MDM3ODQ2YWFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvU2ltcGxlTGluZUxheW91dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Np bXBsZUxpbmVMYXlvdXQuY3BwCkBAIC0xMDQ1LDIwICsxMDQ1LDIyIEBAIHN0ZDo6dW5pcXVlX3B0 cjxMYXlvdXQ+IGNyZWF0ZShSZW5kZXJCbG9ja0Zsb3cmIGZsb3cpCiAgICAgTGF5b3V0OjpSdW5W ZWN0b3IgcnVuczsKICAgICBjcmVhdGVUZXh0UnVucyhydW5zLCBmbG93LCBsaW5lQ291bnQpOwog ICAgIExheW91dDo6U2ltcGxlUGFnaW5hdGlvblN0cnV0cyBzdHJ1dHM7Ci0gICAgaWYgKGZsb3cu dmlldygpLmxheW91dFN0YXRlKCkgJiYgZmxvdy52aWV3KCkubGF5b3V0U3RhdGUoKS0+aXNQYWdp bmF0ZWQoKSkKKyAgICBhdXRvIGlzUGFnaW5hdGVkID0gZmxvdy52aWV3KCkubGF5b3V0U3RhdGUo KSAmJiBmbG93LnZpZXcoKS5sYXlvdXRTdGF0ZSgpLT5pc1BhZ2luYXRlZCgpOworICAgIGlmIChp c1BhZ2luYXRlZCkKICAgICAgICAgYWRqdXN0TGluZVBvc2l0aW9uc0ZvclBhZ2luYXRpb24ocnVu cywgc3RydXRzLCBmbG93LCBsaW5lQ291bnQpOwotICAgIHJldHVybiBMYXlvdXQ6OmNyZWF0ZShy dW5zLCBzdHJ1dHMsIGxpbmVDb3VudCk7CisgICAgcmV0dXJuIExheW91dDo6Y3JlYXRlKHJ1bnMs IHN0cnV0cywgbGluZUNvdW50LCBpc1BhZ2luYXRlZCk7CiB9CiAKLXN0ZDo6dW5pcXVlX3B0cjxM YXlvdXQ+IExheW91dDo6Y3JlYXRlKGNvbnN0IFJ1blZlY3RvciYgcnVuVmVjdG9yLCBTaW1wbGVQ YWdpbmF0aW9uU3RydXRzJiBzdHJ1dHMsIHVuc2lnbmVkIGxpbmVDb3VudCkKK3N0ZDo6dW5pcXVl X3B0cjxMYXlvdXQ+IExheW91dDo6Y3JlYXRlKGNvbnN0IFJ1blZlY3RvciYgcnVuVmVjdG9yLCBT aW1wbGVQYWdpbmF0aW9uU3RydXRzJiBzdHJ1dHMsIHVuc2lnbmVkIGxpbmVDb3VudCwgYm9vbCBp c1BhZ2luYXRlZCkKIHsKICAgICB2b2lkKiBzbG90ID0gV1RGOjpmYXN0TWFsbG9jKHNpemVvZihM YXlvdXQpICsgc2l6ZW9mKFJ1bikgKiBydW5WZWN0b3Iuc2l6ZSgpKTsKLSAgICByZXR1cm4gc3Rk Ojp1bmlxdWVfcHRyPExheW91dD4obmV3IChOb3ROdWxsLCBzbG90KSBMYXlvdXQocnVuVmVjdG9y LCBzdHJ1dHMsIGxpbmVDb3VudCkpOworICAgIHJldHVybiBzdGQ6OnVuaXF1ZV9wdHI8TGF5b3V0 PihuZXcgKE5vdE51bGwsIHNsb3QpIExheW91dChydW5WZWN0b3IsIHN0cnV0cywgbGluZUNvdW50 LCBpc1BhZ2luYXRlZCkpOwogfQogCi1MYXlvdXQ6OkxheW91dChjb25zdCBSdW5WZWN0b3ImIHJ1 blZlY3RvciwgU2ltcGxlUGFnaW5hdGlvblN0cnV0cyYgc3RydXRzLCB1bnNpZ25lZCBsaW5lQ291 bnQpCitMYXlvdXQ6OkxheW91dChjb25zdCBSdW5WZWN0b3ImIHJ1blZlY3RvciwgU2ltcGxlUGFn aW5hdGlvblN0cnV0cyYgc3RydXRzLCB1bnNpZ25lZCBsaW5lQ291bnQsIGJvb2wgaXNQYWdpbmF0 ZWQpCiAgICAgOiBtX2xpbmVDb3VudChsaW5lQ291bnQpCiAgICAgLCBtX3J1bkNvdW50KHJ1blZl Y3Rvci5zaXplKCkpCisgICAgLCBtX2lzUGFnaW5hdGVkKGlzUGFnaW5hdGVkKQogICAgICwgbV9w YWdpbmF0aW9uU3RydXRzKFdURk1vdmUoc3RydXRzKSkKIHsKICAgICBtZW1jcHkobV9ydW5zLCBy dW5WZWN0b3IuZGF0YSgpLCBtX3J1bkNvdW50ICogc2l6ZW9mKFJ1bikpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXQuaCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0LmgKaW5kZXggNGQzYWIyNGI4YjJjYzQwYjJm MjAwYzlkNDVhOGEzNzE0ZjkzMWFmNi4uMTNlNTk1NjQxYTU0N2M4NmVlZTZkMmVjNzE1YjQwM2Qx OGZhNjM3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVM YXlvdXQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dC5o CkBAIC03NiwyMCArNzYsMjIgQEAgY2xhc3MgTGF5b3V0IHsKIHB1YmxpYzoKICAgICB1c2luZyBS dW5WZWN0b3IgPSBWZWN0b3I8UnVuLCAxMD47CiAgICAgdXNpbmcgU2ltcGxlUGFnaW5hdGlvblN0 cnV0cyA9IFZlY3RvcjxTaW1wbGVQYWdpbmF0aW9uU3RydXQsIDQ+OwotICAgIHN0YXRpYyBzdGQ6 OnVuaXF1ZV9wdHI8TGF5b3V0PiBjcmVhdGUoY29uc3QgUnVuVmVjdG9yJiwgU2ltcGxlUGFnaW5h dGlvblN0cnV0cyYsIHVuc2lnbmVkIGxpbmVDb3VudCk7CisgICAgc3RhdGljIHN0ZDo6dW5pcXVl X3B0cjxMYXlvdXQ+IGNyZWF0ZShjb25zdCBSdW5WZWN0b3ImLCBTaW1wbGVQYWdpbmF0aW9uU3Ry dXRzJiwgdW5zaWduZWQgbGluZUNvdW50LCBib29sIGlzUGFnaW5hdGVkKTsKIAogICAgIHVuc2ln bmVkIGxpbmVDb3VudCgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUNvdW50OyB9CiAKICAgICB1bnNp Z25lZCBydW5Db3VudCgpIGNvbnN0IHsgcmV0dXJuIG1fcnVuQ291bnQ7IH0KICAgICBjb25zdCBS dW4mIHJ1bkF0KHVuc2lnbmVkIGkpIGNvbnN0IHsgcmV0dXJuIG1fcnVuc1tpXTsgfQogCi0gICAg Ym9vbCBpc1BhZ2luYXRlZCgpIGNvbnN0IHsgcmV0dXJuICFtX3BhZ2luYXRpb25TdHJ1dHMuaXNF bXB0eSgpOyB9CisgICAgYm9vbCBpc1BhZ2luYXRlZCgpIGNvbnN0IHsgcmV0dXJuIG1faXNQYWdp bmF0ZWQ7IH0KKyAgICBib29sIGhhc1BhZ2luYXRpb25TdHJ1dHMoKSBjb25zdCB7IHJldHVybiAh bV9wYWdpbmF0aW9uU3RydXRzLmlzRW1wdHkoKTsgfQogICAgIGNvbnN0IFNpbXBsZVBhZ2luYXRp b25TdHJ1dHMmIHN0cnV0cygpIGNvbnN0IHsgcmV0dXJuIG1fcGFnaW5hdGlvblN0cnV0czsgfQog cHJpdmF0ZToKLSAgICBMYXlvdXQoY29uc3QgUnVuVmVjdG9yJiwgU2ltcGxlUGFnaW5hdGlvblN0 cnV0cyYsIHVuc2lnbmVkIGxpbmVDb3VudCk7CisgICAgTGF5b3V0KGNvbnN0IFJ1blZlY3RvciYs IFNpbXBsZVBhZ2luYXRpb25TdHJ1dHMmLCB1bnNpZ25lZCBsaW5lQ291bnQsIGJvb2wgaXNQYWdp bmF0ZWQpOwogCiAgICAgdW5zaWduZWQgbV9saW5lQ291bnQ7CiAgICAgdW5zaWduZWQgbV9ydW5D b3VudDsKKyAgICBib29sIG1faXNQYWdpbmF0ZWQ7CiAgICAgU2ltcGxlUGFnaW5hdGlvblN0cnV0 cyBtX3BhZ2luYXRpb25TdHJ1dHM7CiAgICAgUnVuIG1fcnVuc1swXTsKIH07CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZ1bmN0aW9ucy5oIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGdW5jdGlvbnMuaAppbmRl eCA2ODliZDA1MTJmMmJjMmEzYTY0MDU2ZjQwYTA0ZjU0N2MwNmRlNmMyLi43YjMwODM5Y2EyMTY0 Y2EzN2Q4MWQ2MjI0OTlhYTc4MDM2MzJiMjljIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZ1bmN0aW9ucy5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0RnVuY3Rpb25zLmgKQEAgLTc0LDcgKzc0LDcgQEAg bmFtZXNwYWNlIFNpbXBsZUxpbmVMYXlvdXQgewogaW5saW5lIExheW91dFVuaXQgY29tcHV0ZUZs b3dIZWlnaHQoY29uc3QgUmVuZGVyQmxvY2tGbG93JiBmbG93LCBjb25zdCBMYXlvdXQmIGxheW91 dCkKIHsKICAgICBhdXRvIGZsb3dIZWlnaHQgPSBsaW5lSGVpZ2h0RnJvbUZsb3coZmxvdykgKiBs YXlvdXQubGluZUNvdW50KCk7Ci0gICAgaWYgKCFsYXlvdXQuaXNQYWdpbmF0ZWQoKSkKKyAgICBp ZiAoIWxheW91dC5oYXNQYWdpbmF0aW9uU3RydXRzKCkpCiAgICAgICAgIHJldHVybiBmbG93SGVp Z2h0OwogICAgIGZvciAoYXV0byYgc3RydXRFbnRyeSA6IGxheW91dC5zdHJ1dHMoKSkKICAgICAg ICAgZmxvd0hlaWdodCArPSBzdHJ1dEVudHJ5Lm9mZnNldDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuaCBiL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuaAppbmRleCA4NjgxMjdjYmM1 NWIxMjAwNDU4YjhlNmFhNTIxNjJkYWZhZDBiNzZjLi5jZTI0MmNiOTk2NzA5MDIzYzVlMjhmNmQ1 MTA3M2EwMTE3N2Q2OTY2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2lt cGxlTGluZUxheW91dFJlc29sdmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Np bXBsZUxpbmVMYXlvdXRSZXNvbHZlci5oCkBAIC0yMjEsNyArMjIxLDcgQEAgaW5saW5lIGZsb2F0 IFJ1blJlc29sdmVyOjpSdW46OmNvbXB1dGVCYXNlbGluZVBvc2l0aW9uKCkgY29uc3QKIHsKICAg ICBhdXRvJiByZXNvbHZlciA9IG1faXRlcmF0b3IucmVzb2x2ZXIoKTsKICAgICBhdXRvIG9mZnNl dCA9IHJlc29sdmVyLm1fYm9yZGVyQW5kUGFkZGluZ0JlZm9yZSArIHJlc29sdmVyLm1fbGluZUhl aWdodCAqIGxpbmVJbmRleCgpOwotICAgIGlmICghcmVzb2x2ZXIubV9sYXlvdXQuaXNQYWdpbmF0 ZWQoKSkKKyAgICBpZiAoIXJlc29sdmVyLm1fbGF5b3V0Lmhhc1BhZ2luYXRpb25TdHJ1dHMoKSkK ICAgICAgICAgcmV0dXJuIG9mZnNldCArIHJlc29sdmVyLm1fYmFzZWxpbmU7CiAgICAgZm9yIChh dXRvJiBzdHJ1dEVudHJ5IDogcmVzb2x2ZXIubV9sYXlvdXQuc3RydXRzKCkpIHsKICAgICAgICAg aWYgKHN0cnV0RW50cnkubGluZUJyZWFrID4gbGluZUluZGV4KCkpCg== 302417 2017-02-22 11:06:46 -0800 2017-02-22 11:34:48 -0800 Patch bug-168729-20170222110359.patch text/plain 10193 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyNzEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjFjMjk2NDg4ZDIyNjBi YzI1ZWM5MTJiZDJkNTYwMzMzMGNjZjIxMS4uYWE4NmQ3MDQ5Njc4NTZiYmE2OWM5NTM0OGZkY2My ZWIzMWMzMjUzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE3LTAyLTIyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxlIGxpbmUgbGF5b3V0 OiBlbnN1cmVMaW5lQm94ZXMgZm9yIHBhZ2luYXRlZCBjb250ZW50LgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY4NzI5CisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS8zMDY1NDQwMD4KKworICAgICAgICBSZXZpZXdlZCBieSBBbnR0aSBLb2l2aXN0by4K KworICAgICAgICBUaGlzIHBhdGNoIHNldHMgdGhlIGxheW91dCBzdGF0ZSBiaXRzIGZvciBwYWdp bmF0ZWQgc3VidHJlZSBsYXlvdXQsIHdoZW4gd2UgYXJlIHN3aXRjaGluZworICAgICAgICBvdmVy IGZyb20gc2ltcGxlIGxpbmUgcnVucyB0byBpbmxpbmUgdHJlZS4gCisKKyAgICAgICAgTm90IGVu YWJsZWQgeWV0LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9ja0Zsb3c6OmVuc3VyZUxpbmVCb3hlcyk6CisgICAg ICAgICogcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy Vmlldzo6cHVzaExheW91dFN0YXRlRm9yUGFnaW5hdGlvbik6IExheW91dFVuaXQoMSkgaXMgbm90 IHRoZSByZWFsIGhlaWdodCwgaXQncyBqdXN0CisgICAgICAgIGFuIGluZGljYXRvciB0aGF0IHdl J3ZlIGdvdCBwYWdpbmF0ZWQgY29udGVudC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVmll dy5oOgorICAgICAgICAqIHJlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0LmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpT aW1wbGVMaW5lTGF5b3V0OjpMYXlvdXQ6OmNyZWF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpTaW1w bGVMaW5lTGF5b3V0OjpMYXlvdXQ6OkxheW91dCk6CisgICAgICAgICogcmVuZGVyaW5nL1NpbXBs ZUxpbmVMYXlvdXQuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OkxheW91 dDo6aXNQYWdpbmF0ZWQpOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6TGF5 b3V0OjpoYXNQYWdpbmF0aW9uU3RydXRzKToKKyAgICAgICAgKiByZW5kZXJpbmcvU2ltcGxlTGlu ZUxheW91dEZ1bmN0aW9ucy5oOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6 Y29tcHV0ZUZsb3dIZWlnaHQpOgorICAgICAgICAqIHJlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0 UmVzb2x2ZXIuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OlJ1blJlc29s dmVyOjpSdW46OmNvbXB1dGVCYXNlbGluZVBvc2l0aW9uKToKKwogMjAxNy0wMi0yMSAgQ2FybG9z IEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lP TihyMjEyNjgxKTogQ3Jhc2ggd2hlbiBkcmFnZ2luZyBsaW5rcyB3aXRob3V0IGEgZHJhZyBpbWFn ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrRmxvdy5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAppbmRleCA4 YWEyOWJjNjgzZTk5MjhiZTllYzFiNGFhN2NhMjQ5NjdhYTViOGY4Li41MTRhNTc5ZTI3NzZkMzU3 OTM1YWM1YmMxMmQxZWU1ODU0MmUzMGQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2tGbG93LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQmxvY2tGbG93LmNwcApAQCAtMzcwMCw2ICszNzAwLDcgQEAgdm9pZCBSZW5kZXJCbG9j a0Zsb3c6OmVuc3VyZUxpbmVCb3hlcygpCiAgICAgc2V0TGluZUxheW91dFBhdGgoRm9yY2VMaW5l Qm94ZXNQYXRoKTsKICAgICBpZiAoIW1fc2ltcGxlTGluZUxheW91dCkKICAgICAgICAgcmV0dXJu OworICAgIGJvb2wgaXNQYWdpbmF0ZWQgPSBtX3NpbXBsZUxpbmVMYXlvdXQtPmlzUGFnaW5hdGVk KCk7CiAgICAgbV9zaW1wbGVMaW5lTGF5b3V0ID0gbnVsbHB0cjsKIAogI2lmICFBU1NFUlRfRElT QUJMRUQKQEAgLTM3MTAsNyArMzcxMSwxMiBAQCB2b2lkIFJlbmRlckJsb2NrRmxvdzo6ZW5zdXJl TGluZUJveGVzKCkKICAgICBib29sIHJlbGF5b3V0Q2hpbGRyZW4gPSBmYWxzZTsKICAgICBMYXlv dXRVbml0IHJlcGFpbnRMb2dpY2FsVG9wOwogICAgIExheW91dFVuaXQgcmVwYWludExvZ2ljYWxC b3R0b207Ci0gICAgbGF5b3V0TGluZUJveGVzKHJlbGF5b3V0Q2hpbGRyZW4sIHJlcGFpbnRMb2dp Y2FsVG9wLCByZXBhaW50TG9naWNhbEJvdHRvbSk7CisgICAgaWYgKGlzUGFnaW5hdGVkKSB7Cisg ICAgICAgIHZpZXcoKS5wdXNoTGF5b3V0U3RhdGVGb3JQYWdpbmF0aW9uKCp0aGlzKTsKKyAgICAg ICAgbGF5b3V0TGluZUJveGVzKHJlbGF5b3V0Q2hpbGRyZW4sIHJlcGFpbnRMb2dpY2FsVG9wLCBy ZXBhaW50TG9naWNhbEJvdHRvbSk7CisgICAgICAgIHZpZXcoKS5wb3BMYXlvdXRTdGF0ZSgqdGhp cyk7CisgICAgfSBlbHNlCisgICAgICAgIGxheW91dExpbmVCb3hlcyhyZWxheW91dENoaWxkcmVu LCByZXBhaW50TG9naWNhbFRvcCwgcmVwYWludExvZ2ljYWxCb3R0b20pOwogCiAgICAgdXBkYXRl TG9naWNhbEhlaWdodCgpOwogICAgIEFTU0VSVChkaWROZWVkTGF5b3V0IHx8IGxvZ2ljYWxIZWln aHQoKSA9PSBvbGRIZWlnaHQpOwpAQCAtMzk0NCw3ICszOTUwLDcgQEAgdm9pZCBSZW5kZXJCbG9j a0Zsb3c6OmNoZWNrRm9yUGFnaW5hdGlvbkxvZ2ljYWxIZWlnaHRDaGFuZ2UoYm9vbCYgcmVsYXlv dXRDaGlsZHIKICAgICAgICAgLy8gZW5hYmxlZCBhbmQgZmxvdyB0aHJlYWQgaGVpZ2h0IGlzIHN0 aWxsIHVua25vd24gKGkuZS4gZHVyaW5nIHRoZSBmaXJzdCBsYXlvdXQgcGFzcykuIFdoZW4KICAg ICAgICAgLy8gaXQncyB1bmtub3duLCB3ZSBuZWVkIHRvIHByZXZlbnQgdGhlIHBhZ2luYXRpb24g Y29kZSBmcm9tIGFzc3VtaW5nIHBhZ2UgYnJlYWtzIGV2ZXJ5d2hlcmUKICAgICAgICAgLy8gYW5k IHRoZXJlYnkgZWF0aW5nIGV2ZXJ5IHRvcCBtYXJnaW4uIEl0IHNob3VsZCBiZSB0cml2aWFsIHRv IGNsZWFuIHVwIGFuZCBnZXQgcmlkIG9mIHRoaXMKLSAgICAgICAgLy8gaGFjayBvbmNlIHRoZSBv bGQgbXVsdGljb2wgaW1wbGVtZW50YXRpb24gaXMgZ29uZS4KKyAgICAgICAgLy8gaGFjayBvbmNl IHRoZSBvbGQgbXVsdGljb2wgaW1wbGVtZW50YXRpb24gaXMgZ29uZSAoc2VlIGFsc28gUmVuZGVy Vmlldzo6cHVzaExheW91dFN0YXRlRm9yUGFnaW5hdGlvbikuCiAgICAgICAgIHBhZ2VMb2dpY2Fs SGVpZ2h0ID0gZmxvd1RocmVhZC5pc1BhZ2VMb2dpY2FsSGVpZ2h0S25vd24oKSA/IExheW91dFVu aXQoMSkgOiBMYXlvdXRVbml0KDApOwogCiAgICAgICAgIHBhZ2VMb2dpY2FsSGVpZ2h0Q2hhbmdl ZCA9IGZsb3dUaHJlYWQucGFnZUxvZ2ljYWxTaXplQ2hhbmdlZCgpOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclZpZXcuY3BwCmluZGV4IDZjYTM4YWFkMmE5Zjc2NTlmNTMwNzdjYjk0NWM4 MzJlMjhjZTc1NzQuLjI1YzIyYzA4YTc4MWNkNzkyMGRkNDJjZGIyYzc1ZTA2NjcyZGI0MGEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5jcHAKQEAgLTEyMzIsNiArMTIzMiwx NSBAQCB2b2lkIFJlbmRlclZpZXc6OnB1c2hMYXlvdXRTdGF0ZShSZW5kZXJPYmplY3QmIHJvb3Qp CiAgICAgcHVzaExheW91dFN0YXRlRm9yQ3VycmVudEZsb3dUaHJlYWQocm9vdCk7CiB9CiAKK3Zv aWQgUmVuZGVyVmlldzo6cHVzaExheW91dFN0YXRlRm9yUGFnaW5hdGlvbihSZW5kZXJCbG9ja0Zs b3cmIGxheW91dFJvb3QpCit7CisgICAgcHVzaExheW91dFN0YXRlKGxheW91dFJvb3QpOworICAg IEFTU0VSVChtX2xheW91dFN0YXRlKTsKKyAgICBtX2xheW91dFN0YXRlLT5tX2lzUGFnaW5hdGVk ID0gdHJ1ZTsKKyAgICAvLyBUaGlzIGlzIGp1c3QgYSBmbGFnIGZvciBrbm93biBwYWdlIGhlaWdo dCAoc2VlIFJlbmRlckJsb2NrRmxvdzo6Y2hlY2tGb3JQYWdpbmF0aW9uTG9naWNhbEhlaWdodENo YW5nZSkuCisgICAgbV9sYXlvdXRTdGF0ZS0+bV9wYWdlTG9naWNhbEhlaWdodCA9IDE7Cit9CisK IEludFNpemUgUmVuZGVyVmlldzo6dmlld3BvcnRTaXplRm9yQ1NTVmlld3BvcnRVbml0cygpIGNv bnN0CiB7CiAgICAgcmV0dXJuIGZyYW1lVmlldygpLnZpZXdwb3J0U2l6ZUZvckNTU1ZpZXdwb3J0 VW5pdHMoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJWaWV3 LmggYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVmlldy5oCmluZGV4IGQxYWFhNmM1 NWVlMWUwNDkxMGU3MGJkNzU2NzlkMmM3YjVlMTQ3Y2YuLjJlNTQzNTVlMDgzYzBhMzM3N2Q1NTVl OTVhZjE1NTA1NzI0NDc0YjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJWaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclZpZXcuaApA QCAtMTMyLDYgKzEzMiw3IEBAIHB1YmxpYzoKIAogICAgIC8vIFN1YnRyZWUgcHVzaC9wb3AKICAg ICB2b2lkIHB1c2hMYXlvdXRTdGF0ZShSZW5kZXJPYmplY3QmKTsKKyAgICB2b2lkIHB1c2hMYXlv dXRTdGF0ZUZvclBhZ2luYXRpb24oUmVuZGVyQmxvY2tGbG93Jik7CiAgICAgdm9pZCBwb3BMYXlv dXRTdGF0ZShSZW5kZXJPYmplY3QmKSB7IHJldHVybiBwb3BMYXlvdXRTdGF0ZSgpOyB9IC8vIEp1 c3QgZG9pbmcgdGhpcyB0byBrZWVwIHBvcExheW91dFN0YXRlKCkgcHJpdmF0ZSBhbmQgdG8gbWFr ZSB0aGUgc3VidHJlZSBjYWxscyBzeW1tZXRyaWNhbC4KIAogICAgIC8vIFJldHVybnMgdHJ1ZSBp ZiBsYXlvdXRTdGF0ZSBzaG91bGQgYmUgdXNlZCBmb3IgaXRzIGNhY2hlZCBvZmZzZXQgYW5kIGNs aXAuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91 dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dC5jcHAKaW5k ZXggYjc1NmFiMDdiY2ExZjE4ODQyZjE2ODVjZjJlNzE5YWNmYTM2OWI4OS4uNGI4ZDlhN2QxMzRj NTVmNzZkZDllNjQyNjllMzQzOTAzNzg0NmFhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9TaW1wbGVMaW5lTGF5b3V0LmNwcApAQCAtMTA0NSwyMCArMTA0NSwyMiBAQCBzdGQ6OnVu aXF1ZV9wdHI8TGF5b3V0PiBjcmVhdGUoUmVuZGVyQmxvY2tGbG93JiBmbG93KQogICAgIExheW91 dDo6UnVuVmVjdG9yIHJ1bnM7CiAgICAgY3JlYXRlVGV4dFJ1bnMocnVucywgZmxvdywgbGluZUNv dW50KTsKICAgICBMYXlvdXQ6OlNpbXBsZVBhZ2luYXRpb25TdHJ1dHMgc3RydXRzOwotICAgIGlm IChmbG93LnZpZXcoKS5sYXlvdXRTdGF0ZSgpICYmIGZsb3cudmlldygpLmxheW91dFN0YXRlKCkt PmlzUGFnaW5hdGVkKCkpCisgICAgYXV0byBpc1BhZ2luYXRlZCA9IGZsb3cudmlldygpLmxheW91 dFN0YXRlKCkgJiYgZmxvdy52aWV3KCkubGF5b3V0U3RhdGUoKS0+aXNQYWdpbmF0ZWQoKTsKKyAg ICBpZiAoaXNQYWdpbmF0ZWQpCiAgICAgICAgIGFkanVzdExpbmVQb3NpdGlvbnNGb3JQYWdpbmF0 aW9uKHJ1bnMsIHN0cnV0cywgZmxvdywgbGluZUNvdW50KTsKLSAgICByZXR1cm4gTGF5b3V0Ojpj cmVhdGUocnVucywgc3RydXRzLCBsaW5lQ291bnQpOworICAgIHJldHVybiBMYXlvdXQ6OmNyZWF0 ZShydW5zLCBzdHJ1dHMsIGxpbmVDb3VudCwgaXNQYWdpbmF0ZWQpOwogfQogCi1zdGQ6OnVuaXF1 ZV9wdHI8TGF5b3V0PiBMYXlvdXQ6OmNyZWF0ZShjb25zdCBSdW5WZWN0b3ImIHJ1blZlY3Rvciwg U2ltcGxlUGFnaW5hdGlvblN0cnV0cyYgc3RydXRzLCB1bnNpZ25lZCBsaW5lQ291bnQpCitzdGQ6 OnVuaXF1ZV9wdHI8TGF5b3V0PiBMYXlvdXQ6OmNyZWF0ZShjb25zdCBSdW5WZWN0b3ImIHJ1blZl Y3RvciwgU2ltcGxlUGFnaW5hdGlvblN0cnV0cyYgc3RydXRzLCB1bnNpZ25lZCBsaW5lQ291bnQs IGJvb2wgaXNQYWdpbmF0ZWQpCiB7CiAgICAgdm9pZCogc2xvdCA9IFdURjo6ZmFzdE1hbGxvYyhz aXplb2YoTGF5b3V0KSArIHNpemVvZihSdW4pICogcnVuVmVjdG9yLnNpemUoKSk7Ci0gICAgcmV0 dXJuIHN0ZDo6dW5pcXVlX3B0cjxMYXlvdXQ+KG5ldyAoTm90TnVsbCwgc2xvdCkgTGF5b3V0KHJ1 blZlY3Rvciwgc3RydXRzLCBsaW5lQ291bnQpKTsKKyAgICByZXR1cm4gc3RkOjp1bmlxdWVfcHRy PExheW91dD4obmV3IChOb3ROdWxsLCBzbG90KSBMYXlvdXQocnVuVmVjdG9yLCBzdHJ1dHMsIGxp bmVDb3VudCwgaXNQYWdpbmF0ZWQpKTsKIH0KIAotTGF5b3V0OjpMYXlvdXQoY29uc3QgUnVuVmVj dG9yJiBydW5WZWN0b3IsIFNpbXBsZVBhZ2luYXRpb25TdHJ1dHMmIHN0cnV0cywgdW5zaWduZWQg bGluZUNvdW50KQorTGF5b3V0OjpMYXlvdXQoY29uc3QgUnVuVmVjdG9yJiBydW5WZWN0b3IsIFNp bXBsZVBhZ2luYXRpb25TdHJ1dHMmIHN0cnV0cywgdW5zaWduZWQgbGluZUNvdW50LCBib29sIGlz UGFnaW5hdGVkKQogICAgIDogbV9saW5lQ291bnQobGluZUNvdW50KQogICAgICwgbV9ydW5Db3Vu dChydW5WZWN0b3Iuc2l6ZSgpKQorICAgICwgbV9pc1BhZ2luYXRlZChpc1BhZ2luYXRlZCkKICAg ICAsIG1fcGFnaW5hdGlvblN0cnV0cyhXVEZNb3ZlKHN0cnV0cykpCiB7CiAgICAgbWVtY3B5KG1f cnVucywgcnVuVmVjdG9yLmRhdGEoKSwgbV9ydW5Db3VudCAqIHNpemVvZihSdW4pKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0LmggYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dC5oCmluZGV4IDRkM2FiMjRiOGIy Y2M0MGIyZjIwMGM5ZDQ1YThhMzcxNGY5MzFhZjYuLjEzZTU5NTY0MWE1NDdjODZlZWU2ZDJlYzcx NWI0MDNkMThmYTYzNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1w bGVMaW5lTGF5b3V0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVM YXlvdXQuaApAQCAtNzYsMjAgKzc2LDIyIEBAIGNsYXNzIExheW91dCB7CiBwdWJsaWM6CiAgICAg dXNpbmcgUnVuVmVjdG9yID0gVmVjdG9yPFJ1biwgMTA+OwogICAgIHVzaW5nIFNpbXBsZVBhZ2lu YXRpb25TdHJ1dHMgPSBWZWN0b3I8U2ltcGxlUGFnaW5hdGlvblN0cnV0LCA0PjsKLSAgICBzdGF0 aWMgc3RkOjp1bmlxdWVfcHRyPExheW91dD4gY3JlYXRlKGNvbnN0IFJ1blZlY3RvciYsIFNpbXBs ZVBhZ2luYXRpb25TdHJ1dHMmLCB1bnNpZ25lZCBsaW5lQ291bnQpOworICAgIHN0YXRpYyBzdGQ6 OnVuaXF1ZV9wdHI8TGF5b3V0PiBjcmVhdGUoY29uc3QgUnVuVmVjdG9yJiwgU2ltcGxlUGFnaW5h dGlvblN0cnV0cyYsIHVuc2lnbmVkIGxpbmVDb3VudCwgYm9vbCBpc1BhZ2luYXRlZCk7CiAKICAg ICB1bnNpZ25lZCBsaW5lQ291bnQoKSBjb25zdCB7IHJldHVybiBtX2xpbmVDb3VudDsgfQogCiAg ICAgdW5zaWduZWQgcnVuQ291bnQoKSBjb25zdCB7IHJldHVybiBtX3J1bkNvdW50OyB9CiAgICAg Y29uc3QgUnVuJiBydW5BdCh1bnNpZ25lZCBpKSBjb25zdCB7IHJldHVybiBtX3J1bnNbaV07IH0K IAotICAgIGJvb2wgaXNQYWdpbmF0ZWQoKSBjb25zdCB7IHJldHVybiAhbV9wYWdpbmF0aW9uU3Ry dXRzLmlzRW1wdHkoKTsgfQorICAgIGJvb2wgaXNQYWdpbmF0ZWQoKSBjb25zdCB7IHJldHVybiBt X2lzUGFnaW5hdGVkOyB9CisgICAgYm9vbCBoYXNQYWdpbmF0aW9uU3RydXRzKCkgY29uc3QgeyBy ZXR1cm4gIW1fcGFnaW5hdGlvblN0cnV0cy5pc0VtcHR5KCk7IH0KICAgICBjb25zdCBTaW1wbGVQ YWdpbmF0aW9uU3RydXRzJiBzdHJ1dHMoKSBjb25zdCB7IHJldHVybiBtX3BhZ2luYXRpb25TdHJ1 dHM7IH0KIHByaXZhdGU6Ci0gICAgTGF5b3V0KGNvbnN0IFJ1blZlY3RvciYsIFNpbXBsZVBhZ2lu YXRpb25TdHJ1dHMmLCB1bnNpZ25lZCBsaW5lQ291bnQpOworICAgIExheW91dChjb25zdCBSdW5W ZWN0b3ImLCBTaW1wbGVQYWdpbmF0aW9uU3RydXRzJiwgdW5zaWduZWQgbGluZUNvdW50LCBib29s IGlzUGFnaW5hdGVkKTsKIAogICAgIHVuc2lnbmVkIG1fbGluZUNvdW50OwogICAgIHVuc2lnbmVk IG1fcnVuQ291bnQ7CisgICAgYm9vbCBtX2lzUGFnaW5hdGVkOwogICAgIFNpbXBsZVBhZ2luYXRp b25TdHJ1dHMgbV9wYWdpbmF0aW9uU3RydXRzOwogICAgIFJ1biBtX3J1bnNbMF07CiB9OwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGdW5jdGlv bnMuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0RnVuY3Rpb25z LmgKaW5kZXggNjg5YmQwNTEyZjJiYzJhM2E2NDA1NmY0MGEwNGY1NDdjMDZkZTZjMi4uN2IzMDgz OWNhMjE2NGNhMzdkODFkNjIyNDk5YWE3ODAzNjMyYjI5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRGdW5jdGlvbnMuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZ1bmN0aW9ucy5oCkBAIC03NCw3ICs3 NCw3IEBAIG5hbWVzcGFjZSBTaW1wbGVMaW5lTGF5b3V0IHsKIGlubGluZSBMYXlvdXRVbml0IGNv bXB1dGVGbG93SGVpZ2h0KGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgZmxvdywgY29uc3QgTGF5b3V0 JiBsYXlvdXQpCiB7CiAgICAgYXV0byBmbG93SGVpZ2h0ID0gbGluZUhlaWdodEZyb21GbG93KGZs b3cpICogbGF5b3V0LmxpbmVDb3VudCgpOwotICAgIGlmICghbGF5b3V0LmlzUGFnaW5hdGVkKCkp CisgICAgaWYgKCFsYXlvdXQuaGFzUGFnaW5hdGlvblN0cnV0cygpKQogICAgICAgICByZXR1cm4g Zmxvd0hlaWdodDsKICAgICBmb3IgKGF1dG8mIHN0cnV0RW50cnkgOiBsYXlvdXQuc3RydXRzKCkp CiAgICAgICAgIGZsb3dIZWlnaHQgKz0gc3RydXRFbnRyeS5vZmZzZXQ7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dFJlc29sdmVyLmggYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dFJlc29sdmVyLmgKaW5kZXggODY4 MTI3Y2JjNTViMTIwMDQ1OGI4ZTZhYTUyMTYyZGFmYWQwYjc2Yy4uY2UyNDJjYjk5NjcwOTAyM2M1 ZTI4ZjZkNTEwNzNhMDExNzdkNjk2NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNvbHZlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuaApAQCAtMjIxLDcgKzIyMSw3IEBAIGlubGlu ZSBmbG9hdCBSdW5SZXNvbHZlcjo6UnVuOjpjb21wdXRlQmFzZWxpbmVQb3NpdGlvbigpIGNvbnN0 CiB7CiAgICAgYXV0byYgcmVzb2x2ZXIgPSBtX2l0ZXJhdG9yLnJlc29sdmVyKCk7CiAgICAgYXV0 byBvZmZzZXQgPSByZXNvbHZlci5tX2JvcmRlckFuZFBhZGRpbmdCZWZvcmUgKyByZXNvbHZlci5t X2xpbmVIZWlnaHQgKiBsaW5lSW5kZXgoKTsKLSAgICBpZiAoIXJlc29sdmVyLm1fbGF5b3V0Lmlz UGFnaW5hdGVkKCkpCisgICAgaWYgKCFyZXNvbHZlci5tX2xheW91dC5oYXNQYWdpbmF0aW9uU3Ry dXRzKCkpCiAgICAgICAgIHJldHVybiBvZmZzZXQgKyByZXNvbHZlci5tX2Jhc2VsaW5lOwogICAg IGZvciAoYXV0byYgc3RydXRFbnRyeSA6IHJlc29sdmVyLm1fbGF5b3V0LnN0cnV0cygpKSB7CiAg ICAgICAgIGlmIChzdHJ1dEVudHJ5LmxpbmVCcmVhayA+IGxpbmVJbmRleCgpKQo=