176739 2017-09-11 14:30:14 -0700 Web Inspector: Rename NetworkTab / NetworkSidebar to LegacyNetwork* 2017-09-27 12:36:04 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue inspector-bugzilla-changes joepeck mattbaker webkit-bug-importer oldest_to_newest 1347625 0 joepeck 2017-09-11 14:30:14 -0700 Rename NetworkTab / NetworkSidebar to LegacyNetwork* Work towards creating a new Network Tab. 1347627 1 320480 joepeck 2017-09-11 14:32:50 -0700 Created attachment 320480 [PATCH] Proposed Fix 1347630 2 320480 mattbaker 2017-09-11 14:40:59 -0700 Comment on attachment 320480 [PATCH] Proposed Fix r=me 1347672 3 320480 commit-queue 2017-09-11 15:23:54 -0700 Comment on attachment 320480 [PATCH] Proposed Fix Clearing flags on attachment: 320480 Committed r221885: <http://trac.webkit.org/changeset/221885> 1347673 4 commit-queue 2017-09-11 15:23:56 -0700 All reviewed patches have been landed. Closing bug. 1353516 5 webkit-bug-importer 2017-09-27 12:36:04 -0700 <rdar://problem/34693574> 320480 2017-09-11 14:32:50 -0700 2017-09-11 15:23:54 -0700 [PATCH] Proposed Fix legacy-network-rename.patch text/plain 16513 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDZhNTc2ZTE1Mjc1Li42MjUyMjEwYmNlNSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjcgQEAKIDIwMTctMDktMTEgIEpvc2Vw aCBQZWNvcmFybyAgPHBlY29yYXJvQGFwcGxlLmNvbT4KIAorICAgICAgICBXZWIgSW5zcGVjdG9y OiBSZW5hbWUgTmV0d29ya1RhYiAvIE5ldHdvcmtTaWRlYmFyIHRvIExlZ2FjeU5ldHdvcmsqCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzY3MzkKKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRl cmZhY2UvTWFpbi5odG1sOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGVnYWN5TmV0 d29ya1NpZGViYXJQYW5lbC5jc3M6IFJlbmFtZWQgZnJvbSBTb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrU2lkZWJhclBhbmVsLmNzcy4KKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL0xlZ2FjeU5ldHdvcmtTaWRlYmFyUGFuZWwuanM6IFJlbmFtZWQg ZnJvbSBTb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrU2lk ZWJhclBhbmVsLmpzLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGVnYWN5TmV0d29y a1RhYkNvbnRlbnRWaWV3LmpzOiBSZW5hbWVkIGZyb20gU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYkNvbnRlbnRWaWV3LmpzLgorICAgICAgICBSZW5h bWUgcmVzb3VyY2VzLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL01haW4uanM6Cisg ICAgICAgIChXSS5jb250ZW50TG9hZGVkKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L05ldHdvcmtHcmlkQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5OZXR3b3JrR3JpZENvbnRl bnRWaWV3KToKKyAgICAgICAgKFdJLk5ldHdvcmtHcmlkQ29udGVudFZpZXcucHJvdG90eXBlLl9u ZXR3b3JrVGltZWxpbmVSZWNvcmRBZGRlZCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3 cy9UYWJCcm93c2VyLmpzOgorICAgICAgICAoV0kuVGFiQnJvd3Nlci5wcm90b3R5cGUuYmVzdFRh YkNvbnRlbnRWaWV3Rm9yUmVwcmVzZW50ZWRPYmplY3QpOgorICAgICAgICBVcGRhdGUgbmFtZXMg YXQgY2FsbHNpdGVzLgorCisyMDE3LTA5LTExICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0Bh cHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogSW5jbHVkZSBhIERlYnVnQ29udGVu dFZpZXcgZm9yIGRlYnVnZ2luZwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTc2NzMzCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0Jhc2UvTWFpbi5qcwppbmRleCBlMjY0ZTkwYmRkZi4uYTZjMDQ1ODVkMzYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01haW4uanMKQEAg LTQzOCw3ICs0MzgsNyBAQCBXSS5jb250ZW50TG9hZGVkID0gZnVuY3Rpb24oKQogICAgICAgICBX SS5EZWJ1Z2dlclRhYkNvbnRlbnRWaWV3LAogICAgICAgICBXSS5FbGVtZW50c1RhYkNvbnRlbnRW aWV3LAogICAgICAgICBXSS5MYXllcnNUYWJDb250ZW50VmlldywKLSAgICAgICAgV0kuTmV0d29y a1RhYkNvbnRlbnRWaWV3LAorICAgICAgICBXSS5MZWdhY3lOZXR3b3JrVGFiQ29udGVudFZpZXcs CiAgICAgICAgIFdJLk5ld1RhYkNvbnRlbnRWaWV3LAogICAgICAgICBXSS5SZWNvcmRpbmdUYWJD b250ZW50VmlldywKICAgICAgICAgV0kuUmVzb3VyY2VzVGFiQ29udGVudFZpZXcsCkBAIC0xMDAy LDkgKzEwMDIsOSBAQCBXSS5zaG93U3RvcmFnZVRhYiA9IGZ1bmN0aW9uKCkKIAogV0kuc2hvd05l dHdvcmtUYWIgPSBmdW5jdGlvbigpCiB7Ci0gICAgdmFyIHRhYkNvbnRlbnRWaWV3ID0gdGhpcy50 YWJCcm93c2VyLmJlc3RUYWJDb250ZW50Vmlld0ZvckNsYXNzKFdJLk5ldHdvcmtUYWJDb250ZW50 Vmlldyk7CisgICAgdmFyIHRhYkNvbnRlbnRWaWV3ID0gdGhpcy50YWJCcm93c2VyLmJlc3RUYWJD b250ZW50Vmlld0ZvckNsYXNzKFdJLkxlZ2FjeU5ldHdvcmtUYWJDb250ZW50Vmlldyk7CiAgICAg aWYgKCF0YWJDb250ZW50VmlldykKLSAgICAgICAgdGFiQ29udGVudFZpZXcgPSBuZXcgV0kuTmV0 d29ya1RhYkNvbnRlbnRWaWV3OworICAgICAgICB0YWJDb250ZW50VmlldyA9IG5ldyBXSS5MZWdh Y3lOZXR3b3JrVGFiQ29udGVudFZpZXc7CiAgICAgdGhpcy50YWJCcm93c2VyLnNob3dUYWJGb3JD b250ZW50Vmlldyh0YWJDb250ZW50Vmlldyk7CiB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWluLmh0bWwgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9NYWluLmh0bWwKaW5kZXggZTE1MDRhNmIzMTEuLjQ4ZmU3NzJjM2Rl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9NYWluLmh0 bWwKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTWFpbi5odG1sCkBA IC0xMTMsNiArMTEzLDcgQEAKICAgICA8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9IlZpZXdz L0xheWVyVHJlZURldGFpbHNTaWRlYmFyUGFuZWwuY3NzIj4KICAgICA8bGluayByZWw9InN0eWxl c2hlZXQiIGhyZWY9IlZpZXdzL0xheW91dFRpbWVsaW5lT3ZlcnZpZXdHcmFwaC5jc3MiPgogICAg IDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iVmlld3MvTGF5b3V0VGltZWxpbmVWaWV3LmNz cyI+CisgICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJWaWV3cy9MZWdhY3lOZXR3b3Jr U2lkZWJhclBhbmVsLmNzcyI+CiAgICAgPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVmPSJWaWV3 cy9Mb2dDb250ZW50Vmlldy5jc3MiPgogICAgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0i Vmlld3MvTG9nSWNvbi5jc3MiPgogICAgIDxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iVmll d3MvTWVtb3J5Q2F0ZWdvcnlWaWV3LmNzcyI+CkBAIC0xMjIsNyArMTIzLDYgQEAKICAgICA8bGlu ayByZWw9InN0eWxlc2hlZXQiIGhyZWY9IlZpZXdzL05hdmlnYXRpb25CYXIuY3NzIj4KICAgICA8 bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9IlZpZXdzL05hdmlnYXRpb25TaWRlYmFyUGFuZWwu Y3NzIj4KICAgICA8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9IlZpZXdzL05ldHdvcmtHcmlk Q29udGVudFZpZXcuY3NzIj4KLSAgICA8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9IlZpZXdz L05ldHdvcmtTaWRlYmFyUGFuZWwuY3NzIj4KICAgICA8bGluayByZWw9InN0eWxlc2hlZXQiIGhy ZWY9IlZpZXdzL05ldHdvcmtUaW1lbGluZU92ZXJ2aWV3R3JhcGguY3NzIj4KICAgICA8bGluayBy ZWw9InN0eWxlc2hlZXQiIGhyZWY9IlZpZXdzL05ldHdvcmtUaW1lbGluZVZpZXcuY3NzIj4KICAg ICA8bGluayByZWw9InN0eWxlc2hlZXQiIGhyZWY9IlZpZXdzL05ld1RhYkNvbnRlbnRWaWV3LmNz cyI+CkBAIC00ODMsNyArNDgzLDcgQEAKICAgICA8c2NyaXB0IHNyYz0iVmlld3MvRE9NRGV0YWls c1NpZGViYXJQYW5lbC5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL0ZvbGRl clRyZWVFbGVtZW50LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iVmlld3MvRm9sZGVy aXplZFRyZWVFbGVtZW50LmpzIj48L3NjcmlwdD4KLSAgICA8c2NyaXB0IHNyYz0iVmlld3MvTmV0 d29ya1RhYkNvbnRlbnRWaWV3LmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHNyYz0iVmlld3Mv TGVnYWN5TmV0d29ya1RhYkNvbnRlbnRWaWV3LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNy Yz0iVmlld3MvTmV3VGFiQ29udGVudFZpZXcuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3Jj PSJWaWV3cy9PYmplY3RUcmVlQmFzZVRyZWVFbGVtZW50LmpzIj48L3NjcmlwdD4KICAgICA8c2Ny aXB0IHNyYz0iVmlld3MvU291cmNlQ29kZVRyZWVFbGVtZW50LmpzIj48L3NjcmlwdD4KQEAgLTYz Myw2ICs2MzMsNyBAQAogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9MYXlvdXRUaW1lbGluZURhdGFH cmlkTm9kZS5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL0xheW91dFRpbWVs aW5lT3ZlcnZpZXdHcmFwaC5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL0xh eW91dFRpbWVsaW5lVmlldy5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdCBzcmM9IlZpZXdzL0xl Z2FjeU5ldHdvcmtTaWRlYmFyUGFuZWwuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJW aWV3cy9MaW5lQ2hhcnQuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9Mb2dD b250ZW50Vmlldy5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL01lbW9yeUNh dGVnb3J5Vmlldy5qcyI+PC9zY3JpcHQ+CkBAIC02NDEsNyArNjQyLDYgQEAKICAgICA8c2NyaXB0 IHNyYz0iVmlld3MvTXVsdGlwbGVTY29wZUJhckl0ZW0uanMiPjwvc2NyaXB0PgogICAgIDxzY3Jp cHQgc3JjPSJWaWV3cy9OYXZpZ2F0aW9uQmFyLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNy Yz0iVmlld3MvTmV0d29ya0dyaWRDb250ZW50Vmlldy5qcyI+PC9zY3JpcHQ+Ci0gICAgPHNjcmlw dCBzcmM9IlZpZXdzL05ldHdvcmtTaWRlYmFyUGFuZWwuanMiPjwvc2NyaXB0PgogICAgIDxzY3Jp cHQgc3JjPSJWaWV3cy9OZXR3b3JrVGltZWxpbmVPdmVydmlld0dyYXBoLmpzIj48L3NjcmlwdD4K ICAgICA8c2NyaXB0IHNyYz0iVmlld3MvTmV0d29ya1RpbWVsaW5lVmlldy5qcyI+PC9zY3JpcHQ+ CiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL09iamVjdFByZXZpZXdWaWV3LmpzIj48L3NjcmlwdD4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05l dHdvcmtTaWRlYmFyUGFuZWwuY3NzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvTGVnYWN5TmV0d29ya1NpZGViYXJQYW5lbC5jc3MKc2ltaWxhcml0eSBpbmRleCAx MDAlCnJlbmFtZSBmcm9tIFNvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L05ldHdvcmtTaWRlYmFyUGFuZWwuY3NzCnJlbmFtZSB0byBTb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9MZWdhY3lOZXR3b3JrU2lkZWJhclBhbmVsLmNzcwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1Np ZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0xlZ2FjeU5ldHdvcmtTaWRlYmFyUGFuZWwuanMKc2ltaWxhcml0eSBpbmRleCA4NCUKcmVuYW1l IGZyb20gU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1Np ZGViYXJQYW5lbC5qcwpyZW5hbWUgdG8gU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvTGVnYWN5TmV0d29ya1NpZGViYXJQYW5lbC5qcwppbmRleCBmMzU5YjMxY2UyYi4u NTQ3OWE4YTQzYTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL05ldHdvcmtTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGVnYWN5TmV0d29ya1NpZGViYXJQYW5lbC5qcwpAQCAt MjMsNyArMjMsNyBAQAogICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAK LVdJLk5ldHdvcmtTaWRlYmFyUGFuZWwgPSBjbGFzcyBOZXR3b3JrU2lkZWJhclBhbmVsIGV4dGVu ZHMgV0kuTmF2aWdhdGlvblNpZGViYXJQYW5lbAorV0kuTGVnYWN5TmV0d29ya1NpZGViYXJQYW5l bCA9IGNsYXNzIExlZ2FjeU5ldHdvcmtTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXSS5OYXZpZ2F0aW9u U2lkZWJhclBhbmVsCiB7CiAgICAgY29uc3RydWN0b3IoY29udGVudEJyb3dzZXIpCiAgICAgewpA QCAtNDcsNyArNDcsNyBAQCBXSS5OZXR3b3JrU2lkZWJhclBhbmVsID0gY2xhc3MgTmV0d29ya1Np ZGViYXJQYW5lbCBleHRlbmRzIFdJLk5hdmlnYXRpb25TaWRlYmFyUAogICAgIHNob3dEZWZhdWx0 Q29udGVudFZpZXcoKQogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLl9uZXR3b3JrR3JpZFZpZXcp Ci0gICAgICAgICAgICB0aGlzLl9uZXR3b3JrR3JpZFZpZXcgPSBuZXcgV0kuTmV0d29ya0dyaWRD b250ZW50VmlldyhudWxsLCB7bmV0d29ya1NpZGViYXJQYW5lbDogdGhpc30pOworICAgICAgICAg ICAgdGhpcy5fbmV0d29ya0dyaWRWaWV3ID0gbmV3IFdJLk5ldHdvcmtHcmlkQ29udGVudFZpZXco bnVsbCwge2xlZ2FjeU5ldHdvcmtTaWRlYmFyUGFuZWw6IHRoaXN9KTsKIAogICAgICAgICB0aGlz LmNvbnRlbnRCcm93c2VyLnNob3dDb250ZW50Vmlldyh0aGlzLl9uZXR3b3JrR3JpZFZpZXcpOwog ICAgIH0KQEAgLTgzLDcgKzgzLDcgQEAgV0kuTmV0d29ya1NpZGViYXJQYW5lbCA9IGNsYXNzIE5l dHdvcmtTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXSS5OYXZpZ2F0aW9uU2lkZWJhclAKICAgICAgICAg Zm9yIChsZXQga2V5IGluIFdJLlJlc291cmNlLlR5cGUpIHsKICAgICAgICAgICAgIGxldCB2YWx1 ZSA9IFdJLlJlc291cmNlLlR5cGVba2V5XTsKICAgICAgICAgICAgIGxldCBzY29wZUJhckl0ZW0g PSBuZXcgV0kuU2NvcGVCYXJJdGVtKHNjb3BlSXRlbVByZWZpeCArIHZhbHVlLCBXSS5SZXNvdXJj ZS5kaXNwbGF5TmFtZUZvclR5cGUodmFsdWUsIHRydWUpKTsKLSAgICAgICAgICAgIHNjb3BlQmFy SXRlbVtXSS5OZXR3b3JrU2lkZWJhclBhbmVsLlJlc291cmNlVHlwZVN5bWJvbF0gPSB2YWx1ZTsK KyAgICAgICAgICAgIHNjb3BlQmFySXRlbVtXSS5MZWdhY3lOZXR3b3JrU2lkZWJhclBhbmVsLlJl c291cmNlVHlwZVN5bWJvbF0gPSB2YWx1ZTsKICAgICAgICAgICAgIHNjb3BlQmFySXRlbXMucHVz aChzY29wZUJhckl0ZW0pOwogICAgICAgICB9CiAKQEAgLTEwMiw3ICsxMDIsNyBAQCBXSS5OZXR3 b3JrU2lkZWJhclBhbmVsID0gY2xhc3MgTmV0d29ya1NpZGViYXJQYW5lbCBleHRlbmRzIFdJLk5h dmlnYXRpb25TaWRlYmFyUAogICAgIHsKICAgICAgICAgY29uc29sZS5hc3NlcnQoY29va2llKTsK IAotICAgICAgICBjb29raWVbV0kuTmV0d29ya1NpZGViYXJQYW5lbC5TaG93aW5nTmV0d29ya0dy aWRDb250ZW50Vmlld0Nvb2tpZUtleV0gPSB0aGlzLmNvbnRlbnRCcm93c2VyLmN1cnJlbnRDb250 ZW50VmlldyBpbnN0YW5jZW9mIFdJLk5ldHdvcmtHcmlkQ29udGVudFZpZXc7CisgICAgICAgIGNv b2tpZVtXSS5MZWdhY3lOZXR3b3JrU2lkZWJhclBhbmVsLlNob3dpbmdOZXR3b3JrR3JpZENvbnRl bnRWaWV3Q29va2llS2V5XSA9IHRoaXMuY29udGVudEJyb3dzZXIuY3VycmVudENvbnRlbnRWaWV3 IGluc3RhbmNlb2YgV0kuTmV0d29ya0dyaWRDb250ZW50VmlldzsKIAogICAgICAgICBzdXBlci5z YXZlU3RhdGVUb0Nvb2tpZShjb29raWUpOwogICAgIH0KQEAgLTExMyw3ICsxMTMsNyBAQCBXSS5O ZXR3b3JrU2lkZWJhclBhbmVsID0gY2xhc3MgTmV0d29ya1NpZGViYXJQYW5lbCBleHRlbmRzIFdJ Lk5hdmlnYXRpb25TaWRlYmFyUAogCiAgICAgICAgIC8vIERvbid0IGNhbGwgTmF2aWdhdGlvblNp ZGViYXJQYW5lbC5yZXN0b3JlU3RhdGVGcm9tQ29va2llLCBiZWNhdXNlIGl0IHRyaWVzIHRvIG1h dGNoIGJhc2VkCiAgICAgICAgIC8vIG9uIHR5cGUgc2VsZWN0ZWQgdHJlZSBlbGVtZW50LiBUaGlz IHdvdWxkIGNhdXNlIHRoZSBncmlkIHRvIGJlIGRlc2VsZWN0ZWQuCi0gICAgICAgIGlmIChjb29r aWVbV0kuTmV0d29ya1NpZGViYXJQYW5lbC5TaG93aW5nTmV0d29ya0dyaWRDb250ZW50Vmlld0Nv b2tpZUtleV0pCisgICAgICAgIGlmIChjb29raWVbV0kuTGVnYWN5TmV0d29ya1NpZGViYXJQYW5l bC5TaG93aW5nTmV0d29ya0dyaWRDb250ZW50Vmlld0Nvb2tpZUtleV0pCiAgICAgICAgICAgICBy ZXR1cm47CiAKICAgICAgICAgc3VwZXIucmVzdG9yZVN0YXRlRnJvbUNvb2tpZShjb29raWUsIHJl bGF4ZWRNYXRjaERlbGF5KTsKQEAgLTEzOCwxMyArMTM4LDEzIEBAIFdJLk5ldHdvcmtTaWRlYmFy UGFuZWwgPSBjbGFzcyBOZXR3b3JrU2lkZWJhclBhbmVsIGV4dGVuZHMgV0kuTmF2aWdhdGlvblNp ZGViYXJQCiAgICAgICAgIGZ1bmN0aW9uIG1hdGNoKCkKICAgICAgICAgewogICAgICAgICAgICAg aWYgKHRyZWVFbGVtZW50IGluc3RhbmNlb2YgV0kuRnJhbWVUcmVlRWxlbWVudCkKLSAgICAgICAg ICAgICAgICByZXR1cm4gc2VsZWN0ZWRTY29wZUJhckl0ZW1bV0kuTmV0d29ya1NpZGViYXJQYW5l bC5SZXNvdXJjZVR5cGVTeW1ib2xdID09PSBXSS5SZXNvdXJjZS5UeXBlLkRvY3VtZW50OworICAg ICAgICAgICAgICAgIHJldHVybiBzZWxlY3RlZFNjb3BlQmFySXRlbVtXSS5MZWdhY3lOZXR3b3Jr U2lkZWJhclBhbmVsLlJlc291cmNlVHlwZVN5bWJvbF0gPT09IFdJLlJlc291cmNlLlR5cGUuRG9j dW1lbnQ7CiAKICAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRyZWVFbGVtZW50IGluc3RhbmNl b2YgV0kuUmVzb3VyY2VUcmVlRWxlbWVudCwgIlVua25vd24gdHJlZUVsZW1lbnQiLCB0cmVlRWxl bWVudCk7CiAgICAgICAgICAgICBpZiAoISh0cmVlRWxlbWVudCBpbnN0YW5jZW9mIFdJLlJlc291 cmNlVHJlZUVsZW1lbnQpKQogICAgICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgICAg ICAgICAgcmV0dXJuIHRyZWVFbGVtZW50LnJlc291cmNlLnR5cGUgPT09IHNlbGVjdGVkU2NvcGVC YXJJdGVtW1dJLk5ldHdvcmtTaWRlYmFyUGFuZWwuUmVzb3VyY2VUeXBlU3ltYm9sXTsKKyAgICAg ICAgICAgIHJldHVybiB0cmVlRWxlbWVudC5yZXNvdXJjZS50eXBlID09PSBzZWxlY3RlZFNjb3Bl QmFySXRlbVtXSS5MZWdhY3lOZXR3b3JrU2lkZWJhclBhbmVsLlJlc291cmNlVHlwZVN5bWJvbF07 CiAgICAgICAgIH0KIAogICAgICAgICB2YXIgbWF0Y2hlZCA9IG1hdGNoKCk7CkBAIC0xNTUsNyAr MTU1LDcgQEAgV0kuTmV0d29ya1NpZGViYXJQYW5lbCA9IGNsYXNzIE5ldHdvcmtTaWRlYmFyUGFu ZWwgZXh0ZW5kcyBXSS5OYXZpZ2F0aW9uU2lkZWJhclAKIAogICAgIHRyZWVFbGVtZW50QWRkZWRP ckNoYW5nZWQodHJlZUVsZW1lbnQpCiAgICAgewotICAgICAgICBpZiAodHJlZUVsZW1lbnQuc3Rh dHVzICYmIHRyZWVFbGVtZW50LnN0YXR1c1tXSS5OZXR3b3JrU2lkZWJhclBhbmVsLlRyZWVFbGVt ZW50U3RhdHVzQnV0dG9uU3ltYm9sXSB8fCAhdHJlZUVsZW1lbnQudHJlZU91dGxpbmUpCisgICAg ICAgIGlmICh0cmVlRWxlbWVudC5zdGF0dXMgJiYgdHJlZUVsZW1lbnQuc3RhdHVzW1dJLkxlZ2Fj eU5ldHdvcmtTaWRlYmFyUGFuZWwuVHJlZUVsZW1lbnRTdGF0dXNCdXR0b25TeW1ib2xdIHx8ICF0 cmVlRWxlbWVudC50cmVlT3V0bGluZSkKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICB2 YXIgZnJhZ21lbnQgPSBkb2N1bWVudC5jcmVhdGVEb2N1bWVudEZyYWdtZW50KCk7CkBAIC0xNjYs MTIgKzE2NiwxMiBAQCBXSS5OZXR3b3JrU2lkZWJhclBhbmVsID0gY2xhc3MgTmV0d29ya1NpZGVi YXJQYW5lbCBleHRlbmRzIFdJLk5hdmlnYXRpb25TaWRlYmFyUAogICAgICAgICBmcmFnbWVudC5h cHBlbmRDaGlsZChjbG9zZUJ1dHRvbi5lbGVtZW50KTsKIAogICAgICAgICBsZXQgZ29Ub0J1dHRv biA9IG5ldyBXSS5UcmVlRWxlbWVudFN0YXR1c0J1dHRvbihXSS5jcmVhdGVHb1RvQXJyb3dCdXR0 b24oKSk7Ci0gICAgICAgIGdvVG9CdXR0b25bV0kuTmV0d29ya1NpZGViYXJQYW5lbC5UcmVlRWxl bWVudFN5bWJvbF0gPSB0cmVlRWxlbWVudDsKKyAgICAgICAgZ29Ub0J1dHRvbltXSS5MZWdhY3lO ZXR3b3JrU2lkZWJhclBhbmVsLlRyZWVFbGVtZW50U3ltYm9sXSA9IHRyZWVFbGVtZW50OwogICAg ICAgICBnb1RvQnV0dG9uLmFkZEV2ZW50TGlzdGVuZXIoV0kuVHJlZUVsZW1lbnRTdGF0dXNCdXR0 b24uRXZlbnQuQ2xpY2tlZCwgdGhpcy5fdHJlZUVsZW1lbnRHb1RvQXJyb3dXYXNDbGlja2VkLCB0 aGlzKTsKICAgICAgICAgZnJhZ21lbnQuYXBwZW5kQ2hpbGQoZ29Ub0J1dHRvbi5lbGVtZW50KTsK IAogICAgICAgICB0cmVlRWxlbWVudC5zdGF0dXMgPSBmcmFnbWVudDsKLSAgICAgICAgdHJlZUVs ZW1lbnQuc3RhdHVzW1dJLk5ldHdvcmtTaWRlYmFyUGFuZWwuVHJlZUVsZW1lbnRTdGF0dXNCdXR0 b25TeW1ib2xdID0gdHJ1ZTsKKyAgICAgICAgdHJlZUVsZW1lbnQuc3RhdHVzW1dJLkxlZ2FjeU5l dHdvcmtTaWRlYmFyUGFuZWwuVHJlZUVsZW1lbnRTdGF0dXNCdXR0b25TeW1ib2xdID0gdHJ1ZTsK ICAgICB9CiAKICAgICAvLyBQcml2YXRlCkBAIC0yMDIsNyArMjAyLDcgQEAgV0kuTmV0d29ya1Np ZGViYXJQYW5lbCA9IGNsYXNzIE5ldHdvcmtTaWRlYmFyUGFuZWwgZXh0ZW5kcyBXSS5OYXZpZ2F0 aW9uU2lkZWJhclAKICAgICB7CiAgICAgICAgIHRoaXMuX2NsaWNrZWRUcmVlRWxlbWVudEdvVG9B cnJvdyA9IHRydWU7CiAKLSAgICAgICAgbGV0IHRyZWVFbGVtZW50ID0gZXZlbnQudGFyZ2V0W1dJ Lk5ldHdvcmtTaWRlYmFyUGFuZWwuVHJlZUVsZW1lbnRTeW1ib2xdOworICAgICAgICBsZXQgdHJl ZUVsZW1lbnQgPSBldmVudC50YXJnZXRbV0kuTGVnYWN5TmV0d29ya1NpZGViYXJQYW5lbC5UcmVl RWxlbWVudFN5bWJvbF07CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRyZWVFbGVtZW50IGluc3Rh bmNlb2YgV0kuVHJlZUVsZW1lbnQpOwogCiAgICAgICAgIHRyZWVFbGVtZW50LnNlbGVjdCh0cnVl LCB0cnVlKTsKQEAgLTIyNyw4ICsyMjcsOCBAQCBXSS5OZXR3b3JrU2lkZWJhclBhbmVsID0gY2xh c3MgTmV0d29ya1NpZGViYXJQYW5lbCBleHRlbmRzIFdJLk5hdmlnYXRpb25TaWRlYmFyUAogICAg IH0KIH07CiAKLVdJLk5ldHdvcmtTaWRlYmFyUGFuZWwuUmVzb3VyY2VUeXBlU3ltYm9sID0gU3lt Ym9sKCJyZXNvdXJjZS10eXBlIik7Ci1XSS5OZXR3b3JrU2lkZWJhclBhbmVsLlRyZWVFbGVtZW50 U3ltYm9sID0gU3ltYm9sKCJ0cmVlLWVsZW1lbnQiKTsKLVdJLk5ldHdvcmtTaWRlYmFyUGFuZWwu VHJlZUVsZW1lbnRTdGF0dXNCdXR0b25TeW1ib2wgPSBTeW1ib2woInRyZWUtZWxlbWVudC1zdGF0 dXMtYnV0dG9uIik7CitXSS5MZWdhY3lOZXR3b3JrU2lkZWJhclBhbmVsLlJlc291cmNlVHlwZVN5 bWJvbCA9IFN5bWJvbCgicmVzb3VyY2UtdHlwZSIpOworV0kuTGVnYWN5TmV0d29ya1NpZGViYXJQ YW5lbC5UcmVlRWxlbWVudFN5bWJvbCA9IFN5bWJvbCgidHJlZS1lbGVtZW50Iik7CitXSS5MZWdh Y3lOZXR3b3JrU2lkZWJhclBhbmVsLlRyZWVFbGVtZW50U3RhdHVzQnV0dG9uU3ltYm9sID0gU3lt Ym9sKCJ0cmVlLWVsZW1lbnQtc3RhdHVzLWJ1dHRvbiIpOwogCi1XSS5OZXR3b3JrU2lkZWJhclBh bmVsLlNob3dpbmdOZXR3b3JrR3JpZENvbnRlbnRWaWV3Q29va2llS2V5ID0gIm5ldHdvcmstc2lk ZWJhci1wYW5lbC1zaG93aW5nLW5ldHdvcmstZ3JpZC1jb250ZW50LXZpZXciOworV0kuTGVnYWN5 TmV0d29ya1NpZGViYXJQYW5lbC5TaG93aW5nTmV0d29ya0dyaWRDb250ZW50Vmlld0Nvb2tpZUtl eSA9ICJuZXR3b3JrLXNpZGViYXItcGFuZWwtc2hvd2luZy1uZXR3b3JrLWdyaWQtY29udGVudC12 aWV3IjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL05ldHdvcmtUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0xlZ2FjeU5ldHdvcmtUYWJDb250ZW50Vmlldy5qcwpzaW1pbGFyaXR5 IGluZGV4IDg3JQpyZW5hbWUgZnJvbSBTb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9OZXR3b3JrVGFiQ29udGVudFZpZXcuanMKcmVuYW1lIHRvIFNvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xlZ2FjeU5ldHdvcmtUYWJDb250ZW50Vmlldy5q cwppbmRleCAwY2MzMzdkOGY0Yy4uZTdjMjc1YmIzNmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJDb250ZW50Vmlldy5qcwor KysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MZWdhY3lOZXR3 b3JrVGFiQ29udGVudFZpZXcuanMKQEAgLTIzLDE1ICsyMywxNSBAQAogICogVEhFIFBPU1NJQklM SVRZIE9GIFNVQ0ggREFNQUdFLgogICovCiAKLVdJLk5ldHdvcmtUYWJDb250ZW50VmlldyA9IGNs YXNzIE5ldHdvcmtUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRCcm93c2VyVGFiQ29u dGVudFZpZXcKK1dJLkxlZ2FjeU5ldHdvcmtUYWJDb250ZW50VmlldyA9IGNsYXNzIExlZ2FjeU5l dHdvcmtUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRCcm93c2VyVGFiQ29udGVudFZp ZXcKIHsKICAgICBjb25zdHJ1Y3RvcihpZGVudGlmaWVyKQogICAgIHsKLSAgICAgICAgbGV0IHtp bWFnZSwgdGl0bGV9ID0gV0kuTmV0d29ya1RhYkNvbnRlbnRWaWV3LnRhYkluZm8oKTsKKyAgICAg ICAgbGV0IHtpbWFnZSwgdGl0bGV9ID0gV0kuTGVnYWN5TmV0d29ya1RhYkNvbnRlbnRWaWV3LnRh YkluZm8oKTsKICAgICAgICAgbGV0IHRhYkJhckl0ZW0gPSBuZXcgV0kuR2VuZXJhbFRhYkJhckl0 ZW0oaW1hZ2UsIHRpdGxlKTsKICAgICAgICAgbGV0IGRldGFpbHNTaWRlYmFyUGFuZWxDb25zdHJ1 Y3RvcnMgPSBbV0kuUmVzb3VyY2VEZXRhaWxzU2lkZWJhclBhbmVsLCBXSS5Qcm9iZURldGFpbHNT aWRlYmFyUGFuZWxdOwogCi0gICAgICAgIHN1cGVyKGlkZW50aWZpZXIgfHwgIm5ldHdvcmsiLCAi bmV0d29yayIsIHRhYkJhckl0ZW0sIFdJLk5ldHdvcmtTaWRlYmFyUGFuZWwsIGRldGFpbHNTaWRl YmFyUGFuZWxDb25zdHJ1Y3RvcnMpOworICAgICAgICBzdXBlcihpZGVudGlmaWVyIHx8ICJuZXR3 b3JrIiwgIm5ldHdvcmsiLCB0YWJCYXJJdGVtLCBXSS5MZWdhY3lOZXR3b3JrU2lkZWJhclBhbmVs LCBkZXRhaWxzU2lkZWJhclBhbmVsQ29uc3RydWN0b3JzKTsKICAgICB9CiAKICAgICBzdGF0aWMg dGFiSW5mbygpCkBAIC01MSw3ICs1MSw3IEBAIFdJLk5ldHdvcmtUYWJDb250ZW50VmlldyA9IGNs YXNzIE5ldHdvcmtUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRCcm93c2VyCiAKICAg ICBnZXQgdHlwZSgpCiAgICAgewotICAgICAgICByZXR1cm4gV0kuTmV0d29ya1RhYkNvbnRlbnRW aWV3LlR5cGU7CisgICAgICAgIHJldHVybiBXSS5MZWdhY3lOZXR3b3JrVGFiQ29udGVudFZpZXcu VHlwZTsKICAgICB9CiAKICAgICBjYW5TaG93UmVwcmVzZW50ZWRPYmplY3QocmVwcmVzZW50ZWRP YmplY3QpCkBAIC03MCw0ICs3MCw0IEBAIFdJLk5ldHdvcmtUYWJDb250ZW50VmlldyA9IGNsYXNz IE5ldHdvcmtUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRCcm93c2VyCiAgICAgfQog fTsKIAotV0kuTmV0d29ya1RhYkNvbnRlbnRWaWV3LlR5cGUgPSAibmV0d29yayI7CitXSS5MZWdh Y3lOZXR3b3JrVGFiQ29udGVudFZpZXcuVHlwZSA9ICJuZXR3b3JrIjsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtHcmlkQ29udGVu dFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3 b3JrR3JpZENvbnRlbnRWaWV3LmpzCmluZGV4IDQ3YzFlYmFhMDBmLi41YWJjODQxYzdkZSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29y a0dyaWRDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9OZXR3b3JrR3JpZENvbnRlbnRWaWV3LmpzCkBAIC0yOCwxMyArMjgsMTMgQEAg V0kuTmV0d29ya0dyaWRDb250ZW50VmlldyA9IGNsYXNzIE5ldHdvcmtHcmlkQ29udGVudFZpZXcg ZXh0ZW5kcyBXSS5Db250ZW50VmlldwogICAgIGNvbnN0cnVjdG9yKHJlcHJlc2VudGVkT2JqZWN0 LCBleHRyYUFyZ3VtZW50cykKICAgICB7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGV4dHJhQXJn dW1lbnRzKTsKLSAgICAgICAgY29uc29sZS5hc3NlcnQoZXh0cmFBcmd1bWVudHMubmV0d29ya1Np ZGViYXJQYW5lbCBpbnN0YW5jZW9mIFdJLk5ldHdvcmtTaWRlYmFyUGFuZWwpOworICAgICAgICBj b25zb2xlLmFzc2VydChleHRyYUFyZ3VtZW50cy5sZWdhY3lOZXR3b3JrU2lkZWJhclBhbmVsIGlu c3RhbmNlb2YgV0kuTGVnYWN5TmV0d29ya1NpZGViYXJQYW5lbCk7CiAKICAgICAgICAgc3VwZXIo cmVwcmVzZW50ZWRPYmplY3QpOwogCiAgICAgICAgIFdJLkZyYW1lLmFkZEV2ZW50TGlzdGVuZXIo V0kuRnJhbWUuRXZlbnQuTWFpblJlc291cmNlRGlkQ2hhbmdlLCB0aGlzLl9tYWluUmVzb3VyY2VE aWRDaGFuZ2UsIHRoaXMpOwogCi0gICAgICAgIHRoaXMuX25ldHdvcmtTaWRlYmFyUGFuZWwgPSBl eHRyYUFyZ3VtZW50cy5uZXR3b3JrU2lkZWJhclBhbmVsOworICAgICAgICB0aGlzLl9uZXR3b3Jr U2lkZWJhclBhbmVsID0gZXh0cmFBcmd1bWVudHMubGVnYWN5TmV0d29ya1NpZGViYXJQYW5lbDsK IAogICAgICAgICB0aGlzLl9jb250ZW50VHJlZU91dGxpbmUgPSB0aGlzLl9uZXR3b3JrU2lkZWJh clBhbmVsLmNvbnRlbnRUcmVlT3V0bGluZTsKICAgICAgICAgdGhpcy5fY29udGVudFRyZWVPdXRs aW5lLmFkZEV2ZW50TGlzdGVuZXIoV0kuVHJlZU91dGxpbmUuRXZlbnQuU2VsZWN0aW9uRGlkQ2hh bmdlLCB0aGlzLl90cmVlU2VsZWN0aW9uRGlkQ2hhbmdlLCB0aGlzKTsKQEAgLTM3MSw3ICszNzEs NyBAQCBXSS5OZXR3b3JrR3JpZENvbnRlbnRWaWV3ID0gY2xhc3MgTmV0d29ya0dyaWRDb250ZW50 VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAgICAgICAgICAgICB0aGlzLl9zdGFydFRpbWUg PSB0aGlzLl9lbmRUaW1lID0gcmVzb3VyY2VUaW1lbGluZVJlY29yZC5zdGFydFRpbWU7CiAKICAg ICAgICAgLy8gRklYTUU6IDxodHRwczovL3dlYmtpdC5vcmcvYi8xNTM2MzQ+IFdlYiBJbnNwZWN0 b3I6IHNvbWUgYmFja2dyb3VuZCB0YWJzIHRoaW5rIHRoZXkgYXJlIHRoZSBmb3JlZ3JvdW5kIHRh YiBhbmQgZG8gdW5uZWNlc3Nhcnkgd29yawotICAgICAgICBpZiAoIShXSS50YWJCcm93c2VyLnNl bGVjdGVkVGFiQ29udGVudFZpZXcgaW5zdGFuY2VvZiBXSS5OZXR3b3JrVGFiQ29udGVudFZpZXcp KQorICAgICAgICBpZiAoIShXSS50YWJCcm93c2VyLnNlbGVjdGVkVGFiQ29udGVudFZpZXcgaW5z dGFuY2VvZiBXSS5MZWdhY3lOZXR3b3JrVGFiQ29udGVudFZpZXcpKQogICAgICAgICAgICAgcmV0 dXJuOwogCiAgICAgICAgIHRoaXMuX3N0YXJ0VXBkYXRpbmdDdXJyZW50VGltZSgpOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGFiQnJvd3Nl ci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RhYkJyb3dz ZXIuanMKaW5kZXggOWQxYzE3NjU3MjUuLjY5NjJmMGIzZmE0IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UYWJCcm93c2VyLmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RhYkJyb3dzZXIuanMKQEAg LTEyNiw3ICsxMjYsNyBAQCBXSS5UYWJCcm93c2VyID0gY2xhc3MgVGFiQnJvd3NlciBleHRlbmRz IFdJLlZpZXcKICAgICAgICAgICAgIGlmIChvcHRpb25zLmlnbm9yZVNlYXJjaFRhYiAmJiB0YWJD b250ZW50VmlldyBpbnN0YW5jZW9mIFdJLlNlYXJjaFRhYkNvbnRlbnRWaWV3KQogICAgICAgICAg ICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgICAgICBpZiAob3B0aW9ucy5pZ25vcmVOZXR3b3Jr VGFiICYmIHRhYkNvbnRlbnRWaWV3IGluc3RhbmNlb2YgV0kuTmV0d29ya1RhYkNvbnRlbnRWaWV3 KQorICAgICAgICAgICAgaWYgKG9wdGlvbnMuaWdub3JlTmV0d29ya1RhYiAmJiB0YWJDb250ZW50 VmlldyBpbnN0YW5jZW9mIFdJLkxlZ2FjeU5ldHdvcmtUYWJDb250ZW50VmlldykKICAgICAgICAg ICAgICAgICBjb250aW51ZTsKIAogICAgICAgICAgICAgaWYgKHRhYkNvbnRlbnRWaWV3LmNhblNo b3dSZXByZXNlbnRlZE9iamVjdChyZXByZXNlbnRlZE9iamVjdCkpCg==