167562 2017-01-29 10:54:48 -0800 Simple line layout: PerformanceTests/Layout/simple-line-layout-innertext.html regressed at r211108 2017-01-29 12:22:35 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zalan zalan bfulgham commit-queue esprehn+autocc glenn koivisto kondapallykalyan simon.fraser zalan oldest_to_newest 1271128 0 zalan 2017-01-29 10:54:48 -0800 hyphenation support. 1271129 1 300070 zalan 2017-01-29 11:08:49 -0800 Created attachment 300070 Patch 1271130 2 300070 koivisto 2017-01-29 11:13:30 -0800 Comment on attachment 300070 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=300070&action=review > Source/WebCore/rendering/SimpleLineLayoutResolver.cpp:56 > + ASSERT(run.hasHyphen && run.start < run.end); You would be better to use separate asserts. 1271131 3 koivisto 2017-01-29 11:18:32 -0800 *It 1271134 4 300071 zalan 2017-01-29 11:44:48 -0800 Created attachment 300071 Patch 1271139 5 300071 commit-queue 2017-01-29 12:22:30 -0800 Comment on attachment 300071 Patch Clearing flags on attachment: 300071 Committed r211353: <http://trac.webkit.org/changeset/211353> 1271140 6 commit-queue 2017-01-29 12:22:35 -0800 All reviewed patches have been landed. Closing bug. 300070 2017-01-29 11:08:49 -0800 2017-01-29 11:44:43 -0800 Patch bug-167562-20170129110642.patch text/plain 6398 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjExMjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODY4MTEzYzI1OGNjMDc5 YWZiZjU2ODY1ZDY4ODUxZDkwYTZmM2RjNi4uZGNlMWRhZjRlM2JhOGI1NTliMTU3ZjkwYmNmYWI3 Yjk1MjQxMDc0ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE3LTAxLTI5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxlIGxpbmUgbGF5b3V0 OiBQZXJmb3JtYW5jZVRlc3RzL0xheW91dC9zaW1wbGUtbGluZS1sYXlvdXQtaW5uZXJ0ZXh0Lmh0 bWwgcmVncmVzc2VkIGF0IHIyMTExMDgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE2NzU2MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFwcGFyZW50bHkgUnVuUmVzb2x2ZXI6OlJ1bjo6Y29uc3RydWN0U3Ry aW5nRm9ySHlwaGVuSWZOZWVkZWQoKSBpcyBpbiBhIHN1cGVyaG90IGNvZGVwYXRoLgorICAgICAg ICBUaGUgUnVuIHNob3VsZCBub3QgaGF2ZSBhbnkgYWRkaXRpb25hbCBtZW1iZXJzIGFueXdheSwg c28gbGV0J3MgY29uc3RydWN0IHRoZSBoeXBoZW5hdGVkCisgICAgICAgIHN0cmluZyBvbiBkZW1h bmQuCisgICAgICAgIFByb2dyZXNzaW9uIG9uIHNpbXBsZS1saW5lLWxheW91dC1pbm5lcnRleHQu aHRtbCBpcyBmcm9tIH4zNHJ1bnMvc2VjIGJhY2sgdG8gfjUwcnVucy9zZWMuCisKKyAgICAgICAg Q292ZXJlZCBieSBleGlzdGluZyB0ZXh0LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRy ZWVBc1RleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6d3JpdGVTaW1wbGVMaW5lKToKKyAgICAg ICAgKiByZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZ1bmN0aW9ucy5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0OjpwYWludEZsb3cpOgorICAgICAgICAqIHJlbmRlcmlu Zy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxl TGluZUxheW91dDo6UnVuUmVzb2x2ZXI6OlJ1bjo6UnVuKToKKyAgICAgICAgKFdlYkNvcmU6OlNp bXBsZUxpbmVMYXlvdXQ6OlJ1blJlc29sdmVyOjpSdW46OnRleHRXaXRoSHlwaGVuKToKKyAgICAg ICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OlJ1blJlc29sdmVyOjpSdW46OnRleHQpOgor ICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6UnVuUmVzb2x2ZXI6OlJ1bjo6Y29u c3RydWN0U3RyaW5nRm9ySHlwaGVuSWZOZWVkZWQpOiBEZWxldGVkLgorICAgICAgICAqIHJlbmRl cmluZy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuaDoKKwogMjAxNy0wMS0yNiAgQ2hyaXMgRHVt ZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBDUFUgLyBNZW1vcnkgZGlhZ25v c3RpYyBsb2dnaW5nIGluIFBlcmZvcm1hbmNlTW9uaXRvcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRyZWVBc1RleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRyZWVBc1RleHQuY3BwCmluZGV4IDM0YjlkZTQ1OWViMjU1ZTJiM2M3OTYz ZTIyODhkN2RmMmRjYTA3OWYuLmQ3ZDM3YWE1NDQ2NjNmYTY5YjQ0OTAzZmI0NGZjZjEyMWVmMWU4 YzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUcmVlQXNUZXh0 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVHJlZUFzVGV4dC5jcHAK QEAgLTUwNCwxMiArNTA0LDkgQEAgc3RhdGljIHZvaWQgd3JpdGVTaW1wbGVMaW5lKFRleHRTdHJl YW0mIHRzLCBjb25zdCBSZW5kZXJUZXh0JiByZW5kZXJUZXh0LCBjb25zdAogICAgICAgICB5IC09 IGZsb29yVG9JbnQoZG93bmNhc3Q8UmVuZGVyVGFibGVDZWxsPigqcmVuZGVyVGV4dC5jb250YWlu aW5nQmxvY2soKSkuaW50cmluc2ljUGFkZGluZ0JlZm9yZSgpKTsKIAogICAgIHRzIDw8ICJ0ZXh0 IHJ1biBhdCAoIiA8PCB4IDw8ICIsIiA8PCB5IDw8ICIpIHdpZHRoICIgPDwgbG9naWNhbFdpZHRo OwotICAgIGlmIChydW4uaGFzSHlwaGVuKCkpIHsKLSAgICAgICAgdHMgPDwgIjogIiA8PCBxdW90 ZUFuZEVzY2FwZU5vblByaW50YWJsZXMocnVuLnRleHQoKS5zdWJzdHJpbmcoMCwgcnVuLnRleHQo KS5sZW5ndGgoKSAtIDEpKTsKKyAgICB0cyA8PCAiOiAiIDw8IHF1b3RlQW5kRXNjYXBlTm9uUHJp bnRhYmxlcyhydW4udGV4dCgpKTsKKyAgICBpZiAocnVuLmhhc0h5cGhlbigpKQogICAgICAgICB0 cyA8PCAiICsgaHlwaGVuIHN0cmluZyAiIDw8IHF1b3RlQW5kRXNjYXBlTm9uUHJpbnRhYmxlcyhy ZW5kZXJUZXh0LnN0eWxlKCkuaHlwaGVuU3RyaW5nKCkuc3RyaW5nKCkpOwotICAgIH0gZWxzZQot ICAgICAgICB0cyA8PCAiOiAiIDw8IHF1b3RlQW5kRXNjYXBlTm9uUHJpbnRhYmxlcyhydW4udGV4 dCgpKTsKLQogICAgIHRzIDw8ICJcbiI7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0RnVuY3Rpb25zLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0RnVuY3Rpb25zLmNwcAppbmRleCA1YzU2YTM2MDMx YjU0NmI0NDdiNjczMTBmMmJmMDVhYmYwMDA0ZjE4Li5mOTRjODgyYWVmM2Y0YWRkMzYwMTNjMWEw NzVlZmRhNDQ2YTdlNjdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2lt cGxlTGluZUxheW91dEZ1bmN0aW9ucy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1NpbXBsZUxpbmVMYXlvdXRGdW5jdGlvbnMuY3BwCkBAIC0xMTgsOCArMTE4LDExIEBAIHZvaWQg cGFpbnRGbG93KGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgZmxvdywgY29uc3QgTGF5b3V0JiBsYXlv dXQsIFBhaW50SW5mbyYgcGFpCiAgICAgICAgIGlmIChwYWludFJlY3QueSgpID4gdmlzdWFsT3Zl cmZsb3dSZWN0Lm1heFkoKSB8fCBwYWludFJlY3QubWF4WSgpIDwgdmlzdWFsT3ZlcmZsb3dSZWN0 LnkoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCisgICAgICAgIFN0cmluZyB0ZXh0V2l0aEh5 cGhlbjsKKyAgICAgICAgaWYgKHJ1bi5oYXNIeXBoZW4oKSkKKyAgICAgICAgICAgIHRleHRXaXRo SHlwaGVuID0gcnVuLnRleHRXaXRoSHlwaGVuKCk7CiAgICAgICAgIC8vIHggcG9zaXRpb24gaW5k aWNhdGVzIHRoZSBsaW5lIG9mZnNldCBmcm9tIHRoZSByb290Ym94LiBJdCdzIGFsd2F5cyAwIGlu IGNhc2Ugb2Ygc2ltcGxlIGxpbmUgbGF5b3V0LgotICAgICAgICBUZXh0UnVuIHRleHRSdW4ocnVu LnRleHQoKSwgMCwgcnVuLmV4cGFuc2lvbigpLCBydW4uZXhwYW5zaW9uQmVoYXZpb3IoKSk7Cisg ICAgICAgIFRleHRSdW4gdGV4dFJ1bihydW4uaGFzSHlwaGVuKCkgPyB0ZXh0V2l0aEh5cGhlbiA6 IHJ1bi50ZXh0KCksIDAsIHJ1bi5leHBhbnNpb24oKSwgcnVuLmV4cGFuc2lvbkJlaGF2aW9yKCkp OwogICAgICAgICB0ZXh0UnVuLnNldFRhYlNpemUoIXN0eWxlLmNvbGxhcHNlV2hpdGVTcGFjZSgp LCBzdHlsZS50YWJTaXplKCkpOwogICAgICAgICBGbG9hdFBvaW50IHRleHRPcmlnaW4gPSBGbG9h dFBvaW50KHJlY3QueCgpICsgcGFpbnRPZmZzZXQueCgpLCByb3VuZFRvRGV2aWNlUGl4ZWwocnVu LmJhc2VsaW5lUG9zaXRpb24oKSArIHBhaW50T2Zmc2V0LnkoKSwgZGV2aWNlU2NhbGVGYWN0b3Ip KTsKICAgICAgICAgdGV4dFBhaW50ZXIucGFpbnRUZXh0KHRleHRSdW4sIHRleHRSdW4ubGVuZ3Ro KCksIHJlY3QsIHRleHRPcmlnaW4pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNvbHZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvU2ltcGxlTGluZUxheW91dFJlc29sdmVyLmNwcAppbmRleCBlY2E1ZjEzZTJmMTUxZTRiMGMw NWE0N2I2YWFiMmNlZWZkOGFmNWUzLi5lOWU1NWY3ZjY0NDk3ODFhYTA1ZDE1MDc4NjY0ODlkZDM4 Y2VjOTc5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxh eW91dFJlc29sdmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGlu ZUxheW91dFJlc29sdmVyLmNwcApAQCAtNDcsMTkgKzQ3LDE2IEBAIHN0YXRpYyBGbG9hdFNpemUg bGluZVNpemUoZmxvYXQgbG9naWNhbExlZnQsIGZsb2F0IGxvZ2ljYWxSaWdodCwgZmxvYXQgaGVp Z2h0KQogUnVuUmVzb2x2ZXI6OlJ1bjo6UnVuKGNvbnN0IEl0ZXJhdG9yJiBpdGVyYXRvcikKICAg ICA6IG1faXRlcmF0b3IoaXRlcmF0b3IpCiB7Ci0gICAgY29uc3RydWN0U3RyaW5nRm9ySHlwaGVu SWZOZWVkZWQoKTsKIH0KIAotdm9pZCBSdW5SZXNvbHZlcjo6UnVuOjpjb25zdHJ1Y3RTdHJpbmdG b3JIeXBoZW5JZk5lZWRlZCgpCitTdHJpbmcgUnVuUmVzb2x2ZXI6OlJ1bjo6dGV4dFdpdGhIeXBo ZW4oKSBjb25zdAogewogICAgIGF1dG8mIHJ1biA9IG1faXRlcmF0b3Iuc2ltcGxlUnVuKCk7Ci0g ICAgaWYgKCFydW4uaGFzSHlwaGVuKQotICAgICAgICByZXR1cm47CiAgICAgLy8gRW1wdHkgcnVu cyBzaG91bGQgbm90IGhhdmUgaHlwaGVuLgotICAgIEFTU0VSVChydW4uc3RhcnQgPCBydW4uZW5k KTsKKyAgICBBU1NFUlQocnVuLmhhc0h5cGhlbiAmJiBydW4uc3RhcnQgPCBydW4uZW5kKTsKICAg ICBhdXRvJiBzZWdtZW50ID0gbV9pdGVyYXRvci5yZXNvbHZlcigpLm1fZmxvd0NvbnRlbnRzLnNl Z21lbnRGb3JSdW4ocnVuLnN0YXJ0LCBydW4uZW5kKTsKICAgICBhdXRvIHRleHQgPSBTdHJpbmdW aWV3KHNlZ21lbnQudGV4dCkuc3Vic3RyaW5nKHNlZ21lbnQudG9TZWdtZW50UG9zaXRpb24ocnVu LnN0YXJ0KSwgcnVuLmVuZCAtIHJ1bi5zdGFydCk7Ci0gICAgbV90ZXh0V2l0aEh5cGhlbiA9IG1h a2VTdHJpbmcodGV4dCwgbV9pdGVyYXRvci5yZXNvbHZlcigpLmZsb3coKS5zdHlsZSgpLmh5cGhl blN0cmluZygpKTsKKyAgICByZXR1cm4gbWFrZVN0cmluZyh0ZXh0LCBtX2l0ZXJhdG9yLnJlc29s dmVyKCkuZmxvdygpLnN0eWxlKCkuaHlwaGVuU3RyaW5nKCkpOwogfQogCiBGbG9hdFJlY3QgUnVu UmVzb2x2ZXI6OlJ1bjo6cmVjdCgpIGNvbnN0CkBAIC04Miw4ICs3OSw2IEBAIEZsb2F0UmVjdCBS dW5SZXNvbHZlcjo6UnVuOjpyZWN0KCkgY29uc3QKIAogU3RyaW5nVmlldyBSdW5SZXNvbHZlcjo6 UnVuOjp0ZXh0KCkgY29uc3QKIHsKLSAgICBpZiAobV90ZXh0V2l0aEh5cGhlbikKLSAgICAgICAg cmV0dXJuIFN0cmluZ1ZpZXcoKm1fdGV4dFdpdGhIeXBoZW4pOwogICAgIGF1dG8mIHJ1biA9IG1f aXRlcmF0b3Iuc2ltcGxlUnVuKCk7CiAgICAgQVNTRVJUKHJ1bi5zdGFydCA8IHJ1bi5lbmQpOwog ICAgIGF1dG8mIHNlZ21lbnQgPSBtX2l0ZXJhdG9yLnJlc29sdmVyKCkubV9mbG93Q29udGVudHMu c2VnbWVudEZvclJ1bihydW4uc3RhcnQsIHJ1bi5lbmQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNvbHZlci5oIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNvbHZlci5oCmluZGV4IDg0Yzc2OGI1M2U2 YjE1MGEyZmUyZTljMjEzN2U5YWRjZjk2Zjc3MzEuLjNjYzNmYjkzNDVmYjBjMmI4MmJmNWUxYTgy NDNlOGFmNTA1OTJmMGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1w bGVMaW5lTGF5b3V0UmVzb2x2ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2lt cGxlTGluZUxheW91dFJlc29sdmVyLmgKQEAgLTY0LDYgKzY0LDcgQEAgcHVibGljOgogICAgICAg ICBFeHBhbnNpb25CZWhhdmlvciBleHBhbnNpb25CZWhhdmlvcigpIGNvbnN0OwogICAgICAgICBp bnQgYmFzZWxpbmVQb3NpdGlvbigpIGNvbnN0OwogICAgICAgICBTdHJpbmdWaWV3IHRleHQoKSBj b25zdDsKKyAgICAgICAgU3RyaW5nIHRleHRXaXRoSHlwaGVuKCkgY29uc3Q7CiAgICAgICAgIGJv b2wgaXNFbmRPZkxpbmUoKSBjb25zdDsKICAgICAgICAgYm9vbCBoYXNIeXBoZW4oKSBjb25zdCB7 IHJldHVybiBtX2l0ZXJhdG9yLnNpbXBsZVJ1bigpLmhhc0h5cGhlbjsgfQogCkBAIC03NCw3ICs3 NSw2IEBAIHB1YmxpYzoKICAgICAgICAgdm9pZCBjb25zdHJ1Y3RTdHJpbmdGb3JIeXBoZW5JZk5l ZWRlZCgpOwogCiAgICAgICAgIGNvbnN0IEl0ZXJhdG9yJiBtX2l0ZXJhdG9yOwotICAgICAgICBz dGQ6Om9wdGlvbmFsPFN0cmluZz4gbV90ZXh0V2l0aEh5cGhlbjsKICAgICB9OwogCiAgICAgY2xh c3MgSXRlcmF0b3Igewo= 300071 2017-01-29 11:44:48 -0800 2017-01-29 12:22:30 -0800 Patch bug-167562-20170129114240.patch text/plain 6375 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjExMjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODY4MTEzYzI1OGNjMDc5 YWZiZjU2ODY1ZDY4ODUxZDkwYTZmM2RjNi4uYmJmNzQ0MTk1ZTMzYzU0NDc4MDA0YzJlMGY1MzA4 ODM2ZDczNmQ5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE3LTAxLTI5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgU2ltcGxlIGxpbmUgbGF5b3V0 OiBQZXJmb3JtYW5jZVRlc3RzL0xheW91dC9zaW1wbGUtbGluZS1sYXlvdXQtaW5uZXJ0ZXh0Lmh0 bWwgcmVncmVzc2VkIGF0IHIyMTExMDgKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE2NzU2MgorCisgICAgICAgIFJldmlld2VkIGJ5IEFudHRpIEtvaXZp c3RvLgorCisgICAgICAgIEFwcGFyZW50bHkgUnVuUmVzb2x2ZXI6OlJ1bjo6Y29uc3RydWN0U3Ry aW5nRm9ySHlwaGVuSWZOZWVkZWQoKSBpcyBpbiBhIHN1cGVyaG90IGNvZGVwYXRoLgorICAgICAg ICBUaGUgUnVuIHNob3VsZCBub3QgaGF2ZSBhbnkgYWRkaXRpb25hbCBtZW1iZXJzIGFueXdheSwg c28gbGV0J3MgY29uc3RydWN0IHRoZSBoeXBoZW5hdGVkCisgICAgICAgIHN0cmluZyBvbiBkZW1h bmQuCisgICAgICAgIFByb2dyZXNzaW9uIG9uIHNpbXBsZS1saW5lLWxheW91dC1pbm5lcnRleHQu aHRtbCBpcyBmcm9tIH4zNHJ1bnMvc2VjIGJhY2sgdG8gfjUwcnVucy9zZWMuCisKKyAgICAgICAg Q292ZXJlZCBieSBleGlzdGluZyB0ZXh0LgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRy ZWVBc1RleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6d3JpdGVTaW1wbGVMaW5lKToKKyAgICAg ICAgKiByZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dEZ1bmN0aW9ucy5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpTaW1wbGVMaW5lTGF5b3V0OjpwYWludEZsb3cpOgorICAgICAgICAqIHJlbmRlcmlu Zy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U2ltcGxl TGluZUxheW91dDo6UnVuUmVzb2x2ZXI6OlJ1bjo6UnVuKToKKyAgICAgICAgKFdlYkNvcmU6OlNp bXBsZUxpbmVMYXlvdXQ6OlJ1blJlc29sdmVyOjpSdW46OnRleHRXaXRoSHlwaGVuKToKKyAgICAg ICAgKFdlYkNvcmU6OlNpbXBsZUxpbmVMYXlvdXQ6OlJ1blJlc29sdmVyOjpSdW46OnRleHQpOgor ICAgICAgICAoV2ViQ29yZTo6U2ltcGxlTGluZUxheW91dDo6UnVuUmVzb2x2ZXI6OlJ1bjo6Y29u c3RydWN0U3RyaW5nRm9ySHlwaGVuSWZOZWVkZWQpOiBEZWxldGVkLgorICAgICAgICAqIHJlbmRl cmluZy9TaW1wbGVMaW5lTGF5b3V0UmVzb2x2ZXIuaDoKKwogMjAxNy0wMS0yNiAgQ2hyaXMgRHVt ZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBDUFUgLyBNZW1vcnkgZGlhZ25v c3RpYyBsb2dnaW5nIGluIFBlcmZvcm1hbmNlTW9uaXRvcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlclRyZWVBc1RleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclRyZWVBc1RleHQuY3BwCmluZGV4IDM0YjlkZTQ1OWViMjU1ZTJiM2M3OTYz ZTIyODhkN2RmMmRjYTA3OWYuLmQ3ZDM3YWE1NDQ2NjNmYTY5YjQ0OTAzZmI0NGZjZjEyMWVmMWU4 YzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUcmVlQXNUZXh0 LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVHJlZUFzVGV4dC5jcHAK QEAgLTUwNCwxMiArNTA0LDkgQEAgc3RhdGljIHZvaWQgd3JpdGVTaW1wbGVMaW5lKFRleHRTdHJl YW0mIHRzLCBjb25zdCBSZW5kZXJUZXh0JiByZW5kZXJUZXh0LCBjb25zdAogICAgICAgICB5IC09 IGZsb29yVG9JbnQoZG93bmNhc3Q8UmVuZGVyVGFibGVDZWxsPigqcmVuZGVyVGV4dC5jb250YWlu aW5nQmxvY2soKSkuaW50cmluc2ljUGFkZGluZ0JlZm9yZSgpKTsKIAogICAgIHRzIDw8ICJ0ZXh0 IHJ1biBhdCAoIiA8PCB4IDw8ICIsIiA8PCB5IDw8ICIpIHdpZHRoICIgPDwgbG9naWNhbFdpZHRo OwotICAgIGlmIChydW4uaGFzSHlwaGVuKCkpIHsKLSAgICAgICAgdHMgPDwgIjogIiA8PCBxdW90 ZUFuZEVzY2FwZU5vblByaW50YWJsZXMocnVuLnRleHQoKS5zdWJzdHJpbmcoMCwgcnVuLnRleHQo KS5sZW5ndGgoKSAtIDEpKTsKKyAgICB0cyA8PCAiOiAiIDw8IHF1b3RlQW5kRXNjYXBlTm9uUHJp bnRhYmxlcyhydW4udGV4dCgpKTsKKyAgICBpZiAocnVuLmhhc0h5cGhlbigpKQogICAgICAgICB0 cyA8PCAiICsgaHlwaGVuIHN0cmluZyAiIDw8IHF1b3RlQW5kRXNjYXBlTm9uUHJpbnRhYmxlcyhy ZW5kZXJUZXh0LnN0eWxlKCkuaHlwaGVuU3RyaW5nKCkuc3RyaW5nKCkpOwotICAgIH0gZWxzZQot ICAgICAgICB0cyA8PCAiOiAiIDw8IHF1b3RlQW5kRXNjYXBlTm9uUHJpbnRhYmxlcyhydW4udGV4 dCgpKTsKLQogICAgIHRzIDw8ICJcbiI7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0RnVuY3Rpb25zLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9TaW1wbGVMaW5lTGF5b3V0RnVuY3Rpb25zLmNwcAppbmRleCA1YzU2YTM2MDMx YjU0NmI0NDdiNjczMTBmMmJmMDVhYmYwMDA0ZjE4Li5mOTRjODgyYWVmM2Y0YWRkMzYwMTNjMWEw NzVlZmRhNDQ2YTdlNjdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2lt cGxlTGluZUxheW91dEZ1bmN0aW9ucy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1NpbXBsZUxpbmVMYXlvdXRGdW5jdGlvbnMuY3BwCkBAIC0xMTgsOCArMTE4LDExIEBAIHZvaWQg cGFpbnRGbG93KGNvbnN0IFJlbmRlckJsb2NrRmxvdyYgZmxvdywgY29uc3QgTGF5b3V0JiBsYXlv dXQsIFBhaW50SW5mbyYgcGFpCiAgICAgICAgIGlmIChwYWludFJlY3QueSgpID4gdmlzdWFsT3Zl cmZsb3dSZWN0Lm1heFkoKSB8fCBwYWludFJlY3QubWF4WSgpIDwgdmlzdWFsT3ZlcmZsb3dSZWN0 LnkoKSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCisgICAgICAgIFN0cmluZyB0ZXh0V2l0aEh5 cGhlbjsKKyAgICAgICAgaWYgKHJ1bi5oYXNIeXBoZW4oKSkKKyAgICAgICAgICAgIHRleHRXaXRo SHlwaGVuID0gcnVuLnRleHRXaXRoSHlwaGVuKCk7CiAgICAgICAgIC8vIHggcG9zaXRpb24gaW5k aWNhdGVzIHRoZSBsaW5lIG9mZnNldCBmcm9tIHRoZSByb290Ym94LiBJdCdzIGFsd2F5cyAwIGlu IGNhc2Ugb2Ygc2ltcGxlIGxpbmUgbGF5b3V0LgotICAgICAgICBUZXh0UnVuIHRleHRSdW4ocnVu LnRleHQoKSwgMCwgcnVuLmV4cGFuc2lvbigpLCBydW4uZXhwYW5zaW9uQmVoYXZpb3IoKSk7Cisg ICAgICAgIFRleHRSdW4gdGV4dFJ1bihydW4uaGFzSHlwaGVuKCkgPyB0ZXh0V2l0aEh5cGhlbiA6 IHJ1bi50ZXh0KCksIDAsIHJ1bi5leHBhbnNpb24oKSwgcnVuLmV4cGFuc2lvbkJlaGF2aW9yKCkp OwogICAgICAgICB0ZXh0UnVuLnNldFRhYlNpemUoIXN0eWxlLmNvbGxhcHNlV2hpdGVTcGFjZSgp LCBzdHlsZS50YWJTaXplKCkpOwogICAgICAgICBGbG9hdFBvaW50IHRleHRPcmlnaW4gPSBGbG9h dFBvaW50KHJlY3QueCgpICsgcGFpbnRPZmZzZXQueCgpLCByb3VuZFRvRGV2aWNlUGl4ZWwocnVu LmJhc2VsaW5lUG9zaXRpb24oKSArIHBhaW50T2Zmc2V0LnkoKSwgZGV2aWNlU2NhbGVGYWN0b3Ip KTsKICAgICAgICAgdGV4dFBhaW50ZXIucGFpbnRUZXh0KHRleHRSdW4sIHRleHRSdW4ubGVuZ3Ro KCksIHJlY3QsIHRleHRPcmlnaW4pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNvbHZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvU2ltcGxlTGluZUxheW91dFJlc29sdmVyLmNwcAppbmRleCBlY2E1ZjEzZTJmMTUxZTRiMGMw NWE0N2I2YWFiMmNlZWZkOGFmNWUzLi5hZTE1MDA2NjE5OWZhOWU4ZmIwMzA4ZDQ4NmEyYTdjYjQ4 MWI3ZjY5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxh eW91dFJlc29sdmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGlu ZUxheW91dFJlc29sdmVyLmNwcApAQCAtNDcsMTkgKzQ3LDE3IEBAIHN0YXRpYyBGbG9hdFNpemUg bGluZVNpemUoZmxvYXQgbG9naWNhbExlZnQsIGZsb2F0IGxvZ2ljYWxSaWdodCwgZmxvYXQgaGVp Z2h0KQogUnVuUmVzb2x2ZXI6OlJ1bjo6UnVuKGNvbnN0IEl0ZXJhdG9yJiBpdGVyYXRvcikKICAg ICA6IG1faXRlcmF0b3IoaXRlcmF0b3IpCiB7Ci0gICAgY29uc3RydWN0U3RyaW5nRm9ySHlwaGVu SWZOZWVkZWQoKTsKIH0KIAotdm9pZCBSdW5SZXNvbHZlcjo6UnVuOjpjb25zdHJ1Y3RTdHJpbmdG b3JIeXBoZW5JZk5lZWRlZCgpCitTdHJpbmcgUnVuUmVzb2x2ZXI6OlJ1bjo6dGV4dFdpdGhIeXBo ZW4oKSBjb25zdAogewogICAgIGF1dG8mIHJ1biA9IG1faXRlcmF0b3Iuc2ltcGxlUnVuKCk7Ci0g ICAgaWYgKCFydW4uaGFzSHlwaGVuKQotICAgICAgICByZXR1cm47CisgICAgQVNTRVJUKHJ1bi5o YXNIeXBoZW4pOwogICAgIC8vIEVtcHR5IHJ1bnMgc2hvdWxkIG5vdCBoYXZlIGh5cGhlbi4KICAg ICBBU1NFUlQocnVuLnN0YXJ0IDwgcnVuLmVuZCk7CiAgICAgYXV0byYgc2VnbWVudCA9IG1faXRl cmF0b3IucmVzb2x2ZXIoKS5tX2Zsb3dDb250ZW50cy5zZWdtZW50Rm9yUnVuKHJ1bi5zdGFydCwg cnVuLmVuZCk7CiAgICAgYXV0byB0ZXh0ID0gU3RyaW5nVmlldyhzZWdtZW50LnRleHQpLnN1YnN0 cmluZyhzZWdtZW50LnRvU2VnbWVudFBvc2l0aW9uKHJ1bi5zdGFydCksIHJ1bi5lbmQgLSBydW4u c3RhcnQpOwotICAgIG1fdGV4dFdpdGhIeXBoZW4gPSBtYWtlU3RyaW5nKHRleHQsIG1faXRlcmF0 b3IucmVzb2x2ZXIoKS5mbG93KCkuc3R5bGUoKS5oeXBoZW5TdHJpbmcoKSk7CisgICAgcmV0dXJu IG1ha2VTdHJpbmcodGV4dCwgbV9pdGVyYXRvci5yZXNvbHZlcigpLmZsb3coKS5zdHlsZSgpLmh5 cGhlblN0cmluZygpKTsKIH0KIAogRmxvYXRSZWN0IFJ1blJlc29sdmVyOjpSdW46OnJlY3QoKSBj b25zdApAQCAtODIsOCArODAsNiBAQCBGbG9hdFJlY3QgUnVuUmVzb2x2ZXI6OlJ1bjo6cmVjdCgp IGNvbnN0CiAKIFN0cmluZ1ZpZXcgUnVuUmVzb2x2ZXI6OlJ1bjo6dGV4dCgpIGNvbnN0CiB7Ci0g ICAgaWYgKG1fdGV4dFdpdGhIeXBoZW4pCi0gICAgICAgIHJldHVybiBTdHJpbmdWaWV3KCptX3Rl eHRXaXRoSHlwaGVuKTsKICAgICBhdXRvJiBydW4gPSBtX2l0ZXJhdG9yLnNpbXBsZVJ1bigpOwog ICAgIEFTU0VSVChydW4uc3RhcnQgPCBydW4uZW5kKTsKICAgICBhdXRvJiBzZWdtZW50ID0gbV9p dGVyYXRvci5yZXNvbHZlcigpLm1fZmxvd0NvbnRlbnRzLnNlZ21lbnRGb3JSdW4ocnVuLnN0YXJ0 LCBydW4uZW5kKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVM aW5lTGF5b3V0UmVzb2x2ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9TaW1wbGVMaW5l TGF5b3V0UmVzb2x2ZXIuaAppbmRleCA4NGM3NjhiNTNlNmIxNTBhMmZlMmU5YzIxMzdlOWFkY2Y5 NmY3NzMxLi4zY2MzZmI5MzQ1ZmIwYzJiODJiZjVlMWE4MjQzZThhZjUwNTkyZjBkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvU2ltcGxlTGluZUxheW91dFJlc29sdmVyLmgK KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1NpbXBsZUxpbmVMYXlvdXRSZXNvbHZlci5o CkBAIC02NCw2ICs2NCw3IEBAIHB1YmxpYzoKICAgICAgICAgRXhwYW5zaW9uQmVoYXZpb3IgZXhw YW5zaW9uQmVoYXZpb3IoKSBjb25zdDsKICAgICAgICAgaW50IGJhc2VsaW5lUG9zaXRpb24oKSBj b25zdDsKICAgICAgICAgU3RyaW5nVmlldyB0ZXh0KCkgY29uc3Q7CisgICAgICAgIFN0cmluZyB0 ZXh0V2l0aEh5cGhlbigpIGNvbnN0OwogICAgICAgICBib29sIGlzRW5kT2ZMaW5lKCkgY29uc3Q7 CiAgICAgICAgIGJvb2wgaGFzSHlwaGVuKCkgY29uc3QgeyByZXR1cm4gbV9pdGVyYXRvci5zaW1w bGVSdW4oKS5oYXNIeXBoZW47IH0KIApAQCAtNzQsNyArNzUsNiBAQCBwdWJsaWM6CiAgICAgICAg IHZvaWQgY29uc3RydWN0U3RyaW5nRm9ySHlwaGVuSWZOZWVkZWQoKTsKIAogICAgICAgICBjb25z dCBJdGVyYXRvciYgbV9pdGVyYXRvcjsKLSAgICAgICAgc3RkOjpvcHRpb25hbDxTdHJpbmc+IG1f dGV4dFdpdGhIeXBoZW47CiAgICAgfTsKIAogICAgIGNsYXNzIEl0ZXJhdG9yIHsK