92966 2012-08-02 02:48:40 -0700 Web Inspector: rename reportMemoryUsage to reportDescendantMemoryUsage in StyleRuleBase descendants 2012-08-02 03:16:55 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 92748 0 yurys yurys apavlov bweinstein cmarcelo joepeck keishi loislo macpherson menard pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 685152 0 yurys 2012-08-02 02:48:40 -0700 Current implementation of StyleRuleBase::reportMemoryUsage has a switch by the rule type, then casts it to the corresponding descendant type and calls reportMemoryUsage on it. This scheme can be accidentally broken by adding another type to the switch: if the descendant doesn't provide its own reportMemoryUsage implementation we will end up with recursive call to StyleRuleBase::reportMemoryUsage. Compiler won't help us in that case. This can be fixed by changing the name of the method that actually provides the memory instrumentation in the descendants. 685154 1 156021 yurys 2012-08-02 02:50:37 -0700 Created attachment 156021 Patch 685158 2 156021 loislo 2012-08-02 02:55:56 -0700 Comment on attachment 156021 Patch lgtm 685163 3 156021 apavlov 2012-08-02 03:11:47 -0700 Comment on attachment 156021 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=156021&action=review > Source/WebCore/ChangeLog:9 > + StyleRuleBase to avoid accidental recurive calls to StyleRuleBase::reportMemoryUsage recurive -> recursive 685164 4 yurys 2012-08-02 03:12:52 -0700 (In reply to comment #3) > (From update of attachment 156021 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=156021&action=review > > > Source/WebCore/ChangeLog:9 > > + StyleRuleBase to avoid accidental recurive calls to StyleRuleBase::reportMemoryUsage > > recurive -> recursive Done. 685168 5 yurys 2012-08-02 03:16:55 -0700 Committed r124435: <http://trac.webkit.org/changeset/124435> 156021 2012-08-02 02:50:37 -0700 2012-08-02 03:11:47 -0700 Patch bug-92966-20120802135017.patch text/plain 11237 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0NDExCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjhhYmJjYWRmMzkxZWVm NmI2MzcyODIzMjE2ZjNjMmM4NzQ4OGFmMy4uYWU1NDk4OTgzMTA4NmM1OTk1NjU5NzU2OWIwZDY1 MTcxNzljNWFmMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM4IEBACisyMDEyLTA4LTAyICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHJlbmFtZSByZXBvcnRNZW1vcnlVc2FnZSB0byByZXBvcnREZXNjZW5kYW50TWVtb3J5VXNh Z2UgaW4gU3R5bGVSdWxlQmFzZSBkZXNjZW5kYW50cworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTI5NjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBSZW5hbWVkIHJlcG9ydE1lbW9yeVVzYWdlIHRvIHJlcG9y dERlc2NlbmRhbnRNZW1vcnlVc2FnZSBpbiBhbGwgZGVzY2VuZGFudHMgb2YKKyAgICAgICAgU3R5 bGVSdWxlQmFzZSB0byBhdm9pZCBhY2NpZGVudGFsIHJlY3VyaXZlIGNhbGxzIHRvIFN0eWxlUnVs ZUJhc2U6OnJlcG9ydE1lbW9yeVVzYWdlCisgICAgICAgIHdoZW4gYSBuZXcgdHlwZSBvZiBydWxl IGlzIGFkZGVkLgorCisgICAgICAgICogY3NzL1N0eWxlUnVsZS5jcHA6CisgICAgICAgIChXZWJD b3JlOjpTdHlsZVJ1bGVCYXNlOjpyZXBvcnRNZW1vcnlVc2FnZSk6CisgICAgICAgIChXZWJDb3Jl OjpTdHlsZVJ1bGU6OnJlcG9ydERlc2NlbmRhbnRNZW1vcnlVc2FnZSk6CisgICAgICAgIChXZWJD b3JlOjpTdHlsZVJ1bGVQYWdlOjpyZXBvcnREZXNjZW5kYW50TWVtb3J5VXNhZ2UpOgorICAgICAg ICAoV2ViQ29yZTo6U3R5bGVSdWxlRm9udEZhY2U6OnJlcG9ydERlc2NlbmRhbnRNZW1vcnlVc2Fn ZSk6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJ1bGVCbG9jazo6cmVwb3J0RGVzY2VuZGFudE1l bW9yeVVzYWdlKToKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlUnVsZU1lZGlhOjpyZXBvcnREZXNj ZW5kYW50TWVtb3J5VXNhZ2UpOgorICAgICAgICAoV2ViQ29yZTo6U3R5bGVSdWxlUmVnaW9uOjpy ZXBvcnREZXNjZW5kYW50TWVtb3J5VXNhZ2UpOgorICAgICAgICAqIGNzcy9TdHlsZVJ1bGUuaDoK KyAgICAgICAgKFN0eWxlUnVsZSk6CisgICAgICAgIChTdHlsZVJ1bGVGb250RmFjZSk6CisgICAg ICAgIChTdHlsZVJ1bGVQYWdlKToKKyAgICAgICAgKFN0eWxlUnVsZUJsb2NrKToKKyAgICAgICAg KFN0eWxlUnVsZU1lZGlhKToKKyAgICAgICAgKFN0eWxlUnVsZVJlZ2lvbik6CisgICAgICAgICog Y3NzL1N0eWxlUnVsZUltcG9ydC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJ1bGVJbXBv cnQ6OnJlcG9ydERlc2NlbmRhbnRNZW1vcnlVc2FnZSk6CisgICAgICAgICogY3NzL1N0eWxlUnVs ZUltcG9ydC5oOgorICAgICAgICAoU3R5bGVSdWxlSW1wb3J0KToKKyAgICAgICAgKiBjc3MvV2Vi S2l0Q1NTS2V5ZnJhbWVzUnVsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZVJ1bGVLZXlm cmFtZXM6OnJlcG9ydERlc2NlbmRhbnRNZW1vcnlVc2FnZSk6CisgICAgICAgICogY3NzL1dlYktp dENTU0tleWZyYW1lc1J1bGUuaDoKKyAgICAgICAgKFN0eWxlUnVsZUtleWZyYW1lcyk6CisKIDIw MTItMDgtMDEgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQ2hy b21pdW0gQW5kcm9pZCBidWlsZCBmaXggYWZ0ZXIgcjEyNDQwMi4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2Nzcy9TdHlsZVJ1bGUuY3BwIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUnVs ZS5jcHAKaW5kZXggZTVhNGJiZGI4OGI1NzJkMDgzZTM1NGQyNzJjNTcyNmZhNGVkODRkZC4uODU1 NGFmNjljMTc1NDY3YzNkNGM4ZGIyMTE3ZGEzZGU1NDY4NmM4NSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvY3NzL1N0eWxlUnVsZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxl UnVsZS5jcHAKQEAgLTU2LDI3ICs1NiwyNyBAQCB2b2lkIFN0eWxlUnVsZUJhc2U6OnJlcG9ydE1l bW9yeVVzYWdlKE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8pIGNvbnN0CiB7CiAg ICAgc3dpdGNoICh0eXBlKCkpIHsKICAgICBjYXNlIFN0eWxlOgotICAgICAgICBzdGF0aWNfY2Fz dDxjb25zdCBTdHlsZVJ1bGUqPih0aGlzKS0+cmVwb3J0TWVtb3J5VXNhZ2UobWVtb3J5T2JqZWN0 SW5mbyk7CisgICAgICAgIHN0YXRpY19jYXN0PGNvbnN0IFN0eWxlUnVsZSo+KHRoaXMpLT5yZXBv cnREZXNjZW5kYW50TWVtb3J5VXNhZ2UobWVtb3J5T2JqZWN0SW5mbyk7CiAgICAgICAgIHJldHVy bjsKICAgICBjYXNlIFBhZ2U6Ci0gICAgICAgIHN0YXRpY19jYXN0PGNvbnN0IFN0eWxlUnVsZVBh Z2UqPih0aGlzKS0+cmVwb3J0TWVtb3J5VXNhZ2UobWVtb3J5T2JqZWN0SW5mbyk7CisgICAgICAg IHN0YXRpY19jYXN0PGNvbnN0IFN0eWxlUnVsZVBhZ2UqPih0aGlzKS0+cmVwb3J0RGVzY2VuZGFu dE1lbW9yeVVzYWdlKG1lbW9yeU9iamVjdEluZm8pOwogICAgICAgICByZXR1cm47CiAgICAgY2Fz ZSBGb250RmFjZToKLSAgICAgICAgc3RhdGljX2Nhc3Q8Y29uc3QgU3R5bGVSdWxlRm9udEZhY2Uq Pih0aGlzKS0+cmVwb3J0TWVtb3J5VXNhZ2UobWVtb3J5T2JqZWN0SW5mbyk7CisgICAgICAgIHN0 YXRpY19jYXN0PGNvbnN0IFN0eWxlUnVsZUZvbnRGYWNlKj4odGhpcyktPnJlcG9ydERlc2NlbmRh bnRNZW1vcnlVc2FnZShtZW1vcnlPYmplY3RJbmZvKTsKICAgICAgICAgcmV0dXJuOwogICAgIGNh c2UgTWVkaWE6Ci0gICAgICAgIHN0YXRpY19jYXN0PGNvbnN0IFN0eWxlUnVsZU1lZGlhKj4odGhp cyktPnJlcG9ydE1lbW9yeVVzYWdlKG1lbW9yeU9iamVjdEluZm8pOworICAgICAgICBzdGF0aWNf Y2FzdDxjb25zdCBTdHlsZVJ1bGVNZWRpYSo+KHRoaXMpLT5yZXBvcnREZXNjZW5kYW50TWVtb3J5 VXNhZ2UobWVtb3J5T2JqZWN0SW5mbyk7CiAgICAgICAgIHJldHVybjsKICNpZiBFTkFCTEUoQ1NT X1JFR0lPTlMpCiAgICAgY2FzZSBSZWdpb246Ci0gICAgICAgIHN0YXRpY19jYXN0PGNvbnN0IFN0 eWxlUnVsZVJlZ2lvbio+KHRoaXMpLT5yZXBvcnRNZW1vcnlVc2FnZShtZW1vcnlPYmplY3RJbmZv KTsKKyAgICAgICAgc3RhdGljX2Nhc3Q8Y29uc3QgU3R5bGVSdWxlUmVnaW9uKj4odGhpcyktPnJl cG9ydERlc2NlbmRhbnRNZW1vcnlVc2FnZShtZW1vcnlPYmplY3RJbmZvKTsKICAgICAgICAgcmV0 dXJuOwogI2VuZGlmCiAgICAgY2FzZSBJbXBvcnQ6Ci0gICAgICAgIHN0YXRpY19jYXN0PGNvbnN0 IFN0eWxlUnVsZUltcG9ydCo+KHRoaXMpLT5yZXBvcnRNZW1vcnlVc2FnZShtZW1vcnlPYmplY3RJ bmZvKTsKKyAgICAgICAgc3RhdGljX2Nhc3Q8Y29uc3QgU3R5bGVSdWxlSW1wb3J0Kj4odGhpcykt PnJlcG9ydERlc2NlbmRhbnRNZW1vcnlVc2FnZShtZW1vcnlPYmplY3RJbmZvKTsKICAgICAgICAg cmV0dXJuOwogICAgIGNhc2UgS2V5ZnJhbWVzOgotICAgICAgICBzdGF0aWNfY2FzdDxjb25zdCBT dHlsZVJ1bGVLZXlmcmFtZXMqPih0aGlzKS0+cmVwb3J0TWVtb3J5VXNhZ2UobWVtb3J5T2JqZWN0 SW5mbyk7CisgICAgICAgIHN0YXRpY19jYXN0PGNvbnN0IFN0eWxlUnVsZUtleWZyYW1lcyo+KHRo aXMpLT5yZXBvcnREZXNjZW5kYW50TWVtb3J5VXNhZ2UobWVtb3J5T2JqZWN0SW5mbyk7CiAgICAg ICAgIHJldHVybjsKICAgICBjYXNlIFVua25vd246CiAgICAgY2FzZSBDaGFyc2V0OgpAQCAtMjA2 LDcgKzIwNiw3IEBAIHVuc2lnbmVkIFN0eWxlUnVsZTo6YXZlcmFnZVNpemVJbkJ5dGVzKCkKICAg ICByZXR1cm4gc2l6ZW9mKFN0eWxlUnVsZSkgKyBTdHlsZVByb3BlcnR5U2V0OjphdmVyYWdlU2l6 ZUluQnl0ZXMoKTsKIH0KIAotdm9pZCBTdHlsZVJ1bGU6OnJlcG9ydE1lbW9yeVVzYWdlKE1lbW9y eU9iamVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8pIGNvbnN0Cit2b2lkIFN0eWxlUnVsZTo6cmVw b3J0RGVzY2VuZGFudE1lbW9yeVVzYWdlKE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9iamVjdElu Zm8pIGNvbnN0CiB7CiAgICAgTWVtb3J5Q2xhc3NJbmZvPFN0eWxlUnVsZT4gaW5mbyhtZW1vcnlP YmplY3RJbmZvLCB0aGlzLCBNZW1vcnlJbnN0cnVtZW50YXRpb246OkNTUyk7CiAgICAgaW5mby5h ZGRJbnN0cnVtZW50ZWRNZW1iZXIobV9wcm9wZXJ0aWVzKTsKQEAgLTI2OSw3ICsyNjksNyBAQCB2 b2lkIFN0eWxlUnVsZVBhZ2U6OnNldFByb3BlcnRpZXMoUGFzc1JlZlB0cjxTdHlsZVByb3BlcnR5 U2V0PiBwcm9wZXJ0aWVzKQogICAgIG1fcHJvcGVydGllcyA9IHByb3BlcnRpZXM7CiB9CiAKLXZv aWQgU3R5bGVSdWxlUGFnZTo6cmVwb3J0TWVtb3J5VXNhZ2UoTWVtb3J5T2JqZWN0SW5mbyogbWVt b3J5T2JqZWN0SW5mbykgY29uc3QKK3ZvaWQgU3R5bGVSdWxlUGFnZTo6cmVwb3J0RGVzY2VuZGFu dE1lbW9yeVVzYWdlKE1lbW9yeU9iamVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8pIGNvbnN0CiB7 CiAgICAgTWVtb3J5Q2xhc3NJbmZvPFN0eWxlUnVsZVBhZ2U+IGluZm8obWVtb3J5T2JqZWN0SW5m bywgdGhpcywgTWVtb3J5SW5zdHJ1bWVudGF0aW9uOjpDU1MpOwogICAgIGluZm8uYWRkSW5zdHJ1 bWVudGVkTWVtYmVyKG1fcHJvcGVydGllcyk7CkBAIC0zMDMsNyArMzAzLDcgQEAgdm9pZCBTdHls ZVJ1bGVGb250RmFjZTo6c2V0UHJvcGVydGllcyhQYXNzUmVmUHRyPFN0eWxlUHJvcGVydHlTZXQ+ IHByb3BlcnRpZXMpCiAgICAgbV9wcm9wZXJ0aWVzID0gcHJvcGVydGllczsKIH0KIAotdm9pZCBT dHlsZVJ1bGVGb250RmFjZTo6cmVwb3J0TWVtb3J5VXNhZ2UoTWVtb3J5T2JqZWN0SW5mbyogbWVt b3J5T2JqZWN0SW5mbykgY29uc3QKK3ZvaWQgU3R5bGVSdWxlRm9udEZhY2U6OnJlcG9ydERlc2Nl bmRhbnRNZW1vcnlVc2FnZShNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvKSBjb25z dAogewogICAgIE1lbW9yeUNsYXNzSW5mbzxTdHlsZVJ1bGVGb250RmFjZT4gaW5mbyhtZW1vcnlP YmplY3RJbmZvLCB0aGlzLCBNZW1vcnlJbnN0cnVtZW50YXRpb246OkNTUyk7CiAgICAgaW5mby5h ZGRJbnN0cnVtZW50ZWRNZW1iZXIobV9wcm9wZXJ0aWVzKTsKQEAgLTMzNCw3ICszMzQsNyBAQCB2 b2lkIFN0eWxlUnVsZUJsb2NrOjp3cmFwcGVyUmVtb3ZlUnVsZSh1bnNpZ25lZCBpbmRleCkKICAg ICBtX2NoaWxkUnVsZXMucmVtb3ZlKGluZGV4KTsKIH0KIAotdm9pZCBTdHlsZVJ1bGVCbG9jazo6 cmVwb3J0TWVtb3J5VXNhZ2UoTWVtb3J5T2JqZWN0SW5mbyogbWVtb3J5T2JqZWN0SW5mbykgY29u c3QKK3ZvaWQgU3R5bGVSdWxlQmxvY2s6OnJlcG9ydERlc2NlbmRhbnRNZW1vcnlVc2FnZShNZW1v cnlPYmplY3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvKSBjb25zdAogewogICAgIE1lbW9yeUNsYXNz SW5mbzxTdHlsZVJ1bGVCbG9jaz4gaW5mbyhtZW1vcnlPYmplY3RJbmZvLCB0aGlzLCBNZW1vcnlJ bnN0cnVtZW50YXRpb246OkNTUyk7CiAgICAgaW5mby5hZGRJbnN0cnVtZW50ZWRWZWN0b3IobV9j aGlsZFJ1bGVzKTsKQEAgLTM1Myw3ICszNTMsNyBAQCBTdHlsZVJ1bGVNZWRpYTo6U3R5bGVSdWxl TWVkaWEoY29uc3QgU3R5bGVSdWxlTWVkaWEmIG8pCiAgICAgICAgIG1fbWVkaWFRdWVyaWVzID0g by5tX21lZGlhUXVlcmllcy0+Y29weSgpOwogfQogCi12b2lkIFN0eWxlUnVsZU1lZGlhOjpyZXBv cnRNZW1vcnlVc2FnZShNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvKSBjb25zdAor dm9pZCBTdHlsZVJ1bGVNZWRpYTo6cmVwb3J0RGVzY2VuZGFudE1lbW9yeVVzYWdlKE1lbW9yeU9i amVjdEluZm8qIG1lbW9yeU9iamVjdEluZm8pIGNvbnN0CiB7CiAgICAgTWVtb3J5Q2xhc3NJbmZv PFN0eWxlUnVsZU1lZGlhPiBpbmZvKG1lbW9yeU9iamVjdEluZm8sIHRoaXMsIE1lbW9yeUluc3Ry dW1lbnRhdGlvbjo6Q1NTKTsKICAgICBpbmZvLmFkZEluc3RydW1lbnRlZE1lbWJlcihtX21lZGlh UXVlcmllcyk7CkBAIC0zNzEsNyArMzcxLDcgQEAgU3R5bGVSdWxlUmVnaW9uOjpTdHlsZVJ1bGVS ZWdpb24oY29uc3QgU3R5bGVSdWxlUmVnaW9uJiBvKQogewogfQogCi12b2lkIFN0eWxlUnVsZVJl Z2lvbjo6cmVwb3J0TWVtb3J5VXNhZ2UoTWVtb3J5T2JqZWN0SW5mbyogbWVtb3J5T2JqZWN0SW5m bykgY29uc3QKK3ZvaWQgU3R5bGVSdWxlUmVnaW9uOjpyZXBvcnREZXNjZW5kYW50TWVtb3J5VXNh Z2UoTWVtb3J5T2JqZWN0SW5mbyogbWVtb3J5T2JqZWN0SW5mbykgY29uc3QKIHsKICAgICBNZW1v cnlDbGFzc0luZm88U3R5bGVSdWxlUmVnaW9uPiBpbmZvKG1lbW9yeU9iamVjdEluZm8sIHRoaXMs IE1lbW9yeUluc3RydW1lbnRhdGlvbjo6Q1NTKTsKICAgICBpbmZvLmFkZEluc3RydW1lbnRlZE1l bWJlcihtX3NlbGVjdG9yTGlzdCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5 bGVSdWxlLmggYi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSdWxlLmgKaW5kZXggZmFkMjVjMmM1 YzdmODRlMDAxMDYzMzRlNGE2ZjA2NWU1Y2UxNTgzMS4uNzdiZDJkYzYzZTU3OWExNmZhNjg0M2Q3 ZTA1ZTljZDc5OGI2MTk3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUnVs ZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJ1bGUuaApAQCAtMTA3LDcgKzEwNyw3 IEBAIHB1YmxpYzoKICAgICBQYXNzUmVmUHRyPFN0eWxlUnVsZT4gY29weSgpIGNvbnN0IHsgcmV0 dXJuIGFkb3B0UmVmKG5ldyBTdHlsZVJ1bGUoKnRoaXMpKTsgfQogCiAgICAgc3RhdGljIHVuc2ln bmVkIGF2ZXJhZ2VTaXplSW5CeXRlcygpOwotICAgIHZvaWQgcmVwb3J0TWVtb3J5VXNhZ2UoTWVt b3J5T2JqZWN0SW5mbyopIGNvbnN0OworICAgIHZvaWQgcmVwb3J0RGVzY2VuZGFudE1lbW9yeVVz YWdlKE1lbW9yeU9iamVjdEluZm8qKSBjb25zdDsKIAogcHJpdmF0ZToKICAgICBTdHlsZVJ1bGUo aW50IHNvdXJjZUxpbmUpOwpAQCAtMTMwLDcgKzEzMCw3IEBAIHB1YmxpYzoKIAogICAgIFBhc3NS ZWZQdHI8U3R5bGVSdWxlRm9udEZhY2U+IGNvcHkoKSBjb25zdCB7IHJldHVybiBhZG9wdFJlZihu ZXcgU3R5bGVSdWxlRm9udEZhY2UoKnRoaXMpKTsgfQogCi0gICAgdm9pZCByZXBvcnRNZW1vcnlV c2FnZShNZW1vcnlPYmplY3RJbmZvKikgY29uc3Q7CisgICAgdm9pZCByZXBvcnREZXNjZW5kYW50 TWVtb3J5VXNhZ2UoTWVtb3J5T2JqZWN0SW5mbyopIGNvbnN0OwogCiBwcml2YXRlOgogICAgIFN0 eWxlUnVsZUZvbnRGYWNlKCk7CkBAIC0xNTUsNyArMTU1LDcgQEAgcHVibGljOgogCiAgICAgUGFz c1JlZlB0cjxTdHlsZVJ1bGVQYWdlPiBjb3B5KCkgY29uc3QgeyByZXR1cm4gYWRvcHRSZWYobmV3 IFN0eWxlUnVsZVBhZ2UoKnRoaXMpKTsgfQogCi0gICAgdm9pZCByZXBvcnRNZW1vcnlVc2FnZShN ZW1vcnlPYmplY3RJbmZvKikgY29uc3Q7CisgICAgdm9pZCByZXBvcnREZXNjZW5kYW50TWVtb3J5 VXNhZ2UoTWVtb3J5T2JqZWN0SW5mbyopIGNvbnN0OwogCiBwcml2YXRlOgogICAgIFN0eWxlUnVs ZVBhZ2UoKTsKQEAgLTE3Miw3ICsxNzIsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCB3cmFwcGVySW5z ZXJ0UnVsZSh1bnNpZ25lZCwgUGFzc1JlZlB0cjxTdHlsZVJ1bGVCYXNlPik7CiAgICAgdm9pZCB3 cmFwcGVyUmVtb3ZlUnVsZSh1bnNpZ25lZCk7CiAKLSAgICB2b2lkIHJlcG9ydE1lbW9yeVVzYWdl KE1lbW9yeU9iamVjdEluZm8qKSBjb25zdDsKKyAgICB2b2lkIHJlcG9ydERlc2NlbmRhbnRNZW1v cnlVc2FnZShNZW1vcnlPYmplY3RJbmZvKikgY29uc3Q7CiAgICAgCiBwcm90ZWN0ZWQ6CiAgICAg U3R5bGVSdWxlQmxvY2soVHlwZSwgVmVjdG9yPFJlZlB0cjxTdHlsZVJ1bGVCYXNlPiA+JiBhZG9w dFJ1bGUpOwpAQCAtMTkzLDcgKzE5Myw3IEBAIHB1YmxpYzoKIAogICAgIFBhc3NSZWZQdHI8U3R5 bGVSdWxlTWVkaWE+IGNvcHkoKSBjb25zdCB7IHJldHVybiBhZG9wdFJlZihuZXcgU3R5bGVSdWxl TWVkaWEoKnRoaXMpKTsgfQogCi0gICAgdm9pZCByZXBvcnRNZW1vcnlVc2FnZShNZW1vcnlPYmpl Y3RJbmZvKikgY29uc3Q7CisgICAgdm9pZCByZXBvcnREZXNjZW5kYW50TWVtb3J5VXNhZ2UoTWVt b3J5T2JqZWN0SW5mbyopIGNvbnN0OwogCiBwcml2YXRlOgogICAgIFN0eWxlUnVsZU1lZGlhKFBh c3NSZWZQdHI8TWVkaWFRdWVyeVNldD4sIFZlY3RvcjxSZWZQdHI8U3R5bGVSdWxlQmFzZT4gPiYg YWRvcHRSdWxlcyk7CkBAIC0yMTMsNyArMjEzLDcgQEAgcHVibGljOgogCiAgICAgUGFzc1JlZlB0 cjxTdHlsZVJ1bGVSZWdpb24+IGNvcHkoKSBjb25zdCB7IHJldHVybiBhZG9wdFJlZihuZXcgU3R5 bGVSdWxlUmVnaW9uKCp0aGlzKSk7IH0KIAotICAgIHZvaWQgcmVwb3J0TWVtb3J5VXNhZ2UoTWVt b3J5T2JqZWN0SW5mbyopIGNvbnN0OworICAgIHZvaWQgcmVwb3J0RGVzY2VuZGFudE1lbW9yeVVz YWdlKE1lbW9yeU9iamVjdEluZm8qKSBjb25zdDsKIAogcHJpdmF0ZToKICAgICBTdHlsZVJ1bGVS ZWdpb24oVmVjdG9yPE93blB0cjxDU1NQYXJzZXJTZWxlY3Rvcj4gPiosIFZlY3RvcjxSZWZQdHI8 U3R5bGVSdWxlQmFzZT4gPiYgYWRvcHRSdWxlcyk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9jc3MvU3R5bGVSdWxlSW1wb3J0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJ1bGVJ bXBvcnQuY3BwCmluZGV4IDIxYzRmMDE0YjJlN2RkMjhmMzc1NGU0YTlkY2IyMjJhM2M4NDg4MDQu LmU1YTQ1ZDRjMGIzMTI1MWQ0MjY0ODUzMzVlZGY2YjFhNTY3NTczNzIgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJ1bGVJbXBvcnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2Nzcy9TdHlsZVJ1bGVJbXBvcnQuY3BwCkBAIC0xMjgsNyArMTI4LDcgQEAgdm9pZCBTdHlsZVJ1 bGVJbXBvcnQ6OnJlcXVlc3RTdHlsZVNoZWV0KCkKICAgICB9CiB9CiAKLXZvaWQgU3R5bGVSdWxl SW1wb3J0OjpyZXBvcnRNZW1vcnlVc2FnZShNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlPYmplY3RJ bmZvKSBjb25zdAordm9pZCBTdHlsZVJ1bGVJbXBvcnQ6OnJlcG9ydERlc2NlbmRhbnRNZW1vcnlV c2FnZShNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvKSBjb25zdAogewogICAgIE1l bW9yeUNsYXNzSW5mbzxTdHlsZVJ1bGVJbXBvcnQ+IGluZm8obWVtb3J5T2JqZWN0SW5mbywgdGhp cywgTWVtb3J5SW5zdHJ1bWVudGF0aW9uOjpDU1MpOwogICAgIGluZm8uYWRkU3RyaW5nKG1fc3Ry SHJlZik7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSdWxlSW1wb3J0Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9jc3MvU3R5bGVSdWxlSW1wb3J0LmgKaW5kZXggYTk5MWQ5YjA5Mzc2 ZjgzYWUwZjkyOTA0NTZiZjU1NjI0ZDA1NjNhMy4uYzBmODk4YzY1OWNjMDMwMTUzMzAxZjk0MWJj Mjc2ZTBkOGViMmQ4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1N0eWxlUnVsZUlt cG9ydC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9TdHlsZVJ1bGVJbXBvcnQuaApAQCAtNTEs NyArNTEsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHJlcXVlc3RTdHlsZVNoZWV0KCk7CiAKLSAg ICB2b2lkIHJlcG9ydE1lbW9yeVVzYWdlKE1lbW9yeU9iamVjdEluZm8qKSBjb25zdDsKKyAgICB2 b2lkIHJlcG9ydERlc2NlbmRhbnRNZW1vcnlVc2FnZShNZW1vcnlPYmplY3RJbmZvKikgY29uc3Q7 CiAKIHByaXZhdGU6CiAgICAgLy8gTk9URTogV2UgcHV0IHRoZSBDYWNoZWRTdHlsZVNoZWV0Q2xp ZW50IGluIGEgbWVtYmVyIGluc3RlYWQgb2YgaW5oZXJpdGluZyBmcm9tIGl0CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9jc3MvV2ViS2l0Q1NTS2V5ZnJhbWVzUnVsZS5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvV2ViS2l0Q1NTS2V5ZnJhbWVzUnVsZS5jcHAKaW5kZXggYWM5ZDQ4M2I4Njdj YjAxMmNmZTlmZjNhZjNjZTQ4ZWMyZmVlNDNhZS4uMmEwM2ZlNDdmMjMzY2FkNWNiYzQ1NDEyMTc4 YTA2NDAxNDcxZTI1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvY3NzL1dlYktpdENTU0tl eWZyYW1lc1J1bGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9XZWJLaXRDU1NLZXlmcmFt ZXNSdWxlLmNwcApAQCAtODcsNyArODcsNyBAQCBpbnQgU3R5bGVSdWxlS2V5ZnJhbWVzOjpmaW5k S2V5ZnJhbWVJbmRleChjb25zdCBTdHJpbmcmIGtleSkgY29uc3QKICAgICByZXR1cm4gLTE7CiB9 CiAKLXZvaWQgU3R5bGVSdWxlS2V5ZnJhbWVzOjpyZXBvcnRNZW1vcnlVc2FnZShNZW1vcnlPYmpl Y3RJbmZvKiBtZW1vcnlPYmplY3RJbmZvKSBjb25zdAordm9pZCBTdHlsZVJ1bGVLZXlmcmFtZXM6 OnJlcG9ydERlc2NlbmRhbnRNZW1vcnlVc2FnZShNZW1vcnlPYmplY3RJbmZvKiBtZW1vcnlPYmpl Y3RJbmZvKSBjb25zdAogewogICAgIE1lbW9yeUNsYXNzSW5mbzxTdHlsZVJ1bGVLZXlmcmFtZXM+ IGluZm8obWVtb3J5T2JqZWN0SW5mbywgdGhpcywgTWVtb3J5SW5zdHJ1bWVudGF0aW9uOjpDU1Mp OwogICAgIGluZm8uYWRkSW5zdHJ1bWVudGVkVmVjdG9yKG1fa2V5ZnJhbWVzKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9XZWJLaXRDU1NLZXlmcmFtZXNSdWxlLmggYi9Tb3VyY2Uv V2ViQ29yZS9jc3MvV2ViS2l0Q1NTS2V5ZnJhbWVzUnVsZS5oCmluZGV4IDUzZmY0ZTNhNDIyNTI5 MmU0YTQzOWVmMTY1MGI0NGY5ZjEzOWUwNzIuLjBiOTE4Y2YwMjE4Y2EyYTI0YTljODY1MzgxYTcz ZmE4NDZiZDA5M2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9XZWJLaXRDU1NLZXlm cmFtZXNSdWxlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL1dlYktpdENTU0tleWZyYW1lc1J1 bGUuaApAQCAtNTksNyArNTksNyBAQCBwdWJsaWM6CiAKICAgICBQYXNzUmVmUHRyPFN0eWxlUnVs ZUtleWZyYW1lcz4gY29weSgpIGNvbnN0IHsgcmV0dXJuIGFkb3B0UmVmKG5ldyBTdHlsZVJ1bGVL ZXlmcmFtZXMoKnRoaXMpKTsgfQogCi0gICAgdm9pZCByZXBvcnRNZW1vcnlVc2FnZShNZW1vcnlP YmplY3RJbmZvKikgY29uc3Q7CisgICAgdm9pZCByZXBvcnREZXNjZW5kYW50TWVtb3J5VXNhZ2Uo TWVtb3J5T2JqZWN0SW5mbyopIGNvbnN0OwogCiBwcml2YXRlOgogICAgIFN0eWxlUnVsZUtleWZy YW1lcygpOwo=