89967 2012-06-26 03:11:02 -0700 [Platform] Change implementation of LocaleICU class to support more UDateFormat. 2012-06-26 23:03:49 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 89965 1 yosin yosin tkent oldest_to_newest 657465 0 yosin 2012-06-26 03:11:02 -0700 For implementing input type "time", I would like to share code for time format with existing implementation. 658211 1 149658 yosin 2012-06-26 18:29:37 -0700 Created attachment 149658 Patch 1 658212 2 149658 yosin 2012-06-26 18:29:59 -0700 Comment on attachment 149658 Patch 1 Could you review this patch? Thanks in advance. 658322 3 149658 tkent 2012-06-26 21:29:00 -0700 Comment on attachment 149658 Patch 1 View in context: https://bugs.webkit.org/attachment.cgi?id=149658&action=review > Source/WebCore/ChangeLog:3 > + [Platform][DateTime][ICU] Change implementation of LocaleICU class to support more DateFormat. [DateTime] and [ICU] look redundant. What's 'DateFormat'? Do you mean 'UDateFormat'? > Source/WebCore/ChangeLog:8 > + This patch changes internal functions of LocalICU class to process LocalICU -> LocaleICU 658327 4 149676 yosin 2012-06-26 21:59:25 -0700 Created attachment 149676 Patch 2 658329 5 149676 yosin 2012-06-26 22:01:39 -0700 Comment on attachment 149676 Patch 2 Could you review again? Thanks in advance. 658356 6 149676 tkent 2012-06-26 23:00:55 -0700 Comment on attachment 149676 Patch 2 Looks ok 658358 7 149676 yosin 2012-06-26 23:03:43 -0700 Comment on attachment 149676 Patch 2 Clearing flags on attachment: 149676 Committed r121321: <http://trac.webkit.org/changeset/121321> 658359 8 yosin 2012-06-26 23:03:49 -0700 All reviewed patches have been landed. Closing bug. 149658 2012-06-26 18:29:37 -0700 2012-06-26 21:59:20 -0700 Patch 1 bug-89967-20120627102936.patch text/plain 8197 yosin U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxMzA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWEyMDE2YzM5ZmMzMDBi NTAyZjBkNTM3ODczNmJhMDljNmViOTY5ZS4uZTdlOWZlNTU2OTBiOTk3MjQzNTI4ZWNhZTRjMmJi MmFiYjlhZTA1NyAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEyLTA2LTI2ICBZb3No aWZ1bWkgSW5vdWUgIDx5b3NpbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW1BsYXRmb3JtXVtE YXRlVGltZV1bSUNVXSBDaGFuZ2UgaW1wbGVtZW50YXRpb24gb2YgTG9jYWxlSUNVIGNsYXNzIHRv IHN1cHBvcnQgbW9yZSBEYXRlRm9ybWF0LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9ODk5NjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICBUaGlzIHBhdGNoIGNoYW5nZXMgaW50ZXJuYWwgZnVuY3Rpb25zIG9m IExvY2FsSUNVIGNsYXNzIHRvIHByb2Nlc3MKKyAgICAgICAgbXVsdGlwbGUgSUNVIGRhdGUgdGlt ZSBmb3JtYXQgaGFuZGxlcyBpbiBhZGRpdGlvbiB0byBzaG9ydCBkYXRlIHRpbWUKKyAgICAgICAg Zm9ybWF0IGhhbmRsZS4KKworICAgICAgICBUaGlzIHBhdGNoIGlzIGEgcGFydCBvZiBpbXBsZW1l bnRpbmcgaW5wdXQgdHlwZSB0aW1lLiBJJ2xsIGFkZCB0aW1lCisgICAgICAgIGZvcm1hdCByZWxh dGVkIElDVSBkYXRlIHRpbWUgZm9ybWF0IGhhbmRsZXMuCisKKyAgICAgICAgTm8gbmV3IHRlc3Rz LiBUaGlzIHBhdGNoIGRvZXNuJ3QgY2hhbmdlIGJlaGF2aW9yLgorCisgICAgICAgICogcGxhdGZv cm0vdGV4dC9Mb2NhbGVJQ1UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TG9jYWxlSUNVOjppbml0 aWFsaXplU2hvcnREYXRlRm9ybWF0KTogQ2hhbmdlZCB0byB1c2Ugb3BlbkRhdGVGb3JtYXQoKS4K KyAgICAgICAgKFdlYkNvcmU6OkxvY2FsZUlDVTo6b3BlbkRhdGVGb3JtYXQpOiBBZGRlZCBmb3Ig Y29tbW9uIHVzYWdlIG9mIHVkdF9vcGVuKCkuCisgICAgICAgIChXZWJDb3JlOjpnZXREYXRlRm9y bWF0UGF0dGVybik6IEFkZGVkIGZvciBjb21tb24gdXNhZ2Ugb2YgdWR0X3RvUGF0dGVybigpLgor ICAgICAgICAoV2ViQ29yZTo6bG9jYWxpemVGb3JtYXQpOiBDaGFuZ2VkIHRvIHRha2UgU3RyaW5n IHBhcmFtZXRlci4KKyAgICAgICAgKFdlYkNvcmU6OkxvY2FsZUlDVTo6aW5pdGlhbGl6ZUxvY2Fs aXplZERhdGVGb3JtYXRUZXh0KTogQ2hhbmdlZCB0byB1c2UgZ2V0RGF0ZUZvcm1hdFBhdHRlcm4u CisgICAgICAgIChXZWJDb3JlOjpMb2NhbGVJQ1U6OmNyZWF0ZUxhYmVsVmVjdG9yKTogQ2hhbmdl ZCB0byB0YWtlIFVEYXRlRm9ybWF0IHBhcmFtZXRlci4KKyAgICAgICAgKFdlYkNvcmU6OkxvY2Fs ZUlDVTo6aW5pdGlhbGl6ZUNhbGVuZGFyKTogQ2hhbmdlZCBmb3IgaGVscGVyIGZ1bmN0aW9ucy4K KyAgICAgICAgKiBwbGF0Zm9ybS90ZXh0L0xvY2FsZUlDVS5oOgorICAgICAgICAoTG9jYWxlSUNV KToKKwogMjAxMi0wNi0yNiAgS2V2aW4gRWxsaXMgIDxrZXZlcnNAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFRvdWNoIGFkanVzdG1lbnQgZG9lcyBub3QgdGFyZ2V0IHNoYWRvdyBET00gZWxlbWVu dHMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxlSUNVLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxlSUNVLmNwcAppbmRleCA1NmQ2 YTc3NjBkMmIwNWI3YTg1NjJiMGIwM2YyMDc1NDIzNGE0NTE3Li5mNmI0ZWY4MGY5YmE1OWQ5MDFm ZjY3NzRlY2U1MzNmYzIxN2Y2ZjMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS90ZXh0L0xvY2FsZUlDVS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9M b2NhbGVJQ1UuY3BwCkBAIC0yNzIsMTMgKzI3MiwxOCBAQCBib29sIExvY2FsZUlDVTo6aW5pdGlh bGl6ZVNob3J0RGF0ZUZvcm1hdCgpCiB7CiAgICAgaWYgKG1fZGlkQ3JlYXRlU2hvcnREYXRlRm9y bWF0KQogICAgICAgICByZXR1cm4gbV9zaG9ydERhdGVGb3JtYXQ7Ci0gICAgY29uc3QgVUNoYXIg Z210VGltZXpvbmVbM10gPSB7J0cnLCAnTScsICdUJ307Ci0gICAgVUVycm9yQ29kZSBzdGF0dXMg PSBVX1pFUk9fRVJST1I7Ci0gICAgbV9zaG9ydERhdGVGb3JtYXQgPSB1ZGF0X29wZW4oVURBVF9O T05FLCBVREFUX1NIT1JULCBtX2xvY2FsZS5kYXRhKCksIGdtdFRpbWV6b25lLCBXVEZfQVJSQVlf TEVOR1RIKGdtdFRpbWV6b25lKSwgMCwgLTEsICZzdGF0dXMpOworICAgIG1fc2hvcnREYXRlRm9y bWF0ID0gb3BlbkRhdGVGb3JtYXQoVURBVF9OT05FLCBVREFUX1NIT1JUKTsKICAgICBtX2RpZENy ZWF0ZVNob3J0RGF0ZUZvcm1hdCA9IHRydWU7CiAgICAgcmV0dXJuIG1fc2hvcnREYXRlRm9ybWF0 OwogfQogCitVRGF0ZUZvcm1hdCogTG9jYWxlSUNVOjpvcGVuRGF0ZUZvcm1hdChVRGF0ZUZvcm1h dFN0eWxlIHRpbWVTdHlsZSwgVURhdGVGb3JtYXRTdHlsZSBkYXRlU3R5bGUpIGNvbnN0Cit7Cisg ICAgY29uc3QgVUNoYXIgZ210VGltZXpvbmVbM10gPSB7J0cnLCAnTScsICdUJ307CisgICAgVUVy cm9yQ29kZSBzdGF0dXMgPSBVX1pFUk9fRVJST1I7CisgICAgcmV0dXJuIHVkYXRfb3Blbih0aW1l U3R5bGUsIGRhdGVTdHlsZSwgbV9sb2NhbGUuZGF0YSgpLCBnbXRUaW1lem9uZSwgV1RGX0FSUkFZ X0xFTkdUSChnbXRUaW1lem9uZSksIDAsIC0xLCAmc3RhdHVzKTsKK30KKwogZG91YmxlIExvY2Fs ZUlDVTo6cGFyc2VMb2NhbGl6ZWREYXRlKGNvbnN0IFN0cmluZyYgaW5wdXQpCiB7CiAgICAgaWYg KCFpbml0aWFsaXplU2hvcnREYXRlRm9ybWF0KCkpCkBAIC0zMTMsNiArMzE4LDIzIEBAIFN0cmlu ZyBMb2NhbGVJQ1U6OmZvcm1hdExvY2FsaXplZERhdGUoY29uc3QgRGF0ZUNvbXBvbmVudHMmIGRh dGVDb21wb25lbnRzKQogfQogCiAjaWYgRU5BQkxFKENBTEVOREFSX1BJQ0tFUikKK3N0YXRpYyBT dHJpbmcgZ2V0RGF0ZUZvcm1hdFBhdHRlcm4oY29uc3QgVURhdGVGb3JtYXQqIGRhdGVGb3JtYXQp Cit7CisgICAgaWYgKCFkYXRlRm9ybWF0KQorICAgICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsK KworICAgIFVFcnJvckNvZGUgc3RhdHVzID0gVV9aRVJPX0VSUk9SOworICAgIGludDMyX3QgbGVu Z3RoID0gdWRhdF90b1BhdHRlcm4oZGF0ZUZvcm1hdCwgVFJVRSwgMCwgMCwgJnN0YXR1cyk7Cisg ICAgaWYgKHN0YXR1cyAhPSBVX0JVRkZFUl9PVkVSRkxPV19FUlJPUiB8fCAhbGVuZ3RoKQorICAg ICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsKKyAgICBWZWN0b3I8VUNoYXI+IGJ1ZmZlcihsZW5n dGgpOworICAgIHN0YXR1cyA9IFVfWkVST19FUlJPUjsKKyAgICB1ZGF0X3RvUGF0dGVybihkYXRl Rm9ybWF0LCBUUlVFLCBidWZmZXIuZGF0YSgpLCBsZW5ndGgsICZzdGF0dXMpOworICAgIGlmIChV X0ZBSUxVUkUoc3RhdHVzKSkKKyAgICAgICAgcmV0dXJuIGVtcHR5U3RyaW5nKCk7CisgICAgcmV0 dXJuIFN0cmluZzo6YWRvcHQoYnVmZmVyKTsKK30KKwogc3RhdGljIGlubGluZSBib29sIGlzSUNV WWVhclN5bWJvbChVQ2hhciBsZXR0ZXIpCiB7CiAgICAgcmV0dXJuIGxldHRlciA9PSAneScgfHwg bGV0dGVyID09ICdZJzsKQEAgLTMzMCwxMiArMzUyLDEyIEBAIHN0YXRpYyBpbmxpbmUgYm9vbCBp c0lDVURheUluTW9udGhTeW1ib2woVUNoYXIgbGV0dGVyKQogCiAvLyBTcGVjaWZpY2F0aW9uIG9m IHRoZSBpbnB1dDoKIC8vIGh0dHA6Ly9pY3UtcHJvamVjdC5vcmcvYXBpcmVmL2ljdTRjL2NsYXNz U2ltcGxlRGF0ZUZvcm1hdC5odG1sI2RldGFpbHMKLXN0YXRpYyBTdHJpbmcgbG9jYWxpemVGb3Jt YXQoY29uc3QgVmVjdG9yPFVDaGFyPiYgYnVmZmVyKQorc3RhdGljIFN0cmluZyBsb2NhbGl6ZUZv cm1hdChjb25zdCBTdHJpbmcmIGJ1ZmZlcikKIHsKICAgICBTdHJpbmdCdWlsZGVyIGJ1aWxkZXI7 CiAgICAgVUNoYXIgbGFzdENoYXIgPSAwOwogICAgIGJvb2wgaW5RdW90ZSA9IGZhbHNlOwotICAg IGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBidWZmZXIuc2l6ZSgpOyArK2kpIHsKKyAgICBmb3Ig KHVuc2lnbmVkIGkgPSAwOyBpIDwgYnVmZmVyLmxlbmd0aCgpOyArK2kpIHsKICAgICAgICAgaWYg KGluUXVvdGUpIHsKICAgICAgICAgICAgIGlmIChidWZmZXJbaV0gPT0gJ1wnJykgewogICAgICAg ICAgICAgICAgIGluUXVvdGUgPSBmYWxzZTsKQEAgLTM3NCwxNiArMzk2LDcgQEAgdm9pZCBMb2Nh bGVJQ1U6OmluaXRpYWxpemVMb2NhbGl6ZWREYXRlRm9ybWF0VGV4dCgpCiAgICAgbV9sb2NhbGl6 ZWREYXRlRm9ybWF0VGV4dCA9IGVtcHR5U3RyaW5nKCk7CiAgICAgaWYgKCFpbml0aWFsaXplU2hv cnREYXRlRm9ybWF0KCkpCiAgICAgICAgIHJldHVybjsKLSAgICBVRXJyb3JDb2RlIHN0YXR1cyA9 IFVfWkVST19FUlJPUjsKLSAgICBpbnQzMl90IGxlbmd0aCA9IHVkYXRfdG9QYXR0ZXJuKG1fc2hv cnREYXRlRm9ybWF0LCBUUlVFLCAwLCAwLCAmc3RhdHVzKTsKLSAgICBpZiAoc3RhdHVzICE9IFVf QlVGRkVSX09WRVJGTE9XX0VSUk9SKQotICAgICAgICByZXR1cm47Ci0gICAgVmVjdG9yPFVDaGFy PiBidWZmZXIobGVuZ3RoKTsKLSAgICBzdGF0dXMgPSBVX1pFUk9fRVJST1I7Ci0gICAgdWRhdF90 b1BhdHRlcm4obV9zaG9ydERhdGVGb3JtYXQsIFRSVUUsIGJ1ZmZlci5kYXRhKCksIGxlbmd0aCwg JnN0YXR1cyk7Ci0gICAgaWYgKFVfRkFJTFVSRShzdGF0dXMpKQotICAgICAgICByZXR1cm47Ci0g ICAgbV9sb2NhbGl6ZWREYXRlRm9ybWF0VGV4dCA9IGxvY2FsaXplRm9ybWF0KGJ1ZmZlcik7Cisg ICAgbV9sb2NhbGl6ZWREYXRlRm9ybWF0VGV4dCA9IGxvY2FsaXplRm9ybWF0KGdldERhdGVGb3Jt YXRQYXR0ZXJuKG1fc2hvcnREYXRlRm9ybWF0KSk7CiB9CiAKIFN0cmluZyBMb2NhbGVJQ1U6Omxv Y2FsaXplZERhdGVGb3JtYXRUZXh0KCkKQEAgLTM5MiwyMyArNDA1LDIzIEBAIFN0cmluZyBMb2Nh bGVJQ1U6OmxvY2FsaXplZERhdGVGb3JtYXRUZXh0KCkKICAgICByZXR1cm4gbV9sb2NhbGl6ZWRE YXRlRm9ybWF0VGV4dDsKIH0KIAotUGFzc093blB0cjxWZWN0b3I8U3RyaW5nPiA+IExvY2FsZUlD VTo6Y3JlYXRlTGFiZWxWZWN0b3IoVURhdGVGb3JtYXRTeW1ib2xUeXBlIHR5cGUsIGludDMyX3Qg c3RhcnRJbmRleCwgaW50MzJfdCBzaXplKQorUGFzc093blB0cjxWZWN0b3I8U3RyaW5nPiA+IExv Y2FsZUlDVTo6Y3JlYXRlTGFiZWxWZWN0b3IoY29uc3QgVURhdGVGb3JtYXQqIGRhdGVGb3JtYXQs IFVEYXRlRm9ybWF0U3ltYm9sVHlwZSB0eXBlLCBpbnQzMl90IHN0YXJ0SW5kZXgsIGludDMyX3Qg c2l6ZSkKIHsKLSAgICBpZiAoIW1fc2hvcnREYXRlRm9ybWF0KQorICAgIGlmICghZGF0ZUZvcm1h dCkKICAgICAgICAgcmV0dXJuIFBhc3NPd25QdHI8VmVjdG9yPFN0cmluZz4gPigpOwotICAgIGlm ICh1ZGF0X2NvdW50U3ltYm9scyhtX3Nob3J0RGF0ZUZvcm1hdCwgdHlwZSkgIT0gc3RhcnRJbmRl eCArIHNpemUpCisgICAgaWYgKHVkYXRfY291bnRTeW1ib2xzKGRhdGVGb3JtYXQsIHR5cGUpICE9 IHN0YXJ0SW5kZXggKyBzaXplKQogICAgICAgICByZXR1cm4gUGFzc093blB0cjxWZWN0b3I8U3Ry aW5nPiA+KCk7CiAKICAgICBPd25QdHI8VmVjdG9yPFN0cmluZz4gPiBsYWJlbHMgPSBhZG9wdFB0 cihuZXcgVmVjdG9yPFN0cmluZz4oKSk7CiAgICAgbGFiZWxzLT5yZXNlcnZlQ2FwYWNpdHkoc2l6 ZSk7CiAgICAgZm9yIChpbnQzMl90IGkgPSAwOyBpIDwgc2l6ZTsgKytpKSB7CiAgICAgICAgIFVF cnJvckNvZGUgc3RhdHVzID0gVV9aRVJPX0VSUk9SOwotICAgICAgICBpbnQzMl90IGxlbmd0aCA9 IHVkYXRfZ2V0U3ltYm9scyhtX3Nob3J0RGF0ZUZvcm1hdCwgdHlwZSwgc3RhcnRJbmRleCArIGks IDAsIDAsICZzdGF0dXMpOworICAgICAgICBpbnQzMl90IGxlbmd0aCA9IHVkYXRfZ2V0U3ltYm9s cyhkYXRlRm9ybWF0LCB0eXBlLCBzdGFydEluZGV4ICsgaSwgMCwgMCwgJnN0YXR1cyk7CiAgICAg ICAgIGlmIChzdGF0dXMgIT0gVV9CVUZGRVJfT1ZFUkZMT1dfRVJST1IpCiAgICAgICAgICAgICBy ZXR1cm4gUGFzc093blB0cjxWZWN0b3I8U3RyaW5nPiA+KCk7CiAgICAgICAgIFZlY3RvcjxVQ2hh cj4gYnVmZmVyKGxlbmd0aCk7CiAgICAgICAgIHN0YXR1cyA9IFVfWkVST19FUlJPUjsKLSAgICAg ICAgdWRhdF9nZXRTeW1ib2xzKG1fc2hvcnREYXRlRm9ybWF0LCB0eXBlLCBzdGFydEluZGV4ICsg aSwgYnVmZmVyLmRhdGEoKSwgbGVuZ3RoLCAmc3RhdHVzKTsKKyAgICAgICAgdWRhdF9nZXRTeW1i b2xzKGRhdGVGb3JtYXQsIHR5cGUsIHN0YXJ0SW5kZXggKyBpLCBidWZmZXIuZGF0YSgpLCBsZW5n dGgsICZzdGF0dXMpOwogICAgICAgICBpZiAoVV9GQUlMVVJFKHN0YXR1cykpCiAgICAgICAgICAg ICByZXR1cm4gUGFzc093blB0cjxWZWN0b3I8U3RyaW5nPiA+KCk7CiAgICAgICAgIGxhYmVscy0+ YXBwZW5kKFN0cmluZzo6YWRvcHQoYnVmZmVyKSk7CkBAIC00NTIsMTEgKzQ2NSwxMSBAQCB2b2lk IExvY2FsZUlDVTo6aW5pdGlhbGl6ZUNhbGVuZGFyKCkKICAgICB9CiAgICAgbV9maXJzdERheU9m V2VlayA9IHVjYWxfZ2V0QXR0cmlidXRlKHVkYXRfZ2V0Q2FsZW5kYXIobV9zaG9ydERhdGVGb3Jt YXQpLCBVQ0FMX0ZJUlNUX0RBWV9PRl9XRUVLKSAtIFVDQUxfU1VOREFZOwogCi0gICAgbV9tb250 aExhYmVscyA9IGNyZWF0ZUxhYmVsVmVjdG9yKFVEQVRfTU9OVEhTLCBVQ0FMX0pBTlVBUlksIDEy KTsKKyAgICBtX21vbnRoTGFiZWxzID0gY3JlYXRlTGFiZWxWZWN0b3IobV9zaG9ydERhdGVGb3Jt YXQsIFVEQVRfTU9OVEhTLCBVQ0FMX0pBTlVBUlksIDEyKTsKICAgICBpZiAoIW1fbW9udGhMYWJl bHMpCiAgICAgICAgIG1fbW9udGhMYWJlbHMgPSBjcmVhdGVGYWxsYmFja01vbnRoTGFiZWxzKCk7 CiAKLSAgICBtX3dlZWtEYXlTaG9ydExhYmVscyA9IGNyZWF0ZUxhYmVsVmVjdG9yKFVEQVRfU0hP UlRfV0VFS0RBWVMsIFVDQUxfU1VOREFZLCA3KTsKKyAgICBtX3dlZWtEYXlTaG9ydExhYmVscyA9 IGNyZWF0ZUxhYmVsVmVjdG9yKG1fc2hvcnREYXRlRm9ybWF0LCBVREFUX1NIT1JUX1dFRUtEQVlT LCBVQ0FMX1NVTkRBWSwgNyk7CiAgICAgaWYgKCFtX3dlZWtEYXlTaG9ydExhYmVscykKICAgICAg ICAgbV93ZWVrRGF5U2hvcnRMYWJlbHMgPSBjcmVhdGVGYWxsYmFja1dlZWtEYXlTaG9ydExhYmVs cygpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9Mb2NhbGVJ Q1UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxlSUNVLmgKaW5kZXggNzcz NjBhMmFhODNiZDgwNTE1MjdmNDQ5NGZkM2Q0ZTkxMTU3OGI1Yy4uOGM5YjM5ZTczZWMxZGE4YTE5 ZDkyMmZjMWM3YWQ5ODA4MzliZTkyMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vdGV4dC9Mb2NhbGVJQ1UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0xv Y2FsZUlDVS5oCkBAIC03NSwxMCArNzUsMTEgQEAgcHJpdmF0ZToKICAgICB1bnNpZ25lZCBtYXRj aGVkRGVjaW1hbFN5bWJvbEluZGV4KGNvbnN0IFN0cmluZyYgaW5wdXQsIHVuc2lnbmVkJiBwb3Np dGlvbik7CiAKICAgICBib29sIGluaXRpYWxpemVTaG9ydERhdGVGb3JtYXQoKTsKKyAgICBVRGF0 ZUZvcm1hdCogb3BlbkRhdGVGb3JtYXQoVURhdGVGb3JtYXRTdHlsZSB0aW1lU3R5bGUsIFVEYXRl Rm9ybWF0U3R5bGUgZGF0ZVN0eWxlKSBjb25zdDsKIAogI2lmIEVOQUJMRShDQUxFTkRBUl9QSUNL RVIpCiAgICAgdm9pZCBpbml0aWFsaXplTG9jYWxpemVkRGF0ZUZvcm1hdFRleHQoKTsKLSAgICBQ YXNzT3duUHRyPFZlY3RvcjxTdHJpbmc+ID4gY3JlYXRlTGFiZWxWZWN0b3IoVURhdGVGb3JtYXRT eW1ib2xUeXBlLCBpbnQzMl90IHN0YXJ0SW5kZXgsIGludDMyX3Qgc2l6ZSk7CisgICAgUGFzc093 blB0cjxWZWN0b3I8U3RyaW5nPiA+IGNyZWF0ZUxhYmVsVmVjdG9yKGNvbnN0IFVEYXRlRm9ybWF0 KiwgVURhdGVGb3JtYXRTeW1ib2xUeXBlLCBpbnQzMl90IHN0YXJ0SW5kZXgsIGludDMyX3Qgc2l6 ZSk7CiAgICAgdm9pZCBpbml0aWFsaXplQ2FsZW5kYXIoKTsKICNlbmRpZgogCg== 149676 2012-06-26 21:59:25 -0700 2012-06-26 23:03:43 -0700 Patch 2 bug-89967-20120627135924.patch text/plain 8212 yosin U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxMzE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDJjYTExMzA1OTAyNDgy OWEzNDUzNThhYjZjNGRlMjVjNzExY2YzNC4uMjA4ZDcwNjdkYzk4MmRkMDhhYjZkMjQzNjhlY2Vk YjNlMGQzN2I5NiAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEyLTA2LTI2ICBZb3No aWZ1bWkgSW5vdWUgIDx5b3NpbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW1BsYXRmb3JtXSBD aGFuZ2UgaW1wbGVtZW50YXRpb24gb2YgTG9jYWxlSUNVIGNsYXNzIHRvIHN1cHBvcnQgbW9yZSBV RGF0ZUZvcm1hdC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTg5OTY3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgVGhpcyBwYXRjaCBjaGFuZ2VzIGludGVybmFsIGZ1bmN0aW9ucyBvZiBMb2NhbGVJQ1UgY2xh c3MgdG8gcHJvY2VzcworICAgICAgICBtdWx0aXBsZSBJQ1UgZGF0ZSB0aW1lIGZvcm1hdCBoYW5k bGVzIGluIGFkZGl0aW9uIHRvIHNob3J0IGRhdGUgdGltZQorICAgICAgICBmb3JtYXQgaGFuZGxl LgorCisgICAgICAgIFRoaXMgcGF0Y2ggaXMgYSBwYXJ0IG9mIGltcGxlbWVudGluZyBpbnB1dCB0 eXBlIHRpbWUuIEknbGwgYWRkIHRpbWUKKyAgICAgICAgZm9ybWF0IHJlbGF0ZWQgSUNVIGRhdGUg dGltZSBmb3JtYXQgaGFuZGxlcy4KKworICAgICAgICBObyBuZXcgdGVzdHMuIFRoaXMgcGF0Y2gg ZG9lc24ndCBjaGFuZ2UgYmVoYXZpb3IuCisKKyAgICAgICAgKiBwbGF0Zm9ybS90ZXh0L0xvY2Fs ZUlDVS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMb2NhbGVJQ1U6OmluaXRpYWxpemVTaG9ydERh dGVGb3JtYXQpOiBDaGFuZ2VkIHRvIHVzZSBvcGVuRGF0ZUZvcm1hdCgpLgorICAgICAgICAoV2Vi Q29yZTo6TG9jYWxlSUNVOjpvcGVuRGF0ZUZvcm1hdCk6IEFkZGVkIGZvciBjb21tb24gdXNhZ2Ug b2YgdWR0X29wZW4oKS4KKyAgICAgICAgKFdlYkNvcmU6OmdldERhdGVGb3JtYXRQYXR0ZXJuKTog QWRkZWQgZm9yIGNvbW1vbiB1c2FnZSBvZiB1ZHRfdG9QYXR0ZXJuKCkuCisgICAgICAgIChXZWJD b3JlOjpsb2NhbGl6ZUZvcm1hdCk6IENoYW5nZWQgdG8gdGFrZSBTdHJpbmcgcGFyYW1ldGVyLgor ICAgICAgICAoV2ViQ29yZTo6TG9jYWxlSUNVOjppbml0aWFsaXplTG9jYWxpemVkRGF0ZUZvcm1h dFRleHQpOiBDaGFuZ2VkIHRvIHVzZSBnZXREYXRlRm9ybWF0UGF0dGVybi4KKyAgICAgICAgKFdl YkNvcmU6OkxvY2FsZUlDVTo6Y3JlYXRlTGFiZWxWZWN0b3IpOiBDaGFuZ2VkIHRvIHRha2UgVURh dGVGb3JtYXQgcGFyYW1ldGVyLgorICAgICAgICAoV2ViQ29yZTo6TG9jYWxlSUNVOjppbml0aWFs aXplQ2FsZW5kYXIpOiBDaGFuZ2VkIGZvciBoZWxwZXIgZnVuY3Rpb25zLgorICAgICAgICAqIHBs YXRmb3JtL3RleHQvTG9jYWxlSUNVLmg6CisgICAgICAgIChMb2NhbGVJQ1UpOgorCiAyMDEyLTA2 LTI2ICBYdWVxaW5nIEh1YW5nICA8aHVhbmd4dWVxaW5nQGJhaWR1LmNvbT4KIAogICAgICAgICBE cmFnRGF0YTo6YXNGaWxlbmFtZXMgc2hvdWxkIG5vdCBwdXNoIHNhbWUgZmlsZSBuYW1lcyB0byBy ZXN1bHQgaW4gV2luZG93cy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3Rl eHQvTG9jYWxlSUNVLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxlSUNV LmNwcAppbmRleCA1NmQ2YTc3NjBkMmIwNWI3YTg1NjJiMGIwM2YyMDc1NDIzNGE0NTE3Li5mNmI0 ZWY4MGY5YmE1OWQ5MDFmZjY3NzRlY2U1MzNmYzIxN2Y2ZjMxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS90ZXh0L0xvY2FsZUlDVS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vdGV4dC9Mb2NhbGVJQ1UuY3BwCkBAIC0yNzIsMTMgKzI3MiwxOCBAQCBib29sIExv Y2FsZUlDVTo6aW5pdGlhbGl6ZVNob3J0RGF0ZUZvcm1hdCgpCiB7CiAgICAgaWYgKG1fZGlkQ3Jl YXRlU2hvcnREYXRlRm9ybWF0KQogICAgICAgICByZXR1cm4gbV9zaG9ydERhdGVGb3JtYXQ7Ci0g ICAgY29uc3QgVUNoYXIgZ210VGltZXpvbmVbM10gPSB7J0cnLCAnTScsICdUJ307Ci0gICAgVUVy cm9yQ29kZSBzdGF0dXMgPSBVX1pFUk9fRVJST1I7Ci0gICAgbV9zaG9ydERhdGVGb3JtYXQgPSB1 ZGF0X29wZW4oVURBVF9OT05FLCBVREFUX1NIT1JULCBtX2xvY2FsZS5kYXRhKCksIGdtdFRpbWV6 b25lLCBXVEZfQVJSQVlfTEVOR1RIKGdtdFRpbWV6b25lKSwgMCwgLTEsICZzdGF0dXMpOworICAg IG1fc2hvcnREYXRlRm9ybWF0ID0gb3BlbkRhdGVGb3JtYXQoVURBVF9OT05FLCBVREFUX1NIT1JU KTsKICAgICBtX2RpZENyZWF0ZVNob3J0RGF0ZUZvcm1hdCA9IHRydWU7CiAgICAgcmV0dXJuIG1f c2hvcnREYXRlRm9ybWF0OwogfQogCitVRGF0ZUZvcm1hdCogTG9jYWxlSUNVOjpvcGVuRGF0ZUZv cm1hdChVRGF0ZUZvcm1hdFN0eWxlIHRpbWVTdHlsZSwgVURhdGVGb3JtYXRTdHlsZSBkYXRlU3R5 bGUpIGNvbnN0Cit7CisgICAgY29uc3QgVUNoYXIgZ210VGltZXpvbmVbM10gPSB7J0cnLCAnTScs ICdUJ307CisgICAgVUVycm9yQ29kZSBzdGF0dXMgPSBVX1pFUk9fRVJST1I7CisgICAgcmV0dXJu IHVkYXRfb3Blbih0aW1lU3R5bGUsIGRhdGVTdHlsZSwgbV9sb2NhbGUuZGF0YSgpLCBnbXRUaW1l em9uZSwgV1RGX0FSUkFZX0xFTkdUSChnbXRUaW1lem9uZSksIDAsIC0xLCAmc3RhdHVzKTsKK30K KwogZG91YmxlIExvY2FsZUlDVTo6cGFyc2VMb2NhbGl6ZWREYXRlKGNvbnN0IFN0cmluZyYgaW5w dXQpCiB7CiAgICAgaWYgKCFpbml0aWFsaXplU2hvcnREYXRlRm9ybWF0KCkpCkBAIC0zMTMsNiAr MzE4LDIzIEBAIFN0cmluZyBMb2NhbGVJQ1U6OmZvcm1hdExvY2FsaXplZERhdGUoY29uc3QgRGF0 ZUNvbXBvbmVudHMmIGRhdGVDb21wb25lbnRzKQogfQogCiAjaWYgRU5BQkxFKENBTEVOREFSX1BJ Q0tFUikKK3N0YXRpYyBTdHJpbmcgZ2V0RGF0ZUZvcm1hdFBhdHRlcm4oY29uc3QgVURhdGVGb3Jt YXQqIGRhdGVGb3JtYXQpCit7CisgICAgaWYgKCFkYXRlRm9ybWF0KQorICAgICAgICByZXR1cm4g ZW1wdHlTdHJpbmcoKTsKKworICAgIFVFcnJvckNvZGUgc3RhdHVzID0gVV9aRVJPX0VSUk9SOwor ICAgIGludDMyX3QgbGVuZ3RoID0gdWRhdF90b1BhdHRlcm4oZGF0ZUZvcm1hdCwgVFJVRSwgMCwg MCwgJnN0YXR1cyk7CisgICAgaWYgKHN0YXR1cyAhPSBVX0JVRkZFUl9PVkVSRkxPV19FUlJPUiB8 fCAhbGVuZ3RoKQorICAgICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsKKyAgICBWZWN0b3I8VUNo YXI+IGJ1ZmZlcihsZW5ndGgpOworICAgIHN0YXR1cyA9IFVfWkVST19FUlJPUjsKKyAgICB1ZGF0 X3RvUGF0dGVybihkYXRlRm9ybWF0LCBUUlVFLCBidWZmZXIuZGF0YSgpLCBsZW5ndGgsICZzdGF0 dXMpOworICAgIGlmIChVX0ZBSUxVUkUoc3RhdHVzKSkKKyAgICAgICAgcmV0dXJuIGVtcHR5U3Ry aW5nKCk7CisgICAgcmV0dXJuIFN0cmluZzo6YWRvcHQoYnVmZmVyKTsKK30KKwogc3RhdGljIGlu bGluZSBib29sIGlzSUNVWWVhclN5bWJvbChVQ2hhciBsZXR0ZXIpCiB7CiAgICAgcmV0dXJuIGxl dHRlciA9PSAneScgfHwgbGV0dGVyID09ICdZJzsKQEAgLTMzMCwxMiArMzUyLDEyIEBAIHN0YXRp YyBpbmxpbmUgYm9vbCBpc0lDVURheUluTW9udGhTeW1ib2woVUNoYXIgbGV0dGVyKQogCiAvLyBT cGVjaWZpY2F0aW9uIG9mIHRoZSBpbnB1dDoKIC8vIGh0dHA6Ly9pY3UtcHJvamVjdC5vcmcvYXBp cmVmL2ljdTRjL2NsYXNzU2ltcGxlRGF0ZUZvcm1hdC5odG1sI2RldGFpbHMKLXN0YXRpYyBTdHJp bmcgbG9jYWxpemVGb3JtYXQoY29uc3QgVmVjdG9yPFVDaGFyPiYgYnVmZmVyKQorc3RhdGljIFN0 cmluZyBsb2NhbGl6ZUZvcm1hdChjb25zdCBTdHJpbmcmIGJ1ZmZlcikKIHsKICAgICBTdHJpbmdC dWlsZGVyIGJ1aWxkZXI7CiAgICAgVUNoYXIgbGFzdENoYXIgPSAwOwogICAgIGJvb2wgaW5RdW90 ZSA9IGZhbHNlOwotICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBidWZmZXIuc2l6ZSgpOyAr K2kpIHsKKyAgICBmb3IgKHVuc2lnbmVkIGkgPSAwOyBpIDwgYnVmZmVyLmxlbmd0aCgpOyArK2kp IHsKICAgICAgICAgaWYgKGluUXVvdGUpIHsKICAgICAgICAgICAgIGlmIChidWZmZXJbaV0gPT0g J1wnJykgewogICAgICAgICAgICAgICAgIGluUXVvdGUgPSBmYWxzZTsKQEAgLTM3NCwxNiArMzk2 LDcgQEAgdm9pZCBMb2NhbGVJQ1U6OmluaXRpYWxpemVMb2NhbGl6ZWREYXRlRm9ybWF0VGV4dCgp CiAgICAgbV9sb2NhbGl6ZWREYXRlRm9ybWF0VGV4dCA9IGVtcHR5U3RyaW5nKCk7CiAgICAgaWYg KCFpbml0aWFsaXplU2hvcnREYXRlRm9ybWF0KCkpCiAgICAgICAgIHJldHVybjsKLSAgICBVRXJy b3JDb2RlIHN0YXR1cyA9IFVfWkVST19FUlJPUjsKLSAgICBpbnQzMl90IGxlbmd0aCA9IHVkYXRf dG9QYXR0ZXJuKG1fc2hvcnREYXRlRm9ybWF0LCBUUlVFLCAwLCAwLCAmc3RhdHVzKTsKLSAgICBp ZiAoc3RhdHVzICE9IFVfQlVGRkVSX09WRVJGTE9XX0VSUk9SKQotICAgICAgICByZXR1cm47Ci0g ICAgVmVjdG9yPFVDaGFyPiBidWZmZXIobGVuZ3RoKTsKLSAgICBzdGF0dXMgPSBVX1pFUk9fRVJS T1I7Ci0gICAgdWRhdF90b1BhdHRlcm4obV9zaG9ydERhdGVGb3JtYXQsIFRSVUUsIGJ1ZmZlci5k YXRhKCksIGxlbmd0aCwgJnN0YXR1cyk7Ci0gICAgaWYgKFVfRkFJTFVSRShzdGF0dXMpKQotICAg ICAgICByZXR1cm47Ci0gICAgbV9sb2NhbGl6ZWREYXRlRm9ybWF0VGV4dCA9IGxvY2FsaXplRm9y bWF0KGJ1ZmZlcik7CisgICAgbV9sb2NhbGl6ZWREYXRlRm9ybWF0VGV4dCA9IGxvY2FsaXplRm9y bWF0KGdldERhdGVGb3JtYXRQYXR0ZXJuKG1fc2hvcnREYXRlRm9ybWF0KSk7CiB9CiAKIFN0cmlu ZyBMb2NhbGVJQ1U6OmxvY2FsaXplZERhdGVGb3JtYXRUZXh0KCkKQEAgLTM5MiwyMyArNDA1LDIz IEBAIFN0cmluZyBMb2NhbGVJQ1U6OmxvY2FsaXplZERhdGVGb3JtYXRUZXh0KCkKICAgICByZXR1 cm4gbV9sb2NhbGl6ZWREYXRlRm9ybWF0VGV4dDsKIH0KIAotUGFzc093blB0cjxWZWN0b3I8U3Ry aW5nPiA+IExvY2FsZUlDVTo6Y3JlYXRlTGFiZWxWZWN0b3IoVURhdGVGb3JtYXRTeW1ib2xUeXBl IHR5cGUsIGludDMyX3Qgc3RhcnRJbmRleCwgaW50MzJfdCBzaXplKQorUGFzc093blB0cjxWZWN0 b3I8U3RyaW5nPiA+IExvY2FsZUlDVTo6Y3JlYXRlTGFiZWxWZWN0b3IoY29uc3QgVURhdGVGb3Jt YXQqIGRhdGVGb3JtYXQsIFVEYXRlRm9ybWF0U3ltYm9sVHlwZSB0eXBlLCBpbnQzMl90IHN0YXJ0 SW5kZXgsIGludDMyX3Qgc2l6ZSkKIHsKLSAgICBpZiAoIW1fc2hvcnREYXRlRm9ybWF0KQorICAg IGlmICghZGF0ZUZvcm1hdCkKICAgICAgICAgcmV0dXJuIFBhc3NPd25QdHI8VmVjdG9yPFN0cmlu Zz4gPigpOwotICAgIGlmICh1ZGF0X2NvdW50U3ltYm9scyhtX3Nob3J0RGF0ZUZvcm1hdCwgdHlw ZSkgIT0gc3RhcnRJbmRleCArIHNpemUpCisgICAgaWYgKHVkYXRfY291bnRTeW1ib2xzKGRhdGVG b3JtYXQsIHR5cGUpICE9IHN0YXJ0SW5kZXggKyBzaXplKQogICAgICAgICByZXR1cm4gUGFzc093 blB0cjxWZWN0b3I8U3RyaW5nPiA+KCk7CiAKICAgICBPd25QdHI8VmVjdG9yPFN0cmluZz4gPiBs YWJlbHMgPSBhZG9wdFB0cihuZXcgVmVjdG9yPFN0cmluZz4oKSk7CiAgICAgbGFiZWxzLT5yZXNl cnZlQ2FwYWNpdHkoc2l6ZSk7CiAgICAgZm9yIChpbnQzMl90IGkgPSAwOyBpIDwgc2l6ZTsgKytp KSB7CiAgICAgICAgIFVFcnJvckNvZGUgc3RhdHVzID0gVV9aRVJPX0VSUk9SOwotICAgICAgICBp bnQzMl90IGxlbmd0aCA9IHVkYXRfZ2V0U3ltYm9scyhtX3Nob3J0RGF0ZUZvcm1hdCwgdHlwZSwg c3RhcnRJbmRleCArIGksIDAsIDAsICZzdGF0dXMpOworICAgICAgICBpbnQzMl90IGxlbmd0aCA9 IHVkYXRfZ2V0U3ltYm9scyhkYXRlRm9ybWF0LCB0eXBlLCBzdGFydEluZGV4ICsgaSwgMCwgMCwg JnN0YXR1cyk7CiAgICAgICAgIGlmIChzdGF0dXMgIT0gVV9CVUZGRVJfT1ZFUkZMT1dfRVJST1Ip CiAgICAgICAgICAgICByZXR1cm4gUGFzc093blB0cjxWZWN0b3I8U3RyaW5nPiA+KCk7CiAgICAg ICAgIFZlY3RvcjxVQ2hhcj4gYnVmZmVyKGxlbmd0aCk7CiAgICAgICAgIHN0YXR1cyA9IFVfWkVS T19FUlJPUjsKLSAgICAgICAgdWRhdF9nZXRTeW1ib2xzKG1fc2hvcnREYXRlRm9ybWF0LCB0eXBl LCBzdGFydEluZGV4ICsgaSwgYnVmZmVyLmRhdGEoKSwgbGVuZ3RoLCAmc3RhdHVzKTsKKyAgICAg ICAgdWRhdF9nZXRTeW1ib2xzKGRhdGVGb3JtYXQsIHR5cGUsIHN0YXJ0SW5kZXggKyBpLCBidWZm ZXIuZGF0YSgpLCBsZW5ndGgsICZzdGF0dXMpOwogICAgICAgICBpZiAoVV9GQUlMVVJFKHN0YXR1 cykpCiAgICAgICAgICAgICByZXR1cm4gUGFzc093blB0cjxWZWN0b3I8U3RyaW5nPiA+KCk7CiAg ICAgICAgIGxhYmVscy0+YXBwZW5kKFN0cmluZzo6YWRvcHQoYnVmZmVyKSk7CkBAIC00NTIsMTEg KzQ2NSwxMSBAQCB2b2lkIExvY2FsZUlDVTo6aW5pdGlhbGl6ZUNhbGVuZGFyKCkKICAgICB9CiAg ICAgbV9maXJzdERheU9mV2VlayA9IHVjYWxfZ2V0QXR0cmlidXRlKHVkYXRfZ2V0Q2FsZW5kYXIo bV9zaG9ydERhdGVGb3JtYXQpLCBVQ0FMX0ZJUlNUX0RBWV9PRl9XRUVLKSAtIFVDQUxfU1VOREFZ OwogCi0gICAgbV9tb250aExhYmVscyA9IGNyZWF0ZUxhYmVsVmVjdG9yKFVEQVRfTU9OVEhTLCBV Q0FMX0pBTlVBUlksIDEyKTsKKyAgICBtX21vbnRoTGFiZWxzID0gY3JlYXRlTGFiZWxWZWN0b3Io bV9zaG9ydERhdGVGb3JtYXQsIFVEQVRfTU9OVEhTLCBVQ0FMX0pBTlVBUlksIDEyKTsKICAgICBp ZiAoIW1fbW9udGhMYWJlbHMpCiAgICAgICAgIG1fbW9udGhMYWJlbHMgPSBjcmVhdGVGYWxsYmFj a01vbnRoTGFiZWxzKCk7CiAKLSAgICBtX3dlZWtEYXlTaG9ydExhYmVscyA9IGNyZWF0ZUxhYmVs VmVjdG9yKFVEQVRfU0hPUlRfV0VFS0RBWVMsIFVDQUxfU1VOREFZLCA3KTsKKyAgICBtX3dlZWtE YXlTaG9ydExhYmVscyA9IGNyZWF0ZUxhYmVsVmVjdG9yKG1fc2hvcnREYXRlRm9ybWF0LCBVREFU X1NIT1JUX1dFRUtEQVlTLCBVQ0FMX1NVTkRBWSwgNyk7CiAgICAgaWYgKCFtX3dlZWtEYXlTaG9y dExhYmVscykKICAgICAgICAgbV93ZWVrRGF5U2hvcnRMYWJlbHMgPSBjcmVhdGVGYWxsYmFja1dl ZWtEYXlTaG9ydExhYmVscygpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vdGV4dC9Mb2NhbGVJQ1UuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3RleHQvTG9jYWxl SUNVLmgKaW5kZXggNzczNjBhMmFhODNiZDgwNTE1MjdmNDQ5NGZkM2Q0ZTkxMTU3OGI1Yy4uOGM5 YjM5ZTczZWMxZGE4YTE5ZDkyMmZjMWM3YWQ5ODA4MzliZTkyMCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vdGV4dC9Mb2NhbGVJQ1UuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS90ZXh0L0xvY2FsZUlDVS5oCkBAIC03NSwxMCArNzUsMTEgQEAgcHJpdmF0ZToKICAg ICB1bnNpZ25lZCBtYXRjaGVkRGVjaW1hbFN5bWJvbEluZGV4KGNvbnN0IFN0cmluZyYgaW5wdXQs IHVuc2lnbmVkJiBwb3NpdGlvbik7CiAKICAgICBib29sIGluaXRpYWxpemVTaG9ydERhdGVGb3Jt YXQoKTsKKyAgICBVRGF0ZUZvcm1hdCogb3BlbkRhdGVGb3JtYXQoVURhdGVGb3JtYXRTdHlsZSB0 aW1lU3R5bGUsIFVEYXRlRm9ybWF0U3R5bGUgZGF0ZVN0eWxlKSBjb25zdDsKIAogI2lmIEVOQUJM RShDQUxFTkRBUl9QSUNLRVIpCiAgICAgdm9pZCBpbml0aWFsaXplTG9jYWxpemVkRGF0ZUZvcm1h dFRleHQoKTsKLSAgICBQYXNzT3duUHRyPFZlY3RvcjxTdHJpbmc+ID4gY3JlYXRlTGFiZWxWZWN0 b3IoVURhdGVGb3JtYXRTeW1ib2xUeXBlLCBpbnQzMl90IHN0YXJ0SW5kZXgsIGludDMyX3Qgc2l6 ZSk7CisgICAgUGFzc093blB0cjxWZWN0b3I8U3RyaW5nPiA+IGNyZWF0ZUxhYmVsVmVjdG9yKGNv bnN0IFVEYXRlRm9ybWF0KiwgVURhdGVGb3JtYXRTeW1ib2xUeXBlLCBpbnQzMl90IHN0YXJ0SW5k ZXgsIGludDMyX3Qgc2l6ZSk7CiAgICAgdm9pZCBpbml0aWFsaXplQ2FsZW5kYXIoKTsKICNlbmRp ZgogCg==