199056 2019-06-19 21:05:54 -0700 [LFC][IFC] Introduce Line::InitialConstraints 2019-06-20 06:59:19 -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 1546407 0 zalan 2019-06-19 21:05:54 -0700 This struct would hold all the initial constraints for the new line. 1546408 1 webkit-bug-importer 2019-06-19 21:06:18 -0700 <rdar://problem/51927597> 1546410 2 372526 zalan 2019-06-19 21:10:46 -0700 Created attachment 372526 Patch 1546499 3 372526 commit-queue 2019-06-20 06:59:17 -0700 Comment on attachment 372526 Patch Clearing flags on attachment: 372526 Committed r246633: <https://trac.webkit.org/changeset/246633> 1546500 4 commit-queue 2019-06-20 06:59:19 -0700 All reviewed patches have been landed. Closing bug. 372526 2019-06-19 21:10:46 -0700 2019-06-20 06:59:17 -0700 Patch bug-199056-20190619211045.patch text/plain 13132 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NjI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDg2MWQ1YjFlYTU1MmMy OWUwNjhlNmU5ZjAwYjBhMWMxZDc0OGJkMS4uN2M5NmFjMDU0ZmNlODk3M2NlZDAwY2I2YWNjMjNi OTg0MDJlNDIzNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE5LTA2LTE5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBJbnRyb2R1 Y2UgTGluZTo6SW5pdGlhbENvbnN0cmFpbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xOTkwNTYKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzUxOTI3 NTk3PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExp bmU6OkluaXRpYWxDb25zdHJhaW50cywgYXMgdGhlIG5hbWUgc3VnZ2VzdHMsIGhvbGRzIHRoZSBp bml0aWFsIGNvbnN0cmFpbnQgdmFsdWVzIGZvciB0aGUgbmV3IGxpbmUuIAorCisgICAgICAgICog bGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHQuaDoKKyAgICAg ICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4dExpbmVM YXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29u dGV4dDo6TGluZUxheW91dDo6TGluZUlucHV0OjpMaW5lSW5wdXQpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6TGluZUxheW91dDo6cGxhY2VJbmxp bmVJdGVtcyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OklubGluZUZvcm1hdHRp bmdDb250ZXh0OjpMaW5lTGF5b3V0OjpsYXlvdXQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6TGluZUxheW91dDo6Y29tcHV0ZWRJbnRy aW5zaWNXaWR0aCBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkxpbmU6OkxpbmUpOgorICAg ICAgICAoV2ViQ29yZTo6TGF5b3V0OjptX3NraXBWZXJ0aWNhbEFsaWdtZW50KToKKyAgICAgICAg KFdlYkNvcmU6OkxheW91dDo6bV9saW5lTG9naWNhbFdpZHRoKTogRGVsZXRlZC4KKyAgICAgICAg KiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmg6CisKIDIwMTktMDYtMTkgIFNh YW0gQmFyYXRpICA8c2JhcmF0aUBhcHBsZS5jb20+CiAKICAgICAgICAgW1dITFNMXSBUaGUgY2hl Y2tlciBuZWVkcyB0byByZXNvbHZlIHR5cGVzIGZvciB0aGUgYW5vbnltb3VzIHZhcmlhYmxlcyBp biBSZWFkTW9kaWZ5V3JpdGUgZXhwcmVzc2lvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVGb3JtYXR0aW5nQ29udGV4 dC5oCmluZGV4IDU5NmU2NTVjNDhhOTMyZDk4OTJjZWYyZDcwNTJjMTA2M2FiMmFkYmYuLjNhOGNk Mzk0YTNjY2NjOGJkYTg3ZTkxZjkxMmFiNjg2NmYzOTE3ZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0LmgK KysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQuaApAQCAtNjYsOCArNjYsNyBAQCBwcml2YXRlOgogICAgICAgICB9OwogCiAg ICAgICAgIHN0cnVjdCBMaW5lSW5wdXQgewotICAgICAgICAgICAgZW51bSBjbGFzcyBTa2lwVmVy dGljYWxBbGlnbWVudCB7IE5vLCBZZXMgfTsKLSAgICAgICAgICAgIExpbmVJbnB1dChMYXlvdXRQ b2ludCBsb2dpY2FsVG9wTGVmdCwgTGF5b3V0VW5pdCBhdmFpbGFibGVMb2dpY2FsV2lkdGgsIFNr aXBWZXJ0aWNhbEFsaWdtZW50LCB1bnNpZ25lZCBmaXJzdElubGluZUl0ZW1JbmRleCwgY29uc3Qg SW5saW5lSXRlbXMmKTsKKyAgICAgICAgICAgIExpbmVJbnB1dChMYXlvdXRQb2ludCBsb2dpY2Fs VG9wTGVmdCwgTGF5b3V0VW5pdCBhdmFpbGFibGVMb2dpY2FsV2lkdGgsIExpbmU6OlNraXBWZXJ0 aWNhbEFsaWdtZW50LCB1bnNpZ25lZCBmaXJzdElubGluZUl0ZW1JbmRleCwgY29uc3QgSW5saW5l SXRlbXMmKTsKICAgICAgICAgICAgIHN0cnVjdCBIb3Jpem9udGFsQ29uc3RyYWludCB7CiAgICAg ICAgICAgICAgICAgSG9yaXpvbnRhbENvbnN0cmFpbnQoTGF5b3V0UG9pbnQgbG9naWNhbFRvcExl ZnQsIExheW91dFVuaXQgYXZhaWxhYmxlTG9naWNhbFdpZHRoKTsKIApAQCAtNzYsNyArNzUsNyBA QCBwcml2YXRlOgogICAgICAgICAgICAgfTsKICAgICAgICAgICAgIEhvcml6b250YWxDb25zdHJh aW50IGhvcml6b250YWxDb25zdHJhaW50OwogICAgICAgICAgICAgLy8gRklYTUUgQWx0ZXJuYXRp dmVseSB3ZSBjb3VsZCBqdXN0IGhhdmUgYSBzZWNvbmQgcGFzcyB3aXRoIHZlcnRpY2FsIHBvc2l0 aW9uaW5nIChwcmVmZXJyZWQgd2lkdGggY29tcHV0YXRpb24gb3B0cyBvdXQpIAotICAgICAgICAg ICAgU2tpcFZlcnRpY2FsQWxpZ21lbnQgc2tpcFZlcnRpY2FsQWxpZ21lbnQ7CisgICAgICAgICAg ICBMaW5lOjpTa2lwVmVydGljYWxBbGlnbWVudCBza2lwVmVydGljYWxBbGlnbWVudDsKICAgICAg ICAgICAgIHVuc2lnbmVkIGZpcnN0SW5saW5lSXRlbUluZGV4IHsgMCB9OwogICAgICAgICAgICAg Y29uc3QgSW5saW5lSXRlbXMmIGlubGluZUl0ZW1zOwogICAgICAgICAgICAgT3B0aW9uYWw8TGF5 b3V0VW5pdD4gZmxvYXRNaW5pbXVtTG9naWNhbEJvdHRvbTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0TGlu ZUxheW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVGb3JtYXR0aW5nQ29udGV4dExpbmVMYXlvdXQuY3BwCmluZGV4IDU1MGJiZDY0YjM3ZGY5ZjUx MjJmMDljY2JmZTc5MTNkYTBiMDAwMzAuLjkxNGVkMzAxMWY3NjhjNmQwZTI0NjkwNTkwZDBjMmZk NjhhMGVhODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0 aW5nL0lubGluZUZvcm1hdHRpbmdDb250ZXh0TGluZUxheW91dC5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lRm9ybWF0dGluZ0NvbnRleHRMaW5l TGF5b3V0LmNwcApAQCAtNzgsNyArNzgsNyBAQCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6TGlu ZUxheW91dDo6TGluZUlucHV0OjpIb3Jpem9udGFsQ29uc3RyYWludDo6SG9yaXpvbnRhbAogewog fQogCi1JbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6TGluZUxheW91dDo6TGluZUlucHV0OjpMaW5l SW5wdXQoTGF5b3V0UG9pbnQgbG9naWNhbFRvcExlZnQsIExheW91dFVuaXQgYXZhaWxhYmxlTG9n aWNhbFdpZHRoLCBTa2lwVmVydGljYWxBbGlnbWVudCBza2lwVmVydGljYWxBbGlnbWVudCwgdW5z aWduZWQgZmlyc3RJbmxpbmVJdGVtSW5kZXgsIGNvbnN0IElubGluZUl0ZW1zJiBpbmxpbmVJdGVt cykKK0lubGluZUZvcm1hdHRpbmdDb250ZXh0OjpMaW5lTGF5b3V0OjpMaW5lSW5wdXQ6OkxpbmVJ bnB1dChMYXlvdXRQb2ludCBsb2dpY2FsVG9wTGVmdCwgTGF5b3V0VW5pdCBhdmFpbGFibGVMb2dp Y2FsV2lkdGgsIExpbmU6OlNraXBWZXJ0aWNhbEFsaWdtZW50IHNraXBWZXJ0aWNhbEFsaWdtZW50 LCB1bnNpZ25lZCBmaXJzdElubGluZUl0ZW1JbmRleCwgY29uc3QgSW5saW5lSXRlbXMmIGlubGlu ZUl0ZW1zKQogICAgIDogaG9yaXpvbnRhbENvbnN0cmFpbnQobG9naWNhbFRvcExlZnQsIGF2YWls YWJsZUxvZ2ljYWxXaWR0aCkKICAgICAsIHNraXBWZXJ0aWNhbEFsaWdtZW50KHNraXBWZXJ0aWNh bEFsaWdtZW50KQogICAgICwgZmlyc3RJbmxpbmVJdGVtSW5kZXgoZmlyc3RJbmxpbmVJdGVtSW5k ZXgpCkBAIC0xMjcsMTMgKzEyNywxNSBAQCBzdGF0aWMgTGF5b3V0VW5pdCBpbmxpbmVJdGVtV2lk dGgoY29uc3QgTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlLCBjb25zdCBJbmxpbmVJdAogCiBJbmxp bmVGb3JtYXR0aW5nQ29udGV4dDo6TGluZUxheW91dDo6TGluZUNvbnRlbnQgSW5saW5lRm9ybWF0 dGluZ0NvbnRleHQ6OkxpbmVMYXlvdXQ6OnBsYWNlSW5saW5lSXRlbXMoY29uc3QgTGluZUlucHV0 JiBsaW5lSW5wdXQpIGNvbnN0CiB7Ci0gICAgc3RkOjp1bmlxdWVfcHRyPExpbmU+IGxpbmU7Ci0g ICAgaWYgKGxpbmVJbnB1dC5za2lwVmVydGljYWxBbGlnbWVudCA9PSBMaW5lSW5wdXQ6OlNraXBW ZXJ0aWNhbEFsaWdtZW50OjpObykgewotICAgICAgICBhdXRvIG1pbWltdW1MaW5lSGVpZ2h0ID0g bV9mb3JtYXR0aW5nUm9vdC5zdHlsZSgpLmNvbXB1dGVkTGluZUhlaWdodCgpOwotICAgICAgICBh dXRvIGluaXRpYWxCYXNlbGluZU9mZnNldCA9IExpbmU6OmhhbGZMZWFkaW5nTWV0cmljcyhtX2Zv cm1hdHRpbmdSb290LnN0eWxlKCkuZm9udE1ldHJpY3MoKSwgbWltaW11bUxpbmVIZWlnaHQpLmFz Y2VudDsKLSAgICAgICAgbGluZSA9IHN0ZDo6bWFrZV91bmlxdWU8TGluZT4obGF5b3V0U3RhdGUo KSwgbGluZUlucHV0Lmhvcml6b250YWxDb25zdHJhaW50LmxvZ2ljYWxUb3BMZWZ0LCBsaW5lSW5w dXQuaG9yaXpvbnRhbENvbnN0cmFpbnQuYXZhaWxhYmxlTG9naWNhbFdpZHRoLCBtaW1pbXVtTGlu ZUhlaWdodCwgaW5pdGlhbEJhc2VsaW5lT2Zmc2V0KTsKLSAgICB9IGVsc2UKLSAgICAgICAgbGlu ZSA9IHN0ZDo6bWFrZV91bmlxdWU8TGluZT4obGF5b3V0U3RhdGUoKSwgbGluZUlucHV0Lmhvcml6 b250YWxDb25zdHJhaW50LmxvZ2ljYWxUb3BMZWZ0LngoKSwgbGluZUlucHV0Lmhvcml6b250YWxD b25zdHJhaW50LmF2YWlsYWJsZUxvZ2ljYWxXaWR0aCk7CisgICAgYXV0byBtaW1pbXVtTGluZUhl aWdodCA9IG1fZm9ybWF0dGluZ1Jvb3Quc3R5bGUoKS5jb21wdXRlZExpbmVIZWlnaHQoKTsKKyAg ICBhdXRvIGluaXRpYWxCYXNlbGluZU9mZnNldCA9IExpbmU6OmhhbGZMZWFkaW5nTWV0cmljcyht X2Zvcm1hdHRpbmdSb290LnN0eWxlKCkuZm9udE1ldHJpY3MoKSwgbWltaW11bUxpbmVIZWlnaHQp LmFzY2VudDsKKyAgICBhdXRvIGluaXRpYWxMaW5lQ29uc3RyYWludHMgPSBMaW5lOjpJbml0aWFs Q29uc3RyYWludHMgeworICAgICAgICBsaW5lSW5wdXQuaG9yaXpvbnRhbENvbnN0cmFpbnQubG9n aWNhbFRvcExlZnQsCisgICAgICAgIGxpbmVJbnB1dC5ob3Jpem9udGFsQ29uc3RyYWludC5hdmFp bGFibGVMb2dpY2FsV2lkdGgsCisgICAgICAgIG1pbWltdW1MaW5lSGVpZ2h0LAorICAgICAgICBp bml0aWFsQmFzZWxpbmVPZmZzZXQKKyAgICB9OworICAgIGF1dG8gbGluZSA9IExpbmUgeyBsYXlv dXRTdGF0ZSgpLCBpbml0aWFsTGluZUNvbnN0cmFpbnRzLCBsaW5lSW5wdXQuc2tpcFZlcnRpY2Fs QWxpZ21lbnQgfTsKIAogICAgIFZlY3RvcjxXZWFrUHRyPElubGluZUl0ZW0+PiBmbG9hdHM7CiAg ICAgdW5zaWduZWQgY29tbWl0dGVkSW5saW5lSXRlbUNvdW50ID0gMDsKQEAgLTE0NCw3ICsxNDYs NyBAQCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6TGluZUxheW91dDo6TGluZUNvbnRlbnQgSW5s aW5lRm9ybWF0dGluZ0NvbnRleHQ6OkxpbmVMYQogICAgICAgICAgICAgcmV0dXJuOwogICAgICAg ICBjb21taXR0ZWRJbmxpbmVJdGVtQ291bnQgKz0gdW5jb21taXR0ZWRDb250ZW50LnNpemUoKTsK ICAgICAgICAgZm9yIChhdXRvJiB1bmNvbW1pdHRlZFJ1biA6IHVuY29tbWl0dGVkQ29udGVudC5y dW5zKCkpCi0gICAgICAgICAgICBsaW5lLT5hcHBlbmQodW5jb21taXR0ZWRSdW4uaW5saW5lSXRl bSwgdW5jb21taXR0ZWRSdW4ubG9naWNhbFdpZHRoKTsKKyAgICAgICAgICAgIGxpbmUuYXBwZW5k KHVuY29tbWl0dGVkUnVuLmlubGluZUl0ZW0sIHVuY29tbWl0dGVkUnVuLmxvZ2ljYWxXaWR0aCk7 CiAgICAgICAgIHVuY29tbWl0dGVkQ29udGVudC5yZXNldCgpOwogICAgIH07CiAKQEAgLTE1Miwx OSArMTU0LDE5IEBAIElubGluZUZvcm1hdHRpbmdDb250ZXh0OjpMaW5lTGF5b3V0OjpMaW5lQ29u dGVudCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6TGluZUxhCiAgICAgYXV0byBjbG9zZUxpbmUg PSBbJl0gewogICAgICAgICBBU1NFUlQoY29tbWl0dGVkSW5saW5lSXRlbUNvdW50IHx8IGxpbmVI YXNGbG9hdEJveCk7CiAgICAgICAgIGF1dG8gbGFzdENvbW1pdHRlZEluZGV4ID0gY29tbWl0dGVk SW5saW5lSXRlbUNvdW50ID8gT3B0aW9uYWw8dW5zaWduZWQ+IHsgbGluZUlucHV0LmZpcnN0SW5s aW5lSXRlbUluZGV4ICsgKGNvbW1pdHRlZElubGluZUl0ZW1Db3VudCAtIDEpIH0gOiBXVEY6Om51 bGxvcHQ7Ci0gICAgICAgIHJldHVybiBMaW5lQ29udGVudCB7IGxhc3RDb21taXR0ZWRJbmRleCwg V1RGTW92ZShmbG9hdHMpLCBsaW5lLT5jbG9zZSgpIH07CisgICAgICAgIHJldHVybiBMaW5lQ29u dGVudCB7IGxhc3RDb21taXR0ZWRJbmRleCwgV1RGTW92ZShmbG9hdHMpLCBsaW5lLmNsb3NlKCkg fTsKICAgICB9OwogICAgIExpbmVCcmVha2VyIGxpbmVCcmVha2VyOwogICAgIC8vIEl0ZXJhdGUg dGhyb3VnaCB0aGUgaW5saW5lIGNvbnRlbnQgYW5kIHBsYWNlIHRoZSBpbmxpbmUgYm94ZXMgb24g dGhlIGN1cnJlbnQgbGluZS4KICAgICBmb3IgKGF1dG8gaW5saW5lSXRlbUluZGV4ID0gbGluZUlu cHV0LmZpcnN0SW5saW5lSXRlbUluZGV4OyBpbmxpbmVJdGVtSW5kZXggPCBsaW5lSW5wdXQuaW5s aW5lSXRlbXMuc2l6ZSgpOyArK2lubGluZUl0ZW1JbmRleCkgewotICAgICAgICBhdXRvIGF2YWls YWJsZVdpZHRoID0gbGluZS0+YXZhaWxhYmxlV2lkdGgoKSAtIHVuY29tbWl0dGVkQ29udGVudC53 aWR0aCgpOwotICAgICAgICBhdXRvIGN1cnJlbnRMb2dpY2FsUmlnaHQgPSBsaW5lLT5jb250ZW50 TG9naWNhbFJpZ2h0KCkgKyB1bmNvbW1pdHRlZENvbnRlbnQud2lkdGgoKTsKKyAgICAgICAgYXV0 byBhdmFpbGFibGVXaWR0aCA9IGxpbmUuYXZhaWxhYmxlV2lkdGgoKSAtIHVuY29tbWl0dGVkQ29u dGVudC53aWR0aCgpOworICAgICAgICBhdXRvIGN1cnJlbnRMb2dpY2FsUmlnaHQgPSBsaW5lLmNv bnRlbnRMb2dpY2FsUmlnaHQoKSArIHVuY29tbWl0dGVkQ29udGVudC53aWR0aCgpOwogICAgICAg ICBhdXRvJiBpbmxpbmVJdGVtID0gbGluZUlucHV0LmlubGluZUl0ZW1zW2lubGluZUl0ZW1JbmRl eF07CiAgICAgICAgIGF1dG8gaXRlbUxvZ2ljYWxXaWR0aCA9IGlubGluZUl0ZW1XaWR0aChsYXlv dXRTdGF0ZSgpLCAqaW5saW5lSXRlbSwgY3VycmVudExvZ2ljYWxSaWdodCk7CiAKICAgICAgICAg Ly8gRklYTUU6IEVuc3VyZSBMaW5lQ29udGV4dDo6dHJpbW1hYmxlV2lkdGggaW5jbHVkZXMgdW5j b21taXR0ZWQgY29udGVudCBpZiBuZWVkZWQuCi0gICAgICAgIGF1dG8gbGluZUlzQ29uc2lkZXJl ZEVtcHR5ID0gIWxpbmUtPmhhc0NvbnRlbnQoKSAmJiAhbGluZUhhc0Zsb2F0Qm94OwotICAgICAg ICBhdXRvIGJyZWFraW5nQ29udGV4dCA9IGxpbmVCcmVha2VyLmJyZWFraW5nQ29udGV4dCgqaW5s aW5lSXRlbSwgaXRlbUxvZ2ljYWxXaWR0aCwgeyBhdmFpbGFibGVXaWR0aCwgY3VycmVudExvZ2lj YWxSaWdodCwgbGluZS0+dHJhaWxpbmdUcmltbWFibGVXaWR0aCgpLCBsaW5lSXNDb25zaWRlcmVk RW1wdHkgfSk7CisgICAgICAgIGF1dG8gbGluZUlzQ29uc2lkZXJlZEVtcHR5ID0gIWxpbmUuaGFz Q29udGVudCgpICYmICFsaW5lSGFzRmxvYXRCb3g7CisgICAgICAgIGF1dG8gYnJlYWtpbmdDb250 ZXh0ID0gbGluZUJyZWFrZXIuYnJlYWtpbmdDb250ZXh0KCppbmxpbmVJdGVtLCBpdGVtTG9naWNh bFdpZHRoLCB7IGF2YWlsYWJsZVdpZHRoLCBjdXJyZW50TG9naWNhbFJpZ2h0LCBsaW5lLnRyYWls aW5nVHJpbW1hYmxlV2lkdGgoKSwgbGluZUlzQ29uc2lkZXJlZEVtcHR5IH0pOwogICAgICAgICBp ZiAoYnJlYWtpbmdDb250ZXh0LmlzQXRCcmVha2luZ09wcG9ydHVuaXR5KQogICAgICAgICAgICAg Y29tbWl0UGVuZGluZ0NvbnRlbnQoKTsKIApAQCAtMTg2LDcgKzE4OCw3IEBAIElubGluZUZvcm1h dHRpbmdDb250ZXh0OjpMaW5lTGF5b3V0OjpMaW5lQ29udGVudCBJbmxpbmVGb3JtYXR0aW5nQ29u dGV4dDo6TGluZUxhCiAgICAgICAgICAgICBBU1NFUlQobGF5b3V0U3RhdGUoKS5oYXNEaXNwbGF5 Qm94KGZsb2F0Qm94KSk7CiAgICAgICAgICAgICAvLyBTaHJpbmsgYXZhaWxibGUgc3BhY2UgZm9y IGN1cnJlbnQgbGluZSBhbmQgbW92ZSBleGlzdGluZyBpbmxpbmUgcnVucy4KICAgICAgICAgICAg IGF1dG8gZmxvYXRCb3hXaWR0aCA9IGxheW91dFN0YXRlKCkuZGlzcGxheUJveEZvckxheW91dEJv eChmbG9hdEJveCkubWFyZ2luQm94V2lkdGgoKTsKLSAgICAgICAgICAgIGZsb2F0Qm94LmlzTGVm dEZsb2F0aW5nUG9zaXRpb25lZCgpID8gbGluZS0+bW92ZUxvZ2ljYWxMZWZ0KGZsb2F0Qm94V2lk dGgpIDogbGluZS0+bW92ZUxvZ2ljYWxSaWdodChmbG9hdEJveFdpZHRoKTsKKyAgICAgICAgICAg IGZsb2F0Qm94LmlzTGVmdEZsb2F0aW5nUG9zaXRpb25lZCgpID8gbGluZS5tb3ZlTG9naWNhbExl ZnQoZmxvYXRCb3hXaWR0aCkgOiBsaW5lLm1vdmVMb2dpY2FsUmlnaHQoZmxvYXRCb3hXaWR0aCk7 CiAgICAgICAgICAgICBmbG9hdHMuYXBwZW5kKG1ha2VXZWFrUHRyKCppbmxpbmVJdGVtKSk7CiAg ICAgICAgICAgICArK2NvbW1pdHRlZElubGluZUl0ZW1Db3VudDsKICAgICAgICAgICAgIGxpbmVI YXNGbG9hdEJveCA9IHRydWU7CkBAIC0yNTEsNyArMjUzLDcgQEAgdm9pZCBJbmxpbmVGb3JtYXR0 aW5nQ29udGV4dDo6TGluZUxheW91dDo6bGF5b3V0KExheW91dFVuaXQgd2lkdGhDb25zdHJhaW50 KSBjb24KICAgICBhdXRvJiBpbmxpbmVJdGVtcyA9IG1fZm9ybWF0dGluZ1N0YXRlLmlubGluZUl0 ZW1zKCk7CiAgICAgdW5zaWduZWQgY3VycmVudElubGluZUl0ZW1JbmRleCA9IDA7CiAgICAgd2hp bGUgKGN1cnJlbnRJbmxpbmVJdGVtSW5kZXggPCBpbmxpbmVJdGVtcy5zaXplKCkpIHsKLSAgICAg ICAgYXV0byBsaW5lSW5wdXQgPSBMaW5lSW5wdXQgeyB7IGxpbmVMb2dpY2FsTGVmdCwgbGluZUxv Z2ljYWxUb3AgfSwgd2lkdGhDb25zdHJhaW50LCBMaW5lSW5wdXQ6OlNraXBWZXJ0aWNhbEFsaWdt ZW50OjpObywgY3VycmVudElubGluZUl0ZW1JbmRleCwgaW5saW5lSXRlbXMgfTsKKyAgICAgICAg YXV0byBsaW5lSW5wdXQgPSBMaW5lSW5wdXQgeyB7IGxpbmVMb2dpY2FsTGVmdCwgbGluZUxvZ2lj YWxUb3AgfSwgd2lkdGhDb25zdHJhaW50LCBMaW5lOjpTa2lwVmVydGljYWxBbGlnbWVudDo6Tm8s IGN1cnJlbnRJbmxpbmVJdGVtSW5kZXgsIGlubGluZUl0ZW1zIH07CiAgICAgICAgIGFwcGx5Rmxv YXRDb25zdHJhaW50KGxpbmVJbnB1dCk7CiAgICAgICAgIGF1dG8gbGluZUNvbnRlbnQgPSBwbGFj ZUlubGluZUl0ZW1zKGxpbmVJbnB1dCk7CiAgICAgICAgIGNyZWF0ZURpc3BsYXlSdW5zKCpsaW5l Q29udGVudC5ydW5zLCBsaW5lQ29udGVudC5mbG9hdHMsIHdpZHRoQ29uc3RyYWludCk7CkBAIC0y NzMsNyArMjc1LDcgQEAgTGF5b3V0VW5pdCBJbmxpbmVGb3JtYXR0aW5nQ29udGV4dDo6TGluZUxh eW91dDo6Y29tcHV0ZWRJbnRyaW5zaWNXaWR0aChMYXlvdXRVbmkKICAgICBhdXRvJiBpbmxpbmVJ dGVtcyA9IG1fZm9ybWF0dGluZ1N0YXRlLmlubGluZUl0ZW1zKCk7CiAgICAgdW5zaWduZWQgY3Vy cmVudElubGluZUl0ZW1JbmRleCA9IDA7CiAgICAgd2hpbGUgKGN1cnJlbnRJbmxpbmVJdGVtSW5k ZXggPCBpbmxpbmVJdGVtcy5zaXplKCkpIHsKLSAgICAgICAgYXV0byBsaW5lQ29udGVudCA9IHBs YWNlSW5saW5lSXRlbXMoeyB7IH0sIHdpZHRoQ29uc3RyYWludCwgTGluZUlucHV0OjpTa2lwVmVy dGljYWxBbGlnbWVudDo6WWVzLCBjdXJyZW50SW5saW5lSXRlbUluZGV4LCBpbmxpbmVJdGVtcyB9 KTsKKyAgICAgICAgYXV0byBsaW5lQ29udGVudCA9IHBsYWNlSW5saW5lSXRlbXMoeyB7IH0sIHdp ZHRoQ29uc3RyYWludCwgTGluZTo6U2tpcFZlcnRpY2FsQWxpZ21lbnQ6OlllcywgY3VycmVudElu bGluZUl0ZW1JbmRleCwgaW5saW5lSXRlbXMgfSk7CiAgICAgICAgIGN1cnJlbnRJbmxpbmVJdGVt SW5kZXggPSAqbGluZUNvbnRlbnQubGFzdElubGluZUl0ZW1JbmRleCArIDE7CiAgICAgICAgIExh eW91dFVuaXQgZmxvYXRzV2lkdGg7CiAgICAgICAgIGZvciAoYXV0byYgZmxvYXRJdGVtIDogbGlu ZUNvbnRlbnQuZmxvYXRzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGlu ZWZvcm1hdHRpbmcvSW5saW5lTGluZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5l Zm9ybWF0dGluZy9JbmxpbmVMaW5lLmNwcAppbmRleCA3MTk4ZmViNDg1NTUwMDFiNmUwMzQ4NTc5 ZTI5MzY3YmQzZmM2MThiLi42NmZjYTJmNWJhNDc4MTUyYjEzMmQ2ZTBkZGJiNWU0NWFlM2U5MzYx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9Jbmxp bmVMaW5lLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVMaW5lLmNwcApAQCAtNDQsMjIgKzQ0LDE0IEBAIExpbmU6OkNvbnRlbnQ6OlJ1bjo6UnVu KGNvbnN0IElubGluZUl0ZW0mIGlubGluZUl0ZW0sIGNvbnN0IERpc3BsYXk6OlJlY3QmIGxvZ2lj CiB7CiB9CiAKLUxpbmU6OkxpbmUoY29uc3QgTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlLCBMYXlv dXRVbml0IGxvZ2ljYWxMZWZ0LCBMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoKQorTGluZTo6TGlu ZShjb25zdCBMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUsIGNvbnN0IEluaXRpYWxDb25zdHJhaW50 cyYgaW5pdGlhbENvbnN0cmFpbnRzLCBTa2lwVmVydGljYWxBbGlnbWVudCBza2lwVmVydGljYWxB bGlnbWVudCkKICAgICA6IG1fbGF5b3V0U3RhdGUobGF5b3V0U3RhdGUpCiAgICAgLCBtX2NvbnRl bnQoc3RkOjptYWtlX3VuaXF1ZTxMaW5lOjpDb250ZW50PigpKQotICAgICwgbV9sb2dpY2FsVG9w TGVmdChsb2dpY2FsTGVmdCwgMCkKLSAgICAsIG1fbGluZUxvZ2ljYWxXaWR0aChhdmFpbGFibGVX aWR0aCkKLSAgICAsIG1fc2tpcFZlcnRpY2FsQWxpZ21lbnQodHJ1ZSkKLXsKLX0KLQotTGluZTo6 TGluZShjb25zdCBMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUsIGNvbnN0IExheW91dFBvaW50JiB0 b3BMZWZ0LCBMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoLCBMYXlvdXRVbml0IG1pbmltdW1IZWln aHQsIExheW91dFVuaXQgYmFzZWxpbmVPZmZzZXQpCi0gICAgOiBtX2xheW91dFN0YXRlKGxheW91 dFN0YXRlKQotICAgICwgbV9jb250ZW50KHN0ZDo6bWFrZV91bmlxdWU8TGluZTo6Q29udGVudD4o KSkKLSAgICAsIG1fbG9naWNhbFRvcExlZnQodG9wTGVmdCkKLSAgICAsIG1fYmFzZWxpbmUoeyBi YXNlbGluZU9mZnNldCwgbWluaW11bUhlaWdodCAtIGJhc2VsaW5lT2Zmc2V0IH0pCi0gICAgLCBt X2NvbnRlbnRMb2dpY2FsSGVpZ2h0KG1pbmltdW1IZWlnaHQpCi0gICAgLCBtX2xpbmVMb2dpY2Fs V2lkdGgoYXZhaWxhYmxlV2lkdGgpCisgICAgLCBtX2xvZ2ljYWxUb3BMZWZ0KGluaXRpYWxDb25z dHJhaW50cy50b3BMZWZ0KQorICAgICwgbV9iYXNlbGluZSh7IGluaXRpYWxDb25zdHJhaW50cy5i YXNlbGluZU9mZnNldCwgaW5pdGlhbENvbnN0cmFpbnRzLmhlaWdodCAtIGluaXRpYWxDb25zdHJh aW50cy5iYXNlbGluZU9mZnNldCB9KQorICAgICwgbV9jb250ZW50TG9naWNhbEhlaWdodChpbml0 aWFsQ29uc3RyYWludHMuaGVpZ2h0KQorICAgICwgbV9saW5lTG9naWNhbFdpZHRoKGluaXRpYWxD b25zdHJhaW50cy5hdmFpbGFibGVXaWR0aCkKKyAgICAsIG1fc2tpcFZlcnRpY2FsQWxpZ21lbnQo c2tpcFZlcnRpY2FsQWxpZ21lbnQgPT0gU2tpcFZlcnRpY2FsQWxpZ21lbnQ6OlllcykKIHsKIH0K IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZS5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5l TGluZS5oCmluZGV4IDdiNmNiMTE0MGYzNTdiOTY5OWYxMWQ2NzhjZDJiMmU5Njk0OTkxYzIuLmMz ZTYwMWFjZTYzNDNkM2RmY2RiMTUwNzc4ODQ3ZTM4ZDU2ODljMGYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0lubGluZUxpbmUuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lLmgKQEAgLTM4LDgg KzM4LDE0IEBAIG5hbWVzcGFjZSBMYXlvdXQgewogY2xhc3MgTGluZSB7CiAgICAgV1RGX01BS0Vf SVNPX0FMTE9DQVRFRChMaW5lKTsKIHB1YmxpYzoKLSAgICBMaW5lKGNvbnN0IExheW91dFN0YXRl JiwgY29uc3QgTGF5b3V0UG9pbnQmIHRvcExlZnQsIExheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgs IExheW91dFVuaXQgbWluaW11bUxpbmVIZWlnaHQsIExheW91dFVuaXQgYmFzZWxpbmVPZmZzZXQp OwotICAgIExpbmUoY29uc3QgTGF5b3V0U3RhdGUmLCBMYXlvdXRVbml0IGxvZ2ljYWxMZWZ0LCBM YXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoKTsKKyAgICBzdHJ1Y3QgSW5pdGlhbENvbnN0cmFpbnRz IHsKKyAgICAgICAgTGF5b3V0UG9pbnQgdG9wTGVmdDsKKyAgICAgICAgTGF5b3V0VW5pdCBhdmFp bGFibGVXaWR0aDsKKyAgICAgICAgTGF5b3V0VW5pdCBoZWlnaHQ7CisgICAgICAgIExheW91dFVu aXQgYmFzZWxpbmVPZmZzZXQ7CisgICAgfTsKKyAgICBlbnVtIGNsYXNzIFNraXBWZXJ0aWNhbEFs aWdtZW50IHsgTm8sIFllcyB9OworICAgIExpbmUoY29uc3QgTGF5b3V0U3RhdGUmLCBjb25zdCBJ bml0aWFsQ29uc3RyYWludHMmLCBTa2lwVmVydGljYWxBbGlnbWVudCk7CiAKICAgICBjbGFzcyBD b250ZW50IHsKICAgICBwdWJsaWM6Cg==