204086 2019-11-11 14:58:22 -0800 Web Inspector: REGRESSION(r250618): main resource view is empty when pausing on inline 'debugger' statement 2019-11-20 13:24:03 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED P2 Normal --- 204170 1 yurys yurys commit-queue hi inspector-bugzilla-changes joepeck webkit-bug-importer oldest_to_newest 1589341 0 383304 yurys 2019-11-11 14:58:22 -0800 Created attachment 383304 test page Steps to reproduce: 1. Load attached page. 2. Open Web Inspector. 3. Reload inspected page. Expected: Execution is paused on the debugger; statement and main resource is displayed. Actual: Main resource view is blank. resource:///org/webkit/inspector/UserInterface/Views/ResourceContentView.js:213:23: CONSOLE ERROR is printed to the console. 1589562 1 yurys 2019-11-12 10:19:39 -0800 This is similar to https://bugs.webkit.org/show_bug.cgi?id=203722. The problem is now SourceCode.currentRevision will always create a copy of the original revision. In the scenario described above scripts content is fetched before the document resource content. When resolving offsets of the inline scripts from SourceCodeTextEditor._getAssociatedScript(position) to access current content it does the following: inlineScript.range.resolveOffsets(this._sourceCode.content); which will clone original revision. Now the new revision of the main resource has empty content and is different from the original one. When resource content is received it will be set to the original revision of the resource but SourceCodeTextEditor._contentAvailable will retrieve it from the current revision of the source code which will be empty. 1589589 2 383368 yurys 2019-11-12 11:46:29 -0800 Created attachment 383368 Patch 1592064 3 383368 hi 2019-11-20 10:53:53 -0800 Comment on attachment 383368 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=383368&action=review r=me > Source/WebInspectorUI/UserInterface/Models/SourceCode.js:72 > + get editableRevision() Please move this after `set currentRevision` so we don't split up a get-set pair. > Source/WebInspectorUI/UserInterface/Models/SourceCode.js:190 > + if (revision !== this._currentRevision) Let's add a `console.assert(revision === this._currentRevision);` before this. I don't think we ever want to update non-current revisions. > Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js:215 > + // The view maybe populated with inline scripts content by the time resource > + // content arrives. SourceCodeTextEditor will handle that. > + if (this._hasContent()) > + return; Why is this needed? I tried doing some testing myself and it seems to work fine. Do you have a specific test case where this is needed? If so, what exactly is "wrong" when this isn't included? > Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js:297 > + let revision = localResourceOverride.localResource.editableRevision; Aside: we should probably move this inside the callback, in case the revision changes in between. 1592076 4 383368 yurys 2019-11-20 11:32:28 -0800 Comment on attachment 383368 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=383368&action=review >> Source/WebInspectorUI/UserInterface/Models/SourceCode.js:72 >> + get editableRevision() > > Please move this after `set currentRevision` so we don't split up a get-set pair. Done. >> Source/WebInspectorUI/UserInterface/Models/SourceCode.js:190 >> + if (revision !== this._currentRevision) > > Let's add a `console.assert(revision === this._currentRevision);` before this. I don't think we ever want to update non-current revisions. Done. >> Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js:215 >> + return; > > Why is this needed? I tried doing some testing myself and it seems to work fine. Do you have a specific test case where this is needed? If so, what exactly is "wrong" when this isn't included? When execution breaks in inline script the content will be first assembled from scripts coming from the debugger. When main resource loading finishes the content will be reset from the main resource. This can be easily reproduced with inline breakpoints. >> Source/WebInspectorUI/UserInterface/Views/ResourceContentView.js:297 >> + let revision = localResourceOverride.localResource.editableRevision; > > Aside: we should probably move this inside the callback, in case the revision changes in between. Done. Given that there is at most 2 revisions ever this should not matter as the one created by editableRevision is guaranteed to stay the latest. 1592077 5 383975 yurys 2019-11-20 11:33:42 -0800 Created attachment 383975 Patch for landing 1592114 6 383975 commit-queue 2019-11-20 13:23:43 -0800 Comment on attachment 383975 Patch for landing Clearing flags on attachment: 383975 Committed r252704: <https://trac.webkit.org/changeset/252704> 1592115 7 commit-queue 2019-11-20 13:23:45 -0800 All reviewed patches have been landed. Closing bug. 383304 2019-11-11 14:58:22 -0800 2019-11-11 14:58:22 -0800 test page inline-debugger-statement.html text/html 124 yurys PCFET0NUWVBFIGh0bWw+CjxodG1sPgo8aGVhZD4KPHNjcmlwdD4KZGVidWdnZXI7Cjwvc2NyaXB0 Pgo8L2hlYWQ+Cjxib2R5PgpSZWxvYWQgcGFnZSB3aXRoIG9wZW4gaW5zcGVjdG9yLgo8L2JvZHk+ CjwvaHRtbD4KCg== 383368 2019-11-12 11:46:29 -0800 2019-11-20 11:33:41 -0800 Patch bug-204086-20191112114628.patch text/plain 10639 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyMzY1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAx NzczZjQ5YzRkMTlmNDA4NzdlYzFjMmRmZWFkYWZjY2NiYWZkMjcwLi43YTk4NzhmMmY2MWU5NTMz MjcxYmM2MDA0OWQ0MDNmMmIzMzE0YzY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzOCBAQAorMjAxOS0xMS0xMiAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVt Lm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBSRUdSRVNTSU9OKHIyNTA2MTgpOiBtYWlu IHJlc291cmNlIHZpZXcgaXMgZW1wdHkgd2hlbiBwYXVzaW5nIG9uIGlubGluZSAnZGVidWdnZXIn IHN0YXRlbWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjA0MDg2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgU291cmNlQ29kZVJldmlzaW9uLmN1cnJlbnRSZXZpc2lvbiBkb2Vzbid0IGNyZWF0ZSBuZXcg cmV2aXNpb25zIHVuZGVyIHRoZSBob29kIGFueW1vcmUuCisgICAgICAgIFRoaXMgYWxsb3dzIHRv IGF2b2lkIHVuZGVzaXJhYmxlIHNpZGUgZWZmZWN0cyB3aGVuIGUuZy4gdGV4dCBlZGl0b3IgdHJp ZXMgdG8gcmVhZCBjdXJyZW50CisgICAgICAgIGNvbnRlbnQgb2YgdGhlIFNvdXJjZUNvZGUgd2hp Y2ggcmVzdWx0cyBpbiBhIG5ldyByZXZpc2lvbiAod2l0aCBlbXB0eSBjb250ZW50KS4gCisgICAg ICAgIE5ldyBtZXRob2QgZWRpdGFibGVSZXZpc2lvbiBpcyBpbnRyb2R1Y2VkIGZvciBhcHBseWlu ZyBjaGFuZ2VzIHRvIHRoZSByZXNvdXJjZSB3aGlsZQorICAgICAgICBrZWVwaW5nIG9yaWdpbmFs IGNvbnRlbnQgcmV2aXNpb24gaW50YWN0LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Db250 cm9sbGVycy9DU1NNYW5hZ2VyLmpzOgorICAgICAgICAoV0kuQ1NTTWFuYWdlci5wcm90b3R5cGUu X3Jlc291cmNlQ29udGVudERpZENoYW5nZS5hcHBseVN0eWxlU2hlZXRDaGFuZ2VzLnN0eWxlU2hl ZXRGb3VuZCk6CisgICAgICAgIChXSS5DU1NNYW5hZ2VyLnByb3RvdHlwZS5fcmVzb3VyY2VDb250 ZW50RGlkQ2hhbmdlLmFwcGx5U3R5bGVTaGVldENoYW5nZXMpOgorICAgICAgICAoV0kuQ1NTTWFu YWdlci5wcm90b3R5cGUuX3Jlc291cmNlQ29udGVudERpZENoYW5nZSk6CisgICAgICAgIChXSS5D U1NNYW5hZ2VyLnByb3RvdHlwZS5fdXBkYXRlUmVzb3VyY2VDb250ZW50LmZldGNoZWRTdHlsZVNo ZWV0Q29udGVudCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9Nb2RlbHMvU291cmNlQ29kZS5q czoKKyAgICAgICAgKFdJLlNvdXJjZUNvZGUucHJvdG90eXBlLmdldCBjdXJyZW50UmV2aXNpb24p OgorICAgICAgICAoV0kuU291cmNlQ29kZS5wcm90b3R5cGUuZ2V0IGVkaXRhYmxlUmV2aXNpb24p OgorICAgICAgICAoV0kuU291cmNlQ29kZS5wcm90b3R5cGUuZ2V0IGNvbnRlbnQpOgorICAgICAg ICAoV0kuU291cmNlQ29kZS5wcm90b3R5cGUucmV2aXNpb25Db250ZW50RGlkQ2hhbmdlKToKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0ZvbnRSZXNvdXJjZUNvbnRlbnRWaWV3LmpzOgor ICAgICAgICAoV0kuRm9udFJlc291cmNlQ29udGVudFZpZXcucHJvdG90eXBlLmRyb3Bab25lSGFu ZGxlRHJvcCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9JbWFnZVJlc291cmNlQ29u dGVudFZpZXcuanM6CisgICAgICAgIChXSS5JbWFnZVJlc291cmNlQ29udGVudFZpZXcucHJvdG90 eXBlLmRyb3Bab25lSGFuZGxlRHJvcCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9S ZXNvdXJjZUNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuUmVzb3VyY2VDb250ZW50Vmlldy5w cm90b3R5cGUuX2NvbnRlbnRBdmFpbGFibGUpOgorICAgICAgICAoV0kuUmVzb3VyY2VDb250ZW50 Vmlldy5wcm90b3R5cGUuX2hhbmRsZUltcG9ydExvY2FsUmVzb3VyY2VPdmVycmlkZSk6CisgICAg ICAgICogVXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHRDb250ZW50Vmlldy5qczoKKyAgICAgICAg KFdJLlNjcmlwdENvbnRlbnRWaWV3LnByb3RvdHlwZS5faGFuZGxlVGV4dEVkaXRvckNvbnRlbnRE aWRDaGFuZ2UpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGV4dFJlc291cmNlQ29u dGVudFZpZXcuanM6CisgICAgICAgIChXSS5UZXh0UmVzb3VyY2VDb250ZW50Vmlldy5wcm90b3R5 cGUuX3RleHRFZGl0b3JDb250ZW50RGlkQ2hhbmdlKToKKwogMjAxOS0xMS0wNyAgRGV2aW4gUm91 c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogUkVHUkVT U0lPTihyMjUxOTU4KTogY29uc29sZSBwcm9tcHQgaXMgYXV0b21hdGljYWxseSBmb2N1c2VkIHdo ZW4gcGFnZSBpcyByZWxvYWRlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ1NTTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NTU01hbmFnZXIuanMKaW5kZXggNDIwMTE0 MmY1NjFkZWU2MGJiNjI0NDVjMWM4ZjAzYmViYzcwNjhjYS4uMDU0MmQ4NTE2M2Q2ZmE1MzQxNjdh ZDU2Y2IyZWM5MjQzODNkYmEyZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ1NTTWFuYWdlci5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9DU1NNYW5hZ2VyLmpzCkBAIC02NjAs NyArNjYwLDcgQEAgV0kuQ1NTTWFuYWdlciA9IGNsYXNzIENTU01hbmFnZXIgZXh0ZW5kcyBXSS5P YmplY3QKICAgICAgICAgICAgICAgICAvLyBpZ25vcmUgdGhlIG5leHQgX3VwZGF0ZVJlc291cmNl Q29udGVudCBjYWxsLgogICAgICAgICAgICAgICAgIHJlc291cmNlLl9faWdub3JlTmV4dFVwZGF0 ZVJlc291cmNlQ29udGVudCA9IHRydWU7CiAKLSAgICAgICAgICAgICAgICBsZXQgcmV2aXNpb24g PSBzdHlsZVNoZWV0LmN1cnJlbnRSZXZpc2lvbjsKKyAgICAgICAgICAgICAgICBsZXQgcmV2aXNp b24gPSBzdHlsZVNoZWV0LmVkaXRhYmxlUmV2aXNpb247CiAgICAgICAgICAgICAgICAgcmV2aXNp b24udXBkYXRlUmV2aXNpb25Db250ZW50KHJlc291cmNlLmNvbnRlbnQpOwogICAgICAgICAgICAg fQogCkBAIC03MDQsNyArNzA0LDcgQEAgV0kuQ1NTTWFuYWdlciA9IGNsYXNzIENTU01hbmFnZXIg ZXh0ZW5kcyBXSS5PYmplY3QKIAogICAgICAgICAgICAgdGhpcy5faWdub3JlUmVzb3VyY2VDb250 ZW50RGlkQ2hhbmdlRXZlbnRGb3JSZXNvdXJjZSA9IHJlcHJlc2VudGVkT2JqZWN0OwogCi0gICAg ICAgICAgICBsZXQgcmV2aXNpb24gPSByZXByZXNlbnRlZE9iamVjdC5jdXJyZW50UmV2aXNpb247 CisgICAgICAgICAgICBsZXQgcmV2aXNpb24gPSByZXByZXNlbnRlZE9iamVjdC5lZGl0YWJsZVJl dmlzaW9uOwogICAgICAgICAgICAgaWYgKHN0eWxlU2hlZXQuaXNJbnNwZWN0b3JTdHlsZVNoZWV0 KCkpIHsKICAgICAgICAgICAgICAgICByZXZpc2lvbi51cGRhdGVSZXZpc2lvbkNvbnRlbnQocmVw cmVzZW50ZWRPYmplY3QuY29udGVudCk7CiAgICAgICAgICAgICAgICAgc3R5bGVTaGVldC5kaXNw YXRjaEV2ZW50VG9MaXN0ZW5lcnMoV0kuU291cmNlQ29kZS5FdmVudC5Db250ZW50RGlkQ2hhbmdl KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVs cy9Tb3VyY2VDb2RlLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9k ZWxzL1NvdXJjZUNvZGUuanMKaW5kZXggM2UyNmZmYzI3NTk4ODQwNTU1Y2ZlNmFkZGZhMTk4MTM1 NGZlNjBlYi4uMGE0NTQxNzAwNWZlOWE1MTgwNzI5MmRhNGEyMWI3NTQ5NTM1YzkxYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1NvdXJjZUNv ZGUuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1Nv dXJjZUNvZGUuanMKQEAgLTY2LDcgKzY2LDEzIEBAIFdJLlNvdXJjZUNvZGUgPSBjbGFzcyBTb3Vy Y2VDb2RlIGV4dGVuZHMgV0kuT2JqZWN0CiAKICAgICBnZXQgY3VycmVudFJldmlzaW9uKCkKICAg ICB7Ci0gICAgICAgIHRoaXMuX2luaXRpYWxpemVDdXJyZW50UmV2aXNpb25JZk5lZWRlZCgpOwor ICAgICAgICByZXR1cm4gdGhpcy5fY3VycmVudFJldmlzaW9uOworICAgIH0KKworICAgIGdldCBl ZGl0YWJsZVJldmlzaW9uKCkKKyAgICB7CisgICAgICAgIGlmICh0aGlzLl9jdXJyZW50UmV2aXNp b24gPT09IHRoaXMuX29yaWdpbmFsUmV2aXNpb24pCisgICAgICAgICAgICB0aGlzLl9jdXJyZW50 UmV2aXNpb24gPSB0aGlzLl9vcmlnaW5hbFJldmlzaW9uLmNvcHkoKTsKICAgICAgICAgcmV0dXJu IHRoaXMuX2N1cnJlbnRSZXZpc2lvbjsKICAgICB9CiAKQEAgLTg3LDcgKzkzLDcgQEAgV0kuU291 cmNlQ29kZSA9IGNsYXNzIFNvdXJjZUNvZGUgZXh0ZW5kcyBXSS5PYmplY3QKIAogICAgIGdldCBj b250ZW50KCkKICAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLmN1cnJlbnRSZXZpc2lvbi5jb250 ZW50OworICAgICAgICByZXR1cm4gdGhpcy5fY3VycmVudFJldmlzaW9uLmNvbnRlbnQ7CiAgICAg fQogCiAgICAgZ2V0IHVybCgpCkBAIC0xNzgsMTMgKzE4NCwxMCBAQCBXSS5Tb3VyY2VDb2RlID0g Y2xhc3MgU291cmNlQ29kZSBleHRlbmRzIFdJLk9iamVjdAogCiAgICAgcmV2aXNpb25Db250ZW50 RGlkQ2hhbmdlKHJldmlzaW9uKQogICAgIHsKLSAgICAgICAgaWYgKHJldmlzaW9uID09PSB0aGlz Ll9vcmlnaW5hbFJldmlzaW9uKQotICAgICAgICAgICAgdGhpcy5faW5pdGlhbGl6ZUN1cnJlbnRS ZXZpc2lvbklmTmVlZGVkKCk7Ci0KICAgICAgICAgaWYgKHRoaXMuX2lnbm9yZVJldmlzaW9uQ29u dGVudERpZENoYW5nZUV2ZW50KQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGlmIChy ZXZpc2lvbiAhPT0gdGhpcy5jdXJyZW50UmV2aXNpb24pCisgICAgICAgIGlmIChyZXZpc2lvbiAh PT0gdGhpcy5fY3VycmVudFJldmlzaW9uKQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAg IHRoaXMuaGFuZGxlQ3VycmVudFJldmlzaW9uQ29udGVudENoYW5nZSgpOwpAQCAtMjI0LDEyICsy MjcsNiBAQCBXSS5Tb3VyY2VDb2RlID0gY2xhc3MgU291cmNlQ29kZSBleHRlbmRzIFdJLk9iamVj dAogCiAgICAgLy8gUHJpdmF0ZQogCi0gICAgX2luaXRpYWxpemVDdXJyZW50UmV2aXNpb25JZk5l ZWRlZCgpCi0gICAgewotICAgICAgICBpZiAodGhpcy5fY3VycmVudFJldmlzaW9uID09PSB0aGlz Ll9vcmlnaW5hbFJldmlzaW9uKQotICAgICAgICAgICAgdGhpcy5fY3VycmVudFJldmlzaW9uID0g dGhpcy5fb3JpZ2luYWxSZXZpc2lvbi5jb3B5KCk7Ci0gICAgfQotCiAgICAgX3Byb2Nlc3NDb250 ZW50KHBhcmFtZXRlcnMpCiAgICAgewogICAgICAgICAvLyBEaWZmZXJlbnQgYmFja2VuZCBBUElz IHJldHVybiBvbmUgb2YgYGNvbnRlbnQsIGBib2R5YCwgYHRleHRgLCBvciBgc2NyaXB0U291cmNl YC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0ZvbnRSZXNvdXJjZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvRm9udFJlc291cmNlQ29udGVudFZpZXcuanMKaW5kZXggODk5M2U1ZTJj NzdjYmNjMGIxODhiNGY1Yjc3M2IyYWQ2ZjU5NjgzOC4uZDZjYjBjMmYyNjMxNDgwNWU4ZWJlMjAy MjMzNjU5OTc5MDNjM2VhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvRm9udFJlc291cmNlQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9udFJlc291cmNlQ29udGVudFZpZXcu anMKQEAgLTE0Niw3ICsxNDYsNyBAQCBXSS5Gb250UmVzb3VyY2VDb250ZW50VmlldyA9IGNsYXNz IEZvbnRSZXNvdXJjZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuUmVzb3VyY2VDbwogCiAgICAgICAg ICAgICBjb25zb2xlLmFzc2VydChsb2NhbFJlc291cmNlT3ZlcnJpZGUpOwogCi0gICAgICAgICAg ICBsZXQgcmV2aXNpb24gPSBsb2NhbFJlc291cmNlT3ZlcnJpZGUubG9jYWxSZXNvdXJjZS5jdXJy ZW50UmV2aXNpb247CisgICAgICAgICAgICBsZXQgcmV2aXNpb24gPSBsb2NhbFJlc291cmNlT3Zl cnJpZGUubG9jYWxSZXNvdXJjZS5lZGl0YWJsZVJldmlzaW9uOwogICAgICAgICAgICAgcmV2aXNp b24udXBkYXRlUmV2aXNpb25Db250ZW50KGNvbnRlbnQsIHtiYXNlNjRFbmNvZGVkLCBtaW1lVHlw ZX0pOwogCiAgICAgICAgICAgICBpZiAoIXRoaXMuc2hvd2luZ0xvY2FsUmVzb3VyY2VPdmVycmlk ZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0ltYWdlUmVzb3VyY2VDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL0ltYWdlUmVzb3VyY2VDb250ZW50Vmlldy5qcwppbmRleCBhMzAyYjE3 NDlmOGFkZDgyMDE4NzZkNDFhMjU3ZTUxOGE0ODYxZDYyLi5kNzUzZWRhMGFiN2E2ZjZiNDIwMjNi OGU3NjhiM2FhZWZhZDc0ZWFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9JbWFnZVJlc291cmNlQ29udGVudFZpZXcuanMKKysrIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSW1hZ2VSZXNvdXJjZUNvbnRlbnRW aWV3LmpzCkBAIC0xNjAsNyArMTYwLDcgQEAgV0kuSW1hZ2VSZXNvdXJjZUNvbnRlbnRWaWV3ID0g Y2xhc3MgSW1hZ2VSZXNvdXJjZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuUmVzb3VyY2UKIAogICAg ICAgICAgICAgY29uc29sZS5hc3NlcnQobG9jYWxSZXNvdXJjZU92ZXJyaWRlKTsKIAotICAgICAg ICAgICAgbGV0IHJldmlzaW9uID0gbG9jYWxSZXNvdXJjZU92ZXJyaWRlLmxvY2FsUmVzb3VyY2Uu Y3VycmVudFJldmlzaW9uOworICAgICAgICAgICAgbGV0IHJldmlzaW9uID0gbG9jYWxSZXNvdXJj ZU92ZXJyaWRlLmxvY2FsUmVzb3VyY2UuZWRpdGFibGVSZXZpc2lvbjsKICAgICAgICAgICAgIHJl dmlzaW9uLnVwZGF0ZVJldmlzaW9uQ29udGVudChjb250ZW50LCB7YmFzZTY0RW5jb2RlZCwgbWlt ZVR5cGV9KTsKIAogICAgICAgICAgICAgaWYgKCF0aGlzLnNob3dpbmdMb2NhbFJlc291cmNlT3Zl cnJpZGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9SZXNvdXJjZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvUmVzb3VyY2VDb250ZW50Vmlldy5qcwppbmRleCA5MGU2NDhiNWRjYjNm ZmJjYjVjNTc3OWVhNjk5ZTVjMzljZmRjZDBmLi4xMWY5Mjg3YmI1NDEzYzZhY2IyOTMwMzA1MDEx ZGE0OGI2ZWNlOWE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9SZXNvdXJjZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlQ29udGVudFZpZXcuanMKQEAgLTIwOSw4 ICsyMDksMTIgQEAgV0kuUmVzb3VyY2VDb250ZW50VmlldyA9IGNsYXNzIFJlc291cmNlQ29udGVu dFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAg ICB9CiAKKyAgICAgICAgLy8gVGhlIHZpZXcgbWF5YmUgcG9wdWxhdGVkIHdpdGggaW5saW5lIHNj cmlwdHMgY29udGVudCBieSB0aGUgdGltZSByZXNvdXJjZQorICAgICAgICAvLyBjb250ZW50IGFy cml2ZXMuIFNvdXJjZUNvZGVUZXh0RWRpdG9yIHdpbGwgaGFuZGxlIHRoYXQuCisgICAgICAgIGlm ICh0aGlzLl9oYXNDb250ZW50KCkpCisgICAgICAgICAgICByZXR1cm47CisKICAgICAgICAgLy8g Q29udGVudCBpcyByZWFkeSB0byBzaG93LCBjYWxsIHRoZSBwdWJsaWMgbWV0aG9kIG5vdy4KLSAg ICAgICAgY29uc29sZS5hc3NlcnQoIXRoaXMuX2hhc0NvbnRlbnQoKSk7CiAgICAgICAgIGNvbnNv bGUuYXNzZXJ0KHBhcmFtZXRlcnMuc291cmNlQ29kZSA9PT0gdGhpcy5fcmVzb3VyY2UpOwogICAg ICAgICB0aGlzLmNvbnRlbnRBdmFpbGFibGUocGFyYW1ldGVycy5zb3VyY2VDb2RlLmNvbnRlbnQs IHBhcmFtZXRlcnMuYmFzZTY0RW5jb2RlZCk7CiAKQEAgLTI5MCw3ICsyOTQsNyBAQCBXSS5SZXNv dXJjZUNvbnRlbnRWaWV3ID0gY2xhc3MgUmVzb3VyY2VDb250ZW50VmlldyBleHRlbmRzIFdJLkNv bnRlbnRWaWV3CiAgICAgICAgICAgICBsZXQgbG9jYWxSZXNvdXJjZU92ZXJyaWRlID0gV0kubmV0 d29ya01hbmFnZXIubG9jYWxSZXNvdXJjZU92ZXJyaWRlRm9yVVJMKHRoaXMucmVzb3VyY2UudXJs KTsKICAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGxvY2FsUmVzb3VyY2VPdmVycmlkZSk7CiAK LSAgICAgICAgICAgIGxldCByZXZpc2lvbiA9IGxvY2FsUmVzb3VyY2VPdmVycmlkZS5sb2NhbFJl c291cmNlLmN1cnJlbnRSZXZpc2lvbjsKKyAgICAgICAgICAgIGxldCByZXZpc2lvbiA9IGxvY2Fs UmVzb3VyY2VPdmVycmlkZS5sb2NhbFJlc291cmNlLmVkaXRhYmxlUmV2aXNpb247CiAgICAgICAg ICAgICBhd2FpdCB0aGlzLl9nZXRDb250ZW50Rm9yTG9jYWxSZXNvdXJjZU92ZXJyaWRlRnJvbUZp bGUoZmlsZUxpc3RbMF0sICh7bWltZVR5cGUsIGJhc2U2NEVuY29kZWQsIGNvbnRlbnR9KSA9PiB7 CiAgICAgICAgICAgICAgICAgcmV2aXNpb24udXBkYXRlUmV2aXNpb25Db250ZW50KGNvbnRlbnQs IHtiYXNlNjRFbmNvZGVkLCBtaW1lVHlwZX0pOwogICAgICAgICAgICAgfSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHRDb250ZW50 Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Njcmlw dENvbnRlbnRWaWV3LmpzCmluZGV4IGRmYzU1MWFjN2ZlNGY2Nzg2MTMyOTM3ZDVmOGNlZDc4ODk3 ZDg4ZDguLmNkMzUwMWY4NzYzZDEzYzZiY2RhMTVmN2NkYTFjNzM1MTZhMmExZTAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1NjcmlwdENvbnRl bnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1NjcmlwdENvbnRlbnRWaWV3LmpzCkBAIC0yMzYsNyArMjM2LDcgQEAgV0kuU2NyaXB0Q29udGVu dFZpZXcgPSBjbGFzcyBTY3JpcHRDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAK ICAgICBfaGFuZGxlVGV4dEVkaXRvckNvbnRlbnREaWRDaGFuZ2UoZXZlbnQpCiAgICAgewotICAg ICAgICB0aGlzLl9zY3JpcHQuY3VycmVudFJldmlzaW9uLnVwZGF0ZVJldmlzaW9uQ29udGVudCh0 aGlzLl90ZXh0RWRpdG9yLnN0cmluZyk7CisgICAgICAgIHRoaXMuX3NjcmlwdC5lZGl0YWJsZVJl dmlzaW9uLnVwZGF0ZVJldmlzaW9uQ29udGVudCh0aGlzLl90ZXh0RWRpdG9yLnN0cmluZyk7CiAg ICAgfQogCiAgICAgX3RvZ2dsZVByZXR0eVByaW50KGV2ZW50KQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGV4dFJlc291cmNlQ29udGVudFZp ZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UZXh0UmVz b3VyY2VDb250ZW50Vmlldy5qcwppbmRleCBlOWIwNTI5ZGIyZmFlM2NiYWJhYjFlY2YzZDYwNjkz M2MzN2RmZDUxLi45YWQ4ZGQzOTEwMzAxNWQzOGFjYjNjNDA1ZGU2YTdlYzE0OTRlYjVmIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UZXh0UmVz b3VyY2VDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9UZXh0UmVzb3VyY2VDb250ZW50Vmlldy5qcwpAQCAtMjg5LDcgKzI4OSw3IEBA IFdJLlRleHRSZXNvdXJjZUNvbnRlbnRWaWV3ID0gY2xhc3MgVGV4dFJlc291cmNlQ29udGVudFZp ZXcgZXh0ZW5kcyBXSS5SZXNvdXJjZUNvCiAgICAgX3RleHRFZGl0b3JDb250ZW50RGlkQ2hhbmdl KGV2ZW50KQogICAgIHsKICAgICAgICAgdGhpcy5faWdub3JlU291cmNlQ29kZUNvbnRlbnREaWRD aGFuZ2VFdmVudCA9IHRydWU7Ci0gICAgICAgIHRoaXMucmVzb3VyY2UuY3VycmVudFJldmlzaW9u LnVwZGF0ZVJldmlzaW9uQ29udGVudCh0aGlzLl90ZXh0RWRpdG9yLnN0cmluZyk7CisgICAgICAg IHRoaXMucmVzb3VyY2UuZWRpdGFibGVSZXZpc2lvbi51cGRhdGVSZXZpc2lvbkNvbnRlbnQodGhp cy5fdGV4dEVkaXRvci5zdHJpbmcpOwogICAgICAgICB0aGlzLl9pZ25vcmVTb3VyY2VDb2RlQ29u dGVudERpZENoYW5nZUV2ZW50ID0gZmFsc2U7CiAgICAgfQogCg== 383975 2019-11-20 11:33:42 -0800 2019-11-20 13:23:43 -0800 Patch for landing bug-204086-20191120113342.patch text/plain 10822 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyNjkyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA4 YTgxZTFiZTQwZTA2MGMxODNiMWRlMDNiZDBhODg4OWQ1M2YwOTk1Li41MmEwYjg1YWM1NDM1NjIw M2M3MmE2OWUzZTdlNDIyZWI2MzNjNmEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzOCBAQAorMjAxOS0xMS0xMiAgWXVyeSBTZW1pa2hhdHNreSAgPHl1cnlzQGNocm9taXVt Lm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBSRUdSRVNTSU9OKHIyNTA2MTgpOiBtYWlu IHJlc291cmNlIHZpZXcgaXMgZW1wdHkgd2hlbiBwYXVzaW5nIG9uIGlubGluZSAnZGVidWdnZXIn IHN0YXRlbWVudAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjA0MDg2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGV2aW4gUm91c3NvLgorCisgICAgICAg IFNvdXJjZUNvZGVSZXZpc2lvbi5jdXJyZW50UmV2aXNpb24gZG9lc24ndCBjcmVhdGUgbmV3IHJl dmlzaW9ucyB1bmRlciB0aGUgaG9vZCBhbnltb3JlLgorICAgICAgICBUaGlzIGFsbG93cyB0byBh dm9pZCB1bmRlc2lyYWJsZSBzaWRlIGVmZmVjdHMgd2hlbiBlLmcuIHRleHQgZWRpdG9yIHRyaWVz IHRvIHJlYWQgY3VycmVudAorICAgICAgICBjb250ZW50IG9mIHRoZSBTb3VyY2VDb2RlIHdoaWNo IHJlc3VsdHMgaW4gYSBuZXcgcmV2aXNpb24gKHdpdGggZW1wdHkgY29udGVudCkuIAorICAgICAg ICBOZXcgbWV0aG9kIGVkaXRhYmxlUmV2aXNpb24gaXMgaW50cm9kdWNlZCBmb3IgYXBwbHlpbmcg Y2hhbmdlcyB0byB0aGUgcmVzb3VyY2Ugd2hpbGUKKyAgICAgICAga2VlcGluZyBvcmlnaW5hbCBj b250ZW50IHJldmlzaW9uIGludGFjdC4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJv bGxlcnMvQ1NTTWFuYWdlci5qczoKKyAgICAgICAgKFdJLkNTU01hbmFnZXIucHJvdG90eXBlLl9y ZXNvdXJjZUNvbnRlbnREaWRDaGFuZ2UuYXBwbHlTdHlsZVNoZWV0Q2hhbmdlcy5zdHlsZVNoZWV0 Rm91bmQpOgorICAgICAgICAoV0kuQ1NTTWFuYWdlci5wcm90b3R5cGUuX3Jlc291cmNlQ29udGVu dERpZENoYW5nZS5hcHBseVN0eWxlU2hlZXRDaGFuZ2VzKToKKyAgICAgICAgKFdJLkNTU01hbmFn ZXIucHJvdG90eXBlLl9yZXNvdXJjZUNvbnRlbnREaWRDaGFuZ2UpOgorICAgICAgICAoV0kuQ1NT TWFuYWdlci5wcm90b3R5cGUuX3VwZGF0ZVJlc291cmNlQ29udGVudC5mZXRjaGVkU3R5bGVTaGVl dENvbnRlbnQpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL1NvdXJjZUNvZGUuanM6 CisgICAgICAgIChXSS5Tb3VyY2VDb2RlLnByb3RvdHlwZS5nZXQgY3VycmVudFJldmlzaW9uKToK KyAgICAgICAgKFdJLlNvdXJjZUNvZGUucHJvdG90eXBlLmdldCBlZGl0YWJsZVJldmlzaW9uKToK KyAgICAgICAgKFdJLlNvdXJjZUNvZGUucHJvdG90eXBlLmdldCBjb250ZW50KToKKyAgICAgICAg KFdJLlNvdXJjZUNvZGUucHJvdG90eXBlLnJldmlzaW9uQ29udGVudERpZENoYW5nZSk6CisgICAg ICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Gb250UmVzb3VyY2VDb250ZW50Vmlldy5qczoKKyAg ICAgICAgKFdJLkZvbnRSZXNvdXJjZUNvbnRlbnRWaWV3LnByb3RvdHlwZS5kcm9wWm9uZUhhbmRs ZURyb3ApOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvSW1hZ2VSZXNvdXJjZUNvbnRl bnRWaWV3LmpzOgorICAgICAgICAoV0kuSW1hZ2VSZXNvdXJjZUNvbnRlbnRWaWV3LnByb3RvdHlw ZS5kcm9wWm9uZUhhbmRsZURyb3ApOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUmVz b3VyY2VDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLlJlc291cmNlQ29udGVudFZpZXcucHJv dG90eXBlLl9jb250ZW50QXZhaWxhYmxlKToKKyAgICAgICAgKFdJLlJlc291cmNlQ29udGVudFZp ZXcucHJvdG90eXBlLl9oYW5kbGVJbXBvcnRMb2NhbFJlc291cmNlT3ZlcnJpZGUpOgorICAgICAg ICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0Q29udGVudFZpZXcuanM6CisgICAgICAgIChX SS5TY3JpcHRDb250ZW50Vmlldy5wcm90b3R5cGUuX2hhbmRsZVRleHRFZGl0b3JDb250ZW50RGlk Q2hhbmdlKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1RleHRSZXNvdXJjZUNvbnRl bnRWaWV3LmpzOgorICAgICAgICAoV0kuVGV4dFJlc291cmNlQ29udGVudFZpZXcucHJvdG90eXBl Ll90ZXh0RWRpdG9yQ29udGVudERpZENoYW5nZSk6CisKIDIwMTktMTEtMTkgIERldmluIFJvdXNz byAgPGRyb3Vzc29AYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IExvY2FsIE92 ZXJyaWRlczogdGhlIHBsYWNlaG9sZGVyIGZvciB0aGUgTUlNRSB0eXBlLCBzdGF0dXMgY29kZSwg YW5kIHN0YXR1cyB0ZXh0IGlzIHRoZSBzYW1lIGFzIHRoZSBwbGFjZWhvbGRlciBVUkwKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NT U01hbmFnZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9s bGVycy9DU1NNYW5hZ2VyLmpzCmluZGV4IDQyMDExNDJmNTYxZGVlNjBiYjYyNDQ1YzFjOGYwM2Jl YmM3MDY4Y2EuLjA1NDJkODUxNjNkNmZhNTM0MTY3YWQ1NmNiMmVjOTI0MzgzZGJhMmUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NT U01hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29u dHJvbGxlcnMvQ1NTTWFuYWdlci5qcwpAQCAtNjYwLDcgKzY2MCw3IEBAIFdJLkNTU01hbmFnZXIg PSBjbGFzcyBDU1NNYW5hZ2VyIGV4dGVuZHMgV0kuT2JqZWN0CiAgICAgICAgICAgICAgICAgLy8g aWdub3JlIHRoZSBuZXh0IF91cGRhdGVSZXNvdXJjZUNvbnRlbnQgY2FsbC4KICAgICAgICAgICAg ICAgICByZXNvdXJjZS5fX2lnbm9yZU5leHRVcGRhdGVSZXNvdXJjZUNvbnRlbnQgPSB0cnVlOwog Ci0gICAgICAgICAgICAgICAgbGV0IHJldmlzaW9uID0gc3R5bGVTaGVldC5jdXJyZW50UmV2aXNp b247CisgICAgICAgICAgICAgICAgbGV0IHJldmlzaW9uID0gc3R5bGVTaGVldC5lZGl0YWJsZVJl dmlzaW9uOwogICAgICAgICAgICAgICAgIHJldmlzaW9uLnVwZGF0ZVJldmlzaW9uQ29udGVudChy ZXNvdXJjZS5jb250ZW50KTsKICAgICAgICAgICAgIH0KIApAQCAtNzA0LDcgKzcwNCw3IEBAIFdJ LkNTU01hbmFnZXIgPSBjbGFzcyBDU1NNYW5hZ2VyIGV4dGVuZHMgV0kuT2JqZWN0CiAKICAgICAg ICAgICAgIHRoaXMuX2lnbm9yZVJlc291cmNlQ29udGVudERpZENoYW5nZUV2ZW50Rm9yUmVzb3Vy Y2UgPSByZXByZXNlbnRlZE9iamVjdDsKIAotICAgICAgICAgICAgbGV0IHJldmlzaW9uID0gcmVw cmVzZW50ZWRPYmplY3QuY3VycmVudFJldmlzaW9uOworICAgICAgICAgICAgbGV0IHJldmlzaW9u ID0gcmVwcmVzZW50ZWRPYmplY3QuZWRpdGFibGVSZXZpc2lvbjsKICAgICAgICAgICAgIGlmIChz dHlsZVNoZWV0LmlzSW5zcGVjdG9yU3R5bGVTaGVldCgpKSB7CiAgICAgICAgICAgICAgICAgcmV2 aXNpb24udXBkYXRlUmV2aXNpb25Db250ZW50KHJlcHJlc2VudGVkT2JqZWN0LmNvbnRlbnQpOwog ICAgICAgICAgICAgICAgIHN0eWxlU2hlZXQuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdJLlNv dXJjZUNvZGUuRXZlbnQuQ29udGVudERpZENoYW5nZSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvU291cmNlQ29kZS5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Tb3VyY2VDb2RlLmpzCmluZGV4IDNl MjZmZmMyNzU5ODg0MDU1NWNmZTZhZGRmYTE5ODEzNTRmZTYwZWIuLjRhNDAzMjMwODNkNDk5ZGY4 ZmQyZDA5MTFiOTViZjk1ODM2MmRlNWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL01vZGVscy9Tb3VyY2VDb2RlLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Tb3VyY2VDb2RlLmpzCkBAIC02Niw3ICs2Niw2 IEBAIFdJLlNvdXJjZUNvZGUgPSBjbGFzcyBTb3VyY2VDb2RlIGV4dGVuZHMgV0kuT2JqZWN0CiAK ICAgICBnZXQgY3VycmVudFJldmlzaW9uKCkKICAgICB7Ci0gICAgICAgIHRoaXMuX2luaXRpYWxp emVDdXJyZW50UmV2aXNpb25JZk5lZWRlZCgpOwogICAgICAgICByZXR1cm4gdGhpcy5fY3VycmVu dFJldmlzaW9uOwogICAgIH0KIApAQCAtODUsOSArODQsMTYgQEAgV0kuU291cmNlQ29kZSA9IGNs YXNzIFNvdXJjZUNvZGUgZXh0ZW5kcyBXSS5PYmplY3QKICAgICAgICAgdGhpcy5kaXNwYXRjaEV2 ZW50VG9MaXN0ZW5lcnMoV0kuU291cmNlQ29kZS5FdmVudC5Db250ZW50RGlkQ2hhbmdlKTsKICAg ICB9CiAKKyAgICBnZXQgZWRpdGFibGVSZXZpc2lvbigpCisgICAgeworICAgICAgICBpZiAodGhp cy5fY3VycmVudFJldmlzaW9uID09PSB0aGlzLl9vcmlnaW5hbFJldmlzaW9uKQorICAgICAgICAg ICAgdGhpcy5fY3VycmVudFJldmlzaW9uID0gdGhpcy5fb3JpZ2luYWxSZXZpc2lvbi5jb3B5KCk7 CisgICAgICAgIHJldHVybiB0aGlzLl9jdXJyZW50UmV2aXNpb247CisgICAgfQorCiAgICAgZ2V0 IGNvbnRlbnQoKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuY3VycmVudFJldmlzaW9uLmNv bnRlbnQ7CisgICAgICAgIHJldHVybiB0aGlzLl9jdXJyZW50UmV2aXNpb24uY29udGVudDsKICAg ICB9CiAKICAgICBnZXQgdXJsKCkKQEAgLTE3OCwxMyArMTg0LDExIEBAIFdJLlNvdXJjZUNvZGUg PSBjbGFzcyBTb3VyY2VDb2RlIGV4dGVuZHMgV0kuT2JqZWN0CiAKICAgICByZXZpc2lvbkNvbnRl bnREaWRDaGFuZ2UocmV2aXNpb24pCiAgICAgewotICAgICAgICBpZiAocmV2aXNpb24gPT09IHRo aXMuX29yaWdpbmFsUmV2aXNpb24pCi0gICAgICAgICAgICB0aGlzLl9pbml0aWFsaXplQ3VycmVu dFJldmlzaW9uSWZOZWVkZWQoKTsKLQogICAgICAgICBpZiAodGhpcy5faWdub3JlUmV2aXNpb25D b250ZW50RGlkQ2hhbmdlRXZlbnQpCiAgICAgICAgICAgICByZXR1cm47CiAKLSAgICAgICAgaWYg KHJldmlzaW9uICE9PSB0aGlzLmN1cnJlbnRSZXZpc2lvbikKKyAgICAgICAgY29uc29sZS5hc3Nl cnQocmV2aXNpb24gPT09IHRoaXMuX2N1cnJlbnRSZXZpc2lvbik7CisgICAgICAgIGlmIChyZXZp c2lvbiAhPT0gdGhpcy5fY3VycmVudFJldmlzaW9uKQogICAgICAgICAgICAgcmV0dXJuOwogCiAg ICAgICAgIHRoaXMuaGFuZGxlQ3VycmVudFJldmlzaW9uQ29udGVudENoYW5nZSgpOwpAQCAtMjI0 LDEyICsyMjgsNiBAQCBXSS5Tb3VyY2VDb2RlID0gY2xhc3MgU291cmNlQ29kZSBleHRlbmRzIFdJ Lk9iamVjdAogCiAgICAgLy8gUHJpdmF0ZQogCi0gICAgX2luaXRpYWxpemVDdXJyZW50UmV2aXNp b25JZk5lZWRlZCgpCi0gICAgewotICAgICAgICBpZiAodGhpcy5fY3VycmVudFJldmlzaW9uID09 PSB0aGlzLl9vcmlnaW5hbFJldmlzaW9uKQotICAgICAgICAgICAgdGhpcy5fY3VycmVudFJldmlz aW9uID0gdGhpcy5fb3JpZ2luYWxSZXZpc2lvbi5jb3B5KCk7Ci0gICAgfQotCiAgICAgX3Byb2Nl c3NDb250ZW50KHBhcmFtZXRlcnMpCiAgICAgewogICAgICAgICAvLyBEaWZmZXJlbnQgYmFja2Vu ZCBBUElzIHJldHVybiBvbmUgb2YgYGNvbnRlbnQsIGBib2R5YCwgYHRleHRgLCBvciBgc2NyaXB0 U291cmNlYC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0ZvbnRSZXNvdXJjZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvRm9udFJlc291cmNlQ29udGVudFZpZXcuanMKaW5kZXggODk5 M2U1ZTJjNzdjYmNjMGIxODhiNGY1Yjc3M2IyYWQ2ZjU5NjgzOC4uZDZjYjBjMmYyNjMxNDgwNWU4 ZWJlMjAyMjMzNjU5OTc5MDNjM2VhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvRm9udFJlc291cmNlQ29udGVudFZpZXcuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRm9udFJlc291cmNlQ29udGVu dFZpZXcuanMKQEAgLTE0Niw3ICsxNDYsNyBAQCBXSS5Gb250UmVzb3VyY2VDb250ZW50VmlldyA9 IGNsYXNzIEZvbnRSZXNvdXJjZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuUmVzb3VyY2VDbwogCiAg ICAgICAgICAgICBjb25zb2xlLmFzc2VydChsb2NhbFJlc291cmNlT3ZlcnJpZGUpOwogCi0gICAg ICAgICAgICBsZXQgcmV2aXNpb24gPSBsb2NhbFJlc291cmNlT3ZlcnJpZGUubG9jYWxSZXNvdXJj ZS5jdXJyZW50UmV2aXNpb247CisgICAgICAgICAgICBsZXQgcmV2aXNpb24gPSBsb2NhbFJlc291 cmNlT3ZlcnJpZGUubG9jYWxSZXNvdXJjZS5lZGl0YWJsZVJldmlzaW9uOwogICAgICAgICAgICAg cmV2aXNpb24udXBkYXRlUmV2aXNpb25Db250ZW50KGNvbnRlbnQsIHtiYXNlNjRFbmNvZGVkLCBt aW1lVHlwZX0pOwogCiAgICAgICAgICAgICBpZiAoIXRoaXMuc2hvd2luZ0xvY2FsUmVzb3VyY2VP dmVycmlkZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0ltYWdlUmVzb3VyY2VDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0ltYWdlUmVzb3VyY2VDb250ZW50Vmlldy5qcwppbmRleCAy MDZjOTE3OGMwZWQ5MDc0NmI1ZDFiMmU0NjMyODk4NTYxZGQzZDhhLi5kYTZiNmJhM2IxNzQwZGRl YTM1YjdkMTAwNTE1NDk3NzEzMzdlYTg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9JbWFnZVJlc291cmNlQ29udGVudFZpZXcuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvSW1hZ2VSZXNvdXJjZUNv bnRlbnRWaWV3LmpzCkBAIC0xNjEsNyArMTYxLDcgQEAgV0kuSW1hZ2VSZXNvdXJjZUNvbnRlbnRW aWV3ID0gY2xhc3MgSW1hZ2VSZXNvdXJjZUNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuUmVzb3VyY2UK IAogICAgICAgICAgICAgY29uc29sZS5hc3NlcnQobG9jYWxSZXNvdXJjZU92ZXJyaWRlKTsKIAot ICAgICAgICAgICAgbGV0IHJldmlzaW9uID0gbG9jYWxSZXNvdXJjZU92ZXJyaWRlLmxvY2FsUmVz b3VyY2UuY3VycmVudFJldmlzaW9uOworICAgICAgICAgICAgbGV0IHJldmlzaW9uID0gbG9jYWxS ZXNvdXJjZU92ZXJyaWRlLmxvY2FsUmVzb3VyY2UuZWRpdGFibGVSZXZpc2lvbjsKICAgICAgICAg ICAgIHJldmlzaW9uLnVwZGF0ZVJldmlzaW9uQ29udGVudChjb250ZW50LCB7YmFzZTY0RW5jb2Rl ZCwgbWltZVR5cGV9KTsKIAogICAgICAgICAgICAgaWYgKCF0aGlzLnNob3dpbmdMb2NhbFJlc291 cmNlT3ZlcnJpZGUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9SZXNvdXJjZUNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvUmVzb3VyY2VDb250ZW50Vmlldy5qcwppbmRleCA5MGU2NDhi NWRjYjNmZmJjYjVjNTc3OWVhNjk5ZTVjMzljZmRjZDBmLi41MmFhYzNmNzg5NDM5NTc3NTZiNmVi YTlmM2M5MmFmYWExZGFjYThkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlQ29udGVudFZpZXcuanMKQEAg LTIwOSw4ICsyMDksMTIgQEAgV0kuUmVzb3VyY2VDb250ZW50VmlldyA9IGNsYXNzIFJlc291cmNl Q29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICB9CiAKKyAgICAgICAgLy8gVGhlIHZpZXcgbWF5YmUgcG9wdWxhdGVkIHdpdGggaW5s aW5lIHNjcmlwdHMgY29udGVudCBieSB0aGUgdGltZSByZXNvdXJjZQorICAgICAgICAvLyBjb250 ZW50IGFycml2ZXMuIFNvdXJjZUNvZGVUZXh0RWRpdG9yIHdpbGwgaGFuZGxlIHRoYXQuCisgICAg ICAgIGlmICh0aGlzLl9oYXNDb250ZW50KCkpCisgICAgICAgICAgICByZXR1cm47CisKICAgICAg ICAgLy8gQ29udGVudCBpcyByZWFkeSB0byBzaG93LCBjYWxsIHRoZSBwdWJsaWMgbWV0aG9kIG5v dy4KLSAgICAgICAgY29uc29sZS5hc3NlcnQoIXRoaXMuX2hhc0NvbnRlbnQoKSk7CiAgICAgICAg IGNvbnNvbGUuYXNzZXJ0KHBhcmFtZXRlcnMuc291cmNlQ29kZSA9PT0gdGhpcy5fcmVzb3VyY2Up OwogICAgICAgICB0aGlzLmNvbnRlbnRBdmFpbGFibGUocGFyYW1ldGVycy5zb3VyY2VDb2RlLmNv bnRlbnQsIHBhcmFtZXRlcnMuYmFzZTY0RW5jb2RlZCk7CiAKQEAgLTI5MCw4ICsyOTQsOCBAQCBX SS5SZXNvdXJjZUNvbnRlbnRWaWV3ID0gY2xhc3MgUmVzb3VyY2VDb250ZW50VmlldyBleHRlbmRz IFdJLkNvbnRlbnRWaWV3CiAgICAgICAgICAgICBsZXQgbG9jYWxSZXNvdXJjZU92ZXJyaWRlID0g V0kubmV0d29ya01hbmFnZXIubG9jYWxSZXNvdXJjZU92ZXJyaWRlRm9yVVJMKHRoaXMucmVzb3Vy Y2UudXJsKTsKICAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGxvY2FsUmVzb3VyY2VPdmVycmlk ZSk7CiAKLSAgICAgICAgICAgIGxldCByZXZpc2lvbiA9IGxvY2FsUmVzb3VyY2VPdmVycmlkZS5s b2NhbFJlc291cmNlLmN1cnJlbnRSZXZpc2lvbjsKICAgICAgICAgICAgIGF3YWl0IHRoaXMuX2dl dENvbnRlbnRGb3JMb2NhbFJlc291cmNlT3ZlcnJpZGVGcm9tRmlsZShmaWxlTGlzdFswXSwgKHtt aW1lVHlwZSwgYmFzZTY0RW5jb2RlZCwgY29udGVudH0pID0+IHsKKyAgICAgICAgICAgICAgICBs ZXQgcmV2aXNpb24gPSBsb2NhbFJlc291cmNlT3ZlcnJpZGUubG9jYWxSZXNvdXJjZS5lZGl0YWJs ZVJldmlzaW9uOwogICAgICAgICAgICAgICAgIHJldmlzaW9uLnVwZGF0ZVJldmlzaW9uQ29udGVu dChjb250ZW50LCB7YmFzZTY0RW5jb2RlZCwgbWltZVR5cGV9KTsKICAgICAgICAgICAgIH0pOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9T Y3JpcHRDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL1NjcmlwdENvbnRlbnRWaWV3LmpzCmluZGV4IGRmYzU1MWFjN2ZlNGY2Nzg2MTMyOTM3 ZDVmOGNlZDc4ODk3ZDg4ZDguLmNkMzUwMWY4NzYzZDEzYzZiY2RhMTVmN2NkYTFjNzM1MTZhMmEx ZTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L1NjcmlwdENvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1NjcmlwdENvbnRlbnRWaWV3LmpzCkBAIC0yMzYsNyArMjM2LDcgQEAgV0ku U2NyaXB0Q29udGVudFZpZXcgPSBjbGFzcyBTY3JpcHRDb250ZW50VmlldyBleHRlbmRzIFdJLkNv bnRlbnRWaWV3CiAKICAgICBfaGFuZGxlVGV4dEVkaXRvckNvbnRlbnREaWRDaGFuZ2UoZXZlbnQp CiAgICAgewotICAgICAgICB0aGlzLl9zY3JpcHQuY3VycmVudFJldmlzaW9uLnVwZGF0ZVJldmlz aW9uQ29udGVudCh0aGlzLl90ZXh0RWRpdG9yLnN0cmluZyk7CisgICAgICAgIHRoaXMuX3Njcmlw dC5lZGl0YWJsZVJldmlzaW9uLnVwZGF0ZVJldmlzaW9uQ29udGVudCh0aGlzLl90ZXh0RWRpdG9y LnN0cmluZyk7CiAgICAgfQogCiAgICAgX3RvZ2dsZVByZXR0eVByaW50KGV2ZW50KQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGV4dFJlc291 cmNlQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9UZXh0UmVzb3VyY2VDb250ZW50Vmlldy5qcwppbmRleCBlOWIwNTI5ZGIyZmFlM2NiYWJh YjFlY2YzZDYwNjkzM2MzN2RmZDUxLi45YWQ4ZGQzOTEwMzAxNWQzOGFjYjNjNDA1ZGU2YTdlYzE0 OTRlYjVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9UZXh0UmVzb3VyY2VDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9UZXh0UmVzb3VyY2VDb250ZW50Vmlldy5qcwpAQCAtMjg5 LDcgKzI4OSw3IEBAIFdJLlRleHRSZXNvdXJjZUNvbnRlbnRWaWV3ID0gY2xhc3MgVGV4dFJlc291 cmNlQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5SZXNvdXJjZUNvCiAgICAgX3RleHRFZGl0b3JDb250 ZW50RGlkQ2hhbmdlKGV2ZW50KQogICAgIHsKICAgICAgICAgdGhpcy5faWdub3JlU291cmNlQ29k ZUNvbnRlbnREaWRDaGFuZ2VFdmVudCA9IHRydWU7Ci0gICAgICAgIHRoaXMucmVzb3VyY2UuY3Vy cmVudFJldmlzaW9uLnVwZGF0ZVJldmlzaW9uQ29udGVudCh0aGlzLl90ZXh0RWRpdG9yLnN0cmlu Zyk7CisgICAgICAgIHRoaXMucmVzb3VyY2UuZWRpdGFibGVSZXZpc2lvbi51cGRhdGVSZXZpc2lv bkNvbnRlbnQodGhpcy5fdGV4dEVkaXRvci5zdHJpbmcpOwogICAgICAgICB0aGlzLl9pZ25vcmVT b3VyY2VDb2RlQ29udGVudERpZENoYW5nZUV2ZW50ID0gZmFsc2U7CiAgICAgfQogCg==