130889 2014-03-27 23:42:35 -0700 Fix recently-introduced off-by-one error in centerTruncateToBuffer 2014-03-29 22:59:13 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 darin darin ap conrad_shultz oldest_to_newest 995257 0 darin 2014-03-27 23:42:35 -0700 Fix recently-introduced off-by-one error in centerTruncateToBuffer 995263 1 darin 2014-03-28 00:14:38 -0700 I finished the fix about an hour ago, but I decided to add unit tests for WebStringTruncator, which is taking me a little time. 995265 2 228030 darin 2014-03-28 00:36:55 -0700 Created attachment 228030 Patch 995266 3 darin 2014-03-28 00:37:49 -0700 I originally thought this was Mac-only, but it seems this code is used on other platforms as well. 995365 4 228030 ap 2014-03-28 10:07:56 -0700 Comment on attachment 228030 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228030&action=review > Source/WebKit/mac/ChangeLog:12 > + (+[WebStringTruncator initialize]): Added threading initialization, needed for main > + thread assertions in string truncator code. I'm confused about how this worked before - you didn't add any new assertions in this patch. Is something like this needed on iOS too? 995414 5 conrad_shultz 2014-03-28 11:58:31 -0700 Would it be worth adding some non-ASCII inputs to the unit tests? 995527 6 228030 darin 2014-03-28 17:44:21 -0700 Comment on attachment 228030 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=228030&action=review > Source/WebKit/mac/Misc/WebStringTruncator.mm:67 > +#if PLATFORM(MAC) As Alexey and I discussed, we don’t need this #if since this file is already Mac-only (has NSFont). 995547 7 darin 2014-03-28 20:18:50 -0700 Committed r166448: <http://trac.webkit.org/changeset/166448> 995629 8 ap 2014-03-29 22:49:16 -0700 The regression test fails on Mountain Lion: /Volumes/Data/slave/mountainlion-debug/build/Tools/TestWebKitAPI/Tests/mac/StringTruncator.mm:36: Failure Value of: "abcdef…tuvwxyz" Expected: [[WebStringTruncator centerTruncateString:@"abcdefghijklmnopqrstuvwxyz" toWidth:100 withFont:[NSFont fontWithName:@"Helvetica" size:12]] UTF8String] Which is: "abcdefg…tuvwxyz" 995635 9 ap 2014-03-29 22:59:13 -0700 Updated expectation for 10.8 in <http://trac.webkit.org/r166458>. 228030 2014-03-28 00:36:55 -0700 2014-03-28 17:44:21 -0700 Patch bug-130889-20140328003634.patch text/plain 13334 darin U3VidmVyc2lvbiBSZXZpc2lvbjogMTY2NDAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjJkMWRmMzcyMjA3OWY1 YWNlMzE2NzRhYzlhYjA0NTMxMDdiMTEwZi4uMjFkNmU1ZDY1MDA0YmI2ZjE3M2VjNTBiMWUxOGRm M2U4NDkzNzkwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDE0LTAzLTI4ICBEYXJp biBBZGxlciAgPGRhcmluQGFwcGxlLmNvbT4KKworICAgICAgICBGaXggcmVjZW50bHktaW50cm9k dWNlZCBvZmYtYnktb25lIGVycm9yIGluIGNlbnRlclRydW5jYXRlVG9CdWZmZXIKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMDg4OQorICAgICAgICA8 cmRhcjovL3Byb2JsZW0vMTY0MDg2OTQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9TdHJpbmdUcnVuY2F0b3IuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Y2VudGVyVHJ1bmNhdGVUb0J1ZmZlcik6IFNpbXBsaWZpZWQg ZXhwcmVzc2lvbiB0aGF0IGNvbXB1dGVzIHRydW5jYXRlZExlbmd0aC4KKyAgICAgICAgUmVtb3Zl ZCBpbmNvcnJlY3QgIisgMSIgZnJvbSBjb21wdXRhdGlvbiBvZiB3aGVyZSB0byB3cml0ZSBjaGFy YWN0ZXJzLgorCiAyMDE0LTAzLTI3ICBKYW1lcyBDcmFpZyAgPGpjcmFpZ0BhcHBsZS5jb20+CiAK ICAgICAgICAgV2ViIEluc3BlY3RvcjogQVhJOiBleHBvc2Ugc2VsZWN0ZWRDaGlsZE5vZGVJZHMg b2YgbGlzdCBib3hlcywgdHJlZSBjb250cm9scywgZXRjLiwgYW5kIHJlY29uY2lsZSBVSSB3aXRo IGNoaWxkTm9kZUlkcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIv U291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4IGRkZjZjODM5MTc0MGU1ZWNiZTdmZDBj MjJlYWU5ZjNkYTQ1ZjgxNWMuLjljYzhmMzczOGIwMzBiOTkyZGU5MDJkZGQ1OGUwMTUzYzg3ODY2 YjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZworKysgYi9Tb3VyY2Uv V2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxNC0wMy0yOCAgRGFyaW4g QWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IHJlY2VudGx5LWludHJvZHVj ZWQgb2ZmLWJ5LW9uZSBlcnJvciBpbiBjZW50ZXJUcnVuY2F0ZVRvQnVmZmVyCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzA4ODkKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIE1pc2MvV2ViU3RyaW5nVHJ1 bmNhdG9yLm1tOgorICAgICAgICAoZGVmYXVsdE1lbnVGb250KTogQ2hhbmdlZCB0byB1c2UgTmV2 ZXJEZXN0cm95ZWQgc2luY2UgSSBoYWQgdG8gdG91Y2ggdGhpcyBmaWxlIGFueXdheS4KKyAgICAg ICAgKGZvbnRGcm9tTlNGb250KTogRGl0dG8uIEFsc28gaW1wcm92ZWQgdmFyaWFibGUgbmFtZXMg YSBiaXQuCisgICAgICAgICgrW1dlYlN0cmluZ1RydW5jYXRvciBpbml0aWFsaXplXSk6IEFkZGVk IHRocmVhZGluZyBpbml0aWFsaXphdGlvbiwgbmVlZGVkIGZvciBtYWluCisgICAgICAgIHRocmVh ZCBhc3NlcnRpb25zIGluIHN0cmluZyB0cnVuY2F0b3IgY29kZS4KKwogMjAxNC0wMy0yNyAgQ29t bWl0IFF1ZXVlICA8Y29tbWl0LXF1ZXVlQHdlYmtpdC5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdl ZCwgcm9sbGluZyBvdXQgcjE2NjM2MC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL1N0cmluZ1RydW5jYXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9TdHJpbmdUcnVuY2F0b3IuY3BwCmluZGV4IDE1ZTg1ZDUwNGIyZDk3OTEyOGJj MWIyOGRmNzVhN2FhN2Y4YjJjMWQuLjM4ZGQ3MmEzNDFjZGJiMDJjMWIyNTZiYWExYTIxZmY3MTBl M2MzZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL1N0cmlu Z1RydW5jYXRvci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvU3Ry aW5nVHJ1bmNhdG9yLmNwcApAQCAtODcsMTMgKzg3LDEzIEBAIHN0YXRpYyB1bnNpZ25lZCBjZW50 ZXJUcnVuY2F0ZVRvQnVmZmVyKGNvbnN0IFN0cmluZyYgc3RyaW5nLCB1bnNpZ25lZCBsZW5ndGgs IHVuCiAgICAgICAgICsrb21pdEVuZDsKICNlbmRpZgogCi0gICAgdW5zaWduZWQgdHJ1bmNhdGVk TGVuZ3RoID0gc2hvdWxkSW5zZXJ0RWxsaXBzaXMgPyBvbWl0U3RhcnQgKyAxICsgKGxlbmd0aCAt IG9taXRFbmQpIDogbGVuZ3RoIC0gKG9taXRFbmQgLSBvbWl0U3RhcnQpOworICAgIHVuc2lnbmVk IHRydW5jYXRlZExlbmd0aCA9IG9taXRTdGFydCArIHNob3VsZEluc2VydEVsbGlwc2lzICsgKGxl bmd0aCAtIG9taXRFbmQpOwogICAgIEFTU0VSVCh0cnVuY2F0ZWRMZW5ndGggPD0gbGVuZ3RoKTsK IAogICAgIFN0cmluZ1ZpZXcoc3RyaW5nKS5zdWJzdHJpbmcoMCwgb21pdFN0YXJ0KS5nZXRDaGFy YWN0ZXJzV2l0aFVwY29udmVydChidWZmZXIpOwogICAgIGlmIChzaG91bGRJbnNlcnRFbGxpcHNp cykKICAgICAgICAgYnVmZmVyW29taXRTdGFydCsrXSA9IGhvcml6b250YWxFbGxpcHNpczsKLSAg ICBTdHJpbmdWaWV3KHN0cmluZykuc3Vic3RyaW5nKG9taXRFbmQsIGxlbmd0aCAtIG9taXRFbmQp LmdldENoYXJhY3RlcnNXaXRoVXBjb252ZXJ0KCZidWZmZXJbb21pdFN0YXJ0ICsgMV0pOworICAg IFN0cmluZ1ZpZXcoc3RyaW5nKS5zdWJzdHJpbmcob21pdEVuZCwgbGVuZ3RoIC0gb21pdEVuZCku Z2V0Q2hhcmFjdGVyc1dpdGhVcGNvbnZlcnQoJmJ1ZmZlcltvbWl0U3RhcnRdKTsKICAgICByZXR1 cm4gdHJ1bmNhdGVkTGVuZ3RoOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9N aXNjL1dlYlN0cmluZ1RydW5jYXRvci5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL01pc2MvV2ViU3Ry aW5nVHJ1bmNhdG9yLm1tCmluZGV4IDFmYjRmZTE3MTlhYTY0Y2IxYWU4NjlmNzgyZDRjM2UzYzM0 NTExNDQuLjkzOWI5NTAzMzgyYWEzYmQ2YTRhYjhjYWM0MTViYzEwMzNmNGNjYmMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvbWFjL01pc2MvV2ViU3RyaW5nVHJ1bmNhdG9yLm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQvbWFjL01pc2MvV2ViU3RyaW5nVHJ1bmNhdG9yLm1tCkBAIC0xLDUgKzEsNSBA QAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAwNSwgMjAwNiBBcHBsZSBJbmMuICBBbGwgcmlnaHRz IHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA1LCAyMDA2LCAyMDE0IEFwcGxlIEluYy4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNv dXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwg YXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAt MzMsNiArMzMsOSBAQAogI2ltcG9ydCA8V2ViQ29yZS9Gb250Q2FjaGUuaD4KICNpbXBvcnQgPFdl YkNvcmUvRm9udFBsYXRmb3JtRGF0YS5oPgogI2ltcG9ydCA8V2ViQ29yZS9TdHJpbmdUcnVuY2F0 b3IuaD4KKyNpbXBvcnQgPHJ1bnRpbWUvSW5pdGlhbGl6ZVRocmVhZGluZy5oPgorI2ltcG9ydCA8 d3RmL01haW5UaHJlYWQuaD4KKyNpbXBvcnQgPHd0Zi9OZXZlckRlc3Ryb3llZC5oPgogI2ltcG9y dCA8d3RmL1N0ZExpYkV4dHJhcy5oPgogI2ltcG9ydCA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAK QEAgLTQwLDI4ICs0MywyMCBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogc3RhdGljIE5T Rm9udCAqZGVmYXVsdE1lbnVGb250KCkKIHsKLSAgICBzdGF0aWMgTlNGb250ICpkZWZhdWx0TWVu dUZvbnQgPSBuaWw7Ci0gICAgaWYgKCFkZWZhdWx0TWVudUZvbnQpIHsKLSAgICAgICAgZGVmYXVs dE1lbnVGb250ID0gW05TRm9udCBtZW51Rm9udE9mU2l6ZTowXTsKLSAgICAgICAgQ0ZSZXRhaW4o ZGVmYXVsdE1lbnVGb250KTsKLSAgICB9Ci0gICAgcmV0dXJuIGRlZmF1bHRNZW51Rm9udDsKKyAg ICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8UmV0YWluUHRyPE5TRm9udD4+IGRlZmF1bHRNZW51Rm9u dCA9IFtOU0ZvbnQgbWVudUZvbnRPZlNpemU6MF07CisgICAgcmV0dXJuIGRlZmF1bHRNZW51Rm9u dC5nZXQoKS5nZXQoKTsKIH0KIAogc3RhdGljIEZvbnQmIGZvbnRGcm9tTlNGb250KE5TRm9udCAq Zm9udCkKIHsKLSAgICBzdGF0aWMgTlNGb250ICpjdXJyZW50Rm9udDsKLSAgICBERVBSRUNBVEVE X0RFRklORV9TVEFUSUNfTE9DQUwoRm9udCwgY3VycmVudFJlbmRlcmVyLCAoKSk7CisgICAgc3Rh dGljIE5ldmVyRGVzdHJveWVkPFJldGFpblB0cjxOU0ZvbnQ+PiBjdXJyZW50TlNGb250ID0gW05T Rm9udCBtZW51Rm9udE9mU2l6ZTowXTsKKyAgICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8Rm9udD4g Y3VycmVudEZvbnQ7CiAKLSAgICBpZiAoW2ZvbnQgaXNFcXVhbDpjdXJyZW50Rm9udF0pCi0gICAg ICAgIHJldHVybiBjdXJyZW50UmVuZGVyZXI7Ci0gICAgaWYgKGN1cnJlbnRGb250KQotICAgICAg ICBDRlJlbGVhc2UoY3VycmVudEZvbnQpOwotICAgIGN1cnJlbnRGb250ID0gZm9udDsKLSAgICBD RlJldGFpbihjdXJyZW50Rm9udCk7Ci0gICAgRm9udFBsYXRmb3JtRGF0YSBmKGZvbnQsIFtmb250 IHBvaW50U2l6ZV0pOwotICAgIGN1cnJlbnRSZW5kZXJlciA9IEZvbnQoZiwgIVtbTlNHcmFwaGlj c0NvbnRleHQgY3VycmVudENvbnRleHRdIGlzRHJhd2luZ1RvU2NyZWVuXSk7Ci0gICAgcmV0dXJu IGN1cnJlbnRSZW5kZXJlcjsKKyAgICBpZiAoW2ZvbnQgaXNFcXVhbDpjdXJyZW50TlNGb250Lmdl dCgpLmdldCgpXSkKKyAgICAgICAgcmV0dXJuIGN1cnJlbnRGb250OworICAgIGN1cnJlbnROU0Zv bnQuZ2V0KCkgPSBmb250OworICAgIGN1cnJlbnRGb250LmdldCgpID0gRm9udChGb250UGxhdGZv cm1EYXRhKGZvbnQsIFtmb250IHBvaW50U2l6ZV0pLCAhW1tOU0dyYXBoaWNzQ29udGV4dCBjdXJy ZW50Q29udGV4dF0gaXNEcmF3aW5nVG9TY3JlZW5dKTsKKyAgICByZXR1cm4gY3VycmVudEZvbnQ7 CiB9CiAKIEBpbXBsZW1lbnRhdGlvbiBXZWJTdHJpbmdUcnVuY2F0b3IKQEAgLTY5LDYgKzY0LDEw IEBAIEBpbXBsZW1lbnRhdGlvbiBXZWJTdHJpbmdUcnVuY2F0b3IKICsgKHZvaWQpaW5pdGlhbGl6 ZQogewogICAgIEluaXRXZWJDb3JlU3lzdGVtSW50ZXJmYWNlKCk7CisjaWYgUExBVEZPUk0oTUFD KQorICAgIEpTQzo6aW5pdGlhbGl6ZVRocmVhZGluZygpOworICAgIFdURjo6aW5pdGlhbGl6ZU1h aW5UaHJlYWRUb1Byb2Nlc3NNYWluVGhyZWFkKCk7CisjZW5kaWYKIH0KIAogKyAoTlNTdHJpbmcg KiljZW50ZXJUcnVuY2F0ZVN0cmluZzooTlNTdHJpbmcgKilzdHJpbmcgdG9XaWR0aDooZmxvYXQp bWF4V2lkdGgKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwpp bmRleCAzNmM1OGZiMzZlZjc0YWJiNzliYzczZWYxOTI1Yzk2ODg2NTZiN2ZmLi40MDM5NGE1YjBm YTcwM2NkNDk3ZWUzMDIyNmYwYzdkOTViZGZlMDIyIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VM b2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTQtMDMtMjggIERh cmluIEFkbGVyICA8ZGFyaW5AYXBwbGUuY29tPgorCisgICAgICAgIEZpeCByZWNlbnRseS1pbnRy b2R1Y2VkIG9mZi1ieS1vbmUgZXJyb3IgaW4gY2VudGVyVHJ1bmNhdGVUb0J1ZmZlcgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwODg5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJ L1Rlc3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajogQWRkZWQgU3RyaW5nVHJ1 bmNhdG9yLm1tLgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvbWFjL1N0cmluZ1RydW5j YXRvci5tbTogQWRkZWQuIE9uZSB0ZXN0IGZvciBlYWNoIG9mIHRoZQorICAgICAgICBXZWJTdHJp bmdUcnVuY2F0b3IgbWV0aG9kczsgc2hvdWxkIGJlIGdvb2QgZm9yIGEgc3RhcnQuIFRoZXNlIGFy ZSBkZXBlbmRlbnQgb24gdGhlCisgICAgICAgIG1ldHJpY3Mgb2YgSGVsdmV0aWNhIDEyLCBidXQg SSBhbSBob3BpbmcgdGhhdCB3aWxsIGJlIGNvbnNpc3RlbnQgYWNyb3NzIE9TIFggbWFjaGluZXMu CisKIDIwMTQtMDMtMjcgIE1pa2hhaWwgUG96ZG55YWtvdiAgPG1pa2hhaWwucG96ZG55YWtvdkBp bnRlbC5jb20+CiAKICAgICAgICAgPGh0dHBzOi8vd2Via2l0Lm9yZy9iLzQyNzA0PiBXZWJLaXRU ZXN0UnVubmVyIG5lZWRzIHRvIHByaW50IGhpc3RvcnkgZGVsZWdhdGUgaW5mb3JtYXRpb24KZGlm ZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJv amVjdC5wYnhwcm9qIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJv ai9wcm9qZWN0LnBieHByb2oKaW5kZXggOGJiYjU3MGZjZWI4YWEyYmVlZjE5ZmM1MThiMmE0MzNi OWE4Y2M5Ni4uZDI4MDVkOWY1MTllNzFlZjNhY2FkMjIxMmNkNzJkZDlhNjMzZjIwNiAxMDA2NDQK LS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0 LnBieHByb2oKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLnhjb2RlcHJv ai9wcm9qZWN0LnBieHByb2oKQEAgLTEyNCw2ICsxMjQsNyBAQAogCQk5MzMxNDA3QzE3QjQ0MTkw MDBGMDgzQjEgLyogRGlkTm90SGFuZGxlS2V5RG93bi5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA5MzMxNDA3QjE3QjQ0MTkwMDBGMDgzQjEgLyogRGlk Tm90SGFuZGxlS2V5RG93bi5jcHAgKi87IH07CiAJCTkzNjEwMDI5MTREQzk1QTcwMDYxMzc5RCAv KiBsb3RzLW9mLWlmcmFtZXMuaHRtbCBpbiBDb3B5IFJlc291cmNlcyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSA5MzYxMDAyODE0REM5NTdCMDA2MTM3OUQgLyogbG90cy1vZi1p ZnJhbWVzLmh0bWwgKi87IH07CiAJCTkzOUJBOTE3MTQxMDM0MTIwMDFBMDFCRCAvKiBEZXZpY2VT Y2FsZUZhY3Rvck9uQmFjay5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsg ZmlsZVJlZiA9IDkzOUJBOTE2MTQxMDM0MTIwMDFBMDFCRCAvKiBEZXZpY2VTY2FsZUZhY3Rvck9u QmFjay5tbSAqLzsgfTsKKwkJOTM5QkZFM0ExOEU1NTQ4OTAwODgzMjc1IC8qIFN0cmluZ1RydW5j YXRvci5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDkz OUJGRTM5MThFNTU0ODkwMDg4MzI3NSAvKiBTdHJpbmdUcnVuY2F0b3IubW0gKi87IH07CiAJCTkz QTQyN0E5MTgwRDlCMDcwMENEMjRENyAvKiBSZWZQdHIuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOTNBNDI3QTgxODBEOUIwNzAwQ0QyNEQ3IC8qIFJl ZlB0ci5jcHAgKi87IH07CiAJCTkzQTQyN0FCMTgwREEyNjQwMENEMjRENyAvKiBSZWYuY3BwIGlu IFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gOTNBNDI3QUExODBE QTI2NDAwQ0QyNEQ3IC8qIFJlZi5jcHAgKi87IH07CiAJCTkzQUJBODA5MTZEREFCOTEwMDJEQjJG QSAvKiBTdHJpbmdIYXNoZXIuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxl OyBmaWxlUmVmID0gOTNBQkE4MDgxNkREQUI5MTAwMkRCMkZBIC8qIFN0cmluZ0hhc2hlci5jcHAg Ki87IH07CkBAIC00NTAsNiArNDUxLDcgQEAKIAkJOTMzMTQwN0IxN0I0NDE5MDAwRjA4M0IxIC8q IERpZE5vdEhhbmRsZUtleURvd24uY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZp bGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBw YXRoID0gRGlkTm90SGFuZGxlS2V5RG93bi5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07 CiAJCTkzNjEwMDI4MTREQzk1N0IwMDYxMzc5RCAvKiBsb3RzLW9mLWlmcmFtZXMuaHRtbCAqLyA9 IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxl VHlwZSA9IHRleHQuaHRtbDsgcGF0aCA9ICJsb3RzLW9mLWlmcmFtZXMuaHRtbCI7IHNvdXJjZVRy ZWUgPSAiPGdyb3VwPiI7IH07CiAJCTkzOUJBOTE2MTQxMDM0MTIwMDFBMDFCRCAvKiBEZXZpY2VT Y2FsZUZhY3Rvck9uQmFjay5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5j b2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgcGF0 aCA9IERldmljZVNjYWxlRmFjdG9yT25CYWNrLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OworCQk5MzlCRkUzOTE4RTU1NDg5MDA4ODMyNzUgLyogU3RyaW5nVHJ1bmNhdG9yLm1tICovID0g e2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gU3RyaW5nVHJ1bmNhdG9yLm1tOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk5M0E0MjdBODE4MEQ5QjA3MDBDRDI0RDcgLyog UmVmUHRyLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFJlZlB0ci5j cHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTkzQTQyN0FBMTgwREEyNjQwMENEMjRE NyAvKiBSZWYuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGluZyA9 IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gUmVmLmNw cDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOTNBNDI3QUMxODBEQTYwRjAwQ0QyNEQ3 IC8qIE1vdmVPbmx5LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9IE1vdmVPbmx5Lmg7IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07CkBAIC05NzUsMTMgKzk3NywxNCBAQAogCQkJCUM1NDBGNzc1MTUyRTREQTAw MEE0MEM4QyAvKiBTaW1wbGlmeU1hcmt1cC5tbSAqLywKIAkJCQkyOTE4NjFGRDE3QkQ0REM3MDBE NEU0MUUgLyogU3RvcExvYWRpbmdGcm9tRGlkRmluaXNoTG9hZGluZy5tbSAqLywKIAkJCQlFMTk0 RTFCQTE3N0U1MTQ1MDA5QzRENEUgLyogU3RvcExvYWRpbmdGcm9tRGlkUmVjZWl2ZVJlc3BvbnNl Lm1tICovLAotCQkJCUNFMzJDN0M3MTgxODRDNDkwMENEOEMyOCAvKiBXaWxsUGVyZm9ybUNsaWVu dFJlZGlyZWN0VG9VUkxDcmFzaC5tbSAqLywKIAkJCQkzNzk5QUQzOTE0MTIwQTQzMDA1RUIwQzYg LyogU3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdEZyb21TdHJpbmcubW0gKi8sCisJCQkJOTM5 QkZFMzkxOEU1NTQ4OTAwODgzMjc1IC8qIFN0cmluZ1RydW5jYXRvci5tbSAqLywKIAkJCQkzN0E2 ODk1RDE0OEE5QjUwMDA1MTAwRkEgLyogU3VicmVzb3VyY2VFcnJvckNyYXNoLm1tICovLAogCQkJ CUU0OTAyOTY3MTRFMkUzQTQwMDJCRUREMSAvKiBUeXBpbmdTdHlsZUNyYXNoLm1tICovLAogCQkJ CTUxRkJCQjRDMTUxM0Q0RTkwMDgyMjczOCAvKiBXZWJWaWV3Q2FuUGFzdGVVUkwubW0gKi8sCiAJ CQkJQzJFQjJERDExNkNBQzdBQzAwOUI1MkVFIC8qIFdlYlZpZXdEaWRDcmVhdGVKYXZhU2NyaXB0 Q29udGV4dC5tbSAqLywKIAkJCQkzN0UzOEMzMzE2OUI3RDAxMDA4NEMyOEMgLyogV2ViVmlld0Rp ZFJlbW92ZUZyYW1lRnJvbUhpZXJhcmNoeS5tbSAqLywKKwkJCQlDRTMyQzdDNzE4MTg0QzQ5MDBD RDhDMjggLyogV2lsbFBlcmZvcm1DbGllbnRSZWRpcmVjdFRvVVJMQ3Jhc2gubW0gKi8sCiAJCQkJ MUE3QkZDMEExNzFBMEJEQjAwQkM1RjY0IC8qIFdpbGxTZW5kU3VibWl0RXZlbnQubW0gKi8sCiAJ CQkJQTVFMjAyNzIxNUIyMTgxOTAwQzEzRTE0IC8qIFdpbmRvd2xlc3NXZWJWaWV3V2l0aE1lZGlh Lm1tICovLAogCQkJKTsKQEAgLTEyNTYsNiArMTI1OSw3IEBACiAJCQkJMTRGM0IxMTMxNUU0NUVB QjAwMjEwMDY5IC8qIFNhdHVyYXRlZEFyaXRobWV0aWNPcGVyYXRpb25zLmNwcCBpbiBTb3VyY2Vz ICovLAogCQkJCTI2MTUxNkQ2MTVCMEU2MDUwMEEyQzIwMSAvKiBTZXRBbmRVcGRhdGVDYWNoZU1v ZGVsLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJNTJCOENGOTYxNTg2OENGMDAwMjgxMDUzIC8qIFNl dERvY3VtZW50VVJJLm1tIGluIFNvdXJjZXMgKi8sCisJCQkJOTM5QkZFM0ExOEU1NTQ4OTAwODgz Mjc1IC8qIFN0cmluZ1RydW5jYXRvci5tbSBpbiBTb3VyY2VzICovLAogCQkJCTdDOEREQUFCMTcz NURFRUUwMEVBNUFDMCAvKiBDbG9zZVRoZW5UZXJtaW5hdGUuY3BwIGluIFNvdXJjZXMgKi8sCiAJ CQkJQ0RDMkM3MTUxNzk3MEREQjAwRTYyN0ZCIC8qIFRpbWVSYW5nZXMuY3BwIGluIFNvdXJjZXMg Ki8sCiAJCQkJNTFGQ0Y3OUExNTM0QUM2RDAwMTA0NDkxIC8qIFNob3VsZEdvVG9CYWNrRm9yd2Fy ZExpc3RJdGVtLmNwcCBpbiBTb3VyY2VzICovLApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktp dEFQSS9UZXN0cy9tYWMvU3RyaW5nVHJ1bmNhdG9yLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9tYWMvU3RyaW5nVHJ1bmNhdG9yLm1tCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjdhNjUxMzk4NTVkYzdlNzNk ZjZhZGE4NDEwMzUxYjA1NjlmYmY3OWYKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL21hYy9TdHJpbmdUcnVuY2F0b3IubW0KQEAgLTAsMCArMSw0MyBAQAorLyoK KyAqIENvcHlyaWdodCAoQykgMjAxNCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisg KgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywg d2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQg dGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3Ry aWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAor ICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBk aXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVw cm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNv bmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3Vt ZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmli dXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFO RCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJ RUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1Q TElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJU SUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBM RSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwg SU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVF TlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5U IE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwg T1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQg QU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwg U1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJX SVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdB UkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdF LgorICovCisKKyNpbXBvcnQgImNvbmZpZy5oIgorI2ltcG9ydCAiUGxhdGZvcm1VdGlsaXRpZXMu aCIKKworI2ltcG9ydCA8V2ViS2l0L1dlYlN0cmluZ1RydW5jYXRvci5oPgorCituYW1lc3BhY2Ug VGVzdFdlYktpdEFQSSB7CisKK1RFU1QoV2ViS2l0MSwgU3RyaW5nVHJ1bmNhdG9yKQoreworICAg IEBhdXRvcmVsZWFzZXBvb2wgeworICAgICAgICBFWFBFQ1RfU1RSRVEoW1tXZWJTdHJpbmdUcnVu Y2F0b3IgY2VudGVyVHJ1bmNhdGVTdHJpbmc6QCJhYmNkZWZnaGlqa2xtbm9wcXJzdHV2d3h5eiIg dG9XaWR0aDoxMDAgd2l0aEZvbnQ6W05TRm9udCBmb250V2l0aE5hbWU6QCJIZWx2ZXRpY2EiIHNp emU6MTJdXSBVVEY4U3RyaW5nXSwgImFiY2RlZuKApnR1dnd4eXoiKTsKKyAgICAgICAgRVhQRUNU X1NUUkVRKFtbV2ViU3RyaW5nVHJ1bmNhdG9yIGNlbnRlclRydW5jYXRlU3RyaW5nOkAiYWJjZGVm Z2hpamtsbW5vcHFyc3R1dnd4eXoiIHRvV2lkdGg6MTAwXSBVVEY4U3RyaW5nXSwgImFiY2Rl4oCm dXZ3eHl6Iik7CisgICAgICAgIEVYUEVDVF9TVFJFUShbW1dlYlN0cmluZ1RydW5jYXRvciByaWdo dFRydW5jYXRlU3RyaW5nOkAiYWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXoiIHRvV2lkdGg6MTAw IHdpdGhGb250OltOU0ZvbnQgZm9udFdpdGhOYW1lOkAiSGVsdmV0aWNhIiBzaXplOjEyXV0gVVRG OFN0cmluZ10sICJhYmNkZWZnaGlqa2xtbm/igKYiKTsKKyAgICAgICAgRVhQRUNUX0VRKFtXZWJT dHJpbmdUcnVuY2F0b3Igd2lkdGhPZlN0cmluZzpAImFiY2RlZmdoaWprbG1ub3BxcnN0dXZ3eHl6 IiBmb250OltOU0ZvbnQgZm9udFdpdGhOYW1lOkAiSGVsdmV0aWNhIiBzaXplOjEyXV0sIDE1Mi43 MzYzMjgxMjUpOworICAgIH0KK30KKworfSAvLyBuYW1lc3BhY2UgVGVzdFdlYktpdEFQSQo=