130219 2014-03-13 17:43:56 -0700 Make editingAttributedString pass existing attributed string tests 2014-03-13 22:57:28 -0700 1 1 1 Unclassified WebKit HTML Editing 528+ (Nightly build) Unspecified Unspecified RESOLVED INVALID P2 Normal --- 1 rniwa rniwa darin enrica sam oldest_to_newest 990215 0 rniwa 2014-03-13 17:43:56 -0700 Now that we have some tests for attributed strings, we should make editingAttributedString (TextIterator version) pass those tests. 990217 1 226632 rniwa 2014-03-13 17:50:26 -0700 Created attachment 226632 Fixes the bug 990218 2 226633 rniwa 2014-03-13 17:57:05 -0700 Created attachment 226633 Added a change log entry for LayoutTests 226632 2014-03-13 17:50:26 -0700 2014-03-13 17:57:03 -0700 Fixes the bug bug-130219-20140313175004.patch text/plain 14278 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NTU4MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE0LTAzLTEzICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIE1ha2UgZWRpdGluZ0F0dHJpYnV0 ZWRTdHJpbmcgcGFzcyBleGlzdGluZyBhdHRyaWJ1dGVkIHN0cmluZyB0ZXN0cworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwMjE5CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4ZWQgZWRpdGluZ0F0dHJp YnV0ZWRTdHJpbmcgdG8gdXNlIFBsYXRmb3JtRm9udENsYXNzIHRvIGdlbmVyYXRlIGEgZm9udCB3 aGVuCisgICAgICAgIHRoZSBmb250IG5hbWUgaXMgbm90IHNwZWNpZmllZCwgYW5kIG1hZGUgaXQg bm90IGdlbmVyYXRlIGJsYWNrIGZvcmVncm91bmQgdGV4dCBjb2xvci4KKworICAgICAgICBGaW5h bGx5LCBzZXQgdGhlIGRlZmF1bHQgcGFyYWdyYXBoIHN0eWxlLgorCisgICAgICAgICogcGxhdGZv cm0vbWFjL0hUTUxDb252ZXJ0ZXIubW06CisgICAgICAgIChfY29sb3JGb3JSR0JDb2xvcik6IFJl ZmFjdG9yZWQgdG8gdGFrZSBOU0NvbG9yKi4KKyAgICAgICAgKC1bV2ViSFRNTENvbnZlcnRlciBf Y29tcHV0ZWRDb2xvckZvck5vZGU6cHJvcGVydHk6XSk6CisgICAgICAgICgrW1dlYkhUTUxDb252 ZXJ0ZXIgZWRpdGluZ0F0dHJpYnV0ZWRTdHJpbmdGcm9tUmFuZ2U6XSk6IAorCiAyMDE0LTAzLTEz ICBCZW5qYW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBh IGJ1bmNoIG9mIG1pc3Rha2VzIGluIHRoZSBwYXJzaW5nIG9mIDo6Y3VlKCBhbmQgOjpjdWUKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9IVE1MQ29udmVydGVyLm1tCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9IVE1MQ29udmVydGVyLm1tCShyZXZp c2lvbiAxNjU1NjEpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvSFRNTENvbnZlcnRl ci5tbQkod29ya2luZyBjb3B5KQpAQCAtODMyLDE1ICs4MzIsMTQgQEAgLSAoTlNCdW5kbGUgKilf d2ViS2l0QnVuZGxlCiB9CiAKICNpZiBQTEFURk9STShJT1MpCi1zdGF0aWMgaW5saW5lIFVJQ29s b3IgKl9jb2xvckZvclJHQkNvbG9yKERPTVJHQkNvbG9yICpkb21SR0JDb2xvciwgQk9PTCkKK3N0 YXRpYyBpbmxpbmUgVUlDb2xvciAqX2NvbG9yRm9yUkdCQ29sb3IoTlNDb2xvciAqY29sb3IsIEJP T0wpCiB7Ci0gICAgcmV0dXJuIFtnZXRVSUNvbG9yQ2xhc3MoKSBfZGlzYW1iaWd1YXRlZF9kdWVf dG9fQ0lJbWFnZV9jb2xvcldpdGhDR0NvbG9yOltkb21SR0JDb2xvciBjb2xvcl1dOworICAgIHJl dHVybiBbZ2V0VUlDb2xvckNsYXNzKCkgX2Rpc2FtYmlndWF0ZWRfZHVlX3RvX0NJSW1hZ2VfY29s b3JXaXRoQ0dDb2xvcjpjb2xvcl07CiB9CiAKICNlbHNlCi1zdGF0aWMgaW5saW5lIE5TQ29sb3Ig Kl9jb2xvckZvclJHQkNvbG9yKERPTVJHQkNvbG9yICpkb21SR0JDb2xvciwgQk9PTCBpZ25vcmVC bGFjaykKK3N0YXRpYyBpbmxpbmUgTlNDb2xvciAqX2NvbG9yRm9yUkdCQ29sb3IoTlNDb2xvciAq Y29sb3IsIEJPT0wgaWdub3JlQmxhY2spCiB7Ci0gICAgTlNDb2xvciAqY29sb3IgPSBbZG9tUkdC Q29sb3IgX2NvbG9yXTsKICAgICBOU0NvbG9yU3BhY2UgKmNvbG9yU3BhY2UgPSBbY29sb3IgY29s b3JTcGFjZV07CiAgICAgY29uc3QgQ0dGbG9hdCBDb2xvckVwc2lsb24gPSAxIC8gKDIgKiAoQ0dG bG9hdCkyNTUuMCk7CiAgICAgCkBAIC05NzksNyArOTc4LDcgQEAgLSAoUGxhdGZvcm1Db2xvciAq KV9jb21wdXRlZENvbG9yRm9yTm9kZQogICAgICAgICBpZiAoIWhhdmVSZXN1bHQgJiYgKGNvbXB1 dGVkU3R5bGUgPSBbc2VsZiBfY29tcHV0ZWRTdHlsZUZvckVsZW1lbnQ6ZWxlbWVudF0pKSB7CiAg ICAgICAgICAgICBET01DU1NQcmltaXRpdmVWYWx1ZSAqY29tcHV0ZWRWYWx1ZSA9IChET01DU1NQ cmltaXRpdmVWYWx1ZSAqKVtjb21wdXRlZFN0eWxlIGdldFByb3BlcnR5Q1NTVmFsdWU6a2V5XTsK ICAgICAgICAgICAgIGlmIChjb21wdXRlZFZhbHVlICYmIFtjb21wdXRlZFZhbHVlIGNzc1ZhbHVl VHlwZV0gPT0gRE9NX0NTU19QUklNSVRJVkVfVkFMVUUgJiYgW2NvbXB1dGVkVmFsdWUgcHJpbWl0 aXZlVHlwZV0gPT0gRE9NX0NTU19SR0JDT0xPUikgewotICAgICAgICAgICAgICAgIHJlc3VsdCA9 IF9jb2xvckZvclJHQkNvbG9yKFtjb21wdXRlZFZhbHVlIGdldFJHQkNvbG9yVmFsdWVdLCBpc0Nv bG9yKTsKKyAgICAgICAgICAgICAgICByZXN1bHQgPSBfY29sb3JGb3JSR0JDb2xvcihbW2NvbXB1 dGVkVmFsdWUgZ2V0UkdCQ29sb3JWYWx1ZV0gY29sb3JdLCBpc0NvbG9yKTsKICAgICAgICAgICAg ICAgICBoYXZlUmVzdWx0ID0gWUVTOwogICAgICAgICAgICAgfQogICAgICAgICB9CkBAIC05ODgs NyArOTg3LDcgQEAgLSAoUGxhdGZvcm1Db2xvciAqKV9jb21wdXRlZENvbG9yRm9yTm9kZQogICAg ICAgICAgICAgaWYgKHNwZWNpZmllZFZhbHVlKSB7CiAgICAgICAgICAgICAgICAgdW5zaWduZWQg c2hvcnQgdmFsdWVUeXBlID0gW3NwZWNpZmllZFZhbHVlIGNzc1ZhbHVlVHlwZV07CiAgICAgICAg ICAgICAgICAgaWYgKHZhbHVlVHlwZSA9PSBET01fQ1NTX1BSSU1JVElWRV9WQUxVRSAmJiBbc3Bl Y2lmaWVkVmFsdWUgcHJpbWl0aXZlVHlwZV0gPT0gRE9NX0NTU19SR0JDT0xPUikgewotICAgICAg ICAgICAgICAgICAgICByZXN1bHQgPSBfY29sb3JGb3JSR0JDb2xvcihbc3BlY2lmaWVkVmFsdWUg Z2V0UkdCQ29sb3JWYWx1ZV0sIGlzQ29sb3IpOworICAgICAgICAgICAgICAgICAgICByZXN1bHQg PSBfY29sb3JGb3JSR0JDb2xvcihbW3NwZWNpZmllZFZhbHVlIGdldFJHQkNvbG9yVmFsdWVdIGNv bG9yXSwgaXNDb2xvcik7CiAgICAgICAgICAgICAgICAgICAgIGhhdmVSZXN1bHQgPSBZRVM7CiAg ICAgICAgICAgICAgICAgfSBlbHNlIGlmICh2YWx1ZVR5cGUgPT0gRE9NX0NTU19JTkhFUklUKQog ICAgICAgICAgICAgICAgICAgICBpbmhlcml0ID0gWUVTOwpAQCAtMjQ4MSw3ICsyNDgwLDYgQEAg LSAoTlNBdHRyaWJ1dGVkU3RyaW5nICopYXR0cmlidXRlZFN0cmluZwogLy8gVGhpcyBmdW5jdGlv biB1c2VzIFRleHRJdGVyYXRvciwgd2hpY2ggbWFrZXMgb2Zmc2V0cyBpbiBpdHMgcmVzdWx0IGNv bXBhdGlibGUgd2l0aCBIVE1MIGVkaXRpbmcuCiArIChOU0F0dHJpYnV0ZWRTdHJpbmcgKillZGl0 aW5nQXR0cmlidXRlZFN0cmluZ0Zyb21SYW5nZTooUmFuZ2UqKXJhbmdlCiB7Ci0gICAgTlNGb250 TWFuYWdlciAqZm9udE1hbmFnZXIgPSBbTlNGb250TWFuYWdlciBzaGFyZWRGb250TWFuYWdlcl07 CiAgICAgTlNNdXRhYmxlQXR0cmlidXRlZFN0cmluZyAqc3RyaW5nID0gW1tOU011dGFibGVBdHRy aWJ1dGVkU3RyaW5nIGFsbG9jXSBpbml0XTsKICAgICBOU1VJbnRlZ2VyIHN0cmluZ0xlbmd0aCA9 IDA7CiAgICAgUmV0YWluUHRyPE5TTXV0YWJsZURpY3Rpb25hcnk+IGF0dHJzID0gYWRvcHROUyhb W05TTXV0YWJsZURpY3Rpb25hcnkgYWxsb2NdIGluaXRdKTsKQEAgLTI1MTksMTYgKzI1MTcsMjAg QEAgKyAoTlNBdHRyaWJ1dGVkU3RyaW5nICopZWRpdGluZ0F0dHJpYnV0ZQogICAgICAgICBpZiAo TlNGb250ICpmb250ID0gc3R5bGUuZm9udCgpLnByaW1hcnlGb250KCktPmdldE5TRm9udCgpKQog ICAgICAgICAgICAgW2F0dHJzLmdldCgpIHNldE9iamVjdDpmb250IGZvcktleTpOU0ZvbnRBdHRy aWJ1dGVOYW1lXTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgW2F0dHJzLmdldCgpIHNldE9i amVjdDpbZm9udE1hbmFnZXIgY29udmVydEZvbnQ6V2ViRGVmYXVsdEZvbnQoKSB0b1NpemU6c3R5 bGUuZm9udCgpLnByaW1hcnlGb250KCktPnBsYXRmb3JtRGF0YSgpLnNpemUoKV0gZm9yS2V5Ok5T Rm9udEF0dHJpYnV0ZU5hbWVdOwotICAgICAgICBpZiAoc3R5bGUudmlzaXRlZERlcGVuZGVudENv bG9yKENTU1Byb3BlcnR5Q29sb3IpLmFscGhhKCkpCi0gICAgICAgICAgICBbYXR0cnMuZ2V0KCkg c2V0T2JqZWN0Om5zQ29sb3Ioc3R5bGUudmlzaXRlZERlcGVuZGVudENvbG9yKENTU1Byb3BlcnR5 Q29sb3IpKSBmb3JLZXk6TlNGb3JlZ3JvdW5kQ29sb3JBdHRyaWJ1dGVOYW1lXTsKKyAgICAgICAg ICAgIFtQbGF0Zm9ybUZvbnRDbGFzcyBmb250V2l0aE5hbWU6QCJUaW1lcyIgc2l6ZTpzdHlsZS5m b250KCkucHJpbWFyeUZvbnQoKS0+cGxhdGZvcm1EYXRhKCkuc2l6ZSgpXTsKKworICAgICAgICBp ZiAoTlNDb2xvciAqY29sb3IgPSBfY29sb3JGb3JSR0JDb2xvcihuc0NvbG9yKHN0eWxlLnZpc2l0 ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0eUNvbG9yKSksIHRydWUpKQorICAgICAgICAgICAg W2F0dHJzLmdldCgpIHNldE9iamVjdDpjb2xvciBmb3JLZXk6TlNGb3JlZ3JvdW5kQ29sb3JBdHRy aWJ1dGVOYW1lXTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgW2F0dHJzLmdldCgpIHJlbW92 ZU9iamVjdEZvcktleTpOU0ZvcmVncm91bmRDb2xvckF0dHJpYnV0ZU5hbWVdOwotICAgICAgICBp ZiAoc3R5bGUudmlzaXRlZERlcGVuZGVudENvbG9yKENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9y KS5hbHBoYSgpKQotICAgICAgICAgICAgW2F0dHJzLmdldCgpIHNldE9iamVjdDpuc0NvbG9yKHN0 eWxlLnZpc2l0ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0eUJhY2tncm91bmRDb2xvcikpIGZv cktleTpOU0JhY2tncm91bmRDb2xvckF0dHJpYnV0ZU5hbWVdOworCisgICAgICAgIGlmIChOU0Nv bG9yICpjb2xvciA9IF9jb2xvckZvclJHQkNvbG9yKG5zQ29sb3Ioc3R5bGUudmlzaXRlZERlcGVu ZGVudENvbG9yKENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9yKSksIGZhbHNlKSkKKyAgICAgICAg ICAgIFthdHRycy5nZXQoKSBzZXRPYmplY3Q6Y29sb3IgZm9yS2V5Ok5TQmFja2dyb3VuZENvbG9y QXR0cmlidXRlTmFtZV07CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIFthdHRycy5nZXQoKSBy ZW1vdmVPYmplY3RGb3JLZXk6TlNCYWNrZ3JvdW5kQ29sb3JBdHRyaWJ1dGVOYW1lXTsKIAorICAg ICAgICBbYXR0cnMuZ2V0KCkgc2V0T2JqZWN0OltbV2ViSFRNTENvbnZlcnRlciBkZWZhdWx0UGFy YWdyYXBoU3R5bGVdIG11dGFibGVDb3B5XSBmb3JLZXk6TlNQYXJhZ3JhcGhTdHlsZUF0dHJpYnV0 ZU5hbWVdOworCiAgICAgICAgIFtzdHJpbmcgcmVwbGFjZUNoYXJhY3RlcnNJblJhbmdlOk5TTWFr ZVJhbmdlKHN0cmluZ0xlbmd0aCwgMCkgd2l0aFN0cmluZzppdC50ZXh0KCkuY3JlYXRlTlNTdHJp bmdXaXRob3V0Q29weWluZygpLmdldCgpXTsKICAgICAgICAgW3N0cmluZyBzZXRBdHRyaWJ1dGVz OmF0dHJzLmdldCgpIHJhbmdlOk5TTWFrZVJhbmdlKHN0cmluZ0xlbmd0aCwgY3VycmVudFRleHRM ZW5ndGgpXTsKICAgICAgICAgc3RyaW5nTGVuZ3RoICs9IGN1cnJlbnRUZXh0TGVuZ3RoOwpJbmRl eDogU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvbWFjL0NoYW5nZUxvZwkocmV2aXNpb24gMTY1NTgwKQorKysgU291cmNlL1dlYktpdC9tYWMv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTQtMDMtMTMgIFJ5 b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTWFrZSBlZGl0aW5nQXR0 cmlidXRlZFN0cmluZyBwYXNzIGV4aXN0aW5nIGF0dHJpYnV0ZWQgc3RyaW5nIHRlc3RzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzAyMTkKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlZpZXcvV2Vi SFRNTFZpZXcubW06CisgICAgICAgICgtW1dlYkhUTUxWaWV3IF9hdHRyaWJ1dGVkU3RyaW5nRnJv bURPTVJhbmdlOl0pOiBSZW5hbWVkIGZyb20gX2F0dHJpYnV0KmUqU3RyaW5nRnJvbURPTVJhbmdl LgorICAgICAgICAoLVtXZWJIVE1MVmlldyBfZWRpdGluZ0F0dHJpYnV0ZWRTdHJpbmdGcm9tRE9N UmFuZ2U6XSk6IEFkZGVkIHRvIGJlIHVzZWQgaW4gRFJULgorICAgICAgICAoLVtXZWJIVE1MVmll dyBhdHRyaWJ1dGVkU3RyaW5nXSk6CisgICAgICAgICgtW1dlYkhUTUxWaWV3IHNlbGVjdGVkQXR0 cmlidXRlZFN0cmluZ10pOgorCiAyMDE0LTAzLTEzICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0 b25AYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCByZWxhdGl2ZSBwYXRocyB0byBVc2VJbnRlcm5h bFNESy54Y2NvbmZpZyBmb3IgQU5HTEUgYW5kIFdlYktpdC9tYWMKSW5kZXg6IFNvdXJjZS9XZWJL aXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQkocmV2aXNpb24gMTY1NTYxKQorKysgU291cmNl L1dlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtNjYy Miw3ICs2NjIyLDcgQEAgLSAoTlNTdHJpbmcgKilzdHJpbmcKIH0KIAogI2lmICFQTEFURk9STShJ T1MpCi0tIChOU0F0dHJpYnV0ZWRTdHJpbmcgKilfYXR0cmlidXRlU3RyaW5nRnJvbURPTVJhbmdl OihET01SYW5nZSAqKXJhbmdlCistIChOU0F0dHJpYnV0ZWRTdHJpbmcgKilfYXR0cmlidXRlZFN0 cmluZ0Zyb21ET01SYW5nZTooRE9NUmFuZ2UgKilyYW5nZQogewogICAgIE5TQXR0cmlidXRlZFN0 cmluZyAqYXR0cmlidXRlZFN0cmluZzsKICNpZiAhTE9HX0RJU0FCTEVECkBAIC02NjM2LDE2ICs2 NjM2LDIyIEBAIC0gKE5TQXR0cmlidXRlZFN0cmluZyAqKV9hdHRyaWJ1dGVTdHJpbmcKICAgICBy ZXR1cm4gYXR0cmlidXRlZFN0cmluZzsKIH0KIAorLSAoTlNBdHRyaWJ1dGVkU3RyaW5nICopX2Vk aXRpbmdBdHRyaWJ1dGVkU3RyaW5nRnJvbURPTVJhbmdlOihET01SYW5nZSAqKXJhbmdlCit7Cisg ICAgcmV0dXJuIFtXZWJIVE1MQ29udmVydGVyIGVkaXRpbmdBdHRyaWJ1dGVkU3RyaW5nRnJvbVJh bmdlOmNvcmUocmFuZ2UpXTsKK30KKwogLSAoTlNBdHRyaWJ1dGVkU3RyaW5nICopYXR0cmlidXRl ZFN0cmluZwogewogICAgIERPTURvY3VtZW50ICpkb2N1bWVudCA9IFtbc2VsZiBfZnJhbWVdIERP TURvY3VtZW50XTsKLSAgICBOU0F0dHJpYnV0ZWRTdHJpbmcgKmF0dHJpYnV0ZWRTdHJpbmcgPSBb c2VsZiBfYXR0cmlidXRlU3RyaW5nRnJvbURPTVJhbmdlOltkb2N1bWVudCBfZG9jdW1lbnRSYW5n ZV1dOworICAgIE5TQXR0cmlidXRlZFN0cmluZyAqYXR0cmlidXRlZFN0cmluZyA9IFtzZWxmIF9h dHRyaWJ1dGVkU3RyaW5nRnJvbURPTVJhbmdlOltkb2N1bWVudCBfZG9jdW1lbnRSYW5nZV1dOwog ICAgIGlmICghYXR0cmlidXRlZFN0cmluZykgewogICAgICAgICBEb2N1bWVudCogY29yZURvY3Vt ZW50ID0gY29yZShkb2N1bWVudCk7CiAgICAgICAgIGF0dHJpYnV0ZWRTdHJpbmcgPSBbV2ViSFRN TENvbnZlcnRlciBlZGl0aW5nQXR0cmlidXRlZFN0cmluZ0Zyb21SYW5nZTpSYW5nZTo6Y3JlYXRl KCpjb3JlRG9jdW1lbnQsIGNvcmVEb2N1bWVudCwgMCwgY29yZURvY3VtZW50LCBjb3JlRG9jdW1l bnQtPmNoaWxkTm9kZUNvdW50KCkpLmdldCgpXTsKICAgICB9CiAgICAgcmV0dXJuIGF0dHJpYnV0 ZWRTdHJpbmc7CiB9CisKICNlbmRpZgogCiAtIChOU1N0cmluZyAqKXNlbGVjdGVkU3RyaW5nCkBA IC02NjU2LDcgKzY2NjIsNyBAQCAtIChOU1N0cmluZyAqKXNlbGVjdGVkU3RyaW5nCiAjaWYgIVBM QVRGT1JNKElPUykKIC0gKE5TQXR0cmlidXRlZFN0cmluZyAqKXNlbGVjdGVkQXR0cmlidXRlZFN0 cmluZwogewotICAgIE5TQXR0cmlidXRlZFN0cmluZyAqYXR0cmlidXRlZFN0cmluZyA9IFtzZWxm IF9hdHRyaWJ1dGVTdHJpbmdGcm9tRE9NUmFuZ2U6W3NlbGYgX3NlbGVjdGVkUmFuZ2VdXTsKKyAg ICBOU0F0dHJpYnV0ZWRTdHJpbmcgKmF0dHJpYnV0ZWRTdHJpbmcgPSBbc2VsZiBfYXR0cmlidXRl ZFN0cmluZ0Zyb21ET01SYW5nZTpbc2VsZiBfc2VsZWN0ZWRSYW5nZV1dOwogICAgIGlmICghYXR0 cmlidXRlZFN0cmluZykgewogICAgICAgICBGcmFtZSogY29yZUZyYW1lID0gY29yZShbc2VsZiBf ZnJhbWVdKTsKICAgICAgICAgaWYgKGNvcmVGcmFtZSkgewpJbmRleDogVG9vbHMvQ2hhbmdlTG9n Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMTY1NTgwKQorKysgVG9v bHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTQtMDMtMTMg IFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTWFrZSBlZGl0aW5n QXR0cmlidXRlZFN0cmluZyBwYXNzIGV4aXN0aW5nIGF0dHJpYnV0ZWQgc3RyaW5nIHRlc3RzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzAyMTkKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCB0ZXh0 SW5wdXRDb250cm9sbGVyLmVkaXRpbmdBdHRyaWJ1dGVkU3RyaW5nIHRoYXQgdXNlcyBlZGl0aW5n QXR0cmlidXRlZFN0cmluZyB0byBnZW5lcmF0ZSBhdHRyaWJ1dGVkIHN0cmluZy4KKworICAgICAg ICAqIER1bXBSZW5kZXJUcmVlL21hYy9UZXh0SW5wdXRDb250cm9sbGVyLm06CisgICAgICAgICgr W1RleHRJbnB1dENvbnRyb2xsZXIgaXNTZWxlY3RvckV4Y2x1ZGVkRnJvbVdlYlNjcmlwdDpdKToK KyAgICAgICAgKCtbVGV4dElucHV0Q29udHJvbGxlciB3ZWJTY3JpcHROYW1lRm9yU2VsZWN0b3I6 XSk6CisgICAgICAgICgtW1RleHRJbnB1dENvbnRyb2xsZXIgbGVnYWN5QXR0cmlidXRlZFN0cmlu ZzpdKToKKyAgICAgICAgKC1bVGV4dElucHV0Q29udHJvbGxlciBlZGl0aW5nQXR0cmlidXRlZFN0 cmluZzpdKToKKwogMjAxNC0wMy0xMyAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgog CiAgICAgICAgIEZUTCBzaG91bGQgc3VwcG9ydCBJc0JsYWgKSW5kZXg6IFRvb2xzL0R1bXBSZW5k ZXJUcmVlL21hYy9UZXh0SW5wdXRDb250cm9sbGVyLm0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvRHVt cFJlbmRlclRyZWUvbWFjL1RleHRJbnB1dENvbnRyb2xsZXIubQkocmV2aXNpb24gMTY1NTYxKQor KysgVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL1RleHRJbnB1dENvbnRyb2xsZXIubQkod29ya2lu ZyBjb3B5KQpAQCAtNTcsNyArNTcsOCBAQCAtICh2b2lkKWludGVycHJldEtleUV2ZW50czooTlNB cnJheSAqKWV2CiAKIEBpbnRlcmZhY2UgV2ViSFRNTFZpZXcgKFdlYktpdFNlY3JldHNUZXh0SW5w dXRDb250cm9sbGVySXNBd2FyZU9mKQogLSAoV2ViRnJhbWUgKilfZnJhbWU7Ci0tIChOU0F0dHJp YnV0ZWRTdHJpbmcgKilfYXR0cmlidXRlU3RyaW5nRnJvbURPTVJhbmdlOihET01SYW5nZSAqKXJh bmdlOworLSAoTlNBdHRyaWJ1dGVkU3RyaW5nICopX2F0dHJpYnV0ZWRTdHJpbmdGcm9tRE9NUmFu Z2U6KERPTVJhbmdlICopcmFuZ2U7CistIChOU0F0dHJpYnV0ZWRTdHJpbmcgKilfZWRpdGluZ0F0 dHJpYnV0ZWRTdHJpbmdGcm9tRE9NUmFuZ2U6KERPTVJhbmdlICopcmFuZ2U7CiBAZW5kCiAKIEBp bXBsZW1lbnRhdGlvbiBXZWJIVE1MVmlldyAoRHVtcFJlbmRlclRyZWVJbnB1dE1ldGhvZEhhbmRs ZXIpCkBAIC0yMjUsNiArMjI2LDcgQEAgKyAoQk9PTClpc1NlbGVjdG9yRXhjbHVkZWRGcm9tV2Vi U2NyaXB0OgogICAgICAgICAgICAgfHwgYVNlbGVjdG9yID09IEBzZWxlY3RvcihzdWJzdHJpbmdG cm9tOmxlbmd0aDopCiAgICAgICAgICAgICB8fCBhU2VsZWN0b3IgPT0gQHNlbGVjdG9yKGF0dHJp YnV0ZWRTdWJzdHJpbmdGcm9tOmxlbmd0aDopCiAgICAgICAgICAgICB8fCBhU2VsZWN0b3IgPT0g QHNlbGVjdG9yKGxlZ2FjeUF0dHJpYnV0ZWRTdHJpbmc6KQorICAgICAgICAgICAgfHwgYVNlbGVj dG9yID09IEBzZWxlY3RvcihlZGl0aW5nQXR0cmlidXRlZFN0cmluZzopCiAgICAgICAgICAgICB8 fCBhU2VsZWN0b3IgPT0gQHNlbGVjdG9yKG1hcmtlZFJhbmdlKQogICAgICAgICAgICAgfHwgYVNl bGVjdG9yID09IEBzZWxlY3RvcihzZWxlY3RlZFJhbmdlKQogICAgICAgICAgICAgfHwgYVNlbGVj dG9yID09IEBzZWxlY3RvcihmaXJzdFJlY3RGb3JDaGFyYWN0ZXJzRnJvbTpsZW5ndGg6KQpAQCAt MjUxLDYgKzI1Myw4IEBAICsgKE5TU3RyaW5nICopd2ViU2NyaXB0TmFtZUZvclNlbGVjdG9yOigK ICAgICAgICAgcmV0dXJuIEAiYXR0cmlidXRlZFN1YnN0cmluZ0Zyb21SYW5nZSI7CiAgICAgZWxz ZSBpZiAoYVNlbGVjdG9yID09IEBzZWxlY3RvcihsZWdhY3lBdHRyaWJ1dGVkU3RyaW5nOikpCiAg ICAgICAgIHJldHVybiBAImxlZ2FjeUF0dHJpYnV0ZWRTdHJpbmciOworICAgIGVsc2UgaWYgKGFT ZWxlY3RvciA9PSBAc2VsZWN0b3IoZWRpdGluZ0F0dHJpYnV0ZWRTdHJpbmc6KSkKKyAgICAgICAg cmV0dXJuIEAiZWRpdGluZ0F0dHJpYnV0ZWRTdHJpbmciOwogICAgIGVsc2UgaWYgKGFTZWxlY3Rv ciA9PSBAc2VsZWN0b3IoZmlyc3RSZWN0Rm9yQ2hhcmFjdGVyc0Zyb206bGVuZ3RoOikpCiAgICAg ICAgIHJldHVybiBAImZpcnN0UmVjdEZvckNoYXJhY3RlclJhbmdlIjsKICAgICBlbHNlIGlmIChh U2VsZWN0b3IgPT0gQHNlbGVjdG9yKGNoYXJhY3RlckluZGV4Rm9yUG9pbnRYOlk6KSkKQEAgLTM2 OSw3ICszNzMsMTggQEAgLSAoTlNNdXRhYmxlQXR0cmlidXRlZFN0cmluZyAqKWxlZ2FjeUF0dAog ICAgIGlmICghW2RvY3VtZW50VmlldyBpc0tpbmRPZkNsYXNzOltXZWJIVE1MVmlldyBjbGFzc11d KQogICAgICAgICByZXR1cm4gc3RyaW5nOwogCi0gICAgW3N0cmluZyBzZXRBdHRyaWJ1dGVkU3Ry aW5nOlsoV2ViSFRNTFZpZXcgKilkb2N1bWVudFZpZXcgX2F0dHJpYnV0ZVN0cmluZ0Zyb21ET01S YW5nZTpyYW5nZV1dOworICAgIFtzdHJpbmcgc2V0QXR0cmlidXRlZFN0cmluZzpbKFdlYkhUTUxW aWV3ICopZG9jdW1lbnRWaWV3IF9hdHRyaWJ1dGVkU3RyaW5nRnJvbURPTVJhbmdlOnJhbmdlXV07 CisgICAgcmV0dXJuIHN0cmluZzsKK30KKworLSAoTlNNdXRhYmxlQXR0cmlidXRlZFN0cmluZyAq KWVkaXRpbmdBdHRyaWJ1dGVkU3RyaW5nOihET01SYW5nZSopcmFuZ2UKK3sKKyAgICBOU011dGFi bGVBdHRyaWJ1dGVkU3RyaW5nICpzdHJpbmcgPSBbW1tOU011dGFibGVBdHRyaWJ1dGVkU3RyaW5n IGFsbG9jXSBpbml0XSBhdXRvcmVsZWFzZV07CisgICAgaWQgZG9jdW1lbnRWaWV3ID0gW1tbd2Vi VmlldyBtYWluRnJhbWVdIGZyYW1lVmlld10gZG9jdW1lbnRWaWV3XTsKKyAgICBpZiAoIVtkb2N1 bWVudFZpZXcgaXNLaW5kT2ZDbGFzczpbV2ViSFRNTFZpZXcgY2xhc3NdXSkKKyAgICAgICAgcmV0 dXJuIHN0cmluZzsKKworICAgIFtzdHJpbmcgc2V0QXR0cmlidXRlZFN0cmluZzpbKFdlYkhUTUxW aWV3ICopZG9jdW1lbnRWaWV3IF9lZGl0aW5nQXR0cmlidXRlZFN0cmluZ0Zyb21ET01SYW5nZTpy YW5nZV1dOwogICAgIHJldHVybiBzdHJpbmc7CiB9CiAKSW5kZXg6IExheW91dFRlc3RzL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NTU4 MCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEy IEBACisyMDE0LTAzLTEzICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAg ICAgIE1ha2UgZWRpdGluZ0F0dHJpYnV0ZWRTdHJpbmcgcGFzcyBleGlzdGluZyBhdHRyaWJ1dGVk IHN0cmluZyB0ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTMwMjE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9tYWMvZWRpdGluZy9hdHRyaWJ1dGVkLXN0cmluZy9yZXNvdXJjZXMv ZHVtcC1hdHRyaWJ1dGVkLXN0cmluZy5qczoKKwogMjAxNC0wMy0xMyAgQW5kcmVzIEdvbWV6ICA8 YWdvbWV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjE2 NTUzNi4KSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9lZGl0aW5nL2F0dHJpYnV0ZWQt c3RyaW5nL3Jlc291cmNlcy9kdW1wLWF0dHJpYnV0ZWQtc3RyaW5nLmpzCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9lZGl0aW5nL2F0dHJpYnV0ZWQtc3RyaW5nL3Jlc291 cmNlcy9kdW1wLWF0dHJpYnV0ZWQtc3RyaW5nLmpzCShyZXZpc2lvbiAxNjU1NjEpCisrKyBMYXlv dXRUZXN0cy9wbGF0Zm9ybS9tYWMvZWRpdGluZy9hdHRyaWJ1dGVkLXN0cmluZy9yZXNvdXJjZXMv ZHVtcC1hdHRyaWJ1dGVkLXN0cmluZy5qcwkod29ya2luZyBjb3B5KQpAQCAtMTQsNyArMTQsMTEg QEAKICAgICAgICAgcmFuZ2Uuc2VsZWN0Tm9kZUNvbnRlbnRzKGNvbnRhaW5lcik7CiAKICAgICAg ICAgdmFyIHByZSA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ3ByZScpOwotICAgICAgICBwcmUu dGV4dENvbnRlbnQgPSAnSW5wdXQ6XG4nICsgY29udGFpbmVyLmlubmVySFRNTC50cmltKCkgKyAn XG5cbk91dHB1dDpcbicgKyBzZXJpYWxpemVBdHRyaWJ1dGVkU3RyaW5nKHRleHRJbnB1dENvbnRy b2xsZXIubGVnYWN5QXR0cmlidXRlZFN0cmluZyhyYW5nZSkpOworICAgICAgICB2YXIgbGVnYWN5 T3V0cHV0ID0gc2VyaWFsaXplQXR0cmlidXRlZFN0cmluZyh0ZXh0SW5wdXRDb250cm9sbGVyLmxl Z2FjeUF0dHJpYnV0ZWRTdHJpbmcocmFuZ2UpKTsKKyAgICAgICAgdmFyIGVkaXRpbmdPdXRwdXQg PSBzZXJpYWxpemVBdHRyaWJ1dGVkU3RyaW5nKHRleHRJbnB1dENvbnRyb2xsZXIuZWRpdGluZ0F0 dHJpYnV0ZWRTdHJpbmcocmFuZ2UpKTsKKyAgICAgICAgcHJlLnRleHRDb250ZW50ID0gJ0lucHV0 OlxuJyArIGNvbnRhaW5lci5pbm5lckhUTUwudHJpbSgpICsgJ1xuXG5PdXRwdXQ6XG4nICsgbGVn YWN5T3V0cHV0OworICAgICAgICBpZiAobGVnYWN5T3V0cHV0ICE9IGVkaXRpbmdPdXRwdXQpCisg ICAgICAgICAgICBwcmUudGV4dENvbnRlbnQgKz0gJ1xuXG5FZGl0aW5nT3V0cHV0OlxuJyArIGVk aXRpbmdPdXRwdXQ7CiAKICAgICAgICAgYm9keS5pbm5lckhUTUwgPSAnJzsKICAgICAgICAgYm9k eS5hcHBlbmRDaGlsZChwcmUpOwpAQCAtNjUsNyArNjksMTAgQEAKICAgICAgICAgdmFsdWUgPSB2 YWx1ZS5yZXBsYWNlKC9eInwiJC9nLCAnJyk7CiAgICAgICAgIHN3aXRjaCAobmFtZSkgewogICAg ICAgICBjYXNlICdOU0ZvbnQnOgotICAgICAgICAgICAgcmV0dXJuIHZhbHVlLm1hdGNoKC8oLis/ KVxzK1AgXFtcXS8pWzFdOworICAgICAgICAgICAgdmFyIG1hdGNoZXMgPSB2YWx1ZS5tYXRjaCgv KC4rPylccysoW1BTXSkgXFtcXS8pOworICAgICAgICAgICAgLy8gRklYTUU6IERpc3Rpbmd1aXNo IHNjcmVlbiBhbmQgcHJpbnQgZm9udHMgd2l0aCAnICcgKyAobWF0Y2hlc1syXSA9PSAnUCcgPyAn UHJpbnQnIDogJ1NjcmVlbicpOworICAgICAgICAgICAgLy8gUmlnaHQgbm93LCBlZGl0aW5nQXR0 cmlidXRlZFN0cmluZyBjcmVhdGVzIHNjcmVlbiBmb250cyBpbiBzb21lIGNhc2VzLgorICAgICAg ICAgICAgcmV0dXJuIG1hdGNoZXNbMV0KICAgICAgICAgY2FzZSAnTlNDb2xvcic6CiAgICAgICAg IGNhc2UgJ05TQmFja2dyb3VuZENvbG9yJzoKICAgICAgICAgICAgIHZhciBwYXJzZWQgPSBwYXJz ZU5TQ29sb3JEZXNjcmlwdGlvbih2YWx1ZSk7Cg== 226633 2014-03-13 17:57:05 -0700 2014-03-13 18:21:48 -0700 Added a change log entry for LayoutTests bug-130219-20140313175643.patch text/plain 14521 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NTU4MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE0LTAzLTEzICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIE1ha2UgZWRpdGluZ0F0dHJpYnV0 ZWRTdHJpbmcgcGFzcyBleGlzdGluZyBhdHRyaWJ1dGVkIHN0cmluZyB0ZXN0cworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTMwMjE5CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4ZWQgZWRpdGluZ0F0dHJp YnV0ZWRTdHJpbmcgdG8gdXNlIFBsYXRmb3JtRm9udENsYXNzIHRvIGdlbmVyYXRlIGEgZm9udCB3 aGVuCisgICAgICAgIHRoZSBmb250IG5hbWUgaXMgbm90IHNwZWNpZmllZCwgYW5kIG1hZGUgaXQg bm90IGdlbmVyYXRlIGJsYWNrIGZvcmVncm91bmQgdGV4dCBjb2xvci4KKworICAgICAgICBGaW5h bGx5LCBzZXQgdGhlIGRlZmF1bHQgcGFyYWdyYXBoIHN0eWxlLgorCisgICAgICAgICogcGxhdGZv cm0vbWFjL0hUTUxDb252ZXJ0ZXIubW06CisgICAgICAgIChfY29sb3JGb3JSR0JDb2xvcik6IFJl ZmFjdG9yZWQgdG8gdGFrZSBOU0NvbG9yKi4KKyAgICAgICAgKC1bV2ViSFRNTENvbnZlcnRlciBf Y29tcHV0ZWRDb2xvckZvck5vZGU6cHJvcGVydHk6XSk6CisgICAgICAgICgrW1dlYkhUTUxDb252 ZXJ0ZXIgZWRpdGluZ0F0dHJpYnV0ZWRTdHJpbmdGcm9tUmFuZ2U6XSk6IAorCiAyMDE0LTAzLTEz ICBCZW5qYW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCBh IGJ1bmNoIG9mIG1pc3Rha2VzIGluIHRoZSBwYXJzaW5nIG9mIDo6Y3VlKCBhbmQgOjpjdWUKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9IVE1MQ29udmVydGVyLm1tCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9IVE1MQ29udmVydGVyLm1tCShyZXZp c2lvbiAxNjU1NjEpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvSFRNTENvbnZlcnRl ci5tbQkod29ya2luZyBjb3B5KQpAQCAtODMyLDE1ICs4MzIsMTQgQEAgLSAoTlNCdW5kbGUgKilf d2ViS2l0QnVuZGxlCiB9CiAKICNpZiBQTEFURk9STShJT1MpCi1zdGF0aWMgaW5saW5lIFVJQ29s b3IgKl9jb2xvckZvclJHQkNvbG9yKERPTVJHQkNvbG9yICpkb21SR0JDb2xvciwgQk9PTCkKK3N0 YXRpYyBpbmxpbmUgVUlDb2xvciAqX2NvbG9yRm9yUkdCQ29sb3IoTlNDb2xvciAqY29sb3IsIEJP T0wpCiB7Ci0gICAgcmV0dXJuIFtnZXRVSUNvbG9yQ2xhc3MoKSBfZGlzYW1iaWd1YXRlZF9kdWVf dG9fQ0lJbWFnZV9jb2xvcldpdGhDR0NvbG9yOltkb21SR0JDb2xvciBjb2xvcl1dOworICAgIHJl dHVybiBbZ2V0VUlDb2xvckNsYXNzKCkgX2Rpc2FtYmlndWF0ZWRfZHVlX3RvX0NJSW1hZ2VfY29s b3JXaXRoQ0dDb2xvcjpjb2xvcl07CiB9CiAKICNlbHNlCi1zdGF0aWMgaW5saW5lIE5TQ29sb3Ig Kl9jb2xvckZvclJHQkNvbG9yKERPTVJHQkNvbG9yICpkb21SR0JDb2xvciwgQk9PTCBpZ25vcmVC bGFjaykKK3N0YXRpYyBpbmxpbmUgTlNDb2xvciAqX2NvbG9yRm9yUkdCQ29sb3IoTlNDb2xvciAq Y29sb3IsIEJPT0wgaWdub3JlQmxhY2spCiB7Ci0gICAgTlNDb2xvciAqY29sb3IgPSBbZG9tUkdC Q29sb3IgX2NvbG9yXTsKICAgICBOU0NvbG9yU3BhY2UgKmNvbG9yU3BhY2UgPSBbY29sb3IgY29s b3JTcGFjZV07CiAgICAgY29uc3QgQ0dGbG9hdCBDb2xvckVwc2lsb24gPSAxIC8gKDIgKiAoQ0dG bG9hdCkyNTUuMCk7CiAgICAgCkBAIC05NzksNyArOTc4LDcgQEAgLSAoUGxhdGZvcm1Db2xvciAq KV9jb21wdXRlZENvbG9yRm9yTm9kZQogICAgICAgICBpZiAoIWhhdmVSZXN1bHQgJiYgKGNvbXB1 dGVkU3R5bGUgPSBbc2VsZiBfY29tcHV0ZWRTdHlsZUZvckVsZW1lbnQ6ZWxlbWVudF0pKSB7CiAg ICAgICAgICAgICBET01DU1NQcmltaXRpdmVWYWx1ZSAqY29tcHV0ZWRWYWx1ZSA9IChET01DU1NQ cmltaXRpdmVWYWx1ZSAqKVtjb21wdXRlZFN0eWxlIGdldFByb3BlcnR5Q1NTVmFsdWU6a2V5XTsK ICAgICAgICAgICAgIGlmIChjb21wdXRlZFZhbHVlICYmIFtjb21wdXRlZFZhbHVlIGNzc1ZhbHVl VHlwZV0gPT0gRE9NX0NTU19QUklNSVRJVkVfVkFMVUUgJiYgW2NvbXB1dGVkVmFsdWUgcHJpbWl0 aXZlVHlwZV0gPT0gRE9NX0NTU19SR0JDT0xPUikgewotICAgICAgICAgICAgICAgIHJlc3VsdCA9 IF9jb2xvckZvclJHQkNvbG9yKFtjb21wdXRlZFZhbHVlIGdldFJHQkNvbG9yVmFsdWVdLCBpc0Nv bG9yKTsKKyAgICAgICAgICAgICAgICByZXN1bHQgPSBfY29sb3JGb3JSR0JDb2xvcihbW2NvbXB1 dGVkVmFsdWUgZ2V0UkdCQ29sb3JWYWx1ZV0gY29sb3JdLCBpc0NvbG9yKTsKICAgICAgICAgICAg ICAgICBoYXZlUmVzdWx0ID0gWUVTOwogICAgICAgICAgICAgfQogICAgICAgICB9CkBAIC05ODgs NyArOTg3LDcgQEAgLSAoUGxhdGZvcm1Db2xvciAqKV9jb21wdXRlZENvbG9yRm9yTm9kZQogICAg ICAgICAgICAgaWYgKHNwZWNpZmllZFZhbHVlKSB7CiAgICAgICAgICAgICAgICAgdW5zaWduZWQg c2hvcnQgdmFsdWVUeXBlID0gW3NwZWNpZmllZFZhbHVlIGNzc1ZhbHVlVHlwZV07CiAgICAgICAg ICAgICAgICAgaWYgKHZhbHVlVHlwZSA9PSBET01fQ1NTX1BSSU1JVElWRV9WQUxVRSAmJiBbc3Bl Y2lmaWVkVmFsdWUgcHJpbWl0aXZlVHlwZV0gPT0gRE9NX0NTU19SR0JDT0xPUikgewotICAgICAg ICAgICAgICAgICAgICByZXN1bHQgPSBfY29sb3JGb3JSR0JDb2xvcihbc3BlY2lmaWVkVmFsdWUg Z2V0UkdCQ29sb3JWYWx1ZV0sIGlzQ29sb3IpOworICAgICAgICAgICAgICAgICAgICByZXN1bHQg PSBfY29sb3JGb3JSR0JDb2xvcihbW3NwZWNpZmllZFZhbHVlIGdldFJHQkNvbG9yVmFsdWVdIGNv bG9yXSwgaXNDb2xvcik7CiAgICAgICAgICAgICAgICAgICAgIGhhdmVSZXN1bHQgPSBZRVM7CiAg ICAgICAgICAgICAgICAgfSBlbHNlIGlmICh2YWx1ZVR5cGUgPT0gRE9NX0NTU19JTkhFUklUKQog ICAgICAgICAgICAgICAgICAgICBpbmhlcml0ID0gWUVTOwpAQCAtMjQ4MSw3ICsyNDgwLDYgQEAg LSAoTlNBdHRyaWJ1dGVkU3RyaW5nICopYXR0cmlidXRlZFN0cmluZwogLy8gVGhpcyBmdW5jdGlv biB1c2VzIFRleHRJdGVyYXRvciwgd2hpY2ggbWFrZXMgb2Zmc2V0cyBpbiBpdHMgcmVzdWx0IGNv bXBhdGlibGUgd2l0aCBIVE1MIGVkaXRpbmcuCiArIChOU0F0dHJpYnV0ZWRTdHJpbmcgKillZGl0 aW5nQXR0cmlidXRlZFN0cmluZ0Zyb21SYW5nZTooUmFuZ2UqKXJhbmdlCiB7Ci0gICAgTlNGb250 TWFuYWdlciAqZm9udE1hbmFnZXIgPSBbTlNGb250TWFuYWdlciBzaGFyZWRGb250TWFuYWdlcl07 CiAgICAgTlNNdXRhYmxlQXR0cmlidXRlZFN0cmluZyAqc3RyaW5nID0gW1tOU011dGFibGVBdHRy aWJ1dGVkU3RyaW5nIGFsbG9jXSBpbml0XTsKICAgICBOU1VJbnRlZ2VyIHN0cmluZ0xlbmd0aCA9 IDA7CiAgICAgUmV0YWluUHRyPE5TTXV0YWJsZURpY3Rpb25hcnk+IGF0dHJzID0gYWRvcHROUyhb W05TTXV0YWJsZURpY3Rpb25hcnkgYWxsb2NdIGluaXRdKTsKQEAgLTI1MTksMTYgKzI1MTcsMjAg QEAgKyAoTlNBdHRyaWJ1dGVkU3RyaW5nICopZWRpdGluZ0F0dHJpYnV0ZQogICAgICAgICBpZiAo TlNGb250ICpmb250ID0gc3R5bGUuZm9udCgpLnByaW1hcnlGb250KCktPmdldE5TRm9udCgpKQog ICAgICAgICAgICAgW2F0dHJzLmdldCgpIHNldE9iamVjdDpmb250IGZvcktleTpOU0ZvbnRBdHRy aWJ1dGVOYW1lXTsKICAgICAgICAgZWxzZQotICAgICAgICAgICAgW2F0dHJzLmdldCgpIHNldE9i amVjdDpbZm9udE1hbmFnZXIgY29udmVydEZvbnQ6V2ViRGVmYXVsdEZvbnQoKSB0b1NpemU6c3R5 bGUuZm9udCgpLnByaW1hcnlGb250KCktPnBsYXRmb3JtRGF0YSgpLnNpemUoKV0gZm9yS2V5Ok5T Rm9udEF0dHJpYnV0ZU5hbWVdOwotICAgICAgICBpZiAoc3R5bGUudmlzaXRlZERlcGVuZGVudENv bG9yKENTU1Byb3BlcnR5Q29sb3IpLmFscGhhKCkpCi0gICAgICAgICAgICBbYXR0cnMuZ2V0KCkg c2V0T2JqZWN0Om5zQ29sb3Ioc3R5bGUudmlzaXRlZERlcGVuZGVudENvbG9yKENTU1Byb3BlcnR5 Q29sb3IpKSBmb3JLZXk6TlNGb3JlZ3JvdW5kQ29sb3JBdHRyaWJ1dGVOYW1lXTsKKyAgICAgICAg ICAgIFtQbGF0Zm9ybUZvbnRDbGFzcyBmb250V2l0aE5hbWU6QCJUaW1lcyIgc2l6ZTpzdHlsZS5m b250KCkucHJpbWFyeUZvbnQoKS0+cGxhdGZvcm1EYXRhKCkuc2l6ZSgpXTsKKworICAgICAgICBp ZiAoTlNDb2xvciAqY29sb3IgPSBfY29sb3JGb3JSR0JDb2xvcihuc0NvbG9yKHN0eWxlLnZpc2l0 ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0eUNvbG9yKSksIHRydWUpKQorICAgICAgICAgICAg W2F0dHJzLmdldCgpIHNldE9iamVjdDpjb2xvciBmb3JLZXk6TlNGb3JlZ3JvdW5kQ29sb3JBdHRy aWJ1dGVOYW1lXTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgW2F0dHJzLmdldCgpIHJlbW92 ZU9iamVjdEZvcktleTpOU0ZvcmVncm91bmRDb2xvckF0dHJpYnV0ZU5hbWVdOwotICAgICAgICBp ZiAoc3R5bGUudmlzaXRlZERlcGVuZGVudENvbG9yKENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9y KS5hbHBoYSgpKQotICAgICAgICAgICAgW2F0dHJzLmdldCgpIHNldE9iamVjdDpuc0NvbG9yKHN0 eWxlLnZpc2l0ZWREZXBlbmRlbnRDb2xvcihDU1NQcm9wZXJ0eUJhY2tncm91bmRDb2xvcikpIGZv cktleTpOU0JhY2tncm91bmRDb2xvckF0dHJpYnV0ZU5hbWVdOworCisgICAgICAgIGlmIChOU0Nv bG9yICpjb2xvciA9IF9jb2xvckZvclJHQkNvbG9yKG5zQ29sb3Ioc3R5bGUudmlzaXRlZERlcGVu ZGVudENvbG9yKENTU1Byb3BlcnR5QmFja2dyb3VuZENvbG9yKSksIGZhbHNlKSkKKyAgICAgICAg ICAgIFthdHRycy5nZXQoKSBzZXRPYmplY3Q6Y29sb3IgZm9yS2V5Ok5TQmFja2dyb3VuZENvbG9y QXR0cmlidXRlTmFtZV07CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIFthdHRycy5nZXQoKSBy ZW1vdmVPYmplY3RGb3JLZXk6TlNCYWNrZ3JvdW5kQ29sb3JBdHRyaWJ1dGVOYW1lXTsKIAorICAg ICAgICBbYXR0cnMuZ2V0KCkgc2V0T2JqZWN0OltbV2ViSFRNTENvbnZlcnRlciBkZWZhdWx0UGFy YWdyYXBoU3R5bGVdIG11dGFibGVDb3B5XSBmb3JLZXk6TlNQYXJhZ3JhcGhTdHlsZUF0dHJpYnV0 ZU5hbWVdOworCiAgICAgICAgIFtzdHJpbmcgcmVwbGFjZUNoYXJhY3RlcnNJblJhbmdlOk5TTWFr ZVJhbmdlKHN0cmluZ0xlbmd0aCwgMCkgd2l0aFN0cmluZzppdC50ZXh0KCkuY3JlYXRlTlNTdHJp bmdXaXRob3V0Q29weWluZygpLmdldCgpXTsKICAgICAgICAgW3N0cmluZyBzZXRBdHRyaWJ1dGVz OmF0dHJzLmdldCgpIHJhbmdlOk5TTWFrZVJhbmdlKHN0cmluZ0xlbmd0aCwgY3VycmVudFRleHRM ZW5ndGgpXTsKICAgICAgICAgc3RyaW5nTGVuZ3RoICs9IGN1cnJlbnRUZXh0TGVuZ3RoOwpJbmRl eDogU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvbWFjL0NoYW5nZUxvZwkocmV2aXNpb24gMTY1NTgwKQorKysgU291cmNlL1dlYktpdC9tYWMv Q2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTQtMDMtMTMgIFJ5 b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTWFrZSBlZGl0aW5nQXR0 cmlidXRlZFN0cmluZyBwYXNzIGV4aXN0aW5nIGF0dHJpYnV0ZWQgc3RyaW5nIHRlc3RzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzAyMTkKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYlZpZXcvV2Vi SFRNTFZpZXcubW06CisgICAgICAgICgtW1dlYkhUTUxWaWV3IF9hdHRyaWJ1dGVkU3RyaW5nRnJv bURPTVJhbmdlOl0pOiBSZW5hbWVkIGZyb20gX2F0dHJpYnV0KmUqU3RyaW5nRnJvbURPTVJhbmdl LgorICAgICAgICAoLVtXZWJIVE1MVmlldyBfZWRpdGluZ0F0dHJpYnV0ZWRTdHJpbmdGcm9tRE9N UmFuZ2U6XSk6IEFkZGVkIHRvIGJlIHVzZWQgaW4gRFJULgorICAgICAgICAoLVtXZWJIVE1MVmll dyBhdHRyaWJ1dGVkU3RyaW5nXSk6CisgICAgICAgICgtW1dlYkhUTUxWaWV3IHNlbGVjdGVkQXR0 cmlidXRlZFN0cmluZ10pOgorCiAyMDE0LTAzLTEzICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0 b25AYXBwbGUuY29tPgogCiAgICAgICAgIEZpeCByZWxhdGl2ZSBwYXRocyB0byBVc2VJbnRlcm5h bFNESy54Y2NvbmZpZyBmb3IgQU5HTEUgYW5kIFdlYktpdC9tYWMKSW5kZXg6IFNvdXJjZS9XZWJL aXQvbWFjL1dlYlZpZXcvV2ViSFRNTFZpZXcubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQkocmV2aXNpb24gMTY1NTYxKQorKysgU291cmNl L1dlYktpdC9tYWMvV2ViVmlldy9XZWJIVE1MVmlldy5tbQkod29ya2luZyBjb3B5KQpAQCAtNjYy Miw3ICs2NjIyLDcgQEAgLSAoTlNTdHJpbmcgKilzdHJpbmcKIH0KIAogI2lmICFQTEFURk9STShJ T1MpCi0tIChOU0F0dHJpYnV0ZWRTdHJpbmcgKilfYXR0cmlidXRlU3RyaW5nRnJvbURPTVJhbmdl OihET01SYW5nZSAqKXJhbmdlCistIChOU0F0dHJpYnV0ZWRTdHJpbmcgKilfYXR0cmlidXRlZFN0 cmluZ0Zyb21ET01SYW5nZTooRE9NUmFuZ2UgKilyYW5nZQogewogICAgIE5TQXR0cmlidXRlZFN0 cmluZyAqYXR0cmlidXRlZFN0cmluZzsKICNpZiAhTE9HX0RJU0FCTEVECkBAIC02NjM2LDE2ICs2 NjM2LDIyIEBAIC0gKE5TQXR0cmlidXRlZFN0cmluZyAqKV9hdHRyaWJ1dGVTdHJpbmcKICAgICBy ZXR1cm4gYXR0cmlidXRlZFN0cmluZzsKIH0KIAorLSAoTlNBdHRyaWJ1dGVkU3RyaW5nICopX2Vk aXRpbmdBdHRyaWJ1dGVkU3RyaW5nRnJvbURPTVJhbmdlOihET01SYW5nZSAqKXJhbmdlCit7Cisg ICAgcmV0dXJuIFtXZWJIVE1MQ29udmVydGVyIGVkaXRpbmdBdHRyaWJ1dGVkU3RyaW5nRnJvbVJh bmdlOmNvcmUocmFuZ2UpXTsKK30KKwogLSAoTlNBdHRyaWJ1dGVkU3RyaW5nICopYXR0cmlidXRl ZFN0cmluZwogewogICAgIERPTURvY3VtZW50ICpkb2N1bWVudCA9IFtbc2VsZiBfZnJhbWVdIERP TURvY3VtZW50XTsKLSAgICBOU0F0dHJpYnV0ZWRTdHJpbmcgKmF0dHJpYnV0ZWRTdHJpbmcgPSBb c2VsZiBfYXR0cmlidXRlU3RyaW5nRnJvbURPTVJhbmdlOltkb2N1bWVudCBfZG9jdW1lbnRSYW5n ZV1dOworICAgIE5TQXR0cmlidXRlZFN0cmluZyAqYXR0cmlidXRlZFN0cmluZyA9IFtzZWxmIF9h dHRyaWJ1dGVkU3RyaW5nRnJvbURPTVJhbmdlOltkb2N1bWVudCBfZG9jdW1lbnRSYW5nZV1dOwog ICAgIGlmICghYXR0cmlidXRlZFN0cmluZykgewogICAgICAgICBEb2N1bWVudCogY29yZURvY3Vt ZW50ID0gY29yZShkb2N1bWVudCk7CiAgICAgICAgIGF0dHJpYnV0ZWRTdHJpbmcgPSBbV2ViSFRN TENvbnZlcnRlciBlZGl0aW5nQXR0cmlidXRlZFN0cmluZ0Zyb21SYW5nZTpSYW5nZTo6Y3JlYXRl KCpjb3JlRG9jdW1lbnQsIGNvcmVEb2N1bWVudCwgMCwgY29yZURvY3VtZW50LCBjb3JlRG9jdW1l bnQtPmNoaWxkTm9kZUNvdW50KCkpLmdldCgpXTsKICAgICB9CiAgICAgcmV0dXJuIGF0dHJpYnV0 ZWRTdHJpbmc7CiB9CisKICNlbmRpZgogCiAtIChOU1N0cmluZyAqKXNlbGVjdGVkU3RyaW5nCkBA IC02NjU2LDcgKzY2NjIsNyBAQCAtIChOU1N0cmluZyAqKXNlbGVjdGVkU3RyaW5nCiAjaWYgIVBM QVRGT1JNKElPUykKIC0gKE5TQXR0cmlidXRlZFN0cmluZyAqKXNlbGVjdGVkQXR0cmlidXRlZFN0 cmluZwogewotICAgIE5TQXR0cmlidXRlZFN0cmluZyAqYXR0cmlidXRlZFN0cmluZyA9IFtzZWxm IF9hdHRyaWJ1dGVTdHJpbmdGcm9tRE9NUmFuZ2U6W3NlbGYgX3NlbGVjdGVkUmFuZ2VdXTsKKyAg ICBOU0F0dHJpYnV0ZWRTdHJpbmcgKmF0dHJpYnV0ZWRTdHJpbmcgPSBbc2VsZiBfYXR0cmlidXRl ZFN0cmluZ0Zyb21ET01SYW5nZTpbc2VsZiBfc2VsZWN0ZWRSYW5nZV1dOwogICAgIGlmICghYXR0 cmlidXRlZFN0cmluZykgewogICAgICAgICBGcmFtZSogY29yZUZyYW1lID0gY29yZShbc2VsZiBf ZnJhbWVdKTsKICAgICAgICAgaWYgKGNvcmVGcmFtZSkgewpJbmRleDogVG9vbHMvQ2hhbmdlTG9n Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMTY1NTgwKQorKysgVG9v bHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTQtMDMtMTMg IFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTWFrZSBlZGl0aW5n QXR0cmlidXRlZFN0cmluZyBwYXNzIGV4aXN0aW5nIGF0dHJpYnV0ZWQgc3RyaW5nIHRlc3RzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzAyMTkKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRlZCB0ZXh0 SW5wdXRDb250cm9sbGVyLmVkaXRpbmdBdHRyaWJ1dGVkU3RyaW5nIHRoYXQgdXNlcyBlZGl0aW5n QXR0cmlidXRlZFN0cmluZyB0byBnZW5lcmF0ZSBhdHRyaWJ1dGVkIHN0cmluZy4KKworICAgICAg ICAqIER1bXBSZW5kZXJUcmVlL21hYy9UZXh0SW5wdXRDb250cm9sbGVyLm06CisgICAgICAgICgr W1RleHRJbnB1dENvbnRyb2xsZXIgaXNTZWxlY3RvckV4Y2x1ZGVkRnJvbVdlYlNjcmlwdDpdKToK KyAgICAgICAgKCtbVGV4dElucHV0Q29udHJvbGxlciB3ZWJTY3JpcHROYW1lRm9yU2VsZWN0b3I6 XSk6CisgICAgICAgICgtW1RleHRJbnB1dENvbnRyb2xsZXIgbGVnYWN5QXR0cmlidXRlZFN0cmlu ZzpdKToKKyAgICAgICAgKC1bVGV4dElucHV0Q29udHJvbGxlciBlZGl0aW5nQXR0cmlidXRlZFN0 cmluZzpdKToKKwogMjAxNC0wMy0xMyAgRmlsaXAgUGl6bG8gIDxmcGl6bG9AYXBwbGUuY29tPgog CiAgICAgICAgIEZUTCBzaG91bGQgc3VwcG9ydCBJc0JsYWgKSW5kZXg6IFRvb2xzL0R1bXBSZW5k ZXJUcmVlL21hYy9UZXh0SW5wdXRDb250cm9sbGVyLm0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvRHVt cFJlbmRlclRyZWUvbWFjL1RleHRJbnB1dENvbnRyb2xsZXIubQkocmV2aXNpb24gMTY1NTYxKQor KysgVG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL1RleHRJbnB1dENvbnRyb2xsZXIubQkod29ya2lu ZyBjb3B5KQpAQCAtNTcsNyArNTcsOCBAQCAtICh2b2lkKWludGVycHJldEtleUV2ZW50czooTlNB cnJheSAqKWV2CiAKIEBpbnRlcmZhY2UgV2ViSFRNTFZpZXcgKFdlYktpdFNlY3JldHNUZXh0SW5w dXRDb250cm9sbGVySXNBd2FyZU9mKQogLSAoV2ViRnJhbWUgKilfZnJhbWU7Ci0tIChOU0F0dHJp YnV0ZWRTdHJpbmcgKilfYXR0cmlidXRlU3RyaW5nRnJvbURPTVJhbmdlOihET01SYW5nZSAqKXJh bmdlOworLSAoTlNBdHRyaWJ1dGVkU3RyaW5nICopX2F0dHJpYnV0ZWRTdHJpbmdGcm9tRE9NUmFu Z2U6KERPTVJhbmdlICopcmFuZ2U7CistIChOU0F0dHJpYnV0ZWRTdHJpbmcgKilfZWRpdGluZ0F0 dHJpYnV0ZWRTdHJpbmdGcm9tRE9NUmFuZ2U6KERPTVJhbmdlICopcmFuZ2U7CiBAZW5kCiAKIEBp bXBsZW1lbnRhdGlvbiBXZWJIVE1MVmlldyAoRHVtcFJlbmRlclRyZWVJbnB1dE1ldGhvZEhhbmRs ZXIpCkBAIC0yMjUsNiArMjI2LDcgQEAgKyAoQk9PTClpc1NlbGVjdG9yRXhjbHVkZWRGcm9tV2Vi U2NyaXB0OgogICAgICAgICAgICAgfHwgYVNlbGVjdG9yID09IEBzZWxlY3RvcihzdWJzdHJpbmdG cm9tOmxlbmd0aDopCiAgICAgICAgICAgICB8fCBhU2VsZWN0b3IgPT0gQHNlbGVjdG9yKGF0dHJp YnV0ZWRTdWJzdHJpbmdGcm9tOmxlbmd0aDopCiAgICAgICAgICAgICB8fCBhU2VsZWN0b3IgPT0g QHNlbGVjdG9yKGxlZ2FjeUF0dHJpYnV0ZWRTdHJpbmc6KQorICAgICAgICAgICAgfHwgYVNlbGVj dG9yID09IEBzZWxlY3RvcihlZGl0aW5nQXR0cmlidXRlZFN0cmluZzopCiAgICAgICAgICAgICB8 fCBhU2VsZWN0b3IgPT0gQHNlbGVjdG9yKG1hcmtlZFJhbmdlKQogICAgICAgICAgICAgfHwgYVNl bGVjdG9yID09IEBzZWxlY3RvcihzZWxlY3RlZFJhbmdlKQogICAgICAgICAgICAgfHwgYVNlbGVj dG9yID09IEBzZWxlY3RvcihmaXJzdFJlY3RGb3JDaGFyYWN0ZXJzRnJvbTpsZW5ndGg6KQpAQCAt MjUxLDYgKzI1Myw4IEBAICsgKE5TU3RyaW5nICopd2ViU2NyaXB0TmFtZUZvclNlbGVjdG9yOigK ICAgICAgICAgcmV0dXJuIEAiYXR0cmlidXRlZFN1YnN0cmluZ0Zyb21SYW5nZSI7CiAgICAgZWxz ZSBpZiAoYVNlbGVjdG9yID09IEBzZWxlY3RvcihsZWdhY3lBdHRyaWJ1dGVkU3RyaW5nOikpCiAg ICAgICAgIHJldHVybiBAImxlZ2FjeUF0dHJpYnV0ZWRTdHJpbmciOworICAgIGVsc2UgaWYgKGFT ZWxlY3RvciA9PSBAc2VsZWN0b3IoZWRpdGluZ0F0dHJpYnV0ZWRTdHJpbmc6KSkKKyAgICAgICAg cmV0dXJuIEAiZWRpdGluZ0F0dHJpYnV0ZWRTdHJpbmciOwogICAgIGVsc2UgaWYgKGFTZWxlY3Rv ciA9PSBAc2VsZWN0b3IoZmlyc3RSZWN0Rm9yQ2hhcmFjdGVyc0Zyb206bGVuZ3RoOikpCiAgICAg ICAgIHJldHVybiBAImZpcnN0UmVjdEZvckNoYXJhY3RlclJhbmdlIjsKICAgICBlbHNlIGlmIChh U2VsZWN0b3IgPT0gQHNlbGVjdG9yKGNoYXJhY3RlckluZGV4Rm9yUG9pbnRYOlk6KSkKQEAgLTM2 OSw3ICszNzMsMTggQEAgLSAoTlNNdXRhYmxlQXR0cmlidXRlZFN0cmluZyAqKWxlZ2FjeUF0dAog ICAgIGlmICghW2RvY3VtZW50VmlldyBpc0tpbmRPZkNsYXNzOltXZWJIVE1MVmlldyBjbGFzc11d KQogICAgICAgICByZXR1cm4gc3RyaW5nOwogCi0gICAgW3N0cmluZyBzZXRBdHRyaWJ1dGVkU3Ry aW5nOlsoV2ViSFRNTFZpZXcgKilkb2N1bWVudFZpZXcgX2F0dHJpYnV0ZVN0cmluZ0Zyb21ET01S YW5nZTpyYW5nZV1dOworICAgIFtzdHJpbmcgc2V0QXR0cmlidXRlZFN0cmluZzpbKFdlYkhUTUxW aWV3ICopZG9jdW1lbnRWaWV3IF9hdHRyaWJ1dGVkU3RyaW5nRnJvbURPTVJhbmdlOnJhbmdlXV07 CisgICAgcmV0dXJuIHN0cmluZzsKK30KKworLSAoTlNNdXRhYmxlQXR0cmlidXRlZFN0cmluZyAq KWVkaXRpbmdBdHRyaWJ1dGVkU3RyaW5nOihET01SYW5nZSopcmFuZ2UKK3sKKyAgICBOU011dGFi bGVBdHRyaWJ1dGVkU3RyaW5nICpzdHJpbmcgPSBbW1tOU011dGFibGVBdHRyaWJ1dGVkU3RyaW5n IGFsbG9jXSBpbml0XSBhdXRvcmVsZWFzZV07CisgICAgaWQgZG9jdW1lbnRWaWV3ID0gW1tbd2Vi VmlldyBtYWluRnJhbWVdIGZyYW1lVmlld10gZG9jdW1lbnRWaWV3XTsKKyAgICBpZiAoIVtkb2N1 bWVudFZpZXcgaXNLaW5kT2ZDbGFzczpbV2ViSFRNTFZpZXcgY2xhc3NdXSkKKyAgICAgICAgcmV0 dXJuIHN0cmluZzsKKworICAgIFtzdHJpbmcgc2V0QXR0cmlidXRlZFN0cmluZzpbKFdlYkhUTUxW aWV3ICopZG9jdW1lbnRWaWV3IF9lZGl0aW5nQXR0cmlidXRlZFN0cmluZ0Zyb21ET01SYW5nZTpy YW5nZV1dOwogICAgIHJldHVybiBzdHJpbmc7CiB9CiAKSW5kZXg6IExheW91dFRlc3RzL0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NTU4 MCkKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2 IEBACisyMDE0LTAzLTEzICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAg ICAgIE1ha2UgZWRpdGluZ0F0dHJpYnV0ZWRTdHJpbmcgcGFzcyBleGlzdGluZyBhdHRyaWJ1dGVk IHN0cmluZyB0ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTMwMjE5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQWRkZWQgdGhlIGNvZGUgdG8gcmV0cmlldmUgdGhlIGF0dHJpYnV0ZWQgc3RyaW5nIGdl bmVyYXRlZCBieSBlZGl0aW5nQXR0cmlidXRlZFN0cmluZworICAgICAgICBhbmQgdmVyaWZ5IHRo YXQgaXQgbWF0Y2hlcyB0aGF0IG9mIGxlZ2FjeUF0dHJpYnV0ZWRTdHJpbmcuIFdoZW4gdGhleSBk b24ndCBtYXRjaCwgZHVtcAorICAgICAgICB0aGUgb3V0cHV0IGZyb20gZWRpdGluZ0F0dHJpYnV0 ZWRTdHJpbmcuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvZWRpdGluZy9hdHRyaWJ1dGVkLXN0 cmluZy9yZXNvdXJjZXMvZHVtcC1hdHRyaWJ1dGVkLXN0cmluZy5qczoKKwogMjAxNC0wMy0xMyAg QW5kcmVzIEdvbWV6ICA8YWdvbWV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwg cm9sbGluZyBvdXQgcjE2NTUzNi4KSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9lZGl0 aW5nL2F0dHJpYnV0ZWQtc3RyaW5nL3Jlc291cmNlcy9kdW1wLWF0dHJpYnV0ZWQtc3RyaW5nLmpz Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9lZGl0aW5nL2F0dHJpYnV0 ZWQtc3RyaW5nL3Jlc291cmNlcy9kdW1wLWF0dHJpYnV0ZWQtc3RyaW5nLmpzCShyZXZpc2lvbiAx NjU1NjEpCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMvZWRpdGluZy9hdHRyaWJ1dGVkLXN0 cmluZy9yZXNvdXJjZXMvZHVtcC1hdHRyaWJ1dGVkLXN0cmluZy5qcwkod29ya2luZyBjb3B5KQpA QCAtMTQsNyArMTQsMTEgQEAKICAgICAgICAgcmFuZ2Uuc2VsZWN0Tm9kZUNvbnRlbnRzKGNvbnRh aW5lcik7CiAKICAgICAgICAgdmFyIHByZSA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoJ3ByZScp OwotICAgICAgICBwcmUudGV4dENvbnRlbnQgPSAnSW5wdXQ6XG4nICsgY29udGFpbmVyLmlubmVy SFRNTC50cmltKCkgKyAnXG5cbk91dHB1dDpcbicgKyBzZXJpYWxpemVBdHRyaWJ1dGVkU3RyaW5n KHRleHRJbnB1dENvbnRyb2xsZXIubGVnYWN5QXR0cmlidXRlZFN0cmluZyhyYW5nZSkpOworICAg ICAgICB2YXIgbGVnYWN5T3V0cHV0ID0gc2VyaWFsaXplQXR0cmlidXRlZFN0cmluZyh0ZXh0SW5w dXRDb250cm9sbGVyLmxlZ2FjeUF0dHJpYnV0ZWRTdHJpbmcocmFuZ2UpKTsKKyAgICAgICAgdmFy IGVkaXRpbmdPdXRwdXQgPSBzZXJpYWxpemVBdHRyaWJ1dGVkU3RyaW5nKHRleHRJbnB1dENvbnRy b2xsZXIuZWRpdGluZ0F0dHJpYnV0ZWRTdHJpbmcocmFuZ2UpKTsKKyAgICAgICAgcHJlLnRleHRD b250ZW50ID0gJ0lucHV0OlxuJyArIGNvbnRhaW5lci5pbm5lckhUTUwudHJpbSgpICsgJ1xuXG5P dXRwdXQ6XG4nICsgbGVnYWN5T3V0cHV0OworICAgICAgICBpZiAobGVnYWN5T3V0cHV0ICE9IGVk aXRpbmdPdXRwdXQpCisgICAgICAgICAgICBwcmUudGV4dENvbnRlbnQgKz0gJ1xuXG5FZGl0aW5n T3V0cHV0OlxuJyArIGVkaXRpbmdPdXRwdXQ7CiAKICAgICAgICAgYm9keS5pbm5lckhUTUwgPSAn JzsKICAgICAgICAgYm9keS5hcHBlbmRDaGlsZChwcmUpOwpAQCAtNjUsNyArNjksMTAgQEAKICAg ICAgICAgdmFsdWUgPSB2YWx1ZS5yZXBsYWNlKC9eInwiJC9nLCAnJyk7CiAgICAgICAgIHN3aXRj aCAobmFtZSkgewogICAgICAgICBjYXNlICdOU0ZvbnQnOgotICAgICAgICAgICAgcmV0dXJuIHZh bHVlLm1hdGNoKC8oLis/KVxzK1AgXFtcXS8pWzFdOworICAgICAgICAgICAgdmFyIG1hdGNoZXMg PSB2YWx1ZS5tYXRjaCgvKC4rPylccysoW1BTXSkgXFtcXS8pOworICAgICAgICAgICAgLy8gRklY TUU6IERpc3Rpbmd1aXNoIHNjcmVlbiBhbmQgcHJpbnQgZm9udHMgd2l0aCAnICcgKyAobWF0Y2hl c1syXSA9PSAnUCcgPyAnUHJpbnQnIDogJ1NjcmVlbicpOworICAgICAgICAgICAgLy8gUmlnaHQg bm93LCBlZGl0aW5nQXR0cmlidXRlZFN0cmluZyBjcmVhdGVzIHNjcmVlbiBmb250cyBpbiBzb21l IGNhc2VzLgorICAgICAgICAgICAgcmV0dXJuIG1hdGNoZXNbMV0KICAgICAgICAgY2FzZSAnTlND b2xvcic6CiAgICAgICAgIGNhc2UgJ05TQmFja2dyb3VuZENvbG9yJzoKICAgICAgICAgICAgIHZh ciBwYXJzZWQgPSBwYXJzZU5TQ29sb3JEZXNjcmlwdGlvbih2YWx1ZSk7Cg==