96756 2012-09-14 04:55:53 -0700 Web Inspector: automatically detect if class has reportMemoryUsage method 2012-09-17 02:44:04 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 yurys yurys alph apavlov benjamin bweinstein dglazkov gustavo joepeck keishi loislo pfeldman philn pmuellr rik timothy webkit.review.bot xan.lopez yurys oldest_to_newest 720596 0 yurys 2012-09-14 04:55:53 -0700 Classes that support memory usage reporting should provide void reportMemoryUsage(MemoryObjectInfo*) const; method. If such method is present we should invoke it to collect memory usage data, otherwise we should just count sizeof the class. The method detection can be automated at compile time using using template trick called SFINAE(http://en.wikipedia.org/wiki/Substitution_failure_is_not_an_error). 720621 1 164114 yurys 2012-09-14 05:29:43 -0700 Created attachment 164114 Patch to run on test bots, not for revew 720626 2 webkit.review.bot 2012-09-14 05:32:07 -0700 Attachment 164114 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WTF/wtf/MemoryInstrumentation.h']" exit_code: 1 Source/WTF/wtf/MemoryInstrumentation.h:54: The parameter name "object" adds no information, so it should be removed. [readability/parameter_name] [5] Source/WTF/wtf/MemoryInstrumentation.h:54: The parameter name "memoryObjectInfo" adds no information, so it should be removed. [readability/parameter_name] [5] Total errors found: 2 in 1 files If any of these errors are false positives, please file a bug against check-webkit-style. 720835 3 164170 yurys 2012-09-14 09:36:11 -0700 Created attachment 164170 Patch 720870 4 164170 buildbot 2012-09-14 10:05:11 -0700 Comment on attachment 164170 Patch Attachment 164170 did not pass win-ews (win): Output: http://queues.webkit.org/results/13859240 721007 5 164202 loislo 2012-09-14 12:00:50 -0700 Created attachment 164202 Patch 721020 6 164202 buildbot 2012-09-14 12:13:32 -0700 Comment on attachment 164202 Patch Attachment 164202 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/13854532 721024 7 164202 webkit.review.bot 2012-09-14 12:20:17 -0700 Comment on attachment 164202 Patch Attachment 164202 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/13850644 721035 8 164202 webkit-ews 2012-09-14 12:38:23 -0700 Comment on attachment 164202 Patch Attachment 164202 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/13844784 721036 9 164202 gyuyoung.kim 2012-09-14 12:40:58 -0700 Comment on attachment 164202 Patch Attachment 164202 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/13858310 721040 10 164202 webkit-ews 2012-09-14 12:43:46 -0700 Comment on attachment 164202 Patch Attachment 164202 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/13854540 721046 11 164209 loislo 2012-09-14 12:47:44 -0700 Created attachment 164209 ups. Another patch for try bots with static keyword. 721072 12 164209 buildbot 2012-09-14 13:13:16 -0700 Comment on attachment 164209 ups. Another patch for try bots with static keyword. Attachment 164209 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/13845713 721421 13 164281 loislo 2012-09-15 04:41:55 -0700 Created attachment 164281 The patch for windows try bot. I can't reproduce the problem locally. 721423 14 164282 loislo 2012-09-15 04:58:23 -0700 Created attachment 164282 The patch for windows try bot. I can't reproduce the problem locally. Unused parameter was removed. 721696 15 164282 yurys 2012-09-16 23:22:40 -0700 Comment on attachment 164282 The patch for windows try bot. I can't reproduce the problem locally. Unused parameter was removed. View in context: https://bugs.webkit.org/attachment.cgi?id=164282&action=review > Source/WTF/wtf/MemoryInstrumentation.h:95 > + countNotInstrumentedObject(object, memoryObjectInfo); MemoryObjectInfo could be moved above MemoryInstrumentation in this header, then this method could be inlined. 721724 16 164350 loislo 2012-09-17 00:32:44 -0700 Created attachment 164350 comment addressed 721743 17 164350 apavlov 2012-09-17 01:15:41 -0700 Comment on attachment 164350 comment addressed View in context: https://bugs.webkit.org/attachment.cgi?id=164350&action=review > Source/WTF/ChangeLog:8 > + Implemeted automatic selector of the memory reporting method. If typo: Implemented > Source/WebKit/chromium/tests/MemoryInstrumentationTest.cpp:294 > +TEST(MemoryInstrumentationTest, detectReportMemoryUsageMethod) This test should either test both memory usage reporting methods or have a different name that implies only the capability of addMember() to reportMemoryUsage() (but not reportObjectInfo()) is tested. 721775 18 loislo 2012-09-17 02:44:04 -0700 Committed r128732: <http://trac.webkit.org/changeset/128732> 164114 2012-09-14 05:29:43 -0700 2012-09-14 09:36:00 -0700 Patch to run on test bots, not for revew autodetect-reportMemoryUsage.patch text/plain 3065 yurys ZGlmZiAtLWdpdCBhL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvbi5oIGIvU291 cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uLmgKaW5kZXggMDRjYThkMi4uYmQxNjU5 ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uLmgKKysr IGIvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uLmgKQEAgLTQ3LDYgKzQ3LDEy IEBAIGVudW0gTWVtb3J5T3duaW5nVHlwZSB7CiAgICAgYnlQb2ludGVyLAogICAgIGJ5UmVmZXJl bmNlCiB9OworIAordGVtcGxhdGU8dHlwZW5hbWUgVD4KK2NsYXNzIFJlcG9ydE1lbW9yeVVzYWdl VHJhaXRzIHsKK3B1YmxpYzoKKyAgICBzdGF0aWMgdm9pZCByZXBvcnRNZW1vcnlVc2FnZShjb25z dCBUKiBjb25zdCYgb2JqZWN0LCBNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvKTsK K307CiAKIGNsYXNzIE1lbW9yeUluc3RydW1lbnRhdGlvbiB7CiBwdWJsaWM6CkBAIC02Nyw2ICs3 MywxMiBAQCBwcm90ZWN0ZWQ6CiAgICAgICAgIHZpcnR1YWwgdm9pZCBwcm9jZXNzKE1lbW9yeUlu c3RydW1lbnRhdGlvbiopID0gMDsKICAgICB9OwogCisgICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4K KyAgICBzdGF0aWMgdm9pZCByZXBvcnRNZW1vcnlVc2FnZUltcGwoY29uc3QgVCogY29uc3QmIG9i amVjdCwgTWVtb3J5T2JqZWN0SW5mbyogbWVtb3J5T2JqZWN0SW5mbykKKyAgICB7CisgICAgICAg IHZpc2l0T2JqZWN0PFQsIHZvaWQgKFQ6OiopKE1lbW9yeU9iamVjdEluZm8qKSBjb25zdD4ob2Jq ZWN0LCBtZW1vcnlPYmplY3RJbmZvLCAwKTsKKyAgICB9CisKIHByaXZhdGU6CiAgICAgdmlydHVh bCB2b2lkIGNvdW50T2JqZWN0U2l6ZShNZW1vcnlPYmplY3RUeXBlLCBzaXplX3QpID0gMDsKICAg ICB2aXJ0dWFsIHZvaWQgZGVmZXJJbnN0cnVtZW50ZWRQb2ludGVyKFBhc3NPd25QdHI8SW5zdHJ1 bWVudGVkUG9pbnRlckJhc2U+KSA9IDA7CkBAIC03NCw2ICs4NiwyMCBAQCBwcml2YXRlOgogICAg IHZpcnR1YWwgdm9pZCBwcm9jZXNzRGVmZXJyZWRJbnN0cnVtZW50ZWRQb2ludGVycygpID0gMDsK IAogICAgIGZyaWVuZCBjbGFzcyBNZW1vcnlDbGFzc0luZm87CisgICAgdGVtcGxhdGU8dHlwZW5h bWUgVD4gZnJpZW5kIGNsYXNzIFJlcG9ydE1lbW9yeVVzYWdlVHJhaXRzOworCisgICAgdGVtcGxh dGU8dHlwZW5hbWUgVHlwZSwgVHlwZSBQdHI+IHN0cnVjdCBNZW1iZXJIZWxwZXJTdHJ1Y3Q7CisK KyAgICAvLyBJbXBsZW1lbnRhdGlvbiBmb3IgaW5zdHJ1bWVudGVkIGNsYXNzZXMuCisgICAgdGVt cGxhdGU8dHlwZW5hbWUgVCwgdHlwZW5hbWUgVHlwZT4gc3RhdGljIHZvaWQgdmlzaXRPYmplY3Qo Y29uc3QgVCogY29uc3QmIG9iamVjdCwgTWVtb3J5T2JqZWN0SW5mbyogbWVtb3J5T2JqZWN0SW5m bywgIE1lbWJlckhlbHBlclN0cnVjdDxUeXBlLCAmVDo6cmVwb3J0TWVtb3J5VXNhZ2U+KikKKyAg ICB7CisgICAgICAgIG9iamVjdC0+cmVwb3J0TWVtb3J5VXNhZ2UobWVtb3J5T2JqZWN0SW5mbyk7 CisgICAgfQorCisgICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQsIHR5cGVuYW1lIFR5cGU+IHN0YXRp YyB2b2lkIHZpc2l0T2JqZWN0KGNvbnN0IFQqIGNvbnN0JiBvYmplY3QsIE1lbW9yeU9iamVjdElu Zm8qIG1lbW9yeU9iamVjdEluZm8sIC4uLikKKyAgICB7CisgICAgICAgIE1lbW9yeUNsYXNzSW5m byBpbmZvKG1lbW9yeU9iamVjdEluZm8sIG9iamVjdCk7CisgICAgfQogCiAgICAgdGVtcGxhdGU8 dHlwZW5hbWUgVD4gY2xhc3MgSW5zdHJ1bWVudGVkUG9pbnRlciA6IHB1YmxpYyBJbnN0cnVtZW50 ZWRQb2ludGVyQmFzZSB7CiAgICAgcHVibGljOgpAQCAtMjExLDcgKzIzNyw3IEBAIHZvaWQgTWVt b3J5SW5zdHJ1bWVudGF0aW9uOjphZGRJbnN0cnVtZW50ZWRPYmplY3RJbXBsKGNvbnN0IFQqIGNv bnN0JiBvYmplY3QsIE1lCiB7CiAgICAgaWYgKG93bmluZ1R5cGUgPT0gYnlSZWZlcmVuY2UpIHsK ICAgICAgICAgTWVtb3J5T2JqZWN0SW5mbyBtZW1vcnlPYmplY3RJbmZvKHRoaXMsIG93bmVyT2Jq ZWN0VHlwZSk7Ci0gICAgICAgIG9iamVjdC0+cmVwb3J0TWVtb3J5VXNhZ2UoJm1lbW9yeU9iamVj dEluZm8pOworICAgICAgICBSZXBvcnRNZW1vcnlVc2FnZVRyYWl0czxUPjo6cmVwb3J0TWVtb3J5 VXNhZ2Uob2JqZWN0LCAmbWVtb3J5T2JqZWN0SW5mbyk7CiAgICAgfSBlbHNlIHsKICAgICAgICAg aWYgKCFvYmplY3QgfHwgdmlzaXRlZChvYmplY3QpKQogICAgICAgICAgICAgcmV0dXJuOwpAQCAt MzMzLDEwICszNTksMTYgQEAgdGVtcGxhdGU8dHlwZW5hbWUgVD4KIHZvaWQgTWVtb3J5SW5zdHJ1 bWVudGF0aW9uOjpJbnN0cnVtZW50ZWRQb2ludGVyPFQ+Ojpwcm9jZXNzKE1lbW9yeUluc3RydW1l bnRhdGlvbiogbWVtb3J5SW5zdHJ1bWVudGF0aW9uKQogewogICAgIE1lbW9yeU9iamVjdEluZm8g bWVtb3J5T2JqZWN0SW5mbyhtZW1vcnlJbnN0cnVtZW50YXRpb24sIG1fb3duZXJPYmplY3RUeXBl KTsKLSAgICBtX3BvaW50ZXItPnJlcG9ydE1lbW9yeVVzYWdlKCZtZW1vcnlPYmplY3RJbmZvKTsK KyAgICBSZXBvcnRNZW1vcnlVc2FnZVRyYWl0czxUPjo6cmVwb3J0TWVtb3J5VXNhZ2UobV9wb2lu dGVyLCAmbWVtb3J5T2JqZWN0SW5mbyk7CiAgICAgbWVtb3J5SW5zdHJ1bWVudGF0aW9uLT5jb3Vu dE9iamVjdFNpemUobWVtb3J5T2JqZWN0SW5mby5vYmplY3RUeXBlKCksIG1lbW9yeU9iamVjdElu Zm8ub2JqZWN0U2l6ZSgpKTsKIH0KIAordGVtcGxhdGU8dHlwZW5hbWUgVD4KK3ZvaWQgUmVwb3J0 TWVtb3J5VXNhZ2VUcmFpdHM8VD46OnJlcG9ydE1lbW9yeVVzYWdlKGNvbnN0IFQqIGNvbnN0JiBv YmplY3QsIE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8pCit7CisgICAgbWVtb3J5 T2JqZWN0SW5mby0+bWVtb3J5SW5zdHJ1bWVudGF0aW9uKCktPnJlcG9ydE1lbW9yeVVzYWdlSW1w bChvYmplY3QsIG1lbW9yeU9iamVjdEluZm8pOworfQorCiB9IC8vIG5hbWVzcGFjZSBXVEYKIAog I2VuZGlmIC8vICFkZWZpbmVkKE1lbW9yeUluc3RydW1lbnRhdGlvbl9oKQo= 164170 2012-09-14 09:36:11 -0700 2012-09-14 12:00:41 -0700 Patch bug-96756-20120914203542.patch text/plain 7328 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4NTg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDFmNmFmNmJiMDNmMWQ1NTBiNmI3ODIy N2E0ODc2ODI5NWQwOWExMTEuLjlhYWJmNGY4YjYyYTc3NzkyNDk1NDRhNWMzNzBhYmEzMTM4MmE2 NmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTItMDktMTQgIFl1cnkgU2VtaWtoYXRza3kgIDx5 dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYXV0b21hdGljYWxs eSBkZXRlY3QgaWYgY2xhc3MgaGFzIHJlcG9ydE1lbW9yeVVzYWdlIG1ldGhvZAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTY3NTYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1ldGVkIGF1dG9tYXRp YyBzZWxlY3RvciBvZiB0aGUgbWVtb3J5IHJlcG9ydGluZyBtZXRob2QuIElmCisgICAgICAgIGFu IG9iamVjdCBoYXMgcmVwb3J0TWVtb3J5VXNhZ2UgbWV0aG9kIHRoZW4gY2FsbCBpdC4gT3RoZXJ3 aXNlCisgICAgICAgIGNvdW50IG9ubHkgb2JqZWN0J3Mgc2VsZiBzaXplLiBBcyB0aGUgbmV4dCBz dGVwIHdlIHdpbGwgZGVsZXRlCisgICAgICAgIGFkZEluc3RydW1lbnRlZE1lbWJlciBhbmQgYWRk SW5zdHJ1bWVudGVkT2JqZWN0SW1wbCBhbmQgd2lsbAorICAgICAgICBoYXZlIG9ubHkgYWRkTWVt YmVyIGFuZCBhZGRPYmplY3RJbXBsIHRoYXQgd291bGQgYXV0b21hdGljYWxseQorICAgICAgICBj YWxsIHJlcG9ydE1lbW9yeVVzYWdlIGlmIGl0IGlzIHByZXNlbnQuCisKKyAgICAgICAgKiB3dGYv TWVtb3J5SW5zdHJ1bWVudGF0aW9uLmg6CisgICAgICAgIChXVEY6Ok1lbW9yeUluc3RydW1lbnRh dGlvbjo6c2VsZWN0SW5zdHJ1bWVudGF0aW9uTWV0aG9kKToKKyAgICAgICAgKE1lbW9yeUluc3Ry dW1lbnRhdGlvbik6CisgICAgICAgIChXVEY6Ok1lbW9yeUluc3RydW1lbnRhdGlvbjo6cmVwb3J0 T2JqZWN0TWVtb3J5VXNhZ2UpOgorICAgICAgICAoV1RGOjpNZW1vcnlJbnN0cnVtZW50YXRpb246 OmFkZEluc3RydW1lbnRlZE9iamVjdEltcGwpOgorICAgICAgICAoV1RGOjpNZW1vcnlJbnN0cnVt ZW50YXRpb246OmFkZE9iamVjdEltcGwpOgorICAgICAgICAoV1RGOjo6OnByb2Nlc3MpOgorCiAy MDEyLTA5LTE0ICBJbHlhIFRpa2hvbm92c2t5ICA8bG9pc2xvQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBXZWIgSW5zcGVjdG9yOiBOTUk6IHJlbW92ZSBjdXJyZW50IHRyYWl0cyBoZWxwZXIgY2xh c3MgYmVjYXVzZSBpdCBpcyBjdXN0b21pemluZyB0aGUgaW5zdHJ1bWVudGF0aW9uIGF0IGEgd3Jv bmcgcGxhY2UgYW5kIGlzIG5vdCBuZWNlc3NhcnkgYXQgdGhlIG1vbWVudC4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cKaW5kZXggMmVmOWU3ZjFhNzcyYTczNDg1Y2VlODA5OTdjZDBmZGI3NTI2YjAx Ny4uODdiM2Q1MzczY2Y1MWJlMjIyOGM0ZDA0NTIwNTM5NTQyY2ZmNWY1ZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMi0wOS0xNCAgWXVyeSBTZW1pa2hh dHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBhdXRv bWF0aWNhbGx5IGRldGVjdCBpZiBjbGFzcyBoYXMgcmVwb3J0TWVtb3J5VXNhZ2UgbWV0aG9kCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05Njc1NgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3QgdGhhdCBy ZXBvcnRNZW1vcnlVc2FnZSBtZXRob2Qgd2lsbCBiZSBjYWxsZWQgb24gdGhlIGluc3RydW1lbnRl ZCBvYmplY3QKKyAgICAgICAgZXZlbiBpZiBpdCBpcyBhIHRlbXBsYXRlLgorCisgICAgICAgICog dGVzdHMvTWVtb3J5SW5zdHJ1bWVudGF0aW9uVGVzdC5jcHA6CisgICAgICAgIChXZWJDb3JlKToK KyAgICAgICAgKEluc3RydW1lbnRlZFRlbXBsYXRlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3Ry dW1lbnRlZFRlbXBsYXRlOjpJbnN0cnVtZW50ZWRUZW1wbGF0ZSk6CisgICAgICAgIChXZWJDb3Jl OjpJbnN0cnVtZW50ZWRUZW1wbGF0ZTo6cmVwb3J0TWVtb3J5VXNhZ2UpOgorICAgICAgICAoV2Vi Q29yZTo6VEVTVCk6CisKIDIwMTItMDktMTQgIEtlaXNoaSBIYXR0b3JpICA8a2Vpc2hpQHdlYmtp dC5vcmc+CiAKICAgICAgICAgUmVmYWN0b3IgdGltZSBmb3JtYXQgcmVsYXRlZCBtZXRob2RzIG9u IExvY2FsZVdpbi9NYWMvSUNVIHNvIHRoYXQgdGhleSBvdmVycmlkZSBMb2NhbGl6ZXIgbWV0aG9k cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uLmggYi9T b3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb24uaAppbmRleCAwNGNhOGQyMGUwNmRj ZjZjMDllYWUzY2Q2ODM5NzE3YjJmODg4NzA2Li45ZjNlNDE1N2IxNjZiYTc4ZTg5N2Y3ZTlkMjM2 OTQ2NTc3NmYwNWYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50 YXRpb24uaAorKysgYi9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb24uaApAQCAt NzUsNiArNzUsMTcgQEAgcHJpdmF0ZToKIAogICAgIGZyaWVuZCBjbGFzcyBNZW1vcnlDbGFzc0lu Zm87CiAKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBzdGF0aWMgdm9pZCBzZWxlY3RJbnN0cnVt ZW50YXRpb25NZXRob2QoY29uc3QgVCogY29uc3QmIG9iamVjdCwgTWVtb3J5T2JqZWN0SW5mbyog bWVtb3J5T2JqZWN0SW5mbykKKyAgICB7CisgICAgICAgIC8vIElmIHRoZXJlIGlzIHJlcG9ydE1l bW9yeVVzYWdlIG1ldGhvZCBvbiB0aGUgb2JqZWN0LCBjYWxsIGl0LgorICAgICAgICAvLyBPdGhl cndpc2UgY291bnQgb25seSBvYmplY3QncyBzZWxmIHNpemUuCisgICAgICAgIHJlcG9ydE9iamVj dE1lbW9yeVVzYWdlPFQsIHZvaWQgKFQ6OiopKE1lbW9yeU9iamVjdEluZm8qKSBjb25zdD4ob2Jq ZWN0LCBtZW1vcnlPYmplY3RJbmZvLCAwKTsKKyAgICB9CisKKyAgICB0ZW1wbGF0ZTx0eXBlbmFt ZSBUeXBlLCBUeXBlIFB0cj4gc3RydWN0IE1lbWJlckhlbHBlclN0cnVjdDsKKyAgICB0ZW1wbGF0 ZTx0eXBlbmFtZSBULCB0eXBlbmFtZSBUeXBlPiBzdGF0aWMgdm9pZCByZXBvcnRPYmplY3RNZW1v cnlVc2FnZShjb25zdCBUKiBjb25zdCYsIE1lbW9yeU9iamVjdEluZm8qLCAgTWVtYmVySGVscGVy U3RydWN0PFR5cGUsICZUOjpyZXBvcnRNZW1vcnlVc2FnZT4qKTsKKyAgICB0ZW1wbGF0ZTx0eXBl bmFtZSBULCB0eXBlbmFtZSBUeXBlPiBzdGF0aWMgdm9pZCByZXBvcnRPYmplY3RNZW1vcnlVc2Fn ZShjb25zdCBUKiBjb25zdCYsIE1lbW9yeU9iamVjdEluZm8qLCAuLi4pOworCiAgICAgdGVtcGxh dGU8dHlwZW5hbWUgVD4gY2xhc3MgSW5zdHJ1bWVudGVkUG9pbnRlciA6IHB1YmxpYyBJbnN0cnVt ZW50ZWRQb2ludGVyQmFzZSB7CiAgICAgcHVibGljOgogICAgICAgICBleHBsaWNpdCBJbnN0cnVt ZW50ZWRQb2ludGVyKGNvbnN0IFQqIHBvaW50ZXIsIE1lbW9yeU9iamVjdFR5cGUgb3duZXJPYmpl Y3RUeXBlKSA6IG1fcG9pbnRlcihwb2ludGVyKSwgbV9vd25lck9iamVjdFR5cGUob3duZXJPYmpl Y3RUeXBlKSB7IH0KQEAgLTE1NSw2ICsxNjYsNyBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAg ZnJpZW5kIGNsYXNzIE1lbW9yeUNsYXNzSW5mbzsKKyAgICBmcmllbmQgY2xhc3MgTWVtb3J5SW5z dHJ1bWVudGF0aW9uOwogCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gdm9pZCByZXBvcnRPYmpl Y3RJbmZvKE1lbW9yeU9iamVjdFR5cGUgb2JqZWN0VHlwZSwgc2l6ZV90IGFjdHVhbFNpemUpCiAg ICAgewpAQCAtMjExLDcgKzIyMyw3IEBAIHZvaWQgTWVtb3J5SW5zdHJ1bWVudGF0aW9uOjphZGRJ bnN0cnVtZW50ZWRPYmplY3RJbXBsKGNvbnN0IFQqIGNvbnN0JiBvYmplY3QsIE1lCiB7CiAgICAg aWYgKG93bmluZ1R5cGUgPT0gYnlSZWZlcmVuY2UpIHsKICAgICAgICAgTWVtb3J5T2JqZWN0SW5m byBtZW1vcnlPYmplY3RJbmZvKHRoaXMsIG93bmVyT2JqZWN0VHlwZSk7Ci0gICAgICAgIG9iamVj dC0+cmVwb3J0TWVtb3J5VXNhZ2UoJm1lbW9yeU9iamVjdEluZm8pOworICAgICAgICBzZWxlY3RJ bnN0cnVtZW50YXRpb25NZXRob2Q8VD4ob2JqZWN0LCAmbWVtb3J5T2JqZWN0SW5mbyk7CiAgICAg fSBlbHNlIHsKICAgICAgICAgaWYgKCFvYmplY3QgfHwgdmlzaXRlZChvYmplY3QpKQogICAgICAg ICAgICAgcmV0dXJuOwpAQCAtMjU0LDExICsyNjYsMTkgQEAgdm9pZCBNZW1vcnlJbnN0cnVtZW50 YXRpb246OmFkZE9iamVjdEltcGwoY29uc3QgUmVmUHRyPFQ+KiBjb25zdCYgb2JqZWN0LCBNZW1v cnkKIHRlbXBsYXRlPHR5cGVuYW1lIFQ+CiB2b2lkIE1lbW9yeUluc3RydW1lbnRhdGlvbjo6YWRk T2JqZWN0SW1wbChjb25zdCBUKiBjb25zdCYgb2JqZWN0LCBNZW1vcnlPYmplY3RUeXBlIG93bmVy T2JqZWN0VHlwZSwgTWVtb3J5T3duaW5nVHlwZSBvd25pbmdUeXBlKQogewotICAgIGlmICghb2Jq ZWN0IHx8IHZpc2l0ZWQob2JqZWN0KSkKLSAgICAgICAgcmV0dXJuOwotICAgIGlmIChvd25pbmdU eXBlID09IGJ5UmVmZXJlbmNlKQotICAgICAgICByZXR1cm47Ci0gICAgY291bnRPYmplY3RTaXpl KG93bmVyT2JqZWN0VHlwZSwgc2l6ZW9mKFQpKTsKKyAgICBhZGRJbnN0cnVtZW50ZWRPYmplY3RJ bXBsKG9iamVjdCwgb3duZXJPYmplY3RUeXBlLCBvd25pbmdUeXBlKTsKK30KKwordGVtcGxhdGU8 dHlwZW5hbWUgVCwgdHlwZW5hbWUgVHlwZT4KK3ZvaWQgTWVtb3J5SW5zdHJ1bWVudGF0aW9uOjpy ZXBvcnRPYmplY3RNZW1vcnlVc2FnZShjb25zdCBUKiBjb25zdCYgb2JqZWN0LCBNZW1vcnlPYmpl Y3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvLCAgTWVtYmVySGVscGVyU3RydWN0PFR5cGUsICZUOjpy ZXBvcnRNZW1vcnlVc2FnZT4qKQoreworICAgIG9iamVjdC0+cmVwb3J0TWVtb3J5VXNhZ2UobWVt b3J5T2JqZWN0SW5mbyk7Cit9CisKK3RlbXBsYXRlPHR5cGVuYW1lIFQsIHR5cGVuYW1lIFR5cGU+ Cit2b2lkIE1lbW9yeUluc3RydW1lbnRhdGlvbjo6cmVwb3J0T2JqZWN0TWVtb3J5VXNhZ2UoY29u c3QgVCogY29uc3QmLCBNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvLCAuLi4pCit7 CisgICAgbWVtb3J5T2JqZWN0SW5mby0+cmVwb3J0T2JqZWN0SW5mbzxUPigwLCBzaXplb2YoVCkp OwogfQogCiB0ZW1wbGF0ZTx0eXBlbmFtZSBIYXNoTWFwVHlwZT4KQEAgLTMzMyw3ICszNTMsNyBA QCB0ZW1wbGF0ZTx0eXBlbmFtZSBUPgogdm9pZCBNZW1vcnlJbnN0cnVtZW50YXRpb246Okluc3Ry dW1lbnRlZFBvaW50ZXI8VD46OnByb2Nlc3MoTWVtb3J5SW5zdHJ1bWVudGF0aW9uKiBtZW1vcnlJ bnN0cnVtZW50YXRpb24pCiB7CiAgICAgTWVtb3J5T2JqZWN0SW5mbyBtZW1vcnlPYmplY3RJbmZv KG1lbW9yeUluc3RydW1lbnRhdGlvbiwgbV9vd25lck9iamVjdFR5cGUpOwotICAgIG1fcG9pbnRl ci0+cmVwb3J0TWVtb3J5VXNhZ2UoJm1lbW9yeU9iamVjdEluZm8pOworICAgIHNlbGVjdEluc3Ry dW1lbnRhdGlvbk1ldGhvZDxUPihtX3BvaW50ZXIsICZtZW1vcnlPYmplY3RJbmZvKTsKICAgICBt ZW1vcnlJbnN0cnVtZW50YXRpb24tPmNvdW50T2JqZWN0U2l6ZShtZW1vcnlPYmplY3RJbmZvLm9i amVjdFR5cGUoKSwgbWVtb3J5T2JqZWN0SW5mby5vYmplY3RTaXplKCkpOwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL01lbW9yeUluc3RydW1lbnRhdGlvblRl c3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9NZW1vcnlJbnN0cnVtZW50YXRp b25UZXN0LmNwcAppbmRleCA0YTBhM2NmODFmZWIwOWZiZTkxM2QzYzEwMjk2OTJhNjNlNjU5ZjEw Li43MGIzNjUwYmY1NGI2NWNkYThlNTMwOWVhNzRhYjgxNGZkNGY5Njg2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL01lbW9yeUluc3RydW1lbnRhdGlvblRlc3QuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvTWVtb3J5SW5zdHJ1bWVudGF0aW9u VGVzdC5jcHAKQEAgLTI3NSw1ICsyNzUsMzMgQEAgVEVTVChNZW1vcnlJbnN0cnVtZW50YXRpb25U ZXN0LCB2aXNpdFN0cmluZ3MpCiAgICAgfQogfQogCit0ZW1wbGF0ZTx0eXBlbmFtZSBUPgorY2xh c3MgSW5zdHJ1bWVudGVkVGVtcGxhdGUgeworcHVibGljOgorICAgIHRlbXBsYXRlPHR5cGVuYW1l IFY+CisgICAgSW5zdHJ1bWVudGVkVGVtcGxhdGUoY29uc3QgViYgdmFsdWUpIDogbV92YWx1ZSh2 YWx1ZSkgeyB9CisKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBNZW1vcnlPYmplY3RJbmZvPgorICAg IHZvaWQgcmVwb3J0TWVtb3J5VXNhZ2UoTWVtb3J5T2JqZWN0SW5mbyogbWVtb3J5T2JqZWN0SW5m bykgY29uc3QKKyAgICB7CisgICAgICAgIHR5cGVuYW1lIE1lbW9yeU9iamVjdEluZm86OkNsYXNz SW5mbyBpbmZvKG1lbW9yeU9iamVjdEluZm8sIHRoaXMsIFdlYkNvcmVNZW1vcnlUeXBlczo6RE9N KTsKKyAgICAgICAgaW5mby5hZGRNZW1iZXIobV92YWx1ZSk7CisgICAgfQorCisgICAgVCBtX3Zh bHVlOworfTsKKworVEVTVChNZW1vcnlJbnN0cnVtZW50YXRpb25UZXN0LCBkZXRlY3RSZXBvcnRN ZW1vcnlVc2FnZU1ldGhvZCkKK3sKKyAgICBWaXNpdGVkT2JqZWN0cyB2aXNpdGVkT2JqZWN0czsK KyAgICBNZW1vcnlJbnN0cnVtZW50YXRpb25JbXBsIGltcGwodmlzaXRlZE9iamVjdHMpOworCisg ICAgT3duUHRyPEluc3RydW1lbnRlZFRlbXBsYXRlPFN0cmluZz4gPiB2YWx1ZSA9IGFkb3B0UHRy KG5ldyBJbnN0cnVtZW50ZWRUZW1wbGF0ZTxTdHJpbmc+KCIiKSk7CisgICAgSW5zdHJ1bWVudGVk T3duZXI8SW5zdHJ1bWVudGVkVGVtcGxhdGU8U3RyaW5nPiogPiByb290KHZhbHVlLmdldCgpKTsK KyAgICBpbXBsLmFkZFJvb3RPYmplY3Qocm9vdCk7CisgICAgRVhQRUNUX0VRKHNpemVvZihJbnN0 cnVtZW50ZWRUZW1wbGF0ZTxTdHJpbmc+KSArIHNpemVvZihTdHJpbmdJbXBsKSwgaW1wbC5yZXBv cnRlZFNpemVGb3JBbGxUeXBlcygpKTsKKyAgICBFWFBFQ1RfRVEoMiwgdmlzaXRlZE9iamVjdHMu c2l6ZSgpKTsKK30KKwogfSAvLyBuYW1lc3BhY2UKIAo= 164202 2012-09-14 12:00:50 -0700 2012-09-14 12:47:23 -0700 Patch bug-96756-20120914230029.patch text/plain 6937 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4NjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDA0YmY2ZmQ1MzVhZTk0ZmUxODg1NjBk NDc2ZDA4OTZjY2RhOTdjMzAuLjVhNWFjYmIzMGI4ZmEzZjFkZTM1OTY3YWRjMTMxYjUwZWVmNTAz OWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTItMDktMTQgIFl1cnkgU2VtaWtoYXRza3kgIDx5 dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYXV0b21hdGljYWxs eSBkZXRlY3QgaWYgY2xhc3MgaGFzIHJlcG9ydE1lbW9yeVVzYWdlIG1ldGhvZAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTY3NTYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1ldGVkIGF1dG9tYXRp YyBzZWxlY3RvciBvZiB0aGUgbWVtb3J5IHJlcG9ydGluZyBtZXRob2QuIElmCisgICAgICAgIGFu IG9iamVjdCBoYXMgcmVwb3J0TWVtb3J5VXNhZ2UgbWV0aG9kIHRoZW4gY2FsbCBpdC4gT3RoZXJ3 aXNlCisgICAgICAgIGNvdW50IG9ubHkgb2JqZWN0J3Mgc2VsZiBzaXplLiBBcyB0aGUgbmV4dCBz dGVwIHdlIHdpbGwgZGVsZXRlCisgICAgICAgIGFkZEluc3RydW1lbnRlZE1lbWJlciBhbmQgYWRk SW5zdHJ1bWVudGVkT2JqZWN0SW1wbCBhbmQgd2lsbAorICAgICAgICBoYXZlIG9ubHkgYWRkTWVt YmVyIGFuZCBhZGRPYmplY3RJbXBsIHRoYXQgd291bGQgYXV0b21hdGljYWxseQorICAgICAgICBj YWxsIHJlcG9ydE1lbW9yeVVzYWdlIGlmIGl0IGlzIHByZXNlbnQuCisKKyAgICAgICAgKiB3dGYv TWVtb3J5SW5zdHJ1bWVudGF0aW9uLmg6CisgICAgICAgIChXVEY6Ok1lbW9yeUluc3RydW1lbnRh dGlvbjo6c2VsZWN0SW5zdHJ1bWVudGF0aW9uTWV0aG9kKToKKyAgICAgICAgKE1lbW9yeUluc3Ry dW1lbnRhdGlvbik6CisgICAgICAgIChXVEY6Ok1lbW9yeUluc3RydW1lbnRhdGlvbjo6cmVwb3J0 T2JqZWN0TWVtb3J5VXNhZ2UpOgorICAgICAgICAoV1RGOjpNZW1vcnlJbnN0cnVtZW50YXRpb246 OmFkZEluc3RydW1lbnRlZE9iamVjdEltcGwpOgorICAgICAgICAoV1RGOjpNZW1vcnlJbnN0cnVt ZW50YXRpb246OmFkZE9iamVjdEltcGwpOgorICAgICAgICAoV1RGOjo6OnByb2Nlc3MpOgorCiAy MDEyLTA5LTE0ICBUb3IgQXJuZSBWZXN0YsO4ICA8dG9yLmFybmUudmVzdGJvQG5va2lhLmNvbT4K IAogICAgICAgICBbUXRdIE1ha2UgZm9yY2Vfc3RhdGljX2xpYnNfYXNfc2hhcmVkIHdvcmsgb24g TWFjIE9TCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDI5MzBkYWJhZWVkOWNkNzVkZDkx MjYwMTk5ZTM1MDhjYmY0NjFmMzIuLjJhNTQ4NDRiOGY0MTI0NmZmNmFkYTFkOWU5ZjJlOGUyMzZh OTE2MzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTIt MDktMTQgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg V2ViIEluc3BlY3RvcjogYXV0b21hdGljYWxseSBkZXRlY3QgaWYgY2xhc3MgaGFzIHJlcG9ydE1l bW9yeVVzYWdlIG1ldGhvZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTY3NTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUZXN0IHRoYXQgcmVwb3J0TWVtb3J5VXNhZ2UgbWV0aG9kIHdpbGwgYmUgY2FsbGVk IG9uIHRoZSBpbnN0cnVtZW50ZWQgb2JqZWN0CisgICAgICAgIGV2ZW4gaWYgaXQgaXMgYSB0ZW1w bGF0ZS4KKworICAgICAgICAqIHRlc3RzL01lbW9yeUluc3RydW1lbnRhdGlvblRlc3QuY3BwOgor ICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChJbnN0cnVtZW50ZWRUZW1wbGF0ZSk6CisgICAg ICAgIChXZWJDb3JlOjpJbnN0cnVtZW50ZWRUZW1wbGF0ZTo6SW5zdHJ1bWVudGVkVGVtcGxhdGUp OgorICAgICAgICAoV2ViQ29yZTo6SW5zdHJ1bWVudGVkVGVtcGxhdGU6OnJlcG9ydE1lbW9yeVVz YWdlKToKKyAgICAgICAgKFdlYkNvcmU6OlRFU1QpOgorCiAyMDEyLTA5LTE0ICBQZXRlciBCZXZl cmxvbyAgPHBldGVyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1dIFN1cHBvcnQg dGhlIC0te2luLG91dCxlcnJ9LWZpZm8gYXJndW1lbnRzIG9uIFRlc3RXZWJLaXRBUEkgYW5kIHdl YmtpdF91bml0X3Rlc3RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVt ZW50YXRpb24uaCBiL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvbi5oCmluZGV4 IDA0Y2E4ZDIwZTA2ZGNmNmMwOWVhZTNjZDY4Mzk3MTdiMmY4ODg3MDYuLjc2ZTE0NmY0ZDg0MGNj YWI1YTBiMzI3ZDY2NmMyNDI1MGM1Y2U5OTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL01l bW9yeUluc3RydW1lbnRhdGlvbi5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1l bnRhdGlvbi5oCkBAIC03NSw2ICs3NSwyNiBAQCBwcml2YXRlOgogCiAgICAgZnJpZW5kIGNsYXNz IE1lbW9yeUNsYXNzSW5mbzsKIAorICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IHN0YXRpYyB2b2lk IHNlbGVjdEluc3RydW1lbnRhdGlvbk1ldGhvZChjb25zdCBUKiBjb25zdCYgb2JqZWN0LCBNZW1v cnlPYmplY3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvKQorICAgIHsKKyAgICAgICAgLy8gSWYgdGhl cmUgaXMgcmVwb3J0TWVtb3J5VXNhZ2UgbWV0aG9kIG9uIHRoZSBvYmplY3QsIGNhbGwgaXQuCisg ICAgICAgIC8vIE90aGVyd2lzZSBjb3VudCBvbmx5IG9iamVjdCdzIHNlbGYgc2l6ZS4KKyAgICAg ICAgcmVwb3J0T2JqZWN0TWVtb3J5VXNhZ2U8VCwgdm9pZCAoVDo6KikoTWVtb3J5T2JqZWN0SW5m byopIGNvbnN0PihvYmplY3QsIG1lbW9yeU9iamVjdEluZm8sIDApOworICAgIH0KKworICAgIHRl bXBsYXRlPHR5cGVuYW1lIFR5cGUsIFR5cGUgUHRyPiBzdHJ1Y3QgTWVtYmVySGVscGVyU3RydWN0 OworICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQsIHR5cGVuYW1lIFR5cGU+CisgICAgdm9pZCByZXBv cnRPYmplY3RNZW1vcnlVc2FnZShjb25zdCBUKiBjb25zdCYgb2JqZWN0LCBNZW1vcnlPYmplY3RJ bmZvKiBtZW1vcnlPYmplY3RJbmZvLCAgTWVtYmVySGVscGVyU3RydWN0PFR5cGUsICZUOjpyZXBv cnRNZW1vcnlVc2FnZT4qKQorICAgIHsKKyAgICAgICAgb2JqZWN0LT5yZXBvcnRNZW1vcnlVc2Fn ZShtZW1vcnlPYmplY3RJbmZvKTsKKyAgICB9CisKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBULCB0 eXBlbmFtZSBUeXBlPgorICAgIHZvaWQgcmVwb3J0T2JqZWN0TWVtb3J5VXNhZ2UoY29uc3QgVCog Y29uc3QmIG9iamVjdCwgTWVtb3J5T2JqZWN0SW5mbyogbWVtb3J5T2JqZWN0SW5mbywgLi4uKQor ICAgIHsKKyAgICAgICAgTWVtb3J5Q2xhc3NJbmZvIGluZm8obWVtb3J5T2JqZWN0SW5mbywgb2Jq ZWN0KTsKKyAgICB9CisKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBjbGFzcyBJbnN0cnVtZW50 ZWRQb2ludGVyIDogcHVibGljIEluc3RydW1lbnRlZFBvaW50ZXJCYXNlIHsKICAgICBwdWJsaWM6 CiAgICAgICAgIGV4cGxpY2l0IEluc3RydW1lbnRlZFBvaW50ZXIoY29uc3QgVCogcG9pbnRlciwg TWVtb3J5T2JqZWN0VHlwZSBvd25lck9iamVjdFR5cGUpIDogbV9wb2ludGVyKHBvaW50ZXIpLCBt X293bmVyT2JqZWN0VHlwZShvd25lck9iamVjdFR5cGUpIHsgfQpAQCAtMTU1LDYgKzE3NSw3IEBA IHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICBmcmllbmQgY2xhc3MgTWVtb3J5Q2xhc3NJbmZvOwor ICAgIGZyaWVuZCBjbGFzcyBNZW1vcnlJbnN0cnVtZW50YXRpb247CiAKICAgICB0ZW1wbGF0ZTx0 eXBlbmFtZSBUPiB2b2lkIHJlcG9ydE9iamVjdEluZm8oTWVtb3J5T2JqZWN0VHlwZSBvYmplY3RU eXBlLCBzaXplX3QgYWN0dWFsU2l6ZSkKICAgICB7CkBAIC0yMTEsNyArMjMyLDcgQEAgdm9pZCBN ZW1vcnlJbnN0cnVtZW50YXRpb246OmFkZEluc3RydW1lbnRlZE9iamVjdEltcGwoY29uc3QgVCog Y29uc3QmIG9iamVjdCwgTWUKIHsKICAgICBpZiAob3duaW5nVHlwZSA9PSBieVJlZmVyZW5jZSkg ewogICAgICAgICBNZW1vcnlPYmplY3RJbmZvIG1lbW9yeU9iamVjdEluZm8odGhpcywgb3duZXJP YmplY3RUeXBlKTsKLSAgICAgICAgb2JqZWN0LT5yZXBvcnRNZW1vcnlVc2FnZSgmbWVtb3J5T2Jq ZWN0SW5mbyk7CisgICAgICAgIHNlbGVjdEluc3RydW1lbnRhdGlvbk1ldGhvZDxUPihvYmplY3Qs ICZtZW1vcnlPYmplY3RJbmZvKTsKICAgICB9IGVsc2UgewogICAgICAgICBpZiAoIW9iamVjdCB8 fCB2aXNpdGVkKG9iamVjdCkpCiAgICAgICAgICAgICByZXR1cm47CkBAIC0yNTQsMTEgKzI3NSw3 IEBAIHZvaWQgTWVtb3J5SW5zdHJ1bWVudGF0aW9uOjphZGRPYmplY3RJbXBsKGNvbnN0IFJlZlB0 cjxUPiogY29uc3QmIG9iamVjdCwgTWVtb3J5CiB0ZW1wbGF0ZTx0eXBlbmFtZSBUPgogdm9pZCBN ZW1vcnlJbnN0cnVtZW50YXRpb246OmFkZE9iamVjdEltcGwoY29uc3QgVCogY29uc3QmIG9iamVj dCwgTWVtb3J5T2JqZWN0VHlwZSBvd25lck9iamVjdFR5cGUsIE1lbW9yeU93bmluZ1R5cGUgb3du aW5nVHlwZSkKIHsKLSAgICBpZiAoIW9iamVjdCB8fCB2aXNpdGVkKG9iamVjdCkpCi0gICAgICAg IHJldHVybjsKLSAgICBpZiAob3duaW5nVHlwZSA9PSBieVJlZmVyZW5jZSkKLSAgICAgICAgcmV0 dXJuOwotICAgIGNvdW50T2JqZWN0U2l6ZShvd25lck9iamVjdFR5cGUsIHNpemVvZihUKSk7Cisg ICAgYWRkSW5zdHJ1bWVudGVkT2JqZWN0SW1wbChvYmplY3QsIG93bmVyT2JqZWN0VHlwZSwgb3du aW5nVHlwZSk7CiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIEhhc2hNYXBUeXBlPgpAQCAtMzMzLDcg KzM1MCw3IEBAIHRlbXBsYXRlPHR5cGVuYW1lIFQ+CiB2b2lkIE1lbW9yeUluc3RydW1lbnRhdGlv bjo6SW5zdHJ1bWVudGVkUG9pbnRlcjxUPjo6cHJvY2VzcyhNZW1vcnlJbnN0cnVtZW50YXRpb24q IG1lbW9yeUluc3RydW1lbnRhdGlvbikKIHsKICAgICBNZW1vcnlPYmplY3RJbmZvIG1lbW9yeU9i amVjdEluZm8obWVtb3J5SW5zdHJ1bWVudGF0aW9uLCBtX293bmVyT2JqZWN0VHlwZSk7Ci0gICAg bV9wb2ludGVyLT5yZXBvcnRNZW1vcnlVc2FnZSgmbWVtb3J5T2JqZWN0SW5mbyk7CisgICAgc2Vs ZWN0SW5zdHJ1bWVudGF0aW9uTWV0aG9kPFQ+KG1fcG9pbnRlciwgJm1lbW9yeU9iamVjdEluZm8p OwogICAgIG1lbW9yeUluc3RydW1lbnRhdGlvbi0+Y291bnRPYmplY3RTaXplKG1lbW9yeU9iamVj dEluZm8ub2JqZWN0VHlwZSgpLCBtZW1vcnlPYmplY3RJbmZvLm9iamVjdFNpemUoKSk7CiB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvTWVtb3J5SW5zdHJ1bWVu dGF0aW9uVGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL01lbW9yeUluc3Ry dW1lbnRhdGlvblRlc3QuY3BwCmluZGV4IDRhMGEzY2Y4MWZlYjA5ZmJlOTEzZDNjMTAyOTY5MmE2 M2U2NTlmMTAuLjcwYjM2NTBiZjU0YjY1Y2RhOGU1MzA5ZWE3NGFiODE0ZmQ0Zjk2ODYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvTWVtb3J5SW5zdHJ1bWVudGF0aW9u VGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9NZW1vcnlJbnN0cnVt ZW50YXRpb25UZXN0LmNwcApAQCAtMjc1LDUgKzI3NSwzMyBAQCBURVNUKE1lbW9yeUluc3RydW1l bnRhdGlvblRlc3QsIHZpc2l0U3RyaW5ncykKICAgICB9CiB9CiAKK3RlbXBsYXRlPHR5cGVuYW1l IFQ+CitjbGFzcyBJbnN0cnVtZW50ZWRUZW1wbGF0ZSB7CitwdWJsaWM6CisgICAgdGVtcGxhdGU8 dHlwZW5hbWUgVj4KKyAgICBJbnN0cnVtZW50ZWRUZW1wbGF0ZShjb25zdCBWJiB2YWx1ZSkgOiBt X3ZhbHVlKHZhbHVlKSB7IH0KKworICAgIHRlbXBsYXRlPHR5cGVuYW1lIE1lbW9yeU9iamVjdElu Zm8+CisgICAgdm9pZCByZXBvcnRNZW1vcnlVc2FnZShNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlP YmplY3RJbmZvKSBjb25zdAorICAgIHsKKyAgICAgICAgdHlwZW5hbWUgTWVtb3J5T2JqZWN0SW5m bzo6Q2xhc3NJbmZvIGluZm8obWVtb3J5T2JqZWN0SW5mbywgdGhpcywgV2ViQ29yZU1lbW9yeVR5 cGVzOjpET00pOworICAgICAgICBpbmZvLmFkZE1lbWJlcihtX3ZhbHVlKTsKKyAgICB9CisKKyAg ICBUIG1fdmFsdWU7Cit9OworCitURVNUKE1lbW9yeUluc3RydW1lbnRhdGlvblRlc3QsIGRldGVj dFJlcG9ydE1lbW9yeVVzYWdlTWV0aG9kKQoreworICAgIFZpc2l0ZWRPYmplY3RzIHZpc2l0ZWRP YmplY3RzOworICAgIE1lbW9yeUluc3RydW1lbnRhdGlvbkltcGwgaW1wbCh2aXNpdGVkT2JqZWN0 cyk7CisKKyAgICBPd25QdHI8SW5zdHJ1bWVudGVkVGVtcGxhdGU8U3RyaW5nPiA+IHZhbHVlID0g YWRvcHRQdHIobmV3IEluc3RydW1lbnRlZFRlbXBsYXRlPFN0cmluZz4oIiIpKTsKKyAgICBJbnN0 cnVtZW50ZWRPd25lcjxJbnN0cnVtZW50ZWRUZW1wbGF0ZTxTdHJpbmc+KiA+IHJvb3QodmFsdWUu Z2V0KCkpOworICAgIGltcGwuYWRkUm9vdE9iamVjdChyb290KTsKKyAgICBFWFBFQ1RfRVEoc2l6 ZW9mKEluc3RydW1lbnRlZFRlbXBsYXRlPFN0cmluZz4pICsgc2l6ZW9mKFN0cmluZ0ltcGwpLCBp bXBsLnJlcG9ydGVkU2l6ZUZvckFsbFR5cGVzKCkpOworICAgIEVYUEVDVF9FUSgyLCB2aXNpdGVk T2JqZWN0cy5zaXplKCkpOworfQorCiB9IC8vIG5hbWVzcGFjZQogCg== 164209 2012-09-14 12:47:44 -0700 2012-09-14 13:14:12 -0700 ups. Another patch for try bots with static keyword. bug-96756-20120914234724.patch text/plain 6951 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4NjMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDA0YmY2ZmQ1MzVhZTk0ZmUxODg1NjBk NDc2ZDA4OTZjY2RhOTdjMzAuLjVhNWFjYmIzMGI4ZmEzZjFkZTM1OTY3YWRjMTMxYjUwZWVmNTAz OWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTItMDktMTQgIFl1cnkgU2VtaWtoYXRza3kgIDx5 dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYXV0b21hdGljYWxs eSBkZXRlY3QgaWYgY2xhc3MgaGFzIHJlcG9ydE1lbW9yeVVzYWdlIG1ldGhvZAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTY3NTYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1ldGVkIGF1dG9tYXRp YyBzZWxlY3RvciBvZiB0aGUgbWVtb3J5IHJlcG9ydGluZyBtZXRob2QuIElmCisgICAgICAgIGFu IG9iamVjdCBoYXMgcmVwb3J0TWVtb3J5VXNhZ2UgbWV0aG9kIHRoZW4gY2FsbCBpdC4gT3RoZXJ3 aXNlCisgICAgICAgIGNvdW50IG9ubHkgb2JqZWN0J3Mgc2VsZiBzaXplLiBBcyB0aGUgbmV4dCBz dGVwIHdlIHdpbGwgZGVsZXRlCisgICAgICAgIGFkZEluc3RydW1lbnRlZE1lbWJlciBhbmQgYWRk SW5zdHJ1bWVudGVkT2JqZWN0SW1wbCBhbmQgd2lsbAorICAgICAgICBoYXZlIG9ubHkgYWRkTWVt YmVyIGFuZCBhZGRPYmplY3RJbXBsIHRoYXQgd291bGQgYXV0b21hdGljYWxseQorICAgICAgICBj YWxsIHJlcG9ydE1lbW9yeVVzYWdlIGlmIGl0IGlzIHByZXNlbnQuCisKKyAgICAgICAgKiB3dGYv TWVtb3J5SW5zdHJ1bWVudGF0aW9uLmg6CisgICAgICAgIChXVEY6Ok1lbW9yeUluc3RydW1lbnRh dGlvbjo6c2VsZWN0SW5zdHJ1bWVudGF0aW9uTWV0aG9kKToKKyAgICAgICAgKE1lbW9yeUluc3Ry dW1lbnRhdGlvbik6CisgICAgICAgIChXVEY6Ok1lbW9yeUluc3RydW1lbnRhdGlvbjo6cmVwb3J0 T2JqZWN0TWVtb3J5VXNhZ2UpOgorICAgICAgICAoV1RGOjpNZW1vcnlJbnN0cnVtZW50YXRpb246 OmFkZEluc3RydW1lbnRlZE9iamVjdEltcGwpOgorICAgICAgICAoV1RGOjpNZW1vcnlJbnN0cnVt ZW50YXRpb246OmFkZE9iamVjdEltcGwpOgorICAgICAgICAoV1RGOjo6OnByb2Nlc3MpOgorCiAy MDEyLTA5LTE0ICBUb3IgQXJuZSBWZXN0YsO4ICA8dG9yLmFybmUudmVzdGJvQG5va2lhLmNvbT4K IAogICAgICAgICBbUXRdIE1ha2UgZm9yY2Vfc3RhdGljX2xpYnNfYXNfc2hhcmVkIHdvcmsgb24g TWFjIE9TCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDI5MzBkYWJhZWVkOWNkNzVkZDkx MjYwMTk5ZTM1MDhjYmY0NjFmMzIuLjJhNTQ4NDRiOGY0MTI0NmZmNmFkYTFkOWU5ZjJlOGUyMzZh OTE2MzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTIt MDktMTQgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAg V2ViIEluc3BlY3RvcjogYXV0b21hdGljYWxseSBkZXRlY3QgaWYgY2xhc3MgaGFzIHJlcG9ydE1l bW9yeVVzYWdlIG1ldGhvZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTY3NTYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBUZXN0IHRoYXQgcmVwb3J0TWVtb3J5VXNhZ2UgbWV0aG9kIHdpbGwgYmUgY2FsbGVk IG9uIHRoZSBpbnN0cnVtZW50ZWQgb2JqZWN0CisgICAgICAgIGV2ZW4gaWYgaXQgaXMgYSB0ZW1w bGF0ZS4KKworICAgICAgICAqIHRlc3RzL01lbW9yeUluc3RydW1lbnRhdGlvblRlc3QuY3BwOgor ICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChJbnN0cnVtZW50ZWRUZW1wbGF0ZSk6CisgICAg ICAgIChXZWJDb3JlOjpJbnN0cnVtZW50ZWRUZW1wbGF0ZTo6SW5zdHJ1bWVudGVkVGVtcGxhdGUp OgorICAgICAgICAoV2ViQ29yZTo6SW5zdHJ1bWVudGVkVGVtcGxhdGU6OnJlcG9ydE1lbW9yeVVz YWdlKToKKyAgICAgICAgKFdlYkNvcmU6OlRFU1QpOgorCiAyMDEyLTA5LTE0ICBQZXRlciBCZXZl cmxvbyAgPHBldGVyQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1dIFN1cHBvcnQg dGhlIC0te2luLG91dCxlcnJ9LWZpZm8gYXJndW1lbnRzIG9uIFRlc3RXZWJLaXRBUEkgYW5kIHdl YmtpdF91bml0X3Rlc3RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVt ZW50YXRpb24uaCBiL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvbi5oCmluZGV4 IDA0Y2E4ZDIwZTA2ZGNmNmMwOWVhZTNjZDY4Mzk3MTdiMmY4ODg3MDYuLjM2ZWZmMzdjZDNlYmNm N2E2NjJkOTM4NGQyNjhjNzg1NjdmNjA5YWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvd3RmL01l bW9yeUluc3RydW1lbnRhdGlvbi5oCisrKyBiL1NvdXJjZS9XVEYvd3RmL01lbW9yeUluc3RydW1l bnRhdGlvbi5oCkBAIC03NSw2ICs3NSwyNiBAQCBwcml2YXRlOgogCiAgICAgZnJpZW5kIGNsYXNz IE1lbW9yeUNsYXNzSW5mbzsKIAorICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IHN0YXRpYyB2b2lk IHNlbGVjdEluc3RydW1lbnRhdGlvbk1ldGhvZChjb25zdCBUKiBjb25zdCYgb2JqZWN0LCBNZW1v cnlPYmplY3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvKQorICAgIHsKKyAgICAgICAgLy8gSWYgdGhl cmUgaXMgcmVwb3J0TWVtb3J5VXNhZ2UgbWV0aG9kIG9uIHRoZSBvYmplY3QsIGNhbGwgaXQuCisg ICAgICAgIC8vIE90aGVyd2lzZSBjb3VudCBvbmx5IG9iamVjdCdzIHNlbGYgc2l6ZS4KKyAgICAg ICAgcmVwb3J0T2JqZWN0TWVtb3J5VXNhZ2U8VCwgdm9pZCAoVDo6KikoTWVtb3J5T2JqZWN0SW5m byopIGNvbnN0PihvYmplY3QsIG1lbW9yeU9iamVjdEluZm8sIDApOworICAgIH0KKworICAgIHRl bXBsYXRlPHR5cGVuYW1lIFR5cGUsIFR5cGUgUHRyPiBzdHJ1Y3QgTWVtYmVySGVscGVyU3RydWN0 OworICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQsIHR5cGVuYW1lIFR5cGU+CisgICAgc3RhdGljIHZv aWQgcmVwb3J0T2JqZWN0TWVtb3J5VXNhZ2UoY29uc3QgVCogY29uc3QmIG9iamVjdCwgTWVtb3J5 T2JqZWN0SW5mbyogbWVtb3J5T2JqZWN0SW5mbywgIE1lbWJlckhlbHBlclN0cnVjdDxUeXBlLCAm VDo6cmVwb3J0TWVtb3J5VXNhZ2U+KikKKyAgICB7CisgICAgICAgIG9iamVjdC0+cmVwb3J0TWVt b3J5VXNhZ2UobWVtb3J5T2JqZWN0SW5mbyk7CisgICAgfQorCisgICAgdGVtcGxhdGU8dHlwZW5h bWUgVCwgdHlwZW5hbWUgVHlwZT4KKyAgICBzdGF0aWMgdm9pZCByZXBvcnRPYmplY3RNZW1vcnlV c2FnZShjb25zdCBUKiBjb25zdCYgb2JqZWN0LCBNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlPYmpl Y3RJbmZvLCAuLi4pCisgICAgeworICAgICAgICBNZW1vcnlDbGFzc0luZm8gaW5mbyhtZW1vcnlP YmplY3RJbmZvLCBvYmplY3QpOworICAgIH0KKwogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IGNs YXNzIEluc3RydW1lbnRlZFBvaW50ZXIgOiBwdWJsaWMgSW5zdHJ1bWVudGVkUG9pbnRlckJhc2Ug ewogICAgIHB1YmxpYzoKICAgICAgICAgZXhwbGljaXQgSW5zdHJ1bWVudGVkUG9pbnRlcihjb25z dCBUKiBwb2ludGVyLCBNZW1vcnlPYmplY3RUeXBlIG93bmVyT2JqZWN0VHlwZSkgOiBtX3BvaW50 ZXIocG9pbnRlciksIG1fb3duZXJPYmplY3RUeXBlKG93bmVyT2JqZWN0VHlwZSkgeyB9CkBAIC0x NTUsNiArMTc1LDcgQEAgcHVibGljOgogCiBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFzcyBNZW1v cnlDbGFzc0luZm87CisgICAgZnJpZW5kIGNsYXNzIE1lbW9yeUluc3RydW1lbnRhdGlvbjsKIAog ICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IHZvaWQgcmVwb3J0T2JqZWN0SW5mbyhNZW1vcnlPYmpl Y3RUeXBlIG9iamVjdFR5cGUsIHNpemVfdCBhY3R1YWxTaXplKQogICAgIHsKQEAgLTIxMSw3ICsy MzIsNyBAQCB2b2lkIE1lbW9yeUluc3RydW1lbnRhdGlvbjo6YWRkSW5zdHJ1bWVudGVkT2JqZWN0 SW1wbChjb25zdCBUKiBjb25zdCYgb2JqZWN0LCBNZQogewogICAgIGlmIChvd25pbmdUeXBlID09 IGJ5UmVmZXJlbmNlKSB7CiAgICAgICAgIE1lbW9yeU9iamVjdEluZm8gbWVtb3J5T2JqZWN0SW5m byh0aGlzLCBvd25lck9iamVjdFR5cGUpOwotICAgICAgICBvYmplY3QtPnJlcG9ydE1lbW9yeVVz YWdlKCZtZW1vcnlPYmplY3RJbmZvKTsKKyAgICAgICAgc2VsZWN0SW5zdHJ1bWVudGF0aW9uTWV0 aG9kPFQ+KG9iamVjdCwgJm1lbW9yeU9iamVjdEluZm8pOwogICAgIH0gZWxzZSB7CiAgICAgICAg IGlmICghb2JqZWN0IHx8IHZpc2l0ZWQob2JqZWN0KSkKICAgICAgICAgICAgIHJldHVybjsKQEAg LTI1NCwxMSArMjc1LDcgQEAgdm9pZCBNZW1vcnlJbnN0cnVtZW50YXRpb246OmFkZE9iamVjdElt cGwoY29uc3QgUmVmUHRyPFQ+KiBjb25zdCYgb2JqZWN0LCBNZW1vcnkKIHRlbXBsYXRlPHR5cGVu YW1lIFQ+CiB2b2lkIE1lbW9yeUluc3RydW1lbnRhdGlvbjo6YWRkT2JqZWN0SW1wbChjb25zdCBU KiBjb25zdCYgb2JqZWN0LCBNZW1vcnlPYmplY3RUeXBlIG93bmVyT2JqZWN0VHlwZSwgTWVtb3J5 T3duaW5nVHlwZSBvd25pbmdUeXBlKQogewotICAgIGlmICghb2JqZWN0IHx8IHZpc2l0ZWQob2Jq ZWN0KSkKLSAgICAgICAgcmV0dXJuOwotICAgIGlmIChvd25pbmdUeXBlID09IGJ5UmVmZXJlbmNl KQotICAgICAgICByZXR1cm47Ci0gICAgY291bnRPYmplY3RTaXplKG93bmVyT2JqZWN0VHlwZSwg c2l6ZW9mKFQpKTsKKyAgICBhZGRJbnN0cnVtZW50ZWRPYmplY3RJbXBsKG9iamVjdCwgb3duZXJP YmplY3RUeXBlLCBvd25pbmdUeXBlKTsKIH0KIAogdGVtcGxhdGU8dHlwZW5hbWUgSGFzaE1hcFR5 cGU+CkBAIC0zMzMsNyArMzUwLDcgQEAgdGVtcGxhdGU8dHlwZW5hbWUgVD4KIHZvaWQgTWVtb3J5 SW5zdHJ1bWVudGF0aW9uOjpJbnN0cnVtZW50ZWRQb2ludGVyPFQ+Ojpwcm9jZXNzKE1lbW9yeUlu c3RydW1lbnRhdGlvbiogbWVtb3J5SW5zdHJ1bWVudGF0aW9uKQogewogICAgIE1lbW9yeU9iamVj dEluZm8gbWVtb3J5T2JqZWN0SW5mbyhtZW1vcnlJbnN0cnVtZW50YXRpb24sIG1fb3duZXJPYmpl Y3RUeXBlKTsKLSAgICBtX3BvaW50ZXItPnJlcG9ydE1lbW9yeVVzYWdlKCZtZW1vcnlPYmplY3RJ bmZvKTsKKyAgICBzZWxlY3RJbnN0cnVtZW50YXRpb25NZXRob2Q8VD4obV9wb2ludGVyLCAmbWVt b3J5T2JqZWN0SW5mbyk7CiAgICAgbWVtb3J5SW5zdHJ1bWVudGF0aW9uLT5jb3VudE9iamVjdFNp emUobWVtb3J5T2JqZWN0SW5mby5vYmplY3RUeXBlKCksIG1lbW9yeU9iamVjdEluZm8ub2JqZWN0 U2l6ZSgpKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9N ZW1vcnlJbnN0cnVtZW50YXRpb25UZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVz dHMvTWVtb3J5SW5zdHJ1bWVudGF0aW9uVGVzdC5jcHAKaW5kZXggNGEwYTNjZjgxZmViMDlmYmU5 MTNkM2MxMDI5NjkyYTYzZTY1OWYxMC4uNzBiMzY1MGJmNTRiNjVjZGE4ZTUzMDllYTc0YWI4MTRm ZDRmOTY4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9NZW1vcnlJ bnN0cnVtZW50YXRpb25UZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3Rz L01lbW9yeUluc3RydW1lbnRhdGlvblRlc3QuY3BwCkBAIC0yNzUsNSArMjc1LDMzIEBAIFRFU1Qo TWVtb3J5SW5zdHJ1bWVudGF0aW9uVGVzdCwgdmlzaXRTdHJpbmdzKQogICAgIH0KIH0KIAordGVt cGxhdGU8dHlwZW5hbWUgVD4KK2NsYXNzIEluc3RydW1lbnRlZFRlbXBsYXRlIHsKK3B1YmxpYzoK KyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBWPgorICAgIEluc3RydW1lbnRlZFRlbXBsYXRlKGNvbnN0 IFYmIHZhbHVlKSA6IG1fdmFsdWUodmFsdWUpIHsgfQorCisgICAgdGVtcGxhdGU8dHlwZW5hbWUg TWVtb3J5T2JqZWN0SW5mbz4KKyAgICB2b2lkIHJlcG9ydE1lbW9yeVVzYWdlKE1lbW9yeU9iamVj dEluZm8qIG1lbW9yeU9iamVjdEluZm8pIGNvbnN0CisgICAgeworICAgICAgICB0eXBlbmFtZSBN ZW1vcnlPYmplY3RJbmZvOjpDbGFzc0luZm8gaW5mbyhtZW1vcnlPYmplY3RJbmZvLCB0aGlzLCBX ZWJDb3JlTWVtb3J5VHlwZXM6OkRPTSk7CisgICAgICAgIGluZm8uYWRkTWVtYmVyKG1fdmFsdWUp OworICAgIH0KKworICAgIFQgbV92YWx1ZTsKK307CisKK1RFU1QoTWVtb3J5SW5zdHJ1bWVudGF0 aW9uVGVzdCwgZGV0ZWN0UmVwb3J0TWVtb3J5VXNhZ2VNZXRob2QpCit7CisgICAgVmlzaXRlZE9i amVjdHMgdmlzaXRlZE9iamVjdHM7CisgICAgTWVtb3J5SW5zdHJ1bWVudGF0aW9uSW1wbCBpbXBs KHZpc2l0ZWRPYmplY3RzKTsKKworICAgIE93blB0cjxJbnN0cnVtZW50ZWRUZW1wbGF0ZTxTdHJp bmc+ID4gdmFsdWUgPSBhZG9wdFB0cihuZXcgSW5zdHJ1bWVudGVkVGVtcGxhdGU8U3RyaW5nPigi IikpOworICAgIEluc3RydW1lbnRlZE93bmVyPEluc3RydW1lbnRlZFRlbXBsYXRlPFN0cmluZz4q ID4gcm9vdCh2YWx1ZS5nZXQoKSk7CisgICAgaW1wbC5hZGRSb290T2JqZWN0KHJvb3QpOworICAg IEVYUEVDVF9FUShzaXplb2YoSW5zdHJ1bWVudGVkVGVtcGxhdGU8U3RyaW5nPikgKyBzaXplb2Yo U3RyaW5nSW1wbCksIGltcGwucmVwb3J0ZWRTaXplRm9yQWxsVHlwZXMoKSk7CisgICAgRVhQRUNU X0VRKDIsIHZpc2l0ZWRPYmplY3RzLnNpemUoKSk7Cit9CisKIH0gLy8gbmFtZXNwYWNlCiAK 164281 2012-09-15 04:41:55 -0700 2012-09-15 04:58:15 -0700 The patch for windows try bot. I can't reproduce the problem locally. bug-96756-20120915154125.patch text/plain 7234 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4Njg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDEzODljNWRiNjlkYzBlZjg1ZGE2ZTc2 M2Y3MjA2ZTRhNjYzOGE0YWIuLmZmNzJlODhmYzlhNWViNDdjNGZhMjYyYWNiYjM2MWIzOGFkNGQ0 NjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTItMDktMTUgIFl1cnkgU2VtaWtoYXRza3kgIDx5 dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYXV0b21hdGljYWxs eSBkZXRlY3QgaWYgY2xhc3MgaGFzIHJlcG9ydE1lbW9yeVVzYWdlIG1ldGhvZAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTY3NTYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1ldGVkIGF1dG9tYXRp YyBzZWxlY3RvciBvZiB0aGUgbWVtb3J5IHJlcG9ydGluZyBtZXRob2QuIElmCisgICAgICAgIGFu IG9iamVjdCBoYXMgcmVwb3J0TWVtb3J5VXNhZ2UgbWV0aG9kIHRoZW4gY2FsbCBpdC4gT3RoZXJ3 aXNlCisgICAgICAgIGNvdW50IG9ubHkgb2JqZWN0J3Mgc2VsZiBzaXplLiBBcyB0aGUgbmV4dCBz dGVwIHdlIHdpbGwgZGVsZXRlCisgICAgICAgIGFkZEluc3RydW1lbnRlZE1lbWJlciBhbmQgYWRk SW5zdHJ1bWVudGVkT2JqZWN0SW1wbCBhbmQgd2lsbAorICAgICAgICBoYXZlIG9ubHkgYWRkTWVt YmVyIGFuZCBhZGRPYmplY3RJbXBsIHRoYXQgd291bGQgYXV0b21hdGljYWxseQorICAgICAgICBj YWxsIHJlcG9ydE1lbW9yeVVzYWdlIGlmIGl0IGlzIHByZXNlbnQuCisKKyAgICAgICAgKiB3dGYv TWVtb3J5SW5zdHJ1bWVudGF0aW9uLmg6CisgICAgICAgIChXVEY6Ok1lbW9yeUluc3RydW1lbnRh dGlvbjo6c2VsZWN0SW5zdHJ1bWVudGF0aW9uTWV0aG9kKToKKyAgICAgICAgKE1lbW9yeUluc3Ry dW1lbnRhdGlvbik6CisgICAgICAgIChXVEY6Ok1lbW9yeUluc3RydW1lbnRhdGlvbjo6cmVwb3J0 T2JqZWN0TWVtb3J5VXNhZ2UpOgorICAgICAgICAoV1RGOjpNZW1vcnlJbnN0cnVtZW50YXRpb246 OmFkZEluc3RydW1lbnRlZE9iamVjdEltcGwpOgorICAgICAgICAoV1RGOjpNZW1vcnlJbnN0cnVt ZW50YXRpb246OmFkZE9iamVjdEltcGwpOgorICAgICAgICAoV1RGOjo6OnByb2Nlc3MpOgorCiAy MDEyLTA5LTE0ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAg IE1pbmltaXplIGNvbGxpc2lvbnMgd2hlbiBoYXNoaW5nIHBhaXJzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCmluZGV4IDAzNThjYjM1MWJjMTRmNDQxNjViNDhiODA3N2YzZTQxZTU1OGYzZmYuLjA4 MTllY2M2YmJiZDAwZTkwYTM0MzUwOTdhZDBkODE3OTdjMzdkODQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTItMDktMTUgIFl1cnkgU2VtaWtoYXRza3kg IDx5dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYXV0b21hdGlj YWxseSBkZXRlY3QgaWYgY2xhc3MgaGFzIHJlcG9ydE1lbW9yeVVzYWdlIG1ldGhvZAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTY3NTYKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0IHRoYXQgcmVwb3J0 TWVtb3J5VXNhZ2UgbWV0aG9kIHdpbGwgYmUgY2FsbGVkIG9uIHRoZSBpbnN0cnVtZW50ZWQgb2Jq ZWN0CisgICAgICAgIGV2ZW4gaWYgaXQgaXMgYSB0ZW1wbGF0ZS4KKworICAgICAgICAqIHRlc3Rz L01lbW9yeUluc3RydW1lbnRhdGlvblRlc3QuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAg ICAgIChJbnN0cnVtZW50ZWRUZW1wbGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnN0cnVtZW50 ZWRUZW1wbGF0ZTo6SW5zdHJ1bWVudGVkVGVtcGxhdGUpOgorICAgICAgICAoV2ViQ29yZTo6SW5z dHJ1bWVudGVkVGVtcGxhdGU6OnJlcG9ydE1lbW9yeVVzYWdlKToKKyAgICAgICAgKFdlYkNvcmU6 OlRFU1QpOgorCiAyMDEyLTA5LTE0ICBKdWxpZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJr aXQub3JnPgogCiAgICAgICAgIFJldmVydCByMTI3NDU3IGFuZCBmb2xsb3dpbmcgZml4ZXMgZHVl IHRvIHNldmVyYWwgaGl0LXRlc3RpbmcgcmVncmVzc2lvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X VEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvbi5oIGIvU291cmNlL1dURi93dGYvTWVtb3J5SW5z dHJ1bWVudGF0aW9uLmgKaW5kZXggMDRjYThkMjBlMDZkY2Y2YzA5ZWFlM2NkNjgzOTcxN2IyZjg4 ODcwNi4uYmI4MThjODMxYzRiNzdiN2IzZmQ1YmY1YTA5MmY1OTgzYjhmOTViMSAxMDA2NDQKLS0t IGEvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uLmgKKysrIGIvU291cmNlL1dU Ri93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uLmgKQEAgLTc1LDYgKzc1LDI5IEBAIHByaXZhdGU6 CiAKICAgICBmcmllbmQgY2xhc3MgTWVtb3J5Q2xhc3NJbmZvOwogCisgICAgdGVtcGxhdGU8dHlw ZW5hbWUgVD4gc3RhdGljIHZvaWQgc2VsZWN0SW5zdHJ1bWVudGF0aW9uTWV0aG9kKGNvbnN0IFQq IGNvbnN0JiBvYmplY3QsIE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8pCisgICAg eworICAgICAgICAvLyBJZiB0aGVyZSBpcyByZXBvcnRNZW1vcnlVc2FnZSBtZXRob2Qgb24gdGhl IG9iamVjdCwgY2FsbCBpdC4KKyAgICAgICAgLy8gT3RoZXJ3aXNlIGNvdW50IG9ubHkgb2JqZWN0 J3Mgc2VsZiBzaXplLgorICAgICAgICByZXBvcnRPYmplY3RNZW1vcnlVc2FnZTxULCB2b2lkIChU OjoqKShNZW1vcnlPYmplY3RJbmZvKikgY29uc3Q+KG9iamVjdCwgbWVtb3J5T2JqZWN0SW5mbywg MCk7CisgICAgfQorCisgICAgdGVtcGxhdGU8dHlwZW5hbWUgVHlwZSwgVHlwZSBQdHI+IHN0cnVj dCBNZW1iZXJIZWxwZXJTdHJ1Y3Q7CisgICAgdGVtcGxhdGU8dHlwZW5hbWUgVCwgdHlwZW5hbWUg VHlwZT4KKyAgICBzdGF0aWMgdm9pZCByZXBvcnRPYmplY3RNZW1vcnlVc2FnZShjb25zdCBUKiBj b25zdCYgb2JqZWN0LCBNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvLCAgTWVtYmVy SGVscGVyU3RydWN0PFR5cGUsICZUOjpyZXBvcnRNZW1vcnlVc2FnZT4qKQorICAgIHsKKyAgICAg ICAgb2JqZWN0LT5yZXBvcnRNZW1vcnlVc2FnZShtZW1vcnlPYmplY3RJbmZvKTsKKyAgICB9CisK KyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBULCB0eXBlbmFtZSBUeXBlPgorICAgIHN0YXRpYyB2b2lk IHJlcG9ydE9iamVjdE1lbW9yeVVzYWdlKGNvbnN0IFQqIGNvbnN0JiBvYmplY3QsIE1lbW9yeU9i amVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8sIC4uLikKKyAgICB7CisgICAgICAgIGNvdW50Tm90 SW5zdHJ1bWVudGVkT2JqZWN0KG9iamVjdCwgbWVtb3J5T2JqZWN0SW5mbyk7CisgICAgfQorCisg ICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4KKyAgICBzdGF0aWMgdm9pZCBjb3VudE5vdEluc3RydW1l bnRlZE9iamVjdChjb25zdCBUKiBjb25zdCYsIE1lbW9yeU9iamVjdEluZm8qKTsKKwogICAgIHRl bXBsYXRlPHR5cGVuYW1lIFQ+IGNsYXNzIEluc3RydW1lbnRlZFBvaW50ZXIgOiBwdWJsaWMgSW5z dHJ1bWVudGVkUG9pbnRlckJhc2UgewogICAgIHB1YmxpYzoKICAgICAgICAgZXhwbGljaXQgSW5z dHJ1bWVudGVkUG9pbnRlcihjb25zdCBUKiBwb2ludGVyLCBNZW1vcnlPYmplY3RUeXBlIG93bmVy T2JqZWN0VHlwZSkgOiBtX3BvaW50ZXIocG9pbnRlciksIG1fb3duZXJPYmplY3RUeXBlKG93bmVy T2JqZWN0VHlwZSkgeyB9CkBAIC0xNTUsNiArMTc4LDcgQEAgcHVibGljOgogCiBwcml2YXRlOgog ICAgIGZyaWVuZCBjbGFzcyBNZW1vcnlDbGFzc0luZm87CisgICAgZnJpZW5kIGNsYXNzIE1lbW9y eUluc3RydW1lbnRhdGlvbjsKIAogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IHZvaWQgcmVwb3J0 T2JqZWN0SW5mbyhNZW1vcnlPYmplY3RUeXBlIG9iamVjdFR5cGUsIHNpemVfdCBhY3R1YWxTaXpl KQogICAgIHsKQEAgLTIxMSw3ICsyMzUsNyBAQCB2b2lkIE1lbW9yeUluc3RydW1lbnRhdGlvbjo6 YWRkSW5zdHJ1bWVudGVkT2JqZWN0SW1wbChjb25zdCBUKiBjb25zdCYgb2JqZWN0LCBNZQogewog ICAgIGlmIChvd25pbmdUeXBlID09IGJ5UmVmZXJlbmNlKSB7CiAgICAgICAgIE1lbW9yeU9iamVj dEluZm8gbWVtb3J5T2JqZWN0SW5mbyh0aGlzLCBvd25lck9iamVjdFR5cGUpOwotICAgICAgICBv YmplY3QtPnJlcG9ydE1lbW9yeVVzYWdlKCZtZW1vcnlPYmplY3RJbmZvKTsKKyAgICAgICAgc2Vs ZWN0SW5zdHJ1bWVudGF0aW9uTWV0aG9kPFQ+KG9iamVjdCwgJm1lbW9yeU9iamVjdEluZm8pOwog ICAgIH0gZWxzZSB7CiAgICAgICAgIGlmICghb2JqZWN0IHx8IHZpc2l0ZWQob2JqZWN0KSkKICAg ICAgICAgICAgIHJldHVybjsKQEAgLTI1NCwxMSArMjc4LDEzIEBAIHZvaWQgTWVtb3J5SW5zdHJ1 bWVudGF0aW9uOjphZGRPYmplY3RJbXBsKGNvbnN0IFJlZlB0cjxUPiogY29uc3QmIG9iamVjdCwg TWVtb3J5CiB0ZW1wbGF0ZTx0eXBlbmFtZSBUPgogdm9pZCBNZW1vcnlJbnN0cnVtZW50YXRpb246 OmFkZE9iamVjdEltcGwoY29uc3QgVCogY29uc3QmIG9iamVjdCwgTWVtb3J5T2JqZWN0VHlwZSBv d25lck9iamVjdFR5cGUsIE1lbW9yeU93bmluZ1R5cGUgb3duaW5nVHlwZSkKIHsKLSAgICBpZiAo IW9iamVjdCB8fCB2aXNpdGVkKG9iamVjdCkpCi0gICAgICAgIHJldHVybjsKLSAgICBpZiAob3du aW5nVHlwZSA9PSBieVJlZmVyZW5jZSkKLSAgICAgICAgcmV0dXJuOwotICAgIGNvdW50T2JqZWN0 U2l6ZShvd25lck9iamVjdFR5cGUsIHNpemVvZihUKSk7CisgICAgYWRkSW5zdHJ1bWVudGVkT2Jq ZWN0SW1wbChvYmplY3QsIG93bmVyT2JqZWN0VHlwZSwgb3duaW5nVHlwZSk7Cit9CisKK3RlbXBs YXRlPHR5cGVuYW1lIFQ+Cit2b2lkIE1lbW9yeUluc3RydW1lbnRhdGlvbjo6Y291bnROb3RJbnN0 cnVtZW50ZWRPYmplY3QoY29uc3QgVCogY29uc3QmIG9iamVjdCwgTWVtb3J5T2JqZWN0SW5mbyog bWVtb3J5T2JqZWN0SW5mbykKK3sKKyAgICBtZW1vcnlPYmplY3RJbmZvLT5yZXBvcnRPYmplY3RJ bmZvPFQ+KDAsIHNpemVvZihUKSk7CiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIEhhc2hNYXBUeXBl PgpAQCAtMzMzLDcgKzM1OSw3IEBAIHRlbXBsYXRlPHR5cGVuYW1lIFQ+CiB2b2lkIE1lbW9yeUlu c3RydW1lbnRhdGlvbjo6SW5zdHJ1bWVudGVkUG9pbnRlcjxUPjo6cHJvY2VzcyhNZW1vcnlJbnN0 cnVtZW50YXRpb24qIG1lbW9yeUluc3RydW1lbnRhdGlvbikKIHsKICAgICBNZW1vcnlPYmplY3RJ bmZvIG1lbW9yeU9iamVjdEluZm8obWVtb3J5SW5zdHJ1bWVudGF0aW9uLCBtX293bmVyT2JqZWN0 VHlwZSk7Ci0gICAgbV9wb2ludGVyLT5yZXBvcnRNZW1vcnlVc2FnZSgmbWVtb3J5T2JqZWN0SW5m byk7CisgICAgc2VsZWN0SW5zdHJ1bWVudGF0aW9uTWV0aG9kPFQ+KG1fcG9pbnRlciwgJm1lbW9y eU9iamVjdEluZm8pOwogICAgIG1lbW9yeUluc3RydW1lbnRhdGlvbi0+Y291bnRPYmplY3RTaXpl KG1lbW9yeU9iamVjdEluZm8ub2JqZWN0VHlwZSgpLCBtZW1vcnlPYmplY3RJbmZvLm9iamVjdFNp emUoKSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvTWVt b3J5SW5zdHJ1bWVudGF0aW9uVGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3Rz L01lbW9yeUluc3RydW1lbnRhdGlvblRlc3QuY3BwCmluZGV4IDRhMGEzY2Y4MWZlYjA5ZmJlOTEz ZDNjMTAyOTY5MmE2M2U2NTlmMTAuLjcwYjM2NTBiZjU0YjY1Y2RhOGU1MzA5ZWE3NGFiODE0ZmQ0 Zjk2ODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvTWVtb3J5SW5z dHJ1bWVudGF0aW9uVGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9N ZW1vcnlJbnN0cnVtZW50YXRpb25UZXN0LmNwcApAQCAtMjc1LDUgKzI3NSwzMyBAQCBURVNUKE1l bW9yeUluc3RydW1lbnRhdGlvblRlc3QsIHZpc2l0U3RyaW5ncykKICAgICB9CiB9CiAKK3RlbXBs YXRlPHR5cGVuYW1lIFQ+CitjbGFzcyBJbnN0cnVtZW50ZWRUZW1wbGF0ZSB7CitwdWJsaWM6Cisg ICAgdGVtcGxhdGU8dHlwZW5hbWUgVj4KKyAgICBJbnN0cnVtZW50ZWRUZW1wbGF0ZShjb25zdCBW JiB2YWx1ZSkgOiBtX3ZhbHVlKHZhbHVlKSB7IH0KKworICAgIHRlbXBsYXRlPHR5cGVuYW1lIE1l bW9yeU9iamVjdEluZm8+CisgICAgdm9pZCByZXBvcnRNZW1vcnlVc2FnZShNZW1vcnlPYmplY3RJ bmZvKiBtZW1vcnlPYmplY3RJbmZvKSBjb25zdAorICAgIHsKKyAgICAgICAgdHlwZW5hbWUgTWVt b3J5T2JqZWN0SW5mbzo6Q2xhc3NJbmZvIGluZm8obWVtb3J5T2JqZWN0SW5mbywgdGhpcywgV2Vi Q29yZU1lbW9yeVR5cGVzOjpET00pOworICAgICAgICBpbmZvLmFkZE1lbWJlcihtX3ZhbHVlKTsK KyAgICB9CisKKyAgICBUIG1fdmFsdWU7Cit9OworCitURVNUKE1lbW9yeUluc3RydW1lbnRhdGlv blRlc3QsIGRldGVjdFJlcG9ydE1lbW9yeVVzYWdlTWV0aG9kKQoreworICAgIFZpc2l0ZWRPYmpl Y3RzIHZpc2l0ZWRPYmplY3RzOworICAgIE1lbW9yeUluc3RydW1lbnRhdGlvbkltcGwgaW1wbCh2 aXNpdGVkT2JqZWN0cyk7CisKKyAgICBPd25QdHI8SW5zdHJ1bWVudGVkVGVtcGxhdGU8U3RyaW5n PiA+IHZhbHVlID0gYWRvcHRQdHIobmV3IEluc3RydW1lbnRlZFRlbXBsYXRlPFN0cmluZz4oIiIp KTsKKyAgICBJbnN0cnVtZW50ZWRPd25lcjxJbnN0cnVtZW50ZWRUZW1wbGF0ZTxTdHJpbmc+KiA+ IHJvb3QodmFsdWUuZ2V0KCkpOworICAgIGltcGwuYWRkUm9vdE9iamVjdChyb290KTsKKyAgICBF WFBFQ1RfRVEoc2l6ZW9mKEluc3RydW1lbnRlZFRlbXBsYXRlPFN0cmluZz4pICsgc2l6ZW9mKFN0 cmluZ0ltcGwpLCBpbXBsLnJlcG9ydGVkU2l6ZUZvckFsbFR5cGVzKCkpOworICAgIEVYUEVDVF9F USgyLCB2aXNpdGVkT2JqZWN0cy5zaXplKCkpOworfQorCiB9IC8vIG5hbWVzcGFjZQogCg== 164282 2012-09-15 04:58:23 -0700 2012-09-17 00:32:36 -0700 The patch for windows try bot. I can't reproduce the problem locally. Unused parameter was removed. bug-96756-20120915155753.patch text/plain 7227 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4Njg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDEzODljNWRiNjlkYzBlZjg1ZGE2ZTc2 M2Y3MjA2ZTRhNjYzOGE0YWIuLmZmNzJlODhmYzlhNWViNDdjNGZhMjYyYWNiYjM2MWIzOGFkNGQ0 NjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTItMDktMTUgIFl1cnkgU2VtaWtoYXRza3kgIDx5 dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYXV0b21hdGljYWxs eSBkZXRlY3QgaWYgY2xhc3MgaGFzIHJlcG9ydE1lbW9yeVVzYWdlIG1ldGhvZAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTY3NTYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1ldGVkIGF1dG9tYXRp YyBzZWxlY3RvciBvZiB0aGUgbWVtb3J5IHJlcG9ydGluZyBtZXRob2QuIElmCisgICAgICAgIGFu IG9iamVjdCBoYXMgcmVwb3J0TWVtb3J5VXNhZ2UgbWV0aG9kIHRoZW4gY2FsbCBpdC4gT3RoZXJ3 aXNlCisgICAgICAgIGNvdW50IG9ubHkgb2JqZWN0J3Mgc2VsZiBzaXplLiBBcyB0aGUgbmV4dCBz dGVwIHdlIHdpbGwgZGVsZXRlCisgICAgICAgIGFkZEluc3RydW1lbnRlZE1lbWJlciBhbmQgYWRk SW5zdHJ1bWVudGVkT2JqZWN0SW1wbCBhbmQgd2lsbAorICAgICAgICBoYXZlIG9ubHkgYWRkTWVt YmVyIGFuZCBhZGRPYmplY3RJbXBsIHRoYXQgd291bGQgYXV0b21hdGljYWxseQorICAgICAgICBj YWxsIHJlcG9ydE1lbW9yeVVzYWdlIGlmIGl0IGlzIHByZXNlbnQuCisKKyAgICAgICAgKiB3dGYv TWVtb3J5SW5zdHJ1bWVudGF0aW9uLmg6CisgICAgICAgIChXVEY6Ok1lbW9yeUluc3RydW1lbnRh dGlvbjo6c2VsZWN0SW5zdHJ1bWVudGF0aW9uTWV0aG9kKToKKyAgICAgICAgKE1lbW9yeUluc3Ry dW1lbnRhdGlvbik6CisgICAgICAgIChXVEY6Ok1lbW9yeUluc3RydW1lbnRhdGlvbjo6cmVwb3J0 T2JqZWN0TWVtb3J5VXNhZ2UpOgorICAgICAgICAoV1RGOjpNZW1vcnlJbnN0cnVtZW50YXRpb246 OmFkZEluc3RydW1lbnRlZE9iamVjdEltcGwpOgorICAgICAgICAoV1RGOjpNZW1vcnlJbnN0cnVt ZW50YXRpb246OmFkZE9iamVjdEltcGwpOgorICAgICAgICAoV1RGOjo6OnByb2Nlc3MpOgorCiAy MDEyLTA5LTE0ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgogCiAgICAgICAg IE1pbmltaXplIGNvbGxpc2lvbnMgd2hlbiBoYXNoaW5nIHBhaXJzCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCmluZGV4IDAzNThjYjM1MWJjMTRmNDQxNjViNDhiODA3N2YzZTQxZTU1OGYzZmYuLjA4 MTllY2M2YmJiZDAwZTkwYTM0MzUwOTdhZDBkODE3OTdjMzdkODQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTItMDktMTUgIFl1cnkgU2VtaWtoYXRza3kg IDx5dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYXV0b21hdGlj YWxseSBkZXRlY3QgaWYgY2xhc3MgaGFzIHJlcG9ydE1lbW9yeVVzYWdlIG1ldGhvZAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTY3NTYKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0IHRoYXQgcmVwb3J0 TWVtb3J5VXNhZ2UgbWV0aG9kIHdpbGwgYmUgY2FsbGVkIG9uIHRoZSBpbnN0cnVtZW50ZWQgb2Jq ZWN0CisgICAgICAgIGV2ZW4gaWYgaXQgaXMgYSB0ZW1wbGF0ZS4KKworICAgICAgICAqIHRlc3Rz L01lbW9yeUluc3RydW1lbnRhdGlvblRlc3QuY3BwOgorICAgICAgICAoV2ViQ29yZSk6CisgICAg ICAgIChJbnN0cnVtZW50ZWRUZW1wbGF0ZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnN0cnVtZW50 ZWRUZW1wbGF0ZTo6SW5zdHJ1bWVudGVkVGVtcGxhdGUpOgorICAgICAgICAoV2ViQ29yZTo6SW5z dHJ1bWVudGVkVGVtcGxhdGU6OnJlcG9ydE1lbW9yeVVzYWdlKToKKyAgICAgICAgKFdlYkNvcmU6 OlRFU1QpOgorCiAyMDEyLTA5LTE0ICBKdWxpZW4gQ2hhZmZyYWl4ICA8amNoYWZmcmFpeEB3ZWJr aXQub3JnPgogCiAgICAgICAgIFJldmVydCByMTI3NDU3IGFuZCBmb2xsb3dpbmcgZml4ZXMgZHVl IHRvIHNldmVyYWwgaGl0LXRlc3RpbmcgcmVncmVzc2lvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X VEYvd3RmL01lbW9yeUluc3RydW1lbnRhdGlvbi5oIGIvU291cmNlL1dURi93dGYvTWVtb3J5SW5z dHJ1bWVudGF0aW9uLmgKaW5kZXggMDRjYThkMjBlMDZkY2Y2YzA5ZWFlM2NkNjgzOTcxN2IyZjg4 ODcwNi4uOTk4YjQxZmVhZGU1MzMxMWUwYzE1ZjJiMGEyMTkyZTNjZDhmYjVlZiAxMDA2NDQKLS0t IGEvU291cmNlL1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uLmgKKysrIGIvU291cmNlL1dU Ri93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uLmgKQEAgLTc1LDYgKzc1LDI5IEBAIHByaXZhdGU6 CiAKICAgICBmcmllbmQgY2xhc3MgTWVtb3J5Q2xhc3NJbmZvOwogCisgICAgdGVtcGxhdGU8dHlw ZW5hbWUgVD4gc3RhdGljIHZvaWQgc2VsZWN0SW5zdHJ1bWVudGF0aW9uTWV0aG9kKGNvbnN0IFQq IGNvbnN0JiBvYmplY3QsIE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8pCisgICAg eworICAgICAgICAvLyBJZiB0aGVyZSBpcyByZXBvcnRNZW1vcnlVc2FnZSBtZXRob2Qgb24gdGhl IG9iamVjdCwgY2FsbCBpdC4KKyAgICAgICAgLy8gT3RoZXJ3aXNlIGNvdW50IG9ubHkgb2JqZWN0 J3Mgc2VsZiBzaXplLgorICAgICAgICByZXBvcnRPYmplY3RNZW1vcnlVc2FnZTxULCB2b2lkIChU OjoqKShNZW1vcnlPYmplY3RJbmZvKikgY29uc3Q+KG9iamVjdCwgbWVtb3J5T2JqZWN0SW5mbywg MCk7CisgICAgfQorCisgICAgdGVtcGxhdGU8dHlwZW5hbWUgVHlwZSwgVHlwZSBQdHI+IHN0cnVj dCBNZW1iZXJIZWxwZXJTdHJ1Y3Q7CisgICAgdGVtcGxhdGU8dHlwZW5hbWUgVCwgdHlwZW5hbWUg VHlwZT4KKyAgICBzdGF0aWMgdm9pZCByZXBvcnRPYmplY3RNZW1vcnlVc2FnZShjb25zdCBUKiBj b25zdCYgb2JqZWN0LCBNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvLCAgTWVtYmVy SGVscGVyU3RydWN0PFR5cGUsICZUOjpyZXBvcnRNZW1vcnlVc2FnZT4qKQorICAgIHsKKyAgICAg ICAgb2JqZWN0LT5yZXBvcnRNZW1vcnlVc2FnZShtZW1vcnlPYmplY3RJbmZvKTsKKyAgICB9CisK KyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBULCB0eXBlbmFtZSBUeXBlPgorICAgIHN0YXRpYyB2b2lk IHJlcG9ydE9iamVjdE1lbW9yeVVzYWdlKGNvbnN0IFQqIGNvbnN0JiBvYmplY3QsIE1lbW9yeU9i amVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8sIC4uLikKKyAgICB7CisgICAgICAgIGNvdW50Tm90 SW5zdHJ1bWVudGVkT2JqZWN0KG9iamVjdCwgbWVtb3J5T2JqZWN0SW5mbyk7CisgICAgfQorCisg ICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4KKyAgICBzdGF0aWMgdm9pZCBjb3VudE5vdEluc3RydW1l bnRlZE9iamVjdChjb25zdCBUKiBjb25zdCYsIE1lbW9yeU9iamVjdEluZm8qKTsKKwogICAgIHRl bXBsYXRlPHR5cGVuYW1lIFQ+IGNsYXNzIEluc3RydW1lbnRlZFBvaW50ZXIgOiBwdWJsaWMgSW5z dHJ1bWVudGVkUG9pbnRlckJhc2UgewogICAgIHB1YmxpYzoKICAgICAgICAgZXhwbGljaXQgSW5z dHJ1bWVudGVkUG9pbnRlcihjb25zdCBUKiBwb2ludGVyLCBNZW1vcnlPYmplY3RUeXBlIG93bmVy T2JqZWN0VHlwZSkgOiBtX3BvaW50ZXIocG9pbnRlciksIG1fb3duZXJPYmplY3RUeXBlKG93bmVy T2JqZWN0VHlwZSkgeyB9CkBAIC0xNTUsNiArMTc4LDcgQEAgcHVibGljOgogCiBwcml2YXRlOgog ICAgIGZyaWVuZCBjbGFzcyBNZW1vcnlDbGFzc0luZm87CisgICAgZnJpZW5kIGNsYXNzIE1lbW9y eUluc3RydW1lbnRhdGlvbjsKIAogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+IHZvaWQgcmVwb3J0 T2JqZWN0SW5mbyhNZW1vcnlPYmplY3RUeXBlIG9iamVjdFR5cGUsIHNpemVfdCBhY3R1YWxTaXpl KQogICAgIHsKQEAgLTIxMSw3ICsyMzUsNyBAQCB2b2lkIE1lbW9yeUluc3RydW1lbnRhdGlvbjo6 YWRkSW5zdHJ1bWVudGVkT2JqZWN0SW1wbChjb25zdCBUKiBjb25zdCYgb2JqZWN0LCBNZQogewog ICAgIGlmIChvd25pbmdUeXBlID09IGJ5UmVmZXJlbmNlKSB7CiAgICAgICAgIE1lbW9yeU9iamVj dEluZm8gbWVtb3J5T2JqZWN0SW5mbyh0aGlzLCBvd25lck9iamVjdFR5cGUpOwotICAgICAgICBv YmplY3QtPnJlcG9ydE1lbW9yeVVzYWdlKCZtZW1vcnlPYmplY3RJbmZvKTsKKyAgICAgICAgc2Vs ZWN0SW5zdHJ1bWVudGF0aW9uTWV0aG9kPFQ+KG9iamVjdCwgJm1lbW9yeU9iamVjdEluZm8pOwog ICAgIH0gZWxzZSB7CiAgICAgICAgIGlmICghb2JqZWN0IHx8IHZpc2l0ZWQob2JqZWN0KSkKICAg ICAgICAgICAgIHJldHVybjsKQEAgLTI1NCwxMSArMjc4LDEzIEBAIHZvaWQgTWVtb3J5SW5zdHJ1 bWVudGF0aW9uOjphZGRPYmplY3RJbXBsKGNvbnN0IFJlZlB0cjxUPiogY29uc3QmIG9iamVjdCwg TWVtb3J5CiB0ZW1wbGF0ZTx0eXBlbmFtZSBUPgogdm9pZCBNZW1vcnlJbnN0cnVtZW50YXRpb246 OmFkZE9iamVjdEltcGwoY29uc3QgVCogY29uc3QmIG9iamVjdCwgTWVtb3J5T2JqZWN0VHlwZSBv d25lck9iamVjdFR5cGUsIE1lbW9yeU93bmluZ1R5cGUgb3duaW5nVHlwZSkKIHsKLSAgICBpZiAo IW9iamVjdCB8fCB2aXNpdGVkKG9iamVjdCkpCi0gICAgICAgIHJldHVybjsKLSAgICBpZiAob3du aW5nVHlwZSA9PSBieVJlZmVyZW5jZSkKLSAgICAgICAgcmV0dXJuOwotICAgIGNvdW50T2JqZWN0 U2l6ZShvd25lck9iamVjdFR5cGUsIHNpemVvZihUKSk7CisgICAgYWRkSW5zdHJ1bWVudGVkT2Jq ZWN0SW1wbChvYmplY3QsIG93bmVyT2JqZWN0VHlwZSwgb3duaW5nVHlwZSk7Cit9CisKK3RlbXBs YXRlPHR5cGVuYW1lIFQ+Cit2b2lkIE1lbW9yeUluc3RydW1lbnRhdGlvbjo6Y291bnROb3RJbnN0 cnVtZW50ZWRPYmplY3QoY29uc3QgVCogY29uc3QmLCBNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlP YmplY3RJbmZvKQoreworICAgIG1lbW9yeU9iamVjdEluZm8tPnJlcG9ydE9iamVjdEluZm88VD4o MCwgc2l6ZW9mKFQpKTsKIH0KIAogdGVtcGxhdGU8dHlwZW5hbWUgSGFzaE1hcFR5cGU+CkBAIC0z MzMsNyArMzU5LDcgQEAgdGVtcGxhdGU8dHlwZW5hbWUgVD4KIHZvaWQgTWVtb3J5SW5zdHJ1bWVu dGF0aW9uOjpJbnN0cnVtZW50ZWRQb2ludGVyPFQ+Ojpwcm9jZXNzKE1lbW9yeUluc3RydW1lbnRh dGlvbiogbWVtb3J5SW5zdHJ1bWVudGF0aW9uKQogewogICAgIE1lbW9yeU9iamVjdEluZm8gbWVt b3J5T2JqZWN0SW5mbyhtZW1vcnlJbnN0cnVtZW50YXRpb24sIG1fb3duZXJPYmplY3RUeXBlKTsK LSAgICBtX3BvaW50ZXItPnJlcG9ydE1lbW9yeVVzYWdlKCZtZW1vcnlPYmplY3RJbmZvKTsKKyAg ICBzZWxlY3RJbnN0cnVtZW50YXRpb25NZXRob2Q8VD4obV9wb2ludGVyLCAmbWVtb3J5T2JqZWN0 SW5mbyk7CiAgICAgbWVtb3J5SW5zdHJ1bWVudGF0aW9uLT5jb3VudE9iamVjdFNpemUobWVtb3J5 T2JqZWN0SW5mby5vYmplY3RUeXBlKCksIG1lbW9yeU9iamVjdEluZm8ub2JqZWN0U2l6ZSgpKTsK IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9NZW1vcnlJbnN0 cnVtZW50YXRpb25UZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvTWVtb3J5 SW5zdHJ1bWVudGF0aW9uVGVzdC5jcHAKaW5kZXggNGEwYTNjZjgxZmViMDlmYmU5MTNkM2MxMDI5 NjkyYTYzZTY1OWYxMC4uNzBiMzY1MGJmNTRiNjVjZGE4ZTUzMDllYTc0YWI4MTRmZDRmOTY4NiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9NZW1vcnlJbnN0cnVtZW50 YXRpb25UZXN0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL01lbW9yeUlu c3RydW1lbnRhdGlvblRlc3QuY3BwCkBAIC0yNzUsNSArMjc1LDMzIEBAIFRFU1QoTWVtb3J5SW5z dHJ1bWVudGF0aW9uVGVzdCwgdmlzaXRTdHJpbmdzKQogICAgIH0KIH0KIAordGVtcGxhdGU8dHlw ZW5hbWUgVD4KK2NsYXNzIEluc3RydW1lbnRlZFRlbXBsYXRlIHsKK3B1YmxpYzoKKyAgICB0ZW1w bGF0ZTx0eXBlbmFtZSBWPgorICAgIEluc3RydW1lbnRlZFRlbXBsYXRlKGNvbnN0IFYmIHZhbHVl KSA6IG1fdmFsdWUodmFsdWUpIHsgfQorCisgICAgdGVtcGxhdGU8dHlwZW5hbWUgTWVtb3J5T2Jq ZWN0SW5mbz4KKyAgICB2b2lkIHJlcG9ydE1lbW9yeVVzYWdlKE1lbW9yeU9iamVjdEluZm8qIG1l bW9yeU9iamVjdEluZm8pIGNvbnN0CisgICAgeworICAgICAgICB0eXBlbmFtZSBNZW1vcnlPYmpl Y3RJbmZvOjpDbGFzc0luZm8gaW5mbyhtZW1vcnlPYmplY3RJbmZvLCB0aGlzLCBXZWJDb3JlTWVt b3J5VHlwZXM6OkRPTSk7CisgICAgICAgIGluZm8uYWRkTWVtYmVyKG1fdmFsdWUpOworICAgIH0K KworICAgIFQgbV92YWx1ZTsKK307CisKK1RFU1QoTWVtb3J5SW5zdHJ1bWVudGF0aW9uVGVzdCwg ZGV0ZWN0UmVwb3J0TWVtb3J5VXNhZ2VNZXRob2QpCit7CisgICAgVmlzaXRlZE9iamVjdHMgdmlz aXRlZE9iamVjdHM7CisgICAgTWVtb3J5SW5zdHJ1bWVudGF0aW9uSW1wbCBpbXBsKHZpc2l0ZWRP YmplY3RzKTsKKworICAgIE93blB0cjxJbnN0cnVtZW50ZWRUZW1wbGF0ZTxTdHJpbmc+ID4gdmFs dWUgPSBhZG9wdFB0cihuZXcgSW5zdHJ1bWVudGVkVGVtcGxhdGU8U3RyaW5nPigiIikpOworICAg IEluc3RydW1lbnRlZE93bmVyPEluc3RydW1lbnRlZFRlbXBsYXRlPFN0cmluZz4qID4gcm9vdCh2 YWx1ZS5nZXQoKSk7CisgICAgaW1wbC5hZGRSb290T2JqZWN0KHJvb3QpOworICAgIEVYUEVDVF9F UShzaXplb2YoSW5zdHJ1bWVudGVkVGVtcGxhdGU8U3RyaW5nPikgKyBzaXplb2YoU3RyaW5nSW1w bCksIGltcGwucmVwb3J0ZWRTaXplRm9yQWxsVHlwZXMoKSk7CisgICAgRVhQRUNUX0VRKDIsIHZp c2l0ZWRPYmplY3RzLnNpemUoKSk7Cit9CisKIH0gLy8gbmFtZXNwYWNlCiAK 164350 2012-09-17 00:32:44 -0700 2012-09-17 01:15:41 -0700 comment addressed bug-96756-20120917113212.patch text/plain 9007 loislo U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4NzIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDhiZjMyNjgzMTUxMzgwZDk4NzJkNzgx MzMzM2M5ZjVmYTZlYjU4MzAuLmRlMzhlZWEwNzE4ZTNjMzMwMzM4OTVhOWM4NzI2Nzc5Yzg1N2U2 NWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTItMDktMTUgIFl1cnkgU2VtaWtoYXRza3kgIDx5 dXJ5c0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYXV0b21hdGljYWxs eSBkZXRlY3QgaWYgY2xhc3MgaGFzIHJlcG9ydE1lbW9yeVVzYWdlIG1ldGhvZAorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTY3NTYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1ldGVkIGF1dG9tYXRp YyBzZWxlY3RvciBvZiB0aGUgbWVtb3J5IHJlcG9ydGluZyBtZXRob2QuIElmCisgICAgICAgIGFu IG9iamVjdCBoYXMgcmVwb3J0TWVtb3J5VXNhZ2UgbWV0aG9kIHRoZW4gY2FsbCBpdC4gT3RoZXJ3 aXNlCisgICAgICAgIGNvdW50IG9ubHkgb2JqZWN0J3Mgc2VsZiBzaXplLiBBcyB0aGUgbmV4dCBz dGVwIHdlIHdpbGwgZGVsZXRlCisgICAgICAgIGFkZEluc3RydW1lbnRlZE1lbWJlciBhbmQgYWRk SW5zdHJ1bWVudGVkT2JqZWN0SW1wbCBhbmQgd2lsbAorICAgICAgICBoYXZlIG9ubHkgYWRkTWVt YmVyIGFuZCBhZGRPYmplY3RJbXBsIHRoYXQgd291bGQgYXV0b21hdGljYWxseQorICAgICAgICBj YWxsIHJlcG9ydE1lbW9yeVVzYWdlIGlmIGl0IGlzIHByZXNlbnQuCisKKyAgICAgICAgKiB3dGYv TWVtb3J5SW5zdHJ1bWVudGF0aW9uLmg6CisgICAgICAgIChXVEY6Ok1lbW9yeUluc3RydW1lbnRh dGlvbjo6c2VsZWN0SW5zdHJ1bWVudGF0aW9uTWV0aG9kKToKKyAgICAgICAgKE1lbW9yeUluc3Ry dW1lbnRhdGlvbik6CisgICAgICAgIChXVEY6Ok1lbW9yeUluc3RydW1lbnRhdGlvbjo6cmVwb3J0 T2JqZWN0TWVtb3J5VXNhZ2UpOgorICAgICAgICAoV1RGOjpNZW1vcnlJbnN0cnVtZW50YXRpb246 OmFkZEluc3RydW1lbnRlZE9iamVjdEltcGwpOgorICAgICAgICAoV1RGOjpNZW1vcnlJbnN0cnVt ZW50YXRpb246OmFkZE9iamVjdEltcGwpOgorICAgICAgICAoV1RGOjo6OnByb2Nlc3MpOgorCiAy MDEyLTA5LTE1ICBCZW5qYW1pbiBQb3VsYWluICA8YmVuamFtaW5Ad2Via2l0Lm9yZz4KIAogICAg ICAgICBGaXggdGhlIGJ1aWxkIHdpdGggV1RGIFVSTApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpp bmRleCBlNTJkMTc3YzEwNDUyNzM4ZTYyY2JlZDM2ZmZjOWIxM2JhMjMyNjY1Li5kNDAyNDJkZDIx MGUxOWIzYmQzNjVkMDY4NGU0NjMxM2VlYjM5NDkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTA5LTE1ICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNA Y2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGF1dG9tYXRpY2FsbHkgZGV0 ZWN0IGlmIGNsYXNzIGhhcyByZXBvcnRNZW1vcnlVc2FnZSBtZXRob2QKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2NzU2CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdCB0aGF0IHJlcG9ydE1lbW9yeVVz YWdlIG1ldGhvZCB3aWxsIGJlIGNhbGxlZCBvbiB0aGUgaW5zdHJ1bWVudGVkIG9iamVjdAorICAg ICAgICBldmVuIGlmIGl0IGlzIGEgdGVtcGxhdGUuCisKKyAgICAgICAgKiB0ZXN0cy9NZW1vcnlJ bnN0cnVtZW50YXRpb25UZXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoSW5z dHJ1bWVudGVkVGVtcGxhdGUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zdHJ1bWVudGVkVGVtcGxh dGU6Okluc3RydW1lbnRlZFRlbXBsYXRlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3RydW1lbnRl ZFRlbXBsYXRlOjpyZXBvcnRNZW1vcnlVc2FnZSk6CisgICAgICAgIChXZWJDb3JlOjpURVNUKToK KwogMjAxMi0wOS0xNiAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+ CiAKICAgICAgICAgVW5yZXZpZXdlZC4gIFJvbGxlZCBERVBTLgpkaWZmIC0tZ2l0IGEvU291cmNl L1dURi93dGYvTWVtb3J5SW5zdHJ1bWVudGF0aW9uLmggYi9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJ bnN0cnVtZW50YXRpb24uaAppbmRleCAwNGNhOGQyMGUwNmRjZjZjMDllYWUzY2Q2ODM5NzE3YjJm ODg4NzA2Li5mMzEwZGQxZWUzZTYxZjQ4Yjg1NWQyOTlkZjE0NjhlOTAzNmVkYWVkIDEwMDY0NAot LS0gYS9Tb3VyY2UvV1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb24uaAorKysgYi9Tb3VyY2Uv V1RGL3d0Zi9NZW1vcnlJbnN0cnVtZW50YXRpb24uaApAQCAtNDgsNiArNDgsMzkgQEAgZW51bSBN ZW1vcnlPd25pbmdUeXBlIHsKICAgICBieVJlZmVyZW5jZQogfTsKIAorY2xhc3MgTWVtb3J5T2Jq ZWN0SW5mbyB7CitwdWJsaWM6CisgICAgTWVtb3J5T2JqZWN0SW5mbyhNZW1vcnlJbnN0cnVtZW50 YXRpb24qIG1lbW9yeUluc3RydW1lbnRhdGlvbiwgTWVtb3J5T2JqZWN0VHlwZSBvd25lck9iamVj dFR5cGUpCisgICAgICAgIDogbV9tZW1vcnlJbnN0cnVtZW50YXRpb24obWVtb3J5SW5zdHJ1bWVu dGF0aW9uKQorICAgICAgICAsIG1fb2JqZWN0VHlwZShvd25lck9iamVjdFR5cGUpCisgICAgICAg ICwgbV9vYmplY3RTaXplKDApCisgICAgeyB9CisKKyAgICB0eXBlZGVmIE1lbW9yeUNsYXNzSW5m byBDbGFzc0luZm87CisKKyAgICBNZW1vcnlPYmplY3RUeXBlIG9iamVjdFR5cGUoKSBjb25zdCB7 IHJldHVybiBtX29iamVjdFR5cGU7IH0KKyAgICBzaXplX3Qgb2JqZWN0U2l6ZSgpIGNvbnN0IHsg cmV0dXJuIG1fb2JqZWN0U2l6ZTsgfQorCisgICAgTWVtb3J5SW5zdHJ1bWVudGF0aW9uKiBtZW1v cnlJbnN0cnVtZW50YXRpb24oKSB7IHJldHVybiBtX21lbW9yeUluc3RydW1lbnRhdGlvbjsgfQor Citwcml2YXRlOgorICAgIGZyaWVuZCBjbGFzcyBNZW1vcnlDbGFzc0luZm87CisgICAgZnJpZW5k IGNsYXNzIE1lbW9yeUluc3RydW1lbnRhdGlvbjsKKworICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+ IHZvaWQgcmVwb3J0T2JqZWN0SW5mbyhNZW1vcnlPYmplY3RUeXBlIG9iamVjdFR5cGUsIHNpemVf dCBhY3R1YWxTaXplKQorICAgIHsKKyAgICAgICAgaWYgKCFtX29iamVjdFNpemUpIHsKKyAgICAg ICAgICAgIG1fb2JqZWN0U2l6ZSA9IGFjdHVhbFNpemUgPyBhY3R1YWxTaXplIDogc2l6ZW9mKFQp OworICAgICAgICAgICAgaWYgKG9iamVjdFR5cGUpCisgICAgICAgICAgICAgICAgbV9vYmplY3RU eXBlID0gb2JqZWN0VHlwZTsKKyAgICAgICAgfQorICAgIH0KKworICAgIE1lbW9yeUluc3RydW1l bnRhdGlvbiogbV9tZW1vcnlJbnN0cnVtZW50YXRpb247CisgICAgTWVtb3J5T2JqZWN0VHlwZSBt X29iamVjdFR5cGU7CisgICAgc2l6ZV90IG1fb2JqZWN0U2l6ZTsKK307CisKIGNsYXNzIE1lbW9y eUluc3RydW1lbnRhdGlvbiB7CiBwdWJsaWM6CiAgICAgdmlydHVhbCB+TWVtb3J5SW5zdHJ1bWVu dGF0aW9uKCkgeyB9CkBAIC03NSw2ICsxMDgsMjYgQEAgcHJpdmF0ZToKIAogICAgIGZyaWVuZCBj bGFzcyBNZW1vcnlDbGFzc0luZm87CiAKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiBzdGF0aWMg dm9pZCBzZWxlY3RJbnN0cnVtZW50YXRpb25NZXRob2QoY29uc3QgVCogY29uc3QmIG9iamVjdCwg TWVtb3J5T2JqZWN0SW5mbyogbWVtb3J5T2JqZWN0SW5mbykKKyAgICB7CisgICAgICAgIC8vIElm IHRoZXJlIGlzIHJlcG9ydE1lbW9yeVVzYWdlIG1ldGhvZCBvbiB0aGUgb2JqZWN0LCBjYWxsIGl0 LgorICAgICAgICAvLyBPdGhlcndpc2UgY291bnQgb25seSBvYmplY3QncyBzZWxmIHNpemUuCisg ICAgICAgIHJlcG9ydE9iamVjdE1lbW9yeVVzYWdlPFQsIHZvaWQgKFQ6OiopKE1lbW9yeU9iamVj dEluZm8qKSBjb25zdD4ob2JqZWN0LCBtZW1vcnlPYmplY3RJbmZvLCAwKTsKKyAgICB9CisKKyAg ICB0ZW1wbGF0ZTx0eXBlbmFtZSBUeXBlLCBUeXBlIFB0cj4gc3RydWN0IE1lbWJlckhlbHBlclN0 cnVjdDsKKyAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBULCB0eXBlbmFtZSBUeXBlPgorICAgIHN0YXRp YyB2b2lkIHJlcG9ydE9iamVjdE1lbW9yeVVzYWdlKGNvbnN0IFQqIGNvbnN0JiBvYmplY3QsIE1l bW9yeU9iamVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8sICBNZW1iZXJIZWxwZXJTdHJ1Y3Q8VHlw ZSwgJlQ6OnJlcG9ydE1lbW9yeVVzYWdlPiopCisgICAgeworICAgICAgICBvYmplY3QtPnJlcG9y dE1lbW9yeVVzYWdlKG1lbW9yeU9iamVjdEluZm8pOworICAgIH0KKworICAgIHRlbXBsYXRlPHR5 cGVuYW1lIFQsIHR5cGVuYW1lIFR5cGU+CisgICAgc3RhdGljIHZvaWQgcmVwb3J0T2JqZWN0TWVt b3J5VXNhZ2UoY29uc3QgVCogY29uc3QmLCBNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlPYmplY3RJ bmZvLCAuLi4pCisgICAgeworICAgICAgICBtZW1vcnlPYmplY3RJbmZvLT5yZXBvcnRPYmplY3RJ bmZvPFQ+KDAsIHNpemVvZihUKSk7CisgICAgfQorCiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4g Y2xhc3MgSW5zdHJ1bWVudGVkUG9pbnRlciA6IHB1YmxpYyBJbnN0cnVtZW50ZWRQb2ludGVyQmFz ZSB7CiAgICAgcHVibGljOgogICAgICAgICBleHBsaWNpdCBJbnN0cnVtZW50ZWRQb2ludGVyKGNv bnN0IFQqIHBvaW50ZXIsIE1lbW9yeU9iamVjdFR5cGUgb3duZXJPYmplY3RUeXBlKSA6IG1fcG9p bnRlcihwb2ludGVyKSwgbV9vd25lck9iamVjdFR5cGUob3duZXJPYmplY3RUeXBlKSB7IH0KQEAg LTEzOCwzOCArMTkxLDYgQEAgcHJpdmF0ZToKICAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBUPiB2b2lk IGFkZE9iamVjdEltcGwoY29uc3QgUmVmUHRyPFQ+KiBjb25zdCYsIE1lbW9yeU9iamVjdFR5cGUs IE1lbW9yeU93bmluZ1R5cGUpOwogfTsKIAotY2xhc3MgTWVtb3J5T2JqZWN0SW5mbyB7Ci1wdWJs aWM6Ci0gICAgTWVtb3J5T2JqZWN0SW5mbyhNZW1vcnlJbnN0cnVtZW50YXRpb24qIG1lbW9yeUlu c3RydW1lbnRhdGlvbiwgTWVtb3J5T2JqZWN0VHlwZSBvd25lck9iamVjdFR5cGUpCi0gICAgICAg IDogbV9tZW1vcnlJbnN0cnVtZW50YXRpb24obWVtb3J5SW5zdHJ1bWVudGF0aW9uKQotICAgICAg ICAsIG1fb2JqZWN0VHlwZShvd25lck9iamVjdFR5cGUpCi0gICAgICAgICwgbV9vYmplY3RTaXpl KDApCi0gICAgeyB9Ci0KLSAgICB0eXBlZGVmIE1lbW9yeUNsYXNzSW5mbyBDbGFzc0luZm87Ci0K LSAgICBNZW1vcnlPYmplY3RUeXBlIG9iamVjdFR5cGUoKSBjb25zdCB7IHJldHVybiBtX29iamVj dFR5cGU7IH0KLSAgICBzaXplX3Qgb2JqZWN0U2l6ZSgpIGNvbnN0IHsgcmV0dXJuIG1fb2JqZWN0 U2l6ZTsgfQotCi0gICAgTWVtb3J5SW5zdHJ1bWVudGF0aW9uKiBtZW1vcnlJbnN0cnVtZW50YXRp b24oKSB7IHJldHVybiBtX21lbW9yeUluc3RydW1lbnRhdGlvbjsgfQotCi1wcml2YXRlOgotICAg IGZyaWVuZCBjbGFzcyBNZW1vcnlDbGFzc0luZm87Ci0KLSAgICB0ZW1wbGF0ZTx0eXBlbmFtZSBU PiB2b2lkIHJlcG9ydE9iamVjdEluZm8oTWVtb3J5T2JqZWN0VHlwZSBvYmplY3RUeXBlLCBzaXpl X3QgYWN0dWFsU2l6ZSkKLSAgICB7Ci0gICAgICAgIGlmICghbV9vYmplY3RTaXplKSB7Ci0gICAg ICAgICAgICBtX29iamVjdFNpemUgPSBhY3R1YWxTaXplID8gYWN0dWFsU2l6ZSA6IHNpemVvZihU KTsKLSAgICAgICAgICAgIGlmIChvYmplY3RUeXBlKQotICAgICAgICAgICAgICAgIG1fb2JqZWN0 VHlwZSA9IG9iamVjdFR5cGU7Ci0gICAgICAgIH0KLSAgICB9Ci0KLSAgICBNZW1vcnlJbnN0cnVt ZW50YXRpb24qIG1fbWVtb3J5SW5zdHJ1bWVudGF0aW9uOwotICAgIE1lbW9yeU9iamVjdFR5cGUg bV9vYmplY3RUeXBlOwotICAgIHNpemVfdCBtX29iamVjdFNpemU7Ci19OwotCiBjbGFzcyBNZW1v cnlDbGFzc0luZm8gewogcHVibGljOgogICAgIHRlbXBsYXRlPHR5cGVuYW1lIFQ+CkBAIC0yMTEs NyArMjMyLDcgQEAgdm9pZCBNZW1vcnlJbnN0cnVtZW50YXRpb246OmFkZEluc3RydW1lbnRlZE9i amVjdEltcGwoY29uc3QgVCogY29uc3QmIG9iamVjdCwgTWUKIHsKICAgICBpZiAob3duaW5nVHlw ZSA9PSBieVJlZmVyZW5jZSkgewogICAgICAgICBNZW1vcnlPYmplY3RJbmZvIG1lbW9yeU9iamVj dEluZm8odGhpcywgb3duZXJPYmplY3RUeXBlKTsKLSAgICAgICAgb2JqZWN0LT5yZXBvcnRNZW1v cnlVc2FnZSgmbWVtb3J5T2JqZWN0SW5mbyk7CisgICAgICAgIHNlbGVjdEluc3RydW1lbnRhdGlv bk1ldGhvZDxUPihvYmplY3QsICZtZW1vcnlPYmplY3RJbmZvKTsKICAgICB9IGVsc2UgewogICAg ICAgICBpZiAoIW9iamVjdCB8fCB2aXNpdGVkKG9iamVjdCkpCiAgICAgICAgICAgICByZXR1cm47 CkBAIC0yNTQsMTEgKzI3NSw3IEBAIHZvaWQgTWVtb3J5SW5zdHJ1bWVudGF0aW9uOjphZGRPYmpl Y3RJbXBsKGNvbnN0IFJlZlB0cjxUPiogY29uc3QmIG9iamVjdCwgTWVtb3J5CiB0ZW1wbGF0ZTx0 eXBlbmFtZSBUPgogdm9pZCBNZW1vcnlJbnN0cnVtZW50YXRpb246OmFkZE9iamVjdEltcGwoY29u c3QgVCogY29uc3QmIG9iamVjdCwgTWVtb3J5T2JqZWN0VHlwZSBvd25lck9iamVjdFR5cGUsIE1l bW9yeU93bmluZ1R5cGUgb3duaW5nVHlwZSkKIHsKLSAgICBpZiAoIW9iamVjdCB8fCB2aXNpdGVk KG9iamVjdCkpCi0gICAgICAgIHJldHVybjsKLSAgICBpZiAob3duaW5nVHlwZSA9PSBieVJlZmVy ZW5jZSkKLSAgICAgICAgcmV0dXJuOwotICAgIGNvdW50T2JqZWN0U2l6ZShvd25lck9iamVjdFR5 cGUsIHNpemVvZihUKSk7CisgICAgYWRkSW5zdHJ1bWVudGVkT2JqZWN0SW1wbChvYmplY3QsIG93 bmVyT2JqZWN0VHlwZSwgb3duaW5nVHlwZSk7CiB9CiAKIHRlbXBsYXRlPHR5cGVuYW1lIEhhc2hN YXBUeXBlPgpAQCAtMzMzLDcgKzM1MCw3IEBAIHRlbXBsYXRlPHR5cGVuYW1lIFQ+CiB2b2lkIE1l bW9yeUluc3RydW1lbnRhdGlvbjo6SW5zdHJ1bWVudGVkUG9pbnRlcjxUPjo6cHJvY2VzcyhNZW1v cnlJbnN0cnVtZW50YXRpb24qIG1lbW9yeUluc3RydW1lbnRhdGlvbikKIHsKICAgICBNZW1vcnlP YmplY3RJbmZvIG1lbW9yeU9iamVjdEluZm8obWVtb3J5SW5zdHJ1bWVudGF0aW9uLCBtX293bmVy T2JqZWN0VHlwZSk7Ci0gICAgbV9wb2ludGVyLT5yZXBvcnRNZW1vcnlVc2FnZSgmbWVtb3J5T2Jq ZWN0SW5mbyk7CisgICAgc2VsZWN0SW5zdHJ1bWVudGF0aW9uTWV0aG9kPFQ+KG1fcG9pbnRlciwg Jm1lbW9yeU9iamVjdEluZm8pOwogICAgIG1lbW9yeUluc3RydW1lbnRhdGlvbi0+Y291bnRPYmpl Y3RTaXplKG1lbW9yeU9iamVjdEluZm8ub2JqZWN0VHlwZSgpLCBtZW1vcnlPYmplY3RJbmZvLm9i amVjdFNpemUoKSk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVz dHMvTWVtb3J5SW5zdHJ1bWVudGF0aW9uVGVzdC5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3Rlc3RzL01lbW9yeUluc3RydW1lbnRhdGlvblRlc3QuY3BwCmluZGV4IDRhMGEzY2Y4MWZlYjA5 ZmJlOTEzZDNjMTAyOTY5MmE2M2U2NTlmMTAuLjcwYjM2NTBiZjU0YjY1Y2RhOGU1MzA5ZWE3NGFi ODE0ZmQ0Zjk2ODYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvTWVt b3J5SW5zdHJ1bWVudGF0aW9uVGVzdC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90 ZXN0cy9NZW1vcnlJbnN0cnVtZW50YXRpb25UZXN0LmNwcApAQCAtMjc1LDUgKzI3NSwzMyBAQCBU RVNUKE1lbW9yeUluc3RydW1lbnRhdGlvblRlc3QsIHZpc2l0U3RyaW5ncykKICAgICB9CiB9CiAK K3RlbXBsYXRlPHR5cGVuYW1lIFQ+CitjbGFzcyBJbnN0cnVtZW50ZWRUZW1wbGF0ZSB7CitwdWJs aWM6CisgICAgdGVtcGxhdGU8dHlwZW5hbWUgVj4KKyAgICBJbnN0cnVtZW50ZWRUZW1wbGF0ZShj b25zdCBWJiB2YWx1ZSkgOiBtX3ZhbHVlKHZhbHVlKSB7IH0KKworICAgIHRlbXBsYXRlPHR5cGVu YW1lIE1lbW9yeU9iamVjdEluZm8+CisgICAgdm9pZCByZXBvcnRNZW1vcnlVc2FnZShNZW1vcnlP YmplY3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvKSBjb25zdAorICAgIHsKKyAgICAgICAgdHlwZW5h bWUgTWVtb3J5T2JqZWN0SW5mbzo6Q2xhc3NJbmZvIGluZm8obWVtb3J5T2JqZWN0SW5mbywgdGhp cywgV2ViQ29yZU1lbW9yeVR5cGVzOjpET00pOworICAgICAgICBpbmZvLmFkZE1lbWJlcihtX3Zh bHVlKTsKKyAgICB9CisKKyAgICBUIG1fdmFsdWU7Cit9OworCitURVNUKE1lbW9yeUluc3RydW1l bnRhdGlvblRlc3QsIGRldGVjdFJlcG9ydE1lbW9yeVVzYWdlTWV0aG9kKQoreworICAgIFZpc2l0 ZWRPYmplY3RzIHZpc2l0ZWRPYmplY3RzOworICAgIE1lbW9yeUluc3RydW1lbnRhdGlvbkltcGwg aW1wbCh2aXNpdGVkT2JqZWN0cyk7CisKKyAgICBPd25QdHI8SW5zdHJ1bWVudGVkVGVtcGxhdGU8 U3RyaW5nPiA+IHZhbHVlID0gYWRvcHRQdHIobmV3IEluc3RydW1lbnRlZFRlbXBsYXRlPFN0cmlu Zz4oIiIpKTsKKyAgICBJbnN0cnVtZW50ZWRPd25lcjxJbnN0cnVtZW50ZWRUZW1wbGF0ZTxTdHJp bmc+KiA+IHJvb3QodmFsdWUuZ2V0KCkpOworICAgIGltcGwuYWRkUm9vdE9iamVjdChyb290KTsK KyAgICBFWFBFQ1RfRVEoc2l6ZW9mKEluc3RydW1lbnRlZFRlbXBsYXRlPFN0cmluZz4pICsgc2l6 ZW9mKFN0cmluZ0ltcGwpLCBpbXBsLnJlcG9ydGVkU2l6ZUZvckFsbFR5cGVzKCkpOworICAgIEVY UEVDVF9FUSgyLCB2aXNpdGVkT2JqZWN0cy5zaXplKCkpOworfQorCiB9IC8vIG5hbWVzcGFjZQog Cg==