53225 2011-01-26 23:28:29 -0800 REGRESSION (r76743): Uneven spacing in right-to-left justified text 2011-01-27 00:25:40 -0800 1 1 1 Unclassified WebKit Text 528+ (Nightly build) All All RESOLVED FIXED LayoutTestFailure, Regression P1 Major --- 1 mitz webkit-unassigned oldest_to_newest 340739 0 mitz 2011-01-26 23:28:29 -0800 In r76743 I’ve introduced a regression in right-to-left justified text, since the notions of “trailing expansion” and “after expansion” are visual, but some Font code behaves like they’re logical. 340744 1 80298 mitz 2011-01-27 00:16:30 -0800 Created attachment 80298 Fix up the mix up 340748 2 mitz 2011-01-27 00:24:03 -0800 Fixed in r76768. <http://trac.webkit.org/changeset/76768> 80298 2011-01-27 00:16:30 -0800 2011-01-27 00:18:52 -0800 Fix up the mix up 53225_r1.diff text/plain 8973 mitz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc2NzY2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTEtMDEtMjcgIERhbiBCZXJu c3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBSRUdSRVNTSU9OIChyNzY3NDMpOiBVbmV2ZW4gc3BhY2luZyBpbiBy aWdodC10by1sZWZ0IGp1c3RpZmllZCB0ZXh0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD01MzIyNQorCisgICAgICAgIEZpeGVzIGZhaWx1cmUgaW4gZmFz dC90ZXh0L2F0c3VpLXNwYWNpbmctZmVhdHVyZXMuaHRtbAorCisgICAgICAgIFRoZXJlIHdhcyBh biBpbmNvbnNpc3RlbmN5IGJldHdlZW4gcmVuZGVyaW5nIGNvZGUgYW5kIGZvbnQgY29kZSBpbiB0 aGUgaW50ZXJwcmV0YXRpb24gb2YKKyAgICAgICAgJ2FmdGVyIGV4cGFuc2lvbicgYW5kICd0cmFp bGluZyBleHBhbnNpb24nLiBDaGFuZ2VkIGFsbCBjb2RlIHRvIGludGVycHJldCB0aGVzZSBpbiB0 ZXJtcyBvZgorICAgICAgICB2aXN1YWwgb3JkZXIgcmF0aGVyIHRoYW4gbG9naWNhbC4KKworICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Rm9u dDo6ZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudCk6IEFkZGVkIGEgdGV4dCBkaXJlY3Rpb24gcGFy YW1ldGVyIGFuZCBjaGFuZ2VkIHRvCisgICAgICAgIGl0ZXJhdGUgaW4gdmlzdWFsIG9yZGVyIGFj Y29yZGluZ2x5LgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaDoKKyAgICAgICAg KiBwbGF0Zm9ybS9ncmFwaGljcy9XaWR0aEl0ZXJhdG9yLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OldpZHRoSXRlcmF0b3I6OldpZHRoSXRlcmF0b3IpOiBQYXNzIHRoZSBydW4gZGlyZWN0aW9uIHRv IGV4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQoKS4KKyAgICAgICAgKFdlYkNvcmU6OldpZHRoSXRl cmF0b3I6OmFkdmFuY2UpOiBGb3IgcmlnaHQtdG8tbGVmdCBydW5zLCBldmFsdWF0ZSB0aGUgdHJh aWxpbmcgZXhwYW5zaW9uCisgICAgICAgIGNvbmRpdGlvbiB3aXRoIHJlc3BlY3QgdG8gdGhlIGZp cnN0IGNoYXJhY3Rlciwgd2hpY2ggaXMgdGhlIHRyYWlsaW5nIGNoYXJhY3RlciBpbiB2aXN1YWwg b3JkZXIuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL0NvbXBsZXhUZXh0Q29udHJv bGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDb21wbGV4VGV4dENvbnRyb2xsZXI6OkNvbXBs ZXhUZXh0Q29udHJvbGxlcik6IFBhc3MgdGhlIHJ1biBkaXJlY3Rpb24gdG8KKyAgICAgICAgZXhw YW5zaW9uT3Bwb3J0dW5pdHlDb3VudCgpLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCbG9j a0xpbmVMYXlvdXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OmNvbXB1dGVJ bmxpbmVEaXJlY3Rpb25Qb3NpdGlvbnNGb3JMaW5lKTogRGl0dG8uCisKIDIwMTEtMDEtMjYgIEFk YW0gUm9iZW4gIDxhcm9iZW5AYXBwbGUuY29tPgogCiAgICAgICAgIERvbid0IGNyZWF0ZSB0aGUg RGlyZWN0M0QgZGV2aWNlIGJlZm9yZSBpdCdzIGZpcnN0IG5lZWRlZApJbmRleDogU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5jcHAJKHJldmlzaW9uIDc2NzUwKQorKysgU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTQ1OCwyOSArNDU4LDUyIEBAIGJvb2wgRm9udDo6aXNDSktJZGVvZ3JhcGhPclN5bWJvbChVQ2hh cjMKICAgICByZXR1cm4gaXNDSktJZGVvZ3JhcGgoYyk7CiB9CiAKLXVuc2lnbmVkIEZvbnQ6OmV4 cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQoY29uc3QgVUNoYXIqIGNoYXJhY3RlcnMsIHNpemVfdCBs ZW5ndGgsIGJvb2wmIGlzQWZ0ZXJFeHBhbnNpb24pCit1bnNpZ25lZCBGb250OjpleHBhbnNpb25P cHBvcnR1bml0eUNvdW50KGNvbnN0IFVDaGFyKiBjaGFyYWN0ZXJzLCBzaXplX3QgbGVuZ3RoLCBU ZXh0RGlyZWN0aW9uIGRpcmVjdGlvbiwgYm9vbCYgaXNBZnRlckV4cGFuc2lvbikKIHsKICAgICBz dGF0aWMgYm9vbCBleHBhbmRBcm91bmRJZGVvZ3JhcGhzID0gY2FuRXhwYW5kQXJvdW5kSWRlb2dy YXBoc0luQ29tcGxleFRleHQoKTsKICAgICB1bnNpZ25lZCBjb3VudCA9IDA7Ci0gICAgZm9yIChz aXplX3QgaSA9IDA7IGkgPCBsZW5ndGg7ICsraSkgewotICAgICAgICBVQ2hhcjMyIGNoYXJhY3Rl ciA9IGNoYXJhY3RlcnNbaV07Ci0gICAgICAgIGlmICh0cmVhdEFzU3BhY2UoY2hhcmFjdGVyKSkg ewotICAgICAgICAgICAgY291bnQrKzsKLSAgICAgICAgICAgIGlzQWZ0ZXJFeHBhbnNpb24gPSB0 cnVlOwotICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgIH0KLSAgICAgICAgaWYgKFUxNl9J U19MRUFEKGNoYXJhY3RlcikgJiYgaSArIDEgPCBsZW5ndGggJiYgVTE2X0lTX1RSQUlMKGNoYXJh Y3RlcnNbaSArIDFdKSkgewotICAgICAgICAgICAgY2hhcmFjdGVyID0gVTE2X0dFVF9TVVBQTEVN RU5UQVJZKGNoYXJhY3RlciwgY2hhcmFjdGVyc1tpICsgMV0pOwotICAgICAgICAgICAgaSsrOwor ICAgIGlmIChkaXJlY3Rpb24gPT0gTFRSKSB7CisgICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBp IDwgbGVuZ3RoOyArK2kpIHsKKyAgICAgICAgICAgIFVDaGFyMzIgY2hhcmFjdGVyID0gY2hhcmFj dGVyc1tpXTsKKyAgICAgICAgICAgIGlmICh0cmVhdEFzU3BhY2UoY2hhcmFjdGVyKSkgeworICAg ICAgICAgICAgICAgIGNvdW50Kys7CisgICAgICAgICAgICAgICAgaXNBZnRlckV4cGFuc2lvbiA9 IHRydWU7CisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAgICAgICB9CisgICAgICAg ICAgICBpZiAoVTE2X0lTX0xFQUQoY2hhcmFjdGVyKSAmJiBpICsgMSA8IGxlbmd0aCAmJiBVMTZf SVNfVFJBSUwoY2hhcmFjdGVyc1tpICsgMV0pKSB7CisgICAgICAgICAgICAgICAgY2hhcmFjdGVy ID0gVTE2X0dFVF9TVVBQTEVNRU5UQVJZKGNoYXJhY3RlciwgY2hhcmFjdGVyc1tpICsgMV0pOwor ICAgICAgICAgICAgICAgIGkrKzsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGlmIChleHBh bmRBcm91bmRJZGVvZ3JhcGhzICYmIGlzQ0pLSWRlb2dyYXBoKGNoYXJhY3RlcikpIHsKKyAgICAg ICAgICAgICAgICBpZiAoIWlzQWZ0ZXJFeHBhbnNpb24pCisgICAgICAgICAgICAgICAgICAgIGNv dW50Kys7CisgICAgICAgICAgICAgICAgY291bnQrKzsKKyAgICAgICAgICAgICAgICBpc0FmdGVy RXhwYW5zaW9uID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAg IH0KKyAgICAgICAgICAgIGlzQWZ0ZXJFeHBhbnNpb24gPSBmYWxzZTsKICAgICAgICAgfQotICAg ICAgICBpZiAoZXhwYW5kQXJvdW5kSWRlb2dyYXBocyAmJiBpc0NKS0lkZW9ncmFwaChjaGFyYWN0 ZXIpKSB7Ci0gICAgICAgICAgICBpZiAoIWlzQWZ0ZXJFeHBhbnNpb24pCisgICAgfSBlbHNlIHsK KyAgICAgICAgZm9yIChzaXplX3QgaSA9IGxlbmd0aDsgaSA+IDA7IC0taSkgeworICAgICAgICAg ICAgVUNoYXIzMiBjaGFyYWN0ZXIgPSBjaGFyYWN0ZXJzW2kgLSAxXTsKKyAgICAgICAgICAgIGlm ICh0cmVhdEFzU3BhY2UoY2hhcmFjdGVyKSkgeworICAgICAgICAgICAgICAgIGNvdW50Kys7Cisg ICAgICAgICAgICAgICAgaXNBZnRlckV4cGFuc2lvbiA9IHRydWU7CisgICAgICAgICAgICAgICAg Y29udGludWU7CisgICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAoVTE2X0lTX1RSQUlMKGNo YXJhY3RlcikgJiYgaSA+IDEgJiYgVTE2X0lTX0xFQUQoY2hhcmFjdGVyc1tpIC0gMl0pKSB7Cisg ICAgICAgICAgICAgICAgY2hhcmFjdGVyID0gVTE2X0dFVF9TVVBQTEVNRU5UQVJZKGNoYXJhY3Rl cnNbaSAtIDJdLCBjaGFyYWN0ZXIpOworICAgICAgICAgICAgICAgIGktLTsKKyAgICAgICAgICAg IH0KKyAgICAgICAgICAgIGlmIChleHBhbmRBcm91bmRJZGVvZ3JhcGhzICYmIGlzQ0pLSWRlb2dy YXBoKGNoYXJhY3RlcikpIHsKKyAgICAgICAgICAgICAgICBpZiAoIWlzQWZ0ZXJFeHBhbnNpb24p CisgICAgICAgICAgICAgICAgICAgIGNvdW50Kys7CiAgICAgICAgICAgICAgICAgY291bnQrKzsK LSAgICAgICAgICAgIGNvdW50Kys7Ci0gICAgICAgICAgICBpc0FmdGVyRXhwYW5zaW9uID0gdHJ1 ZTsKLSAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgICAgIGlzQWZ0ZXJFeHBhbnNp b24gPSB0cnVlOworICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICAgICAgfQorICAg ICAgICAgICAgaXNBZnRlckV4cGFuc2lvbiA9IGZhbHNlOwogICAgICAgICB9Ci0gICAgICAgIGlz QWZ0ZXJFeHBhbnNpb24gPSBmYWxzZTsKICAgICB9CiAgICAgcmV0dXJuIGNvdW50OwogfQpJbmRl eDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvRm9udC5oCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ZvbnQuaAkocmV2aXNpb24gNzY3NTAp CisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9Gb250LmgJKHdvcmtpbmcgY29w eSkKQEAgLTI5LDYgKzI5LDcgQEAKICNpbmNsdWRlICJGb250RGVzY3JpcHRpb24uaCIKICNpbmNs dWRlICJGb250RmFsbGJhY2tMaXN0LmgiCiAjaW5jbHVkZSAiU2ltcGxlRm9udERhdGEuaCIKKyNp bmNsdWRlICJUZXh0RGlyZWN0aW9uLmgiCiAjaW5jbHVkZSAiVHlwZXNldHRpbmdGZWF0dXJlcy5o IgogI2luY2x1ZGUgPHd0Zi9IYXNoTWFwLmg+CiAjaW5jbHVkZSA8d3RmL0hhc2hTZXQuaD4KQEAg LTE0Myw3ICsxNDQsNyBAQCBwdWJsaWM6CiAgICAgc3RhdGljIGJvb2wgaXNDSktJZGVvZ3JhcGgo VUNoYXIzMik7CiAgICAgc3RhdGljIGJvb2wgaXNDSktJZGVvZ3JhcGhPclN5bWJvbChVQ2hhcjMy KTsKIAotICAgIHN0YXRpYyB1bnNpZ25lZCBleHBhbnNpb25PcHBvcnR1bml0eUNvdW50KGNvbnN0 IFVDaGFyKiwgc2l6ZV90IGxlbmd0aCwgYm9vbCYgaXNBZnRlckV4cGFuc2lvbik7CisgICAgc3Rh dGljIHVuc2lnbmVkIGV4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQoY29uc3QgVUNoYXIqLCBzaXpl X3QgbGVuZ3RoLCBUZXh0RGlyZWN0aW9uLCBib29sJiBpc0FmdGVyRXhwYW5zaW9uKTsKIAogI2lm IFBMQVRGT1JNKFFUKQogICAgIFFGb250IGZvbnQoKSBjb25zdDsKSW5kZXg6IFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuY3BwCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0b3IuY3BwCShyZXZpc2lv biA3Njc1MCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1dpZHRoSXRlcmF0 b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02NCw3ICs2NCw3IEBAIFdpZHRoSXRlcmF0b3I6Oldp ZHRoSXRlcmF0b3IoY29uc3QgRm9udCoKICAgICAgICAgbV9leHBhbnNpb25QZXJPcHBvcnR1bml0 eSA9IDA7CiAgICAgZWxzZSB7CiAgICAgICAgIGJvb2wgaXNBZnRlckV4cGFuc2lvbiA9IHRydWU7 Ci0gICAgICAgIHVuc2lnbmVkIGV4cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQgPSBGb250OjpleHBh bnNpb25PcHBvcnR1bml0eUNvdW50KG1fcnVuLmNoYXJhY3RlcnMoKSwgbV9lbmQsIGlzQWZ0ZXJF eHBhbnNpb24pOworICAgICAgICB1bnNpZ25lZCBleHBhbnNpb25PcHBvcnR1bml0eUNvdW50ID0g Rm9udDo6ZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudChtX3J1bi5jaGFyYWN0ZXJzKCksIG1fZW5k LCBtX3J1bi5sdHIoKSA/IExUUiA6IFJUTCwgaXNBZnRlckV4cGFuc2lvbik7CiAgICAgICAgIGlm IChpc0FmdGVyRXhwYW5zaW9uICYmICFtX3J1bi5hbGxvd3NUcmFpbGluZ0V4cGFuc2lvbigpKQog ICAgICAgICAgICAgZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudC0tOwogCkBAIC0xNzcsNyArMTc3 LDggQEAgdm9pZCBXaWR0aEl0ZXJhdG9yOjphZHZhbmNlKGludCBvZmZzZXQsIAogICAgICAgICAg ICAgYm9vbCB0cmVhdEFzU3BhY2UgPSBGb250Ojp0cmVhdEFzU3BhY2UoYyk7CiAgICAgICAgICAg ICBpZiAodHJlYXRBc1NwYWNlIHx8IChleHBhbmRBcm91bmRJZGVvZ3JhcGhzICYmIEZvbnQ6Omlz Q0pLSWRlb2dyYXBoKGMpKSkgewogICAgICAgICAgICAgICAgIC8vIERpc3RyaWJ1dGUgdGhlIHJ1 bidzIHRvdGFsIGV4cGFuc2lvbiBldmVubHkgb3ZlciBhbGwgZXhwYW5zaW9uIG9wcG9ydHVuaXRp ZXMgaW4gdGhlIHJ1bi4KLSAgICAgICAgICAgICAgICBpZiAobV9leHBhbnNpb24gJiYgKG1fcnVu LmFsbG93c1RyYWlsaW5nRXhwYW5zaW9uKCkgfHwgY3VycmVudENoYXJhY3RlciArIGNsdXN0ZXJM ZW5ndGggPCBzdGF0aWNfY2FzdDxzaXplX3Q+KG1fcnVuLmxlbmd0aCgpKSkpIHsKKyAgICAgICAg ICAgICAgICBpZiAobV9leHBhbnNpb24gJiYgKG1fcnVuLmFsbG93c1RyYWlsaW5nRXhwYW5zaW9u KCkgfHwgKG1fcnVuLmx0cigpICYmIGN1cnJlbnRDaGFyYWN0ZXIgKyBjbHVzdGVyTGVuZ3RoIDwg c3RhdGljX2Nhc3Q8c2l6ZV90PihtX3J1bi5sZW5ndGgoKSkpCisgICAgICAgICAgICAgICAgICAg IHx8IChtX3J1bi5ydGwoKSAmJiBjdXJyZW50Q2hhcmFjdGVyKSkpIHsKICAgICAgICAgICAgICAg ICAgICAgZmxvYXQgcHJldmlvdXNFeHBhbnNpb24gPSBtX2V4cGFuc2lvbjsKICAgICAgICAgICAg ICAgICAgICAgaWYgKCF0cmVhdEFzU3BhY2UgJiYgIW1faXNBZnRlckV4cGFuc2lvbikgewogICAg ICAgICAgICAgICAgICAgICAgICAgLy8gVGFrZSB0aGUgZXhwYW5zaW9uIG9wcG9ydHVuaXR5IGJl Zm9yZSB0aGlzIGlkZW9ncmFwaC4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL21hYy9Db21wbGV4VGV4dENvbnRyb2xsZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9Db21wbGV4VGV4dENvbnRyb2xsZXIuY3BwCShy ZXZpc2lvbiA3Njc1MCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9D b21wbGV4VGV4dENvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC04NCw3ICs4NCw3IEBA IENvbXBsZXhUZXh0Q29udHJvbGxlcjo6Q29tcGxleFRleHRDb250cm8KICAgICAgICAgbV9leHBh bnNpb25QZXJPcHBvcnR1bml0eSA9IDA7CiAgICAgZWxzZSB7CiAgICAgICAgIGJvb2wgaXNBZnRl ckV4cGFuc2lvbiA9IHRydWU7Ci0gICAgICAgIHVuc2lnbmVkIGV4cGFuc2lvbk9wcG9ydHVuaXR5 Q291bnQgPSBGb250OjpleHBhbnNpb25PcHBvcnR1bml0eUNvdW50KG1fcnVuLmNoYXJhY3RlcnMo KSwgbV9lbmQsIGlzQWZ0ZXJFeHBhbnNpb24pOworICAgICAgICB1bnNpZ25lZCBleHBhbnNpb25P cHBvcnR1bml0eUNvdW50ID0gRm9udDo6ZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudChtX3J1bi5j aGFyYWN0ZXJzKCksIG1fZW5kLCBtX3J1bi5sdHIoKSA/IExUUiA6IFJUTCwgaXNBZnRlckV4cGFu c2lvbik7CiAgICAgICAgIGlmIChpc0FmdGVyRXhwYW5zaW9uICYmICFtX3J1bi5hbGxvd3NUcmFp bGluZ0V4cGFuc2lvbigpKQogICAgICAgICAgICAgZXhwYW5zaW9uT3Bwb3J0dW5pdHlDb3VudC0t OwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0 LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tM aW5lTGF5b3V0LmNwcAkocmV2aXNpb24gNzY3NTApCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzI0LDcgKzMy NCw3IEBAIHZvaWQgUmVuZGVyQmxvY2s6OmNvbXB1dGVJbmxpbmVEaXJlY3Rpb24KICAgICAgICAg ICAgIFJlbmRlclRleHQqIHJ0ID0gdG9SZW5kZXJUZXh0KHItPm1fb2JqZWN0KTsKIAogICAgICAg ICAgICAgaWYgKHRleHRBbGlnbiA9PSBKVVNUSUZZICYmIHIgIT0gdHJhaWxpbmdTcGFjZVJ1bikg ewotICAgICAgICAgICAgICAgIHVuc2lnbmVkIG9wcG9ydHVuaXRpZXNJblJ1biA9IEZvbnQ6OmV4 cGFuc2lvbk9wcG9ydHVuaXR5Q291bnQocnQtPmNoYXJhY3RlcnMoKSArIHItPm1fc3RhcnQsIHIt Pm1fc3RvcCAtIHItPm1fc3RhcnQsIGlzQWZ0ZXJFeHBhbnNpb24pOworICAgICAgICAgICAgICAg IHVuc2lnbmVkIG9wcG9ydHVuaXRpZXNJblJ1biA9IEZvbnQ6OmV4cGFuc2lvbk9wcG9ydHVuaXR5 Q291bnQocnQtPmNoYXJhY3RlcnMoKSArIHItPm1fc3RhcnQsIHItPm1fc3RvcCAtIHItPm1fc3Rh cnQsIHItPm1fYm94LT5kaXJlY3Rpb24oKSwgaXNBZnRlckV4cGFuc2lvbik7CiAgICAgICAgICAg ICAgICAgZXhwYW5zaW9uT3Bwb3J0dW5pdGllcy5hcHBlbmQob3Bwb3J0dW5pdGllc0luUnVuKTsK ICAgICAgICAgICAgICAgICBleHBhbnNpb25PcHBvcnR1bml0eUNvdW50ICs9IG9wcG9ydHVuaXRp ZXNJblJ1bjsKICAgICAgICAgICAgIH0K