87830 2012-05-30 00:26:33 -0700 Web Inspector: add MemoryUsageSupport::processMemoryUsageBytes 2012-05-31 00:33:36 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 80787 0 yurys yurys abarth apavlov bweinstein dglazkov fishd jamesr joepeck keishi loislo pfeldman pmuellr rik timothy tkent+wkapi tony webkit.review.bot yurys oldest_to_newest 636958 0 yurys 2012-05-30 00:26:33 -0700 We need to know process memory usage to show it in the inspector. It is now exposed on Source/WebKit/chromium/public/platform/WebKitPlatformSupport.h which is Chromium-specific file. We need a more portable approach here. 636963 1 144735 yurys 2012-05-30 00:32:27 -0700 Created attachment 144735 Patch 636964 2 yurys 2012-05-30 00:33:04 -0700 (In reply to comment #1) > Created an attachment (id=144735) [details] > Patch This patch addresses Tony's comments on http://codereview.chromium.org/9669039/diff/5/webkit/glue/webkitplatformsupport_impl.h 636969 3 webkit.review.bot 2012-05-30 00:35:55 -0700 Please wait for approval from abarth@webkit.org, dglazkov@chromium.org, fishd@chromium.org, jamesr@chromium.org or tkent@chromium.org before submitting, as this patch contains changes to the Chromium public API. See also https://trac.webkit.org/wiki/ChromiumWebKitAPI. 636972 4 144736 yurys 2012-05-30 00:38:21 -0700 Created attachment 144736 Patch 636991 5 144742 yurys 2012-05-30 01:03:25 -0700 Created attachment 144742 Patch 637018 6 144742 buildbot 2012-05-30 01:32:04 -0700 Comment on attachment 144742 Patch Attachment 144742 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/12843770 637048 7 144759 yurys 2012-05-30 02:16:10 -0700 Created attachment 144759 Patch 637324 8 144759 jamesr 2012-05-30 09:44:08 -0700 Comment on attachment 144759 Patch Seems pretty reasonable to me 637476 9 144759 abarth 2012-05-30 11:32:10 -0700 Comment on attachment 144759 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=144759&action=review > Source/WebCore/inspector/InspectorMemoryAgent.cpp:-342 > -#if PLATFORM(CHROMIUM) Yay removing #if CHROMIUM 638058 10 yurys 2012-05-31 00:33:36 -0700 Committed r119068: <http://trac.webkit.org/changeset/119068> 144735 2012-05-30 00:32:27 -0700 2012-05-30 00:38:14 -0700 Patch bug-87830-20120530113225.patch text/plain 8815 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4ODk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCA3MTVkNGRlMjZiYWQ0 OGY0NDVmYWQzOWY0N2YzYzM2MWNmNWQwMTA1Li5jMmI4MzFkZDZkZGI3NTRmMzY0YjRjYjk0NmIx OTQ4YTJhOTQ1NGRhIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMi0wNS0zMCAg WXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiBhZGQgTWVtb3J5VXNhZ2VTdXBwb3J0Ojpwcm9jZXNzTWVtb3J5VXNhZ2VCeXRlcwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODc4MzAKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGNocm9taXVt L3B1YmxpYy9QbGF0Zm9ybS5oOgorICAgICAgICAoUGxhdGZvcm0pOgorICAgICAgICAoV2ViS2l0 OjpQbGF0Zm9ybTo6cHJvY2Vzc01lbW9yeVVzYWdlQnl0ZXMpOiBtb3ZlZCB0aGlzIG1ldGhvZCBm cm9tCisgICAgICAgIFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL3BsYXRmb3JtL1dlYktp dFBsYXRmb3JtU3VwcG9ydC5oLCBhbHNvCisgICAgICAgIHJlbW92ZWQgJ2dldCcgcHJlZml4Lgor CiAyMDEyLTA1LTI5ICBNYXJrIFBpbGdyaW0gIDxwaWxncmltQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBbQ2hyb21pdW1dIE1vdmUgZmlsZUV4aXN0cyB0byBQbGF0Zm9ybS5oCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5k ZXggZmI3Y2IzMTM0MDVhMTY1MDI3NjRjNzVhMzQ5YThlZWNhMWMyMjAwZS4uZTk1NGI3OTEyYWM2 Zjk3N2JkYzI5MzVkZTE0YTE5NGUxNjFkZWM1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBA CisyMDEyLTA1LTMwICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIFdlYiBJbnNwZWN0b3I6IGFkZCBNZW1vcnlVc2FnZVN1cHBvcnQ6OnByb2Nlc3NNZW1v cnlVc2FnZUJ5dGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD04NzgzMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEFkZGVkIGEgbWV0aG9kIGZvciBnZXR0aW5nIHByb2Nlc3MgbWVtb3J5IHVzYWdlIGluIGJ5 dGVzLiBJdCBpcworICAgICAgICB1c2VkIGluIHRoZSBpbnNwZWN0b3IgbWVtb3J5IGluc3RydW1l bnRhdGlvbiB0byBnZXQgcHJvY2VzcyB0b3RhbAorICAgICAgICBtZW1vcnkgdXNhZ2UuCisKKyAg ICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yTWVtb3J5QWdlbnQuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yTWVtb3J5QWdlbnQ6OmdldFByb2Nlc3NNZW1vcnlEaXN0cmlidXRpb24p OgorICAgICAgICAqIHBsYXRmb3JtL01lbW9yeVVzYWdlU3VwcG9ydC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpNZW1vcnlVc2FnZVN1cHBvcnQ6OnByb2Nlc3NNZW1vcnlVc2FnZUJ5dGVzKToKKyAg ICAgICAgKFdlYkNvcmUpOgorICAgICAgICAqIHBsYXRmb3JtL01lbW9yeVVzYWdlU3VwcG9ydC5o OgorICAgICAgICAoTWVtb3J5VXNhZ2VTdXBwb3J0KTogcHJvdmlkZWQgZW1iZWRkZXJzIHdpdGgg YSB3YXkgdG8gcmVwb3J0IFdlYktpdCBwcm9jZXNzCisgICAgICAgIG1lbW9yeSB1c2FnZS4KKyAg ICAgICAgKiBwbGF0Zm9ybS9jaHJvbWl1bS9NZW1vcnlVc2FnZVN1cHBvcnRDaHJvbWl1bS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpNZW1vcnlVc2FnZVN1cHBvcnQ6OnByb2Nlc3NNZW1vcnlVc2Fn ZUJ5dGVzKToKKyAgICAgICAgKFdlYkNvcmUpOgorCiAyMDEyLTA1LTI5ICBNYXJrIFBpbGdyaW0g IDxwaWxncmltQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1dIE1vdmUgZmlsZUV4 aXN0cyB0byBQbGF0Zm9ybS5oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IGRlYWM3MjA5 YTExMTcxMGQ3MzhmODYyNzg1ZDkwZjljNjM0NzQ0MWYuLjBiYmQ5YjVkNTA4NmZiMDQ2M2NhOGMy MmM1MDZhMzI5MDFjYTM5NzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTQgQEAKKzIwMTItMDUtMzAgIFl1cnkgU2VtaWtoYXRza3kgIDx5dXJ5c0BjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogYWRkIE1lbW9yeVVzYWdlU3VwcG9ydDo6cHJvY2Vz c01lbW9yeVVzYWdlQnl0ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTg3ODMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBwdWJsaWMvcGxhdGZvcm0vV2ViS2l0UGxhdGZvcm1TdXBwb3J0Lmg6IHB1bGxl ZCBnZXRQcm9jZXNzTWVtb3J5U2l6ZSB1cAorICAgICAgICB0byB0aGUgU291cmNlL1BsYXRmb3Jt L2Nocm9taXVtL3B1YmxpYy9QbGF0Zm9ybS5oCisgICAgICAgICogc3JjL1BsYXRmb3JtU3VwcG9y dC5jcHA6CisKIDIwMTItMDUtMjkgIE1hcmsgUGlsZ3JpbSAgPHBpbGdyaW1AY2hyb21pdW0ub3Jn PgogCiAgICAgICAgIFtDaHJvbWl1bV0gTW92ZSBmaWxlRXhpc3RzIHRvIFBsYXRmb3JtLmgKZGlm ZiAtLWdpdCBhL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvUGxhdGZvcm0uaCBiL1Nv dXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvUGxhdGZvcm0uaAppbmRleCA5NDM5Y2ViZjZm N2ExZGVlNjYyNjA3ODM5MzdhMzdkOWIwNGJmMDQyLi42MTM4MGZmNTc4YjYzYmYwMjYwZjkzYjZk M2ViMTU1NGRmOWY4MDdhIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vY2hyb21pdW0vcHVi bGljL1BsYXRmb3JtLmgKKysrIGIvU291cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9QbGF0 Zm9ybS5oCkBAIC0xNTMsNiArMTUzLDEwIEBAIHB1YmxpYzoKICAgICAvLyBEZWx0YSBvZiBtZW1v cnkgdXNhZ2UgZ3Jvd3RoICh2cy4gbGFzdCBhY3R1YWxNZW1vcnlVc2FnZU1CKCkpIHRvIGZvcmNl IEdDIHdoZW4gbWVtb3J5IHVzYWdlIGlzIGhpZ2guCiAgICAgdmlydHVhbCBzaXplX3QgaGlnaFVz YWdlRGVsdGFNQigpIHsgcmV0dXJuIDEyODsgfQogCisgICAgLy8gUmV0dXJucyBwcml2YXRlIGFu ZCBzaGFyZWQgdXNhZ2UsIGluIGJ5dGVzLiBQcml2YXRlIGJ5dGVzIGlzIHRoZSBhbW91bnQgb2YK KyAgICAvLyBtZW1vcnkgY3VycmVudGx5IGFsbG9jYXRlZCB0byB0aGlzIHByb2Nlc3MgdGhhdCBj YW5ub3QgYmUgc2hhcmVkLiBSZXR1cm5zCisgICAgLy8gZmFsc2Ugb24gcGxhdGZvcm0gc3BlY2lm aWMgZXJyb3IgY29uZGl0aW9ucy4KKyAgICB2aXJ0dWFsIGJvb2wgcHJvY2Vzc01lbW9yeVVzYWdl Qnl0ZXMoc2l6ZV90KiBwcml2YXRlQnl0ZXMsIHNpemVfdCogc2hhcmVkQnl0ZXMpIHsgcmV0dXJu IGZhbHNlOyB9CiAKICAgICAvLyBOZXR3b3JrIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck1lbW9yeUFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JNZW1vcnlBZ2VudC5jcHAKaW5kZXggMjkwMDc3NTg5YjliY2Y1 YzBiYjA3OGFhYjlhZTUzZGM3YThmYmZmNS4uMzNiOWExNzRhNDY1MGQzMGJmYjU4MmU1Y2MwNjA5 OWE3YTgwNmIyOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ck1lbW9yeUFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y TWVtb3J5QWdlbnQuY3BwCkBAIC00MywxMSArNDMsOSBAQAogI2luY2x1ZGUgIkluc3BlY3RvclN0 YXRlLmgiCiAjaW5jbHVkZSAiSW5zcGVjdG9yVmFsdWVzLmgiCiAjaW5jbHVkZSAiSW5zdHJ1bWVu dGluZ0FnZW50cy5oIgorI2luY2x1ZGUgIk1lbW9yeVVzYWdlU3VwcG9ydC5oIgogI2luY2x1ZGUg Ik5vZGUuaCIKICNpbmNsdWRlICJQYWdlLmgiCi0jaWYgUExBVEZPUk0oQ0hST01JVU0pCi0jaW5j bHVkZSAiUGxhdGZvcm1TdXBwb3J0LmgiCi0jZW5kaWYKICNpbmNsdWRlICJTY3JpcHRHQ0V2ZW50 LmgiCiAjaW5jbHVkZSAiU2NyaXB0UHJvZmlsZXIuaCIKICNpbmNsdWRlICJTdHlsZWRFbGVtZW50 LmgiCkBAIC0zMzksMTAgKzMzNyw4IEBAIHN0YXRpYyBQYXNzUmVmUHRyPFdlYkNvcmU6OlR5cGVC dWlsZGVyOjpNZW1vcnk6Ok1lbW9yeUJsb2NrPiBqc0hlYXBJbmZvKCkKIHZvaWQgSW5zcGVjdG9y TWVtb3J5QWdlbnQ6OmdldFByb2Nlc3NNZW1vcnlEaXN0cmlidXRpb24oRXJyb3JTdHJpbmcqLCBS ZWZQdHI8V2ViQ29yZTo6VHlwZUJ1aWxkZXI6Ok1lbW9yeTo6TWVtb3J5QmxvY2s+JiBwcm9jZXNz TWVtb3J5KQogewogICAgIHNpemVfdCBwcml2YXRlQnl0ZXMgPSAwOwotI2lmIFBMQVRGT1JNKENI Uk9NSVVNKQogICAgIHNpemVfdCBzaGFyZWRCeXRlcyA9IDA7Ci0gICAgUGxhdGZvcm1TdXBwb3J0 OjpnZXRQcm9jZXNzTWVtb3J5U2l6ZSgmcHJpdmF0ZUJ5dGVzLCAmc2hhcmVkQnl0ZXMpOwotI2Vu ZGlmCisgICAgTWVtb3J5VXNhZ2VTdXBwb3J0Ojpwcm9jZXNzTWVtb3J5VXNhZ2VCeXRlcygmcHJp dmF0ZUJ5dGVzLCAmc2hhcmVkQnl0ZXMpOwogICAgIHByb2Nlc3NNZW1vcnkgPSBXZWJDb3JlOjpU eXBlQnVpbGRlcjo6TWVtb3J5OjpNZW1vcnlCbG9jazo6Y3JlYXRlKCkuc2V0TmFtZShNZW1vcnlC bG9ja05hbWU6OnByb2Nlc3NQcml2YXRlTWVtb3J5KTsKICAgICBwcm9jZXNzTWVtb3J5LT5zZXRT aXplKHN0YXRpY19jYXN0PGludD4ocHJpdmF0ZUJ5dGVzKSk7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL01lbW9yeVVzYWdlU3VwcG9ydC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9NZW1vcnlVc2FnZVN1cHBvcnQuY3BwCmluZGV4IDJmMDZjNzYzOTM2YjVmOWVi MjVlOWFiZDMwZmFiMTY3Zjk3MGM5OTIuLjEyZjYyMTM5ZjM5ZDY1MzRjYjBiZjFkMjBlOTgzNGFk NThjMjQ2OTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL01lbW9yeVVzYWdl U3VwcG9ydC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTWVtb3J5VXNhZ2VTdXBw b3J0LmNwcApAQCAtNTgsNCArNTgsOSBAQCBpbnQgTWVtb3J5VXNhZ2VTdXBwb3J0OjpoaWdoVXNh Z2VEZWx0YU1CKCkKICAgICByZXR1cm4gMDsKIH0KICAgICAKK2Jvb2wgTWVtb3J5VXNhZ2VTdXBw b3J0Ojpwcm9jZXNzTWVtb3J5VXNhZ2VCeXRlcyhzaXplX3QqIHByaXZhdGVCeXRlcywgc2l6ZV90 KiBzaGFyZWRCeXRlcykKK3sKKyAgICByZXR1cm4gZmFsc2U7Cit9CisKIH0gLy8gbmFtZXNwYWNl IFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL01lbW9yeVVzYWdl U3VwcG9ydC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTWVtb3J5VXNhZ2VTdXBwb3J0LmgK aW5kZXggOWQxMmUzNzQwYzNlYmNmZDI0YWVjMTZjZGViNGVkOTI4NDhjYjZiMS4uYzg1ODk3NDYy MmE5YTlhOGJmZTQ1MmY5YWQ5YTczMjY1NzZhNDA1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vTWVtb3J5VXNhZ2VTdXBwb3J0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vTWVtb3J5VXNhZ2VTdXBwb3J0LmgKQEAgLTUyLDYgKzUyLDExIEBAIHB1YmxpYzoKICAg ICAvLyBEZWx0YSBvZiBtZW1vcnkgdXNhZ2UgZ3Jvd3RoICh2cy4gbGFzdCBhY3R1YWxNZW1vcnlV c2FnZU1CKCkpCiAgICAgLy8gdG8gZm9yY2UgR0Mgd2hlbiBtZW1vcnkgdXNhZ2UgaXMgaGlnaC4K ICAgICBzdGF0aWMgaW50IGhpZ2hVc2FnZURlbHRhTUIoKTsKKworICAgIC8vIFJldHVybnMgcHJp dmF0ZSBhbmQgc2hhcmVkIHVzYWdlLCBpbiBieXRlcy4gUHJpdmF0ZSBieXRlcyBpcyB0aGUgYW1v dW50IG9mCisgICAgLy8gbWVtb3J5IGN1cnJlbnRseSBhbGxvY2F0ZWQgdG8gdGhpcyBwcm9jZXNz IHRoYXQgY2Fubm90IGJlIHNoYXJlZC4gUmV0dXJucworICAgIC8vIGZhbHNlIG9uIHBsYXRmb3Jt IHNwZWNpZmljIGVycm9yIGNvbmRpdGlvbnMuCisgICAgc3RhdGljIGJvb2wgcHJvY2Vzc01lbW9y eVVzYWdlQnl0ZXMoc2l6ZV90KiBwcml2YXRlQnl0ZXMsIHNpemVfdCogc2hhcmVkQnl0ZXMpOwog fTsKIAogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vY2hyb21pdW0vTWVtb3J5VXNhZ2VTdXBwb3J0Q2hyb21pdW0uY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vTWVtb3J5VXNhZ2VTdXBwb3J0Q2hyb21pdW0uY3Bw CmluZGV4IDBjMzU1M2VhZTc3YmYyZDI3MDkxOTRhYzhhNzY3YzgyMjY3YzVhNGYuLjQ0ZjFhOTBm YTJiNmNhNjBmZjY4ZGM0NmEzYTYwMzBmYTIyYjQ2OTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2Nocm9taXVtL01lbW9yeVVzYWdlU3VwcG9ydENocm9taXVtLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9NZW1vcnlVc2FnZVN1cHBvcnRDaHJv bWl1bS5jcHAKQEAgLTYwLDQgKzYwLDkgQEAgaW50IE1lbW9yeVVzYWdlU3VwcG9ydDo6aGlnaFVz YWdlRGVsdGFNQigpCiAgICAgcmV0dXJuIFdlYktpdDo6UGxhdGZvcm06OmN1cnJlbnQoKS0+aGln aFVzYWdlRGVsdGFNQigpOwogfQogCitib29sIE1lbW9yeVVzYWdlU3VwcG9ydDo6cHJvY2Vzc01l bW9yeVVzYWdlQnl0ZXMoc2l6ZV90KiBwcml2YXRlQnl0ZXMsIHNpemVfdCogc2hhcmVkQnl0ZXMp Cit7CisgICAgcmV0dXJuIFdlYktpdDo6UGxhdGZvcm06OmN1cnJlbnQoKS0+cHJvY2Vzc01lbW9y eVVzYWdlQnl0ZXMocHJpdmF0ZUJ5dGVzLCBzaGFyZWRCeXRlcyk7Cit9CisKIH0gLy8gbmFtZXNw YWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL3Bs YXRmb3JtL1dlYktpdFBsYXRmb3JtU3VwcG9ydC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvcGxhdGZvcm0vV2ViS2l0UGxhdGZvcm1TdXBwb3J0LmgKaW5kZXggOTA4MTUyMTQ5OWM1 MTRjM2JiNDM2YWFiNjk1M2M5Mzc5NWEyOWE4MC4uZjY5YzYyZmYyODBiYmQyYTNkOTczMWE0Zjg1 ODUyNzNmMjJmOWUyNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMv cGxhdGZvcm0vV2ViS2l0UGxhdGZvcm1TdXBwb3J0LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9wdWJsaWMvcGxhdGZvcm0vV2ViS2l0UGxhdGZvcm1TdXBwb3J0LmgKQEAgLTExNSwxMSAr MTE1LDYgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBXZWJTaGFyZWRXb3JrZXJSZXBvc2l0b3J5 KiBzaGFyZWRXb3JrZXJSZXBvc2l0b3J5KCkgeyByZXR1cm4gMDsgfQogCi0gICAgLy8gUmV0dXJu cyBwcml2YXRlIGFuZCBzaGFyZWQgdXNhZ2UsIGluIGJ5dGVzLiBQcml2YXRlIGJ5dGVzIGlzIHRo ZSBhbW91bnQgb2YKLSAgICAvLyBtZW1vcnkgY3VycmVudGx5IGFsbG9jYXRlZCB0byB0aGlzIHBy b2Nlc3MgdGhhdCBjYW5ub3QgYmUgc2hhcmVkLiBSZXR1cm5zCi0gICAgLy8gZmFsc2Ugb24gcGxh dGZvcm0gc3BlY2lmaWMgZXJyb3IgY29uZGl0aW9ucy4KLSAgICB2aXJ0dWFsIGJvb2wgZ2V0UHJv Y2Vzc01lbW9yeVNpemUoc2l6ZV90KiBwcml2YXRlQnl0ZXMsIHNpemVfdCogc2hhcmVkQnl0ZXMp IHsgcmV0dXJuIGZhbHNlOyB9Ci0KIHByb3RlY3RlZDoKICAgICB+V2ViS2l0UGxhdGZvcm1TdXBw b3J0KCkgeyB9CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUGxh dGZvcm1TdXBwb3J0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1BsYXRmb3JtU3Vw cG9ydC5jcHAKaW5kZXggZGQ3Y2M4Mjg4Nzc3MzQ1NmQyOThlNThlZGYxYzQ0NzE3NTA0MWFkMi4u MThjNjQwNjc5ZjQyMGQ4ZGRjYWU0OGJhZmMxYTUwMDRhODZjYzExNCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1TdXBwb3J0LmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL3NyYy9QbGF0Zm9ybVN1cHBvcnQuY3BwCkBAIC04MzEsMTEgKzgzMSw2 IEBAIHZvaWQgUGxhdGZvcm1TdXBwb3J0Ojpub3RpZnlKU091dE9mTWVtb3J5KEZyYW1lKiBmcmFt ZSkKICAgICB3ZWJGcmFtZS0+Y2xpZW50KCktPmRpZEV4aGF1c3RNZW1vcnlBdmFpbGFibGVGb3JT Y3JpcHQod2ViRnJhbWUpOwogfQogCi1ib29sIFBsYXRmb3JtU3VwcG9ydDo6Z2V0UHJvY2Vzc01l bW9yeVNpemUoc2l6ZV90KiBwcml2YXRlQnl0ZXMsIHNpemVfdCogc2hhcmVkQnl0ZXMpCi17Ci0g ICAgcmV0dXJuIHdlYktpdFBsYXRmb3JtU3VwcG9ydCgpLT5nZXRQcm9jZXNzTWVtb3J5U2l6ZShw cml2YXRlQnl0ZXMsIHNoYXJlZEJ5dGVzKTsKLX0KLQogaW50IFBsYXRmb3JtU3VwcG9ydDo6c2Ny ZWVuSG9yaXpvbnRhbERQSShXaWRnZXQqIHdpZGdldCkKIHsKICAgICBXZWJXaWRnZXRDbGllbnQq IGNsaWVudCA9IHRvV2ViV2lkZ2V0Q2xpZW50KHdpZGdldCk7Cg== 144736 2012-05-30 00:38:21 -0700 2012-05-30 01:03:18 -0700 Patch bug-87830-20120530113819.patch text/plain 8839 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4ODk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCA3MTVkNGRlMjZiYWQ0 OGY0NDVmYWQzOWY0N2YzYzM2MWNmNWQwMTA1Li4xY2MzNDgzNWQ4YzhkY2EzZTRiNjUxMTk4MDA3 ZmIwZDdhNzI3NGE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMi0wNS0zMCAg WXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiBhZGQgTWVtb3J5VXNhZ2VTdXBwb3J0Ojpwcm9jZXNzTWVtb3J5VXNhZ2VJbkJ5dGVz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NzgzMAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogY2hyb21p dW0vcHVibGljL1BsYXRmb3JtLmg6CisgICAgICAgIChQbGF0Zm9ybSk6CisgICAgICAgIChXZWJL aXQ6OlBsYXRmb3JtOjpwcm9jZXNzTWVtb3J5VXNhZ2VJbkJ5dGVzKTogbW92ZWQgdGhpcyBtZXRo b2QgZnJvbQorICAgICAgICBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9wbGF0Zm9ybS9X ZWJLaXRQbGF0Zm9ybVN1cHBvcnQuaCwgYWxzbworICAgICAgICByZW1vdmVkICdnZXQnIHByZWZp eC4KKwogMjAxMi0wNS0yOSAgTWFyayBQaWxncmltICA8cGlsZ3JpbUBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgW0Nocm9taXVtXSBNb3ZlIGZpbGVFeGlzdHMgdG8gUGxhdGZvcm0uaApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CmluZGV4IGZiN2NiMzEzNDA1YTE2NTAyNzY0Yzc1YTM0OWE4ZWVjYTFjMjIwMGUuLjg2YjkwMzVj MzhkNTg4MGU0YmEyNTczYzdiYzE1ZDIyZDA5NGZhYjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwy NiBAQAorMjAxMi0wNS0zMCAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4K KworICAgICAgICBXZWIgSW5zcGVjdG9yOiBhZGQgTWVtb3J5VXNhZ2VTdXBwb3J0Ojpwcm9jZXNz TWVtb3J5VXNhZ2VJbkJ5dGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04NzgzMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEFkZGVkIGEgbWV0aG9kIGZvciBnZXR0aW5nIHByb2Nlc3MgbWVtb3J5IHVzYWdl IGluIGJ5dGVzLiBJdCBpcworICAgICAgICB1c2VkIGluIHRoZSBpbnNwZWN0b3IgbWVtb3J5IGlu c3RydW1lbnRhdGlvbiB0byBnZXQgcHJvY2VzcyB0b3RhbAorICAgICAgICBtZW1vcnkgdXNhZ2Uu CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yTWVtb3J5QWdlbnQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yTWVtb3J5QWdlbnQ6OmdldFByb2Nlc3NNZW1vcnlEaXN0cmli dXRpb24pOgorICAgICAgICAqIHBsYXRmb3JtL01lbW9yeVVzYWdlU3VwcG9ydC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpNZW1vcnlVc2FnZVN1cHBvcnQ6OnByb2Nlc3NNZW1vcnlVc2FnZUluQnl0 ZXMpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogcGxhdGZvcm0vTWVtb3J5VXNhZ2VT dXBwb3J0Lmg6CisgICAgICAgIChNZW1vcnlVc2FnZVN1cHBvcnQpOiBwcm92aWRlZCBlbWJlZGRl cnMgd2l0aCBhIHdheSB0byByZXBvcnQgV2ViS2l0IHByb2Nlc3MKKyAgICAgICAgbWVtb3J5IHVz YWdlLgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL01lbW9yeVVzYWdlU3VwcG9ydENocm9t aXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lbW9yeVVzYWdlU3VwcG9ydDo6cHJvY2Vzc01l bW9yeVVzYWdlSW5CeXRlcyk6CisgICAgICAgIChXZWJDb3JlKToKKwogMjAxMi0wNS0yOSAgTWFy ayBQaWxncmltICA8cGlsZ3JpbUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVtXSBN b3ZlIGZpbGVFeGlzdHMgdG8gUGxhdGZvcm0uaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRl eCBkZWFjNzIwOWExMTE3MTBkNzM4Zjg2Mjc4NWQ5MGY5YzYzNDc0NDFmLi4yMDc0NzBmYjc3ZjNm Mjk5ZTZkNDI0NTI3MWQ2ZDRmZGI3M2I3YmMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE0IEBACisyMDEyLTA1LTMwICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hy b21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGFkZCBNZW1vcnlVc2FnZVN1cHBv cnQ6OnByb2Nlc3NNZW1vcnlVc2FnZUluQnl0ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTg3ODMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBwdWJsaWMvcGxhdGZvcm0vV2ViS2l0UGxhdGZvcm1TdXBw b3J0Lmg6IHB1bGxlZCBnZXRQcm9jZXNzTWVtb3J5U2l6ZSB1cAorICAgICAgICB0byB0aGUgU291 cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9QbGF0Zm9ybS5oCisgICAgICAgICogc3JjL1Bs YXRmb3JtU3VwcG9ydC5jcHA6CisKIDIwMTItMDUtMjkgIE1hcmsgUGlsZ3JpbSAgPHBpbGdyaW1A Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWl1bV0gTW92ZSBmaWxlRXhpc3RzIHRvIFBs YXRmb3JtLmgKZGlmZiAtLWdpdCBhL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvUGxh dGZvcm0uaCBiL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvUGxhdGZvcm0uaAppbmRl eCA5NDM5Y2ViZjZmN2ExZGVlNjYyNjA3ODM5MzdhMzdkOWIwNGJmMDQyLi5lMzIwNzY1MWU2OWZh NjE2ZGFkZjc4ZmJhZmU0YTQ3ZmI0MjhiZThiIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0v Y2hyb21pdW0vcHVibGljL1BsYXRmb3JtLmgKKysrIGIvU291cmNlL1BsYXRmb3JtL2Nocm9taXVt L3B1YmxpYy9QbGF0Zm9ybS5oCkBAIC0xNTMsNiArMTUzLDEwIEBAIHB1YmxpYzoKICAgICAvLyBE ZWx0YSBvZiBtZW1vcnkgdXNhZ2UgZ3Jvd3RoICh2cy4gbGFzdCBhY3R1YWxNZW1vcnlVc2FnZU1C KCkpIHRvIGZvcmNlIEdDIHdoZW4gbWVtb3J5IHVzYWdlIGlzIGhpZ2guCiAgICAgdmlydHVhbCBz aXplX3QgaGlnaFVzYWdlRGVsdGFNQigpIHsgcmV0dXJuIDEyODsgfQogCisgICAgLy8gUmV0dXJu cyBwcml2YXRlIGFuZCBzaGFyZWQgdXNhZ2UsIGluIGJ5dGVzLiBQcml2YXRlIGJ5dGVzIGlzIHRo ZSBhbW91bnQgb2YKKyAgICAvLyBtZW1vcnkgY3VycmVudGx5IGFsbG9jYXRlZCB0byB0aGlzIHBy b2Nlc3MgdGhhdCBjYW5ub3QgYmUgc2hhcmVkLiBSZXR1cm5zCisgICAgLy8gZmFsc2Ugb24gcGxh dGZvcm0gc3BlY2lmaWMgZXJyb3IgY29uZGl0aW9ucy4KKyAgICB2aXJ0dWFsIGJvb2wgcHJvY2Vz c01lbW9yeVVzYWdlSW5CeXRlcyhzaXplX3QqIHByaXZhdGVCeXRlcywgc2l6ZV90KiBzaGFyZWRC eXRlcykgeyByZXR1cm4gZmFsc2U7IH0KIAogICAgIC8vIE5ldHdvcmsgLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yTWVtb3J5QWdlbnQuY3BwIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck1lbW9yeUFnZW50LmNwcAppbmRleCAy OTAwNzc1ODliOWJjZjVjMGJiMDc4YWFiOWFlNTNkYzdhOGZiZmY1Li5hZDNhY2I3MWVlY2FjZWFm Mzc1YzUxZDE3NDZmZDI1NTc3MmZmNDdkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yTWVtb3J5QWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JNZW1vcnlBZ2VudC5jcHAKQEAgLTQzLDExICs0Myw5IEBACiAjaW5jbHVk ZSAiSW5zcGVjdG9yU3RhdGUuaCIKICNpbmNsdWRlICJJbnNwZWN0b3JWYWx1ZXMuaCIKICNpbmNs dWRlICJJbnN0cnVtZW50aW5nQWdlbnRzLmgiCisjaW5jbHVkZSAiTWVtb3J5VXNhZ2VTdXBwb3J0 LmgiCiAjaW5jbHVkZSAiTm9kZS5oIgogI2luY2x1ZGUgIlBhZ2UuaCIKLSNpZiBQTEFURk9STShD SFJPTUlVTSkKLSNpbmNsdWRlICJQbGF0Zm9ybVN1cHBvcnQuaCIKLSNlbmRpZgogI2luY2x1ZGUg IlNjcmlwdEdDRXZlbnQuaCIKICNpbmNsdWRlICJTY3JpcHRQcm9maWxlci5oIgogI2luY2x1ZGUg IlN0eWxlZEVsZW1lbnQuaCIKQEAgLTMzOSwxMCArMzM3LDggQEAgc3RhdGljIFBhc3NSZWZQdHI8 V2ViQ29yZTo6VHlwZUJ1aWxkZXI6Ok1lbW9yeTo6TWVtb3J5QmxvY2s+IGpzSGVhcEluZm8oKQog dm9pZCBJbnNwZWN0b3JNZW1vcnlBZ2VudDo6Z2V0UHJvY2Vzc01lbW9yeURpc3RyaWJ1dGlvbihF cnJvclN0cmluZyosIFJlZlB0cjxXZWJDb3JlOjpUeXBlQnVpbGRlcjo6TWVtb3J5OjpNZW1vcnlC bG9jaz4mIHByb2Nlc3NNZW1vcnkpCiB7CiAgICAgc2l6ZV90IHByaXZhdGVCeXRlcyA9IDA7Ci0j aWYgUExBVEZPUk0oQ0hST01JVU0pCiAgICAgc2l6ZV90IHNoYXJlZEJ5dGVzID0gMDsKLSAgICBQ bGF0Zm9ybVN1cHBvcnQ6OmdldFByb2Nlc3NNZW1vcnlTaXplKCZwcml2YXRlQnl0ZXMsICZzaGFy ZWRCeXRlcyk7Ci0jZW5kaWYKKyAgICBNZW1vcnlVc2FnZVN1cHBvcnQ6OnByb2Nlc3NNZW1vcnlV c2FnZUluQnl0ZXMoJnByaXZhdGVCeXRlcywgJnNoYXJlZEJ5dGVzKTsKICAgICBwcm9jZXNzTWVt b3J5ID0gV2ViQ29yZTo6VHlwZUJ1aWxkZXI6Ok1lbW9yeTo6TWVtb3J5QmxvY2s6OmNyZWF0ZSgp LnNldE5hbWUoTWVtb3J5QmxvY2tOYW1lOjpwcm9jZXNzUHJpdmF0ZU1lbW9yeSk7CiAgICAgcHJv Y2Vzc01lbW9yeS0+c2V0U2l6ZShzdGF0aWNfY2FzdDxpbnQ+KHByaXZhdGVCeXRlcykpOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NZW1vcnlVc2FnZVN1cHBvcnQuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTWVtb3J5VXNhZ2VTdXBwb3J0LmNwcAppbmRleCAy ZjA2Yzc2MzkzNmI1ZjllYjI1ZTlhYmQzMGZhYjE2N2Y5NzBjOTkyLi5mNzVhNDY0ZWExMmNjNDdh OTQ5MWZlNjY4OWM1ZDk5Y2RjOTlmNjVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9NZW1vcnlVc2FnZVN1cHBvcnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L01lbW9yeVVzYWdlU3VwcG9ydC5jcHAKQEAgLTU4LDQgKzU4LDkgQEAgaW50IE1lbW9yeVVzYWdl U3VwcG9ydDo6aGlnaFVzYWdlRGVsdGFNQigpCiAgICAgcmV0dXJuIDA7CiB9CiAgICAgCitib29s IE1lbW9yeVVzYWdlU3VwcG9ydDo6cHJvY2Vzc01lbW9yeVVzYWdlSW5CeXRlcyhzaXplX3QqIHBy aXZhdGVCeXRlcywgc2l6ZV90KiBzaGFyZWRCeXRlcykKK3sKKyAgICByZXR1cm4gZmFsc2U7Cit9 CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL01lbW9yeVVzYWdlU3VwcG9ydC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTWVt b3J5VXNhZ2VTdXBwb3J0LmgKaW5kZXggOWQxMmUzNzQwYzNlYmNmZDI0YWVjMTZjZGViNGVkOTI4 NDhjYjZiMS4uZGNjODJhMWMxNjU0YzY4NGZiOGU3NGQ0OTNjNjRlY2JiMmJhNzkxOCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTWVtb3J5VXNhZ2VTdXBwb3J0LmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTWVtb3J5VXNhZ2VTdXBwb3J0LmgKQEAgLTUyLDYgKzUy LDExIEBAIHB1YmxpYzoKICAgICAvLyBEZWx0YSBvZiBtZW1vcnkgdXNhZ2UgZ3Jvd3RoICh2cy4g bGFzdCBhY3R1YWxNZW1vcnlVc2FnZU1CKCkpCiAgICAgLy8gdG8gZm9yY2UgR0Mgd2hlbiBtZW1v cnkgdXNhZ2UgaXMgaGlnaC4KICAgICBzdGF0aWMgaW50IGhpZ2hVc2FnZURlbHRhTUIoKTsKKwor ICAgIC8vIFJldHVybnMgcHJpdmF0ZSBhbmQgc2hhcmVkIHVzYWdlLCBpbiBieXRlcy4gUHJpdmF0 ZSBieXRlcyBpcyB0aGUgYW1vdW50IG9mCisgICAgLy8gbWVtb3J5IGN1cnJlbnRseSBhbGxvY2F0 ZWQgdG8gdGhpcyBwcm9jZXNzIHRoYXQgY2Fubm90IGJlIHNoYXJlZC4gUmV0dXJucworICAgIC8v IGZhbHNlIG9uIHBsYXRmb3JtIHNwZWNpZmljIGVycm9yIGNvbmRpdGlvbnMuCisgICAgc3RhdGlj IGJvb2wgcHJvY2Vzc01lbW9yeVVzYWdlSW5CeXRlcyhzaXplX3QqIHByaXZhdGVCeXRlcywgc2l6 ZV90KiBzaGFyZWRCeXRlcyk7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9NZW1vcnlVc2FnZVN1cHBvcnRD aHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9NZW1vcnlVc2Fn ZVN1cHBvcnRDaHJvbWl1bS5jcHAKaW5kZXggMGMzNTUzZWFlNzdiZjJkMjcwOTE5NGFjOGE3Njdj ODIyNjdjNWE0Zi4uMjRjNWMxYWMzYTBjNmUyYjJhNDJiZDJmY2FkNjNlNGU4ZDU1ZmU2MiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vTWVtb3J5VXNhZ2VTdXBw b3J0Q2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL01l bW9yeVVzYWdlU3VwcG9ydENocm9taXVtLmNwcApAQCAtNjAsNCArNjAsOSBAQCBpbnQgTWVtb3J5 VXNhZ2VTdXBwb3J0OjpoaWdoVXNhZ2VEZWx0YU1CKCkKICAgICByZXR1cm4gV2ViS2l0OjpQbGF0 Zm9ybTo6Y3VycmVudCgpLT5oaWdoVXNhZ2VEZWx0YU1CKCk7CiB9CiAKK2Jvb2wgTWVtb3J5VXNh Z2VTdXBwb3J0Ojpwcm9jZXNzTWVtb3J5VXNhZ2VJbkJ5dGVzKHNpemVfdCogcHJpdmF0ZUJ5dGVz LCBzaXplX3QqIHNoYXJlZEJ5dGVzKQoreworICAgIHJldHVybiBXZWJLaXQ6OlBsYXRmb3JtOjpj dXJyZW50KCktPnByb2Nlc3NNZW1vcnlVc2FnZUluQnl0ZXMocHJpdmF0ZUJ5dGVzLCBzaGFyZWRC eXRlcyk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vcHVibGljL3BsYXRmb3JtL1dlYktpdFBsYXRmb3JtU3VwcG9ydC5oIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvcGxhdGZvcm0vV2ViS2l0UGxhdGZvcm1TdXBw b3J0LmgKaW5kZXggOTA4MTUyMTQ5OWM1MTRjM2JiNDM2YWFiNjk1M2M5Mzc5NWEyOWE4MC4uZjY5 YzYyZmYyODBiYmQyYTNkOTczMWE0Zjg1ODUyNzNmMjJmOWUyNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvcGxhdGZvcm0vV2ViS2l0UGxhdGZvcm1TdXBwb3J0LmgK KysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvcGxhdGZvcm0vV2ViS2l0UGxhdGZv cm1TdXBwb3J0LmgKQEAgLTExNSwxMSArMTE1LDYgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBX ZWJTaGFyZWRXb3JrZXJSZXBvc2l0b3J5KiBzaGFyZWRXb3JrZXJSZXBvc2l0b3J5KCkgeyByZXR1 cm4gMDsgfQogCi0gICAgLy8gUmV0dXJucyBwcml2YXRlIGFuZCBzaGFyZWQgdXNhZ2UsIGluIGJ5 dGVzLiBQcml2YXRlIGJ5dGVzIGlzIHRoZSBhbW91bnQgb2YKLSAgICAvLyBtZW1vcnkgY3VycmVu dGx5IGFsbG9jYXRlZCB0byB0aGlzIHByb2Nlc3MgdGhhdCBjYW5ub3QgYmUgc2hhcmVkLiBSZXR1 cm5zCi0gICAgLy8gZmFsc2Ugb24gcGxhdGZvcm0gc3BlY2lmaWMgZXJyb3IgY29uZGl0aW9ucy4K LSAgICB2aXJ0dWFsIGJvb2wgZ2V0UHJvY2Vzc01lbW9yeVNpemUoc2l6ZV90KiBwcml2YXRlQnl0 ZXMsIHNpemVfdCogc2hhcmVkQnl0ZXMpIHsgcmV0dXJuIGZhbHNlOyB9Ci0KIHByb3RlY3RlZDoK ICAgICB+V2ViS2l0UGxhdGZvcm1TdXBwb3J0KCkgeyB9CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1TdXBwb3J0LmNwcCBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1BsYXRmb3JtU3VwcG9ydC5jcHAKaW5kZXggZGQ3Y2M4Mjg4Nzc3MzQ1NmQy OThlNThlZGYxYzQ0NzE3NTA0MWFkMi4uMThjNjQwNjc5ZjQyMGQ4ZGRjYWU0OGJhZmMxYTUwMDRh ODZjYzExNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1T dXBwb3J0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9QbGF0Zm9ybVN1cHBv cnQuY3BwCkBAIC04MzEsMTEgKzgzMSw2IEBAIHZvaWQgUGxhdGZvcm1TdXBwb3J0Ojpub3RpZnlK U091dE9mTWVtb3J5KEZyYW1lKiBmcmFtZSkKICAgICB3ZWJGcmFtZS0+Y2xpZW50KCktPmRpZEV4 aGF1c3RNZW1vcnlBdmFpbGFibGVGb3JTY3JpcHQod2ViRnJhbWUpOwogfQogCi1ib29sIFBsYXRm b3JtU3VwcG9ydDo6Z2V0UHJvY2Vzc01lbW9yeVNpemUoc2l6ZV90KiBwcml2YXRlQnl0ZXMsIHNp emVfdCogc2hhcmVkQnl0ZXMpCi17Ci0gICAgcmV0dXJuIHdlYktpdFBsYXRmb3JtU3VwcG9ydCgp LT5nZXRQcm9jZXNzTWVtb3J5U2l6ZShwcml2YXRlQnl0ZXMsIHNoYXJlZEJ5dGVzKTsKLX0KLQog aW50IFBsYXRmb3JtU3VwcG9ydDo6c2NyZWVuSG9yaXpvbnRhbERQSShXaWRnZXQqIHdpZGdldCkK IHsKICAgICBXZWJXaWRnZXRDbGllbnQqIGNsaWVudCA9IHRvV2ViV2lkZ2V0Q2xpZW50KHdpZGdl dCk7Cg== 144742 2012-05-30 01:03:25 -0700 2012-05-30 02:16:01 -0700 Patch bug-87830-20120530120324.patch text/plain 8839 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4ODk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCA3MTVkNGRlMjZiYWQ0 OGY0NDVmYWQzOWY0N2YzYzM2MWNmNWQwMTA1Li40ZmIxNWQ5ZTlkNDZlZTcwMTZhNjFkMjNkMjVk MGM4MjQ1NzczMGZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMi0wNS0zMCAg WXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiBhZGQgTWVtb3J5VXNhZ2VTdXBwb3J0Ojpwcm9jZXNzTWVtb3J5U2l6ZXNJbkJ5dGVz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NzgzMAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogY2hyb21p dW0vcHVibGljL1BsYXRmb3JtLmg6CisgICAgICAgIChQbGF0Zm9ybSk6CisgICAgICAgIChXZWJL aXQ6OlBsYXRmb3JtOjpwcm9jZXNzTWVtb3J5U2l6ZXNJbkJ5dGVzKTogbW92ZWQgdGhpcyBtZXRo b2QgZnJvbQorICAgICAgICBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9wbGF0Zm9ybS9X ZWJLaXRQbGF0Zm9ybVN1cHBvcnQuaCwgYWxzbworICAgICAgICByZW1vdmVkICdnZXQnIHByZWZp eC4KKwogMjAxMi0wNS0yOSAgTWFyayBQaWxncmltICA8cGlsZ3JpbUBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgW0Nocm9taXVtXSBNb3ZlIGZpbGVFeGlzdHMgdG8gUGxhdGZvcm0uaApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CmluZGV4IGZiN2NiMzEzNDA1YTE2NTAyNzY0Yzc1YTM0OWE4ZWVjYTFjMjIwMGUuLjEwZDg4NzA0 YmI4Njc1NWM5ZWMwOTA0YWNkM2M1NWEwZTRmMTJiYTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwy NiBAQAorMjAxMi0wNS0zMCAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4K KworICAgICAgICBXZWIgSW5zcGVjdG9yOiBhZGQgTWVtb3J5VXNhZ2VTdXBwb3J0Ojpwcm9jZXNz TWVtb3J5U2l6ZXNJbkJ5dGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04NzgzMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEFkZGVkIGEgbWV0aG9kIGZvciBnZXR0aW5nIHByb2Nlc3MgbWVtb3J5IHVzYWdl IGluIGJ5dGVzLiBJdCBpcworICAgICAgICB1c2VkIGluIHRoZSBpbnNwZWN0b3IgbWVtb3J5IGlu c3RydW1lbnRhdGlvbiB0byBnZXQgcHJvY2VzcyB0b3RhbAorICAgICAgICBtZW1vcnkgdXNhZ2Uu CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yTWVtb3J5QWdlbnQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yTWVtb3J5QWdlbnQ6OmdldFByb2Nlc3NNZW1vcnlEaXN0cmli dXRpb24pOgorICAgICAgICAqIHBsYXRmb3JtL01lbW9yeVVzYWdlU3VwcG9ydC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpNZW1vcnlVc2FnZVN1cHBvcnQ6OnByb2Nlc3NNZW1vcnlTaXplc0luQnl0 ZXMpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogcGxhdGZvcm0vTWVtb3J5VXNhZ2VT dXBwb3J0Lmg6CisgICAgICAgIChNZW1vcnlVc2FnZVN1cHBvcnQpOiBwcm92aWRlZCBlbWJlZGRl cnMgd2l0aCBhIHdheSB0byByZXBvcnQgV2ViS2l0IHByb2Nlc3MKKyAgICAgICAgbWVtb3J5IHVz YWdlLgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL01lbW9yeVVzYWdlU3VwcG9ydENocm9t aXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lbW9yeVVzYWdlU3VwcG9ydDo6cHJvY2Vzc01l bW9yeVNpemVzSW5CeXRlcyk6CisgICAgICAgIChXZWJDb3JlKToKKwogMjAxMi0wNS0yOSAgTWFy ayBQaWxncmltICA8cGlsZ3JpbUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVtXSBN b3ZlIGZpbGVFeGlzdHMgdG8gUGxhdGZvcm0uaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRl eCBkZWFjNzIwOWExMTE3MTBkNzM4Zjg2Mjc4NWQ5MGY5YzYzNDc0NDFmLi4xYjFiOGZkOTQ0ODFj OGFiM2U4NzkwNzkyNmQxZTY3ZjFiNmEyMjVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE0IEBACisyMDEyLTA1LTMwICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hy b21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGFkZCBNZW1vcnlVc2FnZVN1cHBv cnQ6OnByb2Nlc3NNZW1vcnlTaXplc0luQnl0ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTg3ODMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBwdWJsaWMvcGxhdGZvcm0vV2ViS2l0UGxhdGZvcm1TdXBw b3J0Lmg6IHB1bGxlZCBnZXRQcm9jZXNzTWVtb3J5U2l6ZSB1cAorICAgICAgICB0byB0aGUgU291 cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9QbGF0Zm9ybS5oCisgICAgICAgICogc3JjL1Bs YXRmb3JtU3VwcG9ydC5jcHA6CisKIDIwMTItMDUtMjkgIE1hcmsgUGlsZ3JpbSAgPHBpbGdyaW1A Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWl1bV0gTW92ZSBmaWxlRXhpc3RzIHRvIFBs YXRmb3JtLmgKZGlmZiAtLWdpdCBhL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvUGxh dGZvcm0uaCBiL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvUGxhdGZvcm0uaAppbmRl eCA5NDM5Y2ViZjZmN2ExZGVlNjYyNjA3ODM5MzdhMzdkOWIwNGJmMDQyLi41ZGFiYjk0MzJhZTM4 MDc4OTczYTYzNmVmZjdjYTc4YTU5NWJlY2FkIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0v Y2hyb21pdW0vcHVibGljL1BsYXRmb3JtLmgKKysrIGIvU291cmNlL1BsYXRmb3JtL2Nocm9taXVt L3B1YmxpYy9QbGF0Zm9ybS5oCkBAIC0xNTMsNiArMTUzLDEwIEBAIHB1YmxpYzoKICAgICAvLyBE ZWx0YSBvZiBtZW1vcnkgdXNhZ2UgZ3Jvd3RoICh2cy4gbGFzdCBhY3R1YWxNZW1vcnlVc2FnZU1C KCkpIHRvIGZvcmNlIEdDIHdoZW4gbWVtb3J5IHVzYWdlIGlzIGhpZ2guCiAgICAgdmlydHVhbCBz aXplX3QgaGlnaFVzYWdlRGVsdGFNQigpIHsgcmV0dXJuIDEyODsgfQogCisgICAgLy8gUmV0dXJu cyBwcml2YXRlIGFuZCBzaGFyZWQgdXNhZ2UsIGluIGJ5dGVzLiBQcml2YXRlIGJ5dGVzIGlzIHRo ZSBhbW91bnQgb2YKKyAgICAvLyBtZW1vcnkgY3VycmVudGx5IGFsbG9jYXRlZCB0byB0aGlzIHBy b2Nlc3MgdGhhdCBjYW5ub3QgYmUgc2hhcmVkLiBSZXR1cm5zCisgICAgLy8gZmFsc2Ugb24gcGxh dGZvcm0gc3BlY2lmaWMgZXJyb3IgY29uZGl0aW9ucy4KKyAgICB2aXJ0dWFsIGJvb2wgcHJvY2Vz c01lbW9yeVNpemVzSW5CeXRlcyhzaXplX3QqIHByaXZhdGVCeXRlcywgc2l6ZV90KiBzaGFyZWRC eXRlcykgeyByZXR1cm4gZmFsc2U7IH0KIAogICAgIC8vIE5ldHdvcmsgLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yTWVtb3J5QWdlbnQuY3BwIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck1lbW9yeUFnZW50LmNwcAppbmRleCAy OTAwNzc1ODliOWJjZjVjMGJiMDc4YWFiOWFlNTNkYzdhOGZiZmY1Li45N2JjMDk3ZGFkMmI5YjM0 ZmQxMGFlNjIzOTI3YzIzNjJmYzU4YzQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yTWVtb3J5QWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JNZW1vcnlBZ2VudC5jcHAKQEAgLTQzLDExICs0Myw5IEBACiAjaW5jbHVk ZSAiSW5zcGVjdG9yU3RhdGUuaCIKICNpbmNsdWRlICJJbnNwZWN0b3JWYWx1ZXMuaCIKICNpbmNs dWRlICJJbnN0cnVtZW50aW5nQWdlbnRzLmgiCisjaW5jbHVkZSAiTWVtb3J5VXNhZ2VTdXBwb3J0 LmgiCiAjaW5jbHVkZSAiTm9kZS5oIgogI2luY2x1ZGUgIlBhZ2UuaCIKLSNpZiBQTEFURk9STShD SFJPTUlVTSkKLSNpbmNsdWRlICJQbGF0Zm9ybVN1cHBvcnQuaCIKLSNlbmRpZgogI2luY2x1ZGUg IlNjcmlwdEdDRXZlbnQuaCIKICNpbmNsdWRlICJTY3JpcHRQcm9maWxlci5oIgogI2luY2x1ZGUg IlN0eWxlZEVsZW1lbnQuaCIKQEAgLTMzOSwxMCArMzM3LDggQEAgc3RhdGljIFBhc3NSZWZQdHI8 V2ViQ29yZTo6VHlwZUJ1aWxkZXI6Ok1lbW9yeTo6TWVtb3J5QmxvY2s+IGpzSGVhcEluZm8oKQog dm9pZCBJbnNwZWN0b3JNZW1vcnlBZ2VudDo6Z2V0UHJvY2Vzc01lbW9yeURpc3RyaWJ1dGlvbihF cnJvclN0cmluZyosIFJlZlB0cjxXZWJDb3JlOjpUeXBlQnVpbGRlcjo6TWVtb3J5OjpNZW1vcnlC bG9jaz4mIHByb2Nlc3NNZW1vcnkpCiB7CiAgICAgc2l6ZV90IHByaXZhdGVCeXRlcyA9IDA7Ci0j aWYgUExBVEZPUk0oQ0hST01JVU0pCiAgICAgc2l6ZV90IHNoYXJlZEJ5dGVzID0gMDsKLSAgICBQ bGF0Zm9ybVN1cHBvcnQ6OmdldFByb2Nlc3NNZW1vcnlTaXplKCZwcml2YXRlQnl0ZXMsICZzaGFy ZWRCeXRlcyk7Ci0jZW5kaWYKKyAgICBNZW1vcnlVc2FnZVN1cHBvcnQ6OnByb2Nlc3NNZW1vcnlT aXplc0luQnl0ZXMoJnByaXZhdGVCeXRlcywgJnNoYXJlZEJ5dGVzKTsKICAgICBwcm9jZXNzTWVt b3J5ID0gV2ViQ29yZTo6VHlwZUJ1aWxkZXI6Ok1lbW9yeTo6TWVtb3J5QmxvY2s6OmNyZWF0ZSgp LnNldE5hbWUoTWVtb3J5QmxvY2tOYW1lOjpwcm9jZXNzUHJpdmF0ZU1lbW9yeSk7CiAgICAgcHJv Y2Vzc01lbW9yeS0+c2V0U2l6ZShzdGF0aWNfY2FzdDxpbnQ+KHByaXZhdGVCeXRlcykpOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NZW1vcnlVc2FnZVN1cHBvcnQuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTWVtb3J5VXNhZ2VTdXBwb3J0LmNwcAppbmRleCAy ZjA2Yzc2MzkzNmI1ZjllYjI1ZTlhYmQzMGZhYjE2N2Y5NzBjOTkyLi4wZWI0MGU1MmE3YzRlZWEx MjlmNWNlODEzZGI4ZmQ2NTQ0YmRlNDZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9NZW1vcnlVc2FnZVN1cHBvcnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L01lbW9yeVVzYWdlU3VwcG9ydC5jcHAKQEAgLTU4LDQgKzU4LDkgQEAgaW50IE1lbW9yeVVzYWdl U3VwcG9ydDo6aGlnaFVzYWdlRGVsdGFNQigpCiAgICAgcmV0dXJuIDA7CiB9CiAgICAgCitib29s IE1lbW9yeVVzYWdlU3VwcG9ydDo6cHJvY2Vzc01lbW9yeVNpemVzSW5CeXRlcyhzaXplX3QqIHBy aXZhdGVCeXRlcywgc2l6ZV90KiBzaGFyZWRCeXRlcykKK3sKKyAgICByZXR1cm4gZmFsc2U7Cit9 CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL01lbW9yeVVzYWdlU3VwcG9ydC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTWVt b3J5VXNhZ2VTdXBwb3J0LmgKaW5kZXggOWQxMmUzNzQwYzNlYmNmZDI0YWVjMTZjZGViNGVkOTI4 NDhjYjZiMS4uNGYxYTBiZGQ3ZGRkN2FiYTFkZTZlNWRkYTAyMjgyZWVmMmMwNmEyZiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTWVtb3J5VXNhZ2VTdXBwb3J0LmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTWVtb3J5VXNhZ2VTdXBwb3J0LmgKQEAgLTUyLDYgKzUy LDExIEBAIHB1YmxpYzoKICAgICAvLyBEZWx0YSBvZiBtZW1vcnkgdXNhZ2UgZ3Jvd3RoICh2cy4g bGFzdCBhY3R1YWxNZW1vcnlVc2FnZU1CKCkpCiAgICAgLy8gdG8gZm9yY2UgR0Mgd2hlbiBtZW1v cnkgdXNhZ2UgaXMgaGlnaC4KICAgICBzdGF0aWMgaW50IGhpZ2hVc2FnZURlbHRhTUIoKTsKKwor ICAgIC8vIFJldHVybnMgcHJpdmF0ZSBhbmQgc2hhcmVkIHVzYWdlLCBpbiBieXRlcy4gUHJpdmF0 ZSBieXRlcyBpcyB0aGUgYW1vdW50IG9mCisgICAgLy8gbWVtb3J5IGN1cnJlbnRseSBhbGxvY2F0 ZWQgdG8gdGhpcyBwcm9jZXNzIHRoYXQgY2Fubm90IGJlIHNoYXJlZC4gUmV0dXJucworICAgIC8v IGZhbHNlIG9uIHBsYXRmb3JtIHNwZWNpZmljIGVycm9yIGNvbmRpdGlvbnMuCisgICAgc3RhdGlj IGJvb2wgcHJvY2Vzc01lbW9yeVNpemVzSW5CeXRlcyhzaXplX3QqIHByaXZhdGVCeXRlcywgc2l6 ZV90KiBzaGFyZWRCeXRlcyk7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9NZW1vcnlVc2FnZVN1cHBvcnRD aHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9NZW1vcnlVc2Fn ZVN1cHBvcnRDaHJvbWl1bS5jcHAKaW5kZXggMGMzNTUzZWFlNzdiZjJkMjcwOTE5NGFjOGE3Njdj ODIyNjdjNWE0Zi4uZDIxZGVjZTkwYTI4YWQ0ODhjZmNjZjgyNzJmODEwZWE5YzA2NDIxOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vTWVtb3J5VXNhZ2VTdXBw b3J0Q2hyb21pdW0uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL01l bW9yeVVzYWdlU3VwcG9ydENocm9taXVtLmNwcApAQCAtNjAsNCArNjAsOSBAQCBpbnQgTWVtb3J5 VXNhZ2VTdXBwb3J0OjpoaWdoVXNhZ2VEZWx0YU1CKCkKICAgICByZXR1cm4gV2ViS2l0OjpQbGF0 Zm9ybTo6Y3VycmVudCgpLT5oaWdoVXNhZ2VEZWx0YU1CKCk7CiB9CiAKK2Jvb2wgTWVtb3J5VXNh Z2VTdXBwb3J0Ojpwcm9jZXNzTWVtb3J5U2l6ZXNJbkJ5dGVzKHNpemVfdCogcHJpdmF0ZUJ5dGVz LCBzaXplX3QqIHNoYXJlZEJ5dGVzKQoreworICAgIHJldHVybiBXZWJLaXQ6OlBsYXRmb3JtOjpj dXJyZW50KCktPnByb2Nlc3NNZW1vcnlTaXplc0luQnl0ZXMocHJpdmF0ZUJ5dGVzLCBzaGFyZWRC eXRlcyk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vcHVibGljL3BsYXRmb3JtL1dlYktpdFBsYXRmb3JtU3VwcG9ydC5oIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvcGxhdGZvcm0vV2ViS2l0UGxhdGZvcm1TdXBw b3J0LmgKaW5kZXggOTA4MTUyMTQ5OWM1MTRjM2JiNDM2YWFiNjk1M2M5Mzc5NWEyOWE4MC4uZjY5 YzYyZmYyODBiYmQyYTNkOTczMWE0Zjg1ODUyNzNmMjJmOWUyNSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvcGxhdGZvcm0vV2ViS2l0UGxhdGZvcm1TdXBwb3J0LmgK KysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvcGxhdGZvcm0vV2ViS2l0UGxhdGZv cm1TdXBwb3J0LmgKQEAgLTExNSwxMSArMTE1LDYgQEAgcHVibGljOgogCiAgICAgdmlydHVhbCBX ZWJTaGFyZWRXb3JrZXJSZXBvc2l0b3J5KiBzaGFyZWRXb3JrZXJSZXBvc2l0b3J5KCkgeyByZXR1 cm4gMDsgfQogCi0gICAgLy8gUmV0dXJucyBwcml2YXRlIGFuZCBzaGFyZWQgdXNhZ2UsIGluIGJ5 dGVzLiBQcml2YXRlIGJ5dGVzIGlzIHRoZSBhbW91bnQgb2YKLSAgICAvLyBtZW1vcnkgY3VycmVu dGx5IGFsbG9jYXRlZCB0byB0aGlzIHByb2Nlc3MgdGhhdCBjYW5ub3QgYmUgc2hhcmVkLiBSZXR1 cm5zCi0gICAgLy8gZmFsc2Ugb24gcGxhdGZvcm0gc3BlY2lmaWMgZXJyb3IgY29uZGl0aW9ucy4K LSAgICB2aXJ0dWFsIGJvb2wgZ2V0UHJvY2Vzc01lbW9yeVNpemUoc2l6ZV90KiBwcml2YXRlQnl0 ZXMsIHNpemVfdCogc2hhcmVkQnl0ZXMpIHsgcmV0dXJuIGZhbHNlOyB9Ci0KIHByb3RlY3RlZDoK ICAgICB+V2ViS2l0UGxhdGZvcm1TdXBwb3J0KCkgeyB9CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1TdXBwb3J0LmNwcCBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vc3JjL1BsYXRmb3JtU3VwcG9ydC5jcHAKaW5kZXggZGQ3Y2M4Mjg4Nzc3MzQ1NmQy OThlNThlZGYxYzQ0NzE3NTA0MWFkMi4uMThjNjQwNjc5ZjQyMGQ4ZGRjYWU0OGJhZmMxYTUwMDRh ODZjYzExNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1T dXBwb3J0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9QbGF0Zm9ybVN1cHBv cnQuY3BwCkBAIC04MzEsMTEgKzgzMSw2IEBAIHZvaWQgUGxhdGZvcm1TdXBwb3J0Ojpub3RpZnlK U091dE9mTWVtb3J5KEZyYW1lKiBmcmFtZSkKICAgICB3ZWJGcmFtZS0+Y2xpZW50KCktPmRpZEV4 aGF1c3RNZW1vcnlBdmFpbGFibGVGb3JTY3JpcHQod2ViRnJhbWUpOwogfQogCi1ib29sIFBsYXRm b3JtU3VwcG9ydDo6Z2V0UHJvY2Vzc01lbW9yeVNpemUoc2l6ZV90KiBwcml2YXRlQnl0ZXMsIHNp emVfdCogc2hhcmVkQnl0ZXMpCi17Ci0gICAgcmV0dXJuIHdlYktpdFBsYXRmb3JtU3VwcG9ydCgp LT5nZXRQcm9jZXNzTWVtb3J5U2l6ZShwcml2YXRlQnl0ZXMsIHNoYXJlZEJ5dGVzKTsKLX0KLQog aW50IFBsYXRmb3JtU3VwcG9ydDo6c2NyZWVuSG9yaXpvbnRhbERQSShXaWRnZXQqIHdpZGdldCkK IHsKICAgICBXZWJXaWRnZXRDbGllbnQqIGNsaWVudCA9IHRvV2ViV2lkZ2V0Q2xpZW50KHdpZGdl dCk7Cg== 144759 2012-05-30 02:16:10 -0700 2012-05-30 11:32:10 -0700 Patch bug-87830-20120530131608.patch text/plain 8814 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4ODk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvUGxhdGZvcm0v Q2hhbmdlTG9nIGIvU291cmNlL1BsYXRmb3JtL0NoYW5nZUxvZwppbmRleCA3MTVkNGRlMjZiYWQ0 OGY0NDVmYWQzOWY0N2YzYzM2MWNmNWQwMTA1Li40ZmIxNWQ5ZTlkNDZlZTcwMTZhNjFkMjNkMjVk MGM4MjQ1NzczMGZkIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0vQ2hhbmdlTG9nCisrKyBi L1NvdXJjZS9QbGF0Zm9ybS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMi0wNS0zMCAg WXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiBhZGQgTWVtb3J5VXNhZ2VTdXBwb3J0Ojpwcm9jZXNzTWVtb3J5U2l6ZXNJbkJ5dGVz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NzgzMAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogY2hyb21p dW0vcHVibGljL1BsYXRmb3JtLmg6CisgICAgICAgIChQbGF0Zm9ybSk6CisgICAgICAgIChXZWJL aXQ6OlBsYXRmb3JtOjpwcm9jZXNzTWVtb3J5U2l6ZXNJbkJ5dGVzKTogbW92ZWQgdGhpcyBtZXRo b2QgZnJvbQorICAgICAgICBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9wbGF0Zm9ybS9X ZWJLaXRQbGF0Zm9ybVN1cHBvcnQuaCwgYWxzbworICAgICAgICByZW1vdmVkICdnZXQnIHByZWZp eC4KKwogMjAxMi0wNS0yOSAgTWFyayBQaWxncmltICA8cGlsZ3JpbUBjaHJvbWl1bS5vcmc+CiAK ICAgICAgICAgW0Nocm9taXVtXSBNb3ZlIGZpbGVFeGlzdHMgdG8gUGxhdGZvcm0uaApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CmluZGV4IGZiN2NiMzEzNDA1YTE2NTAyNzY0Yzc1YTM0OWE4ZWVjYTFjMjIwMGUuLjEwZDg4NzA0 YmI4Njc1NWM5ZWMwOTA0YWNkM2M1NWEwZTRmMTJiYTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwy NiBAQAorMjAxMi0wNS0zMCAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVtLm9yZz4K KworICAgICAgICBXZWIgSW5zcGVjdG9yOiBhZGQgTWVtb3J5VXNhZ2VTdXBwb3J0Ojpwcm9jZXNz TWVtb3J5U2l6ZXNJbkJ5dGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04NzgzMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEFkZGVkIGEgbWV0aG9kIGZvciBnZXR0aW5nIHByb2Nlc3MgbWVtb3J5IHVzYWdl IGluIGJ5dGVzLiBJdCBpcworICAgICAgICB1c2VkIGluIHRoZSBpbnNwZWN0b3IgbWVtb3J5IGlu c3RydW1lbnRhdGlvbiB0byBnZXQgcHJvY2VzcyB0b3RhbAorICAgICAgICBtZW1vcnkgdXNhZ2Uu CisKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yTWVtb3J5QWdlbnQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6SW5zcGVjdG9yTWVtb3J5QWdlbnQ6OmdldFByb2Nlc3NNZW1vcnlEaXN0cmli dXRpb24pOgorICAgICAgICAqIHBsYXRmb3JtL01lbW9yeVVzYWdlU3VwcG9ydC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpNZW1vcnlVc2FnZVN1cHBvcnQ6OnByb2Nlc3NNZW1vcnlTaXplc0luQnl0 ZXMpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogcGxhdGZvcm0vTWVtb3J5VXNhZ2VT dXBwb3J0Lmg6CisgICAgICAgIChNZW1vcnlVc2FnZVN1cHBvcnQpOiBwcm92aWRlZCBlbWJlZGRl cnMgd2l0aCBhIHdheSB0byByZXBvcnQgV2ViS2l0IHByb2Nlc3MKKyAgICAgICAgbWVtb3J5IHVz YWdlLgorICAgICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL01lbW9yeVVzYWdlU3VwcG9ydENocm9t aXVtLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lbW9yeVVzYWdlU3VwcG9ydDo6cHJvY2Vzc01l bW9yeVNpemVzSW5CeXRlcyk6CisgICAgICAgIChXZWJDb3JlKToKKwogMjAxMi0wNS0yOSAgTWFy ayBQaWxncmltICA8cGlsZ3JpbUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVtXSBN b3ZlIGZpbGVFeGlzdHMgdG8gUGxhdGZvcm0uaApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRl eCBkZWFjNzIwOWExMTE3MTBkNzM4Zjg2Mjc4NWQ5MGY5YzYzNDc0NDFmLi4xYjFiOGZkOTQ0ODFj OGFiM2U4NzkwNzkyNmQxZTY3ZjFiNmEyMjVkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpA QCAtMSwzICsxLDE0IEBACisyMDEyLTA1LTMwICBZdXJ5IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hy b21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IGFkZCBNZW1vcnlVc2FnZVN1cHBv cnQ6OnByb2Nlc3NNZW1vcnlTaXplc0luQnl0ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTg3ODMwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgKiBwdWJsaWMvcGxhdGZvcm0vV2ViS2l0UGxhdGZvcm1TdXBw b3J0Lmg6IHB1bGxlZCBnZXRQcm9jZXNzTWVtb3J5U2l6ZSB1cAorICAgICAgICB0byB0aGUgU291 cmNlL1BsYXRmb3JtL2Nocm9taXVtL3B1YmxpYy9QbGF0Zm9ybS5oCisgICAgICAgICogc3JjL1Bs YXRmb3JtU3VwcG9ydC5jcHA6CisKIDIwMTItMDUtMjkgIE1hcmsgUGlsZ3JpbSAgPHBpbGdyaW1A Y2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtDaHJvbWl1bV0gTW92ZSBmaWxlRXhpc3RzIHRvIFBs YXRmb3JtLmgKZGlmZiAtLWdpdCBhL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvUGxh dGZvcm0uaCBiL1NvdXJjZS9QbGF0Zm9ybS9jaHJvbWl1bS9wdWJsaWMvUGxhdGZvcm0uaAppbmRl eCA5NDM5Y2ViZjZmN2ExZGVlNjYyNjA3ODM5MzdhMzdkOWIwNGJmMDQyLi41ZGFiYjk0MzJhZTM4 MDc4OTczYTYzNmVmZjdjYTc4YTU5NWJlY2FkIDEwMDY0NAotLS0gYS9Tb3VyY2UvUGxhdGZvcm0v Y2hyb21pdW0vcHVibGljL1BsYXRmb3JtLmgKKysrIGIvU291cmNlL1BsYXRmb3JtL2Nocm9taXVt L3B1YmxpYy9QbGF0Zm9ybS5oCkBAIC0xNTMsNiArMTUzLDEwIEBAIHB1YmxpYzoKICAgICAvLyBE ZWx0YSBvZiBtZW1vcnkgdXNhZ2UgZ3Jvd3RoICh2cy4gbGFzdCBhY3R1YWxNZW1vcnlVc2FnZU1C KCkpIHRvIGZvcmNlIEdDIHdoZW4gbWVtb3J5IHVzYWdlIGlzIGhpZ2guCiAgICAgdmlydHVhbCBz aXplX3QgaGlnaFVzYWdlRGVsdGFNQigpIHsgcmV0dXJuIDEyODsgfQogCisgICAgLy8gUmV0dXJu cyBwcml2YXRlIGFuZCBzaGFyZWQgdXNhZ2UsIGluIGJ5dGVzLiBQcml2YXRlIGJ5dGVzIGlzIHRo ZSBhbW91bnQgb2YKKyAgICAvLyBtZW1vcnkgY3VycmVudGx5IGFsbG9jYXRlZCB0byB0aGlzIHBy b2Nlc3MgdGhhdCBjYW5ub3QgYmUgc2hhcmVkLiBSZXR1cm5zCisgICAgLy8gZmFsc2Ugb24gcGxh dGZvcm0gc3BlY2lmaWMgZXJyb3IgY29uZGl0aW9ucy4KKyAgICB2aXJ0dWFsIGJvb2wgcHJvY2Vz c01lbW9yeVNpemVzSW5CeXRlcyhzaXplX3QqIHByaXZhdGVCeXRlcywgc2l6ZV90KiBzaGFyZWRC eXRlcykgeyByZXR1cm4gZmFsc2U7IH0KIAogICAgIC8vIE5ldHdvcmsgLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yTWVtb3J5QWdlbnQuY3BwIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck1lbW9yeUFnZW50LmNwcAppbmRleCAy OTAwNzc1ODliOWJjZjVjMGJiMDc4YWFiOWFlNTNkYzdhOGZiZmY1Li45N2JjMDk3ZGFkMmI5YjM0 ZmQxMGFlNjIzOTI3YzIzNjJmYzU4YzQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yTWVtb3J5QWdlbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9JbnNwZWN0b3JNZW1vcnlBZ2VudC5jcHAKQEAgLTQzLDExICs0Myw5IEBACiAjaW5jbHVk ZSAiSW5zcGVjdG9yU3RhdGUuaCIKICNpbmNsdWRlICJJbnNwZWN0b3JWYWx1ZXMuaCIKICNpbmNs dWRlICJJbnN0cnVtZW50aW5nQWdlbnRzLmgiCisjaW5jbHVkZSAiTWVtb3J5VXNhZ2VTdXBwb3J0 LmgiCiAjaW5jbHVkZSAiTm9kZS5oIgogI2luY2x1ZGUgIlBhZ2UuaCIKLSNpZiBQTEFURk9STShD SFJPTUlVTSkKLSNpbmNsdWRlICJQbGF0Zm9ybVN1cHBvcnQuaCIKLSNlbmRpZgogI2luY2x1ZGUg IlNjcmlwdEdDRXZlbnQuaCIKICNpbmNsdWRlICJTY3JpcHRQcm9maWxlci5oIgogI2luY2x1ZGUg IlN0eWxlZEVsZW1lbnQuaCIKQEAgLTMzOSwxMCArMzM3LDggQEAgc3RhdGljIFBhc3NSZWZQdHI8 V2ViQ29yZTo6VHlwZUJ1aWxkZXI6Ok1lbW9yeTo6TWVtb3J5QmxvY2s+IGpzSGVhcEluZm8oKQog dm9pZCBJbnNwZWN0b3JNZW1vcnlBZ2VudDo6Z2V0UHJvY2Vzc01lbW9yeURpc3RyaWJ1dGlvbihF cnJvclN0cmluZyosIFJlZlB0cjxXZWJDb3JlOjpUeXBlQnVpbGRlcjo6TWVtb3J5OjpNZW1vcnlC bG9jaz4mIHByb2Nlc3NNZW1vcnkpCiB7CiAgICAgc2l6ZV90IHByaXZhdGVCeXRlcyA9IDA7Ci0j aWYgUExBVEZPUk0oQ0hST01JVU0pCiAgICAgc2l6ZV90IHNoYXJlZEJ5dGVzID0gMDsKLSAgICBQ bGF0Zm9ybVN1cHBvcnQ6OmdldFByb2Nlc3NNZW1vcnlTaXplKCZwcml2YXRlQnl0ZXMsICZzaGFy ZWRCeXRlcyk7Ci0jZW5kaWYKKyAgICBNZW1vcnlVc2FnZVN1cHBvcnQ6OnByb2Nlc3NNZW1vcnlT aXplc0luQnl0ZXMoJnByaXZhdGVCeXRlcywgJnNoYXJlZEJ5dGVzKTsKICAgICBwcm9jZXNzTWVt b3J5ID0gV2ViQ29yZTo6VHlwZUJ1aWxkZXI6Ok1lbW9yeTo6TWVtb3J5QmxvY2s6OmNyZWF0ZSgp LnNldE5hbWUoTWVtb3J5QmxvY2tOYW1lOjpwcm9jZXNzUHJpdmF0ZU1lbW9yeSk7CiAgICAgcHJv Y2Vzc01lbW9yeS0+c2V0U2l6ZShzdGF0aWNfY2FzdDxpbnQ+KHByaXZhdGVCeXRlcykpOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NZW1vcnlVc2FnZVN1cHBvcnQuY3Bw IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTWVtb3J5VXNhZ2VTdXBwb3J0LmNwcAppbmRleCAy ZjA2Yzc2MzkzNmI1ZjllYjI1ZTlhYmQzMGZhYjE2N2Y5NzBjOTkyLi43N2ViNGY0NmZhYTA5Y2Yz NzczYmViOTEzNDgyNjQxNzFmMmFlNDdiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9NZW1vcnlVc2FnZVN1cHBvcnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L01lbW9yeVVzYWdlU3VwcG9ydC5jcHAKQEAgLTU4LDQgKzU4LDkgQEAgaW50IE1lbW9yeVVzYWdl U3VwcG9ydDo6aGlnaFVzYWdlRGVsdGFNQigpCiAgICAgcmV0dXJuIDA7CiB9CiAgICAgCitib29s IE1lbW9yeVVzYWdlU3VwcG9ydDo6cHJvY2Vzc01lbW9yeVNpemVzSW5CeXRlcyhzaXplX3QqLCBz aXplX3QqKQoreworICAgIHJldHVybiBmYWxzZTsKK30KKwogfSAvLyBuYW1lc3BhY2UgV2ViQ29y ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vTWVtb3J5VXNhZ2VTdXBwb3J0 LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9NZW1vcnlVc2FnZVN1cHBvcnQuaAppbmRleCA5 ZDEyZTM3NDBjM2ViY2ZkMjRhZWMxNmNkZWI0ZWQ5Mjg0OGNiNmIxLi40ZjFhMGJkZDdkZGQ3YWJh MWRlNmU1ZGRhMDIyODJlZWYyYzA2YTJmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9NZW1vcnlVc2FnZVN1cHBvcnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9N ZW1vcnlVc2FnZVN1cHBvcnQuaApAQCAtNTIsNiArNTIsMTEgQEAgcHVibGljOgogICAgIC8vIERl bHRhIG9mIG1lbW9yeSB1c2FnZSBncm93dGggKHZzLiBsYXN0IGFjdHVhbE1lbW9yeVVzYWdlTUIo KSkKICAgICAvLyB0byBmb3JjZSBHQyB3aGVuIG1lbW9yeSB1c2FnZSBpcyBoaWdoLgogICAgIHN0 YXRpYyBpbnQgaGlnaFVzYWdlRGVsdGFNQigpOworCisgICAgLy8gUmV0dXJucyBwcml2YXRlIGFu ZCBzaGFyZWQgdXNhZ2UsIGluIGJ5dGVzLiBQcml2YXRlIGJ5dGVzIGlzIHRoZSBhbW91bnQgb2YK KyAgICAvLyBtZW1vcnkgY3VycmVudGx5IGFsbG9jYXRlZCB0byB0aGlzIHByb2Nlc3MgdGhhdCBj YW5ub3QgYmUgc2hhcmVkLiBSZXR1cm5zCisgICAgLy8gZmFsc2Ugb24gcGxhdGZvcm0gc3BlY2lm aWMgZXJyb3IgY29uZGl0aW9ucy4KKyAgICBzdGF0aWMgYm9vbCBwcm9jZXNzTWVtb3J5U2l6ZXNJ bkJ5dGVzKHNpemVfdCogcHJpdmF0ZUJ5dGVzLCBzaXplX3QqIHNoYXJlZEJ5dGVzKTsKIH07CiAK IH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2Nocm9taXVtL01lbW9yeVVzYWdlU3VwcG9ydENocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2Nocm9taXVtL01lbW9yeVVzYWdlU3VwcG9ydENocm9taXVtLmNwcAppbmRl eCAwYzM1NTNlYWU3N2JmMmQyNzA5MTk0YWM4YTc2N2M4MjI2N2M1YTRmLi5kMjFkZWNlOTBhMjhh ZDQ4OGNmY2NmODI3MmY4MTBlYTljMDY0MjE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9jaHJvbWl1bS9NZW1vcnlVc2FnZVN1cHBvcnRDaHJvbWl1bS5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vTWVtb3J5VXNhZ2VTdXBwb3J0Q2hyb21pdW0u Y3BwCkBAIC02MCw0ICs2MCw5IEBAIGludCBNZW1vcnlVc2FnZVN1cHBvcnQ6OmhpZ2hVc2FnZURl bHRhTUIoKQogICAgIHJldHVybiBXZWJLaXQ6OlBsYXRmb3JtOjpjdXJyZW50KCktPmhpZ2hVc2Fn ZURlbHRhTUIoKTsKIH0KIAorYm9vbCBNZW1vcnlVc2FnZVN1cHBvcnQ6OnByb2Nlc3NNZW1vcnlT aXplc0luQnl0ZXMoc2l6ZV90KiBwcml2YXRlQnl0ZXMsIHNpemVfdCogc2hhcmVkQnl0ZXMpCit7 CisgICAgcmV0dXJuIFdlYktpdDo6UGxhdGZvcm06OmN1cnJlbnQoKS0+cHJvY2Vzc01lbW9yeVNp emVzSW5CeXRlcyhwcml2YXRlQnl0ZXMsIHNoYXJlZEJ5dGVzKTsKK30KKwogfSAvLyBuYW1lc3Bh Y2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvcGxh dGZvcm0vV2ViS2l0UGxhdGZvcm1TdXBwb3J0LmggYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1 YmxpYy9wbGF0Zm9ybS9XZWJLaXRQbGF0Zm9ybVN1cHBvcnQuaAppbmRleCA5MDgxNTIxNDk5YzUx NGMzYmI0MzZhYWI2OTUzYzkzNzk1YTI5YTgwLi5mNjljNjJmZjI4MGJiZDJhM2Q5NzMxYTRmODU4 NTI3M2YyMmY5ZTI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9w bGF0Zm9ybS9XZWJLaXRQbGF0Zm9ybVN1cHBvcnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL3B1YmxpYy9wbGF0Zm9ybS9XZWJLaXRQbGF0Zm9ybVN1cHBvcnQuaApAQCAtMTE1LDExICsx MTUsNiBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIFdlYlNoYXJlZFdvcmtlclJlcG9zaXRvcnkq IHNoYXJlZFdvcmtlclJlcG9zaXRvcnkoKSB7IHJldHVybiAwOyB9CiAKLSAgICAvLyBSZXR1cm5z IHByaXZhdGUgYW5kIHNoYXJlZCB1c2FnZSwgaW4gYnl0ZXMuIFByaXZhdGUgYnl0ZXMgaXMgdGhl IGFtb3VudCBvZgotICAgIC8vIG1lbW9yeSBjdXJyZW50bHkgYWxsb2NhdGVkIHRvIHRoaXMgcHJv Y2VzcyB0aGF0IGNhbm5vdCBiZSBzaGFyZWQuIFJldHVybnMKLSAgICAvLyBmYWxzZSBvbiBwbGF0 Zm9ybSBzcGVjaWZpYyBlcnJvciBjb25kaXRpb25zLgotICAgIHZpcnR1YWwgYm9vbCBnZXRQcm9j ZXNzTWVtb3J5U2l6ZShzaXplX3QqIHByaXZhdGVCeXRlcywgc2l6ZV90KiBzaGFyZWRCeXRlcykg eyByZXR1cm4gZmFsc2U7IH0KLQogcHJvdGVjdGVkOgogICAgIH5XZWJLaXRQbGF0Zm9ybVN1cHBv cnQoKSB7IH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9QbGF0 Zm9ybVN1cHBvcnQuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1TdXBw b3J0LmNwcAppbmRleCBkZDdjYzgyODg3NzczNDU2ZDI5OGU1OGVkZjFjNDQ3MTc1MDQxYWQyLi4x OGM2NDA2NzlmNDIwZDhkZGNhZTQ4YmFmYzFhNTAwNGE4NmNjMTE0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL3NyYy9QbGF0Zm9ybVN1cHBvcnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vc3JjL1BsYXRmb3JtU3VwcG9ydC5jcHAKQEAgLTgzMSwxMSArODMxLDYg QEAgdm9pZCBQbGF0Zm9ybVN1cHBvcnQ6Om5vdGlmeUpTT3V0T2ZNZW1vcnkoRnJhbWUqIGZyYW1l KQogICAgIHdlYkZyYW1lLT5jbGllbnQoKS0+ZGlkRXhoYXVzdE1lbW9yeUF2YWlsYWJsZUZvclNj cmlwdCh3ZWJGcmFtZSk7CiB9CiAKLWJvb2wgUGxhdGZvcm1TdXBwb3J0OjpnZXRQcm9jZXNzTWVt b3J5U2l6ZShzaXplX3QqIHByaXZhdGVCeXRlcywgc2l6ZV90KiBzaGFyZWRCeXRlcykKLXsKLSAg ICByZXR1cm4gd2ViS2l0UGxhdGZvcm1TdXBwb3J0KCktPmdldFByb2Nlc3NNZW1vcnlTaXplKHBy aXZhdGVCeXRlcywgc2hhcmVkQnl0ZXMpOwotfQotCiBpbnQgUGxhdGZvcm1TdXBwb3J0OjpzY3Jl ZW5Ib3Jpem9udGFsRFBJKFdpZGdldCogd2lkZ2V0KQogewogICAgIFdlYldpZGdldENsaWVudCog Y2xpZW50ID0gdG9XZWJXaWRnZXRDbGllbnQod2lkZ2V0KTsK