112648 2013-03-18 19:30:01 -0700 [chromium] More tracing in deferred image decoding 2013-03-18 20:53:19 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 hclam hclam cc-bugs enne jamesr nduca qinmin reveman webkit.review.bot oldest_to_newest 857854 0 hclam 2013-03-18 19:30:01 -0700 We need more tracing data in deferred image decoding path, here's a list of high level data we want to capture: 1. The time span that a LazyDecodingPixelRef is locked. 2. Decode, scaling, cache pruning time. 3. Memory usage, number of cache entries. 4. Number of re-decode. 857859 1 193715 hclam 2013-03-18 19:36:32 -0700 Created attachment 193715 Patch 857860 2 193716 hclam 2013-03-18 19:41:59 -0700 Created attachment 193716 Patch 857861 3 193717 hclam 2013-03-18 19:43:19 -0700 Created attachment 193717 Patch 857893 4 193717 webkit.review.bot 2013-03-18 20:53:16 -0700 Comment on attachment 193717 Patch Clearing flags on attachment: 193717 Committed r146175: <http://trac.webkit.org/changeset/146175> 857894 5 webkit.review.bot 2013-03-18 20:53:19 -0700 All reviewed patches have been landed. Closing bug. 193715 2013-03-18 19:36:32 -0700 2013-03-18 19:41:57 -0700 Patch bug-112648-20130318193223.patch text/plain 9633 hclam U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MDMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDdkODdlMDMwMTA5Njg0 ODU5MGY1ODllY2ZkMmMxZGEzZmM3ZDIxOS4uMzg4MjJlMjQ5Y2RlNzgwYmViNGE0MzdjZDk1OGRi NzUyNGZmNTQ0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEzLTAzLTE4ICBBbHBo YSBMYW0gIDxoY2xhbUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBNb3JlIHRy YWNpbmcgaW4gZGVmZXJyZWQgaW1hZ2UgZGVjb2RpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjY0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGluZyBtb3JlIHRyYWNlIGV2ZW50cyBmb3IgYSBj b3VwbGUgdGhpbmdzIGluIGRlZmVycmVkIGltYWdlIGRlY29kaW5nIHBhdGg6CisgICAgICAgIC0g VGltZSBzcGFuIGZvciBlYWNoIGxvY2sgcGl4ZWxzIG9mIFNrUGl4ZWxSZWYuCisgICAgICAgIC0g VGltZSBzcGVudCBvbiBkZWNvZGluZywgc2NhbGluZyBhbmQgcHJ1bmluZy4gQWxzbyB0aGUgc3Rh Y2sgdHJhY2UgZm9yIHRoZXNlIGV2ZW50cy4KKyAgICAgICAgLSBNZW1vcnkgdXNhZ2UgYW5kIG51 bWJlciBvZiBjYWNoZWQgZW50cmllcy4KKyAgICAgICAgLSBOdW1iZXIgb2YgZGVjb2RlICYgc2Nh bGUgb3BlcmF0aW9ucyBkb25lIHBlciBpbWFnZS4KKworICAgICAgICBObyB0ZXN0IGFzIHRoaXMg anVzdCBhZGQgdHJhY2luZyBpbmZvcm1hdGlvbiBhbmQgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VEZWNvZGluZ1N0b3JlLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlRGVjb2RpbmdTdG9yZTo6cHJ1bmUpOgorICAgICAg ICAoV2ViQ29yZTo6SW1hZ2VEZWNvZGluZ1N0b3JlOjppbnNlcnRDYWNoZUludGVybmFsKToKKyAg ICAgICAgKFdlYkNvcmU6OkltYWdlRGVjb2RpbmdTdG9yZTo6cmVtb3ZlRnJvbUNhY2hlSW50ZXJu YWwpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlRnJhbWVHZW5l cmF0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VGcmFtZUdlbmVyYXRvcjo6SW1hZ2VG cmFtZUdlbmVyYXRvcik6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUZyYW1lR2VuZXJhdG9yOjpk ZWNvZGVBbmRTY2FsZSk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUZyYW1lR2VuZXJhdG9yOjp0 cnlUb1NjYWxlKToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlRnJhbWVHZW5lcmF0b3I6OnRyeVRv UmVzdW1lRGVjb2RlQW5kU2NhbGUpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VGcmFtZUdlbmVy YXRvcjo6dHJ5VG9EZWNvZGVBbmRTY2FsZSk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUZyYW1l R2VuZXJhdG9yOjpkZWNvZGUpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0ltYWdlRnJhbWVHZW5lcmF0b3IuaDoKKyAgICAgICAgKEltYWdlRnJhbWVHZW5lcmF0b3IpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xhenlEZWNvZGluZ1BpeGVsUmVm LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxhenlEZWNvZGluZ1BpeGVsUmVmOjpvbkxvY2tQaXhl bHMpOgorICAgICAgICAoV2ViQ29yZTo6TGF6eURlY29kaW5nUGl4ZWxSZWY6Om9uVW5sb2NrUGl4 ZWxzKToKKyAgICAgICAgKFdlYkNvcmU6OkxhenlEZWNvZGluZ1BpeGVsUmVmOjpQcmVwYXJlVG9E ZWNvZGUpOgorCiAyMDEzLTAzLTE3ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgogCiAgICAgICAgIEVuY2Fwc3VsYXRlIFBsYXRmb3JtTWVzc2FnZVBvcnRDaGFubmVsIGEgbGl0 dGxlIGJldHRlciB5ZXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL0ltYWdlRGVjb2RpbmdTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZURlY29kaW5nU3RvcmUuY3BwCmluZGV4IGZjOWJl YjIwMzcxNTZlNjVkZGM0YWFiNWRmMzQxNjcwNTkyODdlYzYuLjU5ZTY0NzVlOTFkZjc2ODQ0Njkw MzRkN2FjZTBmMDRiNWQ1ZTU4MTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlRGVjb2RpbmdTdG9yZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VEZWNvZGluZ1N0b3JlLmNwcApA QCAtMjksNiArMjksNyBAQAogI2luY2x1ZGUgIkltYWdlRnJhbWVHZW5lcmF0b3IuaCIKICNpbmNs dWRlICJTY2FsZWRJbWFnZUZyYWdtZW50LmgiCiAjaW5jbHVkZSAiU2hhcmVkQnVmZmVyLmgiCisj aW5jbHVkZSAiVHJhY2VFdmVudC5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTIzNSw2 ICsyMzYsOCBAQCB1bnNpZ25lZCBJbWFnZURlY29kaW5nU3RvcmU6OmNhY2hlRW50cmllcygpCiAK IHZvaWQgSW1hZ2VEZWNvZGluZ1N0b3JlOjpwcnVuZSgpCiB7CisgICAgVFJBQ0VfRVZFTlQwKCJ3 ZWJraXQiLCAiSW1hZ2VEZWNvZGluZ1N0b3JlOjpwcnVuZSIpOworCiAgICAgVmVjdG9yPE93blB0 cjxDYWNoZUVudHJ5PiA+IGNhY2hlRW50cmllc1RvRGVsZXRlOwogICAgIHsKICAgICAgICAgTXV0 ZXhMb2NrZXIgbG9jayhtX211dGV4KTsKQEAgLTI2MCw2ICsyNjMsNyBAQCB2b2lkIEltYWdlRGVj b2RpbmdTdG9yZTo6aW5zZXJ0Q2FjaGVJbnRlcm5hbChQYXNzT3duUHRyPENhY2hlRW50cnk+IGNh Y2hlRW50cnkpCiB7CiAgICAgaWYgKCFjYWNoZUVudHJ5LT5pc0Rpc2NhcmRhYmxlKCkpCiAgICAg ICAgIGluY3JlbWVudE1lbW9yeVVzYWdlKGNhY2hlRW50cnktPm1lbW9yeVVzYWdlSW5CeXRlcygp KTsKKyAgICBUUkFDRV9DT1VOVEVSMSgid2Via2l0IiwgIkltYWdlRGVjb2RpbmdTdG9yZU1lbW9y eVVzYWdlQnl0ZXMiLCBtX21lbW9yeVVzYWdlSW5CeXRlcyk7CiAKICAgICAvLyBtX29yZGVyZWRD YWNoZUxpc3QgaXMgdXNlZCB0byBzdXBwb3J0IExSVSBvcGVyYXRpb25zIHRvIHJlb3JkZXIgY2Fj aGUKICAgICAvLyBlbnRyaWVzIHF1aWNrbHkuCkBAIC0yNjksNiArMjczLDcgQEAgdm9pZCBJbWFn ZURlY29kaW5nU3RvcmU6Omluc2VydENhY2hlSW50ZXJuYWwoUGFzc093blB0cjxDYWNoZUVudHJ5 PiBjYWNoZUVudHJ5KQogICAgIC8vIG1fY2FjaGVNYXAgaXMgdXNlZCBmb3IgaW5kZXhpbmcgYW5k IHF1aWNrIGxvb2t1cCBvZiBhIGNhY2hlZCBpbWFnZS4gSXQgb3ducwogICAgIC8vIGFsbCBjYWNo ZSBlbnRyaWVzLgogICAgIG1fY2FjaGVNYXAuYWRkKGtleSwgY2FjaGVFbnRyeSk7CisgICAgVFJB Q0VfQ09VTlRFUjEoIndlYmtpdCIsICJJbWFnZURlY29kaW5nU3RvcmVOdW1PZkVudHJpZXMiLCBt X2NhY2hlTWFwLnNpemUoKSk7CiAKICAgICAvLyBtX2NhY2hlZFNpemVNYXAga2VlcHMgYWxsIHNj YWxlZCBzaXplcyBhc3NvY2lhdGVkIHdpdGggYW4gSW1hZ2VGcmFtZUdlbmVyYXRvci4KICAgICBD YWNoZWRTaXplTWFwOjpBZGRSZXN1bHQgcmVzdWx0ID0gbV9jYWNoZWRTaXplTWFwLmFkZChrZXku Zmlyc3QsIFNpemVTZXQoKSk7CkBAIC0yNzksMTAgKzI4NCwxMiBAQCB2b2lkIEltYWdlRGVjb2Rp bmdTdG9yZTo6cmVtb3ZlRnJvbUNhY2hlSW50ZXJuYWwoY29uc3QgQ2FjaGVFbnRyeSogY2FjaGVF bnRyeSwgVgogewogICAgIGlmICghY2FjaGVFbnRyeS0+aXNEaXNjYXJkYWJsZSgpKQogICAgICAg ICBkZWNyZW1lbnRNZW1vcnlVc2FnZShjYWNoZUVudHJ5LT5tZW1vcnlVc2FnZUluQnl0ZXMoKSk7 CisgICAgVFJBQ0VfQ09VTlRFUjEoIndlYmtpdCIsICJJbWFnZURlY29kaW5nU3RvcmVNZW1vcnlV c2FnZUJ5dGVzIiwgbV9tZW1vcnlVc2FnZUluQnl0ZXMpOwogCiAgICAgLy8gUmVtb3ZlIGZyb20g bV9jYWNoZU1hcC4KICAgICBDYWNoZUlkZW50aWZpZXIga2V5ID0gY2FjaGVFbnRyeS0+Y2FjaGVL ZXkoKTsKICAgICBkZWxldGlvbkxpc3QtPmFwcGVuZChtX2NhY2hlTWFwLnRha2Uoa2V5KSk7Cisg ICAgVFJBQ0VfQ09VTlRFUjEoIndlYmtpdCIsICJJbWFnZURlY29kaW5nU3RvcmVOdW1PZkVudHJp ZXMiLCBtX2NhY2hlTWFwLnNpemUoKSk7CiAKICAgICAvLyBSZW1vdmUgZnJvbSBtX2NhY2hlZFNp emVNYXAuCiAgICAgQ2FjaGVkU2l6ZU1hcDo6aXRlcmF0b3IgaXRlciA9IG1fY2FjaGVkU2l6ZU1h cC5maW5kKGtleS5maXJzdCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9JbWFnZUZyYW1lR2VuZXJhdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlRnJhbWVHZW5lcmF0b3IuY3BwCmluZGV4 IDRkZDUyMTVkMGQ2MWQ2NTMyMzZhODNmZDUyNmJkYWM1OTE3ZTM2Y2QuLjFmZDc0MWY2YTZiZDc3 NjUyMzAzMzhlNTdhMjY3ZWI0OWRiZTYxZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlRnJhbWVHZW5lcmF0b3IuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlRnJhbWVHZW5lcmF0 b3IuY3BwCkBAIC0zMSw2ICszMSw3IEBACiAjaW5jbHVkZSAiSW1hZ2VEZWNvZGluZ1N0b3JlLmgi CiAjaW5jbHVkZSAiU2NhbGVkSW1hZ2VGcmFnbWVudC5oIgogI2luY2x1ZGUgIlNoYXJlZEJ1ZmZl ci5oIgorI2luY2x1ZGUgIlRyYWNlRXZlbnQuaCIKIAogI2luY2x1ZGUgInNraWEvZXh0L2ltYWdl X29wZXJhdGlvbnMuaCIKIApAQCAtNDksNiArNTAsNyBAQCBJbWFnZUZyYW1lR2VuZXJhdG9yOjpJ bWFnZUZyYW1lR2VuZXJhdG9yKGNvbnN0IFNrSVNpemUmIGZ1bGxTaXplLCBQYXNzUmVmUHRyPFNo YQogICAgIDogbV9mdWxsU2l6ZShmdWxsU2l6ZSkKICAgICAsIG1fZGVjb2RlRmFpbGVkQW5kRW1w dHkoZmFsc2UpCiAgICAgLCBtX2hhc0FscGhhKHRydWUpCisgICAgLCBtX2RlY29kZUNvdW50KDAp CiB7CiAgICAgc2V0RGF0YShkYXRhLmdldCgpLCBhbGxEYXRhUmVjZWl2ZWQpOwogfQpAQCAtODEs NiArODMsNyBAQCBjb25zdCBTY2FsZWRJbWFnZUZyYWdtZW50KiBJbWFnZUZyYW1lR2VuZXJhdG9y OjpkZWNvZGVBbmRTY2FsZShjb25zdCBTa0lTaXplJiBzYwogICAgIGlmIChjYWNoZWRJbWFnZSkK ICAgICAgICAgcmV0dXJuIGNhY2hlZEltYWdlOwogCisgICAgVFJBQ0VfRVZFTlQyKCJ3ZWJraXQi LCAiSW1hZ2VGcmFtZUdlbmVyYXRvcjo6ZGVjb2RlQW5kU2NhbGUiLCAiZ2VuZXJhdG9yIiwgdGhp cywgImRlY29kZUNvdW50IiwgKyttX2RlY29kZUNvdW50KTsKICAgICBjYWNoZWRJbWFnZSA9IHRy eVRvU2NhbGUoMCwgc2NhbGVkU2l6ZSk7CiAgICAgaWYgKGNhY2hlZEltYWdlKQogICAgICAgICBy ZXR1cm4gY2FjaGVkSW1hZ2U7CkBAIC0xMDUsNiArMTA4LDggQEAgY29uc3QgU2NhbGVkSW1hZ2VG cmFnbWVudCogSW1hZ2VGcmFtZUdlbmVyYXRvcjo6dHJ5VG9Mb2NrQ29tcGxldGVDYWNoZShjb25z dCBTa0kKIAogY29uc3QgU2NhbGVkSW1hZ2VGcmFnbWVudCogSW1hZ2VGcmFtZUdlbmVyYXRvcjo6 dHJ5VG9TY2FsZShjb25zdCBTY2FsZWRJbWFnZUZyYWdtZW50KiBmdWxsU2l6ZUltYWdlLCBjb25z dCBTa0lTaXplJiBzY2FsZWRTaXplKQogeworICAgIFRSQUNFX0VWRU5UMCgid2Via2l0IiwgIklt YWdlRnJhbWVHZW5lcmF0b3I6OnRyeVRvU2NhbGUiKTsKKwogICAgIC8vIElmIHRoZSByZXF1ZXN0 ZWQgc2NhbGVkIHNpemUgaXMgdGhlIHNhbWUgYXMgdGhlIGZ1bGwgc2l6ZSB0aGVuIGV4aXQKICAg ICAvLyBlYXJseS4gVGhpcyBzYXZlcyBhIGNhY2hlIGxvb2t1cC4KICAgICBpZiAoc2NhbGVkU2l6 ZSA9PSBtX2Z1bGxTaXplKQpAQCAtMTM1LDYgKzE0MCw4IEBAIGNvbnN0IFNjYWxlZEltYWdlRnJh Z21lbnQqIEltYWdlRnJhbWVHZW5lcmF0b3I6OnRyeVRvU2NhbGUoY29uc3QgU2NhbGVkSW1hZ2VG cmFnCiAKIGNvbnN0IFNjYWxlZEltYWdlRnJhZ21lbnQqIEltYWdlRnJhbWVHZW5lcmF0b3I6OnRy eVRvUmVzdW1lRGVjb2RlQW5kU2NhbGUoY29uc3QgU2tJU2l6ZSYgc2NhbGVkU2l6ZSkKIHsKKyAg ICBUUkFDRV9FVkVOVDAoIndlYmtpdCIsICJJbWFnZUZyYW1lR2VuZXJhdG9yOjp0cnlUb1Jlc3Vt ZURlY29kZUFuZFNjYWxlIik7CisKICAgICBjb25zdCBTY2FsZWRJbWFnZUZyYWdtZW50KiBjYWNo ZWRJbWFnZSA9IDA7CiAgICAgSW1hZ2VEZWNvZGVyKiBjYWNoZWREZWNvZGVyID0gMDsKICAgICBp ZiAoIUltYWdlRGVjb2RpbmdTdG9yZTo6aW5zdGFuY2UoKS0+bG9ja0NhY2hlKHRoaXMsIG1fZnVs bFNpemUsIEltYWdlRGVjb2RpbmdTdG9yZTo6Q2FjaGVDYW5CZUluY29tcGxldGUsICZjYWNoZWRJ bWFnZSwgJmNhY2hlZERlY29kZXIpKQpAQCAtMTY2LDYgKzE3Myw4IEBAIGNvbnN0IFNjYWxlZElt YWdlRnJhZ21lbnQqIEltYWdlRnJhbWVHZW5lcmF0b3I6OnRyeVRvUmVzdW1lRGVjb2RlQW5kU2Nh bGUoY29uc3QKIAogY29uc3QgU2NhbGVkSW1hZ2VGcmFnbWVudCogSW1hZ2VGcmFtZUdlbmVyYXRv cjo6dHJ5VG9EZWNvZGVBbmRTY2FsZShjb25zdCBTa0lTaXplJiBzY2FsZWRTaXplKQogeworICAg IFRSQUNFX0VWRU5UMCgid2Via2l0IiwgIkltYWdlRnJhbWVHZW5lcmF0b3I6OnRyeVRvRGVjb2Rl QW5kU2NhbGUiKTsKKwogICAgIEltYWdlRGVjb2RlciogZGVjb2RlciA9IDA7CiAgICAgT3duUHRy PFNjYWxlZEltYWdlRnJhZ21lbnQ+IGZ1bGxTaXplSW1hZ2UgPSBkZWNvZGUoJmRlY29kZXIpOwog CkBAIC0xOTUsNiArMjA0LDggQEAgY29uc3QgU2NhbGVkSW1hZ2VGcmFnbWVudCogSW1hZ2VGcmFt ZUdlbmVyYXRvcjo6dHJ5VG9EZWNvZGVBbmRTY2FsZShjb25zdCBTa0lTaXoKIAogUGFzc093blB0 cjxTY2FsZWRJbWFnZUZyYWdtZW50PiBJbWFnZUZyYW1lR2VuZXJhdG9yOjpkZWNvZGUoSW1hZ2VE ZWNvZGVyKiogZGVjb2RlcikKIHsKKyAgICBUUkFDRV9FVkVOVDIoIndlYmtpdCIsICJJbWFnZUZy YW1lR2VuZXJhdG9yOjpkZWNvZGUiLCAid2lkdGgiLCBtX2Z1bGxTaXplLndpZHRoKCksICJoZWln aHQiLCBtX2Z1bGxTaXplLmhlaWdodCgpKTsKKwogICAgIEFTU0VSVChkZWNvZGVyKTsKICAgICBT aGFyZWRCdWZmZXIqIGRhdGEgPSAwOwogICAgIGJvb2wgYWxsRGF0YVJlY2VpdmVkID0gZmFsc2U7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9J bWFnZUZyYW1lR2VuZXJhdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9JbWFnZUZyYW1lR2VuZXJhdG9yLmgKaW5kZXggMzQzZTdiNTFlYzZkNDBiMGM3YTBh MTU4NmM2ODk2NmRiYjQxMGI3My4uMGY1MTIyYWFlMTExYjhkNmFmYzFjZjQ1M2QyNTY3ODAwM2Zm YjI0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vSW1hZ2VGcmFtZUdlbmVyYXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0ltYWdlRnJhbWVHZW5lcmF0b3IuaApAQCAtODMsNiArODMsNyBAQCBw cml2YXRlOgogICAgIFRocmVhZFNhZmVEYXRhVHJhbnNwb3J0IG1fZGF0YTsKICAgICBib29sIG1f ZGVjb2RlRmFpbGVkQW5kRW1wdHk7CiAgICAgYm9vbCBtX2hhc0FscGhhOworICAgIGludCBtX2Rl Y29kZUNvdW50OwogICAgIERpc2NhcmRhYmxlUGl4ZWxSZWZBbGxvY2F0b3IgbV9hbGxvY2F0b3I7 CiAKICAgICBPd25QdHI8SW1hZ2VEZWNvZGVyRmFjdG9yeT4gbV9pbWFnZURlY29kZXJGYWN0b3J5 OwpAQCAtOTAsNiArOTEsNyBAQCBwcml2YXRlOgogICAgIC8vIFByZXZlbnRzIG11bHRpcGxlIGRl Y29kZSBvcGVyYXRpb25zIG9uIHRoZSBzYW1lIGRhdGEuCiAgICAgTXV0ZXggbV9kZWNvZGVNdXRl eDsKIAorCiAgICAgLy8gUHJvdGVjdCBjb25jdXJyZW50IGFjY2VzcyB0byBtX2hhc0FscGhhLgog ICAgIE11dGV4IG1fYWxwaGFNdXRleDsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXp5RGVjb2RpbmdQaXhlbFJlZi5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXp5RGVjb2RpbmdQaXhlbFJl Zi5jcHAKaW5kZXggMDAyNThjNjIxNDVmMTZkMjQ1YjU1OGY3NDJiNTJmODZjZGJlODNhZC4uMTU3 MjQyNDExOTE3YWNhMGViOGE2ZjRkMTZjMmIwN2UyZDc1ZWMyZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vTGF6eURlY29kaW5nUGl4ZWxSZWYu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xhenlE ZWNvZGluZ1BpeGVsUmVmLmNwcApAQCAtMjksNiArMjksNyBAQAogI2luY2x1ZGUgIkltYWdlRGVj b2Rlci5oIgogI2luY2x1ZGUgIkltYWdlRGVjb2RpbmdTdG9yZS5oIgogI2luY2x1ZGUgIkltYWdl RnJhbWVHZW5lcmF0b3IuaCIKKyNpbmNsdWRlICJUcmFjZUV2ZW50LmgiCiAjaW5jbHVkZSA8d3Rm L01haW5UaHJlYWQuaD4KIAogbmFtZXNwYWNlIFdlYkNvcmUgewpAQCAtNTcsNiArNTgsNyBAQCBi b29sIExhenlEZWNvZGluZ1BpeGVsUmVmOjppc0NsaXBwZWQoKSBjb25zdAogCiB2b2lkKiBMYXp5 RGVjb2RpbmdQaXhlbFJlZjo6b25Mb2NrUGl4ZWxzKFNrQ29sb3JUYWJsZSoqKQogeworICAgIFRS QUNFX0VWRU5UX0FTWU5DX0JFR0lOMCgid2Via2l0IiwgIkxhenlEZWNvZGluZ1BpeGVsUmVmOjps b2NrUGl4ZWxzIiwgdGhpcyk7CiAgICAgbV9tdXRleC5sb2NrKCk7CiAgICAgQVNTRVJUKCFtX2xv Y2tlZENhY2hlZEltYWdlKTsKIApAQCAtODMsNiArODUsNyBAQCB2b2lkIExhenlEZWNvZGluZ1Bp eGVsUmVmOjpvblVubG9ja1BpeGVscygpCiAgICAgICAgIG1fbG9ja2VkQ2FjaGVkSW1hZ2UgPSAw OwogICAgIH0KICAgICBtX211dGV4LnVubG9jaygpOworICAgIFRSQUNFX0VWRU5UX0FTWU5DX0VO RDAoIndlYmtpdCIsICJMYXp5RGVjb2RpbmdQaXhlbFJlZjo6bG9ja1BpeGVscyIsIHRoaXMpOwog fQogCiBib29sIExhenlEZWNvZGluZ1BpeGVsUmVmOjpvbkxvY2tQaXhlbHNBcmVXcml0YWJsZSgp IGNvbnN0CkBAIC05Miw2ICs5NSw4IEBAIGJvb2wgTGF6eURlY29kaW5nUGl4ZWxSZWY6Om9uTG9j a1BpeGVsc0FyZVdyaXRhYmxlKCkgY29uc3QKIAogYm9vbCBMYXp5RGVjb2RpbmdQaXhlbFJlZjo6 UHJlcGFyZVRvRGVjb2RlKGNvbnN0IExhenlQaXhlbFJlZjo6UHJlcGFyZVBhcmFtcyYgcGFyYW1z KQogeworICAgIFRSQUNFX0VWRU5UMCgid2Via2l0IiwgIkxhenlEZWNvZGluZ1BpeGVsUmVmOjpQ cmVwYXJlVG9EZWNvZGUiKTsKKwogICAgIC8vIFRPRE86IGNoZWNrIGlmIG9ubHkgYSBwYXJ0aWN1 bGFyIHJlY3QgaXMgYXZhaWxhYmxlIGluIGltYWdlIGNhY2hlLgogICAgIFVOVVNFRF9QQVJBTShw YXJhbXMpOwogICAgIGNvbnN0IFNjYWxlZEltYWdlRnJhZ21lbnQqIGNhY2hlZEltYWdlID0gMDsK 193716 2013-03-18 19:41:59 -0700 2013-03-18 19:43:17 -0700 Patch bug-112648-20130318193750.patch text/plain 9440 hclam U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MDMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDdkODdlMDMwMTA5Njg0 ODU5MGY1ODllY2ZkMmMxZGEzZmM3ZDIxOS4uMzg4MjJlMjQ5Y2RlNzgwYmViNGE0MzdjZDk1OGRi NzUyNGZmNTQ0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEzLTAzLTE4ICBBbHBo YSBMYW0gIDxoY2xhbUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBNb3JlIHRy YWNpbmcgaW4gZGVmZXJyZWQgaW1hZ2UgZGVjb2RpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjY0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGluZyBtb3JlIHRyYWNlIGV2ZW50cyBmb3IgYSBj b3VwbGUgdGhpbmdzIGluIGRlZmVycmVkIGltYWdlIGRlY29kaW5nIHBhdGg6CisgICAgICAgIC0g VGltZSBzcGFuIGZvciBlYWNoIGxvY2sgcGl4ZWxzIG9mIFNrUGl4ZWxSZWYuCisgICAgICAgIC0g VGltZSBzcGVudCBvbiBkZWNvZGluZywgc2NhbGluZyBhbmQgcHJ1bmluZy4gQWxzbyB0aGUgc3Rh Y2sgdHJhY2UgZm9yIHRoZXNlIGV2ZW50cy4KKyAgICAgICAgLSBNZW1vcnkgdXNhZ2UgYW5kIG51 bWJlciBvZiBjYWNoZWQgZW50cmllcy4KKyAgICAgICAgLSBOdW1iZXIgb2YgZGVjb2RlICYgc2Nh bGUgb3BlcmF0aW9ucyBkb25lIHBlciBpbWFnZS4KKworICAgICAgICBObyB0ZXN0IGFzIHRoaXMg anVzdCBhZGQgdHJhY2luZyBpbmZvcm1hdGlvbiBhbmQgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VEZWNvZGluZ1N0b3JlLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlRGVjb2RpbmdTdG9yZTo6cHJ1bmUpOgorICAgICAg ICAoV2ViQ29yZTo6SW1hZ2VEZWNvZGluZ1N0b3JlOjppbnNlcnRDYWNoZUludGVybmFsKToKKyAg ICAgICAgKFdlYkNvcmU6OkltYWdlRGVjb2RpbmdTdG9yZTo6cmVtb3ZlRnJvbUNhY2hlSW50ZXJu YWwpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlRnJhbWVHZW5l cmF0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VGcmFtZUdlbmVyYXRvcjo6SW1hZ2VG cmFtZUdlbmVyYXRvcik6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUZyYW1lR2VuZXJhdG9yOjpk ZWNvZGVBbmRTY2FsZSk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUZyYW1lR2VuZXJhdG9yOjp0 cnlUb1NjYWxlKToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlRnJhbWVHZW5lcmF0b3I6OnRyeVRv UmVzdW1lRGVjb2RlQW5kU2NhbGUpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VGcmFtZUdlbmVy YXRvcjo6dHJ5VG9EZWNvZGVBbmRTY2FsZSk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUZyYW1l R2VuZXJhdG9yOjpkZWNvZGUpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0ltYWdlRnJhbWVHZW5lcmF0b3IuaDoKKyAgICAgICAgKEltYWdlRnJhbWVHZW5lcmF0b3IpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xhenlEZWNvZGluZ1BpeGVsUmVm LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxhenlEZWNvZGluZ1BpeGVsUmVmOjpvbkxvY2tQaXhl bHMpOgorICAgICAgICAoV2ViQ29yZTo6TGF6eURlY29kaW5nUGl4ZWxSZWY6Om9uVW5sb2NrUGl4 ZWxzKToKKyAgICAgICAgKFdlYkNvcmU6OkxhenlEZWNvZGluZ1BpeGVsUmVmOjpQcmVwYXJlVG9E ZWNvZGUpOgorCiAyMDEzLTAzLTE3ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgogCiAgICAgICAgIEVuY2Fwc3VsYXRlIFBsYXRmb3JtTWVzc2FnZVBvcnRDaGFubmVsIGEgbGl0 dGxlIGJldHRlciB5ZXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL0ltYWdlRGVjb2RpbmdTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZURlY29kaW5nU3RvcmUuY3BwCmluZGV4IGZjOWJl YjIwMzcxNTZlNjVkZGM0YWFiNWRmMzQxNjcwNTkyODdlYzYuLjU5ZTY0NzVlOTFkZjc2ODQ0Njkw MzRkN2FjZTBmMDRiNWQ1ZTU4MTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlRGVjb2RpbmdTdG9yZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VEZWNvZGluZ1N0b3JlLmNwcApA QCAtMjksNiArMjksNyBAQAogI2luY2x1ZGUgIkltYWdlRnJhbWVHZW5lcmF0b3IuaCIKICNpbmNs dWRlICJTY2FsZWRJbWFnZUZyYWdtZW50LmgiCiAjaW5jbHVkZSAiU2hhcmVkQnVmZmVyLmgiCisj aW5jbHVkZSAiVHJhY2VFdmVudC5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTIzNSw2 ICsyMzYsOCBAQCB1bnNpZ25lZCBJbWFnZURlY29kaW5nU3RvcmU6OmNhY2hlRW50cmllcygpCiAK IHZvaWQgSW1hZ2VEZWNvZGluZ1N0b3JlOjpwcnVuZSgpCiB7CisgICAgVFJBQ0VfRVZFTlQwKCJ3 ZWJraXQiLCAiSW1hZ2VEZWNvZGluZ1N0b3JlOjpwcnVuZSIpOworCiAgICAgVmVjdG9yPE93blB0 cjxDYWNoZUVudHJ5PiA+IGNhY2hlRW50cmllc1RvRGVsZXRlOwogICAgIHsKICAgICAgICAgTXV0 ZXhMb2NrZXIgbG9jayhtX211dGV4KTsKQEAgLTI2MCw2ICsyNjMsNyBAQCB2b2lkIEltYWdlRGVj b2RpbmdTdG9yZTo6aW5zZXJ0Q2FjaGVJbnRlcm5hbChQYXNzT3duUHRyPENhY2hlRW50cnk+IGNh Y2hlRW50cnkpCiB7CiAgICAgaWYgKCFjYWNoZUVudHJ5LT5pc0Rpc2NhcmRhYmxlKCkpCiAgICAg ICAgIGluY3JlbWVudE1lbW9yeVVzYWdlKGNhY2hlRW50cnktPm1lbW9yeVVzYWdlSW5CeXRlcygp KTsKKyAgICBUUkFDRV9DT1VOVEVSMSgid2Via2l0IiwgIkltYWdlRGVjb2RpbmdTdG9yZU1lbW9y eVVzYWdlQnl0ZXMiLCBtX21lbW9yeVVzYWdlSW5CeXRlcyk7CiAKICAgICAvLyBtX29yZGVyZWRD YWNoZUxpc3QgaXMgdXNlZCB0byBzdXBwb3J0IExSVSBvcGVyYXRpb25zIHRvIHJlb3JkZXIgY2Fj aGUKICAgICAvLyBlbnRyaWVzIHF1aWNrbHkuCkBAIC0yNjksNiArMjczLDcgQEAgdm9pZCBJbWFn ZURlY29kaW5nU3RvcmU6Omluc2VydENhY2hlSW50ZXJuYWwoUGFzc093blB0cjxDYWNoZUVudHJ5 PiBjYWNoZUVudHJ5KQogICAgIC8vIG1fY2FjaGVNYXAgaXMgdXNlZCBmb3IgaW5kZXhpbmcgYW5k IHF1aWNrIGxvb2t1cCBvZiBhIGNhY2hlZCBpbWFnZS4gSXQgb3ducwogICAgIC8vIGFsbCBjYWNo ZSBlbnRyaWVzLgogICAgIG1fY2FjaGVNYXAuYWRkKGtleSwgY2FjaGVFbnRyeSk7CisgICAgVFJB Q0VfQ09VTlRFUjEoIndlYmtpdCIsICJJbWFnZURlY29kaW5nU3RvcmVOdW1PZkVudHJpZXMiLCBt X2NhY2hlTWFwLnNpemUoKSk7CiAKICAgICAvLyBtX2NhY2hlZFNpemVNYXAga2VlcHMgYWxsIHNj YWxlZCBzaXplcyBhc3NvY2lhdGVkIHdpdGggYW4gSW1hZ2VGcmFtZUdlbmVyYXRvci4KICAgICBD YWNoZWRTaXplTWFwOjpBZGRSZXN1bHQgcmVzdWx0ID0gbV9jYWNoZWRTaXplTWFwLmFkZChrZXku Zmlyc3QsIFNpemVTZXQoKSk7CkBAIC0yNzksMTAgKzI4NCwxMiBAQCB2b2lkIEltYWdlRGVjb2Rp bmdTdG9yZTo6cmVtb3ZlRnJvbUNhY2hlSW50ZXJuYWwoY29uc3QgQ2FjaGVFbnRyeSogY2FjaGVF bnRyeSwgVgogewogICAgIGlmICghY2FjaGVFbnRyeS0+aXNEaXNjYXJkYWJsZSgpKQogICAgICAg ICBkZWNyZW1lbnRNZW1vcnlVc2FnZShjYWNoZUVudHJ5LT5tZW1vcnlVc2FnZUluQnl0ZXMoKSk7 CisgICAgVFJBQ0VfQ09VTlRFUjEoIndlYmtpdCIsICJJbWFnZURlY29kaW5nU3RvcmVNZW1vcnlV c2FnZUJ5dGVzIiwgbV9tZW1vcnlVc2FnZUluQnl0ZXMpOwogCiAgICAgLy8gUmVtb3ZlIGZyb20g bV9jYWNoZU1hcC4KICAgICBDYWNoZUlkZW50aWZpZXIga2V5ID0gY2FjaGVFbnRyeS0+Y2FjaGVL ZXkoKTsKICAgICBkZWxldGlvbkxpc3QtPmFwcGVuZChtX2NhY2hlTWFwLnRha2Uoa2V5KSk7Cisg ICAgVFJBQ0VfQ09VTlRFUjEoIndlYmtpdCIsICJJbWFnZURlY29kaW5nU3RvcmVOdW1PZkVudHJp ZXMiLCBtX2NhY2hlTWFwLnNpemUoKSk7CiAKICAgICAvLyBSZW1vdmUgZnJvbSBtX2NhY2hlZFNp emVNYXAuCiAgICAgQ2FjaGVkU2l6ZU1hcDo6aXRlcmF0b3IgaXRlciA9IG1fY2FjaGVkU2l6ZU1h cC5maW5kKGtleS5maXJzdCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9JbWFnZUZyYW1lR2VuZXJhdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlRnJhbWVHZW5lcmF0b3IuY3BwCmluZGV4 IDRkZDUyMTVkMGQ2MWQ2NTMyMzZhODNmZDUyNmJkYWM1OTE3ZTM2Y2QuLjFmZDc0MWY2YTZiZDc3 NjUyMzAzMzhlNTdhMjY3ZWI0OWRiZTYxZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlRnJhbWVHZW5lcmF0b3IuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlRnJhbWVHZW5lcmF0 b3IuY3BwCkBAIC0zMSw2ICszMSw3IEBACiAjaW5jbHVkZSAiSW1hZ2VEZWNvZGluZ1N0b3JlLmgi CiAjaW5jbHVkZSAiU2NhbGVkSW1hZ2VGcmFnbWVudC5oIgogI2luY2x1ZGUgIlNoYXJlZEJ1ZmZl ci5oIgorI2luY2x1ZGUgIlRyYWNlRXZlbnQuaCIKIAogI2luY2x1ZGUgInNraWEvZXh0L2ltYWdl X29wZXJhdGlvbnMuaCIKIApAQCAtNDksNiArNTAsNyBAQCBJbWFnZUZyYW1lR2VuZXJhdG9yOjpJ bWFnZUZyYW1lR2VuZXJhdG9yKGNvbnN0IFNrSVNpemUmIGZ1bGxTaXplLCBQYXNzUmVmUHRyPFNo YQogICAgIDogbV9mdWxsU2l6ZShmdWxsU2l6ZSkKICAgICAsIG1fZGVjb2RlRmFpbGVkQW5kRW1w dHkoZmFsc2UpCiAgICAgLCBtX2hhc0FscGhhKHRydWUpCisgICAgLCBtX2RlY29kZUNvdW50KDAp CiB7CiAgICAgc2V0RGF0YShkYXRhLmdldCgpLCBhbGxEYXRhUmVjZWl2ZWQpOwogfQpAQCAtODEs NiArODMsNyBAQCBjb25zdCBTY2FsZWRJbWFnZUZyYWdtZW50KiBJbWFnZUZyYW1lR2VuZXJhdG9y OjpkZWNvZGVBbmRTY2FsZShjb25zdCBTa0lTaXplJiBzYwogICAgIGlmIChjYWNoZWRJbWFnZSkK ICAgICAgICAgcmV0dXJuIGNhY2hlZEltYWdlOwogCisgICAgVFJBQ0VfRVZFTlQyKCJ3ZWJraXQi LCAiSW1hZ2VGcmFtZUdlbmVyYXRvcjo6ZGVjb2RlQW5kU2NhbGUiLCAiZ2VuZXJhdG9yIiwgdGhp cywgImRlY29kZUNvdW50IiwgKyttX2RlY29kZUNvdW50KTsKICAgICBjYWNoZWRJbWFnZSA9IHRy eVRvU2NhbGUoMCwgc2NhbGVkU2l6ZSk7CiAgICAgaWYgKGNhY2hlZEltYWdlKQogICAgICAgICBy ZXR1cm4gY2FjaGVkSW1hZ2U7CkBAIC0xMDUsNiArMTA4LDggQEAgY29uc3QgU2NhbGVkSW1hZ2VG cmFnbWVudCogSW1hZ2VGcmFtZUdlbmVyYXRvcjo6dHJ5VG9Mb2NrQ29tcGxldGVDYWNoZShjb25z dCBTa0kKIAogY29uc3QgU2NhbGVkSW1hZ2VGcmFnbWVudCogSW1hZ2VGcmFtZUdlbmVyYXRvcjo6 dHJ5VG9TY2FsZShjb25zdCBTY2FsZWRJbWFnZUZyYWdtZW50KiBmdWxsU2l6ZUltYWdlLCBjb25z dCBTa0lTaXplJiBzY2FsZWRTaXplKQogeworICAgIFRSQUNFX0VWRU5UMCgid2Via2l0IiwgIklt YWdlRnJhbWVHZW5lcmF0b3I6OnRyeVRvU2NhbGUiKTsKKwogICAgIC8vIElmIHRoZSByZXF1ZXN0 ZWQgc2NhbGVkIHNpemUgaXMgdGhlIHNhbWUgYXMgdGhlIGZ1bGwgc2l6ZSB0aGVuIGV4aXQKICAg ICAvLyBlYXJseS4gVGhpcyBzYXZlcyBhIGNhY2hlIGxvb2t1cC4KICAgICBpZiAoc2NhbGVkU2l6 ZSA9PSBtX2Z1bGxTaXplKQpAQCAtMTM1LDYgKzE0MCw4IEBAIGNvbnN0IFNjYWxlZEltYWdlRnJh Z21lbnQqIEltYWdlRnJhbWVHZW5lcmF0b3I6OnRyeVRvU2NhbGUoY29uc3QgU2NhbGVkSW1hZ2VG cmFnCiAKIGNvbnN0IFNjYWxlZEltYWdlRnJhZ21lbnQqIEltYWdlRnJhbWVHZW5lcmF0b3I6OnRy eVRvUmVzdW1lRGVjb2RlQW5kU2NhbGUoY29uc3QgU2tJU2l6ZSYgc2NhbGVkU2l6ZSkKIHsKKyAg ICBUUkFDRV9FVkVOVDAoIndlYmtpdCIsICJJbWFnZUZyYW1lR2VuZXJhdG9yOjp0cnlUb1Jlc3Vt ZURlY29kZUFuZFNjYWxlIik7CisKICAgICBjb25zdCBTY2FsZWRJbWFnZUZyYWdtZW50KiBjYWNo ZWRJbWFnZSA9IDA7CiAgICAgSW1hZ2VEZWNvZGVyKiBjYWNoZWREZWNvZGVyID0gMDsKICAgICBp ZiAoIUltYWdlRGVjb2RpbmdTdG9yZTo6aW5zdGFuY2UoKS0+bG9ja0NhY2hlKHRoaXMsIG1fZnVs bFNpemUsIEltYWdlRGVjb2RpbmdTdG9yZTo6Q2FjaGVDYW5CZUluY29tcGxldGUsICZjYWNoZWRJ bWFnZSwgJmNhY2hlZERlY29kZXIpKQpAQCAtMTY2LDYgKzE3Myw4IEBAIGNvbnN0IFNjYWxlZElt YWdlRnJhZ21lbnQqIEltYWdlRnJhbWVHZW5lcmF0b3I6OnRyeVRvUmVzdW1lRGVjb2RlQW5kU2Nh bGUoY29uc3QKIAogY29uc3QgU2NhbGVkSW1hZ2VGcmFnbWVudCogSW1hZ2VGcmFtZUdlbmVyYXRv cjo6dHJ5VG9EZWNvZGVBbmRTY2FsZShjb25zdCBTa0lTaXplJiBzY2FsZWRTaXplKQogeworICAg IFRSQUNFX0VWRU5UMCgid2Via2l0IiwgIkltYWdlRnJhbWVHZW5lcmF0b3I6OnRyeVRvRGVjb2Rl QW5kU2NhbGUiKTsKKwogICAgIEltYWdlRGVjb2RlciogZGVjb2RlciA9IDA7CiAgICAgT3duUHRy PFNjYWxlZEltYWdlRnJhZ21lbnQ+IGZ1bGxTaXplSW1hZ2UgPSBkZWNvZGUoJmRlY29kZXIpOwog CkBAIC0xOTUsNiArMjA0LDggQEAgY29uc3QgU2NhbGVkSW1hZ2VGcmFnbWVudCogSW1hZ2VGcmFt ZUdlbmVyYXRvcjo6dHJ5VG9EZWNvZGVBbmRTY2FsZShjb25zdCBTa0lTaXoKIAogUGFzc093blB0 cjxTY2FsZWRJbWFnZUZyYWdtZW50PiBJbWFnZUZyYW1lR2VuZXJhdG9yOjpkZWNvZGUoSW1hZ2VE ZWNvZGVyKiogZGVjb2RlcikKIHsKKyAgICBUUkFDRV9FVkVOVDIoIndlYmtpdCIsICJJbWFnZUZy YW1lR2VuZXJhdG9yOjpkZWNvZGUiLCAid2lkdGgiLCBtX2Z1bGxTaXplLndpZHRoKCksICJoZWln aHQiLCBtX2Z1bGxTaXplLmhlaWdodCgpKTsKKwogICAgIEFTU0VSVChkZWNvZGVyKTsKICAgICBT aGFyZWRCdWZmZXIqIGRhdGEgPSAwOwogICAgIGJvb2wgYWxsRGF0YVJlY2VpdmVkID0gZmFsc2U7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9J bWFnZUZyYW1lR2VuZXJhdG9yLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j aHJvbWl1bS9JbWFnZUZyYW1lR2VuZXJhdG9yLmgKaW5kZXggMzQzZTdiNTFlYzZkNDBiMGM3YTBh MTU4NmM2ODk2NmRiYjQxMGI3My4uYjRlNDE5Zjc0NWM1MDVkOWQ5M2FjYTY0NGEwMzRmNTk2ZDA3 NmQyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vSW1hZ2VGcmFtZUdlbmVyYXRvci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2Nocm9taXVtL0ltYWdlRnJhbWVHZW5lcmF0b3IuaApAQCAtODMsNiArODMsNyBAQCBw cml2YXRlOgogICAgIFRocmVhZFNhZmVEYXRhVHJhbnNwb3J0IG1fZGF0YTsKICAgICBib29sIG1f ZGVjb2RlRmFpbGVkQW5kRW1wdHk7CiAgICAgYm9vbCBtX2hhc0FscGhhOworICAgIGludCBtX2Rl Y29kZUNvdW50OwogICAgIERpc2NhcmRhYmxlUGl4ZWxSZWZBbGxvY2F0b3IgbV9hbGxvY2F0b3I7 CiAKICAgICBPd25QdHI8SW1hZ2VEZWNvZGVyRmFjdG9yeT4gbV9pbWFnZURlY29kZXJGYWN0b3J5 OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v TGF6eURlY29kaW5nUGl4ZWxSZWYuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vTGF6eURlY29kaW5nUGl4ZWxSZWYuY3BwCmluZGV4IDAwMjU4YzYyMTQ1ZjE2 ZDI0NWI1NThmNzQyYjUyZjg2Y2RiZTgzYWQuLmFlYzZiZGIyZGQxODRkYTRjZGI1ZDA2ZjhlZGMy ZmRiOGY3NmE5OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL0xhenlEZWNvZGluZ1BpeGVsUmVmLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9MYXp5RGVjb2RpbmdQaXhlbFJlZi5jcHAKQEAgLTI5 LDYgKzI5LDcgQEAKICNpbmNsdWRlICJJbWFnZURlY29kZXIuaCIKICNpbmNsdWRlICJJbWFnZURl Y29kaW5nU3RvcmUuaCIKICNpbmNsdWRlICJJbWFnZUZyYW1lR2VuZXJhdG9yLmgiCisjaW5jbHVk ZSAiVHJhY2VFdmVudC5oIgogI2luY2x1ZGUgPHd0Zi9NYWluVGhyZWFkLmg+CiAKIG5hbWVzcGFj ZSBXZWJDb3JlIHsKQEAgLTU3LDYgKzU4LDggQEAgYm9vbCBMYXp5RGVjb2RpbmdQaXhlbFJlZjo6 aXNDbGlwcGVkKCkgY29uc3QKIAogdm9pZCogTGF6eURlY29kaW5nUGl4ZWxSZWY6Om9uTG9ja1Bp eGVscyhTa0NvbG9yVGFibGUqKikKIHsKKyAgICBUUkFDRV9FVkVOVF9BU1lOQ19CRUdJTjAoIndl YmtpdCIsICJMYXp5RGVjb2RpbmdQaXhlbFJlZjo6bG9ja1BpeGVscyIsIHRoaXMpOworCiAgICAg bV9tdXRleC5sb2NrKCk7CiAgICAgQVNTRVJUKCFtX2xvY2tlZENhY2hlZEltYWdlKTsKIApAQCAt ODMsNiArODYsOCBAQCB2b2lkIExhenlEZWNvZGluZ1BpeGVsUmVmOjpvblVubG9ja1BpeGVscygp CiAgICAgICAgIG1fbG9ja2VkQ2FjaGVkSW1hZ2UgPSAwOwogICAgIH0KICAgICBtX211dGV4LnVu bG9jaygpOworCisgICAgVFJBQ0VfRVZFTlRfQVNZTkNfRU5EMCgid2Via2l0IiwgIkxhenlEZWNv ZGluZ1BpeGVsUmVmOjpsb2NrUGl4ZWxzIiwgdGhpcyk7CiB9CiAKIGJvb2wgTGF6eURlY29kaW5n UGl4ZWxSZWY6Om9uTG9ja1BpeGVsc0FyZVdyaXRhYmxlKCkgY29uc3QKQEAgLTkyLDYgKzk3LDgg QEAgYm9vbCBMYXp5RGVjb2RpbmdQaXhlbFJlZjo6b25Mb2NrUGl4ZWxzQXJlV3JpdGFibGUoKSBj b25zdAogCiBib29sIExhenlEZWNvZGluZ1BpeGVsUmVmOjpQcmVwYXJlVG9EZWNvZGUoY29uc3Qg TGF6eVBpeGVsUmVmOjpQcmVwYXJlUGFyYW1zJiBwYXJhbXMpCiB7CisgICAgVFJBQ0VfRVZFTlQw KCJ3ZWJraXQiLCAiTGF6eURlY29kaW5nUGl4ZWxSZWY6OlByZXBhcmVUb0RlY29kZSIpOworCiAg ICAgLy8gVE9ETzogY2hlY2sgaWYgb25seSBhIHBhcnRpY3VsYXIgcmVjdCBpcyBhdmFpbGFibGUg aW4gaW1hZ2UgY2FjaGUuCiAgICAgVU5VU0VEX1BBUkFNKHBhcmFtcyk7CiAgICAgY29uc3QgU2Nh bGVkSW1hZ2VGcmFnbWVudCogY2FjaGVkSW1hZ2UgPSAwOwo= 193717 2013-03-18 19:43:19 -0700 2013-03-18 20:53:16 -0700 Patch bug-112648-20130318193910.patch text/plain 9442 hclam U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ2MDMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDdkODdlMDMwMTA5Njg0 ODU5MGY1ODllY2ZkMmMxZGEzZmM3ZDIxOS4uMzg4MjJlMjQ5Y2RlNzgwYmViNGE0MzdjZDk1OGRi NzUyNGZmNTQ0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDEzLTAzLTE4ICBBbHBo YSBMYW0gIDxoY2xhbUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBNb3JlIHRy YWNpbmcgaW4gZGVmZXJyZWQgaW1hZ2UgZGVjb2RpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExMjY0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZGluZyBtb3JlIHRyYWNlIGV2ZW50cyBmb3IgYSBj b3VwbGUgdGhpbmdzIGluIGRlZmVycmVkIGltYWdlIGRlY29kaW5nIHBhdGg6CisgICAgICAgIC0g VGltZSBzcGFuIGZvciBlYWNoIGxvY2sgcGl4ZWxzIG9mIFNrUGl4ZWxSZWYuCisgICAgICAgIC0g VGltZSBzcGVudCBvbiBkZWNvZGluZywgc2NhbGluZyBhbmQgcHJ1bmluZy4gQWxzbyB0aGUgc3Rh Y2sgdHJhY2UgZm9yIHRoZXNlIGV2ZW50cy4KKyAgICAgICAgLSBNZW1vcnkgdXNhZ2UgYW5kIG51 bWJlciBvZiBjYWNoZWQgZW50cmllcy4KKyAgICAgICAgLSBOdW1iZXIgb2YgZGVjb2RlICYgc2Nh bGUgb3BlcmF0aW9ucyBkb25lIHBlciBpbWFnZS4KKworICAgICAgICBObyB0ZXN0IGFzIHRoaXMg anVzdCBhZGQgdHJhY2luZyBpbmZvcm1hdGlvbiBhbmQgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VEZWNvZGluZ1N0b3JlLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlRGVjb2RpbmdTdG9yZTo6cHJ1bmUpOgorICAgICAg ICAoV2ViQ29yZTo6SW1hZ2VEZWNvZGluZ1N0b3JlOjppbnNlcnRDYWNoZUludGVybmFsKToKKyAg ICAgICAgKFdlYkNvcmU6OkltYWdlRGVjb2RpbmdTdG9yZTo6cmVtb3ZlRnJvbUNhY2hlSW50ZXJu YWwpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlRnJhbWVHZW5l cmF0b3IuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VGcmFtZUdlbmVyYXRvcjo6SW1hZ2VG cmFtZUdlbmVyYXRvcik6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUZyYW1lR2VuZXJhdG9yOjpk ZWNvZGVBbmRTY2FsZSk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUZyYW1lR2VuZXJhdG9yOjp0 cnlUb1NjYWxlKToKKyAgICAgICAgKFdlYkNvcmU6OkltYWdlRnJhbWVHZW5lcmF0b3I6OnRyeVRv UmVzdW1lRGVjb2RlQW5kU2NhbGUpOgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VGcmFtZUdlbmVy YXRvcjo6dHJ5VG9EZWNvZGVBbmRTY2FsZSk6CisgICAgICAgIChXZWJDb3JlOjpJbWFnZUZyYW1l R2VuZXJhdG9yOjpkZWNvZGUpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0ltYWdlRnJhbWVHZW5lcmF0b3IuaDoKKyAgICAgICAgKEltYWdlRnJhbWVHZW5lcmF0b3IpOgor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xhenlEZWNvZGluZ1BpeGVsUmVm LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxhenlEZWNvZGluZ1BpeGVsUmVmOjpvbkxvY2tQaXhl bHMpOgorICAgICAgICAoV2ViQ29yZTo6TGF6eURlY29kaW5nUGl4ZWxSZWY6Om9uVW5sb2NrUGl4 ZWxzKToKKyAgICAgICAgKFdlYkNvcmU6OkxhenlEZWNvZGluZ1BpeGVsUmVmOjpQcmVwYXJlVG9E ZWNvZGUpOgorCiAyMDEzLTAzLTE3ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29t PgogCiAgICAgICAgIEVuY2Fwc3VsYXRlIFBsYXRmb3JtTWVzc2FnZVBvcnRDaGFubmVsIGEgbGl0 dGxlIGJldHRlciB5ZXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2Nocm9taXVtL0ltYWdlRGVjb2RpbmdTdG9yZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9JbWFnZURlY29kaW5nU3RvcmUuY3BwCmluZGV4IGZjOWJl YjIwMzcxNTZlNjVkZGM0YWFiNWRmMzQxNjcwNTkyODdlYzYuLjU5ZTY0NzVlOTFkZjc2ODQ0Njkw MzRkN2FjZTBmMDRiNWQ1ZTU4MTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlRGVjb2RpbmdTdG9yZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VEZWNvZGluZ1N0b3JlLmNwcApA QCAtMjksNiArMjksNyBAQAogI2luY2x1ZGUgIkltYWdlRnJhbWVHZW5lcmF0b3IuaCIKICNpbmNs dWRlICJTY2FsZWRJbWFnZUZyYWdtZW50LmgiCiAjaW5jbHVkZSAiU2hhcmVkQnVmZmVyLmgiCisj aW5jbHVkZSAiVHJhY2VFdmVudC5oIgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKQEAgLTIzNSw2 ICsyMzYsOCBAQCB1bnNpZ25lZCBJbWFnZURlY29kaW5nU3RvcmU6OmNhY2hlRW50cmllcygpCiAK IHZvaWQgSW1hZ2VEZWNvZGluZ1N0b3JlOjpwcnVuZSgpCiB7CisgICAgVFJBQ0VfRVZFTlQwKCJ3 ZWJraXQiLCAiSW1hZ2VEZWNvZGluZ1N0b3JlOjpwcnVuZSIpOworCiAgICAgVmVjdG9yPE93blB0 cjxDYWNoZUVudHJ5PiA+IGNhY2hlRW50cmllc1RvRGVsZXRlOwogICAgIHsKICAgICAgICAgTXV0 ZXhMb2NrZXIgbG9jayhtX211dGV4KTsKQEAgLTI2MCw2ICsyNjMsNyBAQCB2b2lkIEltYWdlRGVj b2RpbmdTdG9yZTo6aW5zZXJ0Q2FjaGVJbnRlcm5hbChQYXNzT3duUHRyPENhY2hlRW50cnk+IGNh Y2hlRW50cnkpCiB7CiAgICAgaWYgKCFjYWNoZUVudHJ5LT5pc0Rpc2NhcmRhYmxlKCkpCiAgICAg ICAgIGluY3JlbWVudE1lbW9yeVVzYWdlKGNhY2hlRW50cnktPm1lbW9yeVVzYWdlSW5CeXRlcygp KTsKKyAgICBUUkFDRV9DT1VOVEVSMSgid2Via2l0IiwgIkltYWdlRGVjb2RpbmdTdG9yZU1lbW9y eVVzYWdlQnl0ZXMiLCBtX21lbW9yeVVzYWdlSW5CeXRlcyk7CiAKICAgICAvLyBtX29yZGVyZWRD YWNoZUxpc3QgaXMgdXNlZCB0byBzdXBwb3J0IExSVSBvcGVyYXRpb25zIHRvIHJlb3JkZXIgY2Fj aGUKICAgICAvLyBlbnRyaWVzIHF1aWNrbHkuCkBAIC0yNjksNiArMjczLDcgQEAgdm9pZCBJbWFn ZURlY29kaW5nU3RvcmU6Omluc2VydENhY2hlSW50ZXJuYWwoUGFzc093blB0cjxDYWNoZUVudHJ5 PiBjYWNoZUVudHJ5KQogICAgIC8vIG1fY2FjaGVNYXAgaXMgdXNlZCBmb3IgaW5kZXhpbmcgYW5k IHF1aWNrIGxvb2t1cCBvZiBhIGNhY2hlZCBpbWFnZS4gSXQgb3ducwogICAgIC8vIGFsbCBjYWNo ZSBlbnRyaWVzLgogICAgIG1fY2FjaGVNYXAuYWRkKGtleSwgY2FjaGVFbnRyeSk7CisgICAgVFJB Q0VfQ09VTlRFUjEoIndlYmtpdCIsICJJbWFnZURlY29kaW5nU3RvcmVOdW1PZkVudHJpZXMiLCBt X2NhY2hlTWFwLnNpemUoKSk7CiAKICAgICAvLyBtX2NhY2hlZFNpemVNYXAga2VlcHMgYWxsIHNj YWxlZCBzaXplcyBhc3NvY2lhdGVkIHdpdGggYW4gSW1hZ2VGcmFtZUdlbmVyYXRvci4KICAgICBD YWNoZWRTaXplTWFwOjpBZGRSZXN1bHQgcmVzdWx0ID0gbV9jYWNoZWRTaXplTWFwLmFkZChrZXku Zmlyc3QsIFNpemVTZXQoKSk7CkBAIC0yNzksMTAgKzI4NCwxMiBAQCB2b2lkIEltYWdlRGVjb2Rp bmdTdG9yZTo6cmVtb3ZlRnJvbUNhY2hlSW50ZXJuYWwoY29uc3QgQ2FjaGVFbnRyeSogY2FjaGVF bnRyeSwgVgogewogICAgIGlmICghY2FjaGVFbnRyeS0+aXNEaXNjYXJkYWJsZSgpKQogICAgICAg ICBkZWNyZW1lbnRNZW1vcnlVc2FnZShjYWNoZUVudHJ5LT5tZW1vcnlVc2FnZUluQnl0ZXMoKSk7 CisgICAgVFJBQ0VfQ09VTlRFUjEoIndlYmtpdCIsICJJbWFnZURlY29kaW5nU3RvcmVNZW1vcnlV c2FnZUJ5dGVzIiwgbV9tZW1vcnlVc2FnZUluQnl0ZXMpOwogCiAgICAgLy8gUmVtb3ZlIGZyb20g bV9jYWNoZU1hcC4KICAgICBDYWNoZUlkZW50aWZpZXIga2V5ID0gY2FjaGVFbnRyeS0+Y2FjaGVL ZXkoKTsKICAgICBkZWxldGlvbkxpc3QtPmFwcGVuZChtX2NhY2hlTWFwLnRha2Uoa2V5KSk7Cisg ICAgVFJBQ0VfQ09VTlRFUjEoIndlYmtpdCIsICJJbWFnZURlY29kaW5nU3RvcmVOdW1PZkVudHJp ZXMiLCBtX2NhY2hlTWFwLnNpemUoKSk7CiAKICAgICAvLyBSZW1vdmUgZnJvbSBtX2NhY2hlZFNp emVNYXAuCiAgICAgQ2FjaGVkU2l6ZU1hcDo6aXRlcmF0b3IgaXRlciA9IG1fY2FjaGVkU2l6ZU1h cC5maW5kKGtleS5maXJzdCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9JbWFnZUZyYW1lR2VuZXJhdG9yLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlRnJhbWVHZW5lcmF0b3IuY3BwCmluZGV4 IDRkZDUyMTVkMGQ2MWQ2NTMyMzZhODNmZDUyNmJkYWM1OTE3ZTM2Y2QuLjg0MjFiMzMxNjMyODQ1 NzE3YmQ2MDZkOGMxMmNkMmJhMjg5YjQ1ZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlRnJhbWVHZW5lcmF0b3IuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0ltYWdlRnJhbWVHZW5lcmF0 b3IuY3BwCkBAIC0zMSw2ICszMSw3IEBACiAjaW5jbHVkZSAiSW1hZ2VEZWNvZGluZ1N0b3JlLmgi CiAjaW5jbHVkZSAiU2NhbGVkSW1hZ2VGcmFnbWVudC5oIgogI2luY2x1ZGUgIlNoYXJlZEJ1ZmZl ci5oIgorI2luY2x1ZGUgIlRyYWNlRXZlbnQuaCIKIAogI2luY2x1ZGUgInNraWEvZXh0L2ltYWdl X29wZXJhdGlvbnMuaCIKIApAQCAtNDksNiArNTAsNyBAQCBJbWFnZUZyYW1lR2VuZXJhdG9yOjpJ bWFnZUZyYW1lR2VuZXJhdG9yKGNvbnN0IFNrSVNpemUmIGZ1bGxTaXplLCBQYXNzUmVmUHRyPFNo YQogICAgIDogbV9mdWxsU2l6ZShmdWxsU2l6ZSkKICAgICAsIG1fZGVjb2RlRmFpbGVkQW5kRW1w dHkoZmFsc2UpCiAgICAgLCBtX2hhc0FscGhhKHRydWUpCisgICAgLCBtX2RlY29kZUNvdW50KDAp CiB7CiAgICAgc2V0RGF0YShkYXRhLmdldCgpLCBhbGxEYXRhUmVjZWl2ZWQpOwogfQpAQCAtODEs NiArODMsOCBAQCBjb25zdCBTY2FsZWRJbWFnZUZyYWdtZW50KiBJbWFnZUZyYW1lR2VuZXJhdG9y OjpkZWNvZGVBbmRTY2FsZShjb25zdCBTa0lTaXplJiBzYwogICAgIGlmIChjYWNoZWRJbWFnZSkK ICAgICAgICAgcmV0dXJuIGNhY2hlZEltYWdlOwogCisgICAgVFJBQ0VfRVZFTlQyKCJ3ZWJraXQi LCAiSW1hZ2VGcmFtZUdlbmVyYXRvcjo6ZGVjb2RlQW5kU2NhbGUiLCAiZ2VuZXJhdG9yIiwgdGhp cywgImRlY29kZUNvdW50IiwgKyttX2RlY29kZUNvdW50KTsKKwogICAgIGNhY2hlZEltYWdlID0g dHJ5VG9TY2FsZSgwLCBzY2FsZWRTaXplKTsKICAgICBpZiAoY2FjaGVkSW1hZ2UpCiAgICAgICAg IHJldHVybiBjYWNoZWRJbWFnZTsKQEAgLTEwNSw2ICsxMDksOCBAQCBjb25zdCBTY2FsZWRJbWFn ZUZyYWdtZW50KiBJbWFnZUZyYW1lR2VuZXJhdG9yOjp0cnlUb0xvY2tDb21wbGV0ZUNhY2hlKGNv bnN0IFNrSQogCiBjb25zdCBTY2FsZWRJbWFnZUZyYWdtZW50KiBJbWFnZUZyYW1lR2VuZXJhdG9y Ojp0cnlUb1NjYWxlKGNvbnN0IFNjYWxlZEltYWdlRnJhZ21lbnQqIGZ1bGxTaXplSW1hZ2UsIGNv bnN0IFNrSVNpemUmIHNjYWxlZFNpemUpCiB7CisgICAgVFJBQ0VfRVZFTlQwKCJ3ZWJraXQiLCAi SW1hZ2VGcmFtZUdlbmVyYXRvcjo6dHJ5VG9TY2FsZSIpOworCiAgICAgLy8gSWYgdGhlIHJlcXVl c3RlZCBzY2FsZWQgc2l6ZSBpcyB0aGUgc2FtZSBhcyB0aGUgZnVsbCBzaXplIHRoZW4gZXhpdAog ICAgIC8vIGVhcmx5LiBUaGlzIHNhdmVzIGEgY2FjaGUgbG9va3VwLgogICAgIGlmIChzY2FsZWRT aXplID09IG1fZnVsbFNpemUpCkBAIC0xMzUsNiArMTQxLDggQEAgY29uc3QgU2NhbGVkSW1hZ2VG cmFnbWVudCogSW1hZ2VGcmFtZUdlbmVyYXRvcjo6dHJ5VG9TY2FsZShjb25zdCBTY2FsZWRJbWFn ZUZyYWcKIAogY29uc3QgU2NhbGVkSW1hZ2VGcmFnbWVudCogSW1hZ2VGcmFtZUdlbmVyYXRvcjo6 dHJ5VG9SZXN1bWVEZWNvZGVBbmRTY2FsZShjb25zdCBTa0lTaXplJiBzY2FsZWRTaXplKQogewor ICAgIFRSQUNFX0VWRU5UMCgid2Via2l0IiwgIkltYWdlRnJhbWVHZW5lcmF0b3I6OnRyeVRvUmVz dW1lRGVjb2RlQW5kU2NhbGUiKTsKKwogICAgIGNvbnN0IFNjYWxlZEltYWdlRnJhZ21lbnQqIGNh Y2hlZEltYWdlID0gMDsKICAgICBJbWFnZURlY29kZXIqIGNhY2hlZERlY29kZXIgPSAwOwogICAg IGlmICghSW1hZ2VEZWNvZGluZ1N0b3JlOjppbnN0YW5jZSgpLT5sb2NrQ2FjaGUodGhpcywgbV9m dWxsU2l6ZSwgSW1hZ2VEZWNvZGluZ1N0b3JlOjpDYWNoZUNhbkJlSW5jb21wbGV0ZSwgJmNhY2hl ZEltYWdlLCAmY2FjaGVkRGVjb2RlcikpCkBAIC0xNjYsNiArMTc0LDggQEAgY29uc3QgU2NhbGVk SW1hZ2VGcmFnbWVudCogSW1hZ2VGcmFtZUdlbmVyYXRvcjo6dHJ5VG9SZXN1bWVEZWNvZGVBbmRT Y2FsZShjb25zdAogCiBjb25zdCBTY2FsZWRJbWFnZUZyYWdtZW50KiBJbWFnZUZyYW1lR2VuZXJh dG9yOjp0cnlUb0RlY29kZUFuZFNjYWxlKGNvbnN0IFNrSVNpemUmIHNjYWxlZFNpemUpCiB7Cisg ICAgVFJBQ0VfRVZFTlQwKCJ3ZWJraXQiLCAiSW1hZ2VGcmFtZUdlbmVyYXRvcjo6dHJ5VG9EZWNv ZGVBbmRTY2FsZSIpOworCiAgICAgSW1hZ2VEZWNvZGVyKiBkZWNvZGVyID0gMDsKICAgICBPd25Q dHI8U2NhbGVkSW1hZ2VGcmFnbWVudD4gZnVsbFNpemVJbWFnZSA9IGRlY29kZSgmZGVjb2Rlcik7 CiAKQEAgLTE5NSw2ICsyMDUsOCBAQCBjb25zdCBTY2FsZWRJbWFnZUZyYWdtZW50KiBJbWFnZUZy YW1lR2VuZXJhdG9yOjp0cnlUb0RlY29kZUFuZFNjYWxlKGNvbnN0IFNrSVNpegogCiBQYXNzT3du UHRyPFNjYWxlZEltYWdlRnJhZ21lbnQ+IEltYWdlRnJhbWVHZW5lcmF0b3I6OmRlY29kZShJbWFn ZURlY29kZXIqKiBkZWNvZGVyKQogeworICAgIFRSQUNFX0VWRU5UMigid2Via2l0IiwgIkltYWdl RnJhbWVHZW5lcmF0b3I6OmRlY29kZSIsICJ3aWR0aCIsIG1fZnVsbFNpemUud2lkdGgoKSwgImhl aWdodCIsIG1fZnVsbFNpemUuaGVpZ2h0KCkpOworCiAgICAgQVNTRVJUKGRlY29kZXIpOwogICAg IFNoYXJlZEJ1ZmZlciogZGF0YSA9IDA7CiAgICAgYm9vbCBhbGxEYXRhUmVjZWl2ZWQgPSBmYWxz ZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L0ltYWdlRnJhbWVHZW5lcmF0b3IuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L2Nocm9taXVtL0ltYWdlRnJhbWVHZW5lcmF0b3IuaAppbmRleCAzNDNlN2I1MWVjNmQ0MGIwYzdh MGExNTg2YzY4OTY2ZGJiNDEwYjczLi5iNGU0MTlmNzQ1YzUwNWQ5ZDkzYWNhNjQ0YTAzNGY1OTZk MDc2ZDJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJv bWl1bS9JbWFnZUZyYW1lR2VuZXJhdG9yLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vSW1hZ2VGcmFtZUdlbmVyYXRvci5oCkBAIC04Myw2ICs4Myw3IEBA IHByaXZhdGU6CiAgICAgVGhyZWFkU2FmZURhdGFUcmFuc3BvcnQgbV9kYXRhOwogICAgIGJvb2wg bV9kZWNvZGVGYWlsZWRBbmRFbXB0eTsKICAgICBib29sIG1faGFzQWxwaGE7CisgICAgaW50IG1f ZGVjb2RlQ291bnQ7CiAgICAgRGlzY2FyZGFibGVQaXhlbFJlZkFsbG9jYXRvciBtX2FsbG9jYXRv cjsKIAogICAgIE93blB0cjxJbWFnZURlY29kZXJGYWN0b3J5PiBtX2ltYWdlRGVjb2RlckZhY3Rv cnk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9MYXp5RGVjb2RpbmdQaXhlbFJlZi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9MYXp5RGVjb2RpbmdQaXhlbFJlZi5jcHAKaW5kZXggMDAyNThjNjIxNDVm MTZkMjQ1YjU1OGY3NDJiNTJmODZjZGJlODNhZC4uYWVjNmJkYjJkZDE4NGRhNGNkYjVkMDZmOGVk YzJmZGI4Zjc2YTk5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vTGF6eURlY29kaW5nUGl4ZWxSZWYuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0xhenlEZWNvZGluZ1BpeGVsUmVmLmNwcApAQCAt MjksNiArMjksNyBAQAogI2luY2x1ZGUgIkltYWdlRGVjb2Rlci5oIgogI2luY2x1ZGUgIkltYWdl RGVjb2RpbmdTdG9yZS5oIgogI2luY2x1ZGUgIkltYWdlRnJhbWVHZW5lcmF0b3IuaCIKKyNpbmNs dWRlICJUcmFjZUV2ZW50LmgiCiAjaW5jbHVkZSA8d3RmL01haW5UaHJlYWQuaD4KIAogbmFtZXNw YWNlIFdlYkNvcmUgewpAQCAtNTcsNiArNTgsOCBAQCBib29sIExhenlEZWNvZGluZ1BpeGVsUmVm Ojppc0NsaXBwZWQoKSBjb25zdAogCiB2b2lkKiBMYXp5RGVjb2RpbmdQaXhlbFJlZjo6b25Mb2Nr UGl4ZWxzKFNrQ29sb3JUYWJsZSoqKQogeworICAgIFRSQUNFX0VWRU5UX0FTWU5DX0JFR0lOMCgi d2Via2l0IiwgIkxhenlEZWNvZGluZ1BpeGVsUmVmOjpsb2NrUGl4ZWxzIiwgdGhpcyk7CisKICAg ICBtX211dGV4LmxvY2soKTsKICAgICBBU1NFUlQoIW1fbG9ja2VkQ2FjaGVkSW1hZ2UpOwogCkBA IC04Myw2ICs4Niw4IEBAIHZvaWQgTGF6eURlY29kaW5nUGl4ZWxSZWY6Om9uVW5sb2NrUGl4ZWxz KCkKICAgICAgICAgbV9sb2NrZWRDYWNoZWRJbWFnZSA9IDA7CiAgICAgfQogICAgIG1fbXV0ZXgu dW5sb2NrKCk7CisKKyAgICBUUkFDRV9FVkVOVF9BU1lOQ19FTkQwKCJ3ZWJraXQiLCAiTGF6eURl Y29kaW5nUGl4ZWxSZWY6OmxvY2tQaXhlbHMiLCB0aGlzKTsKIH0KIAogYm9vbCBMYXp5RGVjb2Rp bmdQaXhlbFJlZjo6b25Mb2NrUGl4ZWxzQXJlV3JpdGFibGUoKSBjb25zdApAQCAtOTIsNiArOTcs OCBAQCBib29sIExhenlEZWNvZGluZ1BpeGVsUmVmOjpvbkxvY2tQaXhlbHNBcmVXcml0YWJsZSgp IGNvbnN0CiAKIGJvb2wgTGF6eURlY29kaW5nUGl4ZWxSZWY6OlByZXBhcmVUb0RlY29kZShjb25z dCBMYXp5UGl4ZWxSZWY6OlByZXBhcmVQYXJhbXMmIHBhcmFtcykKIHsKKyAgICBUUkFDRV9FVkVO VDAoIndlYmtpdCIsICJMYXp5RGVjb2RpbmdQaXhlbFJlZjo6UHJlcGFyZVRvRGVjb2RlIik7CisK ICAgICAvLyBUT0RPOiBjaGVjayBpZiBvbmx5IGEgcGFydGljdWxhciByZWN0IGlzIGF2YWlsYWJs ZSBpbiBpbWFnZSBjYWNoZS4KICAgICBVTlVTRURfUEFSQU0ocGFyYW1zKTsKICAgICBjb25zdCBT Y2FsZWRJbWFnZUZyYWdtZW50KiBjYWNoZWRJbWFnZSA9IDA7Cg==