204710 2019-11-29 15:12:14 -0800 [LFC][IFC] Add support for hyphenate-limit-before and hyphenate-limit-after 2019-11-29 16:03:18 -0800 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 1594268 0 zalan 2019-11-29 15:12:14 -0800 ssia 1594269 1 webkit-bug-importer 2019-11-29 15:12:41 -0800 <rdar://problem/57535210> 1594270 2 384528 zalan 2019-11-29 15:15:02 -0800 Created attachment 384528 Patch 1594271 3 384529 zalan 2019-11-29 15:16:02 -0800 Created attachment 384529 Patch 1594273 4 384529 commit-queue 2019-11-29 16:03:16 -0800 Comment on attachment 384529 Patch Clearing flags on attachment: 384529 Committed r252952: <https://trac.webkit.org/changeset/252952> 1594274 5 commit-queue 2019-11-29 16:03:18 -0800 All reviewed patches have been landed. Closing bug. 384528 2019-11-29 15:15:02 -0800 2019-11-29 15:16:00 -0800 Patch bug-204710-20191129151433.patch text/plain 5114 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyOTQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGZmMWI3ZDQ0NGM5NDNm YjA5MjEwYjczZjcxMGNmZTM2MWUwNDkxNi4uOTlmOTk3YzgwMmQ3M2IzNGEyMzdjNWQ1ODAyNGQ4 ZTA3ZDE5NmY2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE5LTExLTI5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgc3Vw cG9ydCBmb3IgaHlwaGVuYXRlLWxpbWl0LWJlZm9yZSBhbmQgaHlwaGVuYXRlLWxpbWl0LWFmdGVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDQ3MTAK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU3NTM1MjEwPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZUJyZWFrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnJlYWtl cjo6dHJ5QnJlYWtpbmdUZXh0UnVuIGNvbnN0KToKKwogMjAxOS0xMS0yOSAgWmFsYW4gQnVqdGFz ICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gQWRkIHN1cHBvcnQgZm9y IHNpbXBsZSBoeXBoZW5hdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuY3BwCmluZGV4IDk0YzY0N2Zi MWY0Y2VlMTg5ZDZkNTQzOWMxM2ZkNzVlN2VkZDJmZjYuLjMyYzQ0Mzg3ZmM4OTk0N2UwMTRhMWQz YzRlYzY5ZjY0NmMyMTFhZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnJlYWtlci5jcHAKQEAgLTE0NywxOCAr MTQ3LDMxIEBAIE9wdGlvbmFsPExpbmVCcmVha2VyOjpTcGxpdExlbmd0aEFuZFdpZHRoPiBMaW5l QnJlYWtlcjo6dHJ5QnJlYWtpbmdUZXh0UnVuKGNvbnN0CiAgICAgaWYgKHN0eWxlLmh5cGhlbnMo KSAhPSBIeXBoZW5zOjpBdXRvIHx8ICFjYW5IeXBoZW5hdGUoc3R5bGUubG9jYWxlKCkpKQogICAg ICAgICByZXR1cm4geyB9OwogCisgICAgYXV0byBydW5MZW5ndGggPSBpbmxpbmVUZXh0SXRlbS5s ZW5ndGgoKTsKKyAgICB1bnNpZ25lZCBsaW1pdEJlZm9yZSA9IHN0eWxlLmh5cGhlbmF0aW9uTGlt aXRCZWZvcmUoKSA9PSBSZW5kZXJTdHlsZTo6aW5pdGlhbEh5cGhlbmF0aW9uTGltaXRCZWZvcmUo KSA/IDAgOiBzdHlsZS5oeXBoZW5hdGlvbkxpbWl0QmVmb3JlKCk7CisgICAgdW5zaWduZWQgbGlt aXRBZnRlciA9IHN0eWxlLmh5cGhlbmF0aW9uTGltaXRBZnRlcigpID09IFJlbmRlclN0eWxlOjpp bml0aWFsSHlwaGVuYXRpb25MaW1pdEFmdGVyKCkgPyAwIDogc3R5bGUuaHlwaGVuYXRpb25MaW1p dEFmdGVyKCk7CisgICAgLy8gQ2hlY2sgaWYgdGhpcyBydW4gY2FuIGFjY29tbW9kYXRlIHRoZSBi ZWZvcmUvYWZ0ZXIgbGltaXRzIGF0IGFsbCBiZWZvcmUgc3RhcnQgbWVhc3VyaW5nIHRleHQuCisg ICAgaWYgKGxpbWl0QmVmb3JlID49IHJ1bkxlbmd0aCB8fCBsaW1pdEFmdGVyID49IHJ1bkxlbmd0 aCB8fCBsaW1pdEJlZm9yZSArIGxpbWl0QWZ0ZXIgPiBydW5MZW5ndGgpCisgICAgICAgIHJldHVy biB7IH07CisKICAgICBhdXRvJiBmb250Q2FzY2FkZSA9IHN0eWxlLmZvbnRDYXNjYWRlKCk7CiAg ICAgLy8gRklYTUU6IFdlIG1pZ2h0IHdhbnQgdG8gY2FjaGUgdGhlIGh5cGhlbiB3aWR0aC4KICAg ICBhdXRvIGh5cGhlbldpZHRoID0gTGF5b3V0VW5pdCB7IGZvbnRDYXNjYWRlLndpZHRoKFRleHRS dW4geyBTdHJpbmdWaWV3IHsgc3R5bGUuaHlwaGVuU3RyaW5nKCkgfSB9KSB9OwogICAgIGF1dG8g YXZhaWxhYmxlV2lkdGhFeGNsdWRpbmdIeXBoZW4gPSBhdmFpbGFibGVXaWR0aCAtIGh5cGhlbldp ZHRoOwotICAgIGlmIChhdmFpbGFibGVXaWR0aEV4Y2x1ZGluZ0h5cGhlbiA8PSAwIHx8ICFlbm91 Z2hXaWR0aEZvckh5cGhlbmF0aW9uKGF2YWlsYWJsZVdpZHRoRXhjbHVkaW5nSHlwaGVuLCBmb250 Q2FzY2FkZS5waXhlbFNpemUoKSkpCisKKyAgICAvLyBGb3Igc3BhY2VXaWR0aCgpIHNlZSB3ZWJr aXQub3JnL2IvMTY5NjEzCisgICAgaWYgKGF2YWlsYWJsZVdpZHRoRXhjbHVkaW5nSHlwaGVuIDw9 IDAgfHwgIWVub3VnaFdpZHRoRm9ySHlwaGVuYXRpb24oYXZhaWxhYmxlV2lkdGhFeGNsdWRpbmdI eXBoZW4gKyBmb250Q2FzY2FkZS5zcGFjZVdpZHRoKCkgLCBmb250Q2FzY2FkZS5waXhlbFNpemUo KSkpCisgICAgICAgIHJldHVybiB7IH07CisKKyAgICBhdXRvIHNwbGl0RGF0YSA9IFRleHRVdGls OjpzcGxpdChpbmxpbmVUZXh0SXRlbS5sYXlvdXRCb3goKSwgaW5saW5lVGV4dEl0ZW0uc3RhcnQo KSwgcnVuTGVuZ3RoLCBvdmVyZmxvd1J1bi5sb2dpY2FsV2lkdGgsIGF2YWlsYWJsZVdpZHRoRXhj bHVkaW5nSHlwaGVuLCB7IH0pOworICAgIGlmIChzcGxpdERhdGEubGVuZ3RoIDwgbGltaXRCZWZv cmUpCiAgICAgICAgIHJldHVybiB7IH07CiAKLSAgICBhdXRvIHNwbGl0RGF0YSA9IFRleHRVdGls OjpzcGxpdChpbmxpbmVUZXh0SXRlbS5sYXlvdXRCb3goKSwgaW5saW5lVGV4dEl0ZW0uc3RhcnQo KSwgaW5saW5lVGV4dEl0ZW0ubGVuZ3RoKCksIG92ZXJmbG93UnVuLmxvZ2ljYWxXaWR0aCwgYXZh aWxhYmxlV2lkdGhFeGNsdWRpbmdIeXBoZW4sIHsgfSk7CiAgICAgYXV0byB0ZXh0Q29udGVudCA9 IGlubGluZVRleHRJdGVtLmxheW91dEJveCgpLnRleHRDb250ZXh0KCktPmNvbnRlbnQ7Ci0gICAg YXV0byBoeXBoZW5CZWZvcmUgPSBpbmxpbmVUZXh0SXRlbS5zdGFydCgpICsgc3BsaXREYXRhLmxl bmd0aDsKKyAgICAvLyBBZGp1c3QgYmVmb3JlIGluZGV4IHRvIGFjY29tbW9kYXRlIHRoZSBsaW1p dC1hZnRlciB2YWx1ZSAoaXQncyB0aGUgbGFzdCBwb3RlbnRpYWwgaHlwaGVuIGxvY2F0aW9uIGlu IHRoaXMgcnVuKS4KKyAgICBhdXRvIGh5cGhlbkJlZm9yZSA9IHN0ZDo6bWluKHNwbGl0RGF0YS5s ZW5ndGgsIHJ1bkxlbmd0aCAtIGxpbWl0QWZ0ZXIpICsgMTsKICAgICB1bnNpZ25lZCBoeXBoZW5M b2NhdGlvbiA9IGxhc3RIeXBoZW5Mb2NhdGlvbihTdHJpbmdWaWV3KHRleHRDb250ZW50KS5zdWJz dHJpbmcoaW5saW5lVGV4dEl0ZW0uc3RhcnQoKSwgaW5saW5lVGV4dEl0ZW0ubGVuZ3RoKCkpLCBo eXBoZW5CZWZvcmUsIHN0eWxlLmxvY2FsZSgpKTsKLSAgICBpZiAoIWh5cGhlbkxvY2F0aW9uKQor ICAgIGlmICghaHlwaGVuTG9jYXRpb24gfHwgaHlwaGVuTG9jYXRpb24gPCBsaW1pdEJlZm9yZSkK ICAgICAgICAgcmV0dXJuIHsgfTsKICAgICByZXR1cm4gU3BsaXRMZW5ndGhBbmRXaWR0aCB7IGh5 cGhlbkxvY2F0aW9uLCBUZXh0VXRpbDo6d2lkdGgoaW5saW5lVGV4dEl0ZW0ubGF5b3V0Qm94KCks IGlubGluZVRleHRJdGVtLnN0YXJ0KCksIGh5cGhlbkxvY2F0aW9uKSB9OwogfQpkaWZmIC0tZ2l0 IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDIzYTc0MDRjZTJlNmI4 MzczZmFiM2Y5ZTc1NGY1Y2E2MTlmNTM1YTAuLjdmZmFlNjQwOWNjZGNkMTMwM2VhMzY1NmMyZDQ5 M2U2NjU5NDk3NDQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxOS0xMS0yOSAgWmFsYW4gQnVqdGFzICA8emFsYW5A YXBwbGUuY29tPgorCisgICAgICAgIFtMRkNdW0lGQ10gQWRkIHN1cHBvcnQgZm9yIGh5cGhlbmF0 ZS1saW1pdC1iZWZvcmUgYW5kIGh5cGhlbmF0ZS1saW1pdC1hZnRlcgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA0NzEwCisgICAgICAgIDxyZGFyOi8v cHJvYmxlbS81NzUzNTIxMD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIExheW91dFJlbG9hZGVkL21pc2MvTEZDLXBhc3NpbmctdGVzdHMudHh0Ogor CiAyMDE5LTExLTI5ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAg ICBBZGQgbWVjaGFuaXNtIGZvciBlbmFibGluZyBpbnRlcm5hbCBhbmQgZXhwZXJpbWVudGFsIGZl YXR1cmVzIGZyb20gcnVuLXdlYmtpdC10ZXN0IGNvbW1hbmQgbGluZQpkaWZmIC0tZ2l0IGEvVG9v bHMvTGF5b3V0UmVsb2FkZWQvbWlzYy9MRkMtcGFzc2luZy10ZXN0cy50eHQgYi9Ub29scy9MYXlv dXRSZWxvYWRlZC9taXNjL0xGQy1wYXNzaW5nLXRlc3RzLnR4dAppbmRleCBhOGMxMWRjODIxNjJh NGUzZjExOTAwZjE1NGEwNjhhNWUzNzNiNjEyLi45ZTlmM2ViYTUwNDBjYzVkMWM4YmNhNDUzOWZk MWZhNzc5ZDU1MWZjIDEwMDY0NAotLS0gYS9Ub29scy9MYXlvdXRSZWxvYWRlZC9taXNjL0xGQy1w YXNzaW5nLXRlc3RzLnR4dAorKysgYi9Ub29scy9MYXlvdXRSZWxvYWRlZC9taXNjL0xGQy1wYXNz aW5nLXRlc3RzLnR4dApAQCAtODQwLDYgKzg0MCw4IEBAIGZhc3QvdGV4dC9zeXN0ZW0tZm9udC1q YXBhbmVzZS1zeW50aGV0aWMtaXRhbGljLmh0bWwKIGZhc3QvdGV4dC9zeXN0ZW0tZm9udC1sZWdh Y3ktbmFtZS5odG1sCiBmYXN0L3RleHQvc3lzdGVtLWZvbnQtemVyby1zaXplLmh0bWwKIGZhc3Qv dGV4dC9zeXN0ZW0tdWktY2hpbmVzZS1ib2xkLWZhbGxiYWNrLmh0bWwKK2Zhc3QvdGV4dC9zaW1w bGUtbGluZS1sYXlvdXQtaHlwaGVuLWxpbWl0LWFmdGVyLmh0bWwKK2Zhc3QvdGV4dC9zaW1wbGUt bGluZS1sYXlvdXQtaHlwaGVuLWxpbWl0LWJlZm9yZS5odG1sCiBmYXN0L3RleHQvdGFiLXdpdGgt a2VybmluZy5odG1sCiBmYXN0L3RleHQvdGV4dC1jb21iaW5lLWZpcnN0LWxpbmUtY3Jhc2guaHRt bAogZmFzdC90ZXh0L3RleHQtY29tYmluZS1yZW5kZXJpbmcuaHRtbAo= 384529 2019-11-29 15:16:02 -0800 2019-11-29 16:03:16 -0800 Patch bug-204710-20191129151532.patch text/plain 5113 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyOTQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGZmMWI3ZDQ0NGM5NDNm YjA5MjEwYjczZjcxMGNmZTM2MWUwNDkxNi4uOTlmOTk3YzgwMmQ3M2IzNGEyMzdjNWQ1ODAyNGQ4 ZTA3ZDE5NmY2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDE5LTExLTI5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgc3Vw cG9ydCBmb3IgaHlwaGVuYXRlLWxpbWl0LWJlZm9yZSBhbmQgaHlwaGVuYXRlLWxpbWl0LWFmdGVy CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDQ3MTAK KyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU3NTM1MjEwPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogbGF5b3V0L2lubGluZWZvcm1hdHRpbmcvSW5s aW5lTGluZUJyZWFrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpMaW5lQnJlYWtl cjo6dHJ5QnJlYWtpbmdUZXh0UnVuIGNvbnN0KToKKwogMjAxOS0xMS0yOSAgWmFsYW4gQnVqdGFz ICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtMRkNdW0lGQ10gQWRkIHN1cHBvcnQgZm9y IHNpbXBsZSBoeXBoZW5hdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2lu bGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5 b3V0L2lubGluZWZvcm1hdHRpbmcvSW5saW5lTGluZUJyZWFrZXIuY3BwCmluZGV4IDk0YzY0N2Zi MWY0Y2VlMTg5ZDZkNTQzOWMxM2ZkNzVlN2VkZDJmZjYuLjg4OWFhMGJjMDk1MzM3M2QwZWEwODk2 M2I4MzUxY2UyNDMxNTBlYjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbmxp bmVmb3JtYXR0aW5nL0lubGluZUxpbmVCcmVha2VyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvaW5saW5lZm9ybWF0dGluZy9JbmxpbmVMaW5lQnJlYWtlci5jcHAKQEAgLTE0NywxOCAr MTQ3LDMxIEBAIE9wdGlvbmFsPExpbmVCcmVha2VyOjpTcGxpdExlbmd0aEFuZFdpZHRoPiBMaW5l QnJlYWtlcjo6dHJ5QnJlYWtpbmdUZXh0UnVuKGNvbnN0CiAgICAgaWYgKHN0eWxlLmh5cGhlbnMo KSAhPSBIeXBoZW5zOjpBdXRvIHx8ICFjYW5IeXBoZW5hdGUoc3R5bGUubG9jYWxlKCkpKQogICAg ICAgICByZXR1cm4geyB9OwogCisgICAgYXV0byBydW5MZW5ndGggPSBpbmxpbmVUZXh0SXRlbS5s ZW5ndGgoKTsKKyAgICB1bnNpZ25lZCBsaW1pdEJlZm9yZSA9IHN0eWxlLmh5cGhlbmF0aW9uTGlt aXRCZWZvcmUoKSA9PSBSZW5kZXJTdHlsZTo6aW5pdGlhbEh5cGhlbmF0aW9uTGltaXRCZWZvcmUo KSA/IDAgOiBzdHlsZS5oeXBoZW5hdGlvbkxpbWl0QmVmb3JlKCk7CisgICAgdW5zaWduZWQgbGlt aXRBZnRlciA9IHN0eWxlLmh5cGhlbmF0aW9uTGltaXRBZnRlcigpID09IFJlbmRlclN0eWxlOjpp bml0aWFsSHlwaGVuYXRpb25MaW1pdEFmdGVyKCkgPyAwIDogc3R5bGUuaHlwaGVuYXRpb25MaW1p dEFmdGVyKCk7CisgICAgLy8gQ2hlY2sgaWYgdGhpcyBydW4gY2FuIGFjY29tbW9kYXRlIHRoZSBi ZWZvcmUvYWZ0ZXIgbGltaXRzIGF0IGFsbCBiZWZvcmUgc3RhcnQgbWVhc3VyaW5nIHRleHQuCisg ICAgaWYgKGxpbWl0QmVmb3JlID49IHJ1bkxlbmd0aCB8fCBsaW1pdEFmdGVyID49IHJ1bkxlbmd0 aCB8fCBsaW1pdEJlZm9yZSArIGxpbWl0QWZ0ZXIgPiBydW5MZW5ndGgpCisgICAgICAgIHJldHVy biB7IH07CisKICAgICBhdXRvJiBmb250Q2FzY2FkZSA9IHN0eWxlLmZvbnRDYXNjYWRlKCk7CiAg ICAgLy8gRklYTUU6IFdlIG1pZ2h0IHdhbnQgdG8gY2FjaGUgdGhlIGh5cGhlbiB3aWR0aC4KICAg ICBhdXRvIGh5cGhlbldpZHRoID0gTGF5b3V0VW5pdCB7IGZvbnRDYXNjYWRlLndpZHRoKFRleHRS dW4geyBTdHJpbmdWaWV3IHsgc3R5bGUuaHlwaGVuU3RyaW5nKCkgfSB9KSB9OwogICAgIGF1dG8g YXZhaWxhYmxlV2lkdGhFeGNsdWRpbmdIeXBoZW4gPSBhdmFpbGFibGVXaWR0aCAtIGh5cGhlbldp ZHRoOwotICAgIGlmIChhdmFpbGFibGVXaWR0aEV4Y2x1ZGluZ0h5cGhlbiA8PSAwIHx8ICFlbm91 Z2hXaWR0aEZvckh5cGhlbmF0aW9uKGF2YWlsYWJsZVdpZHRoRXhjbHVkaW5nSHlwaGVuLCBmb250 Q2FzY2FkZS5waXhlbFNpemUoKSkpCisKKyAgICAvLyBGb3Igc3BhY2VXaWR0aCgpIHNlZSB3ZWJr aXQub3JnL2IvMTY5NjEzCisgICAgaWYgKGF2YWlsYWJsZVdpZHRoRXhjbHVkaW5nSHlwaGVuIDw9 IDAgfHwgIWVub3VnaFdpZHRoRm9ySHlwaGVuYXRpb24oYXZhaWxhYmxlV2lkdGhFeGNsdWRpbmdI eXBoZW4gKyBmb250Q2FzY2FkZS5zcGFjZVdpZHRoKCksIGZvbnRDYXNjYWRlLnBpeGVsU2l6ZSgp KSkKKyAgICAgICAgcmV0dXJuIHsgfTsKKworICAgIGF1dG8gc3BsaXREYXRhID0gVGV4dFV0aWw6 OnNwbGl0KGlubGluZVRleHRJdGVtLmxheW91dEJveCgpLCBpbmxpbmVUZXh0SXRlbS5zdGFydCgp LCBydW5MZW5ndGgsIG92ZXJmbG93UnVuLmxvZ2ljYWxXaWR0aCwgYXZhaWxhYmxlV2lkdGhFeGNs dWRpbmdIeXBoZW4sIHsgfSk7CisgICAgaWYgKHNwbGl0RGF0YS5sZW5ndGggPCBsaW1pdEJlZm9y ZSkKICAgICAgICAgcmV0dXJuIHsgfTsKIAotICAgIGF1dG8gc3BsaXREYXRhID0gVGV4dFV0aWw6 OnNwbGl0KGlubGluZVRleHRJdGVtLmxheW91dEJveCgpLCBpbmxpbmVUZXh0SXRlbS5zdGFydCgp LCBpbmxpbmVUZXh0SXRlbS5sZW5ndGgoKSwgb3ZlcmZsb3dSdW4ubG9naWNhbFdpZHRoLCBhdmFp bGFibGVXaWR0aEV4Y2x1ZGluZ0h5cGhlbiwgeyB9KTsKICAgICBhdXRvIHRleHRDb250ZW50ID0g aW5saW5lVGV4dEl0ZW0ubGF5b3V0Qm94KCkudGV4dENvbnRleHQoKS0+Y29udGVudDsKLSAgICBh dXRvIGh5cGhlbkJlZm9yZSA9IGlubGluZVRleHRJdGVtLnN0YXJ0KCkgKyBzcGxpdERhdGEubGVu Z3RoOworICAgIC8vIEFkanVzdCBiZWZvcmUgaW5kZXggdG8gYWNjb21tb2RhdGUgdGhlIGxpbWl0 LWFmdGVyIHZhbHVlIChpdCdzIHRoZSBsYXN0IHBvdGVudGlhbCBoeXBoZW4gbG9jYXRpb24gaW4g dGhpcyBydW4pLgorICAgIGF1dG8gaHlwaGVuQmVmb3JlID0gc3RkOjptaW4oc3BsaXREYXRhLmxl bmd0aCwgcnVuTGVuZ3RoIC0gbGltaXRBZnRlcikgKyAxOwogICAgIHVuc2lnbmVkIGh5cGhlbkxv Y2F0aW9uID0gbGFzdEh5cGhlbkxvY2F0aW9uKFN0cmluZ1ZpZXcodGV4dENvbnRlbnQpLnN1YnN0 cmluZyhpbmxpbmVUZXh0SXRlbS5zdGFydCgpLCBpbmxpbmVUZXh0SXRlbS5sZW5ndGgoKSksIGh5 cGhlbkJlZm9yZSwgc3R5bGUubG9jYWxlKCkpOwotICAgIGlmICghaHlwaGVuTG9jYXRpb24pCisg ICAgaWYgKCFoeXBoZW5Mb2NhdGlvbiB8fCBoeXBoZW5Mb2NhdGlvbiA8IGxpbWl0QmVmb3JlKQog ICAgICAgICByZXR1cm4geyB9OwogICAgIHJldHVybiBTcGxpdExlbmd0aEFuZFdpZHRoIHsgaHlw aGVuTG9jYXRpb24sIFRleHRVdGlsOjp3aWR0aChpbmxpbmVUZXh0SXRlbS5sYXlvdXRCb3goKSwg aW5saW5lVGV4dEl0ZW0uc3RhcnQoKSwgaHlwaGVuTG9jYXRpb24pIH07CiB9CmRpZmYgLS1naXQg YS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMjNhNzQwNGNlMmU2Yjgz NzNmYWIzZjllNzU0ZjVjYTYxOWY1MzVhMC4uN2ZmYWU2NDA5Y2NkY2QxMzAzZWEzNjU2YzJkNDkz ZTY2NTk0OTc0NCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDE5LTExLTI5ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBh cHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bSUZDXSBBZGQgc3VwcG9ydCBmb3IgaHlwaGVuYXRl LWxpbWl0LWJlZm9yZSBhbmQgaHlwaGVuYXRlLWxpbWl0LWFmdGVyCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDQ3MTAKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzU3NTM1MjEwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogTGF5b3V0UmVsb2FkZWQvbWlzYy9MRkMtcGFzc2luZy10ZXN0cy50eHQ6CisK IDIwMTktMTEtMjkgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAg IEFkZCBtZWNoYW5pc20gZm9yIGVuYWJsaW5nIGludGVybmFsIGFuZCBleHBlcmltZW50YWwgZmVh dHVyZXMgZnJvbSBydW4td2Via2l0LXRlc3QgY29tbWFuZCBsaW5lCmRpZmYgLS1naXQgYS9Ub29s cy9MYXlvdXRSZWxvYWRlZC9taXNjL0xGQy1wYXNzaW5nLXRlc3RzLnR4dCBiL1Rvb2xzL0xheW91 dFJlbG9hZGVkL21pc2MvTEZDLXBhc3NpbmctdGVzdHMudHh0CmluZGV4IGE4YzExZGM4MjE2MmE0 ZTNmMTE5MDBmMTU0YTA2OGE1ZTM3M2I2MTIuLjllOWYzZWJhNTA0MGNjNWQxYzhiY2E0NTM5ZmQx ZmE3NzlkNTUxZmMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0xheW91dFJlbG9hZGVkL21pc2MvTEZDLXBh c3NpbmctdGVzdHMudHh0CisrKyBiL1Rvb2xzL0xheW91dFJlbG9hZGVkL21pc2MvTEZDLXBhc3Np bmctdGVzdHMudHh0CkBAIC04NDAsNiArODQwLDggQEAgZmFzdC90ZXh0L3N5c3RlbS1mb250LWph cGFuZXNlLXN5bnRoZXRpYy1pdGFsaWMuaHRtbAogZmFzdC90ZXh0L3N5c3RlbS1mb250LWxlZ2Fj eS1uYW1lLmh0bWwKIGZhc3QvdGV4dC9zeXN0ZW0tZm9udC16ZXJvLXNpemUuaHRtbAogZmFzdC90 ZXh0L3N5c3RlbS11aS1jaGluZXNlLWJvbGQtZmFsbGJhY2suaHRtbAorZmFzdC90ZXh0L3NpbXBs ZS1saW5lLWxheW91dC1oeXBoZW4tbGltaXQtYWZ0ZXIuaHRtbAorZmFzdC90ZXh0L3NpbXBsZS1s aW5lLWxheW91dC1oeXBoZW4tbGltaXQtYmVmb3JlLmh0bWwKIGZhc3QvdGV4dC90YWItd2l0aC1r ZXJuaW5nLmh0bWwKIGZhc3QvdGV4dC90ZXh0LWNvbWJpbmUtZmlyc3QtbGluZS1jcmFzaC5odG1s CiBmYXN0L3RleHQvdGV4dC1jb21iaW5lLXJlbmRlcmluZy5odG1sCg==