149193 2015-09-15 16:04:40 -0700 GraphicsContext::drawBidiText()'s BidiResolver should not have isolated runs 2015-09-15 17:13:20 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 149153 1 mmaxfield mmaxfield commit-queue esprehn+autocc glenn kondapallykalyan mitz oldest_to_newest 1126178 0 mmaxfield 2015-09-15 16:04:40 -0700 GraphicsContext::drawBidiText()'s BidiResolver should not have isolated runs 1126179 1 261255 mmaxfield 2015-09-15 16:09:42 -0700 Created attachment 261255 Patch 1126180 2 261255 andersca 2015-09-15 16:11:46 -0700 Comment on attachment 261255 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=261255&action=review > Source/WebCore/platform/text/BidiResolver.h:304 > +class BidiResolver: public BidiResolverBase<Iterator, Run, BidiResolver<Iterator, Run>> { Space before : > Source/WebCore/platform/text/BidiResolver.h:309 > +class BidiResolverWithIsolate: public BidiResolverBase<Iterator, Run, BidiResolverWithIsolate<Iterator, Run, IsolateRun>> { Space before : > Source/WebCore/rendering/InlineIterator.h:444 > +template <> No space! > Source/WebCore/rendering/InlineIterator.h:532 > template <> Shouldn't have a space here either. 1126181 3 mitz 2015-09-15 16:12:46 -0700 Aren’t isolated runs needed for supporting explicit directional isolates (LRI, RLI and FSI)? See <http://www.unicode.org/reports/tr9/#Explicit_Directional_Isolates>. 1126198 4 mmaxfield 2015-09-15 16:50:23 -0700 Mitz: Yep, but we don't honor those currently. I filed a bug about it recently: https://bugs.webkit.org/show_bug.cgi?id=149170 1126199 5 mmaxfield 2015-09-15 16:52:01 -0700 (In reply to comment #4) > Mitz: Yep, but we don't honor those currently. I filed a bug about it > recently: https://bugs.webkit.org/show_bug.cgi?id=149170 At least, I should say that our isolate infrastructure requires isolates to come from RenderElements. (Maybe we generate RenderElements for these codepoints and I've just not seen where we do that). See constructBidiRunsForSegment(). 1126204 6 mmaxfield 2015-09-15 17:06:12 -0700 Committed r189829: <http://trac.webkit.org/changeset/189829> 261255 2015-09-15 16:09:42 -0700 2015-09-15 16:11:46 -0700 Patch bug-149193-20150915160931.patch text/plain 14405 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTg5ODIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzRkNWQxZTQyNGVkZjU1 NmY5MTQwYTM3OWYxODk5N2U3YWI3Y2M3Zi4uNzdlMjFiM2I5NTI3MjQ0YzQ2Yzk5YWIzMGEwNjky NzM5NzJiYzAyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYxIEBACisyMDE1LTA5LTE1ICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgR3JhcGhpY3ND b250ZXh0OjpkcmF3QmlkaVRleHQoKSdzIEJpZGlSZXNvbHZlciBzaG91bGQgbm90IGhhdmUgaXNv bGF0ZWQgcnVucworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTQ5MTkzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGhlcmUgYXJlIHR3byB1c2VycyBvZiBCaWRpUmVzb2x2ZXIsIG9uZSB3aGljaCBuZWVkcyBp c29sYXRlZCBydW5zIChpbiBSZW5kZXJCbG9ja0xpbmVMYXlvdXQpIGFuZAorICAgICAgICBvbmUg d2hpY2ggZG9lc24ndCAoaW4gR3JhcGhpY3NDb250ZXh0OjpkcmF3QmlkaVRleHQoKSkuIEJlY2F1 c2Ugb2YgWzFdLCB0aGUgaXNvbGF0ZWQgcnVucyB2ZWN0b3IKKyAgICAgICAgaXMgbWlncmF0aW5n IHRvIGEgbmV3IHR5cGUgb3V0c2lkZSBvZiBwbGF0Zm9ybS8uIFRoZXJlZm9yZSwgb25seSB0aGUg Zmlyc3QgdXNlciBvZiBCaWRpUmVzb2x2ZXIKKyAgICAgICAgc2hvdWxkIGhhdmUgdGhpcyBtZW1i ZXIgdmFyaWFibGUuCisKKyAgICAgICAgVGhpcyBpcyBhY2hpZXZlZCBieSBjcmVhdGluZyB0d28g c3ViY2xhc3NlcyBvZiBCaWRpUmVzb2x2ZXIsIGFuZCB1c2luZyB0aGUgQ3VyaW91c2x5IFJlcGVh dGluZworICAgICAgICBUZW1wbGF0ZSBwYXR0ZXJuIHRvIGRvd25jYXN0IGludG8gc3BlY2lhbGl6 YXRpb25zLgorCisgICAgICAgIFsxXSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTQ5MTUzCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGJlY2F1c2UgdGhlcmUgaXMgbm8g YmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICogcGxhdGZvcm0vdGV4dC9CaWRpUmVzb2x2ZXIu aDoKKyAgICAgICAgKFdlYkNvcmU6OkJpZGlSZXNvbHZlckJhc2U6OkJpZGlSZXNvbHZlckJhc2Up OgorICAgICAgICAoV2ViQ29yZTo6QmlkaVJlc29sdmVyQmFzZTo6aW5jcmVtZW50KToKKyAgICAg ICAgKFdlYkNvcmU6OkJpZGlSZXNvbHZlckJhc2U6OmFwcGVuZFJ1bik6CisgICAgICAgIChXZWJD b3JlOjpCaWRpUmVzb2x2ZXJCYXNlOjppbmNyZW1lbnRJbnRlcm5hbCk6CisgICAgICAgIChXZWJD b3JlOjpJc29sYXRlUnVuPjo6fkJpZGlSZXNvbHZlcldpdGhJc29sYXRlKToKKyAgICAgICAgKFdl YkNvcmU6OlN1YmNsYXNzPjo6YXBwZW5kUnVuSW50ZXJuYWwpOgorICAgICAgICAoV2ViQ29yZTo6 U3ViY2xhc3M+OjplbWJlZCk6CisgICAgICAgIChXZWJDb3JlOjpTdWJjbGFzcz46OmNoZWNrRGly ZWN0aW9uSW5Mb3dlclJhaXNlRW1iZWRkaW5nTGV2ZWwpOgorICAgICAgICAoV2ViQ29yZTo6U3Vi Y2xhc3M+Ojpsb3dlckV4cGxpY2l0RW1iZWRkaW5nTGV2ZWwpOgorICAgICAgICAoV2ViQ29yZTo6 U3ViY2xhc3M+OjpyYWlzZUV4cGxpY2l0RW1iZWRkaW5nTGV2ZWwpOgorICAgICAgICAoV2ViQ29y ZTo6U3ViY2xhc3M+Ojpjb21taXRFeHBsaWNpdEVtYmVkZGluZyk6CisgICAgICAgIChXZWJDb3Jl OjpTdWJjbGFzcz46OnVwZGF0ZVN0YXR1c0xhc3RGcm9tQ3VycmVudERpcmVjdGlvbik6CisgICAg ICAgIChXZWJDb3JlOjpTdWJjbGFzcz46OnJlb3JkZXJSdW5zRnJvbUxldmVscyk6CisgICAgICAg IChXZWJDb3JlOjpTdWJjbGFzcz46OmNyZWF0ZUJpZGlSdW5zRm9yTGluZSk6CisgICAgICAgIChX ZWJDb3JlOjpTdWJjbGFzcz46OnNldE1pZHBvaW50Rm9ySXNvbGF0ZWRSdW4pOgorICAgICAgICAo V2ViQ29yZTo6U3ViY2xhc3M+OjptaWRwb2ludEZvcklzb2xhdGVkUnVuKToKKyAgICAgICAgKFdl YkNvcmU6OkJpZGlSZXNvbHZlcjo6QmlkaVJlc29sdmVyKTogRGVsZXRlZC4KKyAgICAgICAgKFdl YkNvcmU6OkJpZGlSZXNvbHZlcjo6aW5jcmVtZW50KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNv cmU6OkJpZGlSZXNvbHZlcjo6aXNvbGF0ZWRSdW5zKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNv cmU6OlJ1bj46On5CaWRpUmVzb2x2ZXIpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6UnVu Pjo6YXBwZW5kUnVuKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJ1bj46OmVtYmVkKTog RGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJ1bj46OmNoZWNrRGlyZWN0aW9uSW5Mb3dlclJh aXNlRW1iZWRkaW5nTGV2ZWwpOiBEZWxldGVkLgorICAgICAgICAoV2ViQ29yZTo6UnVuPjo6bG93 ZXJFeHBsaWNpdEVtYmVkZGluZ0xldmVsKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJ1 bj46OnJhaXNlRXhwbGljaXRFbWJlZGRpbmdMZXZlbCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJD b3JlOjpSdW4+Ojpjb21taXRFeHBsaWNpdEVtYmVkZGluZyk6IERlbGV0ZWQuCisgICAgICAgIChX ZWJDb3JlOjpSdW4+Ojp1cGRhdGVTdGF0dXNMYXN0RnJvbUN1cnJlbnREaXJlY3Rpb24pOiBEZWxl dGVkLgorICAgICAgICAoV2ViQ29yZTo6UnVuPjo6cmVvcmRlclJ1bnNGcm9tTGV2ZWxzKTogRGVs ZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJ1bj46OmNyZWF0ZUJpZGlSdW5zRm9yTGluZSk6IERl bGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpSdW4+OjpzZXRNaWRwb2ludEZvcklzb2xhdGVkUnVu KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OlJ1bj46Om1pZHBvaW50Rm9ySXNvbGF0ZWRS dW4pOiBEZWxldGVkLgorICAgICAgICAqIHJlbmRlcmluZy9JbmxpbmVJdGVyYXRvci5oOgorICAg ICAgICAoV2ViQ29yZTo6SW5saW5lQmlkaVJlc29sdmVyOjppbmNyZW1lbnRJbnRlcm5hbCk6Cisg ICAgICAgIChXZWJDb3JlOjpJbmxpbmVCaWRpUmVzb2x2ZXI6OmFwcGVuZFJ1bkludGVybmFsKToK KyAgICAgICAgKFdlYkNvcmU6OklubGluZUJpZGlSZXNvbHZlcjo6aW5jcmVtZW50KTogRGVsZXRl ZC4KKyAgICAgICAgKFdlYkNvcmU6OklubGluZUJpZGlSZXNvbHZlcjo6YXBwZW5kUnVuKTogRGVs ZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvbGluZS9UcmFpbGluZ09iamVjdHMuaDoKKwogMjAx NS0wOS0xNCAgRGF2aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgW05ldyBC bG9jay1JbnNpZGUtSW5saW5lIE1vZGVsXSBJbXBsZW1lbnQgbWFyZ2luIGNvbGxhcHNpbmcgYWNy b3NzIGNvbnRpZ3VvdXMgYW5vbnltb3VzIGlubGluZSBibG9ja3MuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0JpZGlSZXNvbHZlci5oIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vdGV4dC9CaWRpUmVzb2x2ZXIuaAppbmRleCAzNzM1MjkwNzcwZjQ2YTEyZmJhNjE2 ZmMyMDY5NzYxNGVlOTJmY2Y4Li5lMTBhZmJjMzNlNDBlZjdkMDRlZTIyMzBmODZjYTQyZDA2ZmUz NjMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0JpZGlSZXNvbHZl ci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvQmlkaVJlc29sdmVyLmgKQEAg LTIwMywxMCArMjAzLDEwIEBAIGVudW0gVmlzdWFsRGlyZWN0aW9uT3ZlcnJpZGUgewogCiAvLyBC aWRpUmVzb2x2ZXIgaXMgV2ViS2l0J3MgaW1wbGVtZW50YXRpb24gb2YgdGhlIFVuaWNvZGUgQmlk aSBBbGdvcml0aG0KIC8vIGh0dHA6Ly91bmljb2RlLm9yZy9yZXBvcnRzL3RyOQotdGVtcGxhdGUg PGNsYXNzIEl0ZXJhdG9yLCBjbGFzcyBSdW4+IGNsYXNzIEJpZGlSZXNvbHZlciB7Ci0gICAgV1RG X01BS0VfTk9OQ09QWUFCTEUoQmlkaVJlc29sdmVyKTsKK3RlbXBsYXRlIDxjbGFzcyBJdGVyYXRv ciwgY2xhc3MgUnVuLCBjbGFzcyBTdWJjbGFzcz4gY2xhc3MgQmlkaVJlc29sdmVyQmFzZSB7Cisg ICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoQmlkaVJlc29sdmVyQmFzZSk7CiBwdWJsaWM6Ci0gICAg QmlkaVJlc29sdmVyKCkKKyAgICBCaWRpUmVzb2x2ZXJCYXNlKCkKICAgICAgICAgOiBtX2RpcmVj dGlvbihVX09USEVSX05FVVRSQUwpCiAgICAgICAgICwgbV9yZWFjaGVkRW5kT2ZMaW5lKGZhbHNl KQogICAgICAgICAsIG1fZW1wdHlSdW4odHJ1ZSkKQEAgLTIxNCwxMCArMjE0LDYgQEAgcHVibGlj OgogICAgIHsKICAgICB9CiAKLSNpZm5kZWYgTkRFQlVHCi0gICAgfkJpZGlSZXNvbHZlcigpOwot I2VuZGlmCi0KICAgICBjb25zdCBJdGVyYXRvciYgcG9zaXRpb24oKSBjb25zdCB7IHJldHVybiBt X2N1cnJlbnQ7IH0KICAgICB2b2lkIHNldFBvc2l0aW9uSWdub3JpbmdOZXN0ZWRJc29sYXRlcyhj b25zdCBJdGVyYXRvciYgcG9zaXRpb24pIHsgbV9jdXJyZW50ID0gcG9zaXRpb247IH0KICAgICB2 b2lkIHNldFBvc2l0aW9uKGNvbnN0IEl0ZXJhdG9yJiBwb3NpdGlvbiwgdW5zaWduZWQgbmVzdGVk SXNvbGF0ZWRDb3VudCkKQEAgLTIyNiw3ICsyMjIsNyBAQCBwdWJsaWM6CiAgICAgICAgIG1fbmVz dGVkSXNvbGF0ZUNvdW50ID0gbmVzdGVkSXNvbGF0ZWRDb3VudDsKICAgICB9CiAKLSAgICB2b2lk IGluY3JlbWVudCgpIHsgbV9jdXJyZW50LmluY3JlbWVudCgpOyB9CisgICAgdm9pZCBpbmNyZW1l bnQoKSB7IHN0YXRpY19jYXN0PFN1YmNsYXNzKj4odGhpcyktPmluY3JlbWVudEludGVybmFsKCk7 IH0KIAogICAgIEJpZGlDb250ZXh0KiBjb250ZXh0KCkgY29uc3QgeyByZXR1cm4gbV9zdGF0dXMu Y29udGV4dC5nZXQoKTsgfQogICAgIHZvaWQgc2V0Q29udGV4dChQYXNzUmVmUHRyPEJpZGlDb250 ZXh0PiBjKSB7IG1fc3RhdHVzLmNvbnRleHQgPSBjOyB9CkBAIC0yNjEsMTQgKzI1NywxMyBAQCBw dWJsaWM6CiAgICAgLy8gSXQncyB1bmNsZWFyIGlmIHRoaXMgaXMgc3RpbGwgbmVlZGVkLgogICAg IHZvaWQgbWFya0N1cnJlbnRSdW5FbXB0eSgpIHsgbV9lbXB0eVJ1biA9IHRydWU7IH0KIAotICAg IFZlY3RvcjxSdW4qPiYgaXNvbGF0ZWRSdW5zKCkgeyByZXR1cm4gbV9pc29sYXRlZFJ1bnM7IH0K ICAgICB2b2lkIHNldE1pZHBvaW50Rm9ySXNvbGF0ZWRSdW4oUnVuKiwgdW5zaWduZWQpOwogICAg IHVuc2lnbmVkIG1pZHBvaW50Rm9ySXNvbGF0ZWRSdW4oUnVuKik7CiAKIHByb3RlY3RlZDoKICAg ICAvLyBGSVhNRTogSW5zdGVhZCBvZiBJbmxpbmVCaWRpUmVzb2x2ZXJzIHN1YmNsYXNzaW5nIHRo aXMgbWV0aG9kLCB3ZSBzaG91bGQKICAgICAvLyBwYXNzIGluIHNvbWUgc29ydCBvZiBUcmFpdHMg b2JqZWN0IHdoaWNoIGtub3dzIGhvdyB0byBjcmVhdGUgcnVucyBmb3IgYXBwZW5kaW5nLgotICAg IHZvaWQgYXBwZW5kUnVuKCk7CisgICAgdm9pZCBhcHBlbmRSdW4oKSB7IHN0YXRpY19jYXN0PFN1 YmNsYXNzKj4odGhpcyktPmFwcGVuZFJ1bkludGVybmFsKCk7IH0KIAogICAgIEl0ZXJhdG9yIG1f Y3VycmVudDsKICAgICAvLyBzb3IgYW5kIGVvciBhcmUgInN0YXJ0IG9mIHJ1biIgYW5kICJlbmQg b2YgcnVuIiByZXNwZWN0aXZlbHkgYW5kIGNvcnJlcG9uZApAQCAtMjkwLDcgKzI4NSw2IEBAIHBy b3RlY3RlZDoKICAgICBNaWRwb2ludFN0YXRlPEl0ZXJhdG9yPiBtX21pZHBvaW50U3RhdGU7CiAK ICAgICB1bnNpZ25lZCBtX25lc3RlZElzb2xhdGVDb3VudDsKLSAgICBWZWN0b3I8UnVuKj4gbV9p c29sYXRlZFJ1bnM7CiAgICAgSGFzaE1hcDxSdW4qLCB1bnNpZ25lZD4gbV9taWRwb2ludEZvcklz b2xhdGVkUnVuOwogCiBwcml2YXRlOgpAQCAtMzAwLDIxICsyOTQsNDMgQEAgcHJpdmF0ZToKIAog ICAgIHZvaWQgdXBkYXRlU3RhdHVzTGFzdEZyb21DdXJyZW50RGlyZWN0aW9uKFVDaGFyRGlyZWN0 aW9uKTsKICAgICB2b2lkIHJlb3JkZXJSdW5zRnJvbUxldmVscygpOworICAgIHZvaWQgaW5jcmVt ZW50SW50ZXJuYWwoKSB7IG1fY3VycmVudC5pbmNyZW1lbnQoKTsgfQorICAgIHZvaWQgYXBwZW5k UnVuSW50ZXJuYWwoKTsKIAogICAgIFZlY3RvcjxCaWRpRW1iZWRkaW5nLCA4PiBtX2N1cnJlbnRF eHBsaWNpdEVtYmVkZGluZ1NlcXVlbmNlOwogfTsKIAotI2lmbmRlZiBOREVCVUcKIHRlbXBsYXRl IDxjbGFzcyBJdGVyYXRvciwgY2xhc3MgUnVuPgotQmlkaVJlc29sdmVyPEl0ZXJhdG9yLCBSdW4+ Ojp+QmlkaVJlc29sdmVyKCkKK2NsYXNzIEJpZGlSZXNvbHZlcjogcHVibGljIEJpZGlSZXNvbHZl ckJhc2U8SXRlcmF0b3IsIFJ1biwgQmlkaVJlc29sdmVyPEl0ZXJhdG9yLCBSdW4+PiB7CitwdWJs aWM6Cit9OworCit0ZW1wbGF0ZSA8Y2xhc3MgSXRlcmF0b3IsIGNsYXNzIFJ1biwgY2xhc3MgSXNv bGF0ZVJ1bj4KK2NsYXNzIEJpZGlSZXNvbHZlcldpdGhJc29sYXRlOiBwdWJsaWMgQmlkaVJlc29s dmVyQmFzZTxJdGVyYXRvciwgUnVuLCBCaWRpUmVzb2x2ZXJXaXRoSXNvbGF0ZTxJdGVyYXRvciwg UnVuLCBJc29sYXRlUnVuPj4geworcHVibGljOgorI2lmbmRlZiBOREVCVUcKKyAgICB+QmlkaVJl c29sdmVyV2l0aElzb2xhdGUoKTsKKyNlbmRpZgorCisgICAgdm9pZCBpbmNyZW1lbnRJbnRlcm5h bCgpOworICAgIHZvaWQgYXBwZW5kUnVuSW50ZXJuYWwoKTsKKyAgICBWZWN0b3I8UnVuKj4mIGlz b2xhdGVkUnVucygpIHsgcmV0dXJuIG1faXNvbGF0ZWRSdW5zOyB9CisKK3ByaXZhdGU6CisgICAg VmVjdG9yPFJ1bio+IG1faXNvbGF0ZWRSdW5zOworfTsKKworI2lmbmRlZiBOREVCVUcKK3RlbXBs YXRlIDxjbGFzcyBJdGVyYXRvciwgY2xhc3MgUnVuLCBjbGFzcyBJc29sYXRlUnVuPgorQmlkaVJl c29sdmVyV2l0aElzb2xhdGU8SXRlcmF0b3IsIFJ1biwgSXNvbGF0ZVJ1bj46On5CaWRpUmVzb2x2 ZXJXaXRoSXNvbGF0ZSgpCiB7CiAgICAgLy8gVGhlIG93bmVyIG9mIHRoaXMgcmVzb2x2ZXIgc2hv dWxkIGhhdmUgaGFuZGxlZCB0aGUgaXNvbGF0ZWQgcnVucy4KICAgICBBU1NFUlQobV9pc29sYXRl ZFJ1bnMuaXNFbXB0eSgpKTsKIH0KICNlbmRpZgogCi10ZW1wbGF0ZSA8Y2xhc3MgSXRlcmF0b3Is IGNsYXNzIFJ1bj4KLXZvaWQgQmlkaVJlc29sdmVyPEl0ZXJhdG9yLCBSdW4+OjphcHBlbmRSdW4o KQordGVtcGxhdGUgPGNsYXNzIEl0ZXJhdG9yLCBjbGFzcyBSdW4sIGNsYXNzIFN1YmNsYXNzPgor dm9pZCBCaWRpUmVzb2x2ZXJCYXNlPEl0ZXJhdG9yLCBSdW4sIFN1YmNsYXNzPjo6YXBwZW5kUnVu SW50ZXJuYWwoKQogewogICAgIGlmICghbV9lbXB0eVJ1biAmJiAhbV9lb3IuYXRFbmQoKSkgewog ICAgICAgICB1bnNpZ25lZCBzdGFydE9mZnNldCA9IG1fc29yLm9mZnNldCgpOwpAQCAtMzM2LDgg KzM1Miw4IEBAIHZvaWQgQmlkaVJlc29sdmVyPEl0ZXJhdG9yLCBSdW4+OjphcHBlbmRSdW4oKQog ICAgIG1fc3RhdHVzLmVvciA9IFVfT1RIRVJfTkVVVFJBTDsKIH0KIAotdGVtcGxhdGUgPGNsYXNz IEl0ZXJhdG9yLCBjbGFzcyBSdW4+Ci12b2lkIEJpZGlSZXNvbHZlcjxJdGVyYXRvciwgUnVuPjo6 ZW1iZWQoVUNoYXJEaXJlY3Rpb24gZGlyLCBCaWRpRW1iZWRkaW5nU291cmNlIHNvdXJjZSkKK3Rl bXBsYXRlIDxjbGFzcyBJdGVyYXRvciwgY2xhc3MgUnVuLCBjbGFzcyBTdWJjbGFzcz4KK3ZvaWQg QmlkaVJlc29sdmVyQmFzZTxJdGVyYXRvciwgUnVuLCBTdWJjbGFzcz46OmVtYmVkKFVDaGFyRGly ZWN0aW9uIGRpciwgQmlkaUVtYmVkZGluZ1NvdXJjZSBzb3VyY2UpCiB7CiAgICAgLy8gSXNvbGF0 ZWQgc3BhbnMgY29tcHV0ZSBiYXNlIGRpcmVjdGlvbmFsaXR5IGR1cmluZyB0aGVpciBvd24gVUJB IHJ1bi4KICAgICAvLyBEbyBub3QgaW5zZXJ0IGZha2UgZW1iZWQgY2hhcmFjdGVycyBvbmNlIHdl IGVudGVyIGFuIGlzb2xhdGVkIHNwYW4uCkBAIC0zNDcsOCArMzYzLDggQEAgdm9pZCBCaWRpUmVz b2x2ZXI8SXRlcmF0b3IsIFJ1bj46OmVtYmVkKFVDaGFyRGlyZWN0aW9uIGRpciwgQmlkaUVtYmVk ZGluZ1NvdXJjZQogICAgIG1fY3VycmVudEV4cGxpY2l0RW1iZWRkaW5nU2VxdWVuY2UuYXBwZW5k KEJpZGlFbWJlZGRpbmcoZGlyLCBzb3VyY2UpKTsKIH0KIAotdGVtcGxhdGUgPGNsYXNzIEl0ZXJh dG9yLCBjbGFzcyBSdW4+Ci12b2lkIEJpZGlSZXNvbHZlcjxJdGVyYXRvciwgUnVuPjo6Y2hlY2tE aXJlY3Rpb25Jbkxvd2VyUmFpc2VFbWJlZGRpbmdMZXZlbCgpCit0ZW1wbGF0ZSA8Y2xhc3MgSXRl cmF0b3IsIGNsYXNzIFJ1biwgY2xhc3MgU3ViY2xhc3M+Cit2b2lkIEJpZGlSZXNvbHZlckJhc2U8 SXRlcmF0b3IsIFJ1biwgU3ViY2xhc3M+OjpjaGVja0RpcmVjdGlvbkluTG93ZXJSYWlzZUVtYmVk ZGluZ0xldmVsKCkKIHsKICAgICBBU1NFUlQobV9zdGF0dXMuZW9yICE9IFVfT1RIRVJfTkVVVFJB TCB8fCBtX2Vvci5hdEVuZCgpKTsKICAgICBBU1NFUlQobV9zdGF0dXMubGFzdCAhPSBVX0RJUl9O T05fU1BBQ0lOR19NQVJLCkBAIC0zNjIsOCArMzc4LDggQEAgdm9pZCBCaWRpUmVzb2x2ZXI8SXRl cmF0b3IsIFJ1bj46OmNoZWNrRGlyZWN0aW9uSW5Mb3dlclJhaXNlRW1iZWRkaW5nTGV2ZWwoKQog ICAgICAgICBtX2RpcmVjdGlvbiA9IG1fc3RhdHVzLmxhc3RTdHJvbmcgPT0gVV9MRUZUX1RPX1JJ R0hUID8gVV9MRUZUX1RPX1JJR0hUIDogVV9SSUdIVF9UT19MRUZUOwogfQogCi10ZW1wbGF0ZSA8 Y2xhc3MgSXRlcmF0b3IsIGNsYXNzIFJ1bj4KLXZvaWQgQmlkaVJlc29sdmVyPEl0ZXJhdG9yLCBS dW4+Ojpsb3dlckV4cGxpY2l0RW1iZWRkaW5nTGV2ZWwoVUNoYXJEaXJlY3Rpb24gZnJvbSkKK3Rl bXBsYXRlIDxjbGFzcyBJdGVyYXRvciwgY2xhc3MgUnVuLCBjbGFzcyBTdWJjbGFzcz4KK3ZvaWQg QmlkaVJlc29sdmVyQmFzZTxJdGVyYXRvciwgUnVuLCBTdWJjbGFzcz46Omxvd2VyRXhwbGljaXRF bWJlZGRpbmdMZXZlbChVQ2hhckRpcmVjdGlvbiBmcm9tKQogewogICAgIGlmICghbV9lbXB0eVJ1 biAmJiBtX2VvciAhPSBtX2xhc3QpIHsKICAgICAgICAgY2hlY2tEaXJlY3Rpb25Jbkxvd2VyUmFp c2VFbWJlZGRpbmdMZXZlbCgpOwpAQCAtMzk4LDggKzQxNCw4IEBAIHZvaWQgQmlkaVJlc29sdmVy PEl0ZXJhdG9yLCBSdW4+Ojpsb3dlckV4cGxpY2l0RW1iZWRkaW5nTGV2ZWwoVUNoYXJEaXJlY3Rp b24gZnJvCiAgICAgbV9lb3IgPSBJdGVyYXRvcigpOwogfQogCi10ZW1wbGF0ZSA8Y2xhc3MgSXRl cmF0b3IsIGNsYXNzIFJ1bj4KLXZvaWQgQmlkaVJlc29sdmVyPEl0ZXJhdG9yLCBSdW4+OjpyYWlz ZUV4cGxpY2l0RW1iZWRkaW5nTGV2ZWwoVUNoYXJEaXJlY3Rpb24gZnJvbSwgVUNoYXJEaXJlY3Rp b24gdG8pCit0ZW1wbGF0ZSA8Y2xhc3MgSXRlcmF0b3IsIGNsYXNzIFJ1biwgY2xhc3MgU3ViY2xh c3M+Cit2b2lkIEJpZGlSZXNvbHZlckJhc2U8SXRlcmF0b3IsIFJ1biwgU3ViY2xhc3M+OjpyYWlz ZUV4cGxpY2l0RW1iZWRkaW5nTGV2ZWwoVUNoYXJEaXJlY3Rpb24gZnJvbSwgVUNoYXJEaXJlY3Rp b24gdG8pCiB7CiAgICAgaWYgKCFtX2VtcHR5UnVuICYmIG1fZW9yICE9IG1fbGFzdCkgewogICAg ICAgICBjaGVja0RpcmVjdGlvbkluTG93ZXJSYWlzZUVtYmVkZGluZ0xldmVsKCk7CkBAIC00MzUs OCArNDUxLDggQEAgdm9pZCBCaWRpUmVzb2x2ZXI8SXRlcmF0b3IsIFJ1bj46OnJhaXNlRXhwbGlj aXRFbWJlZGRpbmdMZXZlbChVQ2hhckRpcmVjdGlvbiBmcm8KICAgICBtX2VvciA9IEl0ZXJhdG9y KCk7CiB9CiAKLXRlbXBsYXRlIDxjbGFzcyBJdGVyYXRvciwgY2xhc3MgUnVuPgotYm9vbCBCaWRp UmVzb2x2ZXI8SXRlcmF0b3IsIFJ1bj46OmNvbW1pdEV4cGxpY2l0RW1iZWRkaW5nKCkKK3RlbXBs YXRlIDxjbGFzcyBJdGVyYXRvciwgY2xhc3MgUnVuLCBjbGFzcyBTdWJjbGFzcz4KK2Jvb2wgQmlk aVJlc29sdmVyQmFzZTxJdGVyYXRvciwgUnVuLCBTdWJjbGFzcz46OmNvbW1pdEV4cGxpY2l0RW1i ZWRkaW5nKCkKIHsKICAgICAvLyBXaGVuIHdlJ3JlICJpbklzb2xhdGUoKSIgd2UncmUgcmVzb2x2 aW5nIHRoZSBwYXJlbnQgY29udGV4dCB3aGljaAogICAgIC8vIGlnbm9yZXMgKHNraXBzIG92ZXIp IHRoZSBpc29sYXRlZCBjb250ZW50LCBpbmNsdWRpbmcgZW1iZWRkaW5nIGxldmVscy4KQEAgLTQ3 OCw4ICs0OTQsOCBAQCBib29sIEJpZGlSZXNvbHZlcjxJdGVyYXRvciwgUnVuPjo6Y29tbWl0RXhw bGljaXRFbWJlZGRpbmcoKQogICAgIHJldHVybiBmcm9tTGV2ZWwgIT0gdG9MZXZlbDsKIH0KIAot dGVtcGxhdGUgPGNsYXNzIEl0ZXJhdG9yLCBjbGFzcyBSdW4+Ci1pbmxpbmUgdm9pZCBCaWRpUmVz b2x2ZXI8SXRlcmF0b3IsIFJ1bj46OnVwZGF0ZVN0YXR1c0xhc3RGcm9tQ3VycmVudERpcmVjdGlv bihVQ2hhckRpcmVjdGlvbiBkaXJDdXJyZW50KQordGVtcGxhdGUgPGNsYXNzIEl0ZXJhdG9yLCBj bGFzcyBSdW4sIGNsYXNzIFN1YmNsYXNzPgoraW5saW5lIHZvaWQgQmlkaVJlc29sdmVyQmFzZTxJ dGVyYXRvciwgUnVuLCBTdWJjbGFzcz46OnVwZGF0ZVN0YXR1c0xhc3RGcm9tQ3VycmVudERpcmVj dGlvbihVQ2hhckRpcmVjdGlvbiBkaXJDdXJyZW50KQogewogICAgIHN3aXRjaCAoZGlyQ3VycmVu dCkgewogICAgIGNhc2UgVV9FVVJPUEVBTl9OVU1CRVJfVEVSTUlOQVRPUjoKQEAgLTUxOSw4ICs1 MzUsOCBAQCBpbmxpbmUgdm9pZCBCaWRpUmVzb2x2ZXI8SXRlcmF0b3IsIFJ1bj46OnVwZGF0ZVN0 YXR1c0xhc3RGcm9tQ3VycmVudERpcmVjdGlvbihVQwogICAgIH0KIH0KIAotdGVtcGxhdGUgPGNs YXNzIEl0ZXJhdG9yLCBjbGFzcyBSdW4+Ci1pbmxpbmUgdm9pZCBCaWRpUmVzb2x2ZXI8SXRlcmF0 b3IsIFJ1bj46OnJlb3JkZXJSdW5zRnJvbUxldmVscygpCit0ZW1wbGF0ZSA8Y2xhc3MgSXRlcmF0 b3IsIGNsYXNzIFJ1biwgY2xhc3MgU3ViY2xhc3M+CitpbmxpbmUgdm9pZCBCaWRpUmVzb2x2ZXJC YXNlPEl0ZXJhdG9yLCBSdW4sIFN1YmNsYXNzPjo6cmVvcmRlclJ1bnNGcm9tTGV2ZWxzKCkKIHsK ICAgICB1bnNpZ25lZCBjaGFyIGxldmVsTG93ID0gMTI4OwogICAgIHVuc2lnbmVkIGNoYXIgbGV2 ZWxIaWdoID0gMDsKQEAgLTU1Niw4ICs1NzIsOCBAQCBpbmxpbmUgdm9pZCBCaWRpUmVzb2x2ZXI8 SXRlcmF0b3IsIFJ1bj46OnJlb3JkZXJSdW5zRnJvbUxldmVscygpCiAgICAgfQogfQogCi10ZW1w bGF0ZSA8Y2xhc3MgSXRlcmF0b3IsIGNsYXNzIFJ1bj4KLXZvaWQgQmlkaVJlc29sdmVyPEl0ZXJh dG9yLCBSdW4+OjpjcmVhdGVCaWRpUnVuc0ZvckxpbmUoY29uc3QgSXRlcmF0b3ImIGVuZCwgVmlz dWFsRGlyZWN0aW9uT3ZlcnJpZGUgb3ZlcnJpZGUsIGJvb2wgaGFyZExpbmVCcmVhaykKK3RlbXBs YXRlIDxjbGFzcyBJdGVyYXRvciwgY2xhc3MgUnVuLCBjbGFzcyBTdWJjbGFzcz4KK3ZvaWQgQmlk aVJlc29sdmVyQmFzZTxJdGVyYXRvciwgUnVuLCBTdWJjbGFzcz46OmNyZWF0ZUJpZGlSdW5zRm9y TGluZShjb25zdCBJdGVyYXRvciYgZW5kLCBWaXN1YWxEaXJlY3Rpb25PdmVycmlkZSBvdmVycmlk ZSwgYm9vbCBoYXJkTGluZUJyZWFrKQogewogICAgIEFTU0VSVChtX2RpcmVjdGlvbiA9PSBVX09U SEVSX05FVVRSQUwpOwogCkBAIC01ODMsNyArNTk5LDcgQEAgdm9pZCBCaWRpUmVzb2x2ZXI8SXRl cmF0b3IsIFJ1bj46OmNyZWF0ZUJpZGlSdW5zRm9yTGluZShjb25zdCBJdGVyYXRvciYgZW5kLCBW aXMKIAogICAgIG1fbGFzdCA9IG1fY3VycmVudDsKICAgICBib29sIHBhc3RFbmQgPSBmYWxzZTsK LSAgICBCaWRpUmVzb2x2ZXI8SXRlcmF0b3IsIFJ1bj4gc3RhdGVBdEVuZDsKKyAgICBCaWRpUmVz b2x2ZXJCYXNlPEl0ZXJhdG9yLCBSdW4sIFN1YmNsYXNzPiBzdGF0ZUF0RW5kOwogCiAgICAgd2hp bGUgKHRydWUpIHsKICAgICAgICAgVUNoYXJEaXJlY3Rpb24gZGlyQ3VycmVudDsKQEAgLTk1Niwx NSArOTcyLDE1IEBAIHZvaWQgQmlkaVJlc29sdmVyPEl0ZXJhdG9yLCBSdW4+OjpjcmVhdGVCaWRp UnVuc0ZvckxpbmUoY29uc3QgSXRlcmF0b3ImIGVuZCwgVmlzCiAgICAgZW5kT2ZMaW5lID0gSXRl cmF0b3IoKTsKIH0KIAotdGVtcGxhdGUgPGNsYXNzIEl0ZXJhdG9yLCBjbGFzcyBSdW4+Ci12b2lk IEJpZGlSZXNvbHZlcjxJdGVyYXRvciwgUnVuPjo6c2V0TWlkcG9pbnRGb3JJc29sYXRlZFJ1bihS dW4qIHJ1biwgdW5zaWduZWQgbWlkcG9pbnQpCit0ZW1wbGF0ZSA8Y2xhc3MgSXRlcmF0b3IsIGNs YXNzIFJ1biwgY2xhc3MgU3ViY2xhc3M+Cit2b2lkIEJpZGlSZXNvbHZlckJhc2U8SXRlcmF0b3Is IFJ1biwgU3ViY2xhc3M+OjpzZXRNaWRwb2ludEZvcklzb2xhdGVkUnVuKFJ1biogcnVuLCB1bnNp Z25lZCBtaWRwb2ludCkKIHsKICAgICBBU1NFUlQoIW1fbWlkcG9pbnRGb3JJc29sYXRlZFJ1bi5j b250YWlucyhydW4pKTsKICAgICBtX21pZHBvaW50Rm9ySXNvbGF0ZWRSdW4uYWRkKHJ1biwgbWlk cG9pbnQpOwogfQogCi10ZW1wbGF0ZTxjbGFzcyBJdGVyYXRvciwgY2xhc3MgUnVuPgotdW5zaWdu ZWQgQmlkaVJlc29sdmVyPEl0ZXJhdG9yLCBSdW4+OjptaWRwb2ludEZvcklzb2xhdGVkUnVuKFJ1 biogcnVuKQordGVtcGxhdGU8Y2xhc3MgSXRlcmF0b3IsIGNsYXNzIFJ1biwgY2xhc3MgU3ViY2xh c3M+Cit1bnNpZ25lZCBCaWRpUmVzb2x2ZXJCYXNlPEl0ZXJhdG9yLCBSdW4sIFN1YmNsYXNzPjo6 bWlkcG9pbnRGb3JJc29sYXRlZFJ1bihSdW4qIHJ1bikKIHsKICAgICByZXR1cm4gbV9taWRwb2lu dEZvcklzb2xhdGVkUnVuLnRha2UocnVuKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9JbmxpbmVJdGVyYXRvci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lu bGluZUl0ZXJhdG9yLmgKaW5kZXggYjQ3NGIzZTBkMDRmODY0Y2YwYjNjNDBkZGFmZTIxMTBlN2Ew ODk0Ni4uMjVjMDJiMzRiMzVjZmVmZThiYmExYjhmYWM3OGY5NWZiNGExZTRiNyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUl0ZXJhdG9yLmgKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL0lubGluZUl0ZXJhdG9yLmgKQEAgLTQ0MSw4ICs0NDEsOCBAQCBB TFdBWVNfSU5MSU5FIFVDaGFyRGlyZWN0aW9uIElubGluZUl0ZXJhdG9yOjpkaXJlY3Rpb24oKSBj b25zdAogICAgIHJldHVybiBVX09USEVSX05FVVRSQUw7CiB9CiAKLXRlbXBsYXRlPD4KLWlubGlu ZSB2b2lkIElubGluZUJpZGlSZXNvbHZlcjo6aW5jcmVtZW50KCkKK3RlbXBsYXRlIDw+Citpbmxp bmUgdm9pZCBJbmxpbmVCaWRpUmVzb2x2ZXI6OmluY3JlbWVudEludGVybmFsKCkKIHsKICAgICBt X2N1cnJlbnQuaW5jcmVtZW50KHRoaXMpOwogfQpAQCAtNTMwLDcgKzUzMCw3IEBAIHByaXZhdGU6 CiB9OwogCiB0ZW1wbGF0ZSA8PgotaW5saW5lIHZvaWQgSW5saW5lQmlkaVJlc29sdmVyOjphcHBl bmRSdW4oKQoraW5saW5lIHZvaWQgSW5saW5lQmlkaVJlc29sdmVyOjphcHBlbmRSdW5JbnRlcm5h bCgpCiB7CiAgICAgaWYgKCFtX2VtcHR5UnVuICYmICFtX2Vvci5hdEVuZCgpICYmICFtX3JlYWNo ZWRFbmRPZkxpbmUpIHsKICAgICAgICAgLy8gS2VlcCB0cmFjayBvZiB3aGVuIHdlIGVudGVyL2xl YXZlICJ1bmljb2RlLWJpZGk6IGlzb2xhdGUiIGlubGluZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvbGluZS9UcmFpbGluZ09iamVjdHMuaCBiL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9saW5lL1RyYWlsaW5nT2JqZWN0cy5oCmluZGV4IDVhZWRlYTYwZTJjMTRlZGU4 MmE5MWZjZGViZjU4OTE5YTZhZDI5NjIuLjVlZTE4ODFhOTlkNjNmOGE2ZGUzYWM0YWM0MTNmODBm MGUxYzQyZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9saW5lL1RyYWls aW5nT2JqZWN0cy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9saW5lL1RyYWlsaW5n T2JqZWN0cy5oCkBAIC0zNiw4ICszNiw5IEBAIGNsYXNzIFJlbmRlclRleHQ7CiBzdHJ1Y3QgQmlk aVJ1bjsKIAogdGVtcGxhdGUgPGNsYXNzIEl0ZXJhdG9yLCBjbGFzcyBSdW4+IGNsYXNzIEJpZGlS ZXNvbHZlcjsKK3RlbXBsYXRlIDxjbGFzcyBJdGVyYXRvciwgY2xhc3MgUnVuLCBjbGFzcyBJc29s YXRlUnVuPiBjbGFzcyBCaWRpUmVzb2x2ZXJXaXRoSXNvbGF0ZTsKIHRlbXBsYXRlIDxjbGFzcyBJ dGVyYXRvcj4gY2xhc3MgTWlkcG9pbnRTdGF0ZTsKLXR5cGVkZWYgQmlkaVJlc29sdmVyPElubGlu ZUl0ZXJhdG9yLCBCaWRpUnVuPiBJbmxpbmVCaWRpUmVzb2x2ZXI7Cit0eXBlZGVmIEJpZGlSZXNv bHZlcldpdGhJc29sYXRlPElubGluZUl0ZXJhdG9yLCBCaWRpUnVuLCBCaWRpUnVuPiBJbmxpbmVC aWRpUmVzb2x2ZXI7CiB0eXBlZGVmIE1pZHBvaW50U3RhdGU8SW5saW5lSXRlcmF0b3I+IExpbmVN aWRwb2ludFN0YXRlOwogCiBjbGFzcyBUcmFpbGluZ09iamVjdHMgewo=