179462 2017-11-08 19:36:15 -0800 [LayoutState cleanup] Move RenderMultiColumnFlow::computeLineGridPaginationOrigin to LayoutState 2017-11-08 20:57:43 -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 koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1369763 0 zalan 2017-11-08 19:36:15 -0800 It's only used by LayoutState. This enables us to move this group of functions to a more appropriate place. 1369764 1 webkit-bug-importer 2017-11-08 19:36:55 -0800 <rdar://problem/35433444> 1369769 2 326419 zalan 2017-11-08 19:47:23 -0800 Created attachment 326419 Patch 1369786 3 326419 commit-queue 2017-11-08 20:57:41 -0800 Comment on attachment 326419 Patch Clearing flags on attachment: 326419 Committed r224616: <https://trac.webkit.org/changeset/224616> 1369787 4 commit-queue 2017-11-08 20:57:43 -0800 All reviewed patches have been landed. Closing bug. 326419 2017-11-08 19:47:23 -0800 2017-11-08 20:57:41 -0800 Patch bug-179462-20171108194723.patch text/plain 11490 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI0NjE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzMyMDU4Y2IwMTBkOGJh ZDhkNzhmNDQwMTMzY2QzYWIxYTFmN2U1OS4uMDYxNmQ3NzcxMzRmOTQzMWU1OWZjNzczZGQ2YmQ1 OTgyN2U1ZTVlMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE3LTExLTA4ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xheW91dFN0YXRlIGNsZWFu dXBdIE1vdmUgUmVuZGVyTXVsdGlDb2x1bW5GbG93Ojpjb21wdXRlTGluZUdyaWRQYWdpbmF0aW9u T3JpZ2luIHRvIExheW91dFN0YXRlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNzk0NjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGlzIGlzIGluIHByZXBhcmF0aW9uIGZvciBoYXZpbmcgbm8gc2V0dGVy cyBvbiBMYXlvdXRTdGF0ZS4KKyAgICAgICAgSGF2aW5nIGFsbCB0aGUgcmVsYXRlZCBmdW5jdGlv bnMgKHBhZ2luYXRpb24vbGluZS1ncmlkKSBpbiBvbmUgcGxhY2UgYWxzbyBoZWxwcyB3aXRoIG1v dmluZworICAgICAgICB0aGVtIHRvIGEgbW9yZSBhcHByb3ByaWF0ZSBwbGFjZSBsYXRlci4KKwor ICAgICAgICBObyBjaGFuZ2UgaW4gZnVuY3Rpb25hbGl0eS4KKworICAgICAgICAqIHJlbmRlcmlu Zy9MYXlvdXRTdGF0ZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRTdGF0ZTo6Y29tcHV0 ZVBhZ2luYXRpb25JbmZvcm1hdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRTdGF0ZTo6 Y29tcHV0ZUxpbmVHcmlkUGFnaW5hdGlvbk9yaWdpbik6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXRTdGF0ZTo6ZXN0YWJsaXNoTGluZUdyaWQpOgorICAgICAgICAqIHJlbmRlcmluZy9MYXlvdXRT dGF0ZS5oOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0U3RhdGU6OnNldExpbmVHcmlkUGFnaW5h dGlvbk9yaWdpbik6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpMYXlvdXRTdGF0ZTo6Y3Vy cmVudFJlbmRlckZyYWdtZW50ZWRGbG93IGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNv cmU6OkxheW91dFN0YXRlOjpzZXRDdXJyZW50UmVuZGVyRnJhZ21lbnRlZEZsb3cpOiBEZWxldGVk LgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJNdWx0aUNvbHVtbkZsb3cuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6UmVuZGVyTXVsdGlDb2x1bW5GbG93Ojpjb21wdXRlTGluZUdyaWRQYWdpbmF0 aW9uT3JpZ2luIGNvbnN0KTogRGVsZXRlZC4KKwogMjAxNy0xMS0wOCAgWmFsYW4gQnVqdGFzICA8 emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMYXlvdXRTdGF0ZSBjbGVhbnVwXSBMYXlvdXRD b250ZXh0IHNob3VsZCBvd24gdGhlIHN0YWNrIG9mIExheW91dFN0YXRlIG9iamVjdHMKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MYXlvdXRTdGF0ZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvTGF5b3V0U3RhdGUuY3BwCmluZGV4IGM3NDVkNDczODM1ZTA2MTE5 ZGFiY2RlNzI0Y2Y5N2M1NzM2NWVlZTUuLjMzZDhkZjM3ZDc3MWQ5OTBhMWVjNDE5NjMzY2ZhYWU4 YjFlZmFjZTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9MYXlvdXRTdGF0 ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xheW91dFN0YXRlLmNwcApAQCAt MTU3LDcgKzE1Nyw3IEBAIHZvaWQgTGF5b3V0U3RhdGU6OmNvbXB1dGVQYWdpbmF0aW9uSW5mb3Jt YXRpb24oY29uc3QgTGF5b3V0Q29udGV4dDo6TGF5b3V0U3RhdGVTCiAgICAgICAgIHByb3BhZ2F0 ZUxpbmVHcmlkSW5mbygqYW5jZXN0b3IsIHJlbmRlcmVyKTsKIAogICAgIGlmIChsaW5lR3JpZCgp ICYmIChsaW5lR3JpZCgpLT5zdHlsZSgpLndyaXRpbmdNb2RlKCkgPT0gcmVuZGVyZXIuc3R5bGUo KS53cml0aW5nTW9kZSgpKSAmJiBpczxSZW5kZXJNdWx0aUNvbHVtbkZsb3c+KHJlbmRlcmVyKSkK LSAgICAgICAgZG93bmNhc3Q8UmVuZGVyTXVsdGlDb2x1bW5GbG93PihyZW5kZXJlcikuY29tcHV0 ZUxpbmVHcmlkUGFnaW5hdGlvbk9yaWdpbigqdGhpcyk7CisgICAgICAgIGNvbXB1dGVMaW5lR3Jp ZFBhZ2luYXRpb25PcmlnaW4oZG93bmNhc3Q8UmVuZGVyTXVsdGlDb2x1bW5GbG93PihyZW5kZXJl cikpOwogCiAgICAgLy8gSWYgd2UgaGF2ZSBhIG5ldyBncmlkIHRvIHRyYWNrLCB0aGVuIGFkZCBp dCB0byBvdXIgc2V0LgogICAgIGlmIChyZW5kZXJlci5zdHlsZSgpLmxpbmVHcmlkKCkgIT0gUmVu ZGVyU3R5bGU6OmluaXRpYWxMaW5lR3JpZCgpICYmIGlzPFJlbmRlckJsb2NrRmxvdz4ocmVuZGVy ZXIpKQpAQCAtMTcxLDYgKzE3MSw0NyBAQCBMYXlvdXRVbml0IExheW91dFN0YXRlOjpwYWdlTG9n aWNhbE9mZnNldChSZW5kZXJCb3gqIGNoaWxkLCBMYXlvdXRVbml0IGNoaWxkTG9naQogICAgIHJl dHVybiBtX2xheW91dE9mZnNldC53aWR0aCgpICsgY2hpbGRMb2dpY2FsT2Zmc2V0IC0gbV9wYWdl T2Zmc2V0LndpZHRoKCk7CiB9CiAKK3ZvaWQgTGF5b3V0U3RhdGU6OmNvbXB1dGVMaW5lR3JpZFBh Z2luYXRpb25PcmlnaW4oY29uc3QgUmVuZGVyTXVsdGlDb2x1bW5GbG93JiBtdWx0aWNvbCkKK3sK KyAgICBpZiAoIWlzUGFnaW5hdGVkKCkgfHwgIXBhZ2VMb2dpY2FsSGVpZ2h0KCkpCisgICAgICAg IHJldHVybjsKKworICAgIGlmICghbXVsdGljb2wucHJvZ3Jlc3Npb25Jc0lubGluZSgpKQorICAg ICAgICByZXR1cm47CisgICAgLy8gV2UgbmVlZCB0byBjYWNoZSBhIGxpbmUgZ3JpZCBwYWdpbmF0 aW9uIG9yaWdpbiBzbyB0aGF0IHdlIHVuZGVyc3RhbmQgaG93IHRvIHJlc2V0IHRoZSBsaW5lIGdy aWQKKyAgICAvLyBhdCB0aGUgdG9wIG9mIGVhY2ggY29sdW1uLgorICAgIC8vIEdldCB0aGUgY3Vy cmVudCBsaW5lIGdyaWQgYW5kIG9mZnNldC4KKyAgICBBU1NFUlQobV9saW5lR3JpZCk7CisgICAg Ly8gR2V0IHRoZSBoeXBvdGhldGljYWwgbGluZSBib3ggdXNlZCB0byBlc3RhYmxpc2ggdGhlIGdy aWQuCisgICAgYXV0byogbGluZUdyaWRCb3ggPSBtX2xpbmVHcmlkLT5saW5lR3JpZEJveCgpOwor ICAgIGlmICghbGluZUdyaWRCb3gpCisgICAgICAgIHJldHVybjsKKworICAgIC8vIE5vdyBkZXRl cm1pbmUgb3VyIHBvc2l0aW9uIG9uIHRoZSBncmlkLiBPdXIgYmFzZWxpbmUgbmVlZHMgdG8gYmUg YWRqdXN0ZWQgdG8gdGhlIG5lYXJlc3QgYmFzZWxpbmUgbXVsdGlwbGUKKyAgICAvLyBhcyBlc3Rh Ymxpc2hlZCBieSB0aGUgbGluZSBib3guCisgICAgLy8gRklYTUU6IE5lZWQgdG8gaGFuZGxlIGNy YXp5IGxpbmUtYm94LWNvbnRhaW4gdmFsdWVzIHRoYXQgY2F1c2UgdGhlIHJvb3QgbGluZSBib3gg dG8gbm90IGJlIGNvbnNpZGVyZWQuIEkgYXNzdW1lCisgICAgLy8gdGhlIGdyaWQgc2hvdWxkIGhv bm9yIGxpbmUtYm94LWNvbnRhaW4uCisgICAgTGF5b3V0VW5pdCBncmlkTGluZUhlaWdodCA9IGxp bmVHcmlkQm94LT5saW5lQm90dG9tV2l0aExlYWRpbmcoKSAtIGxpbmVHcmlkQm94LT5saW5lVG9w V2l0aExlYWRpbmcoKTsKKyAgICBpZiAoIWdyaWRMaW5lSGVpZ2h0KQorICAgICAgICByZXR1cm47 CisKKyAgICBib29sIGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlID0gbV9saW5lR3JpZC0+aXNIb3Jp em9udGFsV3JpdGluZ01vZGUoKTsKKyAgICBMYXlvdXRVbml0IGxpbmVHcmlkQmxvY2tPZmZzZXQg PSBpc0hvcml6b250YWxXcml0aW5nTW9kZSA/IG1fbGluZUdyaWRPZmZzZXQuaGVpZ2h0KCkgOiBt X2xpbmVHcmlkT2Zmc2V0LndpZHRoKCk7CisgICAgTGF5b3V0VW5pdCBmaXJzdExpbmVUb3BXaXRo TGVhZGluZyA9IGxpbmVHcmlkQmxvY2tPZmZzZXQgKyBsaW5lR3JpZEJveC0+bGluZVRvcFdpdGhM ZWFkaW5nKCk7CisgICAgTGF5b3V0VW5pdCBwYWdlTG9naWNhbFRvcCA9IGlzSG9yaXpvbnRhbFdy aXRpbmdNb2RlID8gbV9wYWdlT2Zmc2V0LmhlaWdodCgpIDogbV9wYWdlT2Zmc2V0LndpZHRoKCk7 CisgICAgaWYgKHBhZ2VMb2dpY2FsVG9wIDw9IGZpcnN0TGluZVRvcFdpdGhMZWFkaW5nKQorICAg ICAgICByZXR1cm47CisKKyAgICAvLyBTaGlmdCB0byB0aGUgbmV4dCBoaWdoZXN0IGxpbmUgZ3Jp ZCBtdWx0aXBsZSBwYXN0IHRoZSBwYWdlIGxvZ2ljYWwgdG9wLiBDYWNoZSB0aGUgZGVsdGEKKyAg ICAvLyBiZXR3ZWVuIHRoaXMgbmV3IHZhbHVlIGFuZCB0aGUgcGFnZSBsb2dpY2FsIHRvcCBhcyB0 aGUgcGFnaW5hdGlvbiBvcmlnaW4uCisgICAgTGF5b3V0VW5pdCByZW1haW5kZXIgPSByb3VuZFRv SW50KHBhZ2VMb2dpY2FsVG9wIC0gZmlyc3RMaW5lVG9wV2l0aExlYWRpbmcpICUgcm91bmRUb0lu dChncmlkTGluZUhlaWdodCk7CisgICAgTGF5b3V0VW5pdCBwYWdpbmF0aW9uRGVsdGEgPSBncmlk TGluZUhlaWdodCAtIHJlbWFpbmRlcjsKKyAgICBpZiAoaXNIb3Jpem9udGFsV3JpdGluZ01vZGUp CisgICAgICAgIG1fbGluZUdyaWRQYWdpbmF0aW9uT3JpZ2luLnNldEhlaWdodChwYWdpbmF0aW9u RGVsdGEpOworICAgIGVsc2UKKyAgICAgICAgbV9saW5lR3JpZFBhZ2luYXRpb25PcmlnaW4uc2V0 V2lkdGgocGFnaW5hdGlvbkRlbHRhKTsKK30KKwogdm9pZCBMYXlvdXRTdGF0ZTo6cHJvcGFnYXRl TGluZUdyaWRJbmZvKGNvbnN0IExheW91dFN0YXRlJiBhbmNlc3RvciwgUmVuZGVyQm94JiByZW5k ZXJlcikKIHsKICAgICAvLyBEaXNhYmxlIGxpbmUgZ3JpZHMgZm9yIG9iamVjdHMgd2UgZG9uJ3Qg c3VwcG9ydC4gRm9yIG5vdyB0aGlzIGluY2x1ZGVzIG92ZXJmbG93OnNjcm9sbC9hdXRvLCBpbmxp bmUgYmxvY2tzIGFuZApAQCAtMTg1LDcgKzIyNiw2IEBAIHZvaWQgTGF5b3V0U3RhdGU6OnByb3Bh Z2F0ZUxpbmVHcmlkSW5mbyhjb25zdCBMYXlvdXRTdGF0ZSYgYW5jZXN0b3IsIFJlbmRlckJveCYK IAogdm9pZCBMYXlvdXRTdGF0ZTo6ZXN0YWJsaXNoTGluZUdyaWQoY29uc3QgTGF5b3V0Q29udGV4 dDo6TGF5b3V0U3RhdGVTdGFjayYgbGF5b3V0U3RhdGVTdGFjaywgUmVuZGVyQmxvY2tGbG93JiBy ZW5kZXJlcikKIHsKLSAgICAvLyBGSVhNRTogd2Via2l0Lm9yZy9iLzE3OTQ0MCBUaGlzIGxvZ2lj IHNob3VsZCBiZSBwYXJ0IG9mIHRoZSBMYXlvdXRDb250ZXh0LgogICAgIC8vIEZpcnN0IGNoZWNr IHRvIHNlZSBpZiB0aGlzIGdyaWQgaGFzIGJlZW4gZXN0YWJsaXNoZWQgYWxyZWFkeS4KICAgICBp ZiAobV9saW5lR3JpZCkgewogICAgICAgICBpZiAobV9saW5lR3JpZC0+c3R5bGUoKS5saW5lR3Jp ZCgpID09IHJlbmRlcmVyLnN0eWxlKCkubGluZUdyaWQoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9MYXlvdXRTdGF0ZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L0xheW91dFN0YXRlLmgKaW5kZXggYTRkYTlmYjZjYTJmOTc4OTUyZDRkODcxNTUxNjI0MzBkZGYy ZDRiMC4uOTY2YjYzYjYxNzk2ZWM5N2M3MGFjMzFkOWQ5MTI4ZmFmNWUwZGMyNSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0xheW91dFN0YXRlLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL0xheW91dFN0YXRlLmgKQEAgLTM2LDYgKzM2LDcgQEAgY2xhc3MgUmVu ZGVyQmxvY2tGbG93OwogY2xhc3MgUmVuZGVyQm94OwogY2xhc3MgUmVuZGVyRWxlbWVudDsKIGNs YXNzIFJlbmRlckZyYWdtZW50ZWRGbG93OworY2xhc3MgUmVuZGVyTXVsdGlDb2x1bW5GbG93Owog Y2xhc3MgUmVuZGVyT2JqZWN0OwogCiBjbGFzcyBMYXlvdXRTdGF0ZSB7CkBAIC03NCwxMiArNzUs OSBAQCBwdWJsaWM6CiAgICAgTGF5b3V0U2l6ZSBsYXlvdXRPZmZzZXQoKSBjb25zdCB7IHJldHVy biBtX2xheW91dE9mZnNldDsgfQogCiAgICAgTGF5b3V0U2l6ZSBwYWdlT2Zmc2V0KCkgY29uc3Qg eyByZXR1cm4gbV9wYWdlT2Zmc2V0OyB9Ci0gICAgdm9pZCBzZXRMaW5lR3JpZFBhZ2luYXRpb25P cmlnaW4oY29uc3QgTGF5b3V0U2l6ZSYgb3JpZ2luKSB7IG1fbGluZUdyaWRQYWdpbmF0aW9uT3Jp Z2luID0gb3JpZ2luOyB9Ci0gICAgCisKICAgICBib29sIG5lZWRzQmxvY2tEaXJlY3Rpb25Mb2Nh dGlvblNldEJlZm9yZUxheW91dCgpIGNvbnN0IHsgcmV0dXJuIG1fbGluZUdyaWQgfHwgKG1faXNQ YWdpbmF0ZWQgJiYgbV9wYWdlTG9naWNhbEhlaWdodCk7IH0KIAotICAgIFJlbmRlckZyYWdtZW50 ZWRGbG93KiBjdXJyZW50UmVuZGVyRnJhZ21lbnRlZEZsb3coKSBjb25zdCB7IHJldHVybiBtX2N1 cnJlbnRSZW5kZXJGcmFnbWVudGVkRmxvdzsgfQotICAgIHZvaWQgc2V0Q3VycmVudFJlbmRlckZy YWdtZW50ZWRGbG93KFJlbmRlckZyYWdtZW50ZWRGbG93KiBmcmFnbWVudGVkRmxvdykgeyBtX2N1 cnJlbnRSZW5kZXJGcmFnbWVudGVkRmxvdyA9IGZyYWdtZW50ZWRGbG93OyB9CiAjaWZuZGVmIE5E RUJVRwogICAgIFJlbmRlckVsZW1lbnQqIHJlbmRlcmVyKCkgY29uc3QgeyByZXR1cm4gbV9yZW5k ZXJlcjsgfQogI2VuZGlmCkBAIC05NSw5ICs5MywxMSBAQCBwdWJsaWM6CiBwcml2YXRlOgogICAg IHZvaWQgY29tcHV0ZU9mZnNldHMoY29uc3QgTGF5b3V0U3RhdGUmIGFuY2VzdG9yLCBSZW5kZXJC b3gmLCBMYXlvdXRTaXplIG9mZnNldCk7CiAgICAgdm9pZCBjb21wdXRlQ2xpcFJlY3QoY29uc3Qg TGF5b3V0U3RhdGUmIGFuY2VzdG9yLCBSZW5kZXJCb3gmKTsKKyAgICAvLyBGSVhNRTogd2Via2l0 Lm9yZy9iLzE3OTQ0MCB0aGVzZSBmdW5jdGlvbnMgc2hvdWxkIGJlIHBhcnQgb2YgdGhlIHBhZ2lu YXRpb24gY29kZS9MYXlvdXRDb250ZXh0LgogICAgIHZvaWQgY29tcHV0ZVBhZ2luYXRpb25JbmZv cm1hdGlvbihjb25zdCBMYXlvdXRDb250ZXh0OjpMYXlvdXRTdGF0ZVN0YWNrJiwgUmVuZGVyQm94 JiwgTGF5b3V0VW5pdCBwYWdlTG9naWNhbEhlaWdodCwgYm9vbCBwYWdlTG9naWNhbEhlaWdodENo YW5nZWQpOwogICAgIHZvaWQgcHJvcGFnYXRlTGluZUdyaWRJbmZvKGNvbnN0IExheW91dFN0YXRl JiBhbmNlc3RvciwgUmVuZGVyQm94Jik7CiAgICAgdm9pZCBlc3RhYmxpc2hMaW5lR3JpZChjb25z dCBMYXlvdXRDb250ZXh0OjpMYXlvdXRTdGF0ZVN0YWNrJiwgUmVuZGVyQmxvY2tGbG93Jik7Cisg ICAgdm9pZCBjb21wdXRlTGluZUdyaWRQYWdpbmF0aW9uT3JpZ2luKGNvbnN0IFJlbmRlck11bHRp Q29sdW1uRmxvdyYpOwogCiAgICAgLy8gRG8gbm90IGFkZCBhbnl0aGluZyBhcGFydCBmcm9tIGJp dGZpZWxkcy4gU2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDAx NzMKICAgICBib29sIG1fY2xpcHBlZCA6IDE7CkBAIC0xMzAsOCArMTMwLDYgQEAgcHJpdmF0ZToK ICAgICBMYXlvdXRTaXplIG1fcGFnZU9mZnNldDsKICAgICBMYXlvdXRTaXplIG1fbGluZUdyaWRP ZmZzZXQ7CiAgICAgTGF5b3V0U2l6ZSBtX2xpbmVHcmlkUGFnaW5hdGlvbk9yaWdpbjsKLQotICAg IFJlbmRlckZyYWdtZW50ZWRGbG93KiBtX2N1cnJlbnRSZW5kZXJGcmFnbWVudGVkRmxvdyB7IG51 bGxwdHIgfTsKICNpZm5kZWYgTkRFQlVHCiAgICAgUmVuZGVyRWxlbWVudCogbV9yZW5kZXJlciB7 IG51bGxwdHIgfTsKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlck11bHRpQ29sdW1uRmxvdy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTXVsdGlDb2x1bW5GbG93LmNwcAppbmRleCBmZmE3YjgzNzNmMDRlOTg5NzRkYmJlNmM1YTkw Yjg4OTA2MmYwZTgzLi5lNzQzYTM2OGY3Nzc5NzEzYTM2NWMwODcwZmUzMWMyZDg0OTVlMjViIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5GbG93 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5GbG93 LmNwcApAQCAtNTQzLDUyICs1NDMsNiBAQCBib29sIFJlbmRlck11bHRpQ29sdW1uRmxvdzo6YWRk Rm9yY2VkRnJhZ21lbnRCcmVhayhjb25zdCBSZW5kZXJCbG9jayogYmxvY2ssIExheQogICAgIHJl dHVybiBmYWxzZTsKIH0KIAotdm9pZCBSZW5kZXJNdWx0aUNvbHVtbkZsb3c6OmNvbXB1dGVMaW5l R3JpZFBhZ2luYXRpb25PcmlnaW4oTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlKSBjb25zdAotewot ICAgIGlmICghcHJvZ3Jlc3Npb25Jc0lubGluZSgpKQotICAgICAgICByZXR1cm47Ci0gICAgCi0g ICAgLy8gV2UgbmVlZCB0byBjYWNoZSBhIGxpbmUgZ3JpZCBwYWdpbmF0aW9uIG9yaWdpbiBzbyB0 aGF0IHdlIHVuZGVyc3RhbmQgaG93IHRvIHJlc2V0IHRoZSBsaW5lIGdyaWQKLSAgICAvLyBhdCB0 aGUgdG9wIG9mIGVhY2ggY29sdW1uLgotICAgIC8vIEdldCB0aGUgY3VycmVudCBsaW5lIGdyaWQg YW5kIG9mZnNldC4KLSAgICBjb25zdCBhdXRvIGxpbmVHcmlkID0gbGF5b3V0U3RhdGUubGluZUdy aWQoKTsKLSAgICBpZiAoIWxpbmVHcmlkKQotICAgICAgICByZXR1cm47Ci0KLSAgICAvLyBHZXQg dGhlIGh5cG90aGV0aWNhbCBsaW5lIGJveCB1c2VkIHRvIGVzdGFibGlzaCB0aGUgZ3JpZC4KLSAg ICBhdXRvIGxpbmVHcmlkQm94ID0gbGluZUdyaWQtPmxpbmVHcmlkQm94KCk7Ci0gICAgaWYgKCFs aW5lR3JpZEJveCkKLSAgICAgICAgcmV0dXJuOwotICAgIAotICAgIGJvb2wgaXNIb3Jpem9udGFs V3JpdGluZ01vZGUgPSBsaW5lR3JpZC0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKTsKLQotICAg IExheW91dFVuaXQgbGluZUdyaWRCbG9ja09mZnNldCA9IGlzSG9yaXpvbnRhbFdyaXRpbmdNb2Rl ID8gbGF5b3V0U3RhdGUubGluZUdyaWRPZmZzZXQoKS5oZWlnaHQoKSA6IGxheW91dFN0YXRlLmxp bmVHcmlkT2Zmc2V0KCkud2lkdGgoKTsKLQotICAgIC8vIE5vdyBkZXRlcm1pbmUgb3VyIHBvc2l0 aW9uIG9uIHRoZSBncmlkLiBPdXIgYmFzZWxpbmUgbmVlZHMgdG8gYmUgYWRqdXN0ZWQgdG8gdGhl IG5lYXJlc3QgYmFzZWxpbmUgbXVsdGlwbGUKLSAgICAvLyBhcyBlc3RhYmxpc2hlZCBieSB0aGUg bGluZSBib3guCi0gICAgLy8gRklYTUU6IE5lZWQgdG8gaGFuZGxlIGNyYXp5IGxpbmUtYm94LWNv bnRhaW4gdmFsdWVzIHRoYXQgY2F1c2UgdGhlIHJvb3QgbGluZSBib3ggdG8gbm90IGJlIGNvbnNp ZGVyZWQuIEkgYXNzdW1lCi0gICAgLy8gdGhlIGdyaWQgc2hvdWxkIGhvbm9yIGxpbmUtYm94LWNv bnRhaW4uCi0gICAgTGF5b3V0VW5pdCBncmlkTGluZUhlaWdodCA9IGxpbmVHcmlkQm94LT5saW5l Qm90dG9tV2l0aExlYWRpbmcoKSAtIGxpbmVHcmlkQm94LT5saW5lVG9wV2l0aExlYWRpbmcoKTsK LSAgICBpZiAoIWdyaWRMaW5lSGVpZ2h0KQotICAgICAgICByZXR1cm47Ci0KLSAgICBMYXlvdXRV bml0IGZpcnN0TGluZVRvcFdpdGhMZWFkaW5nID0gbGluZUdyaWRCbG9ja09mZnNldCArIGxpbmVH cmlkQm94LT5saW5lVG9wV2l0aExlYWRpbmcoKTsKLSAgICAKLSAgICBpZiAobGF5b3V0U3RhdGUu aXNQYWdpbmF0ZWQoKSAmJiBsYXlvdXRTdGF0ZS5wYWdlTG9naWNhbEhlaWdodCgpKSB7Ci0gICAg ICAgIExheW91dFVuaXQgcGFnZUxvZ2ljYWxUb3AgPSBpc0hvcml6b250YWxXcml0aW5nTW9kZSA/ IGxheW91dFN0YXRlLnBhZ2VPZmZzZXQoKS5oZWlnaHQoKSA6IGxheW91dFN0YXRlLnBhZ2VPZmZz ZXQoKS53aWR0aCgpOwotICAgICAgICBpZiAocGFnZUxvZ2ljYWxUb3AgPiBmaXJzdExpbmVUb3BX aXRoTGVhZGluZykgewotICAgICAgICAgICAgLy8gU2hpZnQgdG8gdGhlIG5leHQgaGlnaGVzdCBs aW5lIGdyaWQgbXVsdGlwbGUgcGFzdCB0aGUgcGFnZSBsb2dpY2FsIHRvcC4gQ2FjaGUgdGhlIGRl bHRhCi0gICAgICAgICAgICAvLyBiZXR3ZWVuIHRoaXMgbmV3IHZhbHVlIGFuZCB0aGUgcGFnZSBs b2dpY2FsIHRvcCBhcyB0aGUgcGFnaW5hdGlvbiBvcmlnaW4uCi0gICAgICAgICAgICBMYXlvdXRV bml0IHJlbWFpbmRlciA9IHJvdW5kVG9JbnQocGFnZUxvZ2ljYWxUb3AgLSBmaXJzdExpbmVUb3BX aXRoTGVhZGluZykgJSByb3VuZFRvSW50KGdyaWRMaW5lSGVpZ2h0KTsKLSAgICAgICAgICAgIExh eW91dFVuaXQgcGFnaW5hdGlvbkRlbHRhID0gZ3JpZExpbmVIZWlnaHQgLSByZW1haW5kZXI7Ci0g ICAgICAgICAgICBpZiAoaXNIb3Jpem9udGFsV3JpdGluZ01vZGUpCi0gICAgICAgICAgICAgICAg bGF5b3V0U3RhdGUuc2V0TGluZUdyaWRQYWdpbmF0aW9uT3JpZ2luKExheW91dFNpemUobGF5b3V0 U3RhdGUubGluZUdyaWRQYWdpbmF0aW9uT3JpZ2luKCkud2lkdGgoKSwgcGFnaW5hdGlvbkRlbHRh KSk7Ci0gICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgbGF5b3V0U3RhdGUuc2V0TGlu ZUdyaWRQYWdpbmF0aW9uT3JpZ2luKExheW91dFNpemUocGFnaW5hdGlvbkRlbHRhLCBsYXlvdXRT dGF0ZS5saW5lR3JpZFBhZ2luYXRpb25PcmlnaW4oKS5oZWlnaHQoKSkpOwotICAgICAgICB9Ci0g ICAgfQotfQotCiBMYXlvdXRTaXplIFJlbmRlck11bHRpQ29sdW1uRmxvdzo6b2Zmc2V0RnJvbUNv bnRhaW5lcihSZW5kZXJFbGVtZW50JiBlbmNsb3NpbmdDb250YWluZXIsIGNvbnN0IExheW91dFBv aW50JiBwaHlzaWNhbFBvaW50LCBib29sKiBvZmZzZXREZXBlbmRzT25Qb2ludCkgY29uc3QKIHsK ICAgICBBU1NFUlQoJmVuY2xvc2luZ0NvbnRhaW5lciA9PSBjb250YWluZXIoKSk7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5GbG93LmggYi9T b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTXVsdGlDb2x1bW5GbG93LmgKaW5kZXggOWNj MmEwYzM2ZTY3Yjk2Yjg2NjZhZjA3M2JkYmM1ZTZiNGRkMTJiNy4uMjBlODFmMThlNDA1YWU5YTMy ZjUzNjY3NDdkMjMyZmVhMzMyMjgwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlck11bHRpQ29sdW1uRmxvdy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJNdWx0aUNvbHVtbkZsb3cuaApAQCAtNzUsOCArNzUsNiBAQCBwdWJsaWM6CiAgICAg Ym9vbCBwcm9ncmVzc2lvbklzUmV2ZXJzZWQoKSBjb25zdCB7IHJldHVybiBtX3Byb2dyZXNzaW9u SXNSZXZlcnNlZDsgfQogICAgIHZvaWQgc2V0UHJvZ3Jlc3Npb25Jc1JldmVyc2VkKGJvb2wgcmV2 ZXJzZWQpIHsgbV9wcm9ncmVzc2lvbklzUmV2ZXJzZWQgPSByZXZlcnNlZDsgfQogICAgIAotICAg IHZvaWQgY29tcHV0ZUxpbmVHcmlkUGFnaW5hdGlvbk9yaWdpbihMYXlvdXRTdGF0ZSYpIGNvbnN0 OwotICAgIAogICAgIFJlbmRlckZyYWdtZW50Q29udGFpbmVyKiBtYXBGcm9tRmxvd1RvRnJhZ21l bnQoVHJhbnNmb3JtU3RhdGUmKSBjb25zdCBvdmVycmlkZTsKICAgICAKICAgICAvLyBUaGlzIG1l dGhvZCB0YWtlcyBhIGxvZ2ljYWwgb2Zmc2V0IGFuZCByZXR1cm5zIGEgcGh5c2ljYWwgdHJhbnNs YXRpb24gdGhhdCBjYW4gYmUgYXBwbGllZCB0byBtYXAK