6014 2005-12-08 13:43:03 -0800 Bidi algorithm: incorrect resolved levels for neutrals between R and ET ON L 2005-12-18 08:18:17 -0800 1 1 1 Unclassified WebKit Layout and Rendering 420+ Mac OS X 10.4 VERIFIED FIXED P2 Normal --- 1 mitz hyatt oldest_to_newest 25727 0 mitz 2005-12-08 13:43:03 -0800 When the embedding direction is LTR, the sequence R neutrals ET neutrals L should resolve to R L L L L but in TOT it resolves to R R L L L. This is the first example In the attached testcase: R WS ON WS ON WS ET ET WS L resolves to R R R R R R L L L L. Firefox handles it correctly. This happens due to the special way ETs are treated just in case they end up prefixing an EN. The idea in the patch for bug 3733 was to use bidi.eor to mark the last position before the first ET (need to know this position when deciding what goes with the EN), but for the other cases it introduced an eor in the middle of the neutrals, guessing that the neutrals will need to end up as R (setting bidi.status.eor to R). This guess turns out to be wrong in the first example in the testcase. While it might be possible to fix this by not guessing at all (setting bidi.status.eor to ON), this will require special treatment of this case (status.eor==ON) in all places that check status.eor (currently there are asserts that status.eor!=ON). A simpler and clearer solution is to add a bidi.lastET member for the exclusive use of the ET and EN-after-ET cases. 25728 1 5003 mitz 2005-12-08 13:44:21 -0800 Created attachment 5003 testcase 25735 2 5007 mitz 2005-12-08 15:56:48 -0800 Created attachment 5007 Keep track of the last position before the current run of ETs directly This even shortens bidi.cpp by a few lines! 25759 3 5007 darin 2005-12-09 19:19:02 -0800 Comment on attachment 5007 Keep track of the last position before the current run of ETs directly Not that I fully understand this, but r=me. 5003 2005-12-08 13:44:21 -0800 2005-12-08 13:44:21 -0800 testcase bidi-european-terminators.html text/html 1044 mitz PGh0bWw+CjxoZWFkPgo8dGl0bGU+PC90aXRsZT4KPC9oZWFkPgo8Ym9keT4KPHA+ClRoaXMgdGVz dHMgaG93IHRoZSBiaWRpIGFsZ29yaXRobSByZXNvbHZlcyBsZXZlbHMgaW4gc3RyaW5ncyBpbmNs dWRpbmcgRXVyb3BlYW4KdGVybWluYXRvcnMgKEVUcykuIFRoZSBjaGFyYWN0ZXJzICYjeDA1ZDA7 IGFuZCAmI3gwNWQxOyBhcmUgb2YgdHlwZSBSOyBeIGFuZCBACmFyZSBvZiB0eXBlIE9OOyAkIGFu ZCAlIGFyZSBvZiB0eXBlIEVUOyBhIGlzIG9mIHR5cGUgTC4gSW4gZWFjaCBvZiB0aGUgZm9sbG93 aW5nCmV4YW1wbGVzLCB0aGUgdHdvIGxpbmVzIHNob3VsZCBiZSBpZGVudGljYWwuCjwvcD4KPGhy Pgo8cCBzdHlsZT0iZGlyZWN0aW9uOiBsdHI7IHRleHQtYWxpZ246IGxlZnQ7Ij4mI3gwNWQwOyBe IEAgJCUgYTwvcD4KPGJkbyBkaXI9Imx0ciI+JiN4MDVkMDsgXiBAICQlIGE8L2Jkbz4KPGhyPgo8 cCBzdHlsZT0iZGlyZWN0aW9uOiBsdHI7IHRleHQtYWxpZ246IGxlZnQ7Ij4mI3gwNWQwOyBeIEAg JCUgJiN4MDVkMTs8L3A+CjxiZG8gZGlyPSJsdHIiPiYjeDA1ZDE7ICUkIEAgXiAmI3gwNWQwOzwv YmRvPgo8aHI+CjxwIHN0eWxlPSJkaXJlY3Rpb246IGx0cjsgdGV4dC1hbGlnbjogbGVmdDsiPiYj eDA1ZDA7IF4gQCAkJTE8L3A+CjxiZG8gZGlyPSJsdHIiPiQlMSBAIF4gJiN4MDVkMDs8L2Jkbz4K PGhyPgo8cCBzdHlsZT0iZGlyZWN0aW9uOiBydGw7IHRleHQtYWxpZ246IGxlZnQ7Ij4mI3gwNWQw OyBeIEAgJCUgYTwvcD4KPGJkbyBkaXI9Imx0ciI+YSAlJCBAIF4gJiN4MDVkMDs8L2Jkbz4KPGhy Pgo8cCBzdHlsZT0iZGlyZWN0aW9uOiBydGw7IHRleHQtYWxpZ246IGxlZnQ7Ij4mI3gwNWQwOyBe IEAgJCUgJiN4MDVkMTs8L3A+CjxiZG8gZGlyPSJsdHIiPiYjeDA1ZDE7ICUkIEAgXiAmI3gwNWQw OzwvYmRvPgo8aHI+CjxwIHN0eWxlPSJkaXJlY3Rpb246IHJ0bDsgdGV4dC1hbGlnbjogbGVmdDsi PiYjeDA1ZDA7IF4gQCAkJTE8L3A+CjxiZG8gZGlyPSJsdHIiPiQlMSBAIF4gJiN4MDVkMDs8L2Jk bz4KPC9ib2R5Pgo8L2h0bWw+ 5007 2005-12-08 15:56:48 -0800 2005-12-09 19:19:02 -0800 Keep track of the last position before the current run of ETs directly 6014_r2.patch text/plain 13006 mitz SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL3Jv b3QvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjEzMQpkaWZm IC1wIC11IC1yMS4xMzEgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCi0tLSBMYXlvdXRUZXN0cy9DaGFu Z2VMb2cJOCBEZWMgMjAwNSAwOTozMDoyNSAtMDAwMAkxLjEzMQorKysgTGF5b3V0VGVzdHMvQ2hh bmdlTG9nCTggRGVjIDIwMDUgMjM6NTQ6MzkgLTAwMDAKQEAgLTEsMyArMSwxNiBAQAorMjAwNS0x Mi0wOCAgTWl0eiBQZXR0ZWwgIDxvcGVuZGFyd2luLm9yZ0BtaXR6cGV0dGVsLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0IGZvcjogaHR0 cDovL2J1Z3ppbGxhLm9wZW5kYXJ3aW4ub3JnL3Nob3dfYnVnLmNnaT9pZD02MDE0CisgICAgICAg IEJpZGkgYWxnb3JpdGhtOiBpbmNvcnJlY3QgcmVzb2x2ZWQgbGV2ZWxzIGZvciBuZXV0cmFscyBi ZXR3ZWVuIFIgYW5kCisgICAgICAgIEVUIE9OIEwKKworICAgICAgICAqIGZhc3QvdGV4dC9pbnRl cm5hdGlvbmFsL2JpZGktZXVyb3BlYW4tdGVybWluYXRvcnMtZXhwZWN0ZWQuY2hlY2tzdW06IEFk ZGVkLgorICAgICAgICAqIGZhc3QvdGV4dC9pbnRlcm5hdGlvbmFsL2JpZGktZXVyb3BlYW4tdGVy bWluYXRvcnMtZXhwZWN0ZWQucG5nOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L3RleHQvaW50ZXJu YXRpb25hbC9iaWRpLWV1cm9wZWFuLXRlcm1pbmF0b3JzLWV4cGVjdGVkLnR4dDogQWRkZWQuCisg ICAgICAgICogZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvYmlkaS1ldXJvcGVhbi10ZXJtaW5hdG9y cy5odG1sOiBBZGRlZC4KKwogMjAwNS0xMi0wOCAgRXJpYyBTZWlkZWwgIDxlc2VpZGVsQGFwcGxl LmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBkYXJpbi4KSW5kZXg6IExheW91dFRlc3RzL2Zh c3QvdGV4dC9pbnRlcm5hdGlvbmFsL2JpZGktZXVyb3BlYW4tdGVybWluYXRvcnMtZXhwZWN0ZWQu Y2hlY2tzdW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQpkaWZmIC1OcHUgTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2ludGVy bmF0aW9uYWwvYmlkaS1ldXJvcGVhbi10ZXJtaW5hdG9ycy1leHBlY3RlZC5jaGVja3N1bQotLS0g TGF5b3V0VGVzdHMvZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvYmlkaS1ldXJvcGVhbi10ZXJtaW5h dG9ycy1leHBlY3RlZC5jaGVja3N1bQkxIEphbiAxOTcwIDAwOjAwOjAwIC0wMDAwCisrKyBMYXlv dXRUZXN0cy9mYXN0L3RleHQvaW50ZXJuYXRpb25hbC9iaWRpLWV1cm9wZWFuLXRlcm1pbmF0b3Jz LWV4cGVjdGVkLmNoZWNrc3VtCTggRGVjIDIwMDUgMjM6MzA6MTYgLTAwMDAKQEAgLTAsMCArMSBA QAorZTRmNzQ4YzllMDE1ZDYzZWQyYjQ3Y2Y1MmQ4NzA3YTYKXCBObyBuZXdsaW5lIGF0IGVuZCBv ZiBmaWxlCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L3RleHQvaW50ZXJuYXRpb25hbC9iaWRpLWV1 cm9wZWFuLXRlcm1pbmF0b3JzLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09CmRpZmYgLU5wdSBMYXlv dXRUZXN0cy9mYXN0L3RleHQvaW50ZXJuYXRpb25hbC9iaWRpLWV1cm9wZWFuLXRlcm1pbmF0b3Jz LWV4cGVjdGVkLnR4dAotLS0gTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvYmlk aS1ldXJvcGVhbi10ZXJtaW5hdG9ycy1leHBlY3RlZC50eHQJMSBKYW4gMTk3MCAwMDowMDowMCAt MDAwMAorKysgTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2ludGVybmF0aW9uYWwvYmlkaS1ldXJvcGVh bi10ZXJtaW5hdG9ycy1leHBlY3RlZC50eHQJOCBEZWMgMjAwNSAyMzozMDoxNiAtMDAwMApAQCAt MCwwICsxLDgyIEBACitsYXllciBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgUmVuZGVyQ2FudmFz IGF0ICgwLDApIHNpemUgODAweDYwMAorbGF5ZXIgYXQgKDAsMCkgc2l6ZSA4MDB4NjAwCisgIFJl bmRlckJsb2NrIHtIVE1MfSBhdCAoMCwwKSBzaXplIDgwMHg2MDAKKyAgICBSZW5kZXJCb2R5IHtC T0RZfSBhdCAoOCw4KSBzaXplIDc4NHg1ODQKKyAgICAgIFJlbmRlckJsb2NrIHtQfSBhdCAoMCww KSBzaXplIDc4NHgzNgorICAgICAgICBSZW5kZXJUZXh0IHtURVhUfSBhdCAoMCwwKSBzaXplIDg1 eDE4CisgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggODU6ICJUaGlzIHRlc3RzIGZv ciAiCisgICAgICAgIFJlbmRlcklubGluZSB7SX0gYXQgKDAsMCkgc2l6ZSA3Njh4MzYKKyAgICAg ICAgICBSZW5kZXJUZXh0IHtURVhUfSBhdCAoODUsMCkgc2l6ZSA3Njh4MzYKKyAgICAgICAgICAg IHRleHQgcnVuIGF0ICg4NSwwKSB3aWR0aCA2ODM6ICJodHRwOi8vYnVnemlsbGEub3BlbmRhcndp bi5vcmcvc2hvd19idWcuY2dpP2lkPTYwMTQgQmlkaSBhbGdvcml0aG06IGluY29ycmVjdCByZXNv bHZlZCBsZXZlbHMgZm9yIG5ldXRyYWxzIgorICAgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMTgp IHdpZHRoIDE1NzogImJldHdlZW4gUiBhbmQgRVQgT04gTCIKKyAgICAgICAgUmVuZGVyVGV4dCB7 VEVYVH0gYXQgKDE1NywxOCkgc2l6ZSA0eDE4CisgICAgICAgICAgdGV4dCBydW4gYXQgKDE1Nywx OCkgd2lkdGggNDogIi4iCisgICAgICBSZW5kZXJCbG9jayB7UH0gYXQgKDAsNTIpIHNpemUgNzg0 eDM2CisgICAgICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICgwLDApIHNpemUgNzY0eDM2CisgICAg ICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggOTY6ICJUaGUgY2hhcmFjdGVycyAiCisgICAg ICAgICAgdGV4dCBydW4gYXQgKDk2LDApIHdpZHRoIDEwIFJUTDogIlx4ezVEMH0iCisgICAgICAg ICAgdGV4dCBydW4gYXQgKDEwNiwwKSB3aWR0aCAzMTogIiBhbmQgIgorICAgICAgICAgIHRleHQg cnVuIGF0ICgxMzcsMCkgd2lkdGggOSBSVEw6ICJceHs1RDF9IgorICAgICAgICAgIHRleHQgcnVu IGF0ICgxNDYsMCkgd2lkdGggNjE4OiAiIGFyZSBvZiB0eXBlIFI7IF4gYW5kIEAgYXJlIG9mIHR5 cGUgT047ICQgYW5kICUgYXJlIG9mIHR5cGUgRVQ7IGEgaXMgb2YgdHlwZSBMOyAxIGlzIG9mIHR5 cGUgRU4uIEluIgorICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDE4KSB3aWR0aCA0Njc6ICJlYWNo IG9mIHRoZSBmb2xsb3dpbmcgcGFpcnMsIHRoZSB0d28gbGluZXMgc2hvdWxkIGJlIGlkZW50aWNh bCB0byBlYWNoIG90aGVyLiIKKyAgICAgIFJlbmRlckJsb2NrIHtIUn0gYXQgKDAsMTA0KSBzaXpl IDc4NHgyIFtib3JkZXI6ICgxcHggaW5zZXQgIzAwMDAwMCldCisgICAgICBSZW5kZXJCbG9jayB7 UH0gYXQgKDAsMTIyKSBzaXplIDc4NHgxOAorICAgICAgICBSZW5kZXJUZXh0IHtURVhUfSBhdCAo MCwwKSBzaXplIDc3eDE4CisgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggMTAgUlRM OiAiXHh7NUQwfSIKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAoMTAsMCkgd2lkdGggNjc6ICIgXiBA ICQlIGEiCisgICAgICBSZW5kZXJCbG9jayAoYW5vbnltb3VzKSBhdCAoMCwxNTYpIHNpemUgNzg0 eDE4CisgICAgICAgIFJlbmRlcklubGluZSB7QkRPfSBhdCAoMCwwKSBzaXplIDc3eDE4CisgICAg ICAgICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQgKDAsMCkgc2l6ZSA3N3gxOAorICAgICAgICAgICAg dGV4dCBydW4gYXQgKDAsMCkgd2lkdGggNzcgTFRSIG92ZXJyaWRlOiAiXHh7NUQwfSBeIEAgJCUg YSIKKyAgICAgICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQgKDAsMCkgc2l6ZSAweDAKKyAgICAgIFJl bmRlckJsb2NrIHtIUn0gYXQgKDAsMTgyKSBzaXplIDc4NHgyIFtib3JkZXI6ICgxcHggaW5zZXQg IzAwMDAwMCldCisgICAgICBSZW5kZXJCbG9jayB7UH0gYXQgKDAsMjAwKSBzaXplIDc4NHgxOAor ICAgICAgICBSZW5kZXJUZXh0IHtURVhUfSBhdCAoMCwwKSBzaXplIDc5eDE4CisgICAgICAgICAg dGV4dCBydW4gYXQgKDAsMCkgd2lkdGggNzkgUlRMOiAiXHh7NUQwfSBeIEAgJCUgXHh7NUQxfSIK KyAgICAgIFJlbmRlckJsb2NrIChhbm9ueW1vdXMpIGF0ICgwLDIzNCkgc2l6ZSA3ODR4MTgKKyAg ICAgICAgUmVuZGVySW5saW5lIHtCRE99IGF0ICgwLDApIHNpemUgNzl4MTgKKyAgICAgICAgICBS ZW5kZXJUZXh0IHtURVhUfSBhdCAoMCwwKSBzaXplIDc5eDE4CisgICAgICAgICAgICB0ZXh0IHJ1 biBhdCAoMCwwKSB3aWR0aCA3OSBMVFIgb3ZlcnJpZGU6ICJceHs1RDF9ICUkIEAgXiBceHs1RDB9 IgorICAgICAgICBSZW5kZXJUZXh0IHtURVhUfSBhdCAoMCwwKSBzaXplIDB4MAorICAgICAgUmVu ZGVyQmxvY2sge0hSfSBhdCAoMCwyNjApIHNpemUgNzg0eDIgW2JvcmRlcjogKDFweCBpbnNldCAj MDAwMDAwKV0KKyAgICAgIFJlbmRlckJsb2NrIHtQfSBhdCAoMCwyNzgpIHNpemUgNzg0eDE4Cisg ICAgICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICgwLDApIHNpemUgNzR4MTgKKyAgICAgICAgICB0 ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCAyOTogIiQlMSIKKyAgICAgICAgICB0ZXh0IHJ1biBhdCAo MjksMCkgd2lkdGggNDUgUlRMOiAiXHh7NUQwfSBeIEAgIgorICAgICAgUmVuZGVyQmxvY2sgKGFu b255bW91cykgYXQgKDAsMzEyKSBzaXplIDc4NHgxOAorICAgICAgICBSZW5kZXJJbmxpbmUge0JE T30gYXQgKDAsMCkgc2l6ZSA3NHgxOAorICAgICAgICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICgw LDApIHNpemUgNzR4MTgKKyAgICAgICAgICAgIHRleHQgcnVuIGF0ICgwLDApIHdpZHRoIDc0IExU UiBvdmVycmlkZTogIiQlMSBAIF4gXHh7NUQwfSIKKyAgICAgICAgUmVuZGVyVGV4dCB7VEVYVH0g YXQgKDAsMCkgc2l6ZSAweDAKKyAgICAgIFJlbmRlckJsb2NrIHtIUn0gYXQgKDAsMzM4KSBzaXpl IDc4NHgyIFtib3JkZXI6ICgxcHggaW5zZXQgIzAwMDAwMCldCisgICAgICBSZW5kZXJCbG9jayB7 UH0gYXQgKDAsMzU2KSBzaXplIDc4NHgxOAorICAgICAgICBSZW5kZXJUZXh0IHtURVhUfSBhdCAo MCwwKSBzaXplIDc3eDE4CisgICAgICAgICAgdGV4dCBydW4gYXQgKDAsMCkgd2lkdGggNzogImEi CisgICAgICAgICAgdGV4dCBydW4gYXQgKDcsMCkgd2lkdGggNzAgUlRMOiAiXHh7NUQwfSBeIEAg JCUgIgorICAgICAgUmVuZGVyQmxvY2sgKGFub255bW91cykgYXQgKDAsMzkwKSBzaXplIDc4NHgx OAorICAgICAgICBSZW5kZXJJbmxpbmUge0JET30gYXQgKDAsMCkgc2l6ZSA3N3gxOAorICAgICAg ICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICgwLDApIHNpemUgNzd4MTgKKyAgICAgICAgICAgIHRl eHQgcnVuIGF0ICgwLDApIHdpZHRoIDc3IExUUiBvdmVycmlkZTogImEgJSQgQCBeIFx4ezVEMH0i CisgICAgICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICgwLDApIHNpemUgMHgwCisgICAgICBSZW5k ZXJCbG9jayB7SFJ9IGF0ICgwLDQxNikgc2l6ZSA3ODR4MiBbYm9yZGVyOiAoMXB4IGluc2V0ICMw MDAwMDApXQorICAgICAgUmVuZGVyQmxvY2sge1B9IGF0ICgwLDQzNCkgc2l6ZSA3ODR4MTgKKyAg ICAgICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQgKDAsMCkgc2l6ZSA3OXgxOAorICAgICAgICAgIHRl eHQgcnVuIGF0ICgwLDApIHdpZHRoIDc5IFJUTDogIlx4ezVEMH0gXiBAICQlIFx4ezVEMX0iCisg ICAgICBSZW5kZXJCbG9jayAoYW5vbnltb3VzKSBhdCAoMCw0NjgpIHNpemUgNzg0eDE4CisgICAg ICAgIFJlbmRlcklubGluZSB7QkRPfSBhdCAoMCwwKSBzaXplIDc5eDE4CisgICAgICAgICAgUmVu ZGVyVGV4dCB7VEVYVH0gYXQgKDAsMCkgc2l6ZSA3OXgxOAorICAgICAgICAgICAgdGV4dCBydW4g YXQgKDAsMCkgd2lkdGggNzkgTFRSIG92ZXJyaWRlOiAiXHh7NUQxfSAlJCBAIF4gXHh7NUQwfSIK KyAgICAgICAgUmVuZGVyVGV4dCB7VEVYVH0gYXQgKDAsMCkgc2l6ZSAweDAKKyAgICAgIFJlbmRl ckJsb2NrIHtIUn0gYXQgKDAsNDk0KSBzaXplIDc4NHgyIFtib3JkZXI6ICgxcHggaW5zZXQgIzAw MDAwMCldCisgICAgICBSZW5kZXJCbG9jayB7UH0gYXQgKDAsNTEyKSBzaXplIDc4NHgxOAorICAg ICAgICBSZW5kZXJUZXh0IHtURVhUfSBhdCAoMCwwKSBzaXplIDc0eDE4CisgICAgICAgICAgdGV4 dCBydW4gYXQgKDAsMCkgd2lkdGggMjk6ICIkJTEiCisgICAgICAgICAgdGV4dCBydW4gYXQgKDI5 LDApIHdpZHRoIDQ1IFJUTDogIlx4ezVEMH0gXiBAICIKKyAgICAgIFJlbmRlckJsb2NrIChhbm9u eW1vdXMpIGF0ICgwLDU0Nikgc2l6ZSA3ODR4MTgKKyAgICAgICAgUmVuZGVySW5saW5lIHtCRE99 IGF0ICgwLDApIHNpemUgNzR4MTgKKyAgICAgICAgICBSZW5kZXJUZXh0IHtURVhUfSBhdCAoMCww KSBzaXplIDc0eDE4CisgICAgICAgICAgICB0ZXh0IHJ1biBhdCAoMCwwKSB3aWR0aCA3NCBMVFIg b3ZlcnJpZGU6ICIkJTEgQCBeIFx4ezVEMH0iCisgICAgICAgIFJlbmRlclRleHQge1RFWFR9IGF0 ICgwLDApIHNpemUgMHgwCisgICAgICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICgwLDApIHNpemUg MHgwCisgICAgICAgIFJlbmRlclRleHQge1RFWFR9IGF0ICgwLDApIHNpemUgMHgwCkluZGV4OiBM YXlvdXRUZXN0cy9mYXN0L3RleHQvaW50ZXJuYXRpb25hbC9iaWRpLWV1cm9wZWFuLXRlcm1pbmF0 b3JzLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQpkaWZmIC1OcHUgTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2ludGVy bmF0aW9uYWwvYmlkaS1ldXJvcGVhbi10ZXJtaW5hdG9ycy5odG1sCi0tLSBMYXlvdXRUZXN0cy9m YXN0L3RleHQvaW50ZXJuYXRpb25hbC9iaWRpLWV1cm9wZWFuLXRlcm1pbmF0b3JzLmh0bWwJMSBK YW4gMTk3MCAwMDowMDowMCAtMDAwMAorKysgTGF5b3V0VGVzdHMvZmFzdC90ZXh0L2ludGVybmF0 aW9uYWwvYmlkaS1ldXJvcGVhbi10ZXJtaW5hdG9ycy5odG1sCTggRGVjIDIwMDUgMjM6Mjk6MjMg LTAwMDAKQEAgLTAsMCArMSwzNSBAQAorPGh0bWw+Cis8aGVhZD4KKzx0aXRsZT48L3RpdGxlPgor PC9oZWFkPgorPGJvZHk+Cis8cD4KK1RoaXMgdGVzdHMgZm9yIDxpPmh0dHA6Ly9idWd6aWxsYS5v cGVuZGFyd2luLm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjAxNAorQmlkaSBhbGdvcml0aG06IGluY29y cmVjdCByZXNvbHZlZCBsZXZlbHMgZm9yIG5ldXRyYWxzIGJldHdlZW4gUiBhbmQgRVQgT04KK0w8 L2k+LgorPC9wPgorPHA+CitUaGUgY2hhcmFjdGVycyAmI3gwNWQwOyBhbmQgJiN4MDVkMTsgYXJl IG9mIHR5cGUgUjsgXiBhbmQgQAorYXJlIG9mIHR5cGUgT047ICQgYW5kICUgYXJlIG9mIHR5cGUg RVQ7IGEgaXMgb2YgdHlwZSBMOyAxIGlzIG9mIHR5cGUgRU4uIEluCitlYWNoIG9mIHRoZSBmb2xs b3dpbmcgcGFpcnMsIHRoZSB0d28gbGluZXMgc2hvdWxkIGJlIGlkZW50aWNhbCB0byBlYWNoIG90 aGVyLgorPC9wPgorPGhyPgorPHAgc3R5bGU9ImRpcmVjdGlvbjogbHRyOyB0ZXh0LWFsaWduOiBs ZWZ0OyI+JiN4MDVkMDsgXiBAICQlIGE8L3A+Cis8YmRvIGRpcj0ibHRyIj4mI3gwNWQwOyBeIEAg JCUgYTwvYmRvPgorPGhyPgorPHAgc3R5bGU9ImRpcmVjdGlvbjogbHRyOyB0ZXh0LWFsaWduOiBs ZWZ0OyI+JiN4MDVkMDsgXiBAICQlICYjeDA1ZDE7PC9wPgorPGJkbyBkaXI9Imx0ciI+JiN4MDVk MTsgJSQgQCBeICYjeDA1ZDA7PC9iZG8+Cis8aHI+Cis8cCBzdHlsZT0iZGlyZWN0aW9uOiBsdHI7 IHRleHQtYWxpZ246IGxlZnQ7Ij4mI3gwNWQwOyBeIEAgJCUxPC9wPgorPGJkbyBkaXI9Imx0ciI+ JCUxIEAgXiAmI3gwNWQwOzwvYmRvPgorPGhyPgorPHAgc3R5bGU9ImRpcmVjdGlvbjogcnRsOyB0 ZXh0LWFsaWduOiBsZWZ0OyI+JiN4MDVkMDsgXiBAICQlIGE8L3A+Cis8YmRvIGRpcj0ibHRyIj5h ICUkIEAgXiAmI3gwNWQwOzwvYmRvPgorPGhyPgorPHAgc3R5bGU9ImRpcmVjdGlvbjogcnRsOyB0 ZXh0LWFsaWduOiBsZWZ0OyI+JiN4MDVkMDsgXiBAICQlICYjeDA1ZDE7PC9wPgorPGJkbyBkaXI9 Imx0ciI+JiN4MDVkMTsgJSQgQCBeICYjeDA1ZDA7PC9iZG8+Cis8aHI+Cis8cCBzdHlsZT0iZGly ZWN0aW9uOiBydGw7IHRleHQtYWxpZ246IGxlZnQ7Ij4mI3gwNWQwOyBeIEAgJCUxPC9wPgorPGJk byBkaXI9Imx0ciI+JCUxIEAgXiAmI3gwNWQwOzwvYmRvPgorPC9ib2R5PgorPC9odG1sPgpJbmRl eDogV2ViQ29yZS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1MgZmlsZTogL2N2cy9yb290L1dlYkNv cmUvQ2hhbmdlTG9nLHYKcmV0cmlldmluZyByZXZpc2lvbiAxLjQ5NApkaWZmIC1wIC11IC1yMS40 OTQgV2ViQ29yZS9DaGFuZ2VMb2cKLS0tIFdlYkNvcmUvQ2hhbmdlTG9nCTggRGVjIDIwMDUgMjI6 MjI6NDYgLTAwMDAJMS40OTQKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCTggRGVjIDIwMDUgMjM6NTY6 NDIgLTAwMDAKQEAgLTEsMyArMSwxOCBAQAorMjAwNS0xMi0wOCAgTWl0eiBQZXR0ZWwgIDxvcGVu ZGFyd2luLm9yZ0BtaXR6cGV0dGVsLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBUZXN0OiBmYXN0L3RleHQvaW50ZXJuYXRpb25hbC9iaWRpLWV1 cm9wZWFuLXRlcm1pbmF0b3JzLmh0bWwKKworICAgICAgICBGaXggZm9yOiBodHRwOi8vYnVnemls bGEub3BlbmRhcndpbi5vcmcvc2hvd19idWcuY2dpP2lkPTYwMTQKKyAgICAgICAgQmlkaSBhbGdv cml0aG06IGluY29ycmVjdCByZXNvbHZlZCBsZXZlbHMgZm9yIG5ldXRyYWxzIGJldHdlZW4gUiBh bmQKKyAgICAgICAgRVQgT04gTAorCisgICAgICAgICoga2h0bWwvcmVuZGVyaW5nL2JpZGkuY3Bw OgorICAgICAgICAoa2h0bWw6OlJlbmRlckJsb2NrOjpiaWRpUmVvcmRlckxpbmUpOgorICAgICAg ICBLZWVwIHRyYWNrIG9mIHRoZSBsYXN0IHBvc2l0aW9uIGJlZm9yZSB0aGUgY3VycmVudCBydW4g b2YgRVRzIGRpcmVjdGx5CisgICAgICAgIHVzaW5nIGEgbmV3IEJpZGlTdGF0ZSBtZW1iZXIsIGxh c3RCZWZvcmVFVC4KKwogMjAwNS0xMi0wOCAgRGF2aWQgSGFycmlzb24gIDxoYXJyaXNvbkBhcHBs ZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgR2VvZmYuCkluZGV4OiBXZWJDb3JlL2todG1s L3JlbmRlcmluZy9iaWRpLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvY3ZzL3Jvb3QvV2ViQ29y ZS9raHRtbC9yZW5kZXJpbmcvYmlkaS5jcHAsdgpyZXRyaWV2aW5nIHJldmlzaW9uIDEuMTYxCmRp ZmYgLXAgLXUgLXIxLjE2MSBXZWJDb3JlL2todG1sL3JlbmRlcmluZy9iaWRpLmNwcAotLS0gV2Vi Q29yZS9raHRtbC9yZW5kZXJpbmcvYmlkaS5jcHAJNyBEZWMgMjAwNSAyMjo0ODo1NiAtMDAwMAkx LjE2MQorKysgV2ViQ29yZS9raHRtbC9yZW5kZXJpbmcvYmlkaS5jcHAJOCBEZWMgMjAwNSAyMzo1 Njo1NCAtMDAwMApAQCAtNzEsNiArNzEsNyBAQCBzdHJ1Y3QgQmlkaVN0YXRlIHsKICAgICBib29s IGFkanVzdEVtYmVkZGluZzsKICAgICBCaWRpSXRlcmF0b3IgZW5kT2ZMaW5lOwogICAgIGJvb2wg cmVhY2hlZEVuZE9mTGluZTsKKyAgICBCaWRpSXRlcmF0b3IgbGFzdEJlZm9yZUVUOwogfTsKIAog aW5saW5lIGJvb2wgb3BlcmF0b3I9PShjb25zdCBCaWRpU3RhdHVzJiBzdGF0dXMxLCBjb25zdCBC aWRpU3RhdHVzJiBzdGF0dXMyKQpAQCAtMTEyNSwxMiArMTEyNiw2IEBAIHZvaWQgUmVuZGVyQmxv Y2s6OmJpZGlSZW9yZGVyTGluZShjb25zdCAKICAgICAgICAgICAgIGlmIChiaWRpLnN0YXR1cy5s YXN0U3Ryb25nICE9IFFDaGFyOjpEaXJBTCkgewogICAgICAgICAgICAgICAgIC8vIGlmIGxhc3Qg c3Ryb25nIHdhcyBBTCBjaGFuZ2UgRU4gdG8gQU4KICAgICAgICAgICAgICAgICBzd2l0Y2ggKGJp ZGkuc3RhdHVzLmxhc3QpIHsKLSAgICAgICAgICAgICAgICAgICAgY2FzZSBRQ2hhcjo6RGlyRVQ6 Ci0gICAgICAgICAgICAgICAgICAgICAgICBpZiAoYmlkaS5zdGF0dXMubGFzdFN0cm9uZyA9PSBR Q2hhcjo6RGlyUiB8fCBiaWRpLnN0YXR1cy5sYXN0U3Ryb25nID09IFFDaGFyOjpEaXJBTCkgewot ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGFwcGVuZFJ1bihiaWRpKTsKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICBiaWRpLmRpciA9IFFDaGFyOjpEaXJFTjsKLQkJCX0KLQkJCS8vIGZh bGwgdGhyb3VnaAogICAgICAgICAgICAgICAgICAgICBjYXNlIFFDaGFyOjpEaXJFTjoKICAgICAg ICAgICAgICAgICAgICAgY2FzZSBRQ2hhcjo6RGlyTDoKICAgICAgICAgICAgICAgICAgICAgICAg IGJyZWFrOwpAQCAtMTE0NSw2ICsxMTQwLDcgQEAgdm9pZCBSZW5kZXJCbG9jazo6YmlkaVJlb3Jk ZXJMaW5lKGNvbnN0IAogICAgICAgICAgICAgICAgICAgICBjYXNlIFFDaGFyOjpEaXJDUzoKICAg ICAgICAgICAgICAgICAgICAgICAgIGlmIChiaWRpLnN0YXR1cy5lb3IgPT0gUUNoYXI6OkRpckVO KQogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJyZWFrOworICAgICAgICAgICAgICAgICAg ICBjYXNlIFFDaGFyOjpEaXJFVDoKICAgICAgICAgICAgICAgICAgICAgY2FzZSBRQ2hhcjo6RGly Qk46CiAgICAgICAgICAgICAgICAgICAgIGNhc2UgUUNoYXI6OkRpckI6CiAgICAgICAgICAgICAg ICAgICAgIGNhc2UgUUNoYXI6OkRpclM6CkBAIC0xMTUyLDcgKzExNDgsNyBAQCB2b2lkIFJlbmRl ckJsb2NrOjpiaWRpUmVvcmRlckxpbmUoY29uc3QgCiAgICAgICAgICAgICAgICAgICAgIGNhc2Ug UUNoYXI6OkRpck9OOgogICAgICAgICAgICAgICAgICAgICAgICAgaWYgKGJpZGkuc3RhdHVzLmVv ciA9PSBRQ2hhcjo6RGlyUikgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgIC8vIG5ldXRy YWxzIGdvIHRvIFIKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBiaWRpLmVvciA9IGJpZGku bGFzdDsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBiaWRpLmVvciA9IGJpZGkuc3RhdHVz Lmxhc3QgPT0gUUNoYXI6OkRpckVUID8gYmlkaS5sYXN0QmVmb3JlRVQgOiBiaWRpLmxhc3Q7CiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgYXBwZW5kUnVuKGJpZGkpOwogICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGJpZGkuZGlyID0gUUNoYXI6OkRpckVOOwogICAgICAgICAgICAgICAg ICAgICAgICAgfSBlbHNlIGlmIChiaWRpLnN0YXR1cy5lb3IgIT0gUUNoYXI6OkRpckwgJiYKQEAg LTExNjAsNyArMTE1Niw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmJpZGlSZW9yZGVyTGluZShjb25z dCAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJpZGkuZGlyICE9IFFDaGFyOjpE aXJMKSB7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgLy8gbnVtYmVycyBvbiBib3RoIHNp ZGVzLCBuZXV0cmFscyBnZXQgcmlnaHQgdG8gbGVmdCBkaXJlY3Rpb24KICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBhcHBlbmRSdW4oYmlkaSk7Ci0gICAgICAgICAgICAgICAgICAgICAgICAg ICAgYmlkaS5lb3IgPSBiaWRpLmxhc3Q7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgYmlk aS5lb3IgPSBiaWRpLnN0YXR1cy5sYXN0ID09IFFDaGFyOjpEaXJFVCA/IGJpZGkubGFzdEJlZm9y ZUVUIDogYmlkaS5sYXN0OwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJpZGkuZGlyID0g UUNoYXI6OkRpclI7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXBwZW5kUnVuKGJpZGkp OwogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGJpZGkuZGlyID0gUUNoYXI6OkRpckVOOwpA QCAtMTIzMiwxOSArMTIyOCw4IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmJpZGlSZW9yZGVyTGluZShj b25zdCAKICAgICAgICAgICAgICAgICBkaXJDdXJyZW50ID0gUUNoYXI6OkRpckVOOwogICAgICAg ICAgICAgICAgIGJpZGkuZW9yID0gYmlkaS5jdXJyZW50OwogICAgICAgICAgICAgICAgIGJpZGku c3RhdHVzLmVvciA9IGRpckN1cnJlbnQ7Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAg ICAgICB9IGVsc2UgaWYgKChiaWRpLnN0YXR1cy5lb3IgPT0gUUNoYXI6OkRpclIgfHwgYmlkaS5z dGF0dXMuZW9yID09IFFDaGFyOjpEaXJBTCB8fCBiaWRpLnN0YXR1cy5lb3IgPT0gUUNoYXI6OkRp ckFOIHx8IChiaWRpLnN0YXR1cy5lb3IgPT0gUUNoYXI6OkRpckVOICYmIGJpZGkuc3RhdHVzLmxh c3RTdHJvbmcgPT0gUUNoYXI6OkRpclIpKSAmJiBiaWRpLmxhc3QhPWJpZGkuY3VycmVudCkgewot ICAgICAgICAgICAgICAgIC8vIG1vc3Qgb2YgdGhlIHRpbWUgdGhpcyBpcyB1bm5lY2Vzc2FyeSwg YnV0IHdlIG5lZWQgdG8gc2VjdXJlIHRoZSBSIHJ1biBpbiBjYXNlCi0gICAgICAgICAgICAgICAg Ly8gdGhlIEVUIGVuZHMgdXAgYmVpbmcgbmV1dHJhbCBhbmQgZm9sbG93ZWQgYnkgTAotICAgICAg ICAgICAgICAgIGlmIChiaWRpLnN0YXR1cy5sYXN0IT1RQ2hhcjo6RGlyRVQpIHsKLSAgICAgICAg ICAgICAgICAgICAgYmlkaS5kaXIgPSBiaWRpLnN0YXR1cy5lb3I7Ci0gICAgICAgICAgICAgICAg ICAgIGFwcGVuZFJ1bihiaWRpKTsKLSAgICAgICAgICAgICAgICAgICAgYmlkaS5lb3IgPSBiaWRp Lmxhc3Q7Ci0gICAgICAgICAgICAgICAgfQotICAgICAgICAgICAgICAgIGJpZGkuc3RhdHVzLmVv ciA9IFFDaGFyOjpEaXJSOwotICAgICAgICAgICAgICAgIGJpZGkuZGlyID0gUUNoYXI6OkRpclI7 Ci0gICAgICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgICAgICB9CisgICAgICAgICAgICB9IGVs c2UgaWYgKGJpZGkuc3RhdHVzLmxhc3QgIT0gUUNoYXI6OkRpckVUKQorICAgICAgICAgICAgICAg IGJpZGkubGFzdEJlZm9yZUVUID0gZW1wdHlSdW4gPyBiaWRpLmVvciA6IGJpZGkubGFzdDsKICAg ICAgICAgICAgIGJyZWFrOwogCiAgICAgICAgIC8vIGJvdW5kYXJ5IG5ldXRyYWxzIHNob3VsZCBi ZSBpZ25vcmVkCg==