201825 2019-09-16 10:02:58 -0700 [LFC] Make the nested Geometry/MarginCollapse/Quirks c'tors private. 2019-09-16 11:44:44 -0700 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 1571153 0 zalan 2019-09-16 10:02:58 -0700 they should be constructed through the accessor (geometry(), quirks(), marginCollapse()) functions. 1571154 1 webkit-bug-importer 2019-09-16 10:03:18 -0700 <rdar://problem/55403474> 1571161 2 378870 zalan 2019-09-16 10:17:43 -0700 Created attachment 378870 Patch 1571191 3 378870 commit-queue 2019-09-16 11:44:43 -0700 Comment on attachment 378870 Patch Clearing flags on attachment: 378870 Committed r249908: <https://trac.webkit.org/changeset/249908> 1571192 4 commit-queue 2019-09-16 11:44:44 -0700 All reviewed patches have been landed. Closing bug. 378870 2019-09-16 10:17:43 -0700 2019-09-16 11:44:43 -0700 Patch bug-201825-20190916101742.patch text/plain 11905 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ5OTAzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjNkNzk3ZWIxMGEwYmEy OGQ4MmNiN2M5MTJkYWQ3OTFiOTY4Mzc0Yi4uY2VhZTUxNzM4NTcwMjNjYzM4ODdjY2FmMTgzMjkx ZTQzNGVkNTc0MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE5LTA5LTE2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gTWFrZSB0aGUgbmVz dGVkIEdlb21ldHJ5L01hcmdpbkNvbGxhcHNlL1F1aXJrcyBjJ3RvcnMgcHJpdmF0ZS4KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMTgyNQorICAgICAg ICA8cmRhcjovL3Byb2JsZW0vNTU0MDM0NzQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhlIEdlb21ldHJ5L01hcmdpbkNvbGxhcHNlL1F1aXJrcyBv YmplY3RzIHNob3VsZCBiZSBjb25zdHJ1Y3RlZCB0aHJvdWdoIHRoZSBjb3JyZXNwb25kaW5nIGFj Y2Vzc29yIGZ1bmN0aW9ucy4KKyAgICAgICAgVGhpcyBpcyBhbHNvIGEgcHJlcGFyYXRpb24gZm9y IGJlaW5nIGFibGUgdG8gcGFzcyB0aGUgbGF5b3V0IGJveCBpbiB0byB0aGVzZSBzdGFjayBvYmpl Y3RzIGFuZCBjYWxsIGdlb21ldHJ5KGxheW91dEJveCktPm91dE9mRmxvd1ZlcnRpY2FsR2VvbWV0 cnkoKSB2cy4gZ2VvbWV0cnkoKS0+b3V0T2ZGbG93VmVydGljYWxHZW9tZXRyeShsYXlvdXRCb3gp LiAKKworICAgICAgICAqIGxheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oOgorICAgICAgICAqIGxh eW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oOgorICAgICAgICAq IGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2Vv bWV0cnk6OmluRmxvd05vblJlcGxhY2VkSGVpZ2h0QW5kTWFyZ2luKToKKyAgICAgICAgKiBsYXlv dXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpRdWlya3M6OnN0 cmV0Y2hlZEluRmxvd0hlaWdodCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcv SW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaDoKKyAgICAgICAgKiBsYXlvdXQvdGFibGVmb3JtYXR0 aW5nL1RhYmxlRm9ybWF0dGluZ0NvbnRleHQuaDoKKwogMjAxOS0wOS0xNiAgWmFsYW4gQnVqdGFz ICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdIEFsd2F5cyBwcm92aWRlIGEgY29u dGFpbmluZyBibG9jayB3aWR0aCB2YWx1ZSB0byBjb21wdXRlKiBmdW5jdGlvbnMuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4IGQzYmNiMWM1MGI0ZmE3OTIw NTk3NzI2ZmZiZDE2ZDlmYWIyZTkwMWMuLmZlNGIyODA4ZWIzYTJkNmY3ZmYyMDhjNWFhZGE4YTY2 YTM2OTlmNDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29u dGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dC5oCkBA IC05Myw4ICs5Myw2IEBAIHByb3RlY3RlZDoKICAgICAvLyBUaGlzIGNsYXNzIGltcGxlbWVudHMg Z2VuZXJpYyBwb3NpdGlvbmluZyBhbmQgc2l6aW5nLgogICAgIGNsYXNzIEdlb21ldHJ5IHsKICAg ICBwdWJsaWM6Ci0gICAgICAgIEdlb21ldHJ5KGNvbnN0IEZvcm1hdHRpbmdDb250ZXh0Jik7Ci0K ICAgICAgICAgVmVydGljYWxHZW9tZXRyeSBvdXRPZkZsb3dWZXJ0aWNhbEdlb21ldHJ5KGNvbnN0 IEJveCYsIFVzZWRIb3Jpem9udGFsVmFsdWVzLCBVc2VkVmVydGljYWxWYWx1ZXMpIGNvbnN0Owog ICAgICAgICBIb3Jpem9udGFsR2VvbWV0cnkgb3V0T2ZGbG93SG9yaXpvbnRhbEdlb21ldHJ5KGNv bnN0IEJveCYsIFVzZWRIb3Jpem9udGFsVmFsdWVzKTsKIApAQCAtMTI2LDYgKzEyNCw5IEBAIHBy b3RlY3RlZDoKICAgICAgICAgTGF5b3V0VW5pdCBjb250ZW50SGVpZ2h0Rm9yRm9ybWF0dGluZ0Nv bnRleHRSb290KGNvbnN0IEJveCYpIGNvbnN0OwogCiAgICAgcHJvdGVjdGVkOgorICAgICAgICBm cmllbmQgY2xhc3MgRm9ybWF0dGluZ0NvbnRleHQ7CisgICAgICAgIEdlb21ldHJ5KGNvbnN0IEZv cm1hdHRpbmdDb250ZXh0Jik7CisKICAgICAgICAgZW51bSBjbGFzcyBIZWlnaHRUeXBlIHsgTWlu LCBNYXgsIE5vcm1hbCB9OwogICAgICAgICBPcHRpb25hbDxMYXlvdXRVbml0PiBjb21wdXRlZEhl aWdodFZhbHVlKGNvbnN0IEJveCYsIEhlaWdodFR5cGUsIE9wdGlvbmFsPFVzZWRWZXJ0aWNhbFZh bHVlcz4gPSBXVEY6Om51bGxvcHQpIGNvbnN0OwogCkBAIC0xNTQsMTEgKzE1NSwxMiBAQCBwcm90 ZWN0ZWQ6CiAKICAgICBjbGFzcyBRdWlya3MgewogICAgIHB1YmxpYzoKLSAgICAgICAgUXVpcmtz KGNvbnN0IEZvcm1hdHRpbmdDb250ZXh0Jik7Ci0KICAgICAgICAgTGF5b3V0VW5pdCBoZWlnaHRW YWx1ZU9mTmVhcmVzdENvbnRhaW5pbmdCbG9ja1dpdGhGaXhlZEhlaWdodChjb25zdCBCb3gmKTsK IAogICAgIHByb3RlY3RlZDoKKyAgICAgICAgZnJpZW5kIGNsYXNzIEZvcm1hdHRpbmdDb250ZXh0 OworICAgICAgICBRdWlya3MoY29uc3QgRm9ybWF0dGluZ0NvbnRleHQmKTsKKwogICAgICAgICBj b25zdCBMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUoKSBjb25zdCB7IHJldHVybiBtX2Zvcm1hdHRp bmdDb250ZXh0LmxheW91dFN0YXRlKCk7IH0KICAgICAgICAgTGF5b3V0U3RhdGUmIGxheW91dFN0 YXRlKCkgeyByZXR1cm4gbV9mb3JtYXR0aW5nQ29udGV4dC5sYXlvdXRTdGF0ZSgpOyB9CiAgICAg ICAgIGNvbnN0IEZvcm1hdHRpbmdDb250ZXh0JiBmb3JtYXR0aW5nQ29udGV4dCgpIGNvbnN0IHsg cmV0dXJuIG1fZm9ybWF0dGluZ0NvbnRleHQ7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmgK aW5kZXggZmI2NTdiNmE4OGJmNDAwMDdiMGRmMTc0Y2QyNmJmYTkzZDZlYmFjOS4uOGZhOWM0NzA2 OWU3NGQ0MWM3ZDFlOTdlNmMzOWZlMTc3MTRmM2M4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmgKKysrIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250 ZXh0LmgKQEAgLTc1LDggKzc1LDYgQEAgcHJpdmF0ZToKICAgICAvLyBUaGlzIGNsYXNzIGltcGxl bWVudHMgcG9zaXRpb25pbmcgYW5kIHNpemluZyBmb3IgYm94ZXMgcGFydGljaXBhdGluZyBpbiBh IGJsb2NrIGZvcm1hdHRpbmcgY29udGV4dC4KICAgICBjbGFzcyBHZW9tZXRyeSA6IHB1YmxpYyBG b3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnkgewogICAgIHB1YmxpYzoKLSAgICAgICAgR2VvbWV0 cnkoY29uc3QgQmxvY2tGb3JtYXR0aW5nQ29udGV4dCYpOwotCiAgICAgICAgIEhlaWdodEFuZE1h cmdpbiBpbkZsb3dIZWlnaHRBbmRNYXJnaW4oY29uc3QgQm94JiwgVXNlZEhvcml6b250YWxWYWx1 ZXMsIFVzZWRWZXJ0aWNhbFZhbHVlcyk7CiAgICAgICAgIFdpZHRoQW5kTWFyZ2luIGluRmxvd1dp ZHRoQW5kTWFyZ2luKGNvbnN0IEJveCYsIFVzZWRIb3Jpem9udGFsVmFsdWVzKTsKIApAQCAtODcs NiArODUsOSBAQCBwcml2YXRlOgogICAgICAgICBJbnRyaW5zaWNXaWR0aENvbnN0cmFpbnRzIGlu dHJpbnNpY1dpZHRoQ29uc3RyYWludHMoY29uc3QgQm94Jik7CiAKICAgICBwcml2YXRlOgorICAg ICAgICBmcmllbmQgY2xhc3MgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDsKKyAgICAgICAgR2VvbWV0 cnkoY29uc3QgQmxvY2tGb3JtYXR0aW5nQ29udGV4dCYpOworCiAgICAgICAgIEhlaWdodEFuZE1h cmdpbiBpbkZsb3dOb25SZXBsYWNlZEhlaWdodEFuZE1hcmdpbihjb25zdCBCb3gmLCBVc2VkSG9y aXpvbnRhbFZhbHVlcywgVXNlZFZlcnRpY2FsVmFsdWVzKTsKICAgICAgICAgV2lkdGhBbmRNYXJn aW4gaW5GbG93Tm9uUmVwbGFjZWRXaWR0aEFuZE1hcmdpbihjb25zdCBCb3gmLCBVc2VkSG9yaXpv bnRhbFZhbHVlcykgY29uc3Q7CiAgICAgICAgIFdpZHRoQW5kTWFyZ2luIGluRmxvd1JlcGxhY2Vk V2lkdGhBbmRNYXJnaW4oY29uc3QgQm94JiwgVXNlZEhvcml6b250YWxWYWx1ZXMpIGNvbnN0OwpA QCAtOTksOCArMTAwLDYgQEAgcHJpdmF0ZToKICAgICAvLyBUaGlzIGNsYXNzIGltcGxlbWVudHMg bWFyZ2luIGNvbGxhcHNpbmcgZm9yIGJsb2NrIGZvcm1hdHRpbmcgY29udGV4dC4KICAgICBjbGFz cyBNYXJnaW5Db2xsYXBzZSB7CiAgICAgcHVibGljOgotICAgICAgICBNYXJnaW5Db2xsYXBzZShj b25zdCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Jik7Ci0KICAgICAgICAgVXNlZFZlcnRpY2FsTWFy Z2luOjpDb2xsYXBzZWRWYWx1ZXMgY29sbGFwc2VkVmVydGljYWxWYWx1ZXMoY29uc3QgQm94Jiwg Y29uc3QgVXNlZFZlcnRpY2FsTWFyZ2luOjpOb25Db2xsYXBzZWRWYWx1ZXMmKTsKIAogICAgICAg ICBFc3RpbWF0ZWRNYXJnaW5CZWZvcmUgZXN0aW1hdGVkTWFyZ2luQmVmb3JlKGNvbnN0IEJveCYp OwpAQCAtMTIyLDYgKzEyMSw5IEBAIHByaXZhdGU6CiAgICAgICAgIGJvb2wgbWFyZ2luc0NvbGxh cHNlVGhyb3VnaChjb25zdCBCb3gmKSBjb25zdDsKIAogICAgIHByaXZhdGU6CisgICAgICAgIGZy aWVuZCBjbGFzcyBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OworICAgICAgICBNYXJnaW5Db2xsYXBz ZShjb25zdCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Jik7CisKICAgICAgICAgZW51bSBjbGFzcyBN YXJnaW5UeXBlIHsgQmVmb3JlLCBBZnRlciB9OwogICAgICAgICBQb3NpdGl2ZUFuZE5lZ2F0aXZl VmVydGljYWxNYXJnaW46OlZhbHVlcyBwb3NpdGl2ZU5lZ2F0aXZlVmFsdWVzKGNvbnN0IEJveCYs IE1hcmdpblR5cGUpOwogICAgICAgICBQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW46 OlZhbHVlcyBwb3NpdGl2ZU5lZ2F0aXZlTWFyZ2luQmVmb3JlKGNvbnN0IEJveCYsIGNvbnN0IFVz ZWRWZXJ0aWNhbE1hcmdpbjo6Tm9uQ29sbGFwc2VkVmFsdWVzJik7CkBAIC0xMzgsOCArMTQwLDYg QEAgcHJpdmF0ZToKIAogICAgIGNsYXNzIFF1aXJrcyA6IHB1YmxpYyBGb3JtYXR0aW5nQ29udGV4 dDo6UXVpcmtzIHsKICAgICBwdWJsaWM6Ci0gICAgICAgIFF1aXJrcyhjb25zdCBCbG9ja0Zvcm1h dHRpbmdDb250ZXh0Jik7Ci0KICAgICAgICAgYm9vbCBuZWVkc1N0cmV0Y2hpbmcoY29uc3QgQm94 JikgY29uc3Q7CiAgICAgICAgIEhlaWdodEFuZE1hcmdpbiBzdHJldGNoZWRJbkZsb3dIZWlnaHQo Y29uc3QgQm94JiwgSGVpZ2h0QW5kTWFyZ2luKTsKIApAQCAtMTQ4LDYgKzE0OCw5IEBAIHByaXZh dGU6CiAgICAgICAgIGJvb2wgc2hvdWxkSWdub3JlTWFyZ2luQWZ0ZXIoY29uc3QgQm94JikgY29u c3Q7CiAKICAgICBwcml2YXRlOgorICAgICAgICBmcmllbmQgY2xhc3MgQmxvY2tGb3JtYXR0aW5n Q29udGV4dDsKKyAgICAgICAgUXVpcmtzKGNvbnN0IEJsb2NrRm9ybWF0dGluZ0NvbnRleHQmKTsK KwogICAgICAgICBjb25zdCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0JiBmb3JtYXR0aW5nQ29udGV4 dCgpIGNvbnN0IHsgcmV0dXJuIGRvd25jYXN0PEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ+KEZvcm1h dHRpbmdDb250ZXh0OjpRdWlya3M6OmZvcm1hdHRpbmdDb250ZXh0KCkpOyB9CiAKICAgICB9Owpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zv cm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2Nr Zm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IDA0ZWZl MGQwYmIzZDViZGI3MjQzYmJkYWRiM2NjMmFkNTllNGMxMGEuLjc1MzE5MWM1ODhlMTM3MGRkMmI2 Y2JmYzIwMmI3MDQ2ZDk4ZWQ3NWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9i bG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRl eHRHZW9tZXRyeS5jcHAKQEAgLTg0LDggKzg0LDcgQEAgSGVpZ2h0QW5kTWFyZ2luIEJsb2NrRm9y bWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbkZsb3dOb25SZXBsYWNlZEhlaWdodEFuZE1hcmcK ICAgICAgICAgLy8gMi4gdGhlIGJvdHRvbSBlZGdlIG9mIHRoZSBib3R0b20gKHBvc3NpYmx5IGNv bGxhcHNlZCkgbWFyZ2luIG9mIGl0cyBsYXN0IGluLWZsb3cgY2hpbGQsIGlmIHRoZSBjaGlsZCdz IGJvdHRvbSBtYXJnaW4uLi4KICAgICAgICAgYXV0byogbGFzdEluRmxvd0NoaWxkID0gbGF5b3V0 Q29udGFpbmVyLmxhc3RJbkZsb3dDaGlsZCgpOwogICAgICAgICBBU1NFUlQobGFzdEluRmxvd0No aWxkKTsKLSAgICAgICAgYXV0byBtYXJnaW5Db2xsYXBzZSA9IE1hcmdpbkNvbGxhcHNlKGZvcm1h dHRpbmdDb250ZXh0KCkpOwotICAgICAgICBpZiAoIW1hcmdpbkNvbGxhcHNlLm1hcmdpbkFmdGVy Q29sbGFwc2VzV2l0aFBhcmVudE1hcmdpbkFmdGVyKCpsYXN0SW5GbG93Q2hpbGQpKSB7CisgICAg ICAgIGlmICghZm9ybWF0dGluZ0NvbnRleHQoKS5tYXJnaW5Db2xsYXBzZSgpLm1hcmdpbkFmdGVy Q29sbGFwc2VzV2l0aFBhcmVudE1hcmdpbkFmdGVyKCpsYXN0SW5GbG93Q2hpbGQpKSB7CiAgICAg ICAgICAgICBhdXRvJiBsYXN0SW5GbG93Qm94R2VvbWV0cnkgPSBmb3JtYXR0aW5nQ29udGV4dCgp Lmdlb21ldHJ5Rm9yQm94KCpsYXN0SW5GbG93Q2hpbGQpOwogICAgICAgICAgICAgYXV0byBib3R0 b21FZGdlT2ZCb3R0b21NYXJnaW4gPSBsYXN0SW5GbG93Qm94R2VvbWV0cnkuYm90dG9tKCkgKyAo bGFzdEluRmxvd0JveEdlb21ldHJ5Lmhhc0NvbGxhcHNlZFRocm91Z2hNYXJnaW4oKSA/IExheW91 dFVuaXQoKSA6IGxhc3RJbkZsb3dCb3hHZW9tZXRyeS5tYXJnaW5BZnRlcigpKTsgCiAgICAgICAg ICAgICByZXR1cm4geyBib3R0b21FZGdlT2ZCb3R0b21NYXJnaW4gLSBib3JkZXJBbmRQYWRkaW5n VG9wLCBub25Db2xsYXBzZWRNYXJnaW4gfTsKQEAgLTkzLDcgKzkyLDcgQEAgSGVpZ2h0QW5kTWFy Z2luIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbkZsb3dOb25SZXBsYWNlZEhl aWdodEFuZE1hcmcKIAogICAgICAgICAvLyAzLiB0aGUgYm90dG9tIGJvcmRlciBlZGdlIG9mIHRo ZSBsYXN0IGluLWZsb3cgY2hpbGQgd2hvc2UgdG9wIG1hcmdpbiBkb2Vzbid0IGNvbGxhcHNlIHdp dGggdGhlIGVsZW1lbnQncyBib3R0b20gbWFyZ2luCiAgICAgICAgIGF1dG8qIGluRmxvd0NoaWxk ID0gbGFzdEluRmxvd0NoaWxkOwotICAgICAgICB3aGlsZSAoaW5GbG93Q2hpbGQgJiYgbWFyZ2lu Q29sbGFwc2UubWFyZ2luQmVmb3JlQ29sbGFwc2VzV2l0aFBhcmVudE1hcmdpbkFmdGVyKCppbkZs b3dDaGlsZCkpCisgICAgICAgIHdoaWxlIChpbkZsb3dDaGlsZCAmJiBmb3JtYXR0aW5nQ29udGV4 dCgpLm1hcmdpbkNvbGxhcHNlKCkubWFyZ2luQmVmb3JlQ29sbGFwc2VzV2l0aFBhcmVudE1hcmdp bkFmdGVyKCppbkZsb3dDaGlsZCkpCiAgICAgICAgICAgICBpbkZsb3dDaGlsZCA9IGluRmxvd0No aWxkLT5wcmV2aW91c0luRmxvd1NpYmxpbmcoKTsKICAgICAgICAgaWYgKGluRmxvd0NoaWxkKSB7 CiAgICAgICAgICAgICBhdXRvJiBpbkZsb3dEaXNwbGF5Qm94R2VvbWV0cnkgPSBmb3JtYXR0aW5n Q29udGV4dCgpLmdlb21ldHJ5Rm9yQm94KCppbkZsb3dDaGlsZCk7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRR dWlya3MuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zv cm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcAppbmRleCAxY2Y1OTgwYzRlMDIyOTk1OGQ0MzY1YTU1 ZWU2NjUwZDRlYjRiYmQyLi40YzFlMTViYmMzMjA2MDJjOGRiZWE3YTU2NTc3NjgyMjg1NWZjOTY0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2Nr Rm9ybWF0dGluZ0NvbnRleHRRdWlya3MuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9i bG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dFF1aXJrcy5jcHAKQEAgLTg5LDcg Kzg5LDcgQEAgSGVpZ2h0QW5kTWFyZ2luIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OlF1aXJrczo6 c3RyZXRjaGVkSW5GbG93SGVpZ2h0KGNvbnN0IEJveCYKICAgICAgICAgc3RyZWNoZWRIZWlnaHQg LT0gYm9keUJveEdlb21ldHJ5LnZlcnRpY2FsQm9yZGVyKCkgKyBib2R5Qm94R2VvbWV0cnkudmVy dGljYWxQYWRkaW5nKCkudmFsdWVPcigwKTsKIAogICAgICAgICBhdXRvIG5vbkNvbGxhcHNlZE1h cmdpbiA9IGhlaWdodEFuZE1hcmdpbi5ub25Db2xsYXBzZWRNYXJnaW47Ci0gICAgICAgIGF1dG8g Y29sbGFwc2VkTWFyZ2luID0gTWFyZ2luQ29sbGFwc2UoZm9ybWF0dGluZ0NvbnRleHQpLmNvbGxh cHNlZFZlcnRpY2FsVmFsdWVzKGxheW91dEJveCwgbm9uQ29sbGFwc2VkTWFyZ2luKTsKKyAgICAg ICAgYXV0byBjb2xsYXBzZWRNYXJnaW4gPSBmb3JtYXR0aW5nQ29udGV4dC5tYXJnaW5Db2xsYXBz ZSgpLmNvbGxhcHNlZFZlcnRpY2FsVmFsdWVzKGxheW91dEJveCwgbm9uQ29sbGFwc2VkTWFyZ2lu KTsKICAgICAgICAgdG90YWxWZXJ0aWNhbE1hcmdpbiA9IGNvbGxhcHNlZE1hcmdpbi5iZWZvcmUu dmFsdWVPcihub25Db2xsYXBzZWRNYXJnaW4uYmVmb3JlKTsKICAgICAgICAgdG90YWxWZXJ0aWNh bE1hcmdpbiArPSBjb2xsYXBzZWRNYXJnaW4uaXNDb2xsYXBzZWRUaHJvdWdoID8gbm9uQ29sbGFw c2VkTWFyZ2luLmFmdGVyIDogY29sbGFwc2VkTWFyZ2luLmFmdGVyLnZhbHVlT3Iobm9uQ29sbGFw c2VkTWFyZ2luLmFmdGVyKTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaApp bmRleCA0NjU3NDhiNTFhOWExZmFhYmEwODFmMzM0YjAwM2JhNjE1ZWI1N2VmLi4wN2Y4YmY3Y2Yy YjU4MTU2YmU2MDUzNjUyMjE1YzE3MzE2N2Q3MjU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdD b250ZXh0LmgKQEAgLTcxLDEyICs3MSwxMyBAQCBwcml2YXRlOgogCiAgICAgY2xhc3MgUXVpcmtz IDogcHVibGljIEZvcm1hdHRpbmdDb250ZXh0OjpRdWlya3MgewogICAgIHB1YmxpYzoKLSAgICAg ICAgUXVpcmtzKGNvbnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0Jik7Ci0KICAgICAgICAgYm9v bCBsaW5lRGVzY2VudE5lZWRzQ29sbGFwc2luZyhjb25zdCBMaW5lOjpDb250ZW50JikgY29uc3Q7 CiAgICAgICAgIExpbmU6OkluaXRpYWxDb25zdHJhaW50czo6SGVpZ2h0QW5kQmFzZWxpbmUgbGlu ZUhlaWdodENvbnN0cmFpbnRzKGNvbnN0IEJveCYgZm9ybWF0dGluZ1Jvb3QpIGNvbnN0OwogCiAg ICAgcHJpdmF0ZToKKyAgICAgICAgZnJpZW5kIGNsYXNzIElubGluZUZvcm1hdHRpbmdDb250ZXh0 OworICAgICAgICBRdWlya3MoY29uc3QgSW5saW5lRm9ybWF0dGluZ0NvbnRleHQmKTsKKwogICAg ICAgICBjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYgZm9ybWF0dGluZ0NvbnRleHQoKSBj b25zdCB7IHJldHVybiBkb3duY2FzdDxJbmxpbmVGb3JtYXR0aW5nQ29udGV4dD4oRm9ybWF0dGlu Z0NvbnRleHQ6OlF1aXJrczo6Zm9ybWF0dGluZ0NvbnRleHQoKSk7IH0KIAogICAgIH07CkBAIC04 NCwxMiArODUsMTMgQEAgcHJpdmF0ZToKIAogICAgIGNsYXNzIEdlb21ldHJ5IDogcHVibGljIEZv cm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeSB7CiAgICAgcHVibGljOgotICAgICAgICBHZW9tZXRy eShjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYpOwotCiAgICAgICAgIEhlaWdodEFuZE1h cmdpbiBpbmxpbmVCbG9ja0hlaWdodEFuZE1hcmdpbihjb25zdCBCb3gmLCBVc2VkSG9yaXpvbnRh bFZhbHVlcykgY29uc3Q7CiAgICAgICAgIFdpZHRoQW5kTWFyZ2luIGlubGluZUJsb2NrV2lkdGhB bmRNYXJnaW4oY29uc3QgQm94JiwgVXNlZEhvcml6b250YWxWYWx1ZXMpOwogCiAgICAgcHJpdmF0 ZToKKyAgICAgICAgZnJpZW5kIGNsYXNzIElubGluZUZvcm1hdHRpbmdDb250ZXh0OworICAgICAg ICBHZW9tZXRyeShjb25zdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dCYpOworCiAgICAgICAgIGNv bnN0IElubGluZUZvcm1hdHRpbmdDb250ZXh0JiBmb3JtYXR0aW5nQ29udGV4dCgpIGNvbnN0IHsg cmV0dXJuIGRvd25jYXN0PElubGluZUZvcm1hdHRpbmdDb250ZXh0PihGb3JtYXR0aW5nQ29udGV4 dDo6R2VvbWV0cnk6OmZvcm1hdHRpbmdDb250ZXh0KCkpOyB9CiAKICAgICB9OwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L3RhYmxlZm9ybWF0dGluZy9UYWJsZUZvcm1hdHRpbmdD b250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9y bWF0dGluZ0NvbnRleHQuaAppbmRleCA5N2ExNDQ2MjA5OWQ3NzI5YjQwYjJjZmIzNWYzMGFlYTNk OGEyOGYyLi5lYThkM2U1OWVjMWFlYjRhNjQxMTg5N2JiMDQ2ZDAxM2VkZTA4ZjAwIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1RhYmxlRm9ybWF0dGlu Z0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvdGFibGVmb3JtYXR0aW5nL1Rh YmxlRm9ybWF0dGluZ0NvbnRleHQuaApAQCAtNDUsMTEgKzQ1LDEyIEBAIHB1YmxpYzoKIHByaXZh dGU6CiAgICAgY2xhc3MgR2VvbWV0cnkgOiBwdWJsaWMgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21l dHJ5IHsKICAgICBwdWJsaWM6Ci0gICAgICAgIEdlb21ldHJ5KGNvbnN0IFRhYmxlRm9ybWF0dGlu Z0NvbnRleHQmKTsKLQogICAgICAgICBIZWlnaHRBbmRNYXJnaW4gdGFibGVDZWxsSGVpZ2h0QW5k TWFyZ2luKGNvbnN0IEJveCYpIGNvbnN0OwogCiAgICAgcHJpdmF0ZToKKyAgICAgICAgZnJpZW5k IGNsYXNzIFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ7CisgICAgICAgIEdlb21ldHJ5KGNvbnN0IFRh YmxlRm9ybWF0dGluZ0NvbnRleHQmKTsKKwogICAgICAgICBjb25zdCBUYWJsZUZvcm1hdHRpbmdD b250ZXh0JiBmb3JtYXR0aW5nQ29udGV4dCgpIGNvbnN0IHsgcmV0dXJuIGRvd25jYXN0PFRhYmxl Rm9ybWF0dGluZ0NvbnRleHQ+KEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6Zm9ybWF0dGlu Z0NvbnRleHQoKSk7IH0KICAgICB9OwogICAgIFRhYmxlRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21l dHJ5IGdlb21ldHJ5KCkgY29uc3QgeyByZXR1cm4gR2VvbWV0cnkoKnRoaXMpOyB9Cg==