194074 2019-01-30 20:41:33 -0800 [LFC] Use the used margin values in outOfFlowReplacedHorizontalGeometry consistently 2019-01-31 05:40:30 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1500392 0 zalan 2019-01-30 20:41:33 -0800 ssia 1500404 1 360686 zalan 2019-01-30 20:56:38 -0800 Created attachment 360686 Patch 1500552 2 zalan 2019-01-31 05:39:50 -0800 Committed r240780: <https://trac.webkit.org/changeset/240780> 1500553 3 webkit-bug-importer 2019-01-31 05:40:30 -0800 <rdar://problem/47700116> 360686 2019-01-30 20:56:38 -0800 2019-01-31 05:32:00 -0800 Patch Patch.txt text/plain 11091 zalan ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2NzdlMGI5NDY5My4uNjAzYTM5OTY3MTkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAor MjAxOS0wMS0zMCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgorCisgICAgICAgIFtM RkNdIFVzZSB0aGUgdXNlZCBtYXJnaW4gdmFsdWVzIGluIG91dE9mRmxvd1JlcGxhY2VkSG9yaXpv bnRhbEdlb21ldHJ5IGNvbnNpc3RlbnRseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTk0MDc0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBmYXN0L2Jsb2NrL2Jsb2NrLW9ubHkvYWJzb2x1dGUtcG9zaXRp b24td2l0aC1tYXJnaW4tYXV0by1zaW1wbGUyLWV4cGVjdGVkLmh0bWw6IEFkZGVkLgorICAgICAg ICAqIGZhc3QvYmxvY2svYmxvY2stb25seS9hYnNvbHV0ZS1wb3NpdGlvbi13aXRoLW1hcmdpbi1h dXRvLXNpbXBsZTIuaHRtbDogQWRkZWQuCisKIDIwMTktMDEtMzAgIERlYW4gSmFja3NvbiAgPGRp bm9AYXBwbGUuY29tPgogCiAgICAgICAgIFBvaW50ZXJFdmVudHMgLSB0aWx0WCBhbmQgdGlsdFkg YXJlIHJldmVyc2VkCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2Jsb2NrL2Jsb2NrLW9u bHkvYWJzb2x1dGUtcG9zaXRpb24td2l0aC1tYXJnaW4tYXV0by1zaW1wbGUyLWV4cGVjdGVkLmh0 bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Jsb2NrL2Jsb2NrLW9ubHkvYWJzb2x1dGUtcG9zaXRpb24t d2l0aC1tYXJnaW4tYXV0by1zaW1wbGUyLWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAuLjQxMjU3ODRhOWJlCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvZmFzdC9ibG9jay9ibG9jay1vbmx5L2Fic29sdXRlLXBvc2l0aW9uLXdpdGgtbWFy Z2luLWF1dG8tc2ltcGxlMi1leHBlY3RlZC5odG1sCkBAIC0wLDAgKzEsOSBAQAorPHN0eWxlPgor ZGl2IHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgICB3aWR0aDogMTAwcHg7Cisg ICAgaGVpZ2h0OiAxMDBweDsKK30KKzwvc3R5bGU+Cis8ZGl2IHN0eWxlPSJwb3NpdGlvbjogcmVs YXRpdmU7IGxlZnQ6IDEwcHg7Ij48L2Rpdj4KKzxkaXYgc3R5bGU9InBvc2l0aW9uOiByZWxhdGl2 ZTsgdG9wOiAtMTAwcHg7IGxlZnQ6IDM5MHB4OyI+PC9kaXY+CmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9mYXN0L2Jsb2NrL2Jsb2NrLW9ubHkvYWJzb2x1dGUtcG9zaXRpb24td2l0aC1tYXJnaW4t YXV0by1zaW1wbGUyLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2Jsb2NrL2Jsb2NrLW9ubHkvYWJz b2x1dGUtcG9zaXRpb24td2l0aC1tYXJnaW4tYXV0by1zaW1wbGUyLmh0bWwKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAuLmNkNzQ3MzJkMjlhCi0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvZmFzdC9ibG9jay9ibG9jay1vbmx5L2Fic29sdXRlLXBvc2l0aW9uLXdp dGgtbWFyZ2luLWF1dG8tc2ltcGxlMi5odG1sCkBAIC0wLDAgKzEsMTUgQEAKKzxzdHlsZT4KK2Rp diB7CisgICAgbWFyZ2luLWxlZnQ6IGF1dG87CisgICAgbWFyZ2luLXJpZ2h0OiBhdXRvOworICAg IHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmVlbjsKKyAgICBo ZWlnaHQ6IDEwMHB4OworfQorPC9zdHlsZT4KKzxkaXYgc3R5bGU9ImhlaWdodDogNTAwcHg7IHdp ZHRoOiA1MDBweDsgYmFja2dyb3VuZC1jb2xvcjogdHJhbnNwYXJlbnQiPgorIDxkaXYgc3R5bGU9 ImxlZnQ6IDEwcHg7Ij48L2Rpdj4KKyA8ZGl2IHN0eWxlPSJyaWdodDogMTBweDsiPjwvZGl2Pgor IDxkaXYgc3R5bGU9ImxlZnQ6IDEwcHg7IHdpZHRoOiAxMDBweCI+PC9kaXY+CisgPGRpdiBzdHls ZT0icmlnaHQ6IDEwcHg7IHdpZHRoOiAxMDBweCI+PC9kaXY+Cis8L2Rpdj4KXCBObyBuZXdsaW5l IGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9T b3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWFhYjRhMjRiMDkuLjFhNTA0NDNkOTZlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTktMDEtMzAgIFphbGFuIEJ1anRhcyAgPHph bGFuQGFwcGxlLmNvbT4KKworICAgICAgICBbTEZDXSBVc2UgdGhlIHVzZWQgbWFyZ2luIHZhbHVl cyBpbiBvdXRPZkZsb3dSZXBsYWNlZEhvcml6b250YWxHZW9tZXRyeSBjb25zaXN0ZW50bHkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NDA3NAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoZWNrIHRoZSB1 c2VkIG1hcmdpbiB2YXJpYWJsZXMgd2hldGhlciB3ZSBhbHJlYWR5IGNvbXB1dGVkIHN0YXJ0L2Vu ZCB2YWx1ZXMuCisKKyAgICAgICAgVGVzdDogZmFzdC9ibG9jay9ibG9jay1vbmx5L2Fic29sdXRl LXBvc2l0aW9uLXdpdGgtbWFyZ2luLWF1dG8tc2ltcGxlMi5odG1sCisKKyAgICAgICAgKiBsYXlv dXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXQ6OkZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2ZGbG93UmVwbGFjZWRIb3Jpem9u dGFsR2VvbWV0cnkpOgorCiAyMDE5LTAxLTMwICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5j b20+CiAKICAgICAgICAgW0xGQ11bQkZDXSBBZGQgc3VwcG9ydCBmb3IgYmxvY2sgbGV2ZWwgcmVw bGFjZWQgYm94LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdD b250ZXh0R2VvbWV0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250 ZXh0R2VvbWV0cnkuY3BwCmluZGV4IDJmMDBiNTVmYmUyLi4zOGNmNGMyN2VlMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcApA QCAtNjQyLDcgKzY0Miw4IEBAIEhvcml6b250YWxHZW9tZXRyeSBGb3JtYXR0aW5nQ29udGV4dDo6 R2VvbWV0cnk6Om91dE9mRmxvd1JlcGxhY2VkSG9yaXpvbnRhbEdlb21lCiAgICAgYXV0byByaWdo dCA9IGNvbXB1dGVkVmFsdWVJZk5vdEF1dG8oc3R5bGUubG9naWNhbFJpZ2h0KCksIGNvbnRhaW5p bmdCbG9ja1dpZHRoKTsKICAgICBhdXRvIGlzU3RhdGljYWxseVBvc2l0aW9uZWQgPSAhbGVmdCAm JiAhcmlnaHQ7CiAgICAgYXV0byBjb21wdXRlZEhvcml6b250YWxNYXJnaW4gPSBHZW9tZXRyeTo6 Y29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luKGxheW91dFN0YXRlLCBsYXlvdXRCb3gpOwotICAgIFVz ZWRIb3Jpem9udGFsTWFyZ2luIHVzZWRIb3Jpem9udGFsTWFyZ2luOworICAgIE9wdGlvbmFsPExh eW91dFVuaXQ+IHVzZWRNYXJnaW5TdGFydDsKKyAgICBPcHRpb25hbDxMYXlvdXRVbml0PiB1c2Vk TWFyZ2luRW5kOwogICAgIGF1dG8gd2lkdGggPSBpbmxpbmVSZXBsYWNlZFdpZHRoQW5kTWFyZ2lu KGxheW91dFN0YXRlLCBsYXlvdXRCb3gsIHVzZWRXaWR0aCkud2lkdGg7CiAgICAgYXV0byBwYWRk aW5nTGVmdCA9IGRpc3BsYXlCb3gucGFkZGluZ0xlZnQoKS52YWx1ZU9yKDApOwogICAgIGF1dG8g cGFkZGluZ1JpZ2h0ID0gZGlzcGxheUJveC5wYWRkaW5nUmlnaHQoKS52YWx1ZU9yKDApOwpAQCAt NjYwLDQ5ICs2NjEsNTMgQEAgSG9yaXpvbnRhbEdlb21ldHJ5IEZvcm1hdHRpbmdDb250ZXh0OjpH ZW9tZXRyeTo6b3V0T2ZGbG93UmVwbGFjZWRIb3Jpem9udGFsR2VvbWUKIAogICAgIGlmICghbGVm dCB8fCAhcmlnaHQpIHsKICAgICAgICAgLy8gIzIKLSAgICAgICAgdXNlZEhvcml6b250YWxNYXJn aW4gPSB7IGNvbXB1dGVkSG9yaXpvbnRhbE1hcmdpbi5zdGFydC52YWx1ZU9yKDApLCBjb21wdXRl ZEhvcml6b250YWxNYXJnaW4uZW5kLnZhbHVlT3IoMCkgfTsKKyAgICAgICAgdXNlZE1hcmdpblN0 YXJ0ID0gY29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luLnN0YXJ0LnZhbHVlT3IoMCk7CisgICAgICAg IHVzZWRNYXJnaW5FbmQgPSBjb21wdXRlZEhvcml6b250YWxNYXJnaW4uZW5kLnZhbHVlT3IoMCk7 CiAgICAgfQogCi0gICAgaWYgKCFjb21wdXRlZEhvcml6b250YWxNYXJnaW4uc3RhcnQgJiYgIWNv bXB1dGVkSG9yaXpvbnRhbE1hcmdpbi5lbmQpIHsKKyAgICBpZiAoIXVzZWRNYXJnaW5TdGFydCAm JiAhdXNlZE1hcmdpbkVuZCkgewogICAgICAgICAvLyAjMwogICAgICAgICBhdXRvIG1hcmdpblN0 YXJ0QW5kRW5kID0gY29udGFpbmluZ0Jsb2NrV2lkdGggLSAoKmxlZnQgKyBib3JkZXJMZWZ0ICsg cGFkZGluZ0xlZnQgKyB3aWR0aCArIHBhZGRpbmdSaWdodCArIGJvcmRlclJpZ2h0ICsgKnJpZ2h0 KTsKLSAgICAgICAgaWYgKG1hcmdpblN0YXJ0QW5kRW5kID49IDApCi0gICAgICAgICAgICB1c2Vk SG9yaXpvbnRhbE1hcmdpbiA9IHsgbWFyZ2luU3RhcnRBbmRFbmQgLyAyLCBtYXJnaW5TdGFydEFu ZEVuZCAvIDIgfTsKLSAgICAgICAgZWxzZSB7CisgICAgICAgIGlmIChtYXJnaW5TdGFydEFuZEVu ZCA+PSAwKSB7CisgICAgICAgICAgICB1c2VkTWFyZ2luU3RhcnQgPSBtYXJnaW5TdGFydEFuZEVu ZCAvIDI7CisgICAgICAgICAgICB1c2VkTWFyZ2luRW5kID0gdXNlZE1hcmdpblN0YXJ0OworICAg ICAgICB9IGVsc2UgewogICAgICAgICAgICAgaWYgKGlzTGVmdFRvUmlnaHREaXJlY3Rpb24pIHsK LSAgICAgICAgICAgICAgICB1c2VkSG9yaXpvbnRhbE1hcmdpbi5zdGFydCA9IDBfbHU7Ci0gICAg ICAgICAgICAgICAgdXNlZEhvcml6b250YWxNYXJnaW4uZW5kID0gY29udGFpbmluZ0Jsb2NrV2lk dGggLSAoKmxlZnQgKyB1c2VkSG9yaXpvbnRhbE1hcmdpbi5zdGFydCArIGJvcmRlckxlZnQgKyBw YWRkaW5nTGVmdCArIHdpZHRoICsgcGFkZGluZ1JpZ2h0ICsgYm9yZGVyUmlnaHQgKyAqcmlnaHQp OworICAgICAgICAgICAgICAgIHVzZWRNYXJnaW5TdGFydCA9IDBfbHU7CisgICAgICAgICAgICAg ICAgdXNlZE1hcmdpbkVuZCA9IGNvbnRhaW5pbmdCbG9ja1dpZHRoIC0gKCpsZWZ0ICsgKnVzZWRN YXJnaW5TdGFydCArIGJvcmRlckxlZnQgKyBwYWRkaW5nTGVmdCArIHdpZHRoICsgcGFkZGluZ1Jp Z2h0ICsgYm9yZGVyUmlnaHQgKyAqcmlnaHQpOwogICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAg ICAgICAgICAgICB1c2VkSG9yaXpvbnRhbE1hcmdpbi5lbmQgPSAwX2x1OwotICAgICAgICAgICAg ICAgIHVzZWRIb3Jpem9udGFsTWFyZ2luLnN0YXJ0ID0gY29udGFpbmluZ0Jsb2NrV2lkdGggLSAo KmxlZnQgKyBib3JkZXJMZWZ0ICsgcGFkZGluZ0xlZnQgKyB3aWR0aCArIHBhZGRpbmdSaWdodCAr IGJvcmRlclJpZ2h0ICsgdXNlZEhvcml6b250YWxNYXJnaW4uZW5kICsgKnJpZ2h0KTsKKyAgICAg ICAgICAgICAgICB1c2VkTWFyZ2luRW5kID0gMF9sdTsKKyAgICAgICAgICAgICAgICB1c2VkTWFy Z2luU3RhcnQgPSBjb250YWluaW5nQmxvY2tXaWR0aCAtICgqbGVmdCArIGJvcmRlckxlZnQgKyBw YWRkaW5nTGVmdCArIHdpZHRoICsgcGFkZGluZ1JpZ2h0ICsgYm9yZGVyUmlnaHQgKyAqdXNlZE1h cmdpbkVuZCArICpyaWdodCk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CiAKICAg ICAvLyAjNAogICAgIGlmICghbGVmdCkKLSAgICAgICAgbGVmdCA9IGNvbnRhaW5pbmdCbG9ja1dp ZHRoIC0gKHVzZWRIb3Jpem9udGFsTWFyZ2luLnN0YXJ0ICsgYm9yZGVyTGVmdCArIHBhZGRpbmdM ZWZ0ICsgd2lkdGggKyBwYWRkaW5nUmlnaHQgKyBib3JkZXJSaWdodCArIHVzZWRIb3Jpem9udGFs TWFyZ2luLmVuZCArICpyaWdodCk7CisgICAgICAgIGxlZnQgPSBjb250YWluaW5nQmxvY2tXaWR0 aCAtICgqdXNlZE1hcmdpblN0YXJ0ICsgYm9yZGVyTGVmdCArIHBhZGRpbmdMZWZ0ICsgd2lkdGgg KyBwYWRkaW5nUmlnaHQgKyBib3JkZXJSaWdodCArICp1c2VkTWFyZ2luRW5kICsgKnJpZ2h0KTsK IAogICAgIGlmICghcmlnaHQpCi0gICAgICAgIHJpZ2h0ID0gY29udGFpbmluZ0Jsb2NrV2lkdGgg LSAoKmxlZnQgKyB1c2VkSG9yaXpvbnRhbE1hcmdpbi5zdGFydCArIGJvcmRlckxlZnQgKyBwYWRk aW5nTGVmdCArIHdpZHRoICsgcGFkZGluZ1JpZ2h0ICsgYm9yZGVyUmlnaHQgKyB1c2VkSG9yaXpv bnRhbE1hcmdpbi5lbmQpOworICAgICAgICByaWdodCA9IGNvbnRhaW5pbmdCbG9ja1dpZHRoIC0g KCpsZWZ0ICsgKnVzZWRNYXJnaW5TdGFydCArIGJvcmRlckxlZnQgKyBwYWRkaW5nTGVmdCArIHdp ZHRoICsgcGFkZGluZ1JpZ2h0ICsgYm9yZGVyUmlnaHQgKyAqdXNlZE1hcmdpbkVuZCk7CiAKLSAg ICBpZiAoIWNvbXB1dGVkSG9yaXpvbnRhbE1hcmdpbi5zdGFydCkKLSAgICAgICAgdXNlZEhvcml6 b250YWxNYXJnaW4uc3RhcnQgPSBjb250YWluaW5nQmxvY2tXaWR0aCAtICgqbGVmdCArIGJvcmRl ckxlZnQgKyBwYWRkaW5nTGVmdCArIHdpZHRoICsgcGFkZGluZ1JpZ2h0ICsgYm9yZGVyUmlnaHQg KyB1c2VkSG9yaXpvbnRhbE1hcmdpbi5lbmQgKyAqcmlnaHQpOworICAgIGlmICghdXNlZE1hcmdp blN0YXJ0KQorICAgICAgICB1c2VkTWFyZ2luU3RhcnQgPSBjb250YWluaW5nQmxvY2tXaWR0aCAt ICgqbGVmdCArIGJvcmRlckxlZnQgKyBwYWRkaW5nTGVmdCArIHdpZHRoICsgcGFkZGluZ1JpZ2h0 ICsgYm9yZGVyUmlnaHQgKyAqdXNlZE1hcmdpbkVuZCArICpyaWdodCk7CiAKLSAgICBpZiAoIWNv bXB1dGVkSG9yaXpvbnRhbE1hcmdpbi5lbmQpCi0gICAgICAgIHVzZWRIb3Jpem9udGFsTWFyZ2lu LmVuZCA9IGNvbnRhaW5pbmdCbG9ja1dpZHRoIC0gKCpsZWZ0ICsgdXNlZEhvcml6b250YWxNYXJn aW4uc3RhcnQgKyBib3JkZXJMZWZ0ICsgcGFkZGluZ0xlZnQgKyB3aWR0aCArIHBhZGRpbmdSaWdo dCArIGJvcmRlclJpZ2h0ICsgKnJpZ2h0KTsKKyAgICBpZiAoIXVzZWRNYXJnaW5FbmQpCisgICAg ICAgIHVzZWRNYXJnaW5FbmQgPSBjb250YWluaW5nQmxvY2tXaWR0aCAtICgqbGVmdCArICp1c2Vk TWFyZ2luU3RhcnQgKyBib3JkZXJMZWZ0ICsgcGFkZGluZ0xlZnQgKyB3aWR0aCArIHBhZGRpbmdS aWdodCArIGJvcmRlclJpZ2h0ICsgKnJpZ2h0KTsKIAotICAgIGF1dG8gYm94V2lkdGggPSAoKmxl ZnQgKyB1c2VkSG9yaXpvbnRhbE1hcmdpbi5zdGFydCArIGJvcmRlckxlZnQgKyBwYWRkaW5nTGVm dCArIHdpZHRoICsgcGFkZGluZ1JpZ2h0ICsgYm9yZGVyUmlnaHQgKyB1c2VkSG9yaXpvbnRhbE1h cmdpbi5lbmQgKyAqcmlnaHQpOworICAgIGF1dG8gYm94V2lkdGggPSAoKmxlZnQgKyAqdXNlZE1h cmdpblN0YXJ0ICsgYm9yZGVyTGVmdCArIHBhZGRpbmdMZWZ0ICsgd2lkdGggKyBwYWRkaW5nUmln aHQgKyBib3JkZXJSaWdodCArICp1c2VkTWFyZ2luRW5kICsgKnJpZ2h0KTsKICAgICBpZiAoYm94 V2lkdGggPiBjb250YWluaW5nQmxvY2tXaWR0aCkgewogICAgICAgICAvLyAjNSBPdmVyLWNvbnN0 cmFpbmVkPwogICAgICAgICBpZiAoaXNMZWZ0VG9SaWdodERpcmVjdGlvbikKLSAgICAgICAgICAg IHJpZ2h0ID0gY29udGFpbmluZ0Jsb2NrV2lkdGggLSAoKmxlZnQgKyB1c2VkSG9yaXpvbnRhbE1h cmdpbi5zdGFydCArIGJvcmRlckxlZnQgKyBwYWRkaW5nTGVmdCArIHdpZHRoICsgcGFkZGluZ1Jp Z2h0ICsgYm9yZGVyUmlnaHQgKyB1c2VkSG9yaXpvbnRhbE1hcmdpbi5lbmQpOworICAgICAgICAg ICAgcmlnaHQgPSBjb250YWluaW5nQmxvY2tXaWR0aCAtICgqbGVmdCArICp1c2VkTWFyZ2luU3Rh cnQgKyBib3JkZXJMZWZ0ICsgcGFkZGluZ0xlZnQgKyB3aWR0aCArIHBhZGRpbmdSaWdodCArIGJv cmRlclJpZ2h0ICsgKnVzZWRNYXJnaW5FbmQpOwogICAgICAgICBlbHNlCi0gICAgICAgICAgICBs ZWZ0ID0gY29udGFpbmluZ0Jsb2NrV2lkdGggLSAodXNlZEhvcml6b250YWxNYXJnaW4uc3RhcnQg KyBib3JkZXJMZWZ0ICsgcGFkZGluZ0xlZnQgKyB3aWR0aCArIHBhZGRpbmdSaWdodCArIGJvcmRl clJpZ2h0ICsgdXNlZEhvcml6b250YWxNYXJnaW4uZW5kICsgKnJpZ2h0KTsKKyAgICAgICAgICAg IGxlZnQgPSBjb250YWluaW5nQmxvY2tXaWR0aCAtICgqdXNlZE1hcmdpblN0YXJ0ICsgYm9yZGVy TGVmdCArIHBhZGRpbmdMZWZ0ICsgd2lkdGggKyBwYWRkaW5nUmlnaHQgKyBib3JkZXJSaWdodCAr ICp1c2VkTWFyZ2luRW5kICsgKnJpZ2h0KTsKICAgICB9CiAKICAgICBBU1NFUlQobGVmdCk7CiAg ICAgQVNTRVJUKHJpZ2h0KTsKKyAgICBBU1NFUlQodXNlZE1hcmdpblN0YXJ0KTsKKyAgICBBU1NF UlQodXNlZE1hcmdpbkVuZCk7CiAKICAgICAvLyBGb3Igb3V0LW9mLWZsb3cgZWxlbWVudHMgdGhl IGNvbnRhaW5pbmcgYmxvY2sgaXMgZm9ybWVkIGJ5IHRoZSBwYWRkaW5nIGVkZ2Ugb2YgdGhlIGFu Y2VzdG9yLgogICAgIC8vIEF0IHRoaXMgcG9pbnQgdGhlIG5vbi1zdGF0aWNhbGx5IHBvc2l0aW9u ZWQgdmFsdWUgaXMgaW4gdGhlIGNvb3JkaW5hdGUgc3lzdGVtIG9mIHRoZSBwYWRkaW5nIGJveC4g TGV0J3MgY29udmVydCBpdCB0byBib3JkZXIgYm94IGNvb3JkaW5hdGUgc3lzdGVtLgpAQCAtNzEy LDggKzcxNyw4IEBAIEhvcml6b250YWxHZW9tZXRyeSBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0 cnk6Om91dE9mRmxvd1JlcGxhY2VkSG9yaXpvbnRhbEdlb21lCiAgICAgICAgICpyaWdodCArPSBj b250YWluaW5nQmxvY2tQYWRkaW5nVmVydGljYWxFZGdlOwogICAgIH0KIAotICAgIExPR19XSVRI X1NUUkVBTShGb3JtYXR0aW5nQ29udGV4dExheW91dCwgc3RyZWFtIDw8ICJbUG9zaXRpb25dW1dp ZHRoXVtNYXJnaW5dIC0+IG91dC1vZi1mbG93IHJlcGxhY2VkIC0+IGxlZnQoIiA8PCAqbGVmdCA8 PCAicHgpIHJpZ2h0KCIgIDw8ICpyaWdodCA8PCAicHgpIHdpZHRoKCIgPDwgd2lkdGggPDwgInB4 KSBtYXJnaW4oIiA8PCB1c2VkSG9yaXpvbnRhbE1hcmdpbi5zdGFydCA8PCAicHgsICIgIDw8IHVz ZWRIb3Jpem9udGFsTWFyZ2luLmVuZCA8PCAicHgpIGxheW91dEJveCgiIDw8ICZsYXlvdXRCb3gg PDwgIikiKTsKLSAgICByZXR1cm4geyAqbGVmdCwgKnJpZ2h0LCB7IHdpZHRoLCB1c2VkSG9yaXpv bnRhbE1hcmdpbiwgY29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luIH0gfTsKKyAgICBMT0dfV0lUSF9T VFJFQU0oRm9ybWF0dGluZ0NvbnRleHRMYXlvdXQsIHN0cmVhbSA8PCAiW1Bvc2l0aW9uXVtXaWR0 aF1bTWFyZ2luXSAtPiBvdXQtb2YtZmxvdyByZXBsYWNlZCAtPiBsZWZ0KCIgPDwgKmxlZnQgPDwg InB4KSByaWdodCgiICA8PCAqcmlnaHQgPDwgInB4KSB3aWR0aCgiIDw8IHdpZHRoIDw8ICJweCkg bWFyZ2luKCIgPDwgKnVzZWRNYXJnaW5TdGFydCA8PCAicHgsICIgIDw8ICp1c2VkTWFyZ2luRW5k IDw8ICJweCkgbGF5b3V0Qm94KCIgPDwgJmxheW91dEJveCA8PCAiKSIpOworICAgIHJldHVybiB7 ICpsZWZ0LCAqcmlnaHQsIHsgd2lkdGgsIHsgKnVzZWRNYXJnaW5TdGFydCwgKnVzZWRNYXJnaW5F bmQgfSwgY29tcHV0ZWRIb3Jpem9udGFsTWFyZ2luIH0gfTsKIH0KIAogSGVpZ2h0QW5kTWFyZ2lu IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6Y29tcGxpY2F0ZWRDYXNlcyhjb25zdCBMYXlv dXRTdGF0ZSYgbGF5b3V0U3RhdGUsIGNvbnN0IEJveCYgbGF5b3V0Qm94LCBPcHRpb25hbDxMYXlv dXRVbml0PiB1c2VkSGVpZ2h0KQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMv Q2hhbmdlTG9nCmluZGV4IDgwMDljMGRkNGQ5Li4yMjIyNTJlMGY3OSAxMDA2NDQKLS0tIGEvVG9v bHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDE5 LTAxLTMwICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10g VXNlIHRoZSB1c2VkIG1hcmdpbiB2YWx1ZXMgaW4gb3V0T2ZGbG93UmVwbGFjZWRIb3Jpem9udGFs R2VvbWV0cnkgY29uc2lzdGVudGx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xOTQwNzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICAqIExheW91dFJlbG9hZGVkL21pc2MvTEZDLXBhc3NpbmctdGVzdHMudHh0 OgorCiAyMDE5LTAxLTMwICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAg ICAgW0xGQ11bQkZDXSBBZGQgc3VwcG9ydCBmb3IgYmxvY2sgbGV2ZWwgcmVwbGFjZWQgYm94Lgpk aWZmIC0tZ2l0IGEvVG9vbHMvTGF5b3V0UmVsb2FkZWQvbWlzYy9MRkMtcGFzc2luZy10ZXN0cy50 eHQgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9taXNjL0xGQy1wYXNzaW5nLXRlc3RzLnR4dAppbmRl eCAxYTk1NDhlYTUxZS4uMjQ4MGZlNDBkMGEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFJlbG9h ZGVkL21pc2MvTEZDLXBhc3NpbmctdGVzdHMudHh0CisrKyBiL1Rvb2xzL0xheW91dFJlbG9hZGVk L21pc2MvTEZDLXBhc3NpbmctdGVzdHMudHh0CkBAIC04Myw2ICs4Myw3IEBAIGZhc3QvYmxvY2sv YmxvY2stb25seS9ub24tYXV0by10b3AtYm90dG9tLWhlaWdodC13aXRoLW1hcmdpbnMuaHRtbAog ZmFzdC9ibG9jay9ibG9jay1vbmx5L25vbi1hdXRvLXRvcC1ib3R0b20taGVpZ2h0LXdpdGgtYXV0 by1tYXJnaW5zLmh0bWwKIGZhc3QvYmxvY2svYmxvY2stb25seS9hYnMtcG9zLXdpdGgtYm9yZGVy LXBhZGRpbmctYW5kLWZsb2F0LWNoaWxkLWV4cGVjdGVkLmh0bWwKIGZhc3QvYmxvY2svYmxvY2st b25seS9hYnNvbHV0ZS1wb3NpdGlvbi13aXRoLW1hcmdpbi1hdXRvLXNpbXBsZS5odG1sCitmYXN0 L2Jsb2NrL2Jsb2NrLW9ubHkvYWJzb2x1dGUtcG9zaXRpb24td2l0aC1tYXJnaW4tYXV0by1zaW1w bGUyLmh0bWwKIGZhc3QvYmxvY2svYmFzaWMvMDAyLmh0bWwKIGZhc3QvYmxvY2svYmFzaWMvMDAz Lmh0bWwKIGZhc3QvYmxvY2svYmFzaWMvMDA0Lmh0bWwK