218550 2020-11-03 19:48:36 -0800 [LFC][Integration] Introduce LayoutIntegration::Run::renderedContent 2020-11-04 16:12:18 -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 1704313 0 zalan 2020-11-03 19:48:36 -0800 when the original content is adjusted and we need to renderer a slightly different content (e.g. hyphens, text-overflow: ellipsis) 1704316 1 413137 zalan 2020-11-03 19:56:16 -0800 Created attachment 413137 Patch 1704650 2 ews-feeder 2020-11-04 16:11:56 -0800 Committed r269402: <https://trac.webkit.org/changeset/269402> All reviewed patches have been landed. Closing bug and clearing flags on attachment 413137. 1704651 3 webkit-bug-importer 2020-11-04 16:12:18 -0800 <rdar://problem/71055974> 413137 2020-11-03 19:56:16 -0800 2020-11-04 16:11:56 -0800 Patch bug-218550-20201103195616.patch text/plain 9435 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjY5MzAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmUyZDk4MTZiYTYwZDBm MDBmYzI3MDM0ZWY2ZGRlOTdmYzM2MmQyNy4uOTA1OWQ5OGRhMWJkYTRmOTIwMTAxM2NlNzk3YWVh MDA2MjBiOThlYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIwLTExLTAzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSW50ZWdyYXRpb25d IEludHJvZHVjZSBMYXlvdXRJbnRlZ3JhdGlvbjo6UnVuOjpyZW5kZXJlZENvbnRlbnQKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxODU1MAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMgaXMgaW4gcHJl cGFyYXRpb24gZm9yIHN1cHBvcnRpbmcgInRleHQtb3ZlcmZsb3c6IGVsbGlwc2lzIiB3aGVyZSB0 aGUgcmVuZGVyZWQgY29udGVudCBjb3VsZAorICAgICAgICBiZSB2ZXJ5IGRpZmZlcmVudCBmcm9t IHRoZSBvcmlnaW5hbCBjb250ZW50IChlLmcuIHJ1bnMgYWZ0ZXIgdGhlIHRydW5jYXRpb24gZ28g Y29tcGxldGVseSBibGFuaykKKworICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJ bnRlZ3JhdGlvbkxpbmUuaDoKKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50 ZWdyYXRpb25MaW5lTGF5b3V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0 aW9uOjpMaW5lTGF5b3V0Ojpjb25zdHJ1Y3RDb250ZW50KToKKyAgICAgICAgKFdlYkNvcmU6Okxh eW91dEludGVncmF0aW9uOjpMaW5lTGF5b3V0OjpwYWludCk6CisgICAgICAgICogbGF5b3V0L2lu dGVncmF0aW9uL0xheW91dEludGVncmF0aW9uUnVuLmg6CisgICAgICAgIChXZWJDb3JlOjpMYXlv dXRJbnRlZ3JhdGlvbjo6UnVuOjpUZXh0Q29udGVudDo6b3JpZ2luYWxDb250ZW50IGNvbnN0KToK KyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0aW9uOjpSdW46OlRleHRDb250ZW50Ojpy ZW5kZXJlZENvbnRlbnQgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50ZWdyYXRp b246OlJ1bjo6aXNMaW5lQnJlYWsgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0SW50 ZWdyYXRpb246OlJ1bjo6VGV4dENvbnRlbnQ6OlRleHRDb250ZW50KToKKyAgICAgICAgKFdlYkNv cmU6OkxheW91dEludGVncmF0aW9uOjpSdW46OlRleHRDb250ZW50Ojpjb250ZW50IGNvbnN0KTog RGVsZXRlZC4KKyAgICAgICAgKiBsYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25S dW5JdGVyYXRvck1vZGVyblBhdGguaDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dEludGVncmF0 aW9uOjpSdW5JdGVyYXRvck1vZGVyblBhdGg6OnRleHQgY29uc3QpOgorCiAyMDIwLTExLTAzICBa YWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ11bSW50ZWdyYXRp b25dIFJlbmFtZSBSdW46Om5lZWRzSHlwaGVuIHRvIGhhc0h5cGhlbgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZS5oIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZS5o CmluZGV4IGY4YWU3MDJkNzUwNzU3MjBlOWEyODRlNzJmMTIxZTRlN2EyZWY4YmEuLjllOGQ4OWYz Y2M0ZDMwMzkxZjYwNzAwZDg5NzJlYjg4ZmNkOWVjYzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkxpbmUuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25MaW5lLmgKQEAg LTY1LDcgKzY1LDcgQEAgcHJpdmF0ZToKICAgICBGbG9hdFJlY3QgbV9zY3JvbGxhYmxlT3ZlcmZs b3c7CiAgICAgRmxvYXRSZWN0IG1faW5rT3ZlcmZsb3c7CiAgICAgZmxvYXQgbV9iYXNlbGluZSB7 IDAgfTsKLSAgICBmbG9hdCBtX2hvcml6b250YWxBbGlnbm1lbnRPZmZzZXQ7CisgICAgZmxvYXQg bV9ob3Jpem9udGFsQWxpZ25tZW50T2Zmc2V0IHsgMCB9OwogfTsKIAogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dEludGVncmF0aW9uTGluZUxh eW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdy YXRpb25MaW5lTGF5b3V0LmNwcAppbmRleCAxNjU2ODI0NmRlY2I5YWFlZDUzNjczYjk5NTAyY2U2 ZjcyNTJlMThkLi40MjEwZWVmNWY5YTYyNDQ3MjY4N2MzYjE0YTdkNDdjMTg3YTY5NGQ2IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRp b25MaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24v TGF5b3V0SW50ZWdyYXRpb25MaW5lTGF5b3V0LmNwcApAQCAtMTk4LDggKzE5OCwxMyBAQCB2b2lk IExpbmVMYXlvdXQ6OmNvbnN0cnVjdENvbnRlbnQoKQogICAgICAgICAgICAgICAgIHJ1blJlY3Qu c2V0WShyb3VuZFRvSW50KHJ1blJlY3QueSgpKSk7CiAKICAgICAgICAgICAgIFdURjo6T3B0aW9u YWw8UnVuOjpUZXh0Q29udGVudD4gdGV4dENvbnRlbnQ7Ci0gICAgICAgICAgICBpZiAoYXV0byB0 ZXh0ID0gbGluZVJ1bi50ZXh0KCkpCi0gICAgICAgICAgICAgICAgdGV4dENvbnRlbnQgPSBSdW46 OlRleHRDb250ZW50IHsgdGV4dC0+c3RhcnQoKSwgdGV4dC0+bGVuZ3RoKCksIHRleHQtPmNvbnRl bnQoKSwgdGV4dC0+bmVlZHNIeXBoZW4oKSB9OworICAgICAgICAgICAgaWYgKGF1dG8gdGV4dCA9 IGxpbmVSdW4udGV4dCgpKSB7CisgICAgICAgICAgICAgICAgYXV0byBhZGp1c3RlZENvbnRlbnRU b1JlbmRlcmVyID0gWyZdIHsKKyAgICAgICAgICAgICAgICAgICAgLy8gRklYTUU6IFRoaXMgaXMg d2hlcmUgd2UgY3JlYXRlIHN0cmluZ3Mgd2l0aCB0cmFpbGluZyBoeXBoZW5zIGFuZCB0cnVuY2F0 ZS9yZXBsYWNlIGNvbnRlbnQgd2l0aCBlbGxpcHNpcy4KKyAgICAgICAgICAgICAgICAgICAgcmV0 dXJuIFN0cmluZygpOworICAgICAgICAgICAgICAgIH07CisgICAgICAgICAgICAgICAgdGV4dENv bnRlbnQgPSBSdW46OlRleHRDb250ZW50IHsgdGV4dC0+c3RhcnQoKSwgdGV4dC0+bGVuZ3RoKCks IHRleHQtPmNvbnRlbnQoKSwgYWRqdXN0ZWRDb250ZW50VG9SZW5kZXJlcigpLCB0ZXh0LT5uZWVk c0h5cGhlbigpIH07CisgICAgICAgICAgICB9CiAgICAgICAgICAgICBhdXRvIGV4cGFuc2lvbiA9 IFJ1bjo6RXhwYW5zaW9uIHsgbGluZVJ1bi5leHBhbnNpb24oKS5iZWhhdmlvciwgbGluZVJ1bi5l eHBhbnNpb24oKS5ob3Jpem9udGFsRXhwYW5zaW9uIH07CiAgICAgICAgICAgICBhdXRvIGRpc3Bs YXlSdW4gPSBSdW4geyBsaW5lSW5kZXgsIGxheW91dEJveCwgcnVuUmVjdCwgY29tcHV0ZWRJbmtP dmVyZmxvdyhydW5SZWN0KSwgZXhwYW5zaW9uLCB0ZXh0Q29udGVudCB9OwogICAgICAgICAgICAg ZGlzcGxheUlubGluZUNvbnRlbnQucnVucy5hcHBlbmQoZGlzcGxheVJ1bik7CkBAIC0yMTQsNyAr MjE5LDcgQEAgdm9pZCBMaW5lTGF5b3V0Ojpjb25zdHJ1Y3RDb250ZW50KCkKICAgICB9OwogICAg IGNvbnN0cnVjdERpc3BsYXlMaW5lUnVucygpOwogCi0gICAgYXV0byBjb25zdHJ1Y3REaXNwbGF5 TGluZSA9IFsmXSB7CisgICAgYXV0byBjb25zdHJ1Y3REaXNwbGF5TGluZXMgPSBbJl0gewogICAg ICAgICBhdXRvJiBsaW5lcyA9IG1faW5saW5lRm9ybWF0dGluZ1N0YXRlLmxpbmVzKCk7CiAgICAg ICAgIGF1dG8mIGxpbmVCb3hlcyA9IG1faW5saW5lRm9ybWF0dGluZ1N0YXRlLmxpbmVCb3hlcygp OwogICAgICAgICBhdXRvJiBydW5zID0gZGlzcGxheUlubGluZUNvbnRlbnQucnVuczsKQEAgLTI2 Niw3ICsyNzEsOCBAQCB2b2lkIExpbmVMYXlvdXQ6OmNvbnN0cnVjdENvbnRlbnQoKQogICAgICAg ICAgICAgZGlzcGxheUlubGluZUNvbnRlbnQubGluZXMuYXBwZW5kKHsgZmlyc3RSdW5JbmRleCwg cnVuQ291bnQsIGxpbmVSZWN0LCBlbmNsb3NpbmdMaW5lUmVjdCwgc2Nyb2xsYWJsZU92ZXJmbG93 UmVjdCwgbGluZUlua092ZXJmbG93UmVjdCwgbGluZS5iYXNlbGluZSgpLCBsaW5lLmhvcml6b250 YWxBbGlnbm1lbnRPZmZzZXQoKSB9KTsKICAgICAgICAgfQogICAgIH07Ci0gICAgY29uc3RydWN0 RGlzcGxheUxpbmUoKTsKKyAgICBjb25zdHJ1Y3REaXNwbGF5TGluZXMoKTsKKwogICAgIGRpc3Bs YXlJbmxpbmVDb250ZW50LmNsZWFyR2FwQWZ0ZXJMYXN0TGluZSA9IG1faW5saW5lRm9ybWF0dGlu Z1N0YXRlLmNsZWFyR2FwQWZ0ZXJMYXN0TGluZSgpOwogICAgIGRpc3BsYXlJbmxpbmVDb250ZW50 LnNocmlua1RvRml0KCk7CiAgICAgbV9pbmxpbmVGb3JtYXR0aW5nU3RhdGUuc2hyaW5rVG9GaXQo KTsKQEAgLTUwNSwxMSArNTExLDExIEBAIHZvaWQgTGluZUxheW91dDo6cGFpbnQoUGFpbnRJbmZv JiBwYWludEluZm8sIGNvbnN0IExheW91dFBvaW50JiBwYWludE9mZnNldCkKIAogICAgICAgICBT dHJpbmcgdGV4dFdpdGhIeXBoZW47CiAgICAgICAgIGlmICh0ZXh0Q29udGVudC5oYXNIeXBoZW4o KSkKLSAgICAgICAgICAgIHRleHRXaXRoSHlwaGVuID0gbWFrZVN0cmluZyh0ZXh0Q29udGVudC5j b250ZW50KCksIHN0eWxlLmh5cGhlblN0cmluZygpKTsKKyAgICAgICAgICAgIHRleHRXaXRoSHlw aGVuID0gbWFrZVN0cmluZyh0ZXh0Q29udGVudC5yZW5kZXJlZENvbnRlbnQoKSwgc3R5bGUuaHlw aGVuU3RyaW5nKCkpOwogICAgICAgICAvLyBUZXh0UnVuIGV4cGVjdHMgdGhlIHhQb3MgdG8gYmUg YWRqdXN0ZWQgd2l0aCB0aGUgYWxpZ21lbnQgb2Zmc2V0IChlLmcuIHdoZW4gdGhlIGxpbmUgaXMg Y2VudGVyIGFsaWduZWQKICAgICAgICAgLy8gYW5kIHRoZSBydW4gc3RhcnRzIGF0IDEwMHB4LCBk dWUgdG8gdGhlIGhvcml6b250YWwgYWxpZ21lbnQsIHRoZSB4cG9zIGlzIHN1cHBvc2VkIHRvIGJl IGF0IDBweCkuCiAgICAgICAgIGF1dG8geFBvcyA9IHJlY3QueCgpIC0gKGxpbmUucmVjdCgpLngo KSArIGxpbmUuaG9yaXpvbnRhbEFsaWdubWVudE9mZnNldCgpKTsKLSAgICAgICAgV2ViQ29yZTo6 VGV4dFJ1biB0ZXh0UnVuIHsgIXRleHRXaXRoSHlwaGVuLmlzRW1wdHkoKSA/IHRleHRXaXRoSHlw aGVuIDogdGV4dENvbnRlbnQuY29udGVudCgpLCB4UG9zLCBleHBhbnNpb24uaG9yaXpvbnRhbEV4 cGFuc2lvbiwgZXhwYW5zaW9uLmJlaGF2aW9yIH07CisgICAgICAgIFdlYkNvcmU6OlRleHRSdW4g dGV4dFJ1biB7ICF0ZXh0V2l0aEh5cGhlbi5pc0VtcHR5KCkgPyB0ZXh0V2l0aEh5cGhlbiA6IHRl eHRDb250ZW50LnJlbmRlcmVkQ29udGVudCgpLCB4UG9zLCBleHBhbnNpb24uaG9yaXpvbnRhbEV4 cGFuc2lvbiwgZXhwYW5zaW9uLmJlaGF2aW9yIH07CiAgICAgICAgIHRleHRSdW4uc2V0VGFiU2l6 ZSghc3R5bGUuY29sbGFwc2VXaGl0ZVNwYWNlKCksIHN0eWxlLnRhYlNpemUoKSk7CiAgICAgICAg IEZsb2F0UG9pbnQgdGV4dE9yaWdpbiB7IHJlY3QueCgpICsgcGFpbnRPZmZzZXQueCgpLCByb3Vu ZFRvRGV2aWNlUGl4ZWwoYmFzZWxpbmUsIGRldmljZVNjYWxlRmFjdG9yKSB9OwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24vTGF5b3V0SW50ZWdyYXRpb25S dW4uaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlv blJ1bi5oCmluZGV4IDU0OWI5MGFmODcwYTVmM2E5NmI1NjY5Y2Y2NTlkYzZjYzI0NjNjZmUuLmJm OTVjNjZmZTE3MTUwYjM4ZDQwNjg5MzUwZmQyMjcyMzJlZTc2ODkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblJ1bi5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblJ1bi5o CkBAIC00MywxOSArNDMsMjEgQEAgc3RydWN0IFJ1biB7CiAgICAgc3RydWN0IFRleHRDb250ZW50 IHsKICAgICAgICAgV1RGX01BS0VfU1RSVUNUX0ZBU1RfQUxMT0NBVEVEOwogICAgIHB1YmxpYzoK LSAgICAgICAgVGV4dENvbnRlbnQoc2l6ZV90IHBvc2l0aW9uLCBzaXplX3QgbGVuZ3RoLCBjb25z dCBTdHJpbmcmLCBib29sIGhhc0h5cGhlbik7CisgICAgICAgIFRleHRDb250ZW50KHNpemVfdCBw b3NpdGlvbiwgc2l6ZV90IGxlbmd0aCwgY29uc3QgU3RyaW5nJiwgU3RyaW5nIGFkanVzdGVkQ29u dGVudFRvUmVuZGVyLCBib29sIGhhc0h5cGhlbik7CiAKICAgICAgICAgc2l6ZV90IHN0YXJ0KCkg Y29uc3QgeyByZXR1cm4gbV9zdGFydDsgfQogICAgICAgICBzaXplX3QgZW5kKCkgY29uc3QgeyBy ZXR1cm4gc3RhcnQoKSArIGxlbmd0aCgpOyB9CiAgICAgICAgIHNpemVfdCBsZW5ndGgoKSBjb25z dCB7IHJldHVybiBtX2xlbmd0aDsgfQotICAgICAgICBTdHJpbmdWaWV3IGNvbnRlbnQoKSBjb25z dCB7IHJldHVybiBTdHJpbmdWaWV3KG1fY29udGVudFN0cmluZykuc3Vic3RyaW5nKG1fc3RhcnQs IG1fbGVuZ3RoKTsgfQorICAgICAgICBTdHJpbmdWaWV3IG9yaWdpbmFsQ29udGVudCgpIGNvbnN0 IHsgcmV0dXJuIFN0cmluZ1ZpZXcobV9vcmlnaW5hbENvbnRlbnQpLnN1YnN0cmluZyhtX3N0YXJ0 LCBtX2xlbmd0aCk7IH0KKyAgICAgICAgU3RyaW5nVmlldyByZW5kZXJlZENvbnRlbnQoKSBjb25z dCB7IHJldHVybiBtX2FkanVzdGVkQ29udGVudFRvUmVuZGVyLmlzTnVsbCgpID8gb3JpZ2luYWxD b250ZW50KCkgOiBtX2FkanVzdGVkQ29udGVudFRvUmVuZGVyOyB9CiAgICAgICAgIGJvb2wgaGFz SHlwaGVuKCkgY29uc3QgeyByZXR1cm4gbV9oYXNIeXBoZW47IH0KIAogICAgIHByaXZhdGU6CiAg ICAgICAgIHNpemVfdCBtX3N0YXJ0IHsgMCB9OwogICAgICAgICBzaXplX3QgbV9sZW5ndGggeyAw IH07CiAgICAgICAgIGJvb2wgbV9oYXNIeXBoZW4geyBmYWxzZSB9OwotICAgICAgICBTdHJpbmcg bV9jb250ZW50U3RyaW5nOworICAgICAgICBTdHJpbmcgbV9vcmlnaW5hbENvbnRlbnQ7CisgICAg ICAgIFN0cmluZyBtX2FkanVzdGVkQ29udGVudFRvUmVuZGVyOwogICAgIH07CiAKICAgICBzdHJ1 Y3QgRXhwYW5zaW9uOwpAQCAtNjcsNyArNjksNyBAQCBzdHJ1Y3QgUnVuIHsKICAgICBPcHRpb25h bDxUZXh0Q29udGVudD4mIHRleHRDb250ZW50KCkgeyByZXR1cm4gbV90ZXh0Q29udGVudDsgfQog ICAgIGNvbnN0IE9wdGlvbmFsPFRleHRDb250ZW50PiYgdGV4dENvbnRlbnQoKSBjb25zdCB7IHJl dHVybiBtX3RleHRDb250ZW50OyB9CiAgICAgLy8gRklYTUU6IFRoaXMgaW5mb3JtYXRpb24gc2hv dWxkIGJlIHByZXNlcnZlZCBhdCBSdW4gY29uc3RydWN0aW9uIHRpbWUuCi0gICAgYm9vbCBpc0xp bmVCcmVhaygpIGNvbnN0IHsgcmV0dXJuIGxheW91dEJveCgpLmlzTGluZUJyZWFrQm94KCkgfHwg KHRleHRDb250ZW50KCkgJiYgdGV4dENvbnRlbnQoKS0+Y29udGVudCgpID09ICJcbiIgJiYgc3R5 bGUoKS5wcmVzZXJ2ZU5ld2xpbmUoKSk7IH0KKyAgICBib29sIGlzTGluZUJyZWFrKCkgY29uc3Qg eyByZXR1cm4gbGF5b3V0Qm94KCkuaXNMaW5lQnJlYWtCb3goKSB8fCAodGV4dENvbnRlbnQoKSAm JiB0ZXh0Q29udGVudCgpLT5vcmlnaW5hbENvbnRlbnQoKSA9PSAiXG4iICYmIHN0eWxlKCkucHJl c2VydmVOZXdsaW5lKCkpOyB9CiAKICAgICBzdHJ1Y3QgRXhwYW5zaW9uIHsKICAgICAgICAgRXhw YW5zaW9uQmVoYXZpb3IgYmVoYXZpb3IgeyBEZWZhdWx0RXhwYW5zaW9uIH07CkBAIC0xMDUsMTEg KzEwNywxMiBAQCBpbmxpbmUgUnVuOjpSdW4oc2l6ZV90IGxpbmVJbmRleCwgY29uc3QgTGF5b3V0 OjpCb3gmIGxheW91dEJveCwgY29uc3QgRmxvYXRSZWN0JgogewogfQogCi1pbmxpbmUgUnVuOjpU ZXh0Q29udGVudDo6VGV4dENvbnRlbnQoc2l6ZV90IHN0YXJ0LCBzaXplX3QgbGVuZ3RoLCBjb25z dCBTdHJpbmcmIGNvbnRlbnRTdHJpbmcsIGJvb2wgaGFzSHlwaGVuKQoraW5saW5lIFJ1bjo6VGV4 dENvbnRlbnQ6OlRleHRDb250ZW50KHNpemVfdCBzdGFydCwgc2l6ZV90IGxlbmd0aCwgY29uc3Qg U3RyaW5nJiBvcmlnaW5hbENvbnRlbnQsIFN0cmluZyBhZGp1c3RlZENvbnRlbnRUb1JlbmRlciwg Ym9vbCBoYXNIeXBoZW4pCiAgICAgOiBtX3N0YXJ0KHN0YXJ0KQogICAgICwgbV9sZW5ndGgobGVu Z3RoKQogICAgICwgbV9oYXNIeXBoZW4oaGFzSHlwaGVuKQotICAgICwgbV9jb250ZW50U3RyaW5n KGNvbnRlbnRTdHJpbmcpCisgICAgLCBtX29yaWdpbmFsQ29udGVudChvcmlnaW5hbENvbnRlbnQp CisgICAgLCBtX2FkanVzdGVkQ29udGVudFRvUmVuZGVyKGFkanVzdGVkQ29udGVudFRvUmVuZGVy KQogewogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW50ZWdyYXRpb24v TGF5b3V0SW50ZWdyYXRpb25SdW5JdGVyYXRvck1vZGVyblBhdGguaCBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yTW9kZXJuUGF0 aC5oCmluZGV4IDExMjQ3MGEyMDFhMDA3Mjg2MTYyYmI3NzAwZTBlN2NlNmU4Njg5MzMuLjNmMDY2 MTA4NzJmMWE0N2EzZDc2MTQ3OTNiMzRiZWQ0NDYyM2ViMjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvblJ1bkl0ZXJhdG9yTW9k ZXJuUGF0aC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJ bnRlZ3JhdGlvblJ1bkl0ZXJhdG9yTW9kZXJuUGF0aC5oCkBAIC02MSw3ICs2MSw3IEBAIHB1Ymxp YzoKICAgICB1bnNpZ25lZCBjaGFyIGJpZGlMZXZlbCgpIGNvbnN0IHsgcmV0dXJuIDA7IH0KIAog ICAgIGJvb2wgaGFzSHlwaGVuKCkgY29uc3QgeyByZXR1cm4gcnVuKCkudGV4dENvbnRlbnQoKS0+ aGFzSHlwaGVuKCk7IH0KLSAgICBTdHJpbmdWaWV3IHRleHQoKSBjb25zdCB7IHJldHVybiBydW4o KS50ZXh0Q29udGVudCgpLT5jb250ZW50KCk7IH0KKyAgICBTdHJpbmdWaWV3IHRleHQoKSBjb25z dCB7IHJldHVybiBydW4oKS50ZXh0Q29udGVudCgpLT5vcmlnaW5hbENvbnRlbnQoKTsgfQogICAg IHVuc2lnbmVkIHN0YXJ0KCkgY29uc3QgeyByZXR1cm4gcnVuKCkudGV4dENvbnRlbnQoKS0+c3Rh cnQoKTsgfQogICAgIHVuc2lnbmVkIGVuZCgpIGNvbnN0IHsgcmV0dXJuIHJ1bigpLnRleHRDb250 ZW50KCktPmVuZCgpOyB9CiAgICAgdW5zaWduZWQgbGVuZ3RoKCkgY29uc3QgeyByZXR1cm4gcnVu KCkudGV4dENvbnRlbnQoKS0+bGVuZ3RoKCk7IH0K