83162 2012-04-04 08:01:41 -0700 Web Inspector: migrate from InspectorFrontendHost.saveAs to InspectorFrontendHost.save. 2012-04-04 08:49:59 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman abarth apavlov bweinstein dglazkov fishd jamesr joepeck keishi loislo pfeldman pmuellr rik timothy tkent webkit.review.bot yurys oldest_to_newest 595537 0 pfeldman 2012-04-04 08:01:41 -0700 This allows not showing save-as dialog for every content commit, but only for the new files edited / saved. 595542 1 135592 pfeldman 2012-04-04 08:11:31 -0700 Created attachment 135592 Patch 595548 2 webkit.review.bot 2012-04-04 08:14:15 -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. 595558 3 135592 yurys 2012-04-04 08:28:47 -0700 Comment on attachment 135592 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=135592&action=review > Source/WebCore/ChangeLog:8 > + This change adds Save item into the context manus for inspector. It also makes typo: manus -> menus > Source/WebCore/inspector/InspectorFrontendClient.h:63 > + virtual void save(const WTF::String& url, const WTF::String& content, bool saveAs) = 0; saveAs -> forceSaveAs 595572 4 pfeldman 2012-04-04 08:49:59 -0700 Committed r113192: <http://trac.webkit.org/changeset/113192> 135592 2012-04-04 08:11:31 -0700 2012-04-04 08:28:46 -0700 Patch bug-83162-20120404191129.patch text/plain 25813 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzMTgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDVkYmExNmYxZjIyOWI1 YmM1ODEyNzNkYmQwZGU0ZjZhM2I1ZWZiYi4uZjRiOWFkMzBkZDgzNzcwN2NlMjBhZTZmOGJhNWNk NWUzOTVkOGI1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDU3IEBACisyMDEyLTA0LTA0ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IG1pZ3JhdGUgZnJvbSBJbnNwZWN0b3JGcm9udGVuZEhvc3Quc2F2ZUFzIHRvIEluc3BlY3Rv ckZyb250ZW5kSG9zdC5zYXZlLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9ODMxNjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBUaGlzIGNoYW5nZSBhZGRzIFNhdmUgaXRlbSBpbnRvIHRoZSBjb250ZXh0IG1h bnVzIGZvciBpbnNwZWN0b3IuIEl0IGFsc28gbWFrZXMKKyAgICAgICAgc2F2ZUFzIHBhcmFtZXRl ciBvcHRpb25hbCBpbiB0aGUgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LnNhdmUgc28gdGhhdCB3ZSBj b3VsZAorICAgICAgICBza2lwIHRoZSBkaWFsb2cgZm9yIHRoZSBwYXRocyB0aGF0IHdlcmUgYWxy ZWFkeSBzYXZlZC4gRW1iZWRkZXIgdGVsbHMgdGhlIGZyb250LWVuZAorICAgICAgICB3aGF0IHVy bHMgd2VyZSBzdWNjZXNzZnVsbHkgc2F2ZWQgc28gdGhhdCBmcm9udC1lbmQgY291bGQgaXNzdWUg c3Vic2VxdWVudCBzYXZlIGNvbW1hbmRzCisgICAgICAgIGZvciB0aG9zZSBmaWxlcy4KKworICAg ICAgICAqIEVuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKyAgICAgICAgKiBpbnNw ZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRDbGllbnQuaDoKKyAgICAgICAgKEluc3BlY3RvckZyb250 ZW5kQ2xpZW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRM b2NhbC5oOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbDo6 Y2FuU2F2ZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JGcm9udGVuZENsaWVudExvY2Fs OjpzYXZlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvckZyb250ZW5kSG9zdDo6Y2FuU2F2ZSk6CisgICAg ICAgIChXZWJDb3JlOjpJbnNwZWN0b3JGcm9udGVuZEhvc3Q6OnNhdmUpOgorICAgICAgICAqIGlu c3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuaDoKKyAgICAgICAgKEluc3BlY3RvckZyb250 ZW5kSG9zdCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5pZGw6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9JbnNwZWN0b3JGcm9udGVuZEhvc3RTdHVi LmpzOgorICAgICAgICAoLldlYkluc3BlY3Rvci5JbnNwZWN0b3JGcm9udGVuZEhvc3RTdHViLnBy b3RvdHlwZS5jYW5TYXZlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFTY3Jp cHRTb3VyY2VGcmFtZS5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQ YW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrTG9nVmlldy5wcm90b3R5cGUu X2NvbnRleHRNZW51KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrTG9nVmlldy5wcm90 b3R5cGUuX2V4cG9ydEFsbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0xvZ1ZpZXcu cHJvdG90eXBlLl9leHBvcnRSZXNvdXJjZSk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9SZXNvdXJjZVZpZXcuanM6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJj ZXNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GcmFtZVJlc291cmNlVHJlZUVsZW1l bnQucHJvdG90eXBlLl9hcHBlbmRTYXZlQXNBY3Rpb24uZG9TYXZlKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5GcmFtZVJlc291cmNlVHJlZUVsZW1lbnQucHJvdG90eXBlLl9hcHBlbmRTYXZlQXNB Y3Rpb24uc2F2ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRnJhbWVSZXNvdXJjZVRyZWVFbGVt ZW50LnByb3RvdHlwZS5fYXBwZW5kU2F2ZUFzQWN0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5SZXNvdXJjZVJldmlzaW9uVHJlZUVsZW1lbnQucHJvdG90eXBlLl9oYW5kbGVDb250ZXh0TWVu dUV2ZW50LmRvU2F2ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VSZXZpc2lvblRy ZWVFbGVtZW50LnByb3RvdHlwZS5faGFuZGxlQ29udGV4dE1lbnVFdmVudC5zYXZlKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVJldmlzaW9uVHJlZUVsZW1lbnQucHJvdG90eXBlLl9o YW5kbGVDb250ZXh0TWVudUV2ZW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Nl dHRpbmdzLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4dFZpZXdlckRlbGVnYXRlRm9yU291cmNlRnJhbWUu cHJvdG90eXBlLnBvcHVsYXRlVGV4dEFyZWFDb250ZXh0TWVudSk6CisgICAgICAgICogaW5zcGVj dG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRleHRW aWV3ZXIucHJvdG90eXBlLl9jb250ZXh0TWVudSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGV4 dFZpZXdlci5wcm90b3R5cGUuX2NvbW1pdEVkaXRpbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlRleHRWaWV3ZXJEZWxlZ2F0ZS5wcm90b3R5cGUucG9wdWxhdGVUZXh0QXJlYUNvbnRleHRNZW51 KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lTW9kZWwuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVNb2RlbC5wcm90b3R5cGUuc2F2ZVRvRmlsZSk6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlLl9yZWdpc3RlclNob3J0Y3V0cyk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUuX2NvbnRleHRN ZW51KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKwogMjAx Mi0wNC0wNCAgQWxsYW4gU2FuZGZlbGQgSmVuc2VuICA8YWxsYW4uamVuc2VuQG5va2lhLmNvbT4K IAogICAgICAgICBCZXN0IHpvb21hYmxlIGFyZWEgZG9lcyBub3QgYmFsYW5jZSBpbnRlcnNlY3Rp b24gd2l0aCB0YXJnZXQgYXJlYS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggYjgxZjg4 NzJjZmYwMmMyOWM4ZDVmYWRkYWI0NjRmZjE2MTRmN2RmMC4uM2FkMWY3ZmJhMDQ1OGQ3OTk1NWRh MGRjMTU3MmQxMTJkOWU4MTM4ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNyBAQAorMjAxMi0wNC0wNCAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9y Zz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBtaWdyYXRlIGZyb20gSW5zcGVjdG9yRnJvbnRl bmRIb3N0LnNhdmVBcyB0byBJbnNwZWN0b3JGcm9udGVuZEhvc3Quc2F2ZS4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgzMTYyCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwdWJsaWMvV2ViRGV2VG9vbHNG cm9udGVuZENsaWVudC5oOgorICAgICAgICAqIHNyYy9JbnNwZWN0b3JGcm9udGVuZENsaWVudElt cGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpJbnNwZWN0b3JGcm9udGVuZENsaWVudEltcGw6OmNh blNhdmUpOgorICAgICAgICAoV2ViS2l0OjpJbnNwZWN0b3JGcm9udGVuZENsaWVudEltcGw6OnNh dmUpOgorICAgICAgICAqIHNyYy9JbnNwZWN0b3JGcm9udGVuZENsaWVudEltcGwuaDoKKyAgICAg ICAgKEluc3BlY3RvckZyb250ZW5kQ2xpZW50SW1wbCk6CisKIDIwMTItMDQtMDQgIEhhbnMgV2Vu bmJvcmcgIDxoYW5zQGNocm9taXVtLm9yZz4KIAogICAgICAgICBXZWJTcGVlY2hSZWNvZ25pemVy Lmg6IGFkZCBtaXNzaW5nIGZvcndhcmQgZGVjbGFyYXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJDb3Jl L0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCA0MzhkMDhhZWI1ZTUzMDMy NTQ1ZTdkOWM0NDkxMDRlOTI5YjM1NjViLi42OTQ2NmVhYjY5ODZmZGI1NGUxOGJjNzQzNTAyMDNm ZjMzNDBhOTc3IDEwMDY0NApHSVQgYmluYXJ5IHBhdGNoCmRlbHRhIDM5CnZjbWNjY2hoXkdkbVdD O2VydEhCQ2k0MHs3c2dvUCpNSkdRdCkwKHtoMkc3KTVNenlXIWo0eTJnR3hpVFIKCmRlbHRhIDE5 CmJjbWJSQ20qdjdBbVdDO2VyanomSTtNdjtGJFpyUCNVP1RgfQoKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZENsaWVudC5oIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kQ2xpZW50LmgKaW5kZXggZWFkM2VlODAy YzczNzI0ODFhODkwNTFlZjMzZDYxYjc0ZGUxNGZkMS4uZDc1NmMyOWViZmY3ZTYwNzJlYzE0YjUx Y2NiMGI2OGUzNzNkM2Q2ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckZyb250ZW5kQ2xpZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvckZyb250ZW5kQ2xpZW50LmgKQEAgLTU5LDggKzU5LDggQEAgcHVibGljOgogICAgIHZp cnR1YWwgdm9pZCByZXF1ZXN0U2V0RG9ja1NpZGUoY29uc3QgU3RyaW5nJikgPSAwOwogICAgIHZp cnR1YWwgdm9pZCBjaGFuZ2VBdHRhY2hlZFdpbmRvd0hlaWdodCh1bnNpZ25lZCkgPSAwOwogICAg IHZpcnR1YWwgdm9pZCBvcGVuSW5OZXdUYWIoY29uc3QgU3RyaW5nJiB1cmwpID0gMDsKLSAgICB2 aXJ0dWFsIGJvb2wgY2FuU2F2ZUFzKCkgPSAwOwotICAgIHZpcnR1YWwgdm9pZCBzYXZlQXMoY29u c3QgV1RGOjpTdHJpbmcmIGZpbGVOYW1lLCBjb25zdCBXVEY6OlN0cmluZyYgY29udGVudCkgPSAw OworICAgIHZpcnR1YWwgYm9vbCBjYW5TYXZlKCkgPSAwOworICAgIHZpcnR1YWwgdm9pZCBzYXZl KGNvbnN0IFdURjo6U3RyaW5nJiB1cmwsIGNvbnN0IFdURjo6U3RyaW5nJiBjb250ZW50LCBib29s IHNhdmVBcykgPSAwOwogCiAgICAgdmlydHVhbCB2b2lkIGluc3BlY3RlZFVSTENoYW5nZWQoY29u c3QgU3RyaW5nJikgPSAwOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yRnJvbnRlbmRDbGllbnRMb2NhbC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvckZyb250ZW5kQ2xpZW50TG9jYWwuaAppbmRleCBjNDllNTc4M2UxMjg0OGQyZTMw MDM0MzBkMWI2Yzk0YTA5ZmUyZDAwLi5mNGVlZmY3YmUxOThiZTc2YTY5YTc4OWU1NDdjMTZjYzBj YWQyZjJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJv bnRlbmRDbGllbnRMb2NhbC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JGcm9udGVuZENsaWVudExvY2FsLmgKQEAgLTY4LDggKzY4LDggQEAgcHVibGljOgogICAgIHZp cnR1YWwgdm9pZCByZXF1ZXN0U2V0RG9ja1NpZGUoY29uc3QgU3RyaW5nJikgeyB9CiAgICAgdmly dHVhbCB2b2lkIGNoYW5nZUF0dGFjaGVkV2luZG93SGVpZ2h0KHVuc2lnbmVkKTsKICAgICB2aXJ0 dWFsIHZvaWQgb3BlbkluTmV3VGFiKGNvbnN0IFN0cmluZyYgdXJsKTsKLSAgICB2aXJ0dWFsIGJv b2wgY2FuU2F2ZUFzKCkgeyByZXR1cm4gZmFsc2U7IH0KLSAgICB2aXJ0dWFsIHZvaWQgc2F2ZUFz KGNvbnN0IFN0cmluZyYsIGNvbnN0IFN0cmluZyYpIHsgfQorICAgIHZpcnR1YWwgYm9vbCBjYW5T YXZlKCkgeyByZXR1cm4gZmFsc2U7IH0KKyAgICB2aXJ0dWFsIHZvaWQgc2F2ZShjb25zdCBTdHJp bmcmLCBjb25zdCBTdHJpbmcmLCBib29sKSB7IH0KIAogICAgIHZpcnR1YWwgdm9pZCBhdHRhY2hX aW5kb3coKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRldGFjaFdpbmRvdygpID0gMDsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JGcm9udGVuZEhvc3QuY3Bw IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5jcHAKaW5k ZXggZTE4ODM3ZDg3M2U1NzhlNjVkMjUxMTQxNGM4ZmQzM2Y4M2VlNzYyMi4uMzYwNjJkYjcxYjQ4 NDEwZWM3MTA1NmJkZjNjOWE1OTUxNjk1Yjg2OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5jcHAKQEAgLTIzMiwxNyArMjMyLDE3IEBA IHZvaWQgSW5zcGVjdG9yRnJvbnRlbmRIb3N0OjpvcGVuSW5OZXdUYWIoY29uc3QgU3RyaW5nJiB1 cmwpCiAgICAgICAgIG1fY2xpZW50LT5vcGVuSW5OZXdUYWIodXJsKTsKIH0KIAotYm9vbCBJbnNw ZWN0b3JGcm9udGVuZEhvc3Q6OmNhblNhdmVBcygpCitib29sIEluc3BlY3RvckZyb250ZW5kSG9z dDo6Y2FuU2F2ZSgpCiB7CiAgICAgaWYgKG1fY2xpZW50KQotICAgICAgICByZXR1cm4gbV9jbGll bnQtPmNhblNhdmVBcygpOworICAgICAgICByZXR1cm4gbV9jbGllbnQtPmNhblNhdmUoKTsKICAg ICByZXR1cm4gZmFsc2U7CiB9CiAKLXZvaWQgSW5zcGVjdG9yRnJvbnRlbmRIb3N0OjpzYXZlQXMo Y29uc3QgU3RyaW5nJiBmaWxlTmFtZSwgY29uc3QgU3RyaW5nJiBjb250ZW50KQordm9pZCBJbnNw ZWN0b3JGcm9udGVuZEhvc3Q6OnNhdmUoY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYg Y29udGVudCwgYm9vbCBzYXZlQXMpCiB7CiAgICAgaWYgKG1fY2xpZW50KQotICAgICAgICBtX2Ns aWVudC0+c2F2ZUFzKGZpbGVOYW1lLCBjb250ZW50KTsKKyAgICAgICAgbV9jbGllbnQtPnNhdmUo dXJsLCBjb250ZW50LCBzYXZlQXMpOwogfQogCiB2b2lkIEluc3BlY3RvckZyb250ZW5kSG9zdDo6 c2VuZE1lc3NhZ2VUb0JhY2tlbmQoY29uc3QgU3RyaW5nJiBtZXNzYWdlKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5oIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5oCmluZGV4IDE3ZDlkMzI3 NmVhMzVjM2QxYzYyMTE1NDY0OGZjNWY4MzEyMzAwZTAuLmM1ZGVkNDliYjBkNTk0NWMzMDVhZjdi ZjU1ZDhiMDUwNTA4MmE3ZjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JGcm9udGVuZEhvc3QuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yRnJvbnRlbmRIb3N0LmgKQEAgLTc1LDggKzc1LDggQEAgcHVibGljOgogCiAgICAgdm9p ZCBjb3B5VGV4dChjb25zdCBTdHJpbmcmIHRleHQpOwogICAgIHZvaWQgb3BlbkluTmV3VGFiKGNv bnN0IFN0cmluZyYgdXJsKTsKLSAgICBib29sIGNhblNhdmVBcygpOwotICAgIHZvaWQgc2F2ZUFz KGNvbnN0IFN0cmluZyYgZmlsZU5hbWUsIGNvbnN0IFN0cmluZyYgY29udGVudCk7CisgICAgYm9v bCBjYW5TYXZlKCk7CisgICAgdm9pZCBzYXZlKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJp bmcmIGNvbnRlbnQsIGJvb2wgc2F2ZUFzKTsKIAogICAgIC8vIENhbGxlZCBmcm9tIFtDdXN0b21d IGltcGxlbWVudGF0aW9ucy4KICAgICB2b2lkIHNob3dDb250ZXh0TWVudShFdmVudCosIGNvbnN0 IFZlY3RvcjxDb250ZXh0TWVudUl0ZW0qPiYgaXRlbXMpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckZyb250ZW5kSG9zdC5pZGwgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmlkbAppbmRleCAxMTI3YzNiODM1MzE4 NDRmZjE5YTY2NGVjNDc1ZmMwNWJlMmE1ZjUxLi5hZWQ0ZmE4N2UxYTdkYTA2YTc5N2M2OGVmMTNj YzY4ZTZkYzcyMTM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yRnJvbnRlbmRIb3N0LmlkbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yRnJvbnRlbmRIb3N0LmlkbApAQCAtNTIsOCArNTIsOCBAQCBtb2R1bGUgY29yZSB7CiAKICAg ICAgICAgdm9pZCBjb3B5VGV4dChpbiBET01TdHJpbmcgdGV4dCk7CiAgICAgICAgIHZvaWQgb3Bl bkluTmV3VGFiKGluIERPTVN0cmluZyB1cmwpOwotICAgICAgICBib29sZWFuIGNhblNhdmVBcygp OwotICAgICAgICB2b2lkIHNhdmVBcyhpbiBET01TdHJpbmcgZmlsZU5hbWUsIGluIERPTVN0cmlu ZyBjb250ZW50KTsKKyAgICAgICAgYm9vbGVhbiBjYW5TYXZlKCk7CisgICAgICAgIHZvaWQgc2F2 ZShpbiBET01TdHJpbmcgdXJsLCBpbiBET01TdHJpbmcgY29udGVudCwgaW4gYm9vbGVhbiBzYXZl QXMpOwogCiAgICAgICAgIFtDdXN0b21dIERPTVN0cmluZyBwbGF0Zm9ybSgpOwogICAgICAgICBb Q3VzdG9tXSBET01TdHJpbmcgcG9ydCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9JbnNwZWN0b3JGcm9udGVuZEhvc3RTdHViLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9JbnNwZWN0b3JGcm9udGVuZEhvc3RTdHViLmpzCmlu ZGV4IGFjMzE0YTRlYjA0NzE0ZTBlOTI3MjM3YzUwODEyOTYwMDA1MGZjZjEuLjhkYzNlMzc4MGRi OGVlM2NkNWM4OTRhYjFmZjU0Yzk1MDg0Nzk3ZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvSW5zcGVjdG9yRnJvbnRlbmRIb3N0U3R1Yi5qcworKysgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0luc3BlY3RvckZyb250ZW5kSG9zdFN0 dWIuanMKQEAgLTExOCwxMiArMTE4LDEyIEBAIFdlYkluc3BlY3Rvci5JbnNwZWN0b3JGcm9udGVu ZEhvc3RTdHViLnByb3RvdHlwZSA9IHsKICAgICAgICAgd2luZG93Lm9wZW4odXJsLCAiX2JsYW5r Iik7CiAgICAgfSwKIAotICAgIGNhblNhdmVBczogZnVuY3Rpb24oZmlsZU5hbWUsIGNvbnRlbnQp CisgICAgY2FuU2F2ZTogZnVuY3Rpb24oKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRydWU7CiAg ICAgfSwKIAotICAgIHNhdmVBczogZnVuY3Rpb24oZmlsZU5hbWUsIGNvbnRlbnQpCisgICAgc2F2 ZTogZnVuY3Rpb24odXJsLCBjb250ZW50LCBzYXZlQXMpCiAgICAgewogICAgICAgICB2YXIgYnVp bGRlciA9IG5ldyBXZWJLaXRCbG9iQnVpbGRlcigpOwogICAgICAgICBidWlsZGVyLmFwcGVuZChj b250ZW50KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv SmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9KYXZhU2NyaXB0U291cmNlRnJhbWUuanMKaW5kZXggYjNmZGU5ZDA1OGZhMGYzMWQyYzcy ZTI4MTg4ZWM2ZmNjZjg0ZmU5OC4uYjVlMzlmOWE3NGQwODI0YmNkMTliZjMzOWNlODI3NDgzNTIw OTNjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9KYXZh U2NyaXB0U291cmNlRnJhbWUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9KYXZhU2NyaXB0U291cmNlRnJhbWUuanMKQEAgLTg0LDExICs4NCw2IEBAIFdlYkluc3Bl Y3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlID0gewogICAgICAgICByZXR1cm4g dGhpcy5fbW9kZWwuY2FuRWRpdFNjcmlwdFNvdXJjZSh0aGlzLl91aVNvdXJjZUNvZGUpOwogICAg IH0sCiAKLSAgICBzdWdnZXN0ZWRGaWxlTmFtZTogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAg cmV0dXJuIHRoaXMuX3VpU291cmNlQ29kZS5maWxlTmFtZSB8fCAidW50aXRsZWQuanMiOwotICAg IH0sCi0KICAgICBlZGl0Q29udGVudDogZnVuY3Rpb24obmV3Q29udGVudCwgY2FsbGJhY2spCiAg ICAgewogICAgICAgICB0aGlzLl9lZGl0aW5nQ29udGVudCA9IHRydWU7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCmluZGV4IDNmZmQ0 YmM2OWQ0NzBhZGU5NTI0NTJmYjk4MjMyOTkxMjI0OTRlZGQuLjQ4NWQxZjNlZmNhOGU0MDcwMDEy N2YzMTg2Y2QxZGVkYTM5OTc0MDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvTmV0d29ya1BhbmVsLmpzCkBAIC05NDcsNyArOTQ3LDcgQEAgV2ViSW5zcGVj dG9yLk5ldHdvcmtMb2dWaWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogICAgICAgICBjb250 ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZyhXZWJJbnNwZWN0b3IudXNl TG93ZXJDYXNlTWVudVRpdGxlcygpID8gIkNvcHkgYWxsIGFzIEhBUiIgOiAiQ29weSBBbGwgYXMg SEFSIiksIHRoaXMuX2NvcHlBbGwuYmluZCh0aGlzKSk7CiAKLSAgICAgICAgaWYgKEluc3BlY3Rv ckZyb250ZW5kSG9zdC5jYW5TYXZlQXMoKSkgeworICAgICAgICBpZiAoSW5zcGVjdG9yRnJvbnRl bmRIb3N0LmNhblNhdmUoKSkgewogICAgICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kU2VwYXJh dG9yKCk7CiAgICAgICAgICAgICBpZiAocmVzb3VyY2UpCiAgICAgICAgICAgICAgICAgY29udGV4 dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoV2ViSW5zcGVjdG9yLnVzZUxv d2VyQ2FzZU1lbnVUaXRsZXMoKSA/ICJTYXZlIGVudHJ5IGFzIEhBUiIgOiAiU2F2ZSBFbnRyeSBh cyBIQVIiKSwgdGhpcy5fZXhwb3J0UmVzb3VyY2UuYmluZCh0aGlzLCByZXNvdXJjZSkpOwpAQCAt OTk5LDEzICs5OTksMTMgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtMb2dWaWV3LnByb3RvdHlwZSA9 IHsKICAgICAgICAgICAgIGxvZzogKG5ldyBXZWJJbnNwZWN0b3IuSEFSTG9nKHRoaXMuX3Jlc291 cmNlcykpLmJ1aWxkKCkKICAgICAgICAgfTsKICAgICAgICAgCi0gICAgICAgIEluc3BlY3RvckZy b250ZW5kSG9zdC5zYXZlQXMoV2ViSW5zcGVjdG9yLmluc3BlY3RlZFBhZ2VEb21haW4gKyAiLmhh ciIsIEpTT04uc3RyaW5naWZ5KGhhckFyY2hpdmUsIG51bGwsIDIpKTsKKyAgICAgICAgSW5zcGVj dG9yRnJvbnRlbmRIb3N0LnNhdmUoV2ViSW5zcGVjdG9yLmluc3BlY3RlZFBhZ2VEb21haW4gKyAi LmhhciIsIEpTT04uc3RyaW5naWZ5KGhhckFyY2hpdmUsIG51bGwsIDIpLCB0cnVlKTsKICAgICB9 LAogCiAgICAgX2V4cG9ydFJlc291cmNlOiBmdW5jdGlvbihyZXNvdXJjZSkKICAgICB7CiAgICAg ICAgIHZhciBoYXIgPSAobmV3IFdlYkluc3BlY3Rvci5IQVJFbnRyeShyZXNvdXJjZSkpLmJ1aWxk KCk7Ci0gICAgICAgIEluc3BlY3RvckZyb250ZW5kSG9zdC5zYXZlQXMocmVzb3VyY2UuZGlzcGxh eU5hbWUgKyAiLmhhciIsIEpTT04uc3RyaW5naWZ5KGhhciwgbnVsbCwgMikpOworICAgICAgICBJ bnNwZWN0b3JGcm9udGVuZEhvc3Quc2F2ZShyZXNvdXJjZS5kaXNwbGF5TmFtZSArICIuaGFyIiwg SlNPTi5zdHJpbmdpZnkoaGFyLCBudWxsLCAyKSwgdHJ1ZSk7CiAgICAgfSwKIAogICAgIF9jbGVh ckJyb3dzZXJDYWNoZTogZnVuY3Rpb24oZXZlbnQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVmlldy5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VWaWV3LmpzCmluZGV4IDhkY2RkZTkzOTExYjEwNWZi NjU0Yzk5NGQ3MDA0NjQ0NzJhNzA5NTkuLjJjMTgzYTk3OWNhMmM5YzVhYzVlYWUwYTM2Y2E0Mjk3 NWI4YmEzZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv UmVzb3VyY2VWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv UmVzb3VyY2VWaWV3LmpzCkBAIC0xMTYsMTEgKzExNiw2IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJj ZVNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5yZXNvdXJjZS5yZXF1ZXN0 Q29udGVudChjb250ZW50TG9hZGVkLmJpbmQodGhpcykpOwogICAgIH0sCiAKLSAgICBzdWdnZXN0 ZWRGaWxlTmFtZTogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMucmVzb3Vy Y2UuZGlzcGxheU5hbWU7Ci0gICAgfSwKLQogICAgIF9jb250ZW50Q2hhbmdlZDogZnVuY3Rpb24o ZXZlbnQpCiAgICAgewogICAgICAgICB0aGlzLnNldENvbnRlbnQoV2ViSW5zcGVjdG9yLlJlc291 cmNlU291cmNlRnJhbWUubWltZVR5cGVGb3JSZXNvdXJjZVt0aGlzLl9yZXNvdXJjZV0sIHRoaXMu X3Jlc291cmNlLmNvbnRlbnQpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9SZXNvdXJjZXNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvUmVzb3VyY2VzUGFuZWwuanMKaW5kZXggZDBhYTE2ODkyZjdmN2ZlM2NkM2MxZGJh NTFmNWMwNmRlZjYzZGZmOS4uYzEwMWFhMjUwNDYyNTU1NTBiN2Y1Y2E4YmI0YmJkN2I4MTBkMTU1 OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJj ZXNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291 cmNlc1BhbmVsLmpzCkBAIC0xMjY3LDcgKzEyNjcsNyBAQCBXZWJJbnNwZWN0b3IuRnJhbWVSZXNv dXJjZVRyZWVFbGVtZW50LnByb3RvdHlwZSA9IHsKIAogICAgIF9hcHBlbmRTYXZlQXNBY3Rpb246 IGZ1bmN0aW9uKGNvbnRleHRNZW51LCBldmVudCkKICAgICB7Ci0gICAgICAgIGlmICghSW5zcGVj dG9yRnJvbnRlbmRIb3N0LmNhblNhdmVBcygpKQorICAgICAgICBpZiAoIUluc3BlY3RvckZyb250 ZW5kSG9zdC5jYW5TYXZlKCkpCiAgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgaWYgKHRo aXMuX3Jlc291cmNlLnR5cGUgIT09IFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBlLkRvY3VtZW50 ICYmCkBAIC0xMjc1LDE0ICsxMjc1LDE5IEBAIFdlYkluc3BlY3Rvci5GcmFtZVJlc291cmNlVHJl ZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICAgICAgdGhpcy5fcmVzb3VyY2UudHlwZSAh PT0gV2ViSW5zcGVjdG9yLlJlc291cmNlLlR5cGUuU2NyaXB0KQogICAgICAgICAgICAgcmV0dXJu OwogCi0gICAgICAgIGZ1bmN0aW9uIHNhdmUoKQorICAgICAgICBmdW5jdGlvbiBkb1NhdmUoc2F2 ZUFzLCBjb250ZW50KQogICAgICAgICB7Ci0gICAgICAgICAgICB2YXIgZmlsZU5hbWUgPSB0aGlz Ll9yZXNvdXJjZS5kaXNwbGF5TmFtZTsKLSAgICAgICAgICAgIHRoaXMuX3Jlc291cmNlLnJlcXVl c3RDb250ZW50KEluc3BlY3RvckZyb250ZW5kSG9zdC5zYXZlQXMuYmluZChJbnNwZWN0b3JGcm9u dGVuZEhvc3QsIGZpbGVOYW1lKSk7CisgICAgICAgICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3Qu c2F2ZSh0aGlzLl9yZXNvdXJjZS51cmwsIGNvbnRlbnQsIHNhdmVBcyk7CisgICAgICAgIH0KKwor ICAgICAgICBmdW5jdGlvbiBzYXZlKHNhdmVBcykKKyAgICAgICAgeworICAgICAgICAgICAgdGhp cy5fcmVzb3VyY2UucmVxdWVzdENvbnRlbnQoZG9TYXZlLmJpbmQodGhpcywgc2F2ZUFzKSk7CiAg ICAgICAgIH0KIAogICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRTZXBhcmF0b3IoKTsKLSAgICAg ICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoV2ViSW5zcGVj dG9yLnVzZUxvd2VyQ2FzZU1lbnVUaXRsZXMoKSA/ICJTYXZlIGFzLi4uIiA6ICJTYXZlIEFzLi4u IiksIHNhdmUuYmluZCh0aGlzKSk7CisgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2Vi SW5zcGVjdG9yLlVJU3RyaW5nKCJTYXZlIiksIHNhdmUuYmluZCh0aGlzLCBmYWxzZSkpOworICAg ICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZyhXZWJJbnNw ZWN0b3IudXNlTG93ZXJDYXNlTWVudVRpdGxlcygpID8gIlNhdmUgYXMuLi4iIDogIlNhdmUgQXMu Li4iKSwgc2F2ZS5iaW5kKHRoaXMsIHRydWUpKTsKICAgICB9LAogCiAgICAgX3NldEJ1YmJsZVRl eHQ6IGZ1bmN0aW9uKHgpCkBAIC0yMDU0LDE0ICsyMDU5LDIwIEBAIFdlYkluc3BlY3Rvci5SZXNv dXJjZVJldmlzaW9uVHJlZUVsZW1lbnQucHJvdG90eXBlID0gewogICAgICAgICB2YXIgY29udGV4 dE1lbnUgPSBuZXcgV2ViSW5zcGVjdG9yLkNvbnRleHRNZW51KCk7CiAgICAgICAgIGNvbnRleHRN ZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZXZlcnQgdG8gdGhpcyByZXZp c2lvbiIpLCB0aGlzLl9yZXZpc2lvbi5yZXZlcnRUb1RoaXMuYmluZCh0aGlzLl9yZXZpc2lvbikp OwogCi0gICAgICAgIGlmIChJbnNwZWN0b3JGcm9udGVuZEhvc3QuY2FuU2F2ZUFzKCkpIHsKLSAg ICAgICAgICAgIGZ1bmN0aW9uIHNhdmUoKQorICAgICAgICBpZiAoSW5zcGVjdG9yRnJvbnRlbmRI b3N0LmNhblNhdmUoKSkgeworICAgICAgICAgICAgZnVuY3Rpb24gZG9TYXZlKHNhdmVBcywgY29u dGVudCkKICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICB2YXIgZmlsZU5hbWUgPSB0aGlz Ll9yZXZpc2lvbi5yZXNvdXJjZS5kaXNwbGF5TmFtZTsKLSAgICAgICAgICAgICAgICB0aGlzLl9y ZXZpc2lvbi5yZXF1ZXN0Q29udGVudChJbnNwZWN0b3JGcm9udGVuZEhvc3Quc2F2ZUFzLmJpbmQo SW5zcGVjdG9yRnJvbnRlbmRIb3N0LCBmaWxlTmFtZSkpOworICAgICAgICAgICAgICAgIEluc3Bl Y3RvckZyb250ZW5kSG9zdC5zYXZlKHRoaXMuX3JldmlzaW9uLnJlc291cmNlLnVybCwgY29udGVu dCwgc2F2ZUFzKTsKICAgICAgICAgICAgIH0KKworICAgICAgICAgICAgZnVuY3Rpb24gc2F2ZShz YXZlQXMpCisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgdGhpcy5fcmV2aXNpb24ucmVx dWVzdENvbnRlbnQoZG9TYXZlLmJpbmQodGhpcywgc2F2ZUFzKSk7CisgICAgICAgICAgICB9CisK ICAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZFNlcGFyYXRvcigpOwotICAgICAgICAgICAg Y29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoV2ViSW5zcGVjdG9y LnVzZUxvd2VyQ2FzZU1lbnVUaXRsZXMoKSA/ICJTYXZlIGFzLi4uIiA6ICJTYXZlIEFzLi4uIiks IHNhdmUuYmluZCh0aGlzKSk7CisgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdl Ykluc3BlY3Rvci5VSVN0cmluZygiU2F2ZSIpLCBzYXZlLmJpbmQodGhpcywgZmFsc2UpKTsKKyAg ICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdl Ykluc3BlY3Rvci51c2VMb3dlckNhc2VNZW51VGl0bGVzKCkgPyAiU2F2ZSBhcy4uLiIgOiAiU2F2 ZSBBcy4uLiIpLCBzYXZlLmJpbmQodGhpcywgdHJ1ZSkpOwogICAgICAgICB9CiAKICAgICAgICAg Y29udGV4dE1lbnUuc2hvdyhldmVudCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9TZXR0aW5ncy5qcwppbmRleCA1MGM0MjNmMzhiNTA2YjczNjI0ZTY1MmFmZGYyMzA4 NjcwNTk3ZmIxLi45MzQyY2I1MzhlMGI1NmI0Njg1ZjA3YTczNGUyNGI4OGJhNDliY2QzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3MuanMKQEAgLTkz LDYgKzkzLDcgQEAgV2ViSW5zcGVjdG9yLlNldHRpbmdzID0gZnVuY3Rpb24oKQogICAgIHRoaXMu ZW11bGF0ZVRvdWNoRXZlbnRzID0gdGhpcy5jcmVhdGVTZXR0aW5nKCJlbXVsYXRlVG91Y2hFdmVu dHMiLCBmYWxzZSk7CiAgICAgdGhpcy5zaG93UGFpbnRSZWN0cyA9IHRoaXMuY3JlYXRlU2V0dGlu Zygic2hvd1BhaW50UmVjdHMiLCBmYWxzZSk7CiAgICAgdGhpcy56b29tTGV2ZWwgPSB0aGlzLmNy ZWF0ZVNldHRpbmcoInpvb21MZXZlbCIsIDApOworICAgIHRoaXMuc2F2ZWRVUkxzID0gdGhpcy5j cmVhdGVTZXR0aW5nKCJzYXZlZFVSTHMiLCB7fSk7CiAKICAgICAvLyBJZiB0aGVyZSBhcmUgdG9v IG1hbnkgYnJlYWtwb2ludHMgaW4gYSBzdG9yYWdlLCBpdCBpcyBsaWtlbHkgZHVlIHRvIGEgcmVj ZW50IGJ1ZyB0aGF0IGNhdXNlZAogICAgIC8vIHBlcmlvZGljYWwgYnJlYWtwb2ludHMgZHVwbGlj YXRpb24gbGVhZGluZyB0byBpbnNwZWN0b3Igc2xvd25lc3MuCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NvdXJjZUZyYW1lLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcwppbmRleCBlNjQyMjk0OWY3ZTFj MmRiMTA5MzY0NjEzY2JjNTYyOWYwOGJmZGJiLi5hNmE5OTZhYzE0YmQzYjk2MDZjZWE5ZjMyNzY4 Y2E3NWNmNDQzMzZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1NvdXJjZUZyYW1lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU291cmNlRnJhbWUuanMKQEAgLTQ3NiwxMCArNDc2LDYgQEAgV2ViSW5zcGVjdG9yLlNvdXJj ZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgV2ViSW5zcGVjdG9yLnBvcHVsYXRlUmVzb3Vy Y2VDb250ZXh0TWVudShjb250ZXh0TWVudSwgdGhpcy5fdXJsLCBsaW5lTnVtYmVyKTsKICAgICB9 LAogCi0gICAgc3VnZ2VzdGVkRmlsZU5hbWU6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgfSwKLQog ICAgIGluaGVyaXRTY3JvbGxQb3NpdGlvbnM6IGZ1bmN0aW9uKHNvdXJjZUZyYW1lKQogICAgIHsK ICAgICAgICAgdGhpcy5fdGV4dFZpZXdlci5pbmhlcml0U2Nyb2xsUG9zaXRpb25zKHNvdXJjZUZy YW1lLl90ZXh0Vmlld2VyKTsKQEAgLTU0OSwxMSArNTQ1LDYgQEAgV2ViSW5zcGVjdG9yLlRleHRW aWV3ZXJEZWxlZ2F0ZUZvclNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICBwb3B1bGF0ZVRl eHRBcmVhQ29udGV4dE1lbnU6IGZ1bmN0aW9uKGNvbnRleHRNZW51LCBsaW5lTnVtYmVyKQogICAg IHsKICAgICAgICAgdGhpcy5fc291cmNlRnJhbWUucG9wdWxhdGVUZXh0QXJlYUNvbnRleHRNZW51 KGNvbnRleHRNZW51LCBsaW5lTnVtYmVyKTsKLSAgICB9LAotCi0gICAgc3VnZ2VzdGVkRmlsZU5h bWU6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9zb3VyY2VGcmFtZS5z dWdnZXN0ZWRGaWxlTmFtZSgpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9UZXh0Vmlld2VyLmpzCmluZGV4IGI3Y2ZhMGIxMGM5ZDIwZTBkZGY1 MGE4YjVjMWE3MmY1MDJhZGY5MTcuLmY1ZmZhYWI1YTc4OTUzNzJlZDVhNGFmZGVkNWZkOWRkOGE4 MjkzMGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGV4 dFZpZXdlci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RleHRW aWV3ZXIuanMKQEAgLTQyLDcgKzQyLDcgQEAgV2ViSW5zcGVjdG9yLlRleHRWaWV3ZXIgPSBmdW5j dGlvbih0ZXh0TW9kZWwsIHBsYXRmb3JtLCB1cmwsIGRlbGVnYXRlKQogICAgIHRoaXMuX3RleHRN b2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UZXh0RWRpdG9yTW9kZWwuRXZlbnRz LlRleHRDaGFuZ2VkLCB0aGlzLl90ZXh0Q2hhbmdlZCwgdGhpcyk7CiAgICAgdGhpcy5fdGV4dE1v ZGVsLnJlc2V0VW5kb1N0YWNrKCk7CiAgICAgdGhpcy5fZGVsZWdhdGUgPSBkZWxlZ2F0ZTsKLQor ICAgIHRoaXMuX3VybCA9IHVybDsKICAgICB0aGlzLmVsZW1lbnQuY2xhc3NOYW1lID0gInRleHQt ZWRpdG9yIG1vbm9zcGFjZSI7CiAKICAgICB2YXIgZW50ZXJUZXh0Q2hhbmdlTW9kZSA9IHRoaXMu X2VudGVySW50ZXJuYWxUZXh0Q2hhbmdlTW9kZS5iaW5kKHRoaXMpOwpAQCAtMjkwLDkgKzI5MCwx MCBAQCBXZWJJbnNwZWN0b3IuVGV4dFZpZXdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0 YXJnZXQgPSB0aGlzLl9tYWluUGFuZWwuX2VuY2xvc2luZ0xpbmVSb3dPclNlbGYoZXZlbnQudGFy Z2V0KTsKICAgICAgICAgICAgIHRoaXMuX2RlbGVnYXRlLnBvcHVsYXRlVGV4dEFyZWFDb250ZXh0 TWVudShjb250ZXh0TWVudSwgdGFyZ2V0ICYmIHRhcmdldC5saW5lTnVtYmVyKTsKICAgICAgICAg fQotICAgICAgICB2YXIgZmlsZU5hbWUgPSB0aGlzLl9kZWxlZ2F0ZS5zdWdnZXN0ZWRGaWxlTmFt ZSgpOwotICAgICAgICBpZiAoZmlsZU5hbWUpCi0gICAgICAgICAgICBjb250ZXh0TWVudS5hcHBl bmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZyhXZWJJbnNwZWN0b3IudXNlTG93ZXJDYXNlTWVu dVRpdGxlcygpID8gIlNhdmUgYXMuLi4iIDogIlNhdmUgQXMuLi4iKSwgSW5zcGVjdG9yRnJvbnRl bmRIb3N0LnNhdmVBcy5iaW5kKEluc3BlY3RvckZyb250ZW5kSG9zdCwgZmlsZU5hbWUsIHRoaXMu X3RleHRNb2RlbC50ZXh0KSk7CisgICAgICAgIGlmICh0aGlzLl91cmwpIHsKKyAgICAgICAgICAg IGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTYXZlIiksIElu c3BlY3RvckZyb250ZW5kSG9zdC5zYXZlLmJpbmQoSW5zcGVjdG9yRnJvbnRlbmRIb3N0LCB0aGlz Ll91cmwsIHRoaXMuX3RleHRNb2RlbC50ZXh0LCBmYWxzZSkpOworICAgICAgICAgICAgY29udGV4 dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoV2ViSW5zcGVjdG9yLnVzZUxv d2VyQ2FzZU1lbnVUaXRsZXMoKSA/ICJTYXZlIGFzLi4uIiA6ICJTYXZlIEFzLi4uIiksIEluc3Bl Y3RvckZyb250ZW5kSG9zdC5zYXZlLmJpbmQoSW5zcGVjdG9yRnJvbnRlbmRIb3N0LCB0aGlzLl91 cmwsIHRoaXMuX3RleHRNb2RlbC50ZXh0LCB0cnVlKSk7CisgICAgICAgIH0KIAogICAgICAgICBj b250ZXh0TWVudS5zaG93KGV2ZW50KTsKICAgICB9LApAQCAtMzAzLDYgKzMwNCw4IEBAIFdlYklu c3BlY3Rvci5UZXh0Vmlld2VyLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKIAogICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5jb21taXRFZGl0aW5nKCk7CisgICAgICAgIGlm ICh0aGlzLl91cmwgJiYgV2ViSW5zcGVjdG9yLmlzVVJMU2F2ZWQodGhpcy5fdXJsKSkKKyAgICAg ICAgICAgIEluc3BlY3RvckZyb250ZW5kSG9zdC5zYXZlKHRoaXMuX3VybCwgdGhpcy5fdGV4dE1v ZGVsLnRleHQsIGZhbHNlKTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfSwKIApAQCAtMzM3 LDkgKzM0MCw3IEBAIFdlYkluc3BlY3Rvci5UZXh0Vmlld2VyRGVsZWdhdGUucHJvdG90eXBlID0g ewogCiAgICAgcG9wdWxhdGVMaW5lR3V0dGVyQ29udGV4dE1lbnU6IGZ1bmN0aW9uKGNvbnRleHRN ZW51LCBsaW5lTnVtYmVyKSB7IH0sCiAKLSAgICBwb3B1bGF0ZVRleHRBcmVhQ29udGV4dE1lbnU6 IGZ1bmN0aW9uKGNvbnRleHRNZW51LCBsaW5lTnVtYmVyKSB7IH0sCi0KLSAgICBzdWdnZXN0ZWRG aWxlTmFtZTogZnVuY3Rpb24oKSB7IH0KKyAgICBwb3B1bGF0ZVRleHRBcmVhQ29udGV4dE1lbnU6 IGZ1bmN0aW9uKGNvbnRleHRNZW51LCBsaW5lTnVtYmVyKSB7IH0KIH0KIAogLyoqCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lTW9kZWwuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lTW9kZWwuanMKaW5k ZXggMzgzYTE1ZDJhZTFmMDI3YmE5ZWFkZmU2YTY1YWU4NWQzYjA0NGY0Ny4uM2YzOThjZTViZjRl Y2ZkZWQxYTZlNWZiMDBlMDE0NTk5OWZmY2YxNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZU1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVNb2RlbC5qcwpAQCAtMjAyLDggKzIwMiw4IEBA IFdlYkluc3BlY3Rvci5UaW1lbGluZU1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmVjb3Jk c1tyZWNvcmRzLmxlbmd0aCAtIDFdID0gcmVjb3Jkc1tyZWNvcmRzLmxlbmd0aCAtIDFdICsgIl0i OwogCiAgICAgICAgIHZhciBub3cgPSBuZXcgRGF0ZSgpOwotICAgICAgICB2YXIgc3VnZ2VzdGVk RmlsZU5hbWUgPSAiVGltZWxpbmVSYXdEYXRhLSIgKyBub3cudG9JU084NjAxQ29tcGFjdCgpICsg Ii5qc29uIjsKLSAgICAgICAgSW5zcGVjdG9yRnJvbnRlbmRIb3N0LnNhdmVBcyhzdWdnZXN0ZWRG aWxlTmFtZSwgcmVjb3Jkcy5qb2luKCIsXG4iKSk7CisgICAgICAgIHZhciBmaWxlTmFtZSA9ICJU aW1lbGluZVJhd0RhdGEtIiArIG5vdy50b0lTTzg2MDFDb21wYWN0KCkgKyAiLmpzb24iOworICAg ICAgICBJbnNwZWN0b3JGcm9udGVuZEhvc3Quc2F2ZShmaWxlTmFtZSwgcmVjb3Jkcy5qb2luKCIs XG4iKSwgdHJ1ZSk7CiAgICAgfSwKIAogICAgIHJlc2V0OiBmdW5jdGlvbigpCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKaW5kZXgg OTVjNTAwZWUzNzc0ZjFlNWVkNWIyZTBkOGEzOGViZDc2Y2Q0OTQwYi4uZmFkY2Q0ZTU4MGEwZTU0 OTgzYmEzM2VkOWEwOTdhMmViOWFkYjVhZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcwpAQCAtMjY5LDcgKzI2OSw3IEBAIFdl Ykluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fc2hv cnRjdXRzW3Nob3J0Y3V0Lm1ha2VLZXkoImUiLCBtb2RpZmllcnMuQ3RybE9yTWV0YSldID0gdGhp cy5fdG9nZ2xlVGltZWxpbmVCdXR0b25DbGlja2VkLmJpbmQodGhpcyk7CiAgICAgICAgIHNlY3Rp b24uYWRkS2V5KHNob3J0Y3V0LnNob3J0Y3V0VG9TdHJpbmcoImUiLCBtb2RpZmllcnMuQ3RybE9y TWV0YSksIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU3RhcnQvc3RvcCByZWNvcmRpbmciKSk7CiAK LSAgICAgICAgaWYgKEluc3BlY3RvckZyb250ZW5kSG9zdC5jYW5TYXZlQXMoKSkgeworICAgICAg ICBpZiAoSW5zcGVjdG9yRnJvbnRlbmRIb3N0LmNhblNhdmUoKSkgewogICAgICAgICAgICAgdGhp cy5fc2hvcnRjdXRzW3Nob3J0Y3V0Lm1ha2VLZXkoInMiLCBtb2RpZmllcnMuQ3RybE9yTWV0YSld ID0gdGhpcy5fc2F2ZVRvRmlsZS5iaW5kKHRoaXMpOwogICAgICAgICAgICAgc2VjdGlvbi5hZGRL ZXkoc2hvcnRjdXQuc2hvcnRjdXRUb1N0cmluZygicyIsIG1vZGlmaWVycy5DdHJsT3JNZXRhKSwg V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTYXZlIHRpbWVsaW5lIGRhdGEiKSk7CiAgICAgICAgIH0K QEAgLTI5NSw3ICsyOTUsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUg PSB7CiAgICAgX2NvbnRleHRNZW51OiBmdW5jdGlvbihldmVudCkKICAgICB7CiAgICAgICAgIHZh ciBjb250ZXh0TWVudSA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGV4dE1lbnUoKTsKLSAgICAgICAg aWYgKEluc3BlY3RvckZyb250ZW5kSG9zdC5jYW5TYXZlQXMoKSkKKyAgICAgICAgaWYgKEluc3Bl Y3RvckZyb250ZW5kSG9zdC5jYW5TYXZlKCkpCiAgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBl bmRJdGVtKFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2F2ZSBUaW1lbGluZSBkYXRhXHUyMDI2Iiks IHRoaXMuX3NhdmVUb0ZpbGUuYmluZCh0aGlzKSk7CiAgICAgICAgIGNvbnRleHRNZW51LmFwcGVu ZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJMb2FkIFRpbWVsaW5lIGRhdGFcdTIwMjYiKSwg dGhpcy5fZmlsZVNlbGVjdG9yRWxlbWVudC5jbGljay5iaW5kKHRoaXMuX2ZpbGVTZWxlY3RvckVs ZW1lbnQpKTsKICAgICAgICAgY29udGV4dE1lbnUuc2hvdyhldmVudCk7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcyBiL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzCmluZGV4IDEzOTNmMDMwNWVl MGZkODMyNTcxODNhZTZhNTI5Mjg0MjAwMDIxZTQuLjRmZGMyZTAxNjRiZDc2MWI1NjMzOTYzY2Nj ZjU1ZWM1YTIxZDk5MzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvaW5zcGVjdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvaW5zcGVjdG9yLmpzCkBAIC0xMDIwLDMgKzEwMjAsMTYgQEAgV2ViSW5zcGVjdG9yLl90b29s YmFySXRlbUNsaWNrZWQgPSBmdW5jdGlvbihldmVudCkKICAgICB2YXIgdG9vbGJhckl0ZW0gPSBl dmVudC5jdXJyZW50VGFyZ2V0OwogICAgIFdlYkluc3BlY3Rvci5pbnNwZWN0b3JWaWV3LnNldEN1 cnJlbnRQYW5lbCh0b29sYmFySXRlbS5wYW5lbCk7CiB9CisKK1dlYkluc3BlY3Rvci5zYXZlZFVS TCA9IGZ1bmN0aW9uKHVybCkKK3sKKyAgICB2YXIgc2F2ZWRVUkxzID0gV2ViSW5zcGVjdG9yLnNl dHRpbmdzLnNhdmVkVVJMcy5nZXQoKTsKKyAgICBzYXZlZFVSTHNbdXJsXSA9IHRydWU7CisgICAg V2ViSW5zcGVjdG9yLnNldHRpbmdzLnNhdmVkVVJMcy5zZXQoc2F2ZWRVUkxzKTsKK30KKworV2Vi SW5zcGVjdG9yLmlzVVJMU2F2ZWQgPSBmdW5jdGlvbih1cmwpCit7CisgICAgdmFyIHNhdmVkVVJM cyA9IFdlYkluc3BlY3Rvci5zZXR0aW5ncy5zYXZlZFVSTHMuZ2V0KCk7CisgICAgcmV0dXJuIHNh dmVkVVJMc1t1cmxdOworfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9wdWJs aWMvV2ViRGV2VG9vbHNGcm9udGVuZENsaWVudC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9w dWJsaWMvV2ViRGV2VG9vbHNGcm9udGVuZENsaWVudC5oCmluZGV4IGMyNDY2MjM1YTE4OGQ4MDI4 MjJmMWNlNTI5MzM3ZWNhODQ3YTEyNjEuLmJhNjU3NTY3ZTBlYmYwYzZiNTQzNmUzYTA2MzNkNDM1 YjU1ZDZhMjQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vcHVibGljL1dlYkRl dlRvb2xzRnJvbnRlbmRDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3B1Ymxp Yy9XZWJEZXZUb29sc0Zyb250ZW5kQ2xpZW50LmgKQEAgLTUwLDcgKzUwLDYgQEAgcHVibGljOgog ICAgIHZpcnR1YWwgdm9pZCByZXF1ZXN0U2V0RG9ja1NpZGUoY29uc3QgV2ViU3RyaW5nJiBzaWRl KSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgbW92ZVdpbmRvd0J5KGNvbnN0IFdlYkZsb2F0UG9pbnQm KSB7IH0KICAgICB2aXJ0dWFsIHZvaWQgb3BlbkluTmV3VGFiKGNvbnN0IFdlYlN0cmluZyYgc2lk ZSkgeyB9Ci0gICAgdmlydHVhbCB2b2lkIHNhdmVBcyhjb25zdCBXZWJTdHJpbmcmIGZpbGVOYW1l LCBjb25zdCBXZWJTdHJpbmcmIGNvbnRlbnQpIHsgfQogICAgIHZpcnR1YWwgdm9pZCBzYXZlKGNv bnN0IFdlYlN0cmluZyYgdXJsLCBjb25zdCBXZWJTdHJpbmcmIGNvbnRlbnQsIGJvb2wgc2F2ZUFz KSB7IH0KIAogcHJvdGVjdGVkOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9z cmMvSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRJbXBsLmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vc3JjL0luc3BlY3RvckZyb250ZW5kQ2xpZW50SW1wbC5jcHAKaW5kZXggZWUyZTg5YTQyNzM3 NzFkZmJiZGQwMGEyNTRiNDc4ODQyNTY5YjlmNi4uNzg1YWJkYjNhZGMwOTAzNWFlOGE4OTc3NWI0 Njg2ZDcxZjg0MGNlZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvSW5z cGVjdG9yRnJvbnRlbmRDbGllbnRJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3NyYy9JbnNwZWN0b3JGcm9udGVuZENsaWVudEltcGwuY3BwCkBAIC0xMjksMTQgKzEyOSwxNCBA QCB2b2lkIEluc3BlY3RvckZyb250ZW5kQ2xpZW50SW1wbDo6b3BlbkluTmV3VGFiKGNvbnN0IFN0 cmluZyYgdXJsKQogICAgIG1fY2xpZW50LT5vcGVuSW5OZXdUYWIodXJsKTsKIH0KIAotYm9vbCBJ bnNwZWN0b3JGcm9udGVuZENsaWVudEltcGw6OmNhblNhdmVBcygpCitib29sIEluc3BlY3RvckZy b250ZW5kQ2xpZW50SW1wbDo6Y2FuU2F2ZSgpCiB7CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXZv aWQgSW5zcGVjdG9yRnJvbnRlbmRDbGllbnRJbXBsOjpzYXZlQXMoY29uc3QgU3RyaW5nJiBmaWxl TmFtZSwgY29uc3QgU3RyaW5nJiBjb250ZW50KQordm9pZCBJbnNwZWN0b3JGcm9udGVuZENsaWVu dEltcGw6OnNhdmUoY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgY29udGVudCwgYm9v bCBzYXZlQXMpCiB7Ci0gICAgbV9jbGllbnQtPnNhdmVBcyhmaWxlTmFtZSwgY29udGVudCk7Cisg ICAgbV9jbGllbnQtPnNhdmUodXJsLCBjb250ZW50LCBzYXZlQXMpOwogfQogCiB2b2lkIEluc3Bl Y3RvckZyb250ZW5kQ2xpZW50SW1wbDo6aW5zcGVjdGVkVVJMQ2hhbmdlZChjb25zdCBTdHJpbmcm IHVybCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vc3JjL0luc3BlY3RvckZy b250ZW5kQ2xpZW50SW1wbC5oIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvSW5zcGVjdG9y RnJvbnRlbmRDbGllbnRJbXBsLmgKaW5kZXggNGY3YTcyYjk2OTZmM2JlMjI4NjY0ZjgyNDViN2Q5 MzI4NjFiYjI2Yi4uMTBmMDRmYzFhMTM5YjAyZWYxNWMyNmMzYzlmNzM0NjBlNTQzYmRhOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvSW5zcGVjdG9yRnJvbnRlbmRDbGll bnRJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9zcmMvSW5zcGVjdG9yRnJvbnRl bmRDbGllbnRJbXBsLmgKQEAgLTY5LDggKzY5LDggQEAgcHVibGljOgogCiAgICAgdmlydHVhbCB2 b2lkIG9wZW5Jbk5ld1RhYihjb25zdCBTdHJpbmcmIHVybCk7CiAKLSAgICB2aXJ0dWFsIGJvb2wg Y2FuU2F2ZUFzKCk7Ci0gICAgdmlydHVhbCB2b2lkIHNhdmVBcyhjb25zdCBXVEY6OlN0cmluZyYg ZmlsZU5hbWUsIGNvbnN0IFdURjo6U3RyaW5nJiBjb250ZW50KTsKKyAgICB2aXJ0dWFsIGJvb2wg Y2FuU2F2ZSgpOworICAgIHZpcnR1YWwgdm9pZCBzYXZlKGNvbnN0IFdURjo6U3RyaW5nJiB1cmss IGNvbnN0IFdURjo6U3RyaW5nJiBjb250ZW50LCBib29sIHNhdmVBcyk7CiAKICAgICB2aXJ0dWFs IHZvaWQgaW5zcGVjdGVkVVJMQ2hhbmdlZChjb25zdCBXVEY6OlN0cmluZyYpOwogCg==