139104 2014-11-29 15:45:16 -0800 Move the '-webkit-locale', '-webkit-text-orientation', '-webkit-writing-mode', '-webkit-justify-self' and '-webkit-perspective' CSS properties to the new StyleBuilder 2015-01-05 19:34:49 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 137910 1 sam sam cdumez commit-queue oldest_to_newest 1051332 0 sam 2014-11-29 15:45:16 -0800 Move the '-webkit-locale', '-webkit-text-orientation', '-webkit-writing-mode', '-webkit-justify-self' and '-webkit-perspective' CSS properties to the new StyleBuilder 1051333 1 242283 sam 2014-11-29 15:45:52 -0800 Created attachment 242283 Patch 1051338 2 242283 commit-queue 2014-11-29 16:38:56 -0800 Comment on attachment 242283 Patch Clearing flags on attachment: 242283 Committed r176584: <http://trac.webkit.org/changeset/176584> 1051339 3 commit-queue 2014-11-29 16:38:59 -0800 All reviewed patches have been landed. Closing bug. 1058582 4 242283 cdumez 2015-01-04 14:17:30 -0800 Comment on attachment 242283 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=242283&action=review > Source/WebCore/css/StyleBuilderCustom.h:677 > + styleResolver.setTextOrientation(downcast<CSSPrimitiveValue>(value)); This does not need custom code, this is the default StyleBuilder behavior. I'll take care of removing this handler. 1058604 5 242283 cdumez 2015-01-04 16:07:21 -0800 Comment on attachment 242283 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=242283&action=review >> Source/WebCore/css/StyleBuilderCustom.h:677 >> + styleResolver.setTextOrientation(downcast<CSSPrimitiveValue>(value)); > > This does not need custom code, this is the default StyleBuilder behavior. I'll take care of removing this handler. Ah, never mind, I have just noticed the setter is on StyleResolver, not RenderStyle. 242283 2014-11-29 15:45:52 -0800 2014-11-29 16:38:56 -0800 Patch bug-139104-20141129154619.patch text/plain 11071 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3NjU4MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE0LTExLTI5ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTW92ZSB0aGUgJy13ZWJraXQtbG9jYWxl JywgJy13ZWJraXQtdGV4dC1vcmllbnRhdGlvbicsICctd2Via2l0LXdyaXRpbmctbW9kZScsICct d2Via2l0LWp1c3RpZnktc2VsZicgYW5kICctd2Via2l0LXBlcnNwZWN0aXZlJyBDU1MgcHJvcGVy dGllcyB0byB0aGUgbmV3IFN0eWxlQnVpbGRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5MTA0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBjc3MvQ1NTUHJvcGVydHlOYW1lcy5pbjoKKyAgICAgICAg KiBjc3MvU3R5bGVCdWlsZGVyQ3VzdG9tLmg6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZUJ1aWxk ZXJGdW5jdGlvbnM6OmFwcGx5VmFsdWVXZWJraXRMb2NhbGUpOgorICAgICAgICAoV2ViQ29yZTo6 U3R5bGVCdWlsZGVyRnVuY3Rpb25zOjphcHBseVZhbHVlV2Via2l0V3JpdGluZ01vZGUpOgorICAg ICAgICAoV2ViQ29yZTo6U3R5bGVCdWlsZGVyRnVuY3Rpb25zOjphcHBseVZhbHVlV2Via2l0VGV4 dE9yaWVudGF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVpbGRlckZ1bmN0aW9uczo6 YXBwbHlWYWx1ZVdlYmtpdEp1c3RpZnlTZWxmKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlQnVp bGRlckZ1bmN0aW9uczo6YXBwbHlWYWx1ZVdlYmtpdFBlcnNwZWN0aXZlKToKKyAgICAgICAgKiBj c3MvU3R5bGVSZXNvbHZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJlc29sdmVyOjph cHBseVByb3BlcnR5KToKKwogMjAxNC0xMS0yOSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FA YXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBhbiBFbXB0eVZpc2l0ZWRMaW5rU3RvcmUgaW1wbGVt ZW50YXRpb24KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2Nzcy9DU1NQcm9wZXJ0eU5hbWVzLmluCShyZXZp c2lvbiAxNzY1NzMpCisrKyBTb3VyY2UvV2ViQ29yZS9jc3MvQ1NTUHJvcGVydHlOYW1lcy5pbgko d29ya2luZyBjb3B5KQpAQCAtNjksMTMgKzY5LDEzIEBAIHRleHQtcmVuZGVyaW5nIFtJbmhlcml0 ZWQsIExlZ2FjeVN0eWxlQnUKIC13ZWJraXQtZm9udC1rZXJuaW5nIFtJbmhlcml0ZWQsIExlZ2Fj eVN0eWxlQnVpbGRlcl0KIC13ZWJraXQtZm9udC1zbW9vdGhpbmcgW0luaGVyaXRlZCwgTGVnYWN5 U3R5bGVCdWlsZGVyXQogLXdlYmtpdC1mb250LXZhcmlhbnQtbGlnYXR1cmVzIFtJbmhlcml0ZWQs IExlZ2FjeVN0eWxlQnVpbGRlcl0KLS13ZWJraXQtbG9jYWxlIFtJbmhlcml0ZWQsIExlZ2FjeVN0 eWxlQnVpbGRlcl0KLS13ZWJraXQtdGV4dC1vcmllbnRhdGlvbiBbSW5oZXJpdGVkLCBMZWdhY3lT dHlsZUJ1aWxkZXJdCistd2Via2l0LWxvY2FsZSBbSW5oZXJpdGVkLCBDdXN0b209VmFsdWVdCist d2Via2l0LXRleHQtb3JpZW50YXRpb24gW0luaGVyaXRlZCwgQ3VzdG9tPVZhbHVlXQogLWVwdWIt dGV4dC1vcmllbnRhdGlvbiA9IC13ZWJraXQtdGV4dC1vcmllbnRhdGlvbgogI2lmIGRlZmluZWQo RU5BQkxFX0lPU19URVhUX0FVVE9TSVpJTkcpICYmIEVOQUJMRV9JT1NfVEVYVF9BVVRPU0laSU5H CiAtd2Via2l0LXRleHQtc2l6ZS1hZGp1c3QgW0luaGVyaXRlZCwgTGVnYWN5U3R5bGVCdWlsZGVy XQogI2VuZGlmCi0td2Via2l0LXdyaXRpbmctbW9kZSBbSW5oZXJpdGVkLCBMZWdhY3lTdHlsZUJ1 aWxkZXJdCistd2Via2l0LXdyaXRpbmctbW9kZSBbSW5oZXJpdGVkLCBDdXN0b209VmFsdWVdCiAt ZXB1Yi13cml0aW5nLW1vZGUgPSAtd2Via2l0LXdyaXRpbmctbW9kZQogem9vbSBbQ3VzdG9tPUFs bF0KIApAQCAtMzg3LDcgKzM4Nyw3IEBAIGp1c3RpZnktY29udGVudAogI2lmIGRlZmluZWQoRU5B QkxFX0ZJTFRFUlNfTEVWRUxfMikgJiYgRU5BQkxFX0ZJTFRFUlNfTEVWRUxfMgogLXdlYmtpdC1i YWNrZHJvcC1maWx0ZXIgW0xlZ2FjeVN0eWxlQnVpbGRlcl0KICNlbmRpZgotLXdlYmtpdC1qdXN0 aWZ5LXNlbGYgW0xlZ2FjeVN0eWxlQnVpbGRlcl0KKy13ZWJraXQtanVzdGlmeS1zZWxmIFtDdXN0 b209VmFsdWVdCiAtd2Via2l0LWZvbnQtc2l6ZS1kZWx0YSBbTGVnYWN5U3R5bGVCdWlsZGVyXQog I2lmIGRlZmluZWQoRU5BQkxFX0NTU19HUklEX0xBWU9VVCkgJiYgRU5BQkxFX0NTU19HUklEX0xB WU9VVAogLXdlYmtpdC1ncmlkIFtMZWdhY3lTdHlsZUJ1aWxkZXJdCkBAIC00NjYsNyArNDY2LDcg QEAgb3JkZXIgW1R5cGVOYW1lPWludF0KIC13ZWJraXQtcGFkZGluZy1iZWZvcmUgW0xlZ2FjeVN0 eWxlQnVpbGRlcl0KIC13ZWJraXQtcGFkZGluZy1lbmQgW0xlZ2FjeVN0eWxlQnVpbGRlcl0KIC13 ZWJraXQtcGFkZGluZy1zdGFydCBbTGVnYWN5U3R5bGVCdWlsZGVyXQotLXdlYmtpdC1wZXJzcGVj dGl2ZSBbTGVnYWN5U3R5bGVCdWlsZGVyXQorLXdlYmtpdC1wZXJzcGVjdGl2ZSBbQ3VzdG9tPVZh bHVlXQogLXdlYmtpdC1wZXJzcGVjdGl2ZS1vcmlnaW4gW0xlZ2FjeVN0eWxlQnVpbGRlcl0KIC13 ZWJraXQtcGVyc3BlY3RpdmUtb3JpZ2luLXggW0NvbnZlcnRlcj1MZW5ndGhdCiAtd2Via2l0LXBl cnNwZWN0aXZlLW9yaWdpbi15IFtDb252ZXJ0ZXI9TGVuZ3RoXQpJbmRleDogU291cmNlL1dlYkNv cmUvY3NzL1N0eWxlQnVpbGRlckN1c3RvbS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L2Nzcy9TdHlsZUJ1aWxkZXJDdXN0b20uaAkocmV2aXNpb24gMTc2NTczKQorKysgU291cmNlL1dl YkNvcmUvY3NzL1N0eWxlQnVpbGRlckN1c3RvbS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw2ICsz Miw3IEBACiAjaW5jbHVkZSAiQ1NTSW1hZ2VTZXRWYWx1ZS5oIgogI2luY2x1ZGUgIkNTU0ltYWdl VmFsdWUuaCIKICNpbmNsdWRlICJGcmFtZS5oIgorI2luY2x1ZGUgIkxvY2FsZVRvU2NyaXB0TWFw cGluZy5oIgogI2luY2x1ZGUgIlJlY3QuaCIKICNpbmNsdWRlICJTdHlsZVJlc29sdmVyLmgiCiAK QEAgLTY0Nyw2ICs2NDgsNzEgQEAgaW5saW5lIHZvaWQgYXBwbHlWYWx1ZUNsaXAoU3R5bGVSZXNv bHZlcgogICAgIH0KIH0KIAoraW5saW5lIHZvaWQgYXBwbHlWYWx1ZVdlYmtpdExvY2FsZShTdHls ZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBDU1NWYWx1ZSYgdmFsdWUpCit7CisgICAgYXV0byYg cHJpbWl0aXZlVmFsdWUgPSBkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4odmFsdWUpOworCisg ICAgaWYgKHByaW1pdGl2ZVZhbHVlLmdldFZhbHVlSUQoKSA9PSBDU1NWYWx1ZUF1dG8pCisgICAg ICAgIHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+c2V0TG9jYWxlKG51bGxBdG9tKTsKKyAgICBlbHNl CisgICAgICAgIHN0eWxlUmVzb2x2ZXIuc3R5bGUoKS0+c2V0TG9jYWxlKHByaW1pdGl2ZVZhbHVl LmdldFN0cmluZ1ZhbHVlKCkpOworICAgIAorICAgIEZvbnREZXNjcmlwdGlvbiBmb250RGVzY3Jp cHRpb24gPSBzdHlsZVJlc29sdmVyLnN0eWxlKCktPmZvbnREZXNjcmlwdGlvbigpOworICAgIGZv bnREZXNjcmlwdGlvbi5zZXRTY3JpcHQobG9jYWxlVG9TY3JpcHRDb2RlRm9yRm9udFNlbGVjdGlv bihzdHlsZVJlc29sdmVyLnN0eWxlKCktPmxvY2FsZSgpKSk7CisgICAgc3R5bGVSZXNvbHZlci5z ZXRGb250RGVzY3JpcHRpb24oZm9udERlc2NyaXB0aW9uKTsKK30KKworaW5saW5lIHZvaWQgYXBw bHlWYWx1ZVdlYmtpdFdyaXRpbmdNb2RlKFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIsIENT U1ZhbHVlJiB2YWx1ZSkKK3sKKyAgICBzdHlsZVJlc29sdmVyLnNldFdyaXRpbmdNb2RlKGRvd25j YXN0PENTU1ByaW1pdGl2ZVZhbHVlPih2YWx1ZSkpOworCisgICAgLy8gRklYTUU6IEl0IGlzIG5v dCBvayB0byBtb2RpZnkgZG9jdW1lbnQgc3RhdGUgd2hpbGUgYXBwbHlpbmcgc3R5bGUuCisgICAg YXV0byYgc3RhdGUgPSBzdHlsZVJlc29sdmVyLnN0YXRlKCk7CisgICAgaWYgKHN0YXRlLmVsZW1l bnQoKSAmJiBzdGF0ZS5lbGVtZW50KCkgPT0gc3RhdGUuZG9jdW1lbnQoKS5kb2N1bWVudEVsZW1l bnQoKSkKKyAgICAgICAgc3RhdGUuZG9jdW1lbnQoKS5zZXRXcml0aW5nTW9kZVNldE9uRG9jdW1l bnRFbGVtZW50KHRydWUpOworfQorCitpbmxpbmUgdm9pZCBhcHBseVZhbHVlV2Via2l0VGV4dE9y aWVudGF0aW9uKFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIsIENTU1ZhbHVlJiB2YWx1ZSkK K3sKKyAgICBzdHlsZVJlc29sdmVyLnNldFRleHRPcmllbnRhdGlvbihkb3duY2FzdDxDU1NQcmlt aXRpdmVWYWx1ZT4odmFsdWUpKTsKK30KKworaW5saW5lIHZvaWQgYXBwbHlWYWx1ZVdlYmtpdEp1 c3RpZnlTZWxmKFN0eWxlUmVzb2x2ZXImIHN0eWxlUmVzb2x2ZXIsIENTU1ZhbHVlJiB2YWx1ZSkK K3sKKyAgICBhdXRvJiBwcmltaXRpdmVWYWx1ZSA9IGRvd25jYXN0PENTU1ByaW1pdGl2ZVZhbHVl Pih2YWx1ZSk7CisKKyAgICBpZiAoUGFpciogcGFpclZhbHVlID0gcHJpbWl0aXZlVmFsdWUuZ2V0 UGFpclZhbHVlKCkpIHsKKyAgICAgICAgc3R5bGVSZXNvbHZlci5zdHlsZSgpLT5zZXRKdXN0aWZ5 U2VsZigqcGFpclZhbHVlLT5maXJzdCgpKTsKKyAgICAgICAgc3R5bGVSZXNvbHZlci5zdHlsZSgp LT5zZXRKdXN0aWZ5U2VsZk92ZXJmbG93QWxpZ25tZW50KCpwYWlyVmFsdWUtPnNlY29uZCgpKTsK KyAgICB9IGVsc2UKKyAgICAgICAgc3R5bGVSZXNvbHZlci5zdHlsZSgpLT5zZXRKdXN0aWZ5U2Vs ZihwcmltaXRpdmVWYWx1ZSk7Cit9CisKK2lubGluZSB2b2lkIGFwcGx5VmFsdWVXZWJraXRQZXJz cGVjdGl2ZShTdHlsZVJlc29sdmVyJiBzdHlsZVJlc29sdmVyLCBDU1NWYWx1ZSYgdmFsdWUpCit7 CisgICAgYXV0byYgcHJpbWl0aXZlVmFsdWUgPSBkb3duY2FzdDxDU1NQcmltaXRpdmVWYWx1ZT4o dmFsdWUpOworCisgICAgaWYgKHByaW1pdGl2ZVZhbHVlLmdldFZhbHVlSUQoKSA9PSBDU1NWYWx1 ZU5vbmUpIHsKKyAgICAgICAgc3R5bGVSZXNvbHZlci5zdHlsZSgpLT5zZXRQZXJzcGVjdGl2ZSgw KTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAgIGZsb2F0IHBlcnNwZWN0aXZlVmFsdWU7 CisgICAgaWYgKHByaW1pdGl2ZVZhbHVlLmlzTGVuZ3RoKCkpCisgICAgICAgIHBlcnNwZWN0aXZl VmFsdWUgPSBwcmltaXRpdmVWYWx1ZS5jb21wdXRlTGVuZ3RoPGZsb2F0PihzdHlsZVJlc29sdmVy LnN0YXRlKCkuY3NzVG9MZW5ndGhDb252ZXJzaW9uRGF0YSgpKTsKKyAgICBlbHNlIGlmIChwcmlt aXRpdmVWYWx1ZS5pc051bWJlcigpKSB7CisgICAgICAgIC8vIEZvciBiYWNrd2FyZCBjb21wYXRp YmlsaXR5LCB0cmVhdCB2YWx1ZWxlc3MgbnVtYmVycyBhcyBweC4KKyAgICAgICAgUmVmPENTU1By aW1pdGl2ZVZhbHVlPiB2YWx1ZShDU1NQcmltaXRpdmVWYWx1ZTo6Y3JlYXRlKHByaW1pdGl2ZVZh bHVlLmdldERvdWJsZVZhbHVlKCksIENTU1ByaW1pdGl2ZVZhbHVlOjpDU1NfUFgpKTsKKyAgICAg ICAgcGVyc3BlY3RpdmVWYWx1ZSA9IHZhbHVlLmdldCgpLmNvbXB1dGVMZW5ndGg8ZmxvYXQ+KHN0 eWxlUmVzb2x2ZXIuc3RhdGUoKS5jc3NUb0xlbmd0aENvbnZlcnNpb25EYXRhKCkpOworICAgIH0g ZWxzZSB7CisgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOworICAgICAgICByZXR1cm47Cisg ICAgfQorCisgICAgaWYgKHBlcnNwZWN0aXZlVmFsdWUgPj0gMC4wZikKKyAgICAgICAgc3R5bGVS ZXNvbHZlci5zdHlsZSgpLT5zZXRQZXJzcGVjdGl2ZShwZXJzcGVjdGl2ZVZhbHVlKTsKK30KKwog fSAvLyBuYW1lc3BhY2UgU3R5bGVCdWlsZGVyRnVuY3Rpb25zCiAKIH0gLy8gbmFtZXNwYWNlIFdl YkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSZXNvbHZlci5jcHAJKHJldmlzaW9uIDE3 NjU3MykKKysrIFNvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJlc29sdmVyLmNwcAkod29ya2luZyBj b3B5KQpAQCAtMjQxNSwxOSArMjQxNSw2IEBAIHZvaWQgU3R5bGVSZXNvbHZlcjo6YXBwbHlQcm9w ZXJ0eShDU1NQcm8KICAgICAgICAgcmV0dXJuOwogICAgIGNhc2UgQ1NTUHJvcGVydHlVbmljb2Rl UmFuZ2U6IC8vIE9ubHkgdXNlZCBpbiBAZm9udC1mYWNlIHJ1bGVzLgogICAgICAgICByZXR1cm47 Ci0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdExvY2FsZTogewotICAgICAgICBIQU5ETEVfSU5I RVJJVF9BTkRfSU5JVElBTChsb2NhbGUsIExvY2FsZSk7Ci0gICAgICAgIGlmICghcHJpbWl0aXZl VmFsdWUpCi0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIGlmIChwcmltaXRpdmVWYWx1ZS0+ Z2V0VmFsdWVJRCgpID09IENTU1ZhbHVlQXV0bykKLSAgICAgICAgICAgIHN0YXRlLnN0eWxlKCkt PnNldExvY2FsZShudWxsQXRvbSk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIHN0YXRlLnN0 eWxlKCktPnNldExvY2FsZShwcmltaXRpdmVWYWx1ZS0+Z2V0U3RyaW5nVmFsdWUoKSk7Ci0gICAg ICAgIEZvbnREZXNjcmlwdGlvbiBmb250RGVzY3JpcHRpb24gPSBzdGF0ZS5zdHlsZSgpLT5mb250 RGVzY3JpcHRpb24oKTsKLSAgICAgICAgZm9udERlc2NyaXB0aW9uLnNldFNjcmlwdChsb2NhbGVU b1NjcmlwdENvZGVGb3JGb250U2VsZWN0aW9uKHN0YXRlLnN0eWxlKCktPmxvY2FsZSgpKSk7Ci0g ICAgICAgIHNldEZvbnREZXNjcmlwdGlvbihmb250RGVzY3JpcHRpb24pOwotICAgICAgICByZXR1 cm47Ci0gICAgfQogI2lmIEVOQUJMRShJT1NfVEVYVF9BVVRPU0laSU5HKQogICAgIGNhc2UgQ1NT UHJvcGVydHlXZWJraXRUZXh0U2l6ZUFkanVzdDogewogICAgICAgICBIQU5ETEVfSU5IRVJJVF9B TkRfSU5JVElBTCh0ZXh0U2l6ZUFkanVzdCwgVGV4dFNpemVBZGp1c3QpCkBAIC0yNDg5LDMxICsy NDc2LDYgQEAgdm9pZCBTdHlsZVJlc29sdmVyOjphcHBseVByb3BlcnR5KENTU1BybwogICAgICAg ICByZXR1cm47CiAgICAgfQogI2VuZGlmCi0gICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFBlcnNw ZWN0aXZlOiB7Ci0gICAgICAgIEhBTkRMRV9JTkhFUklUX0FORF9JTklUSUFMKHBlcnNwZWN0aXZl LCBQZXJzcGVjdGl2ZSkKLQotICAgICAgICBpZiAoIXByaW1pdGl2ZVZhbHVlKQotICAgICAgICAg ICAgcmV0dXJuOwotCi0gICAgICAgIGlmIChwcmltaXRpdmVWYWx1ZS0+Z2V0VmFsdWVJRCgpID09 IENTU1ZhbHVlTm9uZSkgewotICAgICAgICAgICAgc3RhdGUuc3R5bGUoKS0+c2V0UGVyc3BlY3Rp dmUoMCk7Ci0gICAgICAgICAgICByZXR1cm47Ci0gICAgICAgIH0KLQotICAgICAgICBmbG9hdCBw ZXJzcGVjdGl2ZVZhbHVlOwotICAgICAgICBpZiAocHJpbWl0aXZlVmFsdWUtPmlzTGVuZ3RoKCkp Ci0gICAgICAgICAgICBwZXJzcGVjdGl2ZVZhbHVlID0gcHJpbWl0aXZlVmFsdWUtPmNvbXB1dGVM ZW5ndGg8ZmxvYXQ+KHN0YXRlLmNzc1RvTGVuZ3RoQ29udmVyc2lvbkRhdGEoKSk7Ci0gICAgICAg IGVsc2UgaWYgKHByaW1pdGl2ZVZhbHVlLT5pc051bWJlcigpKSB7Ci0gICAgICAgICAgICAvLyBG b3IgYmFja3dhcmQgY29tcGF0aWJpbGl0eSwgdHJlYXQgdmFsdWVsZXNzIG51bWJlcnMgYXMgcHgu Ci0gICAgICAgICAgICBSZWY8Q1NTUHJpbWl0aXZlVmFsdWU+IHZhbHVlKENTU1ByaW1pdGl2ZVZh bHVlOjpjcmVhdGUocHJpbWl0aXZlVmFsdWUtPmdldERvdWJsZVZhbHVlKCksIENTU1ByaW1pdGl2 ZVZhbHVlOjpDU1NfUFgpKTsKLSAgICAgICAgICAgIHBlcnNwZWN0aXZlVmFsdWUgPSB2YWx1ZS5n ZXQoKS5jb21wdXRlTGVuZ3RoPGZsb2F0PihzdGF0ZS5jc3NUb0xlbmd0aENvbnZlcnNpb25EYXRh KCkpOwotICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICBpZiAo cGVyc3BlY3RpdmVWYWx1ZSA+PSAwLjBmKQotICAgICAgICAgICAgc3RhdGUuc3R5bGUoKS0+c2V0 UGVyc3BlY3RpdmUocGVyc3BlY3RpdmVWYWx1ZSk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9CiAj aWYgUExBVEZPUk0oSU9TKQogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRUb3VjaENhbGxvdXQ6 IHsKICAgICAgICAgSEFORExFX0lOSEVSSVRfQU5EX0lOSVRJQUwodG91Y2hDYWxsb3V0RW5hYmxl ZCwgVG91Y2hDYWxsb3V0RW5hYmxlZCk7CkBAIC0yNTY3LDI4ICsyNTI5LDYgQEAgdm9pZCBTdHls ZVJlc29sdmVyOjphcHBseVByb3BlcnR5KENTU1BybwogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJr aXRUZXh0RGVjb3JhdGlvbnNJbkVmZmVjdDoKICAgICAgICAgcmV0dXJuOwogCi0gICAgLy8gQ1NT IFRleHQgTGF5b3V0IE1vZHVsZSBMZXZlbCAzOiBWZXJ0aWNhbCB3cml0aW5nIHN1cHBvcnQKLSAg ICBjYXNlIENTU1Byb3BlcnR5V2Via2l0V3JpdGluZ01vZGU6IHsKLSAgICAgICAgSEFORExFX0lO SEVSSVRfQU5EX0lOSVRJQUwod3JpdGluZ01vZGUsIFdyaXRpbmdNb2RlKTsKLSAgICAgICAgCi0g ICAgICAgIGlmIChwcmltaXRpdmVWYWx1ZSkKLSAgICAgICAgICAgIHNldFdyaXRpbmdNb2RlKCpw cmltaXRpdmVWYWx1ZSk7Ci0KLSAgICAgICAgLy8gRklYTUU6IEl0IGlzIG5vdCBvayB0byBtb2Rp ZnkgZG9jdW1lbnQgc3RhdGUgd2hpbGUgYXBwbHlpbmcgc3R5bGUuCi0gICAgICAgIGlmIChzdGF0 ZS5lbGVtZW50KCkgJiYgc3RhdGUuZWxlbWVudCgpID09IHN0YXRlLmRvY3VtZW50KCkuZG9jdW1l bnRFbGVtZW50KCkpCi0gICAgICAgICAgICBzdGF0ZS5kb2N1bWVudCgpLnNldFdyaXRpbmdNb2Rl U2V0T25Eb2N1bWVudEVsZW1lbnQodHJ1ZSk7Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0KLSAg ICBjYXNlIENTU1Byb3BlcnR5V2Via2l0VGV4dE9yaWVudGF0aW9uOiB7Ci0gICAgICAgIEhBTkRM RV9JTkhFUklUX0FORF9JTklUSUFMKHRleHRPcmllbnRhdGlvbiwgVGV4dE9yaWVudGF0aW9uKTsK LQotICAgICAgICBpZiAocHJpbWl0aXZlVmFsdWUpCi0gICAgICAgICAgICBzZXRUZXh0T3JpZW50 YXRpb24oKnByaW1pdGl2ZVZhbHVlKTsKLQotICAgICAgICByZXR1cm47Ci0gICAgfQotCiAgICAg Ly8gQ1NTIEZvbnRzIE1vZHVsZSBMZXZlbCAzCiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdEZv bnRGZWF0dXJlU2V0dGluZ3M6IHsKICAgICAgICAgaWYgKHByaW1pdGl2ZVZhbHVlICYmIHByaW1p dGl2ZVZhbHVlLT5nZXRWYWx1ZUlEKCkgPT0gQ1NTVmFsdWVOb3JtYWwpIHsKQEAgLTI4MDksMTYg KzI3NDksNiBAQCB2b2lkIFN0eWxlUmVzb2x2ZXI6OmFwcGx5UHJvcGVydHkoQ1NTUHJvCiAgICAg ICAgIHJldHVybjsKICAgICB9CiAjZW5kaWYgLyogRU5BQkxFKENTU19HUklEX0xBWU9VVCkgKi8K LQotICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRKdXN0aWZ5U2VsZjoKLSAgICAgICAgSEFORExF X0lOSEVSSVRfQU5EX0lOSVRJQUwoanVzdGlmeVNlbGYsIEp1c3RpZnlTZWxmKTsKLSAgICAgICAg aWYgKFBhaXIqIHBhaXJWYWx1ZSA9IHByaW1pdGl2ZVZhbHVlLT5nZXRQYWlyVmFsdWUoKSkgewot ICAgICAgICAgICAgc3RhdGUuc3R5bGUoKS0+c2V0SnVzdGlmeVNlbGYoKnBhaXJWYWx1ZS0+Zmly c3QoKSk7Ci0gICAgICAgICAgICBzdGF0ZS5zdHlsZSgpLT5zZXRKdXN0aWZ5U2VsZk92ZXJmbG93 QWxpZ25tZW50KCpwYWlyVmFsdWUtPnNlY29uZCgpKTsKLSAgICAgICAgfSBlbHNlCi0gICAgICAg ICAgICBzdGF0ZS5zdHlsZSgpLT5zZXRKdXN0aWZ5U2VsZigqcHJpbWl0aXZlVmFsdWUpOwotICAg ICAgICByZXR1cm47Ci0KICNpZiBFTkFCTEUoQ1NTX1NDUk9MTF9TTkFQKQogICAgIGNhc2UgQ1NT UHJvcGVydHlXZWJraXRTY3JvbGxTbmFwVHlwZToKICAgICAgICAgSEFORExFX0lOSEVSSVRfQU5E X0lOSVRJQUwoc2Nyb2xsU25hcFR5cGUsIFNjcm9sbFNuYXBUeXBlKTsKQEAgLTMwMDksNiArMjkz OSwxMCBAQCB2b2lkIFN0eWxlUmVzb2x2ZXI6OmFwcGx5UHJvcGVydHkoQ1NTUHJvCiAgICAgY2Fz ZSBDU1NQcm9wZXJ0eVdlYmtpdENvbHVtbkJyZWFrQWZ0ZXI6CiAgICAgY2FzZSBDU1NQcm9wZXJ0 eVdlYmtpdENvbHVtbkJyZWFrQmVmb3JlOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRDb2x1 bW5CcmVha0luc2lkZToKKyAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0SnVzdGlmeVNlbGY6Cisg ICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdExvY2FsZToKKyAgICBjYXNlIENTU1Byb3BlcnR5V2Vi a2l0VGV4dE9yaWVudGF0aW9uOgorICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRXcml0aW5nTW9k ZToKICAgICBjYXNlIENTU1Byb3BlcnR5Q29sdW1uQ291bnQ6CiAgICAgY2FzZSBDU1NQcm9wZXJ0 eUNvbHVtbkdhcDoKICAgICBjYXNlIENTU1Byb3BlcnR5Q29sdW1uUHJvZ3Jlc3Npb246CkBAIC0z MDcxLDYgKzMwMDUsNyBAQCB2b2lkIFN0eWxlUmVzb2x2ZXI6OmFwcGx5UHJvcGVydHkoQ1NTUHJv CiAgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdE1hc2tTaXplOgogICAgIGNhc2UgQ1NTUHJvcGVy dHlXZWJraXRNYXNrU291cmNlVHlwZToKICAgICBjYXNlIENTU1Byb3BlcnR5V2Via2l0TmJzcE1v ZGU6CisgICAgY2FzZSBDU1NQcm9wZXJ0eVdlYmtpdFBlcnNwZWN0aXZlOgogICAgIGNhc2UgQ1NT UHJvcGVydHlXZWJraXRQZXJzcGVjdGl2ZU9yaWdpbjoKICAgICBjYXNlIENTU1Byb3BlcnR5V2Vi a2l0UGVyc3BlY3RpdmVPcmlnaW5YOgogICAgIGNhc2UgQ1NTUHJvcGVydHlXZWJraXRQZXJzcGVj dGl2ZU9yaWdpblk6Cg==