204781 2019-12-02 20:13:13 -0800 [LFC][IFC] Try to fit content on the current line when the line has trimmable trailing content 2019-12-03 06:49:59 -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 1594894 0 zalan 2019-12-02 20:13:13 -0800 "text content <span style="padding: 1px"></spam>" <- the <span></span> runs could fit after trimming the trailing whitespace. 1594895 1 webkit-bug-importer 2019-12-02 20:13:32 -0800 <rdar://problem/57580138> 1594896 2 384683 zalan 2019-12-02 20:21:46 -0800 Created attachment 384683 Patch 1594997 3 zalan 2019-12-03 06:49:59 -0800 Committed r253038: <https://trac.webkit.org/changeset/253038> 384683 2019-12-02 20:21:46 -0800 2019-12-03 00:20:29 -0800 Patch bug-204781-20191202202112.patch text/plain 9144 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzMDE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMmY2MGI1MDdmZDM5YzJl YjViYWYxNjc5MjU0ZjJjZTQzODdlMTllNC4uZThhMmQ1YjA4ZDMxNGMyMzkzOTk3YTI2NmZlMzhh YzIzN2VjMDc4YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE5LTEyLTAyICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBUcnkgdG8g Zml0IGNvbnRlbnQgb24gdGhlIGN1cnJlbnQgbGluZSB3aGVuIHRoZSBsaW5lIGhhcyB0cmltbWFi bGUgdHJhaWxpbmcgY29udGVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjA0NzgxCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NzU4MDEzOD4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBMZXQncyBleHBh bmQgdGhlIGF2YWlsYWJsZSBzcGFjZSB3aGVuIHRoZSBsaW5lIGhhcyB0cmFpbGluZyB0cmltbWFi bGUgd2hpdGVzcGFjZSBhbmQgd2UgdHJ5IHRvIGZpdCBzb21lIGVtcHR5IGlubGluZSBjb250YWlu ZXJzLgorICAgICAgICAidGV4dCBjb250ZW50IDxzcGFuIHN0eWxlPSJwYWRkaW5nOiAxcHgiPjwv c3Bhbj4iIDwtIHRoZSA8c3Bhbj48L3NwYW4+IHJ1bnMgc2hvdWxkIGZpdCBhZnRlciB0cmltbWlu ZyB0aGUgdHJhaWxpbmcgd2hpdGVzcGFjZS4KKworICAgICAgICAqIGxheW91dC9pbmxpbmVmb3Jt YXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 TGluZUJyZWFrZXI6OmJyZWFraW5nQ29udGV4dEZvcklubGluZUNvbnRlbnQpOgorICAgICAgICAo V2ViQ29yZTo6TGF5b3V0OjpMaW5lQnJlYWtlcjo6Q29udGVudDo6aGFzTm9uQ29udGVudFJ1bnNP bmx5IGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5l QnJlYWtlci5oOgorICAgICAgICAqIGxheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRD b250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6TGluZUxheW91dENvbnRleHQ6 OnByb2Nlc3NVbmNvbW1pdHRlZENvbnRlbnQpOgorCiAyMDE5LTEyLTAyICBaYWxhbiBCdWp0YXMg IDx6YWxhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0xGQ10gRml4IEFTU0VSVCB3aGlsZSBydW5u aW5nIGZhc3QvYmxvY2svYmxvY2stcGFyZW50LXdpdGgtemVyby13aWR0aC1jaGlsZC5odG1sCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM aW5lQnJlYWtlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVMaW5lQnJlYWtlci5jcHAKaW5kZXggZjc4NmFlNjkwZGVlOTJlMjI2OGZkZTk3OTY2M2Uz NTllMjdiNjM5OC4uMjFmOTUxZGNjODJmMWMyMWZjZTIyOWY5NDJhNWJjODlkZjkxNzRjZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGlu ZUJyZWFrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUxpbmVCcmVha2VyLmNwcApAQCAtNDksMzEgKzQ5LDM2IEBAIHN0YXRpYyBpbmxpbmUg Ym9vbCBpc1RyYWlsaW5nV2hpdGVzcGFjZVdpdGhQcmVXcmFwKGNvbnN0IElubGluZUl0ZW0mIHRy YWlsaW5nSW5sCiAgICAgcmV0dXJuIHRyYWlsaW5nSW5saW5lSXRlbS5zdHlsZSgpLndoaXRlU3Bh Y2UoKSA9PSBXaGl0ZVNwYWNlOjpQcmVXcmFwICYmIGRvd25jYXN0PElubGluZVRleHRJdGVtPih0 cmFpbGluZ0lubGluZUl0ZW0pLmlzV2hpdGVzcGFjZSgpOwogfQogCi1MaW5lQnJlYWtlcjo6QnJl YWtpbmdDb250ZXh0IExpbmVCcmVha2VyOjpicmVha2luZ0NvbnRleHRGb3JJbmxpbmVDb250ZW50 KGNvbnN0IENvbnRlbnQmIG5ld0NvbnRlbnQsIExheW91dFVuaXQgYXZhaWxhYmxlV2lkdGgsIGJv b2wgbGluZUhhc0Z1bGx5VHJpbW1hYmxlVHJhaWxpbmdDb250ZW50LCAgYm9vbCBsaW5lSXNFbXB0 eSkKK0xpbmVCcmVha2VyOjpCcmVha2luZ0NvbnRleHQgTGluZUJyZWFrZXI6OmJyZWFraW5nQ29u dGV4dEZvcklubGluZUNvbnRlbnQoY29uc3QgQ29udGVudCYgY2FuZGlkYXRlUnVucywgY29uc3Qg TGluZVN0YXR1cyYgbGluZVN0YXR1cykKIHsKLSAgICBBU1NFUlQoIW5ld0NvbnRlbnQuaXNFbXB0 eSgpKTsKLSAgICBpZiAobmV3Q29udGVudC53aWR0aCgpIDw9IGF2YWlsYWJsZVdpZHRoKQorICAg IEFTU0VSVCghY2FuZGlkYXRlUnVucy5pc0VtcHR5KCkpOworICAgIGlmIChjYW5kaWRhdGVSdW5z LndpZHRoKCkgPD0gbGluZVN0YXR1cy5hdmFpbGFibGVXaWR0aCkKICAgICAgICAgcmV0dXJuIHsg QnJlYWtpbmdDb250ZXh0OjpDb250ZW50QnJlYWs6OktlZXAsIHsgfSB9OwotICAgIGlmIChuZXdD b250ZW50Lmhhc1RyYWlsaW5nVHJpbW1hYmxlQ29udGVudCgpKSB7CisgICAgaWYgKGNhbmRpZGF0 ZVJ1bnMuaGFzVHJhaWxpbmdUcmltbWFibGVDb250ZW50KCkpIHsKICAgICAgICAgLy8gRmlyc3Qg Y2hlY2sgaWYgdGhlIGNvbnRlbnQgZml0cyB3aXRob3V0IHRoZSB0cmFpbGluZyB0cmltbWFibGUg cGFydC4KLSAgICAgICAgaWYgKG5ld0NvbnRlbnQubm9uVHJpbW1hYmxlV2lkdGgoKSA8PSBhdmFp bGFibGVXaWR0aCkKKyAgICAgICAgaWYgKGNhbmRpZGF0ZVJ1bnMubm9uVHJpbW1hYmxlV2lkdGgo KSA8PSBsaW5lU3RhdHVzLmF2YWlsYWJsZVdpZHRoKQogICAgICAgICAgICAgcmV0dXJuIHsgQnJl YWtpbmdDb250ZXh0OjpDb250ZW50QnJlYWs6OktlZXAsIHsgfSB9OwogICAgICAgICAvLyBOb3cg Y2hlY2sgaWYgd2UgY2FuIHRyaW0gdGhlIGxpbmUgdG9vLgotICAgICAgICBpZiAobGluZUhhc0Z1 bGx5VHJpbW1hYmxlVHJhaWxpbmdDb250ZW50ICYmIG5ld0NvbnRlbnQuaXNUcmFpbGluZ0NvbnRl bnRGdWxseVRyaW1tYWJsZSgpKSB7CisgICAgICAgIGlmIChsaW5lU3RhdHVzLmxpbmVIYXNGdWxs eVRyaW1tYWJsZVRyYWlsaW5nQ29udGVudCAmJiBjYW5kaWRhdGVSdW5zLmlzVHJhaWxpbmdDb250 ZW50RnVsbHlUcmltbWFibGUoKSkgewogICAgICAgICAgICAgLy8gSWYgdGhpcyBuZXcgY29udGVu dCBpcyBmdWxseSB0cmltbWFibGUsIGl0IHNob3VkIHN1cmVseSBmaXQuCiAgICAgICAgICAgICBy ZXR1cm4geyBCcmVha2luZ0NvbnRleHQ6OkNvbnRlbnRCcmVhazo6S2VlcCwgeyB9IH07CiAgICAg ICAgIH0KKyAgICB9IGVsc2UgaWYgKGxpbmVTdGF0dXMudHJpbW1hYmxlV2lkdGggJiYgY2FuZGlk YXRlUnVucy5oYXNOb25Db250ZW50UnVuc09ubHkoKSkgeworICAgICAgICAvLyBMZXQncyBzZWUg aWYgdGhlIG5vbi1jb250ZW50IHJ1bnMgZml0IHdoZW4gdGhlIGxpbmUgaGFzIHRyYWlsaW5nIHRy aW1tYWJsZSBjb250ZW50CisgICAgICAgIC8vICJ0ZXh0IGNvbnRlbnQgPHNwYW4gc3R5bGU9InBh ZGRpbmc6IDFweCI+PC9zcGFuPiIgPC0gdGhlIDxzcGFuPjwvc3Bhbj4gcnVucyBjb3VsZCBmaXQg YWZ0ZXIgdHJpbW1pbmcgdGhlIHRyYWlsaW5nIHdoaXRlc3BhY2UuCisgICAgICAgIGlmIChjYW5k aWRhdGVSdW5zLndpZHRoKCkgPD0gbGluZVN0YXR1cy5hdmFpbGFibGVXaWR0aCArIGxpbmVTdGF0 dXMudHJpbW1hYmxlV2lkdGgpCisgICAgICAgICAgICByZXR1cm4geyBCcmVha2luZ0NvbnRleHQ6 OkNvbnRlbnRCcmVhazo6S2VlcCwgeyB9IH07CiAgICAgfQogCi0gICAgaWYgKG5ld0NvbnRlbnQu aGFzVGV4dENvbnRlbnRPbmx5KCkpIHsKLSAgICAgICAgYXV0byYgcnVucyA9IG5ld0NvbnRlbnQu cnVucygpOwotICAgICAgICBpZiAoYXV0byB0cmFpbGluZ1BhcnRpYWxDb250ZW50ID0gd29yZEJy ZWFraW5nQmVoYXZpb3IocnVucywgYXZhaWxhYmxlV2lkdGgpKQorICAgIGlmIChjYW5kaWRhdGVS dW5zLmhhc1RleHRDb250ZW50T25seSgpKSB7CisgICAgICAgIGF1dG8mIHJ1bnMgPSBjYW5kaWRh dGVSdW5zLnJ1bnMoKTsKKyAgICAgICAgaWYgKGF1dG8gdHJhaWxpbmdQYXJ0aWFsQ29udGVudCA9 IHdvcmRCcmVha2luZ0JlaGF2aW9yKHJ1bnMsIGxpbmVTdGF0dXMuYXZhaWxhYmxlV2lkdGgpKQog ICAgICAgICAgICAgcmV0dXJuIHsgQnJlYWtpbmdDb250ZXh0OjpDb250ZW50QnJlYWs6OlNwbGl0 LCB0cmFpbGluZ1BhcnRpYWxDb250ZW50IH07CiAgICAgICAgIC8vIElmIHdlIGRpZCBub3QgbWFu YWdlIHRvIGJyZWFrIHRoaXMgY29udGVudCwgd2Ugc3RpbGwgbmVlZCB0byBkZWNpZGUgd2hldGhl ciBrZWVwIGl0IG9yIHdyYXAgaXQgdG8gdGhlIG5leHQgbGluZS4KICAgICAgICAgLy8gRklYTUU6 IEtlZXAgdHJhY2tpbmcgdGhlIGxhc3QgYnJlYWtpbmcgb3Bwb3J0dW5pdHkgd2hlcmUgd2UgY2Fu IHdyYXAgdGhlIGNvbnRlbnQ6CiAgICAgICAgIC8vIDxzcGFuIHN0eWxlPSJ3aGl0ZS1zcGFjZTog cHJlOyI+dGhpcyBmaXRzPC9zcGFuPiA8c3BhbiBzdHlsZT0id2hpdGUtc3BhY2U6IHByZTsiPnRo aXMgZG9lcyBub3QgZml0IGJ1dCBkb2VzIG5vdCB3cmFwIGVpdGhlcjwvc3Bhbj4KICAgICAgICAg Ly8gXl4gY291bGQgd3JhcCBhdCB0aGUgd2hpdGVzcGFjZSBwb3NpdGlvbiBiZXR3ZWVuIHRoZSAy IGlubGluZSBjb250YWluZXJzLgotICAgICAgICBhdXRvIGNvbnRlbnRTaG91bGRXcmFwID0gIWxp bmVJc0VtcHR5ICYmIGlzQ29udGVudFdyYXBwaW5nQWxsb3dlZChydW5zWzBdLmlubGluZUl0ZW0u c3R5bGUoKSk7CisgICAgICAgIGF1dG8gY29udGVudFNob3VsZFdyYXAgPSAhbGluZVN0YXR1cy5s aW5lSXNFbXB0eSAmJiBpc0NvbnRlbnRXcmFwcGluZ0FsbG93ZWQocnVuc1swXS5pbmxpbmVJdGVt LnN0eWxlKCkpOwogICAgICAgICAvLyBGSVhNRTogd2hpdGUtc3BhY2U6IHByZS13cmFwIG5lZWRz IGNsYXJpZmljYXRpb24uIEFjY29yZGluZyB0byBDU1MgVGV4dCBNb2R1bGUgTGV2ZWwgMywgY29u dGVudCB3cmFwcGluZyBpcyBhcyAnbm9ybWFsJyBidXQgYXBwYXJlbnRseQogICAgICAgICAvLyB3 ZSBuZWVkIHRvIGtlZXAgdGhlIG92ZXJsYXBwaW5nIHdoaXRlc3BhY2Ugb24gdGhlIGxpbmUgKGFu ZCBoYW5nIGl0IEknZCBhc3N1bWUpLgogICAgICAgICBpZiAoaXNUcmFpbGluZ1doaXRlc3BhY2VX aXRoUHJlV3JhcChydW5zLmxhc3QoKS5pbmxpbmVJdGVtKSkKQEAgLTgyLDcgKzg3LDcgQEAgTGlu ZUJyZWFrZXI6OkJyZWFraW5nQ29udGV4dCBMaW5lQnJlYWtlcjo6YnJlYWtpbmdDb250ZXh0Rm9y SW5saW5lQ29udGVudChjb25zdAogICAgIH0KIAogICAgIC8vIEZpcnN0IG5vbi10ZXh0IGlubGlu ZSBjb250ZW50IGFsd2F5cyBzdGF5cyBvbiBsaW5lLgotICAgIHJldHVybiB7IGxpbmVJc0VtcHR5 ID8gQnJlYWtpbmdDb250ZXh0OjpDb250ZW50QnJlYWs6OktlZXAgOiBCcmVha2luZ0NvbnRleHQ6 OkNvbnRlbnRCcmVhazo6V3JhcCwgeyB9IH07CisgICAgcmV0dXJuIHsgbGluZVN0YXR1cy5saW5l SXNFbXB0eSA/IEJyZWFraW5nQ29udGV4dDo6Q29udGVudEJyZWFrOjpLZWVwIDogQnJlYWtpbmdD b250ZXh0OjpDb250ZW50QnJlYWs6OldyYXAsIHsgfSB9OwogfQogCiBib29sIExpbmVCcmVha2Vy OjpzaG91bGRXcmFwRmxvYXRCb3goTGF5b3V0VW5pdCBmbG9hdExvZ2ljYWxXaWR0aCwgTGF5b3V0 VW5pdCBhdmFpbGFibGVXaWR0aCwgYm9vbCBsaW5lSXNFbXB0eSkKQEAgLTMwNSw2ICszMTAsMTgg QEAgYm9vbCBMaW5lQnJlYWtlcjo6Q29udGVudDo6aGFzVGV4dENvbnRlbnRPbmx5KCkgY29uc3QK ICAgICByZXR1cm4gZmFsc2U7CiB9CiAKK2Jvb2wgTGluZUJyZWFrZXI6OkNvbnRlbnQ6Omhhc05v bkNvbnRlbnRSdW5zT25seSgpIGNvbnN0Cit7CisgICAgLy8gPHNwYW4+PC9zcGFuPiA8LSBub24g Y29udGVudCBydW5zLgorICAgIGZvciAoYXV0byYgcnVuIDogbV9jb250aW5vdXNSdW5zKSB7Cisg ICAgICAgIGF1dG8mIGlubGluZUl0ZW0gPSBydW4uaW5saW5lSXRlbTsKKyAgICAgICAgaWYgKGlu bGluZUl0ZW0uaXNDb250YWluZXJTdGFydCgpIHx8IGlubGluZUl0ZW0uaXNDb250YWluZXJFbmQo KSkKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQor ICAgIHJldHVybiB0cnVlOworfQorCiB2b2lkIExpbmVCcmVha2VyOjpDb250ZW50OjpUcmFpbGlu Z1RyaW1tYWJsZUNvbnRlbnQ6OnJlc2V0KCkKIHsKICAgICBpc0Z1bGx5VHJpbW1hYmxlID0gZmFs c2U7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9J bmxpbmVMaW5lQnJlYWtlci5oIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRp bmcvSW5saW5lTGluZUJyZWFrZXIuaAppbmRleCAxNzk5MzYwODE5NzFlN2ZkNTg5M2VkZjg5ZTA2 OWJlZWQ4ODUyODFmLi44ZDU5YjFiMGNmZTU0MGRiMDAyZWM4N2UyYWJhZTMzZGY5OWJhZDFiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVM aW5lQnJlYWtlci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5n L0lubGluZUxpbmVCcmVha2VyLmgKQEAgLTc1LDYgKzc1LDcgQEAgcHVibGljOgogICAgICAgICBj b25zdCBSdW5MaXN0JiBydW5zKCkgY29uc3QgeyByZXR1cm4gbV9jb250aW5vdXNSdW5zOyB9CiAg ICAgICAgIGJvb2wgaXNFbXB0eSgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGlub3VzUnVucy5pc0Vt cHR5KCk7IH0KICAgICAgICAgYm9vbCBoYXNUZXh0Q29udGVudE9ubHkoKSBjb25zdDsKKyAgICAg ICAgYm9vbCBoYXNOb25Db250ZW50UnVuc09ubHkoKSBjb25zdDsKICAgICAgICAgdW5zaWduZWQg c2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fY29udGlub3VzUnVucy5zaXplKCk7IH0KICAgICAgICAg TGF5b3V0VW5pdCB3aWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fd2lkdGg7IH0KICAgICAgICAgTGF5 b3V0VW5pdCBub25UcmltbWFibGVXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIG1fd2lkdGggLSBtX3Ry YWlsaW5nVHJpbW1hYmxlQ29udGVudC53aWR0aDsgfQpAQCAtOTQsNyArOTUsMTMgQEAgcHVibGlj OgogICAgICAgICBMYXlvdXRVbml0IG1fd2lkdGg7CiAgICAgfTsKIAotICAgIEJyZWFraW5nQ29u dGV4dCBicmVha2luZ0NvbnRleHRGb3JJbmxpbmVDb250ZW50KGNvbnN0IENvbnRlbnQmLCBMYXlv dXRVbml0IGF2YWlsYWJsZVdpZHRoLCBib29sIGxpbmVIYXNGdWxseVRyaW1tYWJsZVRyYWlsaW5n Q29udGVudCwgYm9vbCBsaW5lSXNFbXB0eSk7CisgICAgc3RydWN0IExpbmVTdGF0dXMgeworICAg ICAgICBMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRoOworICAgICAgICBMYXlvdXRVbml0IHRyaW1t YWJsZVdpZHRoOworICAgICAgICBib29sIGxpbmVIYXNGdWxseVRyaW1tYWJsZVRyYWlsaW5nQ29u dGVudDsKKyAgICAgICAgYm9vbCBsaW5lSXNFbXB0eTsKKyAgICB9OworICAgIEJyZWFraW5nQ29u dGV4dCBicmVha2luZ0NvbnRleHRGb3JJbmxpbmVDb250ZW50KGNvbnN0IENvbnRlbnQmIGNhbmRp ZGF0ZVJ1bnMsIGNvbnN0IExpbmVTdGF0dXMmKTsKICAgICBib29sIHNob3VsZFdyYXBGbG9hdEJv eChMYXlvdXRVbml0IGZsb2F0TG9naWNhbFdpZHRoLCBMYXlvdXRVbml0IGF2YWlsYWJsZVdpZHRo LCBib29sIGxpbmVJc0VtcHR5KTsKIAogICAgIHZvaWQgc2V0SHlwaGVuYXRpb25EaXNhYmxlZCgp IHsgbl9oeXBoZW5hdGlvbklzRGlzYWJsZWQgPSB0cnVlOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9MaW5lTGF5b3V0Q29udGV4dC5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvaW5saW5lZm9ybWF0dGluZy9MaW5lTGF5b3V0Q29udGV4dC5j cHAKaW5kZXggMTQ2MGNiMzRiNWNjZGU5MjJmYzY4NzUxYjE2Yjc1ZWVlMDY4NjBlNi4uZGI4ZWY3 NmNmMDA0NmMwMzY0NjRjMWY4YzIxMGMzMDRhNzJlNjJiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvTGluZUxheW91dENvbnRleHQuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxpbmVmb3JtYXR0aW5nL0xpbmVMYXlvdXRDb250ZXh0 LmNwcApAQCAtMjA5LDcgKzIwOSw4IEBAIExpbmVMYXlvdXRDb250ZXh0OjpJc0VuZE9mTGluZSBM aW5lTGF5b3V0Q29udGV4dDo6cHJvY2Vzc1VuY29tbWl0dGVkQ29udGVudChMaW5lCiAgICAgYXV0 byBsaW5lQnJlYWtlciA9IExpbmVCcmVha2VyIHsgfTsKICAgICBpZiAoc2hvdWxkRGlzYWJsZUh5 cGhlbmF0aW9uKCkpCiAgICAgICAgIGxpbmVCcmVha2VyLnNldEh5cGhlbmF0aW9uRGlzYWJsZWQo KTsKLSAgICBhdXRvIGJyZWFraW5nQ29udGV4dCA9IGxpbmVCcmVha2VyLmJyZWFraW5nQ29udGV4 dEZvcklubGluZUNvbnRlbnQobV91bmNvbW1pdHRlZENvbnRlbnQsIGxpbmUuYXZhaWxhYmxlV2lk dGgoKSwgbGluZS5pc1RyYWlsaW5nQ29udGVudEZ1bGx5VHJpbW1hYmxlKCksIGxpbmVJc0NvbnNp ZGVyZWRFbXB0eSk7CisgICAgYXV0byBsaW5lU3RhdHVzID0gTGluZUJyZWFrZXI6OkxpbmVTdGF0 dXMgeyBsaW5lLmF2YWlsYWJsZVdpZHRoKCksIGxpbmUudHJhaWxpbmdUcmltbWFibGVXaWR0aCgp LCBsaW5lLmlzVHJhaWxpbmdDb250ZW50RnVsbHlUcmltbWFibGUoKSwgbGluZUlzQ29uc2lkZXJl ZEVtcHR5IH07CisgICAgYXV0byBicmVha2luZ0NvbnRleHQgPSBsaW5lQnJlYWtlci5icmVha2lu Z0NvbnRleHRGb3JJbmxpbmVDb250ZW50KG1fdW5jb21taXR0ZWRDb250ZW50LCBsaW5lU3RhdHVz KTsKICAgICAvLyBUaGUgdW5jb21taXR0ZWQgY29udGVudCBjYW4gZnVsbHksIHBhcnRpYWxseSBm aXQgdGhlIGN1cnJlbnQgbGluZSAoY29tbWl0L3BhcnRpYWwgY29tbWl0KSBvciBub3QgYXQgYWxs IChyZXNldCkuCiAgICAgaWYgKGJyZWFraW5nQ29udGV4dC5jb250ZW50QnJlYWsgPT0gTGluZUJy ZWFrZXI6OkJyZWFraW5nQ29udGV4dDo6Q29udGVudEJyZWFrOjpLZWVwKQogICAgICAgICBjb21t aXRQZW5kaW5nQ29udGVudChsaW5lKTsK