193060 2018-12-29 21:21:52 -0800 [LFC][BFC] Rename computedNonCollapsed*MarginValue to computedNonCollapsed*MarginValue 2019-01-04 08:49:07 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED CONFIGURATION CHANGED P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser zalan oldest_to_newest 1491021 0 zalan 2018-12-29 21:21:52 -0800 ssia 1491022 1 358147 zalan 2018-12-29 21:23:19 -0800 Created attachment 358147 Patch 1491651 2 zalan 2019-01-04 08:49:07 -0800 This is addressed in r239609 358147 2018-12-29 21:23:19 -0800 2018-12-29 21:23:19 -0800 Patch Patch.txt text/plain 14807 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1MDYzMjkzYmViNC4uNjc5ZWJmNWQ5M2MgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzNCBAQAorMjAxOC0xMi0yOSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIFtMRkNdW0JGQ10gUmVuYW1lIGNvbXB1dGVkTm9uQ29sbGFwc2VkKk1hcmdpblZh bHVlIHRvIGNvbXB1dGVkTm9uQ29sbGFwc2VkKk1hcmdpblZhbHVlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTMwNjAKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGxheW91dC9Gb3JtYXR0aW5nQ29udGV4 dC5oOgorICAgICAgICAqIGxheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkxheW91dDo6Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpmbG9h dGluZ05vblJlcGxhY2VkV2lkdGhBbmRNYXJnaW4pOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmZsb2F0aW5nUmVwbGFjZWRXaWR0aEFuZE1h cmdpbik6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpHZW9t ZXRyeTo6aW5saW5lUmVwbGFjZWRIZWlnaHRBbmRNYXJnaW4pOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXB1dGVkTm9uQ29sbGFwc2Vk SG9yaXpvbnRhbE1hcmdpbik6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdD b250ZXh0OjpHZW9tZXRyeTo6Y29tcHV0ZWROb25Db2xsYXBzZWRWZXJ0aWNhbE1hcmdpbik6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6Y29t cHV0ZWROb25Db2xsYXBzZWRIb3Jpem9udGFsTWFyZ2luVmFsdWUpOiBEZWxldGVkLgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXB1dGVk Tm9uQ29sbGFwc2VkVmVydGljYWxNYXJnaW5WYWx1ZSk6IERlbGV0ZWQuCisgICAgICAgICogbGF5 b3V0L0Zvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6Rm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6aGVpZ2h0VmFsdWVPZk5lYXJlc3RDb250YWlu aW5nQmxvY2tXaXRoRml4ZWRIZWlnaHQpOgorICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1hdHRp bmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmluRmxvd05vblJlcGxh Y2VkSGVpZ2h0QW5kTWFyZ2luKToKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Js b2NrRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0 OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OnN0cmV0Y2hlZEluRmxvd0hlaWdodCk6 CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbi5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbjo6cG9z aXRpdmVOZWdhdGl2ZU1hcmdpbkJlZm9yZSk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJs b2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbjo6cG9zaXRpdmVOZWdhdGl2ZU1hcmdpbkFmdGVy KToKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFy Z2luOjp2ZXJ0aWNhbCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l Rm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVG b3JtYXR0aW5nQ29udGV4dDo6Y29sbGVjdElubGluZUNvbnRlbnRGb3JTdWJ0cmVlIGNvbnN0KToK KyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6SW5saW5lRm9ybWF0dGlu Z0NvbnRleHQ6Okdlb21ldHJ5OjppbmxpbmVCbG9ja1dpZHRoQW5kTWFyZ2luKToKKwogMjAxOC0x Mi0yOSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0JG Q10gVXNlIGNvbXB1dGVkVmFsdWUgYW5kIHVzZWRWYWx1ZSBjb25zaXN0ZW50bHkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmgKaW5kZXggN2Y3NDNjYjJjNjIuLjJjOThm MWQ3ZjRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRl eHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaApAQCAt OTYsOCArOTYsOCBAQCBwcm90ZWN0ZWQ6CiAgICAgICAgIHN0YXRpYyBFZGdlcyBjb21wdXRlZEJv cmRlcihjb25zdCBMYXlvdXRTdGF0ZSYsIGNvbnN0IEJveCYpOwogICAgICAgICBzdGF0aWMgT3B0 aW9uYWw8RWRnZXM+IGNvbXB1dGVkUGFkZGluZyhjb25zdCBMYXlvdXRTdGF0ZSYsIGNvbnN0IEJv eCYpOwogCi0gICAgICAgIHN0YXRpYyBIb3Jpem9udGFsTWFyZ2luIGNvbXB1dGVkTm9uQ29sbGFw c2VkSG9yaXpvbnRhbE1hcmdpblZhbHVlKGNvbnN0IExheW91dFN0YXRlJiwgY29uc3QgQm94Jik7 Ci0gICAgICAgIHN0YXRpYyBWZXJ0aWNhbE1hcmdpbjo6Q29tcHV0ZWRWYWx1ZXMgY29tcHV0ZWRO b25Db2xsYXBzZWRWZXJ0aWNhbE1hcmdpblZhbHVlKGNvbnN0IExheW91dFN0YXRlJiwgY29uc3Qg Qm94Jik7CisgICAgICAgIHN0YXRpYyBIb3Jpem9udGFsTWFyZ2luIGNvbXB1dGVkTm9uQ29sbGFw c2VkSG9yaXpvbnRhbE1hcmdpbihjb25zdCBMYXlvdXRTdGF0ZSYsIGNvbnN0IEJveCYpOworICAg ICAgICBzdGF0aWMgVmVydGljYWxNYXJnaW46OkNvbXB1dGVkVmFsdWVzIGNvbXB1dGVkTm9uQ29s bGFwc2VkVmVydGljYWxNYXJnaW4oY29uc3QgTGF5b3V0U3RhdGUmLCBjb25zdCBCb3gmKTsKIAog ICAgICAgICBzdGF0aWMgT3B0aW9uYWw8TGF5b3V0VW5pdD4gY29tcHV0ZWRWYWx1ZUlmTm90QXV0 byhjb25zdCBMZW5ndGgmIGdlb21ldHJ5UHJvcGVydHksIExheW91dFVuaXQgY29udGFpbmluZ0Js b2NrV2lkdGgpOwogICAgICAgICBzdGF0aWMgT3B0aW9uYWw8TGF5b3V0VW5pdD4gZml4ZWRWYWx1 ZShjb25zdCBMZW5ndGgmIGdlb21ldHJ5UHJvcGVydHkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IDIxNjExMThjZTc0 Li43MjNlYTI4YzI3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRp bmdDb250ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0 aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtNzI2LDcgKzcyNiw3IEBAIFdpZHRoQW5kTWFyZ2lu IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6ZmxvYXRpbmdOb25SZXBsYWNlZFdpZHRoQW5k TWFyZ2luKExhCiAgICAgYXV0byBjb250YWluaW5nQmxvY2tXaWR0aCA9IGxheW91dFN0YXRlLmRp c3BsYXlCb3hGb3JMYXlvdXRCb3goY29udGFpbmluZ0Jsb2NrKS5jb250ZW50Qm94V2lkdGgoKTsK IAogICAgIC8vICMxCi0gICAgYXV0byBtYXJnaW4gPSBjb21wdXRlZE5vbkNvbGxhcHNlZEhvcml6 b250YWxNYXJnaW5WYWx1ZShsYXlvdXRTdGF0ZSwgbGF5b3V0Qm94KTsKKyAgICBhdXRvIG1hcmdp biA9IGNvbXB1dGVkTm9uQ29sbGFwc2VkSG9yaXpvbnRhbE1hcmdpbihsYXlvdXRTdGF0ZSwgbGF5 b3V0Qm94KTsKICAgICAvLyAjMgogICAgIGF1dG8gd2lkdGggPSBjb21wdXRlZFZhbHVlSWZOb3RB dXRvKHVzZWRXaWR0aCA/IExlbmd0aCB7IHVzZWRXaWR0aC52YWx1ZSgpLCBGaXhlZCB9IDogbGF5 b3V0Qm94LnN0eWxlKCkubG9naWNhbFdpZHRoKCksIGNvbnRhaW5pbmdCbG9ja1dpZHRoKTsKICAg ICBpZiAoIXdpZHRoKQpAQCAtNzU0LDcgKzc1NCw3IEBAIFdpZHRoQW5kTWFyZ2luIEZvcm1hdHRp bmdDb250ZXh0OjpHZW9tZXRyeTo6ZmxvYXRpbmdSZXBsYWNlZFdpZHRoQW5kTWFyZ2luKGNvbnN0 CiAgICAgLy8KICAgICAvLyAxLiBJZiAnbWFyZ2luLWxlZnQnIG9yICdtYXJnaW4tcmlnaHQnIGFy ZSBjb21wdXRlZCBhcyAnYXV0bycsIHRoZWlyIHVzZWQgdmFsdWUgaXMgJzAnLgogICAgIC8vIDIu IFRoZSB1c2VkIHZhbHVlIG9mICd3aWR0aCcgaXMgZGV0ZXJtaW5lZCBhcyBmb3IgaW5saW5lIHJl cGxhY2VkIGVsZW1lbnRzLgotICAgIGF1dG8gbWFyZ2luID0gY29tcHV0ZWROb25Db2xsYXBzZWRI b3Jpem9udGFsTWFyZ2luVmFsdWUobGF5b3V0U3RhdGUsIGxheW91dEJveCk7CisgICAgYXV0byBt YXJnaW4gPSBjb21wdXRlZE5vbkNvbGxhcHNlZEhvcml6b250YWxNYXJnaW4obGF5b3V0U3RhdGUs IGxheW91dEJveCk7CiAKICAgICBMT0dfV0lUSF9TVFJFQU0oRm9ybWF0dGluZ0NvbnRleHRMYXlv dXQsIHN0cmVhbSA8PCAiW0hlaWdodF1bTWFyZ2luXSAtPiBmbG9hdGluZyByZXBsYWNlZCAtPiBy ZWRpcmVjdGVkIHRvIGlubGluZSByZXBsYWNlZCIpOwogICAgIHJldHVybiBpbmxpbmVSZXBsYWNl ZFdpZHRoQW5kTWFyZ2luKGxheW91dFN0YXRlLCBsYXlvdXRCb3gsIHVzZWRXaWR0aCwgbWFyZ2lu LnN0YXJ0LCBtYXJnaW4uZW5kKTsKQEAgLTgxMSw3ICs4MTEsNyBAQCBIZWlnaHRBbmRNYXJnaW4g Rm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbmxpbmVSZXBsYWNlZEhlaWdodEFuZE1hcmdp bihjb25zdAogICAgIC8vICAgIHRoZSBoZWlnaHQgb2YgdGhlIGxhcmdlc3QgcmVjdGFuZ2xlIHRo YXQgaGFzIGEgMjoxIHJhdGlvLCBoYXMgYSBoZWlnaHQgbm90IGdyZWF0ZXIgdGhhbiAxNTBweCwg YW5kIGhhcyBhIHdpZHRoIG5vdCBncmVhdGVyIHRoYW4gdGhlIGRldmljZSB3aWR0aC4KIAogICAg IC8vICMxCi0gICAgYXV0byBtYXJnaW4gPSBjb21wdXRlZE5vbkNvbGxhcHNlZFZlcnRpY2FsTWFy Z2luVmFsdWUobGF5b3V0U3RhdGUsIGxheW91dEJveCk7CisgICAgYXV0byBtYXJnaW4gPSBjb21w dXRlZE5vbkNvbGxhcHNlZFZlcnRpY2FsTWFyZ2luKGxheW91dFN0YXRlLCBsYXlvdXRCb3gpOwog CiAgICAgYXV0byYgc3R5bGUgPSBsYXlvdXRCb3guc3R5bGUoKTsKICAgICBhdXRvIHJlcGxhY2Vk ID0gbGF5b3V0Qm94LnJlcGxhY2VkKCk7CkBAIC0xMDE3LDcgKzEwMTcsNyBAQCBPcHRpb25hbDxF ZGdlcz4gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZFBhZGRpbmcoY29uc3Qg TGF5b3V0U3RhdGUmCiAgICAgfTsKIH0KIAotSG9yaXpvbnRhbE1hcmdpbiBGb3JtYXR0aW5nQ29u dGV4dDo6R2VvbWV0cnk6OmNvbXB1dGVkTm9uQ29sbGFwc2VkSG9yaXpvbnRhbE1hcmdpblZhbHVl KGNvbnN0IExheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSwgY29uc3QgQm94JiBsYXlvdXRCb3gpCitI b3Jpem9udGFsTWFyZ2luIEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6Y29tcHV0ZWROb25D b2xsYXBzZWRIb3Jpem9udGFsTWFyZ2luKGNvbnN0IExheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSwg Y29uc3QgQm94JiBsYXlvdXRCb3gpCiB7CiAgICAgYXV0byYgc3R5bGUgPSBsYXlvdXRCb3guc3R5 bGUoKTsKICAgICBhdXRvIGNvbnRhaW5pbmdCbG9ja1dpZHRoID0gbGF5b3V0U3RhdGUuZGlzcGxh eUJveEZvckxheW91dEJveCgqbGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpKS5jb250ZW50Qm94 V2lkdGgoKTsKQEAgLTEwMjksNyArMTAyOSw3IEBAIEhvcml6b250YWxNYXJnaW4gRm9ybWF0dGlu Z0NvbnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZE5vbkNvbGxhcHNlZEhvcml6b250YWxNYXJnCiAg ICAgcmV0dXJuIHsgbWFyZ2luU3RhcnQsIG1hcmdpbkVuZCB9OwogfQogCi1WZXJ0aWNhbE1hcmdp bjo6Q29tcHV0ZWRWYWx1ZXMgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZE5v bkNvbGxhcHNlZFZlcnRpY2FsTWFyZ2luVmFsdWUoY29uc3QgTGF5b3V0U3RhdGUmIGxheW91dFN0 YXRlLCBjb25zdCBCb3gmIGxheW91dEJveCkKK1ZlcnRpY2FsTWFyZ2luOjpDb21wdXRlZFZhbHVl cyBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmNvbXB1dGVkTm9uQ29sbGFwc2VkVmVydGlj YWxNYXJnaW4oY29uc3QgTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlLCBjb25zdCBCb3gmIGxheW91 dEJveCkKIHsKICAgICBhdXRvJiBzdHlsZSA9IGxheW91dEJveC5zdHlsZSgpOwogICAgIGF1dG8g Y29udGFpbmluZ0Jsb2NrV2lkdGggPSBsYXlvdXRTdGF0ZS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94 KCpsYXlvdXRCb3guY29udGFpbmluZ0Jsb2NrKCkpLmNvbnRlbnRCb3hXaWR0aCgpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcCBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKaW5kZXgg ZmExZDBhODBiYzAuLjE5YWM4MDE4NjdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9Gb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKQEAgLTUxLDcgKzUxLDcgQEAgTGF5b3V0VW5p dCBGb3JtYXR0aW5nQ29udGV4dDo6UXVpcmtzOjpoZWlnaHRWYWx1ZU9mTmVhcmVzdENvbnRhaW5p bmdCbG9ja1dpdGhGaXgKICAgICAgICAgaWYgKGNvbnRhaW5pbmdCbG9jay0+aXNCb2R5Qm94KCkg fHwgY29udGFpbmluZ0Jsb2NrLT5pc0RvY3VtZW50Qm94KCkpIHsKICAgICAgICAgICAgIGF1dG8m IGRpc3BsYXlCb3ggPSBsYXlvdXRTdGF0ZS5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KCpjb250YWlu aW5nQmxvY2spOwogCi0gICAgICAgICAgICBhdXRvIHZlcnRpY2FsTWFyZ2luID0gR2VvbWV0cnk6 OmNvbXB1dGVkTm9uQ29sbGFwc2VkVmVydGljYWxNYXJnaW5WYWx1ZShsYXlvdXRTdGF0ZSwgKmNv bnRhaW5pbmdCbG9jayk7CisgICAgICAgICAgICBhdXRvIHZlcnRpY2FsTWFyZ2luID0gR2VvbWV0 cnk6OmNvbXB1dGVkTm9uQ29sbGFwc2VkVmVydGljYWxNYXJnaW4obGF5b3V0U3RhdGUsICpjb250 YWluaW5nQmxvY2spOwogICAgICAgICAgICAgYXV0byB2ZXJ0aWNhbFBhZGRpbmcgPSBkaXNwbGF5 Qm94LnBhZGRpbmdUb3AoKS52YWx1ZU9yKDApICsgZGlzcGxheUJveC5wYWRkaW5nQm90dG9tKCku dmFsdWVPcigwKTsKICAgICAgICAgICAgIGF1dG8gdmVydGljYWxCb3JkZXIgPSBkaXNwbGF5Qm94 LmJvcmRlclRvcCgpICsgZGlzcGxheUJveC5ib3JkZXJCb3R0b20oKTsKICAgICAgICAgICAgIGJv ZHlBbmREb2N1bWVudFZlcnRpY2FsTWFyZ2luUGFkZGluZ0FuZEJvcmRlciArPSB2ZXJ0aWNhbE1h cmdpbi5iZWZvcmUgKyB2ZXJ0aWNhbE1hcmdpbi5hZnRlciArIHZlcnRpY2FsUGFkZGluZyArIHZl cnRpY2FsQm9yZGVyOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9y bWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnku Y3BwCmluZGV4IGRmMjZlNzhiM2ViLi5kMWU4YjY2NWEyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0 cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tG b3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApAQCAtNTgsNyArNTgsNyBAQCBIZWlnaHRBbmRN YXJnaW4gQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6OmluRmxvd05vblJlcGxhY2Vk SGVpZ2h0QW5kTWFyZwogICAgICAgICAvLyBhbmQgcmVsYXRpdmVseSBwb3NpdGlvbmVkIGJveGVz IGFyZSBjb25zaWRlcmVkIHdpdGhvdXQgdGhlaXIgb2Zmc2V0KS4gTm90ZSB0aGF0IHRoZSBjaGls ZCBib3ggbWF5IGJlIGFuIGFub255bW91cyBibG9jayBib3guCiAKICAgICAgICAgYXV0byYgZGlz cGxheUJveCA9IGxheW91dFN0YXRlLmRpc3BsYXlCb3hGb3JMYXlvdXRCb3gobGF5b3V0Qm94KTsK LSAgICAgICAgYXV0byBub25Db2xsYXBzZWRNYXJnaW4gPSBjb21wdXRlZE5vbkNvbGxhcHNlZFZl cnRpY2FsTWFyZ2luVmFsdWUobGF5b3V0U3RhdGUsIGxheW91dEJveCk7CisgICAgICAgIGF1dG8g bm9uQ29sbGFwc2VkTWFyZ2luID0gY29tcHV0ZWROb25Db2xsYXBzZWRWZXJ0aWNhbE1hcmdpbihs YXlvdXRTdGF0ZSwgbGF5b3V0Qm94KTsKICAgICAgICAgYXV0byBjb2xsYXBzZWRNYXJnaW4gPSBN YXJnaW46OnZlcnRpY2FsKGxheW91dFN0YXRlLCBsYXlvdXRCb3gpLmNvbGxhcHNlZFZhbHVlcygp OwogICAgICAgICBhdXRvIGJvcmRlckFuZFBhZGRpbmdUb3AgPSBkaXNwbGF5Qm94LmJvcmRlclRv cCgpICsgZGlzcGxheUJveC5wYWRkaW5nVG9wKCkudmFsdWVPcigwKTsKIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250 ZXh0UXVpcmtzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxv Y2tGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKaW5kZXggYjAzYzIzYTBlYTUuLmU0Y2QxNjQ5 YmYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Js b2NrRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKQEAgLTg5 LDcgKzg5LDcgQEAgSGVpZ2h0QW5kTWFyZ2luIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJr czo6c3RyZXRjaGVkSW5GbG93SGVpZ2h0KGNvbnN0IExheW8KICAgICAgICAgLy8gSGVyZSBpcyB0 aGUgcXVpcmt5IHBhcnQgZm9yIGJvZHkgYm94OgogICAgICAgICAvLyBTdHJldGNoIHRoZSBib2R5 IHVzaW5nIHRoZSBpbml0aWFsIGNvbnRhaW5pbmcgYmxvY2sncyBoZWlnaHQgYW5kIHNocmluayBp dCB3aXRoIGRvY3VtZW50IGJveCdzIG1hcmdpbi9ib3JkZXIvcGFkZGluZy4KICAgICAgICAgLy8g VGhpcyBsb29rcyBleHRyZW1lbHkgb2RkIHdoZW4gaHRtbCBoYXMgbm9uLWF1dG8gaGVpZ2h0Lgot ICAgICAgICBhdXRvIGRvY3VtZW50Qm94VmVydGljYWxNYXJnaW4gPSBHZW9tZXRyeTo6Y29tcHV0 ZWROb25Db2xsYXBzZWRWZXJ0aWNhbE1hcmdpblZhbHVlKGxheW91dFN0YXRlLCBkb2N1bWVudEJv eCk7CisgICAgICAgIGF1dG8gZG9jdW1lbnRCb3hWZXJ0aWNhbE1hcmdpbiA9IEdlb21ldHJ5Ojpj b21wdXRlZE5vbkNvbGxhcHNlZFZlcnRpY2FsTWFyZ2luKGxheW91dFN0YXRlLCBkb2N1bWVudEJv eCk7CiAgICAgICAgIHN0cmVjaGVkSGVpZ2h0IC09IChkb2N1bWVudEJveFZlcnRpY2FsTWFyZ2lu LmJlZm9yZSArIGRvY3VtZW50Qm94VmVydGljYWxNYXJnaW4uYWZ0ZXIpOwogCiAgICAgICAgIGF1 dG8gYm9keUJveFZlcnRpY2FsTWFyZ2luID0gaGVpZ2h0QW5kTWFyZ2luLm1hcmdpbi51c2VkVmFs dWVzKCk7IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGlu Zy9CbG9ja01hcmdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5n L0Jsb2NrTWFyZ2luLmNwcAppbmRleCAzNmQ4OWZiOTljYS4uMTI2MTJkYjMyYjEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW4uY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW4u Y3BwCkBAIC01NDUsNyArNTQ1LDcgQEAgUG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2lu OjpWYWx1ZXMgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luOjpwb3NpdGkKICAgICAvLyAy LiBHYXRoZXIgcG9zaXRpdmUgYW5kIG5lZ2F0aXZlIG1hcmdpbiB2YWx1ZXMgZnJvbSBwcmV2aW91 cyBpbmZsb3cgc2libGluZyBpZiBtYXJnaW5zIGFyZSBhZGpvaW5pbmcuCiAgICAgLy8gMy4gQ29t cHV0ZSBtaW4vbWF4IHBvc2l0aXZlIGFuZCBuZWdhdGl2ZSBjb2xsYXBzZWQgbWFyZ2luIHZhbHVl cyB1c2luZyBub24tY29sbHBhc2VkIGNvbXB1dGVkIG1hcmdpbiBiZWZvcmUuCiAgICAgYXV0byBj b2xsYXBzZWRNYXJnaW5CZWZvcmUgPSBjb21wdXRlZFBvc2l0aXZlQW5kTmVnYXRpdmVNYXJnaW4o Zmlyc3RDaGlsZENvbGxhcHNlZE1hcmdpbkJlZm9yZSgpLCBwcmV2aW91U2libGluZ0NvbGxhcHNl ZE1hcmdpbkFmdGVyKCkpOwotICAgIGF1dG8gbm9uQ29sbGFwc2VkTWFyZ2luQmVmb3JlID0gR2Vv bWV0cnk6OmNvbXB1dGVkTm9uQ29sbGFwc2VkVmVydGljYWxNYXJnaW5WYWx1ZShsYXlvdXRTdGF0 ZSwgbGF5b3V0Qm94KS5iZWZvcmU7CisgICAgYXV0byBub25Db2xsYXBzZWRNYXJnaW5CZWZvcmUg PSBHZW9tZXRyeTo6Y29tcHV0ZWROb25Db2xsYXBzZWRWZXJ0aWNhbE1hcmdpbihsYXlvdXRTdGF0 ZSwgbGF5b3V0Qm94KS5iZWZvcmU7CiAgICAgcmV0dXJuIGNvbXB1dGVkUG9zaXRpdmVBbmROZWdh dGl2ZU1hcmdpbihjb2xsYXBzZWRNYXJnaW5CZWZvcmUsIG5vbkNvbGxhcHNlZE1hcmdpbkJlZm9y ZSk7CiB9CiAKQEAgLTU2Niw3ICs1NjYsNyBAQCBQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxN YXJnaW46OlZhbHVlcyBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW46OnBvc2l0aQogCiAg ICAgLy8gV2UgZG9uJ3Qga25vdyB5ZXQgdGhlIG1hcmdpbiBiZWZvcmUgdmFsdWUgb2YgdGhlIG5l eHQgc2libGluZy4gTGV0J3MganVzdCBwcmV0ZW5kIGl0IGRvZXMgbm90IGhhdmUgb25lIGFuZCAK ICAgICAvLyB1cGRhdGUgaXQgbGF0ZXIgd2hlbiB3ZSBjb21wdXRlIHRoZSBuZXh0IHNpYmxpbmcn cyBtYXJnaW4gYmVmb3JlLiBTZWUgdXBkYXRlQ29sbGFwc2VkTWFyZ2luQWZ0ZXIuCi0gICAgYXV0 byBub25Db2xsYXBzZWRNYXJnaW5BZnRlciA9IEdlb21ldHJ5Ojpjb21wdXRlZE5vbkNvbGxhcHNl ZFZlcnRpY2FsTWFyZ2luVmFsdWUobGF5b3V0U3RhdGUsIGxheW91dEJveCkuYWZ0ZXI7CisgICAg YXV0byBub25Db2xsYXBzZWRNYXJnaW5BZnRlciA9IEdlb21ldHJ5Ojpjb21wdXRlZE5vbkNvbGxh cHNlZFZlcnRpY2FsTWFyZ2luKGxheW91dFN0YXRlLCBsYXlvdXRCb3gpLmFmdGVyOwogICAgIHJl dHVybiBjb21wdXRlZFBvc2l0aXZlQW5kTmVnYXRpdmVNYXJnaW4obGFzdENoaWxkQ29sbGFwc2Vk TWFyZ2luQWZ0ZXIoKSwgbm9uQ29sbGFwc2VkTWFyZ2luQWZ0ZXIpOwogfQogCkBAIC02MTAsNyAr NjEwLDcgQEAgVmVydGljYWxNYXJnaW4gQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luOjp2 ZXJ0aWNhbChjb25zdCBMYXlvdXRTdGF0ZSYgbGF5b3UKICAgICBibG9ja0Zvcm1hdHRpbmdTdGF0 ZS5zZXRQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW4obGF5b3V0Qm94LCB7IHBvc2l0 aXZlTmVnYXRpdmVNYXJnaW5CZWZvcmUsIHBvc2l0aXZlTmVnYXRpdmVNYXJnaW5BZnRlciB9KTsK IAogICAgIFZlcnRpY2FsTWFyZ2luOjpDb2xsYXBzZWRWYWx1ZXMgY29sbGFwc2VkVmVydGljYWxN YXJnaW4gPSB7IG1hcmdpblZhbHVlKHBvc2l0aXZlTmVnYXRpdmVNYXJnaW5CZWZvcmUpLCBtYXJn aW5WYWx1ZShwb3NpdGl2ZU5lZ2F0aXZlTWFyZ2luQWZ0ZXIpLCBtYXJnaW5zQ29sbGFwc2VUaHJv dWdoIH07IAotICAgIHJldHVybiB7IEdlb21ldHJ5Ojpjb21wdXRlZE5vbkNvbGxhcHNlZFZlcnRp Y2FsTWFyZ2luVmFsdWUobGF5b3V0U3RhdGUsIGxheW91dEJveCksIGNvbGxhcHNlZFZlcnRpY2Fs TWFyZ2luIH07CisgICAgcmV0dXJuIHsgR2VvbWV0cnk6OmNvbXB1dGVkTm9uQ29sbGFwc2VkVmVy dGljYWxNYXJnaW4obGF5b3V0U3RhdGUsIGxheW91dEJveCksIGNvbGxhcHNlZFZlcnRpY2FsTWFy Z2luIH07CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVm b3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xh eW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCA1 YzVmM2VkYjcyMy4uZTFjYTQxMzI1YzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dC5jcHAKQEAgLTQ0Miw3ICs0NDIsNyBAQCB2b2lkIElubGluZUZvcm1hdHRpbmdDb250ZXh0Ojpj b2xsZWN0SW5saW5lQ29udGVudEZvclN1YnRyZWUoY29uc3QgQm94JiByb290LCBJbgogICAgICAg ICBjcmVhdGVBbmRBcHBlbmRJbmxpbmVJdGVtKCk7CiAgICAgICAgIGF1dG8mIGlubGluZVJ1biA9 ICppbmxpbmVGb3JtYXR0aW5nU3RhdGUuaW5saW5lQ29udGVudCgpLmxhc3QoKTsKIAotICAgICAg ICBhdXRvIGhvcml6b250YWxNYXJnaW4gPSBHZW9tZXRyeTo6Y29tcHV0ZWROb25Db2xsYXBzZWRI b3Jpem9udGFsTWFyZ2luVmFsdWUobGF5b3V0U3RhdGUoKSwgcm9vdCk7CisgICAgICAgIGF1dG8g aG9yaXpvbnRhbE1hcmdpbiA9IEdlb21ldHJ5Ojpjb21wdXRlZE5vbkNvbGxhcHNlZEhvcml6b250 YWxNYXJnaW4obGF5b3V0U3RhdGUoKSwgcm9vdCk7CiAgICAgICAgIGlubGluZVJ1bi5hZGREZXRh Y2hpbmdSdWxlKHsgSW5saW5lSXRlbTo6RGV0YWNoaW5nUnVsZTo6QnJlYWtBdFN0YXJ0LCBJbmxp bmVJdGVtOjpEZXRhY2hpbmdSdWxlOjpCcmVha0F0RW5kIH0pOwogICAgICAgICBpbmxpbmVSdW4u YWRkTm9uQnJlYWthYmxlU3RhcnQoaG9yaXpvbnRhbE1hcmdpbi5zdGFydCk7CiAgICAgICAgIGlu bGluZVJ1bi5hZGROb25CcmVha2FibGVFbmQoaG9yaXpvbnRhbE1hcmdpbi5lbmQpOwpAQCAtNDY1 LDcgKzQ2NSw3IEBAIHZvaWQgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQ6OmNvbGxlY3RJbmxpbmVD b250ZW50Rm9yU3VidHJlZShjb25zdCBCb3gmIHJvb3QsIEluCiAgICAgLy8gRklYTUU6IFJldmlz aXQgdGhpcyB3aGVuIHdlIGZpZ3VyZWQgb3V0IGhvdyBpbmxpbmUgYm94ZXMgZml0IHRoZSBkaXNw bGF5IHRyZWUuCiAgICAgYXV0byBwYWRkaW5nID0gR2VvbWV0cnk6OmNvbXB1dGVkUGFkZGluZyhs YXlvdXRTdGF0ZSgpLCByb290KTsKICAgICBhdXRvIGJvcmRlciA9IEdlb21ldHJ5Ojpjb21wdXRl ZEJvcmRlcihsYXlvdXRTdGF0ZSgpLCByb290KTsKLSAgICBhdXRvIGhvcml6b250YWxNYXJnaW4g PSBHZW9tZXRyeTo6Y29tcHV0ZWROb25Db2xsYXBzZWRIb3Jpem9udGFsTWFyZ2luVmFsdWUobGF5 b3V0U3RhdGUoKSwgcm9vdCk7CisgICAgYXV0byBob3Jpem9udGFsTWFyZ2luID0gR2VvbWV0cnk6 OmNvbXB1dGVkTm9uQ29sbGFwc2VkSG9yaXpvbnRhbE1hcmdpbihsYXlvdXRTdGF0ZSgpLCByb290 KTsKICAgICAvLyBTZXR1cCBicmVha2luZyBib3VuZGFyaWVzIGZvciB0aGlzIHN1YnRyZWUuCiAg ICAgYXV0byogbGFzdERlc2NlbmRhbnRJbmxpbmVCb3ggPSBpbmxpbmVGb3JtYXR0aW5nU3RhdGUu bGFzdElubGluZUl0ZW0oKTsKICAgICAvLyBFbXB0eSBjb250YWluZXI/CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29u dGV4dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUZvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IGI2NWM4OWZjNTVmLi43 MWRhOTE5MGExNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1h dHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRHZW9t ZXRyeS5jcHAKQEAgLTYwLDcgKzYwLDcgQEAgV2lkdGhBbmRNYXJnaW4gSW5saW5lRm9ybWF0dGlu Z0NvbnRleHQ6Okdlb21ldHJ5OjppbmxpbmVCbG9ja1dpZHRoQW5kTWFyZ2luKExheW8KICAgICAg ICAgd2lkdGggPSBzaHJpbmtUb0ZpdFdpZHRoKGxheW91dFN0YXRlLCBmb3JtYXR0aW5nQ29udGV4 dFJvb3QpOwogCiAgICAgLy8gIzIKLSAgICBhdXRvIG1hcmdpbiA9IGNvbXB1dGVkTm9uQ29sbGFw c2VkSG9yaXpvbnRhbE1hcmdpblZhbHVlKGxheW91dFN0YXRlLCBmb3JtYXR0aW5nQ29udGV4dFJv b3QpOworICAgIGF1dG8gbWFyZ2luID0gY29tcHV0ZWROb25Db2xsYXBzZWRIb3Jpem9udGFsTWFy Z2luKGxheW91dFN0YXRlLCBmb3JtYXR0aW5nQ29udGV4dFJvb3QpOwogCiAgICAgcmV0dXJuIFdp ZHRoQW5kTWFyZ2luIHsgKndpZHRoLCBtYXJnaW4sIG1hcmdpbiB9OwogfQo=