65582 2011-08-02 16:55:23 -0700 Web Inspector: Remove InspectorFrontendHost load/saveSessionSetting 2011-08-03 12:09:54 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 joepeck joepeck apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 445618 0 joepeck 2011-08-02 16:55:23 -0700 It looks like load/saveSessionSetting is only used in one place, for "debugger-enabled". In fact, that has been superseded by the WebInspector.setting localStorage setting. It looks we can just remove these functions: - JS: InspectorFrontendHostStub, ScriptsPanel.js usage - Inspector: InspectorFrontendHost + Client - WebKit 1 Ports: cf, mac, win and hashmap instance variable 445898 1 pfeldman 2011-08-03 09:13:00 -0700 (In reply to comment #0) > It looks like load/saveSessionSetting is only used in one place, for "debugger-enabled". > In fact, that has been superseded by the WebInspector.setting localStorage setting. It > looks we can just remove these functions: > > - JS: InspectorFrontendHostStub, ScriptsPanel.js usage > - Inspector: InspectorFrontendHost + Client > - WebKit 1 Ports: cf, mac, win and hashmap instance variable You are probably right: we now have persistent localStorage settings and runtime cookie. This code should vanish. Do you have a patch pending? 445933 2 joepeck 2011-08-03 10:25:56 -0700 Sure I can make a patch. I just had to update my Open Source checkout. After a week or two it takes so long I looked at other things and lost track of this! I'll assign this to myself. 445959 3 102796 joepeck 2011-08-03 11:14:27 -0700 Created attachment 102796 [PATCH] Remove the stale code 445992 4 102796 webkit.review.bot 2011-08-03 12:09:49 -0700 Comment on attachment 102796 [PATCH] Remove the stale code Clearing flags on attachment: 102796 Committed r92300: <http://trac.webkit.org/changeset/92300> 445993 5 webkit.review.bot 2011-08-03 12:09:54 -0700 All reviewed patches have been landed. Closing bug. 102796 2011-08-03 11:14:27 -0700 2011-08-03 12:09:49 -0700 [PATCH] Remove the stale code patch.patch text/plain 12825 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1NTU2ZjliLi5jNzQ5NjY3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTEtMDgtMDMgIEpvc2VwaCBQZWNvcmFybyAgPGpvZXBlY2tAd2Via2l0Lm9yZz4KKwor ICAgICAgICBXZWIgSW5zcGVjdG9yOiBSZW1vdmUgSW5zcGVjdG9yRnJvbnRlbmRIb3N0IGxvYWQv c2F2ZVNlc3Npb25TZXR0aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD02NTU4MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIFJlbW92ZSBzdGFsZSBjb2RlLiBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MgdXNlcyBs b2NhbFN0b3JhZ2UgYW5kCisgICAgICAgIGhhbmRsZXMgdGhlICJkZWJ1Z2dlckVuYWJsZWQiIHN0 YXRlLiBTbyByZW1vdmUgdGhlIG9ubHkgcmVtYWluaW5nCisgICAgICAgIHVzYWdlIG9mIGxvYWQv c2F2ZVNlc3Npb25TZXR0aW5nLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckZyb250 ZW5kQ2xpZW50Lmg6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5j cHA6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5oOgorICAgICAg ICAqIGluc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuaWRsOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvSW5zcGVjdG9yRnJvbnRlbmRIb3N0U3R1Yi5qczoKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9kZWJ1Z2dlcldhc0Rpc2FibGVkKToKKwogMjAxMS0w OC0wMyAgTHVrZSBNYWNwaGVyc29uICAgPG1hY3BoZXJzb25AY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFVzZSBhcHByb3ByaWF0ZSBtYWNybyBmb3IgQ1NTUHJvcGVydHlJbWFnZVJlbmRlcmluZy4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENs aWVudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kQ2xpZW50 LmgKaW5kZXggOWU3MmU1NS4uYmM4YTEzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckZyb250ZW5kQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckZyb250ZW5kQ2xpZW50LmgKQEAgLTYzLDkgKzYzLDYgQEAgcHVibGlj OgogICAgIHZpcnR1YWwgdm9pZCBpbnNwZWN0ZWRVUkxDaGFuZ2VkKGNvbnN0IFN0cmluZyYpID0g MDsKIAogICAgIHZpcnR1YWwgdm9pZCBzZW5kTWVzc2FnZVRvQmFja2VuZChjb25zdCBTdHJpbmcm KSA9IDA7Ci0KLSAgICB2aXJ0dWFsIHZvaWQgc2F2ZVNlc3Npb25TZXR0aW5nKGNvbnN0IFN0cmlu ZyYsIGNvbnN0IFN0cmluZyYpIHsgfQotICAgIHZpcnR1YWwgdm9pZCBsb2FkU2Vzc2lvblNldHRp bmcoY29uc3QgU3RyaW5nJiwgU3RyaW5nKikgeyB9CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJD b3JlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRl bmRIb3N0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhv c3QuY3BwCmluZGV4IGFjOWRjZjcuLmQyYTcwMzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuY3BwCkBAIC0yMjgsMjAgKzIyOCw2IEBA IHZvaWQgSW5zcGVjdG9yRnJvbnRlbmRIb3N0OjpzYXZlQXMoY29uc3QgU3RyaW5nJiBmaWxlTmFt ZSwgY29uc3QgU3RyaW5nJiBjb250ZW50CiAgICAgICAgIG1fY2xpZW50LT5zYXZlQXMoZmlsZU5h bWUsIGNvbnRlbnQpOwogfQogCi12b2lkIEluc3BlY3RvckZyb250ZW5kSG9zdDo6c2F2ZVNlc3Np b25TZXR0aW5nKGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIHZhbHVlKQotewotICAg IGlmIChtX2NsaWVudCkKLSAgICAgICAgbV9jbGllbnQtPnNhdmVTZXNzaW9uU2V0dGluZyhrZXks IHZhbHVlKTsKLX0KLQotU3RyaW5nIEluc3BlY3RvckZyb250ZW5kSG9zdDo6bG9hZFNlc3Npb25T ZXR0aW5nKGNvbnN0IFN0cmluZyYga2V5KQotewotICAgIFN0cmluZyB2YWx1ZTsKLSAgICBpZiAo bV9jbGllbnQpCi0gICAgICAgIG1fY2xpZW50LT5sb2FkU2Vzc2lvblNldHRpbmcoa2V5LCAmdmFs dWUpOwotICAgIHJldHVybiB2YWx1ZTsKLX0KLQogdm9pZCBJbnNwZWN0b3JGcm9udGVuZEhvc3Q6 OnNlbmRNZXNzYWdlVG9CYWNrZW5kKGNvbnN0IFN0cmluZyYgbWVzc2FnZSkKIHsKICAgICBpZiAo bV9jbGllbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y RnJvbnRlbmRIb3N0LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRl bmRIb3N0LmgKaW5kZXggYjY3OGJlZC4uZGVjZmU5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuaApAQCAtNzUsOSArNzUsNiBAQCBwdWJs aWM6CiAgICAgdm9pZCBjb3B5VGV4dChjb25zdCBTdHJpbmcmIHRleHQpOwogICAgIHZvaWQgc2F2 ZUFzKGNvbnN0IFN0cmluZyYgZmlsZU5hbWUsIGNvbnN0IFN0cmluZyYgY29udGVudCk7CiAKLSAg ICB2b2lkIHNhdmVTZXNzaW9uU2V0dGluZyhjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5n JiB2YWx1ZSk7Ci0gICAgU3RyaW5nIGxvYWRTZXNzaW9uU2V0dGluZyhjb25zdCBTdHJpbmcmIGtl eSk7Ci0KICAgICAvLyBDYWxsZWQgZnJvbSBbQ3VzdG9tXSBpbXBsZW1lbnRhdGlvbnMuCiAgICAg dm9pZCBzaG93Q29udGV4dE1lbnUoRXZlbnQqLCBjb25zdCBWZWN0b3I8Q29udGV4dE1lbnVJdGVt Kj4mIGl0ZW1zKTsKICAgICB2b2lkIHNlbmRNZXNzYWdlVG9CYWNrZW5kKGNvbnN0IFN0cmluZyYg bWVzc2FnZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y RnJvbnRlbmRIb3N0LmlkbCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9u dGVuZEhvc3QuaWRsCmluZGV4IGVkMDRhYjguLmU5ODllOTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuaWRsCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuaWRsCkBAIC01MCw5ICs1MCw2 IEBAIG1vZHVsZSBjb3JlIHsKICAgICAgICAgRE9NU3RyaW5nIGxvY2FsaXplZFN0cmluZ3NVUkwo KTsKICAgICAgICAgRE9NU3RyaW5nIGhpZGRlblBhbmVscygpOwogCi0gICAgICAgIHZvaWQgc2F2 ZVNlc3Npb25TZXR0aW5nKGluIERPTVN0cmluZyBrZXksIGluIERPTVN0cmluZyB2YWx1ZSk7Ci0g ICAgICAgIERPTVN0cmluZyBsb2FkU2Vzc2lvblNldHRpbmcoaW4gRE9NU3RyaW5nIGtleSk7Ci0K ICAgICAgICAgdm9pZCBjb3B5VGV4dChpbiBET01TdHJpbmcgdGV4dCk7CiAgICAgICAgIHZvaWQg c2F2ZUFzKGluIERPTVN0cmluZyBmaWxlTmFtZSwgaW4gRE9NU3RyaW5nIGNvbnRlbnQpOwogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0luc3BlY3RvckZy b250ZW5kSG9zdFN0dWIuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0lu c3BlY3RvckZyb250ZW5kSG9zdFN0dWIuanMKaW5kZXggYmFmN2NjNy4uODRlYzNkNyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbnNwZWN0b3JGcm9udGVu ZEhvc3RTdHViLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSW5z cGVjdG9yRnJvbnRlbmRIb3N0U3R1Yi5qcwpAQCAtMTM4LDE0ICsxMzgsNiBAQCBXZWJJbnNwZWN0 b3IuSW5zcGVjdG9yRnJvbnRlbmRIb3N0U3R1Yi5wcm90b3R5cGUgPSB7CiAgICAgewogICAgIH0s CiAKLSAgICBzYXZlU2Vzc2lvblNldHRpbmc6IGZ1bmN0aW9uKGtleSwgdmFsdWUpCi0gICAgewot ICAgIH0sCi0KLSAgICBsb2FkU2Vzc2lvblNldHRpbmc6IGZ1bmN0aW9uKGtleSkKLSAgICB7Ci0g ICAgfSwKLQogICAgIHJlY29yZEFjdGlvblRha2VuOiBmdW5jdGlvbihhY3Rpb25Db2RlKQogICAg IHsKICAgICB9LApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRzUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Nj cmlwdHNQYW5lbC5qcwppbmRleCAwM2MzNTkwLi5hNTYzMjZkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcworKysgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcwpAQCAtMTY3LDcgKzE2 Nyw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5f cHJlc2VudGF0aW9uTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuRGVidWdnZXJQ cmVzZW50YXRpb25Nb2RlbC5FdmVudHMuQ2FsbEZyYW1lU2VsZWN0ZWQsIHRoaXMuX2NhbGxGcmFt ZVNlbGVjdGVkLCB0aGlzKTsKIAogICAgIHZhciBlbmFibGVEZWJ1Z2dlciA9IFByZWZlcmVuY2Vz LmRlYnVnZ2VyQWx3YXlzRW5hYmxlZCB8fCBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MuZGVidWdnZXJF bmFibGVkLmdldCgpOwotICAgIGlmIChlbmFibGVEZWJ1Z2dlciB8fCBJbnNwZWN0b3JGcm9udGVu ZEhvc3QubG9hZFNlc3Npb25TZXR0aW5nKCJkZWJ1Z2dlci1lbmFibGVkIikgPT09ICJ0cnVlIikK KyAgICBpZiAoZW5hYmxlRGVidWdnZXIpCiAgICAgICAgIFdlYkluc3BlY3Rvci5kZWJ1Z2dlck1v ZGVsLmVuYWJsZURlYnVnZ2VyKCk7CiB9CiAKQEAgLTQ3OCw3ICs0NzgsNiBAQCBXZWJJbnNwZWN0 b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYgKHRoaXMuX2RlYnVnZ2Vy RW5hYmxlZCkKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBJbnNwZWN0b3JGcm9udGVu ZEhvc3Quc2F2ZVNlc3Npb25TZXR0aW5nKCJkZWJ1Z2dlci1lbmFibGVkIiwgInRydWUiKTsKICAg ICAgICAgdGhpcy5fZGVidWdnZXJFbmFibGVkID0gdHJ1ZTsKICAgICAgICAgdGhpcy5yZXNldCh0 cnVlKTsKICAgICB9LApAQCAtNDg4LDcgKzQ4Nyw2IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFu ZWwucHJvdG90eXBlID0gewogICAgICAgICBpZiAoIXRoaXMuX2RlYnVnZ2VyRW5hYmxlZCkKICAg ICAgICAgICAgIHJldHVybjsKIAotICAgICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3Quc2F2ZVNl c3Npb25TZXR0aW5nKCJkZWJ1Z2dlci1lbmFibGVkIiwgImZhbHNlIik7CiAgICAgICAgIHRoaXMu X2RlYnVnZ2VyRW5hYmxlZCA9IGZhbHNlOwogICAgICAgICB0aGlzLnJlc2V0KHRydWUpOwogICAg IH0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2NmL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJL aXQvY2YvQ2hhbmdlTG9nCmluZGV4IGFiY2MwNjUuLmNkMGJkN2IgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2YvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2YvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTIgQEAKKzIwMTEtMDgtMDMgIEpvc2VwaCBQZWNvcmFybyAgPGpvZXBlY2tAd2Vi a2l0Lm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBSZW1vdmUgSW5zcGVjdG9yRnJvbnRl bmRIb3N0IGxvYWQvc2F2ZVNlc3Npb25TZXR0aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD02NTU4MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50 Q0YuY3BwOgorCiAyMDExLTAzLTE1ICBLZXZpbiBPbGxpdmllciAgPGtldmlub0B0aGVvbGxpdmll cnMuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9jZi9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnRDRi5jcHAg Yi9Tb3VyY2UvV2ViS2l0L2NmL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudENGLmNw cAppbmRleCAwMzYyZGFjLi44NDdjNzg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2NmL1dl YkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudENGLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L2NmL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudENGLmNwcApAQCAtMTMxLDE4ICsx MzEsNiBAQCB2b2lkIFdlYkluc3BlY3RvckNsaWVudDo6cmVsZWFzZUZyb250ZW5kUGFnZSgpCiAg ICAgbV9mcm9udGVuZFBhZ2UgPSAwOwogfQogCi12b2lkIFdlYkluc3BlY3RvckNsaWVudDo6c2F2 ZVNlc3Npb25TZXR0aW5nKGNvbnN0IFN0cmluZyYga2V5LCBjb25zdCBTdHJpbmcmIHZhbHVlKQot ewotICAgIGlmICgha2V5LmlzRW1wdHkoKSkKLSAgICAgICAgbV9zZXNzaW9uU2V0dGluZ3Muc2V0 KGtleSwgdmFsdWUpOwotfQotCi12b2lkIFdlYkluc3BlY3RvckNsaWVudDo6bG9hZFNlc3Npb25T ZXR0aW5nKGNvbnN0IFN0cmluZyYga2V5LCBTdHJpbmcqIHZhbHVlKQotewotICAgIGlmICgha2V5 LmlzRW1wdHkoKSkKLSAgICAgICAgKnZhbHVlID0gbV9zZXNzaW9uU2V0dGluZ3MuZ2V0KGtleSk7 Ci19Ci0KIFdURjo6UGFzc093blB0cjxXZWJDb3JlOjpJbnNwZWN0b3JGcm9udGVuZENsaWVudExv Y2FsOjpTZXR0aW5ncz4gV2ViSW5zcGVjdG9yQ2xpZW50OjpjcmVhdGVGcm9udGVuZFNldHRpbmdz KCkKIHsKICAgICBjbGFzcyBJbnNwZWN0b3JGcm9udGVuZFNldHRpbmdzQ0YgOiBwdWJsaWMgV2Vi Q29yZTo6SW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbDo6U2V0dGluZ3MgewpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdl TG9nCmluZGV4IDI4MGRjMGIuLjkyYWI5YTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFj L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx MyBAQAorMjAxMS0wOC0wMyAgSm9zZXBoIFBlY29yYXJvICA8am9lcGVja0B3ZWJraXQub3JnPgor CisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJlbW92ZSBJbnNwZWN0b3JGcm9udGVuZEhvc3QgbG9h ZC9zYXZlU2Vzc2lvblNldHRpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY1NTgyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQuaDoKKyAgICAg ICAgKiBXZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQubW06CisKIDIwMTEtMDgtMDMg IFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFtUaW1lbGluZV0gSG92ZXIgb24gcGFpbnQgZXZlbnRzIGFuZCBzZWUgcmVjdCBvdXRs aW5lIGFyb3VuZCB0aGF0IGFyZWEuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJD b3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNv cmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5oCmluZGV4IGY5Y2VlNjUuLmI4NWQ1NzMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNs aWVudC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3Rv ckNsaWVudC5oCkBAIC02OSwxNyArNjksMTIgQEAgcHVibGljOgogCiAgICAgdm9pZCByZWxlYXNl RnJvbnRlbmRQYWdlKCk7CiAKLSAgICB2b2lkIHNhdmVTZXNzaW9uU2V0dGluZyhjb25zdCBTdHJp bmcmIGtleSwgY29uc3QgU3RyaW5nJiB2YWx1ZSk7Ci0gICAgdm9pZCBsb2FkU2Vzc2lvblNldHRp bmcoY29uc3QgU3RyaW5nJiBrZXksIFN0cmluZyogdmFsdWUpOwotCiBwcml2YXRlOgogICAgIFdU Rjo6UGFzc093blB0cjxXZWJDb3JlOjpJbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsOjpTZXR0 aW5ncz4gY3JlYXRlRnJvbnRlbmRTZXR0aW5ncygpOwogCiAgICAgV2ViVmlldyAqbV93ZWJWaWV3 OwogICAgIFJldGFpblB0cjxXZWJOb2RlSGlnaGxpZ2h0ZXI+IG1faGlnaGxpZ2h0ZXI7CiAgICAg V2ViQ29yZTo6UGFnZSogbV9mcm9udGVuZFBhZ2U7Ci0KLSAgICBXVEY6Okhhc2hNYXA8V1RGOjpT dHJpbmcsIFdURjo6U3RyaW5nPiBtX3Nlc3Npb25TZXR0aW5nczsKIH07CiAKIApAQCAtMTAyLDkg Kzk3LDYgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBzZXRBdHRhY2hlZFdpbmRvd0hlaWdo dCh1bnNpZ25lZCBoZWlnaHQpOwogICAgIHZpcnR1YWwgdm9pZCBpbnNwZWN0ZWRVUkxDaGFuZ2Vk KGNvbnN0IFdURjo6U3RyaW5nJiBuZXdVUkwpOwogCi0gICAgdmlydHVhbCB2b2lkIHNhdmVTZXNz aW9uU2V0dGluZyhjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiB2YWx1ZSk7Ci0gICAg dmlydHVhbCB2b2lkIGxvYWRTZXNzaW9uU2V0dGluZyhjb25zdCBTdHJpbmcmIGtleSwgU3RyaW5n KiB2YWx1ZSk7Ci0KIHByaXZhdGU6CiAgICAgdm9pZCB1cGRhdGVXaW5kb3dUaXRsZSgpIGNvbnN0 OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJJbnNw ZWN0b3JDbGllbnQubW0gYi9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9XZWJJbnNw ZWN0b3JDbGllbnQubW0KaW5kZXggMjBhMWIxYi4uZjRkODZhZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvV2ViSW5zcGVjdG9yQ2xpZW50Lm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5tbQpAQCAt MTkwLDIwICsxOTAsNiBAQCB2b2lkIFdlYkluc3BlY3RvckZyb250ZW5kQ2xpZW50OjppbnNwZWN0 ZWRVUkxDaGFuZ2VkKGNvbnN0IFN0cmluZyYgbmV3VVJMKQogICAgIHVwZGF0ZVdpbmRvd1RpdGxl KCk7CiB9CiAKLXZvaWQgV2ViSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQ6OnNhdmVTZXNzaW9uU2V0 dGluZyhjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiB2YWx1ZSkKLXsKLSAgICBXZWJJ bnNwZWN0b3JDbGllbnQqIGNsaWVudCA9IFttX3dpbmRvd0NvbnRyb2xsZXIuZ2V0KCkgaW5zcGVj dG9yQ2xpZW50XTsKLSAgICBpZiAoY2xpZW50KQotICAgICAgICBjbGllbnQtPnNhdmVTZXNzaW9u U2V0dGluZyhrZXksIHZhbHVlKTsKLX0KLQotdm9pZCBXZWJJbnNwZWN0b3JGcm9udGVuZENsaWVu dDo6bG9hZFNlc3Npb25TZXR0aW5nKGNvbnN0IFN0cmluZyYga2V5LCBTdHJpbmcqIHZhbHVlKQot ewotICAgIFdlYkluc3BlY3RvckNsaWVudCogY2xpZW50ID0gW21fd2luZG93Q29udHJvbGxlci5n ZXQoKSBpbnNwZWN0b3JDbGllbnRdOwotICAgIGlmIChjbGllbnQpCi0gICAgICAgIGNsaWVudC0+ bG9hZFNlc3Npb25TZXR0aW5nKGtleSwgdmFsdWUpOwotfQotCiB2b2lkIFdlYkluc3BlY3RvckZy b250ZW5kQ2xpZW50Ojp1cGRhdGVXaW5kb3dUaXRsZSgpIGNvbnN0CiB7CiAgICAgTlNTdHJpbmcg KnRpdGxlID0gW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6VUlfU1RSSU5HX0lOVEVSTkFMKCJX ZWIgSW5zcGVjdG9yIOKAlCAlQCIsICJXZWIgSW5zcGVjdG9yIHdpbmRvdyB0aXRsZSIpLCAoTlNT dHJpbmcgKiltX2luc3BlY3RlZFVSTF07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKaW5kZXggNDJhYjdiMy4uYzc1 MmFkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvd2luL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDExLTA4LTAzICBKb3Nl cGggUGVjb3Jhcm8gIDxqb2VwZWNrQHdlYmtpdC5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogUmVtb3ZlIEluc3BlY3RvckZyb250ZW5kSG9zdCBsb2FkL3NhdmVTZXNzaW9uU2V0dGluZwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjU1ODIKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmVT dXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5jcHA6CisgICAgICAgICogV2ViQ29yZVN1cHBvcnQv V2ViSW5zcGVjdG9yQ2xpZW50Lmg6CisKIDIwMTEtMDgtMDMgIEFkYW0gUm9iZW4gIDxhcm9iZW5A YXBwbGUuY29tPgogCiAgICAgICAgIFdpbmRvd3MgbmlnaHRseSBidWlsZCBmaXggYWZ0ZXIgcjkx Nzc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJJbnNw ZWN0b3JDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdC93aW4vV2ViQ29yZVN1cHBvcnQvV2ViSW5z cGVjdG9yQ2xpZW50LmNwcAppbmRleCAxMmExMDg3Li40ZjhlMDMzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L3dpbi9XZWJDb3JlU3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5jcHAK QEAgLTMxOSwxNiArMzE5LDYgQEAgdm9pZCBXZWJJbnNwZWN0b3JGcm9udGVuZENsaWVudDo6aW5z cGVjdGVkVVJMQ2hhbmdlZChjb25zdCBTdHJpbmcmIG5ld1VSTCkKICAgICB1cGRhdGVXaW5kb3dU aXRsZSgpOwogfQogCi12b2lkIFdlYkluc3BlY3RvckZyb250ZW5kQ2xpZW50OjpzYXZlU2Vzc2lv blNldHRpbmcoY29uc3QgU3RyaW5nJiBrZXksIGNvbnN0IFN0cmluZyYgdmFsdWUpCi17Ci0gICAg bV9pbnNwZWN0b3JDbGllbnQtPnNhdmVTZXNzaW9uU2V0dGluZyhrZXksIHZhbHVlKTsKLX0KLQot dm9pZCBXZWJJbnNwZWN0b3JGcm9udGVuZENsaWVudDo6bG9hZFNlc3Npb25TZXR0aW5nKGNvbnN0 IFN0cmluZyYga2V5LCBTdHJpbmcqIHZhbHVlKQotewotICAgIG1faW5zcGVjdG9yQ2xpZW50LT5s b2FkU2Vzc2lvblNldHRpbmcoa2V5LCB2YWx1ZSk7Ci19Ci0KIHZvaWQgV2ViSW5zcGVjdG9yRnJv bnRlbmRDbGllbnQ6OmNsb3NlV2luZG93V2l0aG91dE5vdGlmaWNhdGlvbnMoKQogewogICAgIGlm ICghbV9mcm9udGVuZEh3bmQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3dpbi9XZWJDb3Jl U3VwcG9ydC9XZWJJbnNwZWN0b3JDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVT dXBwb3J0L1dlYkluc3BlY3RvckNsaWVudC5oCmluZGV4IDYwZGFlYjUuLjZlNjRmMmMgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNsaWVu dC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYkNvcmVTdXBwb3J0L1dlYkluc3BlY3RvckNs aWVudC5oCkBAIC03NSw5ICs3NSw2IEBAIHB1YmxpYzoKICAgICAgICAgcmVsZWFzZUZyb250ZW5k UGFnZSgpOwogICAgIH0KIAotICAgIHZvaWQgc2F2ZVNlc3Npb25TZXR0aW5nKGNvbnN0IFdURjo6 U3RyaW5nJiBrZXksIGNvbnN0IFdURjo6U3RyaW5nJiB2YWx1ZSk7Ci0gICAgdm9pZCBsb2FkU2Vz c2lvblNldHRpbmcoY29uc3QgV1RGOjpTdHJpbmcmIGtleSwgV1RGOjpTdHJpbmcqIHZhbHVlKTsK LQogcHJpdmF0ZToKICAgICB2aXJ0dWFsIH5XZWJJbnNwZWN0b3JDbGllbnQoKTsKICAgICBXVEY6 OlBhc3NPd25QdHI8V2ViQ29yZTo6SW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbDo6U2V0dGlu Z3M+IGNyZWF0ZUZyb250ZW5kU2V0dGluZ3MoKTsKQEAgLTg4LDggKzg1LDYgQEAgcHJpdmF0ZToK ICAgICBIV05EIG1fZnJvbnRlbmRId25kOwogCiAgICAgT3duUHRyPFdlYk5vZGVIaWdobGlnaHQ+ IG1faGlnaGxpZ2h0OwotCi0gICAgV1RGOjpIYXNoTWFwPFdURjo6U3RyaW5nLCBXVEY6OlN0cmlu Zz4gbV9zZXNzaW9uU2V0dGluZ3M7CiB9OwogCiBjbGFzcyBXZWJJbnNwZWN0b3JGcm9udGVuZENs aWVudCA6IHB1YmxpYyBXZWJDb3JlOjpJbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2FsLCBXZWJD b3JlOjpXaW5kb3dNZXNzYWdlTGlzdGVuZXIgewpAQCAtMTEyLDkgKzEwNyw2IEBAIHB1YmxpYzoK ICAgICB2aXJ0dWFsIHZvaWQgc2V0QXR0YWNoZWRXaW5kb3dIZWlnaHQodW5zaWduZWQgaGVpZ2h0 KTsKICAgICB2aXJ0dWFsIHZvaWQgaW5zcGVjdGVkVVJMQ2hhbmdlZChjb25zdCBXVEY6OlN0cmlu ZyYgbmV3VVJMKTsKIAotICAgIHZpcnR1YWwgdm9pZCBzYXZlU2Vzc2lvblNldHRpbmcoY29uc3Qg V1RGOjpTdHJpbmcmIGtleSwgY29uc3QgV1RGOjpTdHJpbmcmIHZhbHVlKTsKLSAgICB2aXJ0dWFs IHZvaWQgbG9hZFNlc3Npb25TZXR0aW5nKGNvbnN0IFdURjo6U3RyaW5nJiBrZXksIFdURjo6U3Ry aW5nKiB2YWx1ZSk7Ci0KIHByaXZhdGU6CiAgICAgdm9pZCBjbG9zZVdpbmRvd1dpdGhvdXROb3Rp ZmljYXRpb25zKCk7CiAgICAgdm9pZCBzaG93V2luZG93V2l0aG91dE5vdGlmaWNhdGlvbnMoKTsK