87263 2012-05-23 07:30:08 -0700 Web Inspector: add a command to InspectorMemoryAgent for getting process memory break down 2012-05-25 02:29:34 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 87387 87262 0 yurys yurys abarth alph apavlov bweinstein dglazkov fishd jamesr joepeck keishi loislo pfeldman pmuellr rik timothy tkent+wkapi webkit.review.bot yurys oldest_to_newest 631652 0 yurys 2012-05-23 07:30:08 -0700 We need a command that would return us total size of the memory allocated by the inspected process and its breakdown by the components. 631653 1 143568 yurys 2012-05-23 07:38:37 -0700 Created attachment 143568 Patch 631654 2 yurys 2012-05-23 07:39:07 -0700 (In reply to comment #1) > Created an attachment (id=143568) [details] > Patch Chromium part of the change: http://codereview.chromium.org/9669039 631656 3 webkit.review.bot 2012-05-23 07:41:24 -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. 631663 4 143568 loislo 2012-05-23 07:52:09 -0700 Comment on attachment 143568 Patch lgtm 631664 5 143568 alph 2012-05-23 07:53:06 -0700 Comment on attachment 143568 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=143568&action=review > Source/WebCore/inspector/InspectorMemoryAgent.cpp:322 > + RefPtr<MemoryBlock> jsHeap = MemoryBlock::create().setName("allcated JS heap").setSize(totalJSHeapSize); nit: Allocated 631665 6 143568 webkit-ews 2012-05-23 07:54:06 -0700 Comment on attachment 143568 Patch Attachment 143568 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/12775246 631667 7 143568 webkit-ews 2012-05-23 08:01:45 -0700 Comment on attachment 143568 Patch Attachment 143568 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/12773223 631671 8 143568 buildbot 2012-05-23 08:06:44 -0700 Comment on attachment 143568 Patch Attachment 143568 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/12785080 631673 9 yurys 2012-05-23 08:11:04 -0700 (In reply to comment #5) > (From update of attachment 143568 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=143568&action=review > > > Source/WebCore/inspector/InspectorMemoryAgent.cpp:322 > > + RefPtr<MemoryBlock> jsHeap = MemoryBlock::create().setName("allcated JS heap").setSize(totalJSHeapSize); > > nit: Allocated Fixed. 631675 10 143572 yurys 2012-05-23 08:11:26 -0700 Created attachment 143572 Patch 632616 11 143572 pfeldman 2012-05-24 04:40:33 -0700 Comment on attachment 143572 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=143572&action=review > Source/WebCore/inspector/Inspector.json:95 > + { "name": "size", "type": "integer", "description": "Size of the block in bytes" }, You can't report size for some of the nodes. Should this be optional? > Source/WebCore/inspector/Inspector.json:96 > + { "name": "name", "type": "string", "description": "User-friendly name describing the component that allocated this block" }, We don't have a way to localize backend. Should this be key names instead? 632659 12 yurys 2012-05-24 05:35:00 -0700 (In reply to comment #11) > (From update of attachment 143572 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=143572&action=review > > > Source/WebCore/inspector/Inspector.json:95 > > + { "name": "size", "type": "integer", "description": "Size of the block in bytes" }, > > You can't report size for some of the nodes. Should this be optional? > Done. > > Source/WebCore/inspector/Inspector.json:96 > > + { "name": "name", "type": "string", "description": "User-friendly name describing the component that allocated this block" }, > > We don't have a way to localize backend. Should this be key names instead? Done. 632693 13 yurys 2012-05-24 06:01:12 -0700 Committed r118357: <http://trac.webkit.org/changeset/118357> 632763 14 webkit.review.bot 2012-05-24 07:23:26 -0700 Re-opened since this is blocked by 87387 143568 2012-05-23 07:38:37 -0700 2012-05-23 08:11:18 -0700 Patch bug-87263-20120523183836.patch text/plain 9876 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4MTYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDVmOTE0NDAxN2M3MTcx NjVlNDVjNTBkOTAxZjM0Nzk1MmQ0OTYxNy4uOTg1ZDQzMjcwZDA0NjNkOTI4MzEwODE1NzNiMTk5 Y2I0NzY1ZjcxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA1LTIzICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGFkZCBhIGNvbW1hbmQgdG8gSW5zcGVjdG9yTWVtb3J5QWdlbnQgZm9yIGdldHRpbmcgcHJv Y2VzcyBtZW1vcnkgYnJlYWsgZG93bgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODcyNjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBJbnRyb2R1Y2VkIG5ldyBwcm90b2NvbCBjb21tYW5kIE1lbW9yeS5nZXRQ cm9jZXNzTWVtb3J5RGlzdHJpYnV0aW9uIHdoaWNoIHJldHVybnMKKyAgICAgICAgbWVtb3J5IGRp c3RyaWJ1dGlvbiBmb3IgdGhlIGluc3BlY3RlZCBwcm9jZXNzLiBDdXJyZW50bHkgb25seSBKUyBh bGxvY2F0ZWQgYW5kIHVzZWQKKyAgICAgICAgaGVhcCBzaXplIGlzIGluY2x1ZGVkLgorCisgICAg ICAgICogaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNw ZWN0b3JNZW1vcnlBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpqc0hlYXBJbmZvKToKKyAg ICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yTWVtb3J5QWdlbnQ6 OmdldFByb2Nlc3NNZW1vcnlEaXN0cmlidXRpb24pOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNw ZWN0b3JNZW1vcnlBZ2VudC5oOgorICAgICAgICAoSW5zcGVjdG9yTWVtb3J5QWdlbnQpOgorICAg ICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtU3VwcG9ydC5oOgorICAgICAgICAoUGxh dGZvcm1TdXBwb3J0KToKKwogMjAxMi0wNS0yMiAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBEZWJ1Z2dlciBzaG91bGQgY29y cmVjdGx5IHNob3cgY2F0Y2ggc2NvcGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggZjU5 Zjg0N2E2MTVmNDU0NzgyM2M1YThhYTVhMDRjNzI1ZThmMjAyYi4uMzAyNDJhY2Y3NDkwYmQ4ZmU3 NGUyYWJkNWI2ZGEwMThkYjdmMTczMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAxMi0wNS0yMyAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVt Lm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBhZGQgYSBjb21tYW5kIHRvIEluc3BlY3Rv ck1lbW9yeUFnZW50IGZvciBnZXR0aW5nIHByb2Nlc3MgbWVtb3J5IGJyZWFrIGRvd24KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3MjYzCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgYW4gQVBJIGZv ciByZXRyaWV2aW5nIHJlbmRlciBwcm9jZXNzIHByaXZhdGUgYW5kIHNoYXJlZCBtZW1vcnkgaW4g Ynl0ZXMuCisKKyAgICAgICAgKiBwdWJsaWMvcGxhdGZvcm0vV2ViS2l0UGxhdGZvcm1TdXBwb3J0 Lmg6CisgICAgICAgIChXZWJLaXRQbGF0Zm9ybVN1cHBvcnQpOgorICAgICAgICAoV2ViS2l0OjpX ZWJLaXRQbGF0Zm9ybVN1cHBvcnQ6OmdldFByb2Nlc3NNZW1vcnlTaXplKToKKyAgICAgICAgKiBz cmMvUGxhdGZvcm1TdXBwb3J0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtU3VwcG9y dDo6Z2V0UHJvY2Vzc01lbW9yeVNpemUpOgorICAgICAgICAoV2ViQ29yZSk6CisKIDIwMTItMDUt MjIgIEFsZXhhbmRyZSBFbGlhcyAgPGFlbGlhc0Bnb29nbGUuY29tPgogCiAgICAgICAgIFtjaHJv bWl1bV0gQXBwbHkgdmlld3BvcnQgdGFnIGluaXRpYWwtc2NhbGUgb25seSBvbmNlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5kZXggYjQ1OGIwNDE3M2NhMDAyN2NjZTFh Yzc0ZGY4MTVkNGI5NzA1MjBhMi4uMTJkMWIzZmZhMjM2MzZmOTY0ODg1YzQyMzExZjIzMjMwZmJk MTNiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29u CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgpAQCAtODcsNiAr ODcsMTUgQEAKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJub2RlQ291bnQiLCAidHlw ZSI6ICJhcnJheSIsICJpdGVtcyI6IHsgIiRyZWYiOiAiTm9kZUNvdW50IiB9fSwKICAgICAgICAg ICAgICAgICAgICAgeyAibmFtZSI6ICJsaXN0ZW5lckNvdW50IiwgInR5cGUiOiAiYXJyYXkiLCAi aXRlbXMiOiB7ICIkcmVmIjogIkxpc3RlbmVyQ291bnQiIH19CiAgICAgICAgICAgICAgICAgXQor ICAgICAgICAgICAgfSwKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAiaWQiOiAiTWVt b3J5QmxvY2siLAorICAgICAgICAgICAgICAgICJ0eXBlIjogIm9iamVjdCIsCisgICAgICAgICAg ICAgICAgInByb3BlcnRpZXMiOiBbCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic2l6 ZSIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiU2l6ZSBvZiB0aGUgYmxvY2sg aW4gYnl0ZXMiIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibmFtZSIsICJ0eXBl IjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJVc2VyLWZyaWVuZGx5IG5hbWUgZGVzY3JpYmlu ZyB0aGUgY29tcG9uZW50IHRoYXQgYWxsb2NhdGVkIHRoaXMgYmxvY2siIH0sCisgICAgICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAiY2hpbGRyZW4iLCAidHlwZSI6ICJhcnJheSIsICJvcHRpb25h bCI6IHRydWUsICJpdGVtcyI6IHsgIiRyZWYiOiAiTWVtb3J5QmxvY2siIH19CisgICAgICAgICAg ICAgICAgXQogICAgICAgICAgICAgfQogICAgICAgICBdLAogICAgICAgICAiY29tbWFuZHMiOiBb CkBAIC05Niw2ICsxMDUsMTIgQEAKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJkb21H cm91cHMiLCAidHlwZSI6ICJhcnJheSIsICJpdGVtcyI6IHsgIiRyZWYiOiAiRE9NR3JvdXAiIH19 LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInN0cmluZ3MiLCAiJHJlZiI6ICJTdHJp bmdTdGF0aXN0aWNzIiB9CiAgICAgICAgICAgICAgICAgXQorICAgICAgICAgICAgfSwKKyAgICAg ICAgICAgIHsKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJnZXRQcm9jZXNzTWVtb3J5RGlzdHJp YnV0aW9uIiwKKyAgICAgICAgICAgICAgICAicmV0dXJucyI6IFsKKyAgICAgICAgICAgICAgICAg ICAgeyAibmFtZSI6ICJkaXN0cmlidXRpb24iLCAiJHJlZiI6ICJNZW1vcnlCbG9jayIsICJkZXNj cmlwdGlvbiI6ICJBbiBvYmplY3QgZGVzY3JpYmluZyBhbGwgbWVtb3J5IGFsbG9jYXRlZCBieSB0 aGUgcHJvY2VzcyJ9CisgICAgICAgICAgICAgICAgXQogICAgICAgICAgICAgfQogICAgICAgICBd CiAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JN ZW1vcnlBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yTWVtb3J5 QWdlbnQuY3BwCmluZGV4IDBjYWQ0OWFhMTQ4NjMzMDJhZmVjNzcyYzY4Y2Y1NzM2YjE4ZWFlNGQu LjVkMzQxMWVlOWQ1YmU0MTJlODJhMjZmMzQ1MDQzM2I2NjcyMjEyMDMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JNZW1vcnlBZ2VudC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck1lbW9yeUFnZW50LmNwcApAQCAtNDUsNiAr NDUsMTAgQEAKICNpbmNsdWRlICJJbnN0cnVtZW50aW5nQWdlbnRzLmgiCiAjaW5jbHVkZSAiTm9k ZS5oIgogI2luY2x1ZGUgIlBhZ2UuaCIKKyNpZiBQTEFURk9STShDSFJPTUlVTSkKKyNpbmNsdWRl ICJQbGF0Zm9ybVN1cHBvcnQuaCIKKyNlbmRpZgorI2luY2x1ZGUgIlNjcmlwdEdDRXZlbnQuaCIK ICNpbmNsdWRlICJTY3JpcHRQcm9maWxlci5oIgogI2luY2x1ZGUgIlN0eWxlZEVsZW1lbnQuaCIK ICNpbmNsdWRlIDx3dGYvSGFzaFNldC5oPgpAQCAtNTIsNiArNTYsNyBAQAogCiB1c2luZyBXZWJD b3JlOjpUeXBlQnVpbGRlcjo6TWVtb3J5OjpET01Hcm91cDsKIHVzaW5nIFdlYkNvcmU6OlR5cGVC dWlsZGVyOjpNZW1vcnk6Okxpc3RlbmVyQ291bnQ7Cit1c2luZyBXZWJDb3JlOjpUeXBlQnVpbGRl cjo6TWVtb3J5OjpNZW1vcnlCbG9jazsKIHVzaW5nIFdlYkNvcmU6OlR5cGVCdWlsZGVyOjpNZW1v cnk6Ok5vZGVDb3VudDsKIHVzaW5nIFdlYkNvcmU6OlR5cGVCdWlsZGVyOjpNZW1vcnk6OlN0cmlu Z1N0YXRpc3RpY3M7CiAKQEAgLTMwNyw2ICszMTIsMzQgQEAgdm9pZCBJbnNwZWN0b3JNZW1vcnlB Z2VudDo6Z2V0RE9NTm9kZUNvdW50KEVycm9yU3RyaW5nKiwgUmVmUHRyPFR5cGVCdWlsZGVyOjpB cnIKICAgICBzdHJpbmdzID0gY291bnRlclZpc2l0b3Iuc3RyaW5ncygpOwogfQogCitzdGF0aWMg UGFzc1JlZlB0cjxNZW1vcnlCbG9jaz4ganNIZWFwSW5mbygpCit7CisgICAgc2l6ZV90IHVzZWRK U0hlYXBTaXplOworICAgIHNpemVfdCB0b3RhbEpTSGVhcFNpemU7CisgICAgc2l6ZV90IGpzSGVh cFNpemVMaW1pdDsKKyAgICBTY3JpcHRHQ0V2ZW50OjpnZXRIZWFwU2l6ZSh1c2VkSlNIZWFwU2l6 ZSwgdG90YWxKU0hlYXBTaXplLCBqc0hlYXBTaXplTGltaXQpOworCisgICAgUmVmUHRyPE1lbW9y eUJsb2NrPiBqc0hlYXAgPSBNZW1vcnlCbG9jazo6Y3JlYXRlKCkuc2V0TmFtZSgiYWxsY2F0ZWQg SlMgaGVhcCIpLnNldFNpemUodG90YWxKU0hlYXBTaXplKTsKKyAgICBSZWZQdHI8VHlwZUJ1aWxk ZXI6OkFycmF5PE1lbW9yeUJsb2NrPiA+IGNoaWxkcmVuID0gVHlwZUJ1aWxkZXI6OkFycmF5PE1l bW9yeUJsb2NrPjo6Y3JlYXRlKCk7CisgICAgY2hpbGRyZW4tPmFkZEl0ZW0oTWVtb3J5QmxvY2s6 OmNyZWF0ZSgpLnNldE5hbWUoInVzZWQgSlMgaGVhcCIpLnNldFNpemUodXNlZEpTSGVhcFNpemUp LnJlbGVhc2UoKSk7CisgICAganNIZWFwLT5zZXRDaGlsZHJlbihjaGlsZHJlbik7CisgICAgcmV0 dXJuIGpzSGVhcC5yZWxlYXNlKCk7Cit9CisKK3ZvaWQgSW5zcGVjdG9yTWVtb3J5QWdlbnQ6Omdl dFByb2Nlc3NNZW1vcnlEaXN0cmlidXRpb24oRXJyb3JTdHJpbmcqLCBSZWZQdHI8TWVtb3J5Qmxv Y2s+JiBwcm9jZXNzTWVtb3J5KQoreworICAgIHNpemVfdCBwcml2YXRlQnl0ZXMgPSAwOworICAg IHNpemVfdCBzaGFyZWRCeXRlcyA9IDA7CisjaWYgUExBVEZPUk0oQ0hST01JVU0pCisgICAgUGxh dGZvcm1TdXBwb3J0OjpnZXRQcm9jZXNzTWVtb3J5U2l6ZSgmcHJpdmF0ZUJ5dGVzLCAmc2hhcmVk Qnl0ZXMpOworI2VuZGlmCisgICAgcHJvY2Vzc01lbW9yeSA9IE1lbW9yeUJsb2NrOjpjcmVhdGUo KS5zZXROYW1lKCJwcm9jZXNzIHByaXZhdGUgbWVtb3J5Iikuc2V0U2l6ZShwcml2YXRlQnl0ZXMp OworCisgICAgUmVmUHRyPFR5cGVCdWlsZGVyOjpBcnJheTxNZW1vcnlCbG9jaz4gPiBjaGlsZHJl biA9IFR5cGVCdWlsZGVyOjpBcnJheTxNZW1vcnlCbG9jaz46OmNyZWF0ZSgpOworICAgIGNoaWxk cmVuLT5hZGRJdGVtKGpzSGVhcEluZm8oKSk7CisgICAgcHJvY2Vzc01lbW9yeS0+c2V0Q2hpbGRy ZW4oY2hpbGRyZW4pOworfQorCiBJbnNwZWN0b3JNZW1vcnlBZ2VudDo6SW5zcGVjdG9yTWVtb3J5 QWdlbnQoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cywgSW5zcGVjdG9y U3RhdGUqIHN0YXRlLCBQYWdlKiBwYWdlLCBJbnNwZWN0b3JET01BZ2VudCogZG9tQWdlbnQpCiAg ICAgOiBJbnNwZWN0b3JCYXNlQWdlbnQ8SW5zcGVjdG9yTWVtb3J5QWdlbnQ+KCJNZW1vcnkiLCBp bnN0cnVtZW50aW5nQWdlbnRzLCBzdGF0ZSkKICAgICAsIG1fcGFnZShwYWdlKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck1lbW9yeUFnZW50LmggYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yTWVtb3J5QWdlbnQuaAppbmRleCA3ZjlhODUy NDk0NzJmNzUzMmZlOTlkOWZlMzJlNzhlMDY1OTViZGVhLi44YTI0YjRjNTM3Y2Q0MjM2YmIzN2Ni Mjc4NTkyYjhjMmU5YmEyODNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yTWVtb3J5QWdlbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yTWVtb3J5QWdlbnQuaApAQCAtNTYsMTAgKzU2LDExIEBAIHB1YmxpYzoKICAgICB7CiAg ICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgSW5zcGVjdG9yTWVtb3J5QWdlbnQoaW5zdHJ1bWVu dGluZ0FnZW50cywgc3RhdGUsIHBhZ2UsIGRvbUFnZW50KSk7CiAgICAgfQorICAgIHZpcnR1YWwg fkluc3BlY3Rvck1lbW9yeUFnZW50KCk7CiAKLSAgICB2b2lkIGdldERPTU5vZGVDb3VudChFcnJv clN0cmluZyosIFJlZlB0cjxUeXBlQnVpbGRlcjo6QXJyYXk8VHlwZUJ1aWxkZXI6Ok1lbW9yeTo6 RE9NR3JvdXA+ID4mIGRvbUdyb3VwcywgUmVmUHRyPFR5cGVCdWlsZGVyOjpNZW1vcnk6OlN0cmlu Z1N0YXRpc3RpY3M+JiBzdHJpbmdzKTsKKyAgICB2aXJ0dWFsIHZvaWQgZ2V0RE9NTm9kZUNvdW50 KEVycm9yU3RyaW5nKiwgUmVmUHRyPFR5cGVCdWlsZGVyOjpBcnJheTxUeXBlQnVpbGRlcjo6TWVt b3J5OjpET01Hcm91cD4gPiYgZG9tR3JvdXBzLCBSZWZQdHI8VHlwZUJ1aWxkZXI6Ok1lbW9yeTo6 U3RyaW5nU3RhdGlzdGljcz4mIHN0cmluZ3MpOworICAgIHZpcnR1YWwgdm9pZCBnZXRQcm9jZXNz TWVtb3J5RGlzdHJpYnV0aW9uKEVycm9yU3RyaW5nKiwgUmVmUHRyPFR5cGVCdWlsZGVyOjpNZW1v cnk6Ok1lbW9yeUJsb2NrPiYgcHJvY2Vzc01lbW9yeSk7CiAKLSAgICB+SW5zcGVjdG9yTWVtb3J5 QWdlbnQoKTsKIAogcHJpdmF0ZToKICAgICBJbnNwZWN0b3JNZW1vcnlBZ2VudChJbnN0cnVtZW50 aW5nQWdlbnRzKiwgSW5zcGVjdG9yU3RhdGUqLCBQYWdlKiwgSW5zcGVjdG9yRE9NQWdlbnQqIGRv bUFnZW50KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1Bs YXRmb3JtU3VwcG9ydC5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUGxhdGZv cm1TdXBwb3J0LmgKaW5kZXggMDFmNGNiNjYwOGJmZDk1ZDQ0YTc2OWM3NjM1M2Y2ZDM3YmQ2ZTk2 NS4uZjI5YmFmODg1Zjg1NzExZDdlMzE4ZGIxZTM5ZTUzZGE3ZWUwODkzZSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUGxhdGZvcm1TdXBwb3J0LmgKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vY2hyb21pdW0vUGxhdGZvcm1TdXBwb3J0LmgKQEAgLTIx Myw2ICsyMTMsMTAgQEAgcHVibGljOgogICAgIHN0YXRpYyB2b2lkIHNldFNoYXJlZFRpbWVyRmly ZWRGdW5jdGlvbih2b2lkICgqZnVuYykoKSk7CiAgICAgc3RhdGljIHZvaWQgc2V0U2hhcmVkVGlt ZXJGaXJlSW50ZXJ2YWwoZG91YmxlKTsKIAorICAgIC8vIFJldHVybnMgcHJpdmF0ZSBhbmQgc2hh cmVkIHVzYWdlLCBpbiBieXRlcy4gUHJpdmF0ZSBieXRlcyBpcyB0aGUgYW1vdW50IG9mCisgICAg Ly8gbWVtb3J5IGN1cnJlbnRseSBhbGxvY2F0ZWQgdG8gdGhpcyBwcm9jZXNzIHRoYXQgY2Fubm90 IGJlIHNoYXJlZC4gUmV0dXJucworICAgIC8vIGZhbHNlIG9uIHBsYXRmb3JtIHNwZWNpZmljIGVy cm9yIGNvbmRpdGlvbnMuCisgICAgc3RhdGljIGJvb2wgZ2V0UHJvY2Vzc01lbW9yeVNpemUoc2l6 ZV90KiBwcml2YXRlQnl0ZXMsIHNpemVfdCogc2hhcmVkQnl0ZXMpOwogICAgIC8vIFRoZW1pbmcg LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tCiAjaWYgT1MoV0lORE9XUykKICAgICBzdGF0aWMgdm9pZCBwYWludEJ1dHRvbigKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL3BsYXRmb3JtL1dlYktpdFBsYXRm b3JtU3VwcG9ydC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvcGxhdGZvcm0vV2Vi S2l0UGxhdGZvcm1TdXBwb3J0LmgKaW5kZXggYjIxNTM0ZDI2MWRkMzAxZTY4Yzg5OGUxNTg2ZDNi NDAwMzViNTQ4My4uZmMwOTI4M2RkYWUyOGJmNTIxNDhhOGI0N2YxYjQyMGM0MDgwODEwNiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvcGxhdGZvcm0vV2ViS2l0UGxh dGZvcm1TdXBwb3J0LmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJsaWMvcGxhdGZv cm0vV2ViS2l0UGxhdGZvcm1TdXBwb3J0LmgKQEAgLTEzMiw2ICsxMzIsMTAgQEAgcHVibGljOgog CiAgICAgdmlydHVhbCBXZWJTaGFyZWRXb3JrZXJSZXBvc2l0b3J5KiBzaGFyZWRXb3JrZXJSZXBv c2l0b3J5KCkgeyByZXR1cm4gMDsgfQogCisgICAgLy8gUmV0dXJucyBwcml2YXRlIGFuZCBzaGFy ZWQgdXNhZ2UsIGluIGJ5dGVzLiBQcml2YXRlIGJ5dGVzIGlzIHRoZSBhbW91bnQgb2YKKyAgICAv LyBtZW1vcnkgY3VycmVudGx5IGFsbG9jYXRlZCB0byB0aGlzIHByb2Nlc3MgdGhhdCBjYW5ub3Qg YmUgc2hhcmVkLiBSZXR1cm5zCisgICAgLy8gZmFsc2Ugb24gcGxhdGZvcm0gc3BlY2lmaWMgZXJy b3IgY29uZGl0aW9ucy4KKyAgICB2aXJ0dWFsIGJvb2wgZ2V0UHJvY2Vzc01lbW9yeVNpemUoc2l6 ZV90KiBwcml2YXRlQnl0ZXMsIHNpemVfdCogc2hhcmVkQnl0ZXMpIHsgcmV0dXJuIGZhbHNlOyB9 CiAKIHByb3RlY3RlZDoKICAgICB+V2ViS2l0UGxhdGZvcm1TdXBwb3J0KCkgeyB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9QbGF0Zm9ybVN1cHBvcnQuY3BwIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1TdXBwb3J0LmNwcAppbmRleCBiMTQ4MTJk ZGFkYjgxYTU0ZDNmNjIzOGY3ZWI5ZDdmNjQ4ZGMyM2U5Li4zYWVmNWQ1MDRiOTJiOTkwMjM5MDI4 NTg4YmMzNzRhM2NhMTUwNzkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Ny Yy9QbGF0Zm9ybVN1cHBvcnQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1Bs YXRmb3JtU3VwcG9ydC5jcHAKQEAgLTgzNyw2ICs4MzcsMTEgQEAgdm9pZCBQbGF0Zm9ybVN1cHBv cnQ6Om5vdGlmeUpTT3V0T2ZNZW1vcnkoRnJhbWUqIGZyYW1lKQogICAgIHdlYkZyYW1lLT5jbGll bnQoKS0+ZGlkRXhoYXVzdE1lbW9yeUF2YWlsYWJsZUZvclNjcmlwdCh3ZWJGcmFtZSk7CiB9CiAK K2Jvb2wgUGxhdGZvcm1TdXBwb3J0OjpnZXRQcm9jZXNzTWVtb3J5U2l6ZShzaXplX3QqIHByaXZh dGVCeXRlcywgc2l6ZV90KiBzaGFyZWRCeXRlcykKK3sKKyAgICByZXR1cm4gd2ViS2l0UGxhdGZv cm1TdXBwb3J0KCktPmdldFByb2Nlc3NNZW1vcnlTaXplKHByaXZhdGVCeXRlcywgc2hhcmVkQnl0 ZXMpOworfQorCiBpbnQgUGxhdGZvcm1TdXBwb3J0OjpzY3JlZW5Ib3Jpem9udGFsRFBJKFdpZGdl dCogd2lkZ2V0KQogewogICAgIFdlYldpZGdldENsaWVudCogY2xpZW50ID0gdG9XZWJXaWRnZXRD bGllbnQod2lkZ2V0KTsK 143572 2012-05-23 08:11:26 -0700 2012-05-24 04:40:33 -0700 Patch bug-87263-20120523191124.patch text/plain 9877 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4MTYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDVmOTE0NDAxN2M3MTcx NjVlNDVjNTBkOTAxZjM0Nzk1MmQ0OTYxNy4uOTg1ZDQzMjcwZDA0NjNkOTI4MzEwODE1NzNiMTk5 Y2I0NzY1ZjcxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTA1LTIzICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGFkZCBhIGNvbW1hbmQgdG8gSW5zcGVjdG9yTWVtb3J5QWdlbnQgZm9yIGdldHRpbmcgcHJv Y2VzcyBtZW1vcnkgYnJlYWsgZG93bgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9ODcyNjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBJbnRyb2R1Y2VkIG5ldyBwcm90b2NvbCBjb21tYW5kIE1lbW9yeS5nZXRQ cm9jZXNzTWVtb3J5RGlzdHJpYnV0aW9uIHdoaWNoIHJldHVybnMKKyAgICAgICAgbWVtb3J5IGRp c3RyaWJ1dGlvbiBmb3IgdGhlIGluc3BlY3RlZCBwcm9jZXNzLiBDdXJyZW50bHkgb25seSBKUyBh bGxvY2F0ZWQgYW5kIHVzZWQKKyAgICAgICAgaGVhcCBzaXplIGlzIGluY2x1ZGVkLgorCisgICAg ICAgICogaW5zcGVjdG9yL0luc3BlY3Rvci5qc29uOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNw ZWN0b3JNZW1vcnlBZ2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpqc0hlYXBJbmZvKToKKyAg ICAgICAgKFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yTWVtb3J5QWdlbnQ6 OmdldFByb2Nlc3NNZW1vcnlEaXN0cmlidXRpb24pOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNw ZWN0b3JNZW1vcnlBZ2VudC5oOgorICAgICAgICAoSW5zcGVjdG9yTWVtb3J5QWdlbnQpOgorICAg ICAgICAqIHBsYXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtU3VwcG9ydC5oOgorICAgICAgICAoUGxh dGZvcm1TdXBwb3J0KToKKwogMjAxMi0wNS0yMiAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBEZWJ1Z2dlciBzaG91bGQgY29y cmVjdGx5IHNob3cgY2F0Y2ggc2NvcGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggZjU5 Zjg0N2E2MTVmNDU0NzgyM2M1YThhYTVhMDRjNzI1ZThmMjAyYi4uMzAyNDJhY2Y3NDkwYmQ4ZmU3 NGUyYWJkNWI2ZGEwMThkYjdmMTczMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAxMi0wNS0yMyAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVt Lm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBhZGQgYSBjb21tYW5kIHRvIEluc3BlY3Rv ck1lbW9yeUFnZW50IGZvciBnZXR0aW5nIHByb2Nlc3MgbWVtb3J5IGJyZWFrIGRvd24KKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3MjYzCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkZWQgYW4gQVBJIGZv ciByZXRyaWV2aW5nIHJlbmRlciBwcm9jZXNzIHByaXZhdGUgYW5kIHNoYXJlZCBtZW1vcnkgaW4g Ynl0ZXMuCisKKyAgICAgICAgKiBwdWJsaWMvcGxhdGZvcm0vV2ViS2l0UGxhdGZvcm1TdXBwb3J0 Lmg6CisgICAgICAgIChXZWJLaXRQbGF0Zm9ybVN1cHBvcnQpOgorICAgICAgICAoV2ViS2l0OjpX ZWJLaXRQbGF0Zm9ybVN1cHBvcnQ6OmdldFByb2Nlc3NNZW1vcnlTaXplKToKKyAgICAgICAgKiBz cmMvUGxhdGZvcm1TdXBwb3J0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtU3VwcG9y dDo6Z2V0UHJvY2Vzc01lbW9yeVNpemUpOgorICAgICAgICAoV2ViQ29yZSk6CisKIDIwMTItMDUt MjIgIEFsZXhhbmRyZSBFbGlhcyAgPGFlbGlhc0Bnb29nbGUuY29tPgogCiAgICAgICAgIFtjaHJv bWl1bV0gQXBwbHkgdmlld3BvcnQgdGFnIGluaXRpYWwtc2NhbGUgb25seSBvbmNlCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24gYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmpzb24KaW5kZXggYjQ1OGIwNDE3M2NhMDAyN2NjZTFh Yzc0ZGY4MTVkNGI5NzA1MjBhMi4uMTJkMWIzZmZhMjM2MzZmOTY0ODg1YzQyMzExZjIzMjMwZmJk MTNiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5qc29u CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuanNvbgpAQCAtODcsNiAr ODcsMTUgQEAKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJub2RlQ291bnQiLCAidHlw ZSI6ICJhcnJheSIsICJpdGVtcyI6IHsgIiRyZWYiOiAiTm9kZUNvdW50IiB9fSwKICAgICAgICAg ICAgICAgICAgICAgeyAibmFtZSI6ICJsaXN0ZW5lckNvdW50IiwgInR5cGUiOiAiYXJyYXkiLCAi aXRlbXMiOiB7ICIkcmVmIjogIkxpc3RlbmVyQ291bnQiIH19CiAgICAgICAgICAgICAgICAgXQor ICAgICAgICAgICAgfSwKKyAgICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAiaWQiOiAiTWVt b3J5QmxvY2siLAorICAgICAgICAgICAgICAgICJ0eXBlIjogIm9iamVjdCIsCisgICAgICAgICAg ICAgICAgInByb3BlcnRpZXMiOiBbCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAic2l6 ZSIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiU2l6ZSBvZiB0aGUgYmxvY2sg aW4gYnl0ZXMiIH0sCisgICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAibmFtZSIsICJ0eXBl IjogInN0cmluZyIsICJkZXNjcmlwdGlvbiI6ICJVc2VyLWZyaWVuZGx5IG5hbWUgZGVzY3JpYmlu ZyB0aGUgY29tcG9uZW50IHRoYXQgYWxsb2NhdGVkIHRoaXMgYmxvY2siIH0sCisgICAgICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAiY2hpbGRyZW4iLCAidHlwZSI6ICJhcnJheSIsICJvcHRpb25h bCI6IHRydWUsICJpdGVtcyI6IHsgIiRyZWYiOiAiTWVtb3J5QmxvY2siIH19CisgICAgICAgICAg ICAgICAgXQogICAgICAgICAgICAgfQogICAgICAgICBdLAogICAgICAgICAiY29tbWFuZHMiOiBb CkBAIC05Niw2ICsxMDUsMTIgQEAKICAgICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJkb21H cm91cHMiLCAidHlwZSI6ICJhcnJheSIsICJpdGVtcyI6IHsgIiRyZWYiOiAiRE9NR3JvdXAiIH19 LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogInN0cmluZ3MiLCAiJHJlZiI6ICJTdHJp bmdTdGF0aXN0aWNzIiB9CiAgICAgICAgICAgICAgICAgXQorICAgICAgICAgICAgfSwKKyAgICAg ICAgICAgIHsKKyAgICAgICAgICAgICAgICAibmFtZSI6ICJnZXRQcm9jZXNzTWVtb3J5RGlzdHJp YnV0aW9uIiwKKyAgICAgICAgICAgICAgICAicmV0dXJucyI6IFsKKyAgICAgICAgICAgICAgICAg ICAgeyAibmFtZSI6ICJkaXN0cmlidXRpb24iLCAiJHJlZiI6ICJNZW1vcnlCbG9jayIsICJkZXNj cmlwdGlvbiI6ICJBbiBvYmplY3QgZGVzY3JpYmluZyBhbGwgbWVtb3J5IGFsbG9jYXRlZCBieSB0 aGUgcHJvY2VzcyJ9CisgICAgICAgICAgICAgICAgXQogICAgICAgICAgICAgfQogICAgICAgICBd CiAgICAgfSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JN ZW1vcnlBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yTWVtb3J5 QWdlbnQuY3BwCmluZGV4IDBjYWQ0OWFhMTQ4NjMzMDJhZmVjNzcyYzY4Y2Y1NzM2YjE4ZWFlNGQu LmJlYWU3YWFlMGNjMzhiYmVkMjQ0ZDQ1YWIzOWYzMzMwYWJkNzI3NDYgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JNZW1vcnlBZ2VudC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck1lbW9yeUFnZW50LmNwcApAQCAtNDUsNiAr NDUsMTAgQEAKICNpbmNsdWRlICJJbnN0cnVtZW50aW5nQWdlbnRzLmgiCiAjaW5jbHVkZSAiTm9k ZS5oIgogI2luY2x1ZGUgIlBhZ2UuaCIKKyNpZiBQTEFURk9STShDSFJPTUlVTSkKKyNpbmNsdWRl ICJQbGF0Zm9ybVN1cHBvcnQuaCIKKyNlbmRpZgorI2luY2x1ZGUgIlNjcmlwdEdDRXZlbnQuaCIK ICNpbmNsdWRlICJTY3JpcHRQcm9maWxlci5oIgogI2luY2x1ZGUgIlN0eWxlZEVsZW1lbnQuaCIK ICNpbmNsdWRlIDx3dGYvSGFzaFNldC5oPgpAQCAtNTIsNiArNTYsNyBAQAogCiB1c2luZyBXZWJD b3JlOjpUeXBlQnVpbGRlcjo6TWVtb3J5OjpET01Hcm91cDsKIHVzaW5nIFdlYkNvcmU6OlR5cGVC dWlsZGVyOjpNZW1vcnk6Okxpc3RlbmVyQ291bnQ7Cit1c2luZyBXZWJDb3JlOjpUeXBlQnVpbGRl cjo6TWVtb3J5OjpNZW1vcnlCbG9jazsKIHVzaW5nIFdlYkNvcmU6OlR5cGVCdWlsZGVyOjpNZW1v cnk6Ok5vZGVDb3VudDsKIHVzaW5nIFdlYkNvcmU6OlR5cGVCdWlsZGVyOjpNZW1vcnk6OlN0cmlu Z1N0YXRpc3RpY3M7CiAKQEAgLTMwNyw2ICszMTIsMzQgQEAgdm9pZCBJbnNwZWN0b3JNZW1vcnlB Z2VudDo6Z2V0RE9NTm9kZUNvdW50KEVycm9yU3RyaW5nKiwgUmVmUHRyPFR5cGVCdWlsZGVyOjpB cnIKICAgICBzdHJpbmdzID0gY291bnRlclZpc2l0b3Iuc3RyaW5ncygpOwogfQogCitzdGF0aWMg UGFzc1JlZlB0cjxNZW1vcnlCbG9jaz4ganNIZWFwSW5mbygpCit7CisgICAgc2l6ZV90IHVzZWRK U0hlYXBTaXplOworICAgIHNpemVfdCB0b3RhbEpTSGVhcFNpemU7CisgICAgc2l6ZV90IGpzSGVh cFNpemVMaW1pdDsKKyAgICBTY3JpcHRHQ0V2ZW50OjpnZXRIZWFwU2l6ZSh1c2VkSlNIZWFwU2l6 ZSwgdG90YWxKU0hlYXBTaXplLCBqc0hlYXBTaXplTGltaXQpOworCisgICAgUmVmUHRyPE1lbW9y eUJsb2NrPiBqc0hlYXAgPSBNZW1vcnlCbG9jazo6Y3JlYXRlKCkuc2V0TmFtZSgiYWxsb2NhdGVk IEpTIGhlYXAiKS5zZXRTaXplKHRvdGFsSlNIZWFwU2l6ZSk7CisgICAgUmVmUHRyPFR5cGVCdWls ZGVyOjpBcnJheTxNZW1vcnlCbG9jaz4gPiBjaGlsZHJlbiA9IFR5cGVCdWlsZGVyOjpBcnJheTxN ZW1vcnlCbG9jaz46OmNyZWF0ZSgpOworICAgIGNoaWxkcmVuLT5hZGRJdGVtKE1lbW9yeUJsb2Nr OjpjcmVhdGUoKS5zZXROYW1lKCJ1c2VkIEpTIGhlYXAiKS5zZXRTaXplKHVzZWRKU0hlYXBTaXpl KS5yZWxlYXNlKCkpOworICAgIGpzSGVhcC0+c2V0Q2hpbGRyZW4oY2hpbGRyZW4pOworICAgIHJl dHVybiBqc0hlYXAucmVsZWFzZSgpOworfQorCit2b2lkIEluc3BlY3Rvck1lbW9yeUFnZW50Ojpn ZXRQcm9jZXNzTWVtb3J5RGlzdHJpYnV0aW9uKEVycm9yU3RyaW5nKiwgUmVmUHRyPE1lbW9yeUJs b2NrPiYgcHJvY2Vzc01lbW9yeSkKK3sKKyAgICBzaXplX3QgcHJpdmF0ZUJ5dGVzID0gMDsKKyNp ZiBQTEFURk9STShDSFJPTUlVTSkKKyAgICBzaXplX3Qgc2hhcmVkQnl0ZXMgPSAwOworICAgIFBs YXRmb3JtU3VwcG9ydDo6Z2V0UHJvY2Vzc01lbW9yeVNpemUoJnByaXZhdGVCeXRlcywgJnNoYXJl ZEJ5dGVzKTsKKyNlbmRpZgorICAgIHByb2Nlc3NNZW1vcnkgPSBNZW1vcnlCbG9jazo6Y3JlYXRl KCkuc2V0TmFtZSgicHJvY2VzcyBwcml2YXRlIG1lbW9yeSIpLnNldFNpemUocHJpdmF0ZUJ5dGVz KTsKKworICAgIFJlZlB0cjxUeXBlQnVpbGRlcjo6QXJyYXk8TWVtb3J5QmxvY2s+ID4gY2hpbGRy ZW4gPSBUeXBlQnVpbGRlcjo6QXJyYXk8TWVtb3J5QmxvY2s+OjpjcmVhdGUoKTsKKyAgICBjaGls ZHJlbi0+YWRkSXRlbShqc0hlYXBJbmZvKCkpOworICAgIHByb2Nlc3NNZW1vcnktPnNldENoaWxk cmVuKGNoaWxkcmVuKTsKK30KKwogSW5zcGVjdG9yTWVtb3J5QWdlbnQ6Okluc3BlY3Rvck1lbW9y eUFnZW50KEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMsIEluc3BlY3Rv clN0YXRlKiBzdGF0ZSwgUGFnZSogcGFnZSwgSW5zcGVjdG9yRE9NQWdlbnQqIGRvbUFnZW50KQog ICAgIDogSW5zcGVjdG9yQmFzZUFnZW50PEluc3BlY3Rvck1lbW9yeUFnZW50PigiTWVtb3J5Iiwg aW5zdHJ1bWVudGluZ0FnZW50cywgc3RhdGUpCiAgICAgLCBtX3BhZ2UocGFnZSkKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JNZW1vcnlBZ2VudC5oIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvck1lbW9yeUFnZW50LmgKaW5kZXggN2Y5YTg1 MjQ5NDcyZjc1MzJmZTk5ZDlmZTMyZTc4ZTA2NTk1YmRlYS4uOGEyNGI0YzUzN2NkNDIzNmJiMzdj YjI3ODU5MmI4YzJlOWJhMjgzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3Rvck1lbW9yeUFnZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3Rvck1lbW9yeUFnZW50LmgKQEAgLTU2LDEwICs1NiwxMSBAQCBwdWJsaWM6CiAgICAgewog ICAgICAgICByZXR1cm4gYWRvcHRQdHIobmV3IEluc3BlY3Rvck1lbW9yeUFnZW50KGluc3RydW1l bnRpbmdBZ2VudHMsIHN0YXRlLCBwYWdlLCBkb21BZ2VudCkpOwogICAgIH0KKyAgICB2aXJ0dWFs IH5JbnNwZWN0b3JNZW1vcnlBZ2VudCgpOwogCi0gICAgdm9pZCBnZXRET01Ob2RlQ291bnQoRXJy b3JTdHJpbmcqLCBSZWZQdHI8VHlwZUJ1aWxkZXI6OkFycmF5PFR5cGVCdWlsZGVyOjpNZW1vcnk6 OkRPTUdyb3VwPiA+JiBkb21Hcm91cHMsIFJlZlB0cjxUeXBlQnVpbGRlcjo6TWVtb3J5OjpTdHJp bmdTdGF0aXN0aWNzPiYgc3RyaW5ncyk7CisgICAgdmlydHVhbCB2b2lkIGdldERPTU5vZGVDb3Vu dChFcnJvclN0cmluZyosIFJlZlB0cjxUeXBlQnVpbGRlcjo6QXJyYXk8VHlwZUJ1aWxkZXI6Ok1l bW9yeTo6RE9NR3JvdXA+ID4mIGRvbUdyb3VwcywgUmVmUHRyPFR5cGVCdWlsZGVyOjpNZW1vcnk6 OlN0cmluZ1N0YXRpc3RpY3M+JiBzdHJpbmdzKTsKKyAgICB2aXJ0dWFsIHZvaWQgZ2V0UHJvY2Vz c01lbW9yeURpc3RyaWJ1dGlvbihFcnJvclN0cmluZyosIFJlZlB0cjxUeXBlQnVpbGRlcjo6TWVt b3J5OjpNZW1vcnlCbG9jaz4mIHByb2Nlc3NNZW1vcnkpOwogCi0gICAgfkluc3BlY3Rvck1lbW9y eUFnZW50KCk7CiAKIHByaXZhdGU6CiAgICAgSW5zcGVjdG9yTWVtb3J5QWdlbnQoSW5zdHJ1bWVu dGluZ0FnZW50cyosIEluc3BlY3RvclN0YXRlKiwgUGFnZSosIEluc3BlY3RvckRPTUFnZW50KiBk b21BZ2VudCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9jaHJvbWl1bS9Q bGF0Zm9ybVN1cHBvcnQuaCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BsYXRm b3JtU3VwcG9ydC5oCmluZGV4IDAxZjRjYjY2MDhiZmQ5NWQ0NGE3NjljNzYzNTNmNmQzN2JkNmU5 NjUuLmYyOWJhZjg4NWY4NTcxMWQ3ZTMxOGRiMWUzOWU1M2RhN2VlMDg5M2UgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtU3VwcG9ydC5oCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2Nocm9taXVtL1BsYXRmb3JtU3VwcG9ydC5oCkBAIC0y MTMsNiArMjEzLDEwIEBAIHB1YmxpYzoKICAgICBzdGF0aWMgdm9pZCBzZXRTaGFyZWRUaW1lckZp cmVkRnVuY3Rpb24odm9pZCAoKmZ1bmMpKCkpOwogICAgIHN0YXRpYyB2b2lkIHNldFNoYXJlZFRp bWVyRmlyZUludGVydmFsKGRvdWJsZSk7CiAKKyAgICAvLyBSZXR1cm5zIHByaXZhdGUgYW5kIHNo YXJlZCB1c2FnZSwgaW4gYnl0ZXMuIFByaXZhdGUgYnl0ZXMgaXMgdGhlIGFtb3VudCBvZgorICAg IC8vIG1lbW9yeSBjdXJyZW50bHkgYWxsb2NhdGVkIHRvIHRoaXMgcHJvY2VzcyB0aGF0IGNhbm5v dCBiZSBzaGFyZWQuIFJldHVybnMKKyAgICAvLyBmYWxzZSBvbiBwbGF0Zm9ybSBzcGVjaWZpYyBl cnJvciBjb25kaXRpb25zLgorICAgIHN0YXRpYyBib29sIGdldFByb2Nlc3NNZW1vcnlTaXplKHNp emVfdCogcHJpdmF0ZUJ5dGVzLCBzaXplX3QqIHNoYXJlZEJ5dGVzKTsKICAgICAvLyBUaGVtaW5n IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLQogI2lmIE9TKFdJTkRPV1MpCiAgICAgc3RhdGljIHZvaWQgcGFpbnRCdXR0b24oCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1YmxpYy9wbGF0Zm9ybS9XZWJLaXRQbGF0 Zm9ybVN1cHBvcnQuaCBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL3BsYXRmb3JtL1dl YktpdFBsYXRmb3JtU3VwcG9ydC5oCmluZGV4IGIyMTUzNGQyNjFkZDMwMWU2OGM4OThlMTU4NmQz YjQwMDM1YjU0ODMuLmZjMDkyODNkZGFlMjhiZjUyMTQ4YThiNDdmMWI0MjBjNDA4MDgxMDYgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL3BsYXRmb3JtL1dlYktpdFBs YXRmb3JtU3VwcG9ydC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL3BsYXRm b3JtL1dlYktpdFBsYXRmb3JtU3VwcG9ydC5oCkBAIC0xMzIsNiArMTMyLDEwIEBAIHB1YmxpYzoK IAogICAgIHZpcnR1YWwgV2ViU2hhcmVkV29ya2VyUmVwb3NpdG9yeSogc2hhcmVkV29ya2VyUmVw b3NpdG9yeSgpIHsgcmV0dXJuIDA7IH0KIAorICAgIC8vIFJldHVybnMgcHJpdmF0ZSBhbmQgc2hh cmVkIHVzYWdlLCBpbiBieXRlcy4gUHJpdmF0ZSBieXRlcyBpcyB0aGUgYW1vdW50IG9mCisgICAg Ly8gbWVtb3J5IGN1cnJlbnRseSBhbGxvY2F0ZWQgdG8gdGhpcyBwcm9jZXNzIHRoYXQgY2Fubm90 IGJlIHNoYXJlZC4gUmV0dXJucworICAgIC8vIGZhbHNlIG9uIHBsYXRmb3JtIHNwZWNpZmljIGVy cm9yIGNvbmRpdGlvbnMuCisgICAgdmlydHVhbCBib29sIGdldFByb2Nlc3NNZW1vcnlTaXplKHNp emVfdCogcHJpdmF0ZUJ5dGVzLCBzaXplX3QqIHNoYXJlZEJ5dGVzKSB7IHJldHVybiBmYWxzZTsg fQogCiBwcm90ZWN0ZWQ6CiAgICAgfldlYktpdFBsYXRmb3JtU3VwcG9ydCgpIHsgfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvUGxhdGZvcm1TdXBwb3J0LmNwcCBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL1BsYXRmb3JtU3VwcG9ydC5jcHAKaW5kZXggYjE0ODEy ZGRhZGI4MWE1NGQzZjYyMzhmN2ViOWQ3ZjY0OGRjMjNlOS4uM2FlZjVkNTA0YjkyYjk5MDIzOTAy ODU4OGJjMzc0YTNjYTE1MDc5MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvUGxhdGZvcm1TdXBwb3J0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3NyYy9Q bGF0Zm9ybVN1cHBvcnQuY3BwCkBAIC04MzcsNiArODM3LDExIEBAIHZvaWQgUGxhdGZvcm1TdXBw b3J0Ojpub3RpZnlKU091dE9mTWVtb3J5KEZyYW1lKiBmcmFtZSkKICAgICB3ZWJGcmFtZS0+Y2xp ZW50KCktPmRpZEV4aGF1c3RNZW1vcnlBdmFpbGFibGVGb3JTY3JpcHQod2ViRnJhbWUpOwogfQog Citib29sIFBsYXRmb3JtU3VwcG9ydDo6Z2V0UHJvY2Vzc01lbW9yeVNpemUoc2l6ZV90KiBwcml2 YXRlQnl0ZXMsIHNpemVfdCogc2hhcmVkQnl0ZXMpCit7CisgICAgcmV0dXJuIHdlYktpdFBsYXRm b3JtU3VwcG9ydCgpLT5nZXRQcm9jZXNzTWVtb3J5U2l6ZShwcml2YXRlQnl0ZXMsIHNoYXJlZEJ5 dGVzKTsKK30KKwogaW50IFBsYXRmb3JtU3VwcG9ydDo6c2NyZWVuSG9yaXpvbnRhbERQSShXaWRn ZXQqIHdpZGdldCkKIHsKICAgICBXZWJXaWRnZXRDbGllbnQqIGNsaWVudCA9IHRvV2ViV2lkZ2V0 Q2xpZW50KHdpZGdldCk7Cg==