137092 2014-09-24 17:21:04 -0700 [SVG -> OTF Converter] Arabic forms are not substituted correctly 2014-10-04 23:34:14 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mmaxfield mmaxfield commit-queue darin dino d-r fmalita gyuyoung.kim jonlee pdr schenney sergio simon.fraser thorton oldest_to_newest 1037094 0 mmaxfield 2014-09-24 17:21:04 -0700 The following tests fail because of this (when the SVG -> OTF converter is turned on): svg/W3C-SVG-1.1/fonts-glyph-02-t.svg svg/custom/glyph-selection-arabic-forms.svg 1037794 1 238821 mmaxfield 2014-09-28 14:07:58 -0700 Created attachment 238821 Patch depends on https://bugs.webkit.org/show_bug.cgi?id=137097 1039330 2 239229 mmaxfield 2014-10-03 13:58:29 -0700 Created attachment 239229 Patch 1039577 3 239229 commit-queue 2014-10-04 23:34:09 -0700 Comment on attachment 239229 Patch Clearing flags on attachment: 239229 Committed r174325: <http://trac.webkit.org/changeset/174325> 1039578 4 commit-queue 2014-10-04 23:34:14 -0700 All reviewed patches have been landed. Closing bug. 238821 2014-09-28 14:07:58 -0700 2014-10-03 13:58:26 -0700 Patch depends on https://bugs.webkit.org/show_bug.cgi?id=137097 patch.txt text/plain 10900 mmaxfield Y29tbWl0IDNkN2UwNDczZWIyNDdmMTc2MTZhZGZkOTlhNTdhMWM3ZTc5NmIyYjEKQXV0aG9yOiBN eWxlcyBDLiBNYXhmaWVsZCA8bW1heGZpZWxkQGFwcGxlLmNvbT4KRGF0ZTogICBTdW4gU2VwIDI4 IDE0OjA1OjA4IDIwMTQgLTA3MDAKCiAgICBbU1ZHIC0+IE9URiBDb252ZXJ0ZXJdIEFyYWJpYyBm b3JtcyBhcmUgbm90IHN1YnN0aXR1dGVkIGNvcnJlY3RseQogICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzA5MgogICAgCiAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KICAgIAogICAgVGVzdHM6IHN2Zy9XM0MtU1ZHLTEuMS9mb250cy1nbHlwaC0wMi10 LnN2ZwogICAgICAgICAgIHN2Zy9jdXN0b20vZ2x5cGgtc2VsZWN0aW9uLWFyYWJpYy1mb3Jtcy5z dmcKICAgIAogICAgKiBzdmcvU1ZHVG9PVEZGb250Q29udmVyc2lvbi5jcHA6CiAgICAoV2ViQ29y ZTo6U1ZHVG9PVEZGb250Q29udmVydGVyOjphcHBlbmRBcmFiaWNSZXBsYWNlbWVudFN1YnRhYmxl KTogSW52b2tlZCBmb3IgZWFjaCBvZiB0aGUgdGhyZWUKICAgIEFyYWJpYyBmb3JtIHN1YnN0aXR1 dGlvbnMuCiAgICAoV2ViQ29yZTo6U1ZHVG9PVEZGb250Q29udmVydGVyOjphcHBlbmRHU1VCVGFi bGUpOiBPcGVuVHlwZSAiQWR2YW5jZWQgVHlwb2dyYXBoaWMgVGFibGUiOgogICAgIkdseXBoIHN1 YnN0aXR1dGlvbiBkYXRhIgogICAgKFdlYkNvcmU6OlNWR1RvT1RGRm9udENvbnZlcnRlcjo6U1ZH VG9PVEZGb250Q29udmVydGVyKTogUmUtb3JkZXIgdGhlIG1fY29kZXBvaW50c1RvSW5kaWNlc01h cAogICAgdG8gcHJlZmVyIGlzb2xhdGVkIGZvcm1zIG9mIGdseXBocy4KICAgIChXZWJDb3JlOjpT VkdUb09URkZvbnRDb252ZXJ0ZXI6OmNvbnZlcnRTVkdUb09URkZvbnQpOiBBcHBlbmQgdGhlIEdT VUIgdGFibGUuCiAgICAoV2ViQ29yZTo6Y2FsY3VsYXRlQ2hlY2tzdW0pOiBEZWxldGVkLgoKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwppbmRleCBkZjExZjcxLi5jNjQ4MjI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAK KzIwMTQtMDktMjggIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbU1ZHIC0+IE9URiBDb252ZXJ0ZXJdIEFyYWJpYyBmb3JtcyBhcmUgbm90IHN1YnN0 aXR1dGVkIGNvcnJlY3RseQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTM3MDkyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgVGVzdHM6IHN2Zy9XM0MtU1ZHLTEuMS9mb250cy1nbHlwaC0wMi10LnN2ZworICAg ICAgICAgICAgICAgc3ZnL2N1c3RvbS9nbHlwaC1zZWxlY3Rpb24tYXJhYmljLWZvcm1zLnN2Zwor CisgICAgICAgICogc3ZnL1NWR1RvT1RGRm9udENvbnZlcnNpb24uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6U1ZHVG9PVEZGb250Q29udmVydGVyOjphcHBlbmRBcmFiaWNSZXBsYWNlbWVudFN1YnRh YmxlKTogSW52b2tlZCBmb3IgZWFjaCBvZiB0aGUgdGhyZWUKKyAgICAgICAgQXJhYmljIGZvcm0g c3Vic3RpdHV0aW9ucy4KKyAgICAgICAgKFdlYkNvcmU6OlNWR1RvT1RGRm9udENvbnZlcnRlcjo6 YXBwZW5kR1NVQlRhYmxlKTogT3BlblR5cGUgIkFkdmFuY2VkIFR5cG9ncmFwaGljIFRhYmxlIjoK KyAgICAgICAgIkdseXBoIHN1YnN0aXR1dGlvbiBkYXRhIgorICAgICAgICAoV2ViQ29yZTo6U1ZH VG9PVEZGb250Q29udmVydGVyOjpTVkdUb09URkZvbnRDb252ZXJ0ZXIpOiBSZS1vcmRlciB0aGUg bV9jb2RlcG9pbnRzVG9JbmRpY2VzTWFwCisgICAgICAgIHRvIHByZWZlciBpc29sYXRlZCBmb3Jt cyBvZiBnbHlwaHMuCisgICAgICAgIChXZWJDb3JlOjpTVkdUb09URkZvbnRDb252ZXJ0ZXI6OmNv bnZlcnRTVkdUb09URkZvbnQpOiBBcHBlbmQgdGhlIEdTVUIgdGFibGUuCisgICAgICAgIChXZWJD b3JlOjpjYWxjdWxhdGVDaGVja3N1bSk6IERlbGV0ZWQuCisKIDIwMTQtMDktMjggIE15bGVzIEMu IE1heGZpZWxkICA8bGl0aGVydW1AZ21haWwuY29tPgogCiAgICAgICAgIFtTVkcgLT4gT1RGIENv bnZlcnRlcl0gU3VwcG9ydCBub24tQk1QIGNvZGVwb2ludHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3N2Zy9TVkdUb09URkZvbnRDb252ZXJzaW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3N2 Zy9TVkdUb09URkZvbnRDb252ZXJzaW9uLmNwcAppbmRleCBlZTA0YWRmLi4zMmMzNTE4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9zdmcvU1ZHVG9PVEZGb250Q29udmVyc2lvbi5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1RvT1RGRm9udENvbnZlcnNpb24uY3BwCkBAIC0xNDIs NiArMTQyLDcgQEAgcHJpdmF0ZToKICAgICB0eXBlZGVmIHZvaWQgKFNWR1RvT1RGRm9udENvbnZl cnRlcjo6KkZvbnRBcHBlbmRpbmdGdW5jdGlvbikoKTsKICAgICB2b2lkIGFwcGVuZFRhYmxlKGNv bnN0IGNoYXIgaWRlbnRpZmllcls0XSwgRm9udEFwcGVuZGluZ0Z1bmN0aW9uKTsKICAgICB2b2lk IGFwcGVuZENNQVBUYWJsZSgpOworICAgIHZvaWQgYXBwZW5kR1NVQlRhYmxlKCk7CiAgICAgdm9p ZCBhcHBlbmRIRUFEVGFibGUoKTsKICAgICB2b2lkIGFwcGVuZEhIRUFUYWJsZSgpOwogICAgIHZv aWQgYXBwZW5kSE1UWFRhYmxlKCk7CkBAIC0xNzAsNiArMTcxLDggQEAgcHJpdmF0ZToKICAgICB0 ZW1wbGF0ZSA8dHlwZW5hbWUgVD4KICAgICBzaXplX3QgYXBwZW5kS0VSTlN1YnRhYmxlKGJvb2wg KFQ6OipidWlsZEtlcm5pbmdQYWlyKShTVkdLZXJuaW5nUGFpciYpIGNvbnN0LCB1aW50MTZfdCBj b3ZlcmFnZSk7CiAKKyAgICB2b2lkIGFwcGVuZEFyYWJpY1JlcGxhY2VtZW50U3VidGFibGUoc2l6 ZV90IHN1YnRhYmxlUmVjb3JkTG9jYXRpb24sIGNvbnN0IFN0cmluZyYgYXJhYmljRm9ybSk7CisK ICAgICBWZWN0b3I8R2x5cGhEYXRhPiBtX2dseXBoczsKICAgICBIYXNoTWFwPFN0cmluZywgR2x5 cGg+IG1fZ2x5cGhOYW1lVG9JbmRleE1hcDsgLy8gU1ZHIDEuMTogIkl0IGlzIHJlY29tbWVuZGVk IHRoYXQgZ2x5cGggbmFtZXMgYmUgdW5pcXVlIHdpdGhpbiBhIGZvbnQuIgogICAgIEhhc2hNYXA8 Q29kZXBvaW50cywgVmVjdG9yPEdseXBoLCAxPj4gbV9jb2RlcG9pbnRzVG9JbmRpY2VzTWFwOwpA QCAtNTc0LDYgKzU3NywxMTkgQEAgdm9pZCBTVkdUb09URkZvbnRDb252ZXJ0ZXI6OmFwcGVuZENG RlRhYmxlKCkKICAgICAgICAgbV9yZXN1bHQuYXBwZW5kVmVjdG9yKGdseXBoLmNoYXJTdHJpbmcp OwogfQogCit2b2lkIFNWR1RvT1RGRm9udENvbnZlcnRlcjo6YXBwZW5kQXJhYmljUmVwbGFjZW1l bnRTdWJ0YWJsZShzaXplX3Qgc3VidGFibGVSZWNvcmRMb2NhdGlvbiwgY29uc3QgU3RyaW5nJiBh cmFiaWNGb3JtKQoreworICAgIFZlY3RvcjxzdGQ6OnBhaXI8R2x5cGgsIEdseXBoPj4gYXJhYmlj RmluYWxSZXBsYWNlbWVudHM7CisgICAgZm9yIChhdXRvJiBwYWlyIDogbV9jb2RlcG9pbnRzVG9J bmRpY2VzTWFwKSB7CisgICAgICAgIGZvciAoYXV0byBnbHlwaEluZGV4IDogcGFpci52YWx1ZSkg eworICAgICAgICAgICAgYXV0byYgZ2x5cGggPSBtX2dseXBoc1tnbHlwaEluZGV4XTsKKyAgICAg ICAgICAgIGlmIChnbHlwaC5nbHlwaEVsZW1lbnQgJiYgZXF1YWxJZ25vcmluZ0Nhc2UoZ2x5cGgu Z2x5cGhFbGVtZW50LT5mYXN0R2V0QXR0cmlidXRlKFNWR05hbWVzOjphcmFiaWNfZm9ybUF0dHIp LCBhcmFiaWNGb3JtKSkKKyAgICAgICAgICAgICAgICBhcmFiaWNGaW5hbFJlcGxhY2VtZW50cy5h cHBlbmQoc3RkOjptYWtlX3BhaXIocGFpci52YWx1ZVswXSwgZ2x5cGhJbmRleCkpOworICAgICAg ICB9CisgICAgfQorICAgIGlmIChhcmFiaWNGaW5hbFJlcGxhY2VtZW50cy5zaXplKCkgPiBzdGQ6 Om51bWVyaWNfbGltaXRzPHVpbnQxNl90Pjo6bWF4KCkpCisgICAgICAgIGFyYWJpY0ZpbmFsUmVw bGFjZW1lbnRzLmNsZWFyKCk7CisKKyAgICBvdmVyd3JpdGUxNihzdWJ0YWJsZVJlY29yZExvY2F0 aW9uICsgNiwgbV9yZXN1bHQuc2l6ZSgpIC0gc3VidGFibGVSZWNvcmRMb2NhdGlvbik7CisgICAg YXV0byBzdWJ0YWJsZUxvY2F0aW9uID0gbV9yZXN1bHQuc2l6ZSgpOworICAgIGFwcGVuZDE2KDIp OyAvLyBGb3JtYXQgMgorICAgIGFwcGVuZDE2KDApOyAvLyBQbGFjZWhvbGRlciBmb3Igb2Zmc2V0 IHRvIGNvdmVyYWdlIHRhYmxlLCByZWxhdGl2ZSB0byBiZWdpbm5pbmcgb2Ygc3Vic3RpdHV0aW9u IHRhYmxlCisgICAgYXBwZW5kMTYoYXJhYmljRmluYWxSZXBsYWNlbWVudHMuc2l6ZSgpKTsgLy8g R2x5cGhDb3VudAorICAgIGZvciAoYXV0byYgcGFpciA6IGFyYWJpY0ZpbmFsUmVwbGFjZW1lbnRz KQorICAgICAgICBhcHBlbmQxNihwYWlyLnNlY29uZCk7CisKKyAgICBvdmVyd3JpdGUxNihzdWJ0 YWJsZUxvY2F0aW9uICsgMiwgbV9yZXN1bHQuc2l6ZSgpIC0gc3VidGFibGVMb2NhdGlvbik7Cisg ICAgYXBwZW5kMTYoMSk7IC8vIENvdmVyYWdlRm9ybWF0CisgICAgYXBwZW5kMTYoYXJhYmljRmlu YWxSZXBsYWNlbWVudHMuc2l6ZSgpKTsgLy8gR2x5cGhDb3VudAorICAgIGZvciAoYXV0byYgcGFp ciA6IGFyYWJpY0ZpbmFsUmVwbGFjZW1lbnRzKQorICAgICAgICBhcHBlbmQxNihwYWlyLmZpcnN0 KTsKK30KKwordm9pZCBTVkdUb09URkZvbnRDb252ZXJ0ZXI6OmFwcGVuZEdTVUJUYWJsZSgpCit7 CisgICAgYXV0byB0YWJsZUxvY2F0aW9uID0gbV9yZXN1bHQuc2l6ZSgpOworICAgIGF1dG8gaGVh ZGVyU2l6ZSA9IDEwOworCisgICAgYXBwZW5kMzIoMHgwMDAxMDAwMCk7IC8vIFZlcnNpb24KKyAg ICBhcHBlbmQxNihoZWFkZXJTaXplKTsgLy8gT2Zmc2V0IHRvIFNjcmlwdExpc3QKKyAgICBhdXRv IGZlYXR1cmVMaXN0T2Zmc2V0TG9jYXRpb24gPSBtX3Jlc3VsdC5zaXplKCk7CisgICAgYXBwZW5k MTYoMCk7IC8vIFBsYWNlaG9sZGVyIGZvciBGZWF0dXJlTGlzdCBvZmZzZXQKKyAgICBhdXRvIGxv b2t1cExpc3RPZmZzZXRMb2NhdGlvbiA9IG1fcmVzdWx0LnNpemUoKTsKKyAgICBhcHBlbmQxNigw KTsgLy8gUGxhY2Vob2xkZXIgZm9yIExvb2t1cExpc3Qgb2Zmc2V0CisgICAgQVNTRVJUKHRhYmxl TG9jYXRpb24gKyBoZWFkZXJTaXplID09IG1fcmVzdWx0LnNpemUoKSk7CisKKyAgICAvLyBTY3Jp cHRMaXN0CisgICAgYXV0byBzY3JpcHRMaXN0TG9jYXRpb24gPSBtX3Jlc3VsdC5zaXplKCk7Cisg ICAgYXBwZW5kMTYoMSk7IC8vIE51bWJlciBvZiBTY3JpcHRSZWNvcmRzCisgICAgYXBwZW5kNEJ5 dGVDb2RlKCJhcmFiIik7CisgICAgYXBwZW5kMTYobV9yZXN1bHQuc2l6ZSgpICsgMiAtIHNjcmlw dExpc3RMb2NhdGlvbik7IC8vIE9mZnNldCBvZiBTY3JpcHQgdGFibGUsIHJlbGF0aXZlIHRvIGJl Z2lubmluZyBvZiBTY3JpcHRMaXN0CisKKyAgICBhdXRvIHNjcmlwdFRhYmxlTG9jYXRpb24gPSBt X3Jlc3VsdC5zaXplKCk7CisgICAgYXV0byBzaXplT2ZFbXB0eVNjcmlwdFRhYmxlID0gNDsKKyAg ICBhcHBlbmQxNihzaXplT2ZFbXB0eVNjcmlwdFRhYmxlKTsgLy8gT2Zmc2V0IG9mIGRlZmF1bHQg bGFuZ3VhZ2Ugc3lzdGVtIHRhYmxlLCByZWxhdGl2ZSB0byBiZWdpbm5pbmcgb2YgU2NyaXB0IHRh YmxlCisgICAgYXBwZW5kMTYoMCk7IC8vIE51bWJlciBvZiBmb2xsb3dpbmcgbGFuZ3VhZ2Ugc3lz dGVtIHRhYmxlcworICAgIEFTU0VSVF9VTlVTRUQoc2NyaXB0VGFibGVMb2NhdGlvbiwgc2NyaXB0 VGFibGVMb2NhdGlvbiArIHNpemVPZkVtcHR5U2NyaXB0VGFibGUgPT0gbV9yZXN1bHQuc2l6ZSgp KTsKKworICAgIGFwcGVuZDE2KDApOyAvLyBMb29rdXBPcmRlciAiPSBOVUxMIC4uLiByZXNlcnZl ZCIKKyAgICBhcHBlbmQxNigwKTsgLy8gRmlyc3QgZmVhdHVyZSBpcyByZXF1aXJlZAorICAgIHVp bnQxNl90IGZlYXR1cmVDb3VudCA9IDQ7CisgICAgYXBwZW5kMTYoNCk7IC8vIEZlYXR1cmVDb3Vu dAorICAgIGZvciAodWludDE2X3QgaSA9IDA7IGkgPCBmZWF0dXJlQ291bnQ7ICsraSkKKyAgICAg ICAgYXBwZW5kMTYoaSk7IC8vIEluZGV4IG9mIG91ciBmZWF0dXJlIGludG8gdGhlIEZlYXR1cmVM aXN0CisKKyAgICAvLyBGZWF0dXJlTGlzdAorICAgIG92ZXJ3cml0ZTE2KGZlYXR1cmVMaXN0T2Zm c2V0TG9jYXRpb24sIG1fcmVzdWx0LnNpemUoKSAtIHRhYmxlTG9jYXRpb24pOworICAgIGF1dG8g ZmVhdHVyZUxpc3RMb2NhdGlvbiA9IG1fcmVzdWx0LnNpemUoKTsKKyAgICBzaXplX3QgZmVhdHVy ZUxpc3RTaXplID0gMiArIDYgKiBmZWF0dXJlQ291bnQ7CisgICAgc2l6ZV90IGZlYXR1cmVUYWJs ZVNpemUgPSA2OworICAgIGFwcGVuZDE2KGZlYXR1cmVDb3VudCk7IC8vIEZlYXR1cmVDb3VudAor ICAgIGFwcGVuZDRCeXRlQ29kZSgiZmluYSIpOworICAgIGFwcGVuZDE2KGZlYXR1cmVMaXN0U2l6 ZSArIGZlYXR1cmVUYWJsZVNpemUgKiAwKTsgLy8gT2Zmc2V0IG9mIGZlYXR1cmUgdGFibGUsIHJl bGF0aXZlIHRvIGJlZ2lubmluZyBvZiBGZWF0dXJlTGlzdCB0YWJsZQorICAgIGFwcGVuZDRCeXRl Q29kZSgibWVkaSIpOworICAgIGFwcGVuZDE2KGZlYXR1cmVMaXN0U2l6ZSArIGZlYXR1cmVUYWJs ZVNpemUgKiAxKTsgLy8gT2Zmc2V0IG9mIGZlYXR1cmUgdGFibGUsIHJlbGF0aXZlIHRvIGJlZ2lu bmluZyBvZiBGZWF0dXJlTGlzdCB0YWJsZQorICAgIGFwcGVuZDRCeXRlQ29kZSgiaW5pdCIpOwor ICAgIGFwcGVuZDE2KGZlYXR1cmVMaXN0U2l6ZSArIGZlYXR1cmVUYWJsZVNpemUgKiAyKTsgLy8g T2Zmc2V0IG9mIGZlYXR1cmUgdGFibGUsIHJlbGF0aXZlIHRvIGJlZ2lubmluZyBvZiBGZWF0dXJl TGlzdCB0YWJsZQorICAgIGFwcGVuZDRCeXRlQ29kZSgicmxpZyIpOworICAgIGFwcGVuZDE2KGZl YXR1cmVMaXN0U2l6ZSArIGZlYXR1cmVUYWJsZVNpemUgKiAzKTsgLy8gT2Zmc2V0IG9mIGZlYXR1 cmUgdGFibGUsIHJlbGF0aXZlIHRvIGJlZ2lubmluZyBvZiBGZWF0dXJlTGlzdCB0YWJsZQorICAg IEFTU0VSVF9VTlVTRUQoZmVhdHVyZUxpc3RMb2NhdGlvbiwgZmVhdHVyZUxpc3RMb2NhdGlvbiAr IGZlYXR1cmVMaXN0U2l6ZSA9PSBtX3Jlc3VsdC5zaXplKCkpOworCisgICAgZm9yICh1bnNpZ25l ZCBpID0gMDsgaSA8IGZlYXR1cmVDb3VudDsgKytpKSB7CisgICAgICAgIGF1dG8gZmVhdHVyZVRh YmxlU3RhcnQgPSBtX3Jlc3VsdC5zaXplKCk7CisgICAgICAgIGFwcGVuZDE2KDApOyAvLyBGZWF0 dXJlUGFyYW1zICI9IE5VTEwgLi4uIHJlc2VydmVkIgorICAgICAgICBhcHBlbmQxNigxKTsgLy8g TG9va3VwQ291bnQKKyAgICAgICAgYXBwZW5kMTYoaSk7IC8vIExvb2t1cExpc3RJbmRleAorICAg ICAgICBBU1NFUlRfVU5VU0VEKGZlYXR1cmVUYWJsZVN0YXJ0LCBmZWF0dXJlVGFibGVTdGFydCAr IGZlYXR1cmVUYWJsZVNpemUgPT0gbV9yZXN1bHQuc2l6ZSgpKTsKKyAgICB9CisKKyAgICAvLyBM b29rdXBMaXN0CisgICAgb3ZlcndyaXRlMTYobG9va3VwTGlzdE9mZnNldExvY2F0aW9uLCBtX3Jl c3VsdC5zaXplKCkgLSB0YWJsZUxvY2F0aW9uKTsKKyAgICBhdXRvIGxvb2t1cExpc3RMb2NhdGlv biA9IG1fcmVzdWx0LnNpemUoKTsKKyAgICBhcHBlbmQxNihmZWF0dXJlQ291bnQpOyAvLyBMb29r dXBDb3VudAorICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBmZWF0dXJlQ291bnQ7ICsraSkK KyAgICAgICAgYXBwZW5kMTYoMCk7IC8vIFBsYWNlaG9sZGVyIGZvciBvZmZzZXQgdG8gZmVhdHVy ZSB0YWJsZSwgcmVsYXRpdmUgdG8gYmVnaW5uaW5nIG9mIExvb2t1cExpc3QKKyAgICBzaXplX3Qg c3VidGFibGVSZWNvcmRMb2NhdGlvbnNbZmVhdHVyZUNvdW50XTsKKyAgICBmb3IgKHVuc2lnbmVk IGkgPSAwOyBpIDwgZmVhdHVyZUNvdW50OyArK2kpIHsKKyAgICAgICAgc3VidGFibGVSZWNvcmRM b2NhdGlvbnNbaV0gPSBtX3Jlc3VsdC5zaXplKCk7CisgICAgICAgIG92ZXJ3cml0ZTE2KGxvb2t1 cExpc3RMb2NhdGlvbiArIDIgKyAyICogaSwgbV9yZXN1bHQuc2l6ZSgpIC0gbG9va3VwTGlzdExv Y2F0aW9uKTsKKyAgICAgICAgYXBwZW5kMTYoaSA9PSAzID8gMyA6IDEpOyAvLyBUeXBlIDE6ICJS ZXBsYWNlIG9uZSBnbHlwaCB3aXRoIG9uZSBnbHlwaCIgLyBUeXBlIDM6ICJSZXBsYWNlIG9uZSBn bHlwaCB3aXRoIG9uZSBvZiBtYW55IGdseXBocyIKKyAgICAgICAgYXBwZW5kMTYoMCk7IC8vIExv b2t1cEZsYWcKKyAgICAgICAgYXBwZW5kMTYoMSk7IC8vIFN1YlRhYmxlQ291bnQKKyAgICAgICAg YXBwZW5kMTYoMCk7IC8vIFBsYWNlaG9sZGVyIGZvciBvZmZzZXQgdG8gc3VidGFibGUsIHJlbGF0 aXZlIHRvIGJlZ2lubmluZyBvZiBMb29rdXAgdGFibGUKKyAgICB9CisKKyAgICBhcHBlbmRBcmFi aWNSZXBsYWNlbWVudFN1YnRhYmxlKHN1YnRhYmxlUmVjb3JkTG9jYXRpb25zWzBdLCBTdHJpbmco InRlcm1pbmFsIiwgU3RyaW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCkpOworICAgIGFwcGVuZEFy YWJpY1JlcGxhY2VtZW50U3VidGFibGUoc3VidGFibGVSZWNvcmRMb2NhdGlvbnNbMV0sIFN0cmlu ZygibWVkaWFsIiwgU3RyaW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCkpOworICAgIGFwcGVuZEFy YWJpY1JlcGxhY2VtZW50U3VidGFibGUoc3VidGFibGVSZWNvcmRMb2NhdGlvbnNbMl0sIFN0cmlu ZygiaW5pdGlhbCIsIFN0cmluZzo6Q29uc3RydWN0RnJvbUxpdGVyYWwpKTsKKworICAgIC8vIE1h bnVhbGx5IGFwcGVuZCBlbXB0eSAicmxpZyIgc3VidGFibGUKKyAgICBvdmVyd3JpdGUxNihzdWJ0 YWJsZVJlY29yZExvY2F0aW9uc1szXSArIDYsIG1fcmVzdWx0LnNpemUoKSAtIHN1YnRhYmxlUmVj b3JkTG9jYXRpb25zWzNdKTsKKyAgICBhcHBlbmQxNigxKTsgLy8gRm9ybWF0IDEKKyAgICBhcHBl bmQxNig2KTsgLy8gb2Zmc2V0IHRvIGNvdmVyYWdlIHRhYmxlLCByZWxhdGl2ZSB0byBiZWdpbm5p bmcgb2Ygc3Vic3RpdHV0aW9uIHRhYmxlCisgICAgYXBwZW5kMTYoMCk7IC8vIEFsdGVybmF0ZVNl dENvdW50CisgICAgYXBwZW5kMTYoMSk7IC8vIENvdmVyYWdlRm9ybWF0CisgICAgYXBwZW5kMTYo MCk7IC8vIEdseXBoQ291bnQKK30KKwogdm9pZCBTVkdUb09URkZvbnRDb252ZXJ0ZXI6OmFwcGVu ZFZPUkdUYWJsZSgpCiB7CiAgICAgYXBwZW5kMTYoMSk7IC8vIE1ham9yIHZlcnNpb24KQEAgLTEw MTEsOCArMTEyNywxNCBAQCBTVkdUb09URkZvbnRDb252ZXJ0ZXI6OlNWR1RvT1RGRm9udENvbnZl cnRlcihjb25zdCBTVkdGb250RWxlbWVudCYgZm9udEVsZW1lbnQpCiAgICAgICAgICAgICBpZiAo IWdseXBoTmFtZS5pc051bGwoKSkKICAgICAgICAgICAgICAgICBtX2dseXBoTmFtZVRvSW5kZXhN YXAuYWRkKGdseXBoTmFtZSwgaSk7CiAgICAgICAgIH0KLSAgICAgICAgaWYgKCFnbHlwaC5jb2Rl cG9pbnRzLmlzTnVsbCgpKQotICAgICAgICAgICAgbV9jb2RlcG9pbnRzVG9JbmRpY2VzTWFwLmFk ZChnbHlwaC5jb2RlcG9pbnRzLCBWZWN0b3I8R2x5cGg+KCkpLml0ZXJhdG9yLT52YWx1ZS5hcHBl bmQoaSk7CisgICAgICAgIGlmICghZ2x5cGguY29kZXBvaW50cy5pc051bGwoKSkgeworICAgICAg ICAgICAgYXV0byYgZ2x5cGhWZWN0b3IgPSBtX2NvZGVwb2ludHNUb0luZGljZXNNYXAuYWRkKGds eXBoLmNvZGVwb2ludHMsIFZlY3RvcjxHbHlwaD4oKSkuaXRlcmF0b3ItPnZhbHVlOworICAgICAg ICAgICAgLy8gUHJlZmVyIGlzb2xhdGVkIGFyYWJpYyBmb3JtcworICAgICAgICAgICAgaWYgKGds eXBoLmdseXBoRWxlbWVudCAmJiBlcXVhbElnbm9yaW5nQ2FzZShnbHlwaC5nbHlwaEVsZW1lbnQt PmZhc3RHZXRBdHRyaWJ1dGUoU1ZHTmFtZXM6OmFyYWJpY19mb3JtQXR0ciksIFN0cmluZygiaXNv bGF0ZWQiLCBTdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKSkpCisgICAgICAgICAgICAgICAg Z2x5cGhWZWN0b3IuaW5zZXJ0KDAsIGkpOworICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAg ICAgIGdseXBoVmVjdG9yLmFwcGVuZChpKTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIC8vIEZJ WE1FOiBIYW5kbGUgY29tbWFzCkBAIC0xMDg2LDcgKzEyMDgsNyBAQCB2b2lkIFNWR1RvT1RGRm9u dENvbnZlcnRlcjo6Y29udmVydFNWR1RvT1RGRm9udCgpCiAgICAgaWYgKCFtX2dseXBocy5zaXpl KCkpCiAgICAgICAgIHJldHVybjsKIAotICAgIHVpbnQxNl90IG51bVRhYmxlcyA9IDEzOworICAg IHVpbnQxNl90IG51bVRhYmxlcyA9IDE0OwogICAgIHVpbnQxNl90IHJvdW5kZWROdW1UYWJsZXMg PSByb3VuZERvd25Ub1Bvd2VyT2ZUd28obnVtVGFibGVzKTsKICAgICB1aW50MTZfdCBzZWFyY2hS YW5nZSA9IHJvdW5kZWROdW1UYWJsZXMgKiAxNjsgLy8gc2VhcmNoUmFuZ2U6ICIoTWF4aW11bSBw b3dlciBvZiAyIDw9IG51bVRhYmxlcykgeCAxNi4iCiAKQEAgLTExMDYsNiArMTIyOCw3IEBAIHZv aWQgU1ZHVG9PVEZGb250Q29udmVydGVyOjpjb252ZXJ0U1ZHVG9PVEZGb250KCkKICAgICAgICAg bV9yZXN1bHQuYXBwZW5kKDApOwogCiAgICAgYXBwZW5kVGFibGUoIkNGRiAiLCAmU1ZHVG9PVEZG b250Q29udmVydGVyOjphcHBlbmRDRkZUYWJsZSk7CisgICAgYXBwZW5kVGFibGUoIkdTVUIiLCAm U1ZHVG9PVEZGb250Q29udmVydGVyOjphcHBlbmRHU1VCVGFibGUpOwogICAgIGFwcGVuZFRhYmxl KCJPUy8yIiwgJlNWR1RvT1RGRm9udENvbnZlcnRlcjo6YXBwZW5kT1MyVGFibGUpOwogICAgIGFw cGVuZFRhYmxlKCJWT1JHIiwgJlNWR1RvT1RGRm9udENvbnZlcnRlcjo6YXBwZW5kVk9SR1RhYmxl KTsKICAgICBhcHBlbmRUYWJsZSgiY21hcCIsICZTVkdUb09URkZvbnRDb252ZXJ0ZXI6OmFwcGVu ZENNQVBUYWJsZSk7Cg== 239229 2014-10-03 13:58:29 -0700 2014-10-04 23:34:09 -0700 Patch bug-137092-20141003135830.patch text/plain 10068 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMTc0Mjc5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWI1YjEyZmRjMmIyMjA1 MTQyMzI5Zjg5YzMzZGU2N2EyZTVlMDc1Zi4uNGI0YzMzMWZmYTY1NzI4ZmRmNjY1MDI0MWQzY2E0 NThiZjc5MGY2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE0LTEwLTAzICBNeWxl cyBDLiBNYXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CisKKyAgICAgICAgW1NWRyAtPiBP VEYgQ29udmVydGVyXSBBcmFiaWMgZm9ybXMgYXJlIG5vdCBzdWJzdGl0dXRlZCBjb3JyZWN0bHkK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNzA5Mgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3RzOiBz dmcvVzNDLVNWRy0xLjEvZm9udHMtZ2x5cGgtMDItdC5zdmcKKyAgICAgICAgICAgICAgIHN2Zy9j dXN0b20vZ2x5cGgtc2VsZWN0aW9uLWFyYWJpYy1mb3Jtcy5zdmcKKworICAgICAgICAqIHN2Zy9T VkdUb09URkZvbnRDb252ZXJzaW9uLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNWR1RvT1RGRm9u dENvbnZlcnRlcjo6YXBwZW5kQXJhYmljUmVwbGFjZW1lbnRTdWJ0YWJsZSk6IEludm9rZWQgZm9y IGVhY2ggb2YgdGhlIHRocmVlCisgICAgICAgIEFyYWJpYyBmb3JtIHN1YnN0aXR1dGlvbnMuCisg ICAgICAgIChXZWJDb3JlOjpTVkdUb09URkZvbnRDb252ZXJ0ZXI6OmFwcGVuZEdTVUJUYWJsZSk6 IE9wZW5UeXBlICJBZHZhbmNlZCBUeXBvZ3JhcGhpYyBUYWJsZSI6CisgICAgICAgICJHbHlwaCBz dWJzdGl0dXRpb24gZGF0YSIKKyAgICAgICAgKFdlYkNvcmU6OlNWR1RvT1RGRm9udENvbnZlcnRl cjo6U1ZHVG9PVEZGb250Q29udmVydGVyKTogUmUtb3JkZXIgdGhlIG1fY29kZXBvaW50c1RvSW5k aWNlc01hcAorICAgICAgICB0byBwcmVmZXIgaXNvbGF0ZWQgZm9ybXMgb2YgZ2x5cGhzLgorICAg ICAgICAoV2ViQ29yZTo6U1ZHVG9PVEZGb250Q29udmVydGVyOjpjb252ZXJ0U1ZHVG9PVEZGb250 KTogQXBwZW5kIHRoZSBHU1VCIHRhYmxlLgorICAgICAgICAoV2ViQ29yZTo6Y2FsY3VsYXRlQ2hl Y2tzdW0pOiBEZWxldGVkLgorCiAyMDE0LTA5LTI4ICBNeWxlcyBDLiBNYXhmaWVsZCAgPG1tYXhm aWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgW1NWRyAtPiBPVEYgQ29udmVydGVyXSBTdXBwb3J0 IG5vbi1CTVAgY29kZXBvaW50cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1Rv T1RGRm9udENvbnZlcnNpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvc3ZnL1NWR1RvT1RGRm9udENv bnZlcnNpb24uY3BwCmluZGV4IDY4MTE1YzE3ZmE4NDAxN2ZiZWRhNTE5OGQyMTIzY2ExYTJmNTZk MTMuLjBiMGJhMDE5YjcwODIzMjhkYTk2MzNmZDM4NjA0YjQ5MjVmMDQwZTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3N2Zy9TVkdUb09URkZvbnRDb252ZXJzaW9uLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9zdmcvU1ZHVG9PVEZGb250Q29udmVyc2lvbi5jcHAKQEAgLTEzNCw2ICsxMzQs NyBAQCBwcml2YXRlOgogICAgIHR5cGVkZWYgdm9pZCAoU1ZHVG9PVEZGb250Q29udmVydGVyOjoq Rm9udEFwcGVuZGluZ0Z1bmN0aW9uKSgpOwogICAgIHZvaWQgYXBwZW5kVGFibGUoY29uc3QgY2hh ciBpZGVudGlmaWVyWzRdLCBGb250QXBwZW5kaW5nRnVuY3Rpb24pOwogICAgIHZvaWQgYXBwZW5k Q01BUFRhYmxlKCk7CisgICAgdm9pZCBhcHBlbmRHU1VCVGFibGUoKTsKICAgICB2b2lkIGFwcGVu ZEhFQURUYWJsZSgpOwogICAgIHZvaWQgYXBwZW5kSEhFQVRhYmxlKCk7CiAgICAgdm9pZCBhcHBl bmRITVRYVGFibGUoKTsKQEAgLTE2MCw2ICsxNjEsOCBAQCBwcml2YXRlOgogICAgIHRlbXBsYXRl PHR5cGVuYW1lIFQ+IHNpemVfdCBhcHBlbmRLRVJOU3VidGFibGUoYm9vbCAoVDo6KmJ1aWxkS2Vy bmluZ1BhaXIpKFNWR0tlcm5pbmdQYWlyJikgY29uc3QsIHVpbnQxNl90IGNvdmVyYWdlKTsKICAg ICBzaXplX3QgZmluaXNoQXBwZW5kaW5nS0VSTlN1YnRhYmxlKFZlY3RvcjxLZXJuaW5nRGF0YT4s IHVpbnQxNl90IGNvdmVyYWdlKTsKIAorICAgIHZvaWQgYXBwZW5kQXJhYmljUmVwbGFjZW1lbnRT dWJ0YWJsZShzaXplX3Qgc3VidGFibGVSZWNvcmRMb2NhdGlvbiwgY29uc3QgY2hhciBhcmFiaWNG b3JtW10pOworCiAgICAgVmVjdG9yPEdseXBoRGF0YT4gbV9nbHlwaHM7CiAgICAgSGFzaE1hcDxT dHJpbmcsIEdseXBoPiBtX2dseXBoTmFtZVRvSW5kZXhNYXA7IC8vIFNWRyAxLjE6ICJJdCBpcyBy ZWNvbW1lbmRlZCB0aGF0IGdseXBoIG5hbWVzIGJlIHVuaXF1ZSB3aXRoaW4gYSBmb250LiIKICAg ICBIYXNoTWFwPFN0cmluZywgVmVjdG9yPEdseXBoLCAxPj4gbV9jb2RlcG9pbnRzVG9JbmRpY2Vz TWFwOwpAQCAtNTU4LDYgKzU2MSwxMTkgQEAgdm9pZCBTVkdUb09URkZvbnRDb252ZXJ0ZXI6OmFw cGVuZENGRlRhYmxlKCkKICAgICAgICAgbV9yZXN1bHQuYXBwZW5kVmVjdG9yKGdseXBoLmNoYXJT dHJpbmcpOwogfQogCit2b2lkIFNWR1RvT1RGRm9udENvbnZlcnRlcjo6YXBwZW5kQXJhYmljUmVw bGFjZW1lbnRTdWJ0YWJsZShzaXplX3Qgc3VidGFibGVSZWNvcmRMb2NhdGlvbiwgY29uc3QgY2hh ciBhcmFiaWNGb3JtW10pCit7CisgICAgVmVjdG9yPHN0ZDo6cGFpcjxHbHlwaCwgR2x5cGg+PiBh cmFiaWNGaW5hbFJlcGxhY2VtZW50czsKKyAgICBmb3IgKGF1dG8mIHBhaXIgOiBtX2NvZGVwb2lu dHNUb0luZGljZXNNYXApIHsKKyAgICAgICAgZm9yIChhdXRvIGdseXBoSW5kZXggOiBwYWlyLnZh bHVlKSB7CisgICAgICAgICAgICBhdXRvJiBnbHlwaCA9IG1fZ2x5cGhzW2dseXBoSW5kZXhdOwor ICAgICAgICAgICAgaWYgKGdseXBoLmdseXBoRWxlbWVudCAmJiBlcXVhbElnbm9yaW5nQ2FzZShn bHlwaC5nbHlwaEVsZW1lbnQtPmZhc3RHZXRBdHRyaWJ1dGUoU1ZHTmFtZXM6OmFyYWJpY19mb3Jt QXR0ciksIGFyYWJpY0Zvcm0pKQorICAgICAgICAgICAgICAgIGFyYWJpY0ZpbmFsUmVwbGFjZW1l bnRzLmFwcGVuZChzdGQ6Om1ha2VfcGFpcihwYWlyLnZhbHVlWzBdLCBnbHlwaEluZGV4KSk7Cisg ICAgICAgIH0KKyAgICB9CisgICAgaWYgKGFyYWJpY0ZpbmFsUmVwbGFjZW1lbnRzLnNpemUoKSA+ IHN0ZDo6bnVtZXJpY19saW1pdHM8dWludDE2X3Q+OjptYXgoKSkKKyAgICAgICAgYXJhYmljRmlu YWxSZXBsYWNlbWVudHMuY2xlYXIoKTsKKworICAgIG92ZXJ3cml0ZTE2KHN1YnRhYmxlUmVjb3Jk TG9jYXRpb24gKyA2LCBtX3Jlc3VsdC5zaXplKCkgLSBzdWJ0YWJsZVJlY29yZExvY2F0aW9uKTsK KyAgICBhdXRvIHN1YnRhYmxlTG9jYXRpb24gPSBtX3Jlc3VsdC5zaXplKCk7CisgICAgYXBwZW5k MTYoMik7IC8vIEZvcm1hdCAyCisgICAgYXBwZW5kMTYoMCk7IC8vIFBsYWNlaG9sZGVyIGZvciBv ZmZzZXQgdG8gY292ZXJhZ2UgdGFibGUsIHJlbGF0aXZlIHRvIGJlZ2lubmluZyBvZiBzdWJzdGl0 dXRpb24gdGFibGUKKyAgICBhcHBlbmQxNihhcmFiaWNGaW5hbFJlcGxhY2VtZW50cy5zaXplKCkp OyAvLyBHbHlwaENvdW50CisgICAgZm9yIChhdXRvJiBwYWlyIDogYXJhYmljRmluYWxSZXBsYWNl bWVudHMpCisgICAgICAgIGFwcGVuZDE2KHBhaXIuc2Vjb25kKTsKKworICAgIG92ZXJ3cml0ZTE2 KHN1YnRhYmxlTG9jYXRpb24gKyAyLCBtX3Jlc3VsdC5zaXplKCkgLSBzdWJ0YWJsZUxvY2F0aW9u KTsKKyAgICBhcHBlbmQxNigxKTsgLy8gQ292ZXJhZ2VGb3JtYXQKKyAgICBhcHBlbmQxNihhcmFi aWNGaW5hbFJlcGxhY2VtZW50cy5zaXplKCkpOyAvLyBHbHlwaENvdW50CisgICAgZm9yIChhdXRv JiBwYWlyIDogYXJhYmljRmluYWxSZXBsYWNlbWVudHMpCisgICAgICAgIGFwcGVuZDE2KHBhaXIu Zmlyc3QpOworfQorCit2b2lkIFNWR1RvT1RGRm9udENvbnZlcnRlcjo6YXBwZW5kR1NVQlRhYmxl KCkKK3sKKyAgICBhdXRvIHRhYmxlTG9jYXRpb24gPSBtX3Jlc3VsdC5zaXplKCk7CisgICAgYXV0 byBoZWFkZXJTaXplID0gMTA7CisKKyAgICBhcHBlbmQzMigweDAwMDEwMDAwKTsgLy8gVmVyc2lv bgorICAgIGFwcGVuZDE2KGhlYWRlclNpemUpOyAvLyBPZmZzZXQgdG8gU2NyaXB0TGlzdAorICAg IGF1dG8gZmVhdHVyZUxpc3RPZmZzZXRMb2NhdGlvbiA9IG1fcmVzdWx0LnNpemUoKTsKKyAgICBh cHBlbmQxNigwKTsgLy8gUGxhY2Vob2xkZXIgZm9yIEZlYXR1cmVMaXN0IG9mZnNldAorICAgIGF1 dG8gbG9va3VwTGlzdE9mZnNldExvY2F0aW9uID0gbV9yZXN1bHQuc2l6ZSgpOworICAgIGFwcGVu ZDE2KDApOyAvLyBQbGFjZWhvbGRlciBmb3IgTG9va3VwTGlzdCBvZmZzZXQKKyAgICBBU1NFUlQo dGFibGVMb2NhdGlvbiArIGhlYWRlclNpemUgPT0gbV9yZXN1bHQuc2l6ZSgpKTsKKworICAgIC8v IFNjcmlwdExpc3QKKyAgICBhdXRvIHNjcmlwdExpc3RMb2NhdGlvbiA9IG1fcmVzdWx0LnNpemUo KTsKKyAgICBhcHBlbmQxNigxKTsgLy8gTnVtYmVyIG9mIFNjcmlwdFJlY29yZHMKKyAgICBhcHBl bmQzMkJpdENvZGUoImFyYWIiKTsKKyAgICBhcHBlbmQxNihtX3Jlc3VsdC5zaXplKCkgKyAyIC0g c2NyaXB0TGlzdExvY2F0aW9uKTsgLy8gT2Zmc2V0IG9mIFNjcmlwdCB0YWJsZSwgcmVsYXRpdmUg dG8gYmVnaW5uaW5nIG9mIFNjcmlwdExpc3QKKworICAgIGF1dG8gc2NyaXB0VGFibGVMb2NhdGlv biA9IG1fcmVzdWx0LnNpemUoKTsKKyAgICBhdXRvIHNpemVPZkVtcHR5U2NyaXB0VGFibGUgPSA0 OworICAgIGFwcGVuZDE2KHNpemVPZkVtcHR5U2NyaXB0VGFibGUpOyAvLyBPZmZzZXQgb2YgZGVm YXVsdCBsYW5ndWFnZSBzeXN0ZW0gdGFibGUsIHJlbGF0aXZlIHRvIGJlZ2lubmluZyBvZiBTY3Jp cHQgdGFibGUKKyAgICBhcHBlbmQxNigwKTsgLy8gTnVtYmVyIG9mIGZvbGxvd2luZyBsYW5ndWFn ZSBzeXN0ZW0gdGFibGVzCisgICAgQVNTRVJUX1VOVVNFRChzY3JpcHRUYWJsZUxvY2F0aW9uLCBz Y3JpcHRUYWJsZUxvY2F0aW9uICsgc2l6ZU9mRW1wdHlTY3JpcHRUYWJsZSA9PSBtX3Jlc3VsdC5z aXplKCkpOworCisgICAgYXBwZW5kMTYoMCk7IC8vIExvb2t1cE9yZGVyICI9IE5VTEwgLi4uIHJl c2VydmVkIgorICAgIGFwcGVuZDE2KDApOyAvLyBGaXJzdCBmZWF0dXJlIGlzIHJlcXVpcmVkCisg ICAgdWludDE2X3QgZmVhdHVyZUNvdW50ID0gNDsKKyAgICBhcHBlbmQxNig0KTsgLy8gRmVhdHVy ZUNvdW50CisgICAgZm9yICh1aW50MTZfdCBpID0gMDsgaSA8IGZlYXR1cmVDb3VudDsgKytpKQor ICAgICAgICBhcHBlbmQxNihpKTsgLy8gSW5kZXggb2Ygb3VyIGZlYXR1cmUgaW50byB0aGUgRmVh dHVyZUxpc3QKKworICAgIC8vIEZlYXR1cmVMaXN0CisgICAgb3ZlcndyaXRlMTYoZmVhdHVyZUxp c3RPZmZzZXRMb2NhdGlvbiwgbV9yZXN1bHQuc2l6ZSgpIC0gdGFibGVMb2NhdGlvbik7CisgICAg YXV0byBmZWF0dXJlTGlzdExvY2F0aW9uID0gbV9yZXN1bHQuc2l6ZSgpOworICAgIHNpemVfdCBm ZWF0dXJlTGlzdFNpemUgPSAyICsgNiAqIGZlYXR1cmVDb3VudDsKKyAgICBzaXplX3QgZmVhdHVy ZVRhYmxlU2l6ZSA9IDY7CisgICAgYXBwZW5kMTYoZmVhdHVyZUNvdW50KTsgLy8gRmVhdHVyZUNv dW50CisgICAgYXBwZW5kMzJCaXRDb2RlKCJmaW5hIik7CisgICAgYXBwZW5kMTYoZmVhdHVyZUxp c3RTaXplICsgZmVhdHVyZVRhYmxlU2l6ZSAqIDApOyAvLyBPZmZzZXQgb2YgZmVhdHVyZSB0YWJs ZSwgcmVsYXRpdmUgdG8gYmVnaW5uaW5nIG9mIEZlYXR1cmVMaXN0IHRhYmxlCisgICAgYXBwZW5k MzJCaXRDb2RlKCJtZWRpIik7CisgICAgYXBwZW5kMTYoZmVhdHVyZUxpc3RTaXplICsgZmVhdHVy ZVRhYmxlU2l6ZSAqIDEpOyAvLyBPZmZzZXQgb2YgZmVhdHVyZSB0YWJsZSwgcmVsYXRpdmUgdG8g YmVnaW5uaW5nIG9mIEZlYXR1cmVMaXN0IHRhYmxlCisgICAgYXBwZW5kMzJCaXRDb2RlKCJpbml0 Iik7CisgICAgYXBwZW5kMTYoZmVhdHVyZUxpc3RTaXplICsgZmVhdHVyZVRhYmxlU2l6ZSAqIDIp OyAvLyBPZmZzZXQgb2YgZmVhdHVyZSB0YWJsZSwgcmVsYXRpdmUgdG8gYmVnaW5uaW5nIG9mIEZl YXR1cmVMaXN0IHRhYmxlCisgICAgYXBwZW5kMzJCaXRDb2RlKCJybGlnIik7CisgICAgYXBwZW5k MTYoZmVhdHVyZUxpc3RTaXplICsgZmVhdHVyZVRhYmxlU2l6ZSAqIDMpOyAvLyBPZmZzZXQgb2Yg ZmVhdHVyZSB0YWJsZSwgcmVsYXRpdmUgdG8gYmVnaW5uaW5nIG9mIEZlYXR1cmVMaXN0IHRhYmxl CisgICAgQVNTRVJUX1VOVVNFRChmZWF0dXJlTGlzdExvY2F0aW9uLCBmZWF0dXJlTGlzdExvY2F0 aW9uICsgZmVhdHVyZUxpc3RTaXplID09IG1fcmVzdWx0LnNpemUoKSk7CisKKyAgICBmb3IgKHVu c2lnbmVkIGkgPSAwOyBpIDwgZmVhdHVyZUNvdW50OyArK2kpIHsKKyAgICAgICAgYXV0byBmZWF0 dXJlVGFibGVTdGFydCA9IG1fcmVzdWx0LnNpemUoKTsKKyAgICAgICAgYXBwZW5kMTYoMCk7IC8v IEZlYXR1cmVQYXJhbXMgIj0gTlVMTCAuLi4gcmVzZXJ2ZWQiCisgICAgICAgIGFwcGVuZDE2KDEp OyAvLyBMb29rdXBDb3VudAorICAgICAgICBhcHBlbmQxNihpKTsgLy8gTG9va3VwTGlzdEluZGV4 CisgICAgICAgIEFTU0VSVF9VTlVTRUQoZmVhdHVyZVRhYmxlU3RhcnQsIGZlYXR1cmVUYWJsZVN0 YXJ0ICsgZmVhdHVyZVRhYmxlU2l6ZSA9PSBtX3Jlc3VsdC5zaXplKCkpOworICAgIH0KKworICAg IC8vIExvb2t1cExpc3QKKyAgICBvdmVyd3JpdGUxNihsb29rdXBMaXN0T2Zmc2V0TG9jYXRpb24s IG1fcmVzdWx0LnNpemUoKSAtIHRhYmxlTG9jYXRpb24pOworICAgIGF1dG8gbG9va3VwTGlzdExv Y2F0aW9uID0gbV9yZXN1bHQuc2l6ZSgpOworICAgIGFwcGVuZDE2KGZlYXR1cmVDb3VudCk7IC8v IExvb2t1cENvdW50CisgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IGZlYXR1cmVDb3VudDsg KytpKQorICAgICAgICBhcHBlbmQxNigwKTsgLy8gUGxhY2Vob2xkZXIgZm9yIG9mZnNldCB0byBm ZWF0dXJlIHRhYmxlLCByZWxhdGl2ZSB0byBiZWdpbm5pbmcgb2YgTG9va3VwTGlzdAorICAgIHNp emVfdCBzdWJ0YWJsZVJlY29yZExvY2F0aW9uc1tmZWF0dXJlQ291bnRdOworICAgIGZvciAodW5z aWduZWQgaSA9IDA7IGkgPCBmZWF0dXJlQ291bnQ7ICsraSkgeworICAgICAgICBzdWJ0YWJsZVJl Y29yZExvY2F0aW9uc1tpXSA9IG1fcmVzdWx0LnNpemUoKTsKKyAgICAgICAgb3ZlcndyaXRlMTYo bG9va3VwTGlzdExvY2F0aW9uICsgMiArIDIgKiBpLCBtX3Jlc3VsdC5zaXplKCkgLSBsb29rdXBM aXN0TG9jYXRpb24pOworICAgICAgICBhcHBlbmQxNihpID09IDMgPyAzIDogMSk7IC8vIFR5cGUg MTogIlJlcGxhY2Ugb25lIGdseXBoIHdpdGggb25lIGdseXBoIiAvIFR5cGUgMzogIlJlcGxhY2Ug b25lIGdseXBoIHdpdGggb25lIG9mIG1hbnkgZ2x5cGhzIgorICAgICAgICBhcHBlbmQxNigwKTsg Ly8gTG9va3VwRmxhZworICAgICAgICBhcHBlbmQxNigxKTsgLy8gU3ViVGFibGVDb3VudAorICAg ICAgICBhcHBlbmQxNigwKTsgLy8gUGxhY2Vob2xkZXIgZm9yIG9mZnNldCB0byBzdWJ0YWJsZSwg cmVsYXRpdmUgdG8gYmVnaW5uaW5nIG9mIExvb2t1cCB0YWJsZQorICAgIH0KKworICAgIGFwcGVu ZEFyYWJpY1JlcGxhY2VtZW50U3VidGFibGUoc3VidGFibGVSZWNvcmRMb2NhdGlvbnNbMF0sICJ0 ZXJtaW5hbCIpOworICAgIGFwcGVuZEFyYWJpY1JlcGxhY2VtZW50U3VidGFibGUoc3VidGFibGVS ZWNvcmRMb2NhdGlvbnNbMV0sICJtZWRpYWwiKTsKKyAgICBhcHBlbmRBcmFiaWNSZXBsYWNlbWVu dFN1YnRhYmxlKHN1YnRhYmxlUmVjb3JkTG9jYXRpb25zWzJdLCAiaW5pdGlhbCIpOworCisgICAg Ly8gTWFudWFsbHkgYXBwZW5kIGVtcHR5ICJybGlnIiBzdWJ0YWJsZQorICAgIG92ZXJ3cml0ZTE2 KHN1YnRhYmxlUmVjb3JkTG9jYXRpb25zWzNdICsgNiwgbV9yZXN1bHQuc2l6ZSgpIC0gc3VidGFi bGVSZWNvcmRMb2NhdGlvbnNbM10pOworICAgIGFwcGVuZDE2KDEpOyAvLyBGb3JtYXQgMQorICAg IGFwcGVuZDE2KDYpOyAvLyBvZmZzZXQgdG8gY292ZXJhZ2UgdGFibGUsIHJlbGF0aXZlIHRvIGJl Z2lubmluZyBvZiBzdWJzdGl0dXRpb24gdGFibGUKKyAgICBhcHBlbmQxNigwKTsgLy8gQWx0ZXJu YXRlU2V0Q291bnQKKyAgICBhcHBlbmQxNigxKTsgLy8gQ292ZXJhZ2VGb3JtYXQKKyAgICBhcHBl bmQxNigwKTsgLy8gR2x5cGhDb3VudAorfQorCiB2b2lkIFNWR1RvT1RGRm9udENvbnZlcnRlcjo6 YXBwZW5kVk9SR1RhYmxlKCkKIHsKICAgICBhcHBlbmQxNigxKTsgLy8gTWFqb3IgdmVyc2lvbgpA QCAtOTcyLDggKzEwODgsMTQgQEAgU1ZHVG9PVEZGb250Q29udmVydGVyOjpTVkdUb09URkZvbnRD b252ZXJ0ZXIoY29uc3QgU1ZHRm9udEVsZW1lbnQmIGZvbnRFbGVtZW50KQogICAgICAgICAgICAg aWYgKCFnbHlwaE5hbWUuaXNOdWxsKCkpCiAgICAgICAgICAgICAgICAgbV9nbHlwaE5hbWVUb0lu ZGV4TWFwLmFkZChnbHlwaE5hbWUsIGkpOwogICAgICAgICB9Ci0gICAgICAgIGlmIChtX2NvZGVw b2ludHNUb0luZGljZXNNYXAuaXNWYWxpZEtleShnbHlwaC5jb2RlcG9pbnRzKSkKLSAgICAgICAg ICAgIG1fY29kZXBvaW50c1RvSW5kaWNlc01hcC5hZGQoZ2x5cGguY29kZXBvaW50cywgVmVjdG9y PEdseXBoPigpKS5pdGVyYXRvci0+dmFsdWUuYXBwZW5kKGkpOworICAgICAgICBpZiAobV9jb2Rl cG9pbnRzVG9JbmRpY2VzTWFwLmlzVmFsaWRLZXkoZ2x5cGguY29kZXBvaW50cykpIHsKKyAgICAg ICAgICAgIGF1dG8mIGdseXBoVmVjdG9yID0gbV9jb2RlcG9pbnRzVG9JbmRpY2VzTWFwLmFkZChn bHlwaC5jb2RlcG9pbnRzLCBWZWN0b3I8R2x5cGg+KCkpLml0ZXJhdG9yLT52YWx1ZTsKKyAgICAg ICAgICAgIC8vIFByZWZlciBpc29sYXRlZCBhcmFiaWMgZm9ybXMKKyAgICAgICAgICAgIGlmIChn bHlwaC5nbHlwaEVsZW1lbnQgJiYgZXF1YWxJZ25vcmluZ0Nhc2UoZ2x5cGguZ2x5cGhFbGVtZW50 LT5mYXN0R2V0QXR0cmlidXRlKFNWR05hbWVzOjphcmFiaWNfZm9ybUF0dHIpLCAiaXNvbGF0ZWQi KSkKKyAgICAgICAgICAgICAgICBnbHlwaFZlY3Rvci5pbnNlcnQoMCwgaSk7CisgICAgICAgICAg ICBlbHNlCisgICAgICAgICAgICAgICAgZ2x5cGhWZWN0b3IuYXBwZW5kKGkpOworICAgICAgICB9 CiAgICAgfQogCiAgICAgLy8gRklYTUU6IEhhbmRsZSBjb21tYXMuCkBAIC0xMDUwLDcgKzExNzIs NyBAQCB2b2lkIFNWR1RvT1RGRm9udENvbnZlcnRlcjo6Y29udmVydFNWR1RvT1RGRm9udCgpCiAg ICAgaWYgKG1fZ2x5cGhzLmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgdWludDE2 X3QgbnVtVGFibGVzID0gMTM7CisgICAgdWludDE2X3QgbnVtVGFibGVzID0gMTQ7CiAgICAgdWlu dDE2X3Qgcm91bmRlZE51bVRhYmxlcyA9IHJvdW5kRG93blRvUG93ZXJPZlR3byhudW1UYWJsZXMp OwogICAgIHVpbnQxNl90IHNlYXJjaFJhbmdlID0gcm91bmRlZE51bVRhYmxlcyAqIDE2OyAvLyBz ZWFyY2hSYW5nZTogIihNYXhpbXVtIHBvd2VyIG9mIDIgPD0gbnVtVGFibGVzKSB4IDE2LiIKIApA QCAtMTA3MCw2ICsxMTkyLDcgQEAgdm9pZCBTVkdUb09URkZvbnRDb252ZXJ0ZXI6OmNvbnZlcnRT VkdUb09URkZvbnQoKQogICAgICAgICBtX3Jlc3VsdC5hcHBlbmQoMCk7CiAKICAgICBhcHBlbmRU YWJsZSgiQ0ZGICIsICZTVkdUb09URkZvbnRDb252ZXJ0ZXI6OmFwcGVuZENGRlRhYmxlKTsKKyAg ICBhcHBlbmRUYWJsZSgiR1NVQiIsICZTVkdUb09URkZvbnRDb252ZXJ0ZXI6OmFwcGVuZEdTVUJU YWJsZSk7CiAgICAgYXBwZW5kVGFibGUoIk9TLzIiLCAmU1ZHVG9PVEZGb250Q29udmVydGVyOjph cHBlbmRPUzJUYWJsZSk7CiAgICAgYXBwZW5kVGFibGUoIlZPUkciLCAmU1ZHVG9PVEZGb250Q29u dmVydGVyOjphcHBlbmRWT1JHVGFibGUpOwogICAgIGFwcGVuZFRhYmxlKCJjbWFwIiwgJlNWR1Rv T1RGRm9udENvbnZlcnRlcjo6YXBwZW5kQ01BUFRhYmxlKTsK