176988 2017-09-15 00:55:27 -0700 Web Inspector: REGRESSION(r222057): recording state doesn't update when changing actions 2017-09-27 12:25:54 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 176936 173807 1 hi hi commit-queue inspector-bugzilla-changes mattbaker webkit-bug-importer oldest_to_newest 1349217 0 hi 2017-09-15 00:55:27 -0700 The changes in <https://webkit.org/b/176936> caused the details sidebars to first request that the recording's actions promise resolved before attempting to pull information from the context/action. In the case of the Trace panel, this was fine since it doesn't need the context to render its content. For the State panel, however, it needs to be able to access the context before `restore()` is called. Since the recording's actions promise will resolve on the next tick, the synchronous `WI.RecordingContentView.prototype._generateContentCanvas2D()` will run to completion before the State panel has a chance to do so, meaning that the State panel will access the context after it has been `restore()`d. 1349218 1 320878 hi 2017-09-15 00:57:27 -0700 Created attachment 320878 Patch 1349517 2 320878 mattbaker 2017-09-15 13:44:12 -0700 Comment on attachment 320878 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=320878&action=review r=me > Source/WebInspectorUI/UserInterface/Views/RecordingStateDetailsSidebarPanel.js:33 > + this._action = NaN; Should be null instead of NaN. > Source/WebInspectorUI/UserInterface/Views/RecordingStateDetailsSidebarPanel.js:84 > + _generateDetailsCanvas2D(action, context, options = {}) A more descriptive name would be nice. How about `_populateCanvasStateDataGrid`? I think having the name be canvas-type agnostic is fine. > Source/WebInspectorUI/UserInterface/Views/RecordingTraceDetailsSidebarPanel.js:82 > + noTraceDataMessageElement.textContent = WI.UIString("No Trace Data"); What about "Call Stack Unavailable" or "No Call Stack" instead? As an aside, I think we should standardize on referring to traces/stack traces as call stacks in user-facing text. Variables names for things can still be trace, etc. 1349594 3 320878 hi 2017-09-15 17:40:52 -0700 Comment on attachment 320878 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=320878&action=review >> Source/WebInspectorUI/UserInterface/Views/RecordingStateDetailsSidebarPanel.js:84 >> + _generateDetailsCanvas2D(action, context, options = {}) > > A more descriptive name would be nice. How about `_populateCanvasStateDataGrid`? I think having the name be canvas-type agnostic is fine. In the future, we may want to display state information about WebGL contexts (such as which buffer is bound). I think that keeping this name as is makes it easier to distinguish what context type will be used when generating the content. Furthermore, this matches the naming style of RecordingNavigationSidebarPanel. 1349595 4 320978 hi 2017-09-15 17:43:23 -0700 Created attachment 320978 Patch 1349596 5 320979 hi 2017-09-15 17:44:50 -0700 Created attachment 320979 Patch Forgot to change bug title 1349611 6 320979 commit-queue 2017-09-15 19:12:20 -0700 Comment on attachment 320979 Patch Clearing flags on attachment: 320979 Committed r222124: <http://trac.webkit.org/changeset/222124> 1349612 7 commit-queue 2017-09-15 19:12:22 -0700 All reviewed patches have been landed. Closing bug. 1353372 8 webkit-bug-importer 2017-09-27 12:25:54 -0700 <rdar://problem/34693265> 320878 2017-09-15 00:57:27 -0700 2017-09-15 17:43:20 -0700 Patch bug-176988-20170915005726.patch text/plain 9985 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGVhNGM1YjIyYjY1OTQyMmNiOGVlYzcyYjIzMWY1 YzJiZDVjOGU2ZTcuLmY3NmNkNjIxZWQyZGViMzUwYTg5MjZkZTQ0YmU5MzUyZDYzMjUzMmEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE3LTA5LTE1ICBEZXZp biBSb3Vzc28gIDx3ZWJraXRAZGV2aW5yb3Vzc28uY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFJFR1JFU1NJT04ocjIyMjA1Nyk6IHJlY29yZGluZyBzdGF0ZSBkb2Vzbid0IGxvbmdlciB1 cGRhdGUgd2hlbiBjaGFuZ2luZyBhY3Rpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNzY5ODgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBSZXBsYWNlIGB1cGRhdGVBY3Rpb25JbmRleGAgd2l0aCBgdXBk YXRlQWN0aW9uYCwgd2hlcmUgdGhlIGN1cnJlbnRseSBzZWxlY3RlZCBSZWNvcmRpbmdBY3Rpb24K KyAgICAgICAgaXMgcGFzc2VkIHRvIHRoZSBEZXRhaWxzU2lkZWJhclBhbmVsLiBBbHNvIHJlbW92 ZSB0aGUgY2FsbCB0byBgdGhpcy5fcmVjb3JkaW5nLmFjdGlvbnNgIGluCisgICAgICAgIG9yZGVy IHRvIGVuc3VyZSB0aGF0IGFsbCBsb2dpYyBwZXJmb3JtZWQgYnkgYm90aCBEZXRhaWxzU2lkZWJh clBhbmVsIGlzIHN5bmNocm9ub3VzLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9S ZWNvcmRpbmdUYWJDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLlJlY29yZGluZ1RhYkNvbnRl bnRWaWV3LnByb3RvdHlwZS5fdXBkYXRlQWN0aW9uSW5kZXgpOgorCisgICAgICAgICogVXNlcklu dGVyZmFjZS9WaWV3cy9SZWNvcmRpbmdDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLlJlY29y ZGluZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5hc3luYy5fZ2VuZXJhdGVDb250ZW50Q2FudmFzMkQp OgorICAgICAgICAoV0kuUmVjb3JkaW5nQ29udGVudFZpZXcucHJvdG90eXBlLmFzeW5jLl9nZW5l cmF0ZUNvbnRlbnRDYW52YXNXZWJHTCk6CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdz L1JlY29yZGluZ1N0YXRlRGV0YWlsc1NpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdJLlJlY29y ZGluZ1N0YXRlRGV0YWlsc1NpZGViYXJQYW5lbCk6CisgICAgICAgIChXSS5SZWNvcmRpbmdTdGF0 ZURldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLnNldCByZWNvcmRpbmcpOgorICAgICAgICAo V0kuUmVjb3JkaW5nU3RhdGVEZXRhaWxzU2lkZWJhclBhbmVsLnByb3RvdHlwZS51cGRhdGVBY3Rp b24pOgorICAgICAgICAoV0kuUmVjb3JkaW5nU3RhdGVEZXRhaWxzU2lkZWJhclBhbmVsLnByb3Rv dHlwZS5fZ2VuZXJhdGVEZXRhaWxzQ2FudmFzMkQpOgorICAgICAgICAoV0kuUmVjb3JkaW5nU3Rh dGVEZXRhaWxzU2lkZWJhclBhbmVsLnByb3RvdHlwZS51cGRhdGVBY3Rpb25JbmRleCk6IERlbGV0 ZWQuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1JlY29yZGluZ1RyYWNlRGV0YWls c1NpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdJLlJlY29yZGluZ1RyYWNlRGV0YWlsc1NpZGVi YXJQYW5lbCk6CisgICAgICAgIChXSS5SZWNvcmRpbmdUcmFjZURldGFpbHNTaWRlYmFyUGFuZWwu cHJvdG90eXBlLnNldCByZWNvcmRpbmcpOgorICAgICAgICAoV0kuUmVjb3JkaW5nVHJhY2VEZXRh aWxzU2lkZWJhclBhbmVsLnByb3RvdHlwZS51cGRhdGVBY3Rpb24pOgorICAgICAgICAoV0kuUmVj b3JkaW5nVHJhY2VEZXRhaWxzU2lkZWJhclBhbmVsLnByb3RvdHlwZS51cGRhdGVBY3Rpb25JbmRl eCk6IERlbGV0ZWQuCisKIDIwMTctMDktMTQgIEpvc2VwaCBQZWNvcmFybyAgPHBlY29yYXJvQGFw cGxlLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIHJvbGxvdXQgcjIyMjAzNi4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlY29yZGluZ0Nv bnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv UmVjb3JkaW5nQ29udGVudFZpZXcuanMKaW5kZXggMjQzMzY2YWYyOTI5NDdhMDExODE1MWU2Mjgy OWYwMTNlNjNiYmYyNC4uMjY0MjlhN2FkY2VlOTg0YmZkZjBmMGRjZTFmM2Y1NGE5NmE3Y2FkMCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVj b3JkaW5nQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvUmVjb3JkaW5nQ29udGVudFZpZXcuanMKQEAgLTM5OCw3ICszOTgsNyBAQCBX SS5SZWNvcmRpbmdDb250ZW50VmlldyA9IGNsYXNzIFJlY29yZGluZ0NvbnRlbnRWaWV3IGV4dGVu ZHMgV0kuQ29udGVudFZpZXcKIAogICAgICAgICBhcHBseUFjdGlvbnMoc25hcHNob3QuaW5kZXgs IHRoaXMuX2luZGV4LCAoKSA9PiB7CiAgICAgICAgICAgICBpZiAob3B0aW9ucy5hY3Rpb25Db21w bGV0ZWRDYWxsYmFjaykKLSAgICAgICAgICAgICAgICBvcHRpb25zLmFjdGlvbkNvbXBsZXRlZENh bGxiYWNrKHNuYXBzaG90LmNvbnRleHQpOworICAgICAgICAgICAgICAgIG9wdGlvbnMuYWN0aW9u Q29tcGxldGVkQ2FsbGJhY2soYWN0aW9uc1t0aGlzLl9pbmRleF0sIHNuYXBzaG90LmNvbnRleHQp OwogICAgICAgICB9KTsKIAogICAgICAgICB0aGlzLl9wcmV2aWV3Q29udGFpbmVyLmFwcGVuZENo aWxkKHNuYXBzaG90LmVsZW1lbnQpOwpAQCAtNDQ4LDcgKzQ0OCw3IEBAIFdJLlJlY29yZGluZ0Nv bnRlbnRWaWV3ID0gY2xhc3MgUmVjb3JkaW5nQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50 VmlldwogICAgICAgICB9CiAKICAgICAgICAgaWYgKG9wdGlvbnMuYWN0aW9uQ29tcGxldGVkQ2Fs bGJhY2spCi0gICAgICAgICAgICBvcHRpb25zLmFjdGlvbkNvbXBsZXRlZENhbGxiYWNrKCk7Cisg ICAgICAgICAgICBvcHRpb25zLmFjdGlvbkNvbXBsZXRlZENhbGxiYWNrKGFjdGlvbnNbdGhpcy5f aW5kZXhdKTsKICAgICB9CiAKICAgICBfYXBwbHlBY3Rpb24oY29udGV4dCwgYWN0aW9uLCBvcHRp b25zID0ge30pCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9SZWNvcmRpbmdTdGF0ZURldGFpbHNTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZWNvcmRpbmdTdGF0ZURldGFpbHNTaWRl YmFyUGFuZWwuanMKaW5kZXggZTI1NTNmZTE3ODU0NTNlOGRkODliZGQzNmYyMjg0MDJkNWE1MjZh Yy4uNTZkMmJjYmU3NGJhZDMwZDFlMjI5YzE4MzMwNzQ0MDViZmZjNTRiMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5nU3RhdGVE ZXRhaWxzU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1JlY29yZGluZ1N0YXRlRGV0YWlsc1NpZGViYXJQYW5lbC5qcwpAQCAtMzAs NyArMzAsNyBAQCBXSS5SZWNvcmRpbmdTdGF0ZURldGFpbHNTaWRlYmFyUGFuZWwgPSBjbGFzcyBS ZWNvcmRpbmdTdGF0ZURldGFpbHNTaWRlYmFyUGFuZWwgZQogICAgICAgICBzdXBlcigicmVjb3Jk aW5nLXN0YXRlIiwgV0kuVUlTdHJpbmcoIlN0YXRlIikpOwogCiAgICAgICAgIHRoaXMuX3JlY29y ZGluZyA9IG51bGw7Ci0gICAgICAgIHRoaXMuX2luZGV4ID0gTmFOOworICAgICAgICB0aGlzLl9h Y3Rpb24gPSBOYU47CiAKICAgICAgICAgdGhpcy5fZGF0YUdyaWQgPSBudWxsOwogICAgIH0KQEAg LTYwLDM0ICs2MCwyOCBAQCBXSS5SZWNvcmRpbmdTdGF0ZURldGFpbHNTaWRlYmFyUGFuZWwgPSBj bGFzcyBSZWNvcmRpbmdTdGF0ZURldGFpbHNTaWRlYmFyUGFuZWwgZQogICAgICAgICAgICAgcmV0 dXJuOwogCiAgICAgICAgIHRoaXMuX3JlY29yZGluZyA9IHJlY29yZGluZzsKLSAgICAgICAgdGhp cy5faW5kZXggPSBOYU47CisgICAgICAgIHRoaXMuX2FjdGlvbiA9IG51bGw7CiAKICAgICAgICAg Zm9yIChsZXQgc3VidmlldyBvZiB0aGlzLmNvbnRlbnRWaWV3LnN1YnZpZXdzKQogICAgICAgICAg ICAgdGhpcy5jb250ZW50Vmlldy5yZW1vdmVTdWJ2aWV3KHN1YnZpZXcpOwogICAgIH0KIAotICAg IHVwZGF0ZUFjdGlvbkluZGV4KGluZGV4LCBjb250ZXh0LCBvcHRpb25zID0ge30pCisgICAgdXBk YXRlQWN0aW9uKGFjdGlvbiwgY29udGV4dCwgb3B0aW9ucyA9IHt9KQogICAgIHsKLSAgICAgICAg aWYgKCF0aGlzLl9yZWNvcmRpbmcpCisgICAgICAgIGlmICghdGhpcy5fcmVjb3JkaW5nIHx8IGFj dGlvbiA9PT0gdGhpcy5fYWN0aW9uKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHRo aXMuX3JlY29yZGluZy5hY3Rpb25zLnRoZW4oKGFjdGlvbnMpID0+IHsKLSAgICAgICAgICAgIGNv bnNvbGUuYXNzZXJ0KGluZGV4ID49IDAgJiYgaW5kZXggPCBhY3Rpb25zLmxlbmd0aCk7Ci0gICAg ICAgICAgICBpZiAoaW5kZXggPCAwIHx8IGluZGV4ID4gYWN0aW9ucy5sZW5ndGggfHwgaW5kZXgg PT09IHRoaXMuX2luZGV4KQotICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdGhpcy5f YWN0aW9uID0gYWN0aW9uOwogCi0gICAgICAgICAgICB0aGlzLl9pbmRleCA9IGluZGV4OworICAg ICAgICBpZiAodGhpcy5fcmVjb3JkaW5nLnR5cGUgPT09IFdJLlJlY29yZGluZy5UeXBlLkNhbnZh czJEKQorICAgICAgICAgICAgdGhpcy5fZ2VuZXJhdGVEZXRhaWxzQ2FudmFzMkQoYWN0aW9uLCBj b250ZXh0LCBvcHRpb25zKTsKIAotICAgICAgICAgICAgaWYgKHRoaXMuX3JlY29yZGluZy50eXBl ID09PSBXSS5SZWNvcmRpbmcuVHlwZS5DYW52YXMyRCkKLSAgICAgICAgICAgICAgICB0aGlzLl9n ZW5lcmF0ZURldGFpbHNDYW52YXMyRChjb250ZXh0LCBhY3Rpb25zLCBvcHRpb25zKTsKLQotICAg ICAgICAgICAgdGhpcy51cGRhdGVMYXlvdXRJZk5lZWRlZCgpOwotICAgICAgICB9KTsKKyAgICAg ICAgdGhpcy51cGRhdGVMYXlvdXRJZk5lZWRlZCgpOwogICAgIH0KIAogICAgIC8vIFByaXZhdGUK IAotICAgIF9nZW5lcmF0ZURldGFpbHNDYW52YXMyRChjb250ZXh0LCBhY3Rpb25zLCBvcHRpb25z ID0ge30pCisgICAgX2dlbmVyYXRlRGV0YWlsc0NhbnZhczJEKGFjdGlvbiwgY29udGV4dCwgb3B0 aW9ucyA9IHt9KQogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLl9kYXRhR3JpZCkgewogICAgICAg ICAgICAgdGhpcy5fZGF0YUdyaWQgPSBuZXcgV0kuRGF0YUdyaWQoewpAQCAtMTM1LDcgKzEyOSw2 IEBAIFdJLlJlY29yZGluZ1N0YXRlRGV0YWlsc1NpZGViYXJQYW5lbCA9IGNsYXNzIFJlY29yZGlu Z1N0YXRlRGV0YWlsc1NpZGViYXJQYW5lbCBlCiAgICAgICAgIHN0YXRlLndlYmtpdExpbmVEYXNo ID0gY29udGV4dC53ZWJraXRMaW5lRGFzaDsKICAgICAgICAgc3RhdGUud2Via2l0TGluZURhc2hP ZmZzZXQgPSBjb250ZXh0LndlYmtpdExpbmVEYXNoT2Zmc2V0OwogCi0gICAgICAgIGxldCBhY3Rp b24gPSBhY3Rpb25zW3RoaXMuX2luZGV4XTsKICAgICAgICAgZm9yIChsZXQgbmFtZSBpbiBzdGF0 ZSkgewogICAgICAgICAgICAgbGV0IHZhbHVlID0gc3RhdGVbbmFtZV07CiAgICAgICAgICAgICBp ZiAodHlwZW9mIHZhbHVlID09PSAib2JqZWN0IikgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5nVGFiQ29udGVudFZpZXcuanMg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZWNvcmRpbmdUYWJD b250ZW50Vmlldy5qcwppbmRleCBjNTIxODE2Y2M5MGRiM2JhODE5MTY3YWZhODgxNzAwMmI4ZmQ2 MjdkLi5kOTljNjJiYWNhY2YzZWVmMmNiNTBjMDU5MTk3ZDM4MDBjNTIxZGE0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZWNvcmRpbmdUYWJD b250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9SZWNvcmRpbmdUYWJDb250ZW50Vmlldy5qcwpAQCAtMTMyLDEwICsxMzIsMTAgQEAgV0ku UmVjb3JkaW5nVGFiQ29udGVudFZpZXcgPSBjbGFzcyBSZWNvcmRpbmdUYWJDb250ZW50VmlldyBl eHRlbmRzIFdJLkNvbnRlbnRCcm8KICAgICB7CiAgICAgICAgIHRoaXMuX3NjcnViYmVyTmF2aWdh dGlvbkl0ZW0udmFsdWUgPSBpbmRleDsKIAotICAgICAgICBvcHRpb25zLmFjdGlvbkNvbXBsZXRl ZENhbGxiYWNrID0gKGNvbnRleHQpID0+IHsKKyAgICAgICAgb3B0aW9ucy5hY3Rpb25Db21wbGV0 ZWRDYWxsYmFjayA9IChhY3Rpb24sIGNvbnRleHQpID0+IHsKICAgICAgICAgICAgIGZvciAobGV0 IGRldGFpbHNTaWRlYmFyUGFuZWwgb2YgdGhpcy5kZXRhaWxzU2lkZWJhclBhbmVscykgewotICAg ICAgICAgICAgICAgIGlmIChkZXRhaWxzU2lkZWJhclBhbmVsLnVwZGF0ZUFjdGlvbkluZGV4KQot ICAgICAgICAgICAgICAgICAgICBkZXRhaWxzU2lkZWJhclBhbmVsLnVwZGF0ZUFjdGlvbkluZGV4 KGluZGV4LCBjb250ZXh0LCBvcHRpb25zKTsKKyAgICAgICAgICAgICAgICBpZiAoZGV0YWlsc1Np ZGViYXJQYW5lbC51cGRhdGVBY3Rpb24pCisgICAgICAgICAgICAgICAgICAgIGRldGFpbHNTaWRl YmFyUGFuZWwudXBkYXRlQWN0aW9uKGFjdGlvbiwgY29udGV4dCwgb3B0aW9ucyk7CiAgICAgICAg ICAgICB9CiAgICAgICAgIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1ZpZXdzL1JlY29yZGluZ1RyYWNlRGV0YWlsc1NpZGViYXJQYW5lbC5qcyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlY29yZGluZ1RyYWNl RGV0YWlsc1NpZGViYXJQYW5lbC5qcwppbmRleCA2N2E4NGQ1OTRmYzQ1MDc2MWNiMGQ4NjcwZTE5 NzY4YTlkMGU5NjhhLi44ODE3YmEzMmY0ZmE4YTAxYWM0MDkwNDVmZGVmMGMwMzhiNzlkYjc5IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZWNv cmRpbmdUcmFjZURldGFpbHNTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5nVHJhY2VEZXRhaWxzU2lkZWJhclBhbmVs LmpzCkBAIC0zMCw3ICszMCw3IEBAIFdJLlJlY29yZGluZ1RyYWNlRGV0YWlsc1NpZGViYXJQYW5l bCA9IGNsYXNzIFJlY29yZGluZ1RyYWNlRGV0YWlsc1NpZGViYXJQYW5lbCBlCiAgICAgICAgIHN1 cGVyKCJyZWNvcmRpbmctdHJhY2UiLCBXSS5VSVN0cmluZygiVHJhY2UiKSk7CiAKICAgICAgICAg dGhpcy5fcmVjb3JkaW5nID0gbnVsbDsKLSAgICAgICAgdGhpcy5faW5kZXggPSBOYU47CisgICAg ICAgIHRoaXMuX2FjdGlvbiA9IG51bGw7CiAgICAgfQogCiAgICAgLy8gU3RhdGljCkBAIC01OCwz OSArNTgsMzMgQEAgV0kuUmVjb3JkaW5nVHJhY2VEZXRhaWxzU2lkZWJhclBhbmVsID0gY2xhc3Mg UmVjb3JkaW5nVHJhY2VEZXRhaWxzU2lkZWJhclBhbmVsIGUKICAgICAgICAgICAgIHJldHVybjsK IAogICAgICAgICB0aGlzLl9yZWNvcmRpbmcgPSByZWNvcmRpbmc7Ci0gICAgICAgIHRoaXMuX2lu ZGV4ID0gTmFOOworICAgICAgICB0aGlzLl9hY3Rpb24gPSBudWxsOwogCiAgICAgICAgIHRoaXMu Y29udGVudFZpZXcuZWxlbWVudC5yZW1vdmVDaGlsZHJlbigpOwogICAgIH0KIAotICAgIHVwZGF0 ZUFjdGlvbkluZGV4KGluZGV4LCBjb250ZXh0LCBvcHRpb25zID0ge30pCisgICAgdXBkYXRlQWN0 aW9uKGFjdGlvbiwgY29udGV4dCwgb3B0aW9ucyA9IHt9KQogICAgIHsKLSAgICAgICAgaWYgKCF0 aGlzLl9yZWNvcmRpbmcpCisgICAgICAgIGlmICghdGhpcy5fcmVjb3JkaW5nIHx8IGFjdGlvbiA9 PT0gdGhpcy5fYWN0aW9uKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHRoaXMuX3Jl Y29yZGluZy5hY3Rpb25zLnRoZW4oKGFjdGlvbnMpID0+IHsKLSAgICAgICAgICAgIGNvbnNvbGUu YXNzZXJ0KGluZGV4ID49IDAgJiYgaW5kZXggPCBhY3Rpb25zLmxlbmd0aCk7Ci0gICAgICAgICAg ICBpZiAoaW5kZXggPCAwIHx8IGluZGV4ID4gYWN0aW9ucy5sZW5ndGggfHwgaW5kZXggPT09IHRo aXMuX2luZGV4KQotICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdGhpcy5fYWN0aW9u ID0gYWN0aW9uOwogCi0gICAgICAgICAgICB0aGlzLl9pbmRleCA9IGluZGV4OwotCi0gICAgICAg ICAgICB0aGlzLmNvbnRlbnRWaWV3LmVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKKyAgICAgICAg dGhpcy5jb250ZW50Vmlldy5lbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7CiAKLSAgICAgICAgICAg IGxldCB0cmFjZSA9IGFjdGlvbnNbdGhpcy5faW5kZXhdLnRyYWNlOwotICAgICAgICAgICAgaWYg KCF0cmFjZS5sZW5ndGgpIHsKLSAgICAgICAgICAgICAgICBsZXQgbm9UcmFjZURhdGFFbGVtZW50 ID0gdGhpcy5jb250ZW50Vmlldy5lbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVs ZW1lbnQoImRpdiIpKTsKLSAgICAgICAgICAgICAgICBub1RyYWNlRGF0YUVsZW1lbnQuY2xhc3NM aXN0LmFkZCgibm8tdHJhY2UtZGF0YSIpOworICAgICAgICBsZXQgdHJhY2UgPSB0aGlzLl9hY3Rp b24udHJhY2U7CisgICAgICAgIGlmICghdHJhY2UubGVuZ3RoKSB7CisgICAgICAgICAgICBsZXQg bm9UcmFjZURhdGFFbGVtZW50ID0gdGhpcy5jb250ZW50Vmlldy5lbGVtZW50LmFwcGVuZENoaWxk KGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpKTsKKyAgICAgICAgICAgIG5vVHJhY2VEYXRh RWxlbWVudC5jbGFzc0xpc3QuYWRkKCJuby10cmFjZS1kYXRhIik7CiAKLSAgICAgICAgICAgICAg ICBsZXQgbm9UcmFjZURhdGFNZXNzYWdlRWxlbWVudCA9IG5vVHJhY2VEYXRhRWxlbWVudC5hcHBl bmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKSk7Ci0gICAgICAgICAgICAgICAg bm9UcmFjZURhdGFNZXNzYWdlRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJtZXNzYWdlIik7Ci0gICAg ICAgICAgICAgICAgbm9UcmFjZURhdGFNZXNzYWdlRWxlbWVudC50ZXh0Q29udGVudCA9IFdJLlVJ U3RyaW5nKCJObyBUcmFjZSBEYXRhIik7Ci0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAgICAg ICAgICAgfQorICAgICAgICAgICAgbGV0IG5vVHJhY2VEYXRhTWVzc2FnZUVsZW1lbnQgPSBub1Ry YWNlRGF0YUVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iikp OworICAgICAgICAgICAgbm9UcmFjZURhdGFNZXNzYWdlRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJt ZXNzYWdlIik7CisgICAgICAgICAgICBub1RyYWNlRGF0YU1lc3NhZ2VFbGVtZW50LnRleHRDb250 ZW50ID0gV0kuVUlTdHJpbmcoIk5vIFRyYWNlIERhdGEiKTsKKyAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgfQogCi0gICAgICAgICAgICBjb25zdCBzaG93RnVuY3Rpb25OYW1lID0gdHJ1ZTsK LSAgICAgICAgICAgIGZvciAobGV0IGNhbGxGcmFtZSBvZiB0cmFjZSkKLSAgICAgICAgICAgICAg ICB0aGlzLmNvbnRlbnRWaWV3LmVsZW1lbnQuYXBwZW5kQ2hpbGQobmV3IFdJLkNhbGxGcmFtZVZp ZXcoY2FsbEZyYW1lLCBzaG93RnVuY3Rpb25OYW1lKSk7Ci0gICAgICAgIH0pOworICAgICAgICBj b25zdCBzaG93RnVuY3Rpb25OYW1lID0gdHJ1ZTsKKyAgICAgICAgZm9yIChsZXQgY2FsbEZyYW1l IG9mIHRyYWNlKQorICAgICAgICAgICAgdGhpcy5jb250ZW50Vmlldy5lbGVtZW50LmFwcGVuZENo aWxkKG5ldyBXSS5DYWxsRnJhbWVWaWV3KGNhbGxGcmFtZSwgc2hvd0Z1bmN0aW9uTmFtZSkpOwog ICAgIH0KIH07Cg== 320978 2017-09-15 17:43:23 -0700 2017-09-15 17:44:48 -0700 Patch bug-176988-20170915174322.patch text/plain 11486 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDU2NTg5YWE2MGNjNDg3NzY4N2Y0MDBjYzgzOGVm MWRlZjQxMjg0OTIuLmQyNmQwNjMzYzg0NjM3ZjIwMmYyY2JjNmQ2NTkyZjFlYWE0OTM2YzIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE3LTA5LTE1ICBEZXZp biBSb3Vzc28gIDx3ZWJraXRAZGV2aW5yb3Vzc28uY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFJFR1JFU1NJT04ocjIyMjA1Nyk6IHJlY29yZGluZyBzdGF0ZSBkb2Vzbid0IGxvbmdlciB1 cGRhdGUgd2hlbiBjaGFuZ2luZyBhY3Rpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNzY5ODgKKworICAgICAgICBSZXZpZXdlZCBieSBNYXR0IEJh a2VyLgorCisgICAgICAgIFJlcGxhY2UgYHVwZGF0ZUFjdGlvbkluZGV4YCB3aXRoIGB1cGRhdGVB Y3Rpb25gLCB3aGVyZSB0aGUgY3VycmVudGx5IHNlbGVjdGVkIFJlY29yZGluZ0FjdGlvbgorICAg ICAgICBpcyBwYXNzZWQgdG8gdGhlIERldGFpbHNTaWRlYmFyUGFuZWwuIEFsc28gcmVtb3ZlIHRo ZSBjYWxsIHRvIGB0aGlzLl9yZWNvcmRpbmcuYWN0aW9uc2AgaW4KKyAgICAgICAgb3JkZXIgdG8g ZW5zdXJlIHRoYXQgYWxsIGxvZ2ljIHBlcmZvcm1lZCBieSBib3RoIERldGFpbHNTaWRlYmFyUGFu ZWwgaXMgc3luY2hyb25vdXMuCisKKyAgICAgICAgKiBMb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xv Y2FsaXplZFN0cmluZ3MuanM6CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL1JlY29y ZGluZ1RhYkNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuUmVjb3JkaW5nVGFiQ29udGVudFZp ZXcucHJvdG90eXBlLl91cGRhdGVBY3Rpb25JbmRleCk6CisKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1ZpZXdzL1JlY29yZGluZ0NvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuUmVjb3JkaW5n Q29udGVudFZpZXcucHJvdG90eXBlLmFzeW5jLl9nZW5lcmF0ZUNvbnRlbnRDYW52YXMyRCk6Cisg ICAgICAgIChXSS5SZWNvcmRpbmdDb250ZW50Vmlldy5wcm90b3R5cGUuYXN5bmMuX2dlbmVyYXRl Q29udGVudENhbnZhc1dlYkdMKToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUmVj b3JkaW5nU3RhdGVEZXRhaWxzU2lkZWJhclBhbmVsLmpzOgorICAgICAgICAoV0kuUmVjb3JkaW5n U3RhdGVEZXRhaWxzU2lkZWJhclBhbmVsKToKKyAgICAgICAgKFdJLlJlY29yZGluZ1N0YXRlRGV0 YWlsc1NpZGViYXJQYW5lbC5wcm90b3R5cGUuc2V0IHJlY29yZGluZyk6CisgICAgICAgIChXSS5S ZWNvcmRpbmdTdGF0ZURldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLnVwZGF0ZUFjdGlvbik6 CisgICAgICAgIChXSS5SZWNvcmRpbmdTdGF0ZURldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBl Ll9nZW5lcmF0ZURldGFpbHNDYW52YXMyRCk6CisgICAgICAgIChXSS5SZWNvcmRpbmdTdGF0ZURl dGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLnVwZGF0ZUFjdGlvbkluZGV4KTogRGVsZXRlZC4K KworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5nVHJhY2VEZXRhaWxzU2lk ZWJhclBhbmVsLmpzOgorICAgICAgICAoV0kuUmVjb3JkaW5nVHJhY2VEZXRhaWxzU2lkZWJhclBh bmVsKToKKyAgICAgICAgKFdJLlJlY29yZGluZ1RyYWNlRGV0YWlsc1NpZGViYXJQYW5lbC5wcm90 b3R5cGUuc2V0IHJlY29yZGluZyk6CisgICAgICAgIChXSS5SZWNvcmRpbmdUcmFjZURldGFpbHNT aWRlYmFyUGFuZWwucHJvdG90eXBlLnVwZGF0ZUFjdGlvbik6CisgICAgICAgIChXSS5SZWNvcmRp bmdUcmFjZURldGFpbHNTaWRlYmFyUGFuZWwucHJvdG90eXBlLnVwZGF0ZUFjdGlvbkluZGV4KTog RGVsZXRlZC4KKwogMjAxNy0wOS0xNSAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+ CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogQ2FudmFzOiByZWNvcmRpbmcgcGFyYW1ldGVycyB0 aGF0IGluY2x1ZGUgY29sb3JzIHNob3VsZCBzaG93IGFuIElubGluZVN3YXRjaCAoMkQgY2FudmFz KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHBy b2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRp b25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXggMTU3ZmI1ZDE4YjgwYmYwMDZh ZTdhOGZkN2ZiMDU3MWM3YjljN2VjMC4uYjBjZmY2NWRkZmNkMDYxMDBjMGYyY2Y0YjIzNGM5NTBk ZTE1Y2Q1NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMv ZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv TG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCkBAIC0xNDYsNiArMTQ2 LDcgQEAgbG9jYWxpemVkU3RyaW5nc1siQ1NTIGNhbnZhcyDigJwlc+KAnSJdID0gIkNTUyBjYW52 YXMg4oCcJXPigJ0iOwogbG9jYWxpemVkU3RyaW5nc1siQ2FjaGVkIl0gPSAiQ2FjaGVkIjsKIGxv Y2FsaXplZFN0cmluZ3NbIkNhbGwgRnJhbWVzIFRydW5jYXRlZCJdID0gIkNhbGwgRnJhbWVzIFRy dW5jYXRlZCI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDYWxsIFN0YWNrIl0gPSAiQ2FsbCBTdGFjayI7 Citsb2NhbGl6ZWRTdHJpbmdzWyJDYWxsIFN0YWNrIFVuYXZhaWxhYmxlIl0gPSAiQ2FsbCBTdGFj ayBVbmF2YWlsYWJsZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDYWxsIFRyZWVzIl0gPSAiQ2FsbCBU cmVlcyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDYWxscyJdID0gIkNhbGxzIjsKIGxvY2FsaXplZFN0 cmluZ3NbIkNhbmNlbCBBdXRvbWF0aWMgQ29udGludWUiXSA9ICJDYW5jZWwgQXV0b21hdGljIENv bnRpbnVlIjsKQEAgLTU5NCw3ICs1OTUsNiBAQCBsb2NhbGl6ZWRTdHJpbmdzWyJObyBSZXF1ZXN0 IEhlYWRlcnMiXSA9ICJObyBSZXF1ZXN0IEhlYWRlcnMiOwogbG9jYWxpemVkU3RyaW5nc1siTm8g UmVzcG9uc2UgSGVhZGVycyJdID0gIk5vIFJlc3BvbnNlIEhlYWRlcnMiOwogbG9jYWxpemVkU3Ry aW5nc1siTm8gUmVzdWx0cyBGb3VuZCJdID0gIk5vIFJlc3VsdHMgRm91bmQiOwogbG9jYWxpemVk U3RyaW5nc1siTm8gU2VhcmNoIFJlc3VsdHMiXSA9ICJObyBTZWFyY2ggUmVzdWx0cyI7Ci1sb2Nh bGl6ZWRTdHJpbmdzWyJObyBUcmFjZSBEYXRhIl0gPSAiTm8gVHJhY2UgRGF0YSI7CiBsb2NhbGl6 ZWRTdHJpbmdzWyJObyBXYXRjaCBFeHByZXNzaW9ucyJdID0gIk5vIFdhdGNoIEV4cHJlc3Npb25z IjsKIGxvY2FsaXplZFN0cmluZ3NbIk5vIG1hdGNoaW5nIEFSSUEgcm9sZSJdID0gIk5vIG1hdGNo aW5nIEFSSUEgcm9sZSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJObyBwcmV2aWV3IGF2YWlsYWJsZSJd ID0gIk5vIHByZXZpZXcgYXZhaWxhYmxlIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlY29yZGluZ0NvbnRlbnRWaWV3LmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5nQ29udGVudFZpZXcu anMKaW5kZXggMjQzMzY2YWYyOTI5NDdhMDExODE1MWU2MjgyOWYwMTNlNjNiYmYyNC4uMjY0Mjlh N2FkY2VlOTg0YmZkZjBmMGRjZTFmM2Y1NGE5NmE3Y2FkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5nQ29udGVudFZpZXcuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5n Q29udGVudFZpZXcuanMKQEAgLTM5OCw3ICszOTgsNyBAQCBXSS5SZWNvcmRpbmdDb250ZW50Vmll dyA9IGNsYXNzIFJlY29yZGluZ0NvbnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudFZpZXcKIAog ICAgICAgICBhcHBseUFjdGlvbnMoc25hcHNob3QuaW5kZXgsIHRoaXMuX2luZGV4LCAoKSA9PiB7 CiAgICAgICAgICAgICBpZiAob3B0aW9ucy5hY3Rpb25Db21wbGV0ZWRDYWxsYmFjaykKLSAgICAg ICAgICAgICAgICBvcHRpb25zLmFjdGlvbkNvbXBsZXRlZENhbGxiYWNrKHNuYXBzaG90LmNvbnRl eHQpOworICAgICAgICAgICAgICAgIG9wdGlvbnMuYWN0aW9uQ29tcGxldGVkQ2FsbGJhY2soYWN0 aW9uc1t0aGlzLl9pbmRleF0sIHNuYXBzaG90LmNvbnRleHQpOwogICAgICAgICB9KTsKIAogICAg ICAgICB0aGlzLl9wcmV2aWV3Q29udGFpbmVyLmFwcGVuZENoaWxkKHNuYXBzaG90LmVsZW1lbnQp OwpAQCAtNDQ4LDcgKzQ0OCw3IEBAIFdJLlJlY29yZGluZ0NvbnRlbnRWaWV3ID0gY2xhc3MgUmVj b3JkaW5nQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogICAgICAgICB9CiAKICAg ICAgICAgaWYgKG9wdGlvbnMuYWN0aW9uQ29tcGxldGVkQ2FsbGJhY2spCi0gICAgICAgICAgICBv cHRpb25zLmFjdGlvbkNvbXBsZXRlZENhbGxiYWNrKCk7CisgICAgICAgICAgICBvcHRpb25zLmFj dGlvbkNvbXBsZXRlZENhbGxiYWNrKGFjdGlvbnNbdGhpcy5faW5kZXhdKTsKICAgICB9CiAKICAg ICBfYXBwbHlBY3Rpb24oY29udGV4dCwgYWN0aW9uLCBvcHRpb25zID0ge30pCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZWNvcmRpbmdTdGF0 ZURldGFpbHNTaWRlYmFyUGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9SZWNvcmRpbmdTdGF0ZURldGFpbHNTaWRlYmFyUGFuZWwuanMKaW5kZXggYWVi YWZhZTlhOGZlZDZjNTVhNmM2Zjc4OWY2YjEyNGZlZTQxYWMyOS4uYTdlMzNkZmM3NTY2MTU4Yzdm NjEwNjA1NDUyM2Y1NDQ5Njc2NDAzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5nU3RhdGVEZXRhaWxzU2lkZWJhclBhbmVsLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlY29yZGlu Z1N0YXRlRGV0YWlsc1NpZGViYXJQYW5lbC5qcwpAQCAtMzAsNyArMzAsNyBAQCBXSS5SZWNvcmRp bmdTdGF0ZURldGFpbHNTaWRlYmFyUGFuZWwgPSBjbGFzcyBSZWNvcmRpbmdTdGF0ZURldGFpbHNT aWRlYmFyUGFuZWwgZQogICAgICAgICBzdXBlcigicmVjb3JkaW5nLXN0YXRlIiwgV0kuVUlTdHJp bmcoIlN0YXRlIikpOwogCiAgICAgICAgIHRoaXMuX3JlY29yZGluZyA9IG51bGw7Ci0gICAgICAg IHRoaXMuX2luZGV4ID0gTmFOOworICAgICAgICB0aGlzLl9hY3Rpb24gPSBudWxsOwogCiAgICAg ICAgIHRoaXMuX2RhdGFHcmlkID0gbnVsbDsKICAgICB9CkBAIC02MCwzNCArNjAsMjggQEAgV0ku UmVjb3JkaW5nU3RhdGVEZXRhaWxzU2lkZWJhclBhbmVsID0gY2xhc3MgUmVjb3JkaW5nU3RhdGVE ZXRhaWxzU2lkZWJhclBhbmVsIGUKICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICB0aGlz Ll9yZWNvcmRpbmcgPSByZWNvcmRpbmc7Ci0gICAgICAgIHRoaXMuX2luZGV4ID0gTmFOOworICAg ICAgICB0aGlzLl9hY3Rpb24gPSBudWxsOwogCiAgICAgICAgIGZvciAobGV0IHN1YnZpZXcgb2Yg dGhpcy5jb250ZW50Vmlldy5zdWJ2aWV3cykKICAgICAgICAgICAgIHRoaXMuY29udGVudFZpZXcu cmVtb3ZlU3VidmlldyhzdWJ2aWV3KTsKICAgICB9CiAKLSAgICB1cGRhdGVBY3Rpb25JbmRleChp bmRleCwgY29udGV4dCwgb3B0aW9ucyA9IHt9KQorICAgIHVwZGF0ZUFjdGlvbihhY3Rpb24sIGNv bnRleHQsIG9wdGlvbnMgPSB7fSkKICAgICB7Ci0gICAgICAgIGlmICghdGhpcy5fcmVjb3JkaW5n KQorICAgICAgICBpZiAoIXRoaXMuX3JlY29yZGluZyB8fCBhY3Rpb24gPT09IHRoaXMuX2FjdGlv bikKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAgICB0aGlzLl9yZWNvcmRpbmcuYWN0aW9u cy50aGVuKChhY3Rpb25zKSA9PiB7Ci0gICAgICAgICAgICBjb25zb2xlLmFzc2VydChpbmRleCA+ PSAwICYmIGluZGV4IDwgYWN0aW9ucy5sZW5ndGgpOwotICAgICAgICAgICAgaWYgKGluZGV4IDwg MCB8fCBpbmRleCA+IGFjdGlvbnMubGVuZ3RoIHx8IGluZGV4ID09PSB0aGlzLl9pbmRleCkKLSAg ICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgIHRoaXMuX2FjdGlvbiA9IGFjdGlvbjsKIAot ICAgICAgICAgICAgdGhpcy5faW5kZXggPSBpbmRleDsKKyAgICAgICAgaWYgKHRoaXMuX3JlY29y ZGluZy50eXBlID09PSBXSS5SZWNvcmRpbmcuVHlwZS5DYW52YXMyRCkKKyAgICAgICAgICAgIHRo aXMuX2dlbmVyYXRlRGV0YWlsc0NhbnZhczJEKGFjdGlvbiwgY29udGV4dCwgb3B0aW9ucyk7CiAK LSAgICAgICAgICAgIGlmICh0aGlzLl9yZWNvcmRpbmcudHlwZSA9PT0gV0kuUmVjb3JkaW5nLlR5 cGUuQ2FudmFzMkQpCi0gICAgICAgICAgICAgICAgdGhpcy5fZ2VuZXJhdGVEZXRhaWxzQ2FudmFz MkQoY29udGV4dCwgYWN0aW9ucywgb3B0aW9ucyk7Ci0KLSAgICAgICAgICAgIHRoaXMudXBkYXRl TGF5b3V0SWZOZWVkZWQoKTsKLSAgICAgICAgfSk7CisgICAgICAgIHRoaXMudXBkYXRlTGF5b3V0 SWZOZWVkZWQoKTsKICAgICB9CiAKICAgICAvLyBQcml2YXRlCiAKLSAgICBfZ2VuZXJhdGVEZXRh aWxzQ2FudmFzMkQoY29udGV4dCwgYWN0aW9ucywgb3B0aW9ucyA9IHt9KQorICAgIF9nZW5lcmF0 ZURldGFpbHNDYW52YXMyRChhY3Rpb24sIGNvbnRleHQsIG9wdGlvbnMgPSB7fSkKICAgICB7CiAg ICAgICAgIGlmICghdGhpcy5fZGF0YUdyaWQpIHsKICAgICAgICAgICAgIHRoaXMuX2RhdGFHcmlk ID0gbmV3IFdJLkRhdGFHcmlkKHsKQEAgLTE0OCw3ICsxNDIsNiBAQCBXSS5SZWNvcmRpbmdTdGF0 ZURldGFpbHNTaWRlYmFyUGFuZWwgPSBjbGFzcyBSZWNvcmRpbmdTdGF0ZURldGFpbHNTaWRlYmFy UGFuZWwgZQogICAgICAgICAgICAgcmV0dXJuIG5ldyBXSS5JbmxpbmVTd2F0Y2goV0kuSW5saW5l U3dhdGNoLlR5cGUuQ29sb3IsIGNvbG9yLCByZWFkT25seSk7CiAgICAgICAgIH0KIAotICAgICAg ICBsZXQgYWN0aW9uID0gYWN0aW9uc1t0aGlzLl9pbmRleF07CiAgICAgICAgIGZvciAobGV0IG5h bWUgaW4gc3RhdGUpIHsKICAgICAgICAgICAgIGxldCB2YWx1ZSA9IHN0YXRlW25hbWVdOwogICAg ICAgICAgICAgaWYgKHR5cGVvZiB2YWx1ZSA9PT0gIm9iamVjdCIpIHsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlY29yZGluZ1RhYkNvbnRl bnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVj b3JkaW5nVGFiQ29udGVudFZpZXcuanMKaW5kZXggYzUyMTgxNmNjOTBkYjNiYTgxOTE2N2FmYTg4 MTcwMDJiOGZkNjI3ZC4uZDk5YzYyYmFjYWNmM2VlZjJjYjUwYzA1OTE5N2QzODAwYzUyMWRhNCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVj b3JkaW5nVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvUmVjb3JkaW5nVGFiQ29udGVudFZpZXcuanMKQEAgLTEzMiwxMCArMTMy LDEwIEBAIFdJLlJlY29yZGluZ1RhYkNvbnRlbnRWaWV3ID0gY2xhc3MgUmVjb3JkaW5nVGFiQ29u dGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50QnJvCiAgICAgewogICAgICAgICB0aGlzLl9zY3J1 YmJlck5hdmlnYXRpb25JdGVtLnZhbHVlID0gaW5kZXg7CiAKLSAgICAgICAgb3B0aW9ucy5hY3Rp b25Db21wbGV0ZWRDYWxsYmFjayA9IChjb250ZXh0KSA9PiB7CisgICAgICAgIG9wdGlvbnMuYWN0 aW9uQ29tcGxldGVkQ2FsbGJhY2sgPSAoYWN0aW9uLCBjb250ZXh0KSA9PiB7CiAgICAgICAgICAg ICBmb3IgKGxldCBkZXRhaWxzU2lkZWJhclBhbmVsIG9mIHRoaXMuZGV0YWlsc1NpZGViYXJQYW5l bHMpIHsKLSAgICAgICAgICAgICAgICBpZiAoZGV0YWlsc1NpZGViYXJQYW5lbC51cGRhdGVBY3Rp b25JbmRleCkKLSAgICAgICAgICAgICAgICAgICAgZGV0YWlsc1NpZGViYXJQYW5lbC51cGRhdGVB Y3Rpb25JbmRleChpbmRleCwgY29udGV4dCwgb3B0aW9ucyk7CisgICAgICAgICAgICAgICAgaWYg KGRldGFpbHNTaWRlYmFyUGFuZWwudXBkYXRlQWN0aW9uKQorICAgICAgICAgICAgICAgICAgICBk ZXRhaWxzU2lkZWJhclBhbmVsLnVwZGF0ZUFjdGlvbihhY3Rpb24sIGNvbnRleHQsIG9wdGlvbnMp OwogICAgICAgICAgICAgfQogICAgICAgICB9OwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZWNvcmRpbmdUcmFjZURldGFpbHNTaWRlYmFy UGFuZWwuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZWNv cmRpbmdUcmFjZURldGFpbHNTaWRlYmFyUGFuZWwuanMKaW5kZXggNjdhODRkNTk0ZmM0NTA3NjFj YjBkODY3MGUxOTc2OGE5ZDBlOTY4YS4uZmFiODdiOTg3NzhkMDZiNDQwZGM0OTYyMmExYmY0MTAx MzBhODEyZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvUmVjb3JkaW5nVHJhY2VEZXRhaWxzU2lkZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlY29yZGluZ1RyYWNlRGV0YWlsc1Np ZGViYXJQYW5lbC5qcwpAQCAtMzAsNyArMzAsNyBAQCBXSS5SZWNvcmRpbmdUcmFjZURldGFpbHNT aWRlYmFyUGFuZWwgPSBjbGFzcyBSZWNvcmRpbmdUcmFjZURldGFpbHNTaWRlYmFyUGFuZWwgZQog ICAgICAgICBzdXBlcigicmVjb3JkaW5nLXRyYWNlIiwgV0kuVUlTdHJpbmcoIlRyYWNlIikpOwog CiAgICAgICAgIHRoaXMuX3JlY29yZGluZyA9IG51bGw7Ci0gICAgICAgIHRoaXMuX2luZGV4ID0g TmFOOworICAgICAgICB0aGlzLl9hY3Rpb24gPSBudWxsOwogICAgIH0KIAogICAgIC8vIFN0YXRp YwpAQCAtNTgsMzkgKzU4LDMzIEBAIFdJLlJlY29yZGluZ1RyYWNlRGV0YWlsc1NpZGViYXJQYW5l bCA9IGNsYXNzIFJlY29yZGluZ1RyYWNlRGV0YWlsc1NpZGViYXJQYW5lbCBlCiAgICAgICAgICAg ICByZXR1cm47CiAKICAgICAgICAgdGhpcy5fcmVjb3JkaW5nID0gcmVjb3JkaW5nOwotICAgICAg ICB0aGlzLl9pbmRleCA9IE5hTjsKKyAgICAgICAgdGhpcy5fYWN0aW9uID0gbnVsbDsKIAogICAg ICAgICB0aGlzLmNvbnRlbnRWaWV3LmVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKICAgICB9CiAK LSAgICB1cGRhdGVBY3Rpb25JbmRleChpbmRleCwgY29udGV4dCwgb3B0aW9ucyA9IHt9KQorICAg IHVwZGF0ZUFjdGlvbihhY3Rpb24sIGNvbnRleHQsIG9wdGlvbnMgPSB7fSkKICAgICB7Ci0gICAg ICAgIGlmICghdGhpcy5fcmVjb3JkaW5nKQorICAgICAgICBpZiAoIXRoaXMuX3JlY29yZGluZyB8 fCBhY3Rpb24gPT09IHRoaXMuX2FjdGlvbikKICAgICAgICAgICAgIHJldHVybjsKIAotICAgICAg ICB0aGlzLl9yZWNvcmRpbmcuYWN0aW9ucy50aGVuKChhY3Rpb25zKSA9PiB7Ci0gICAgICAgICAg ICBjb25zb2xlLmFzc2VydChpbmRleCA+PSAwICYmIGluZGV4IDwgYWN0aW9ucy5sZW5ndGgpOwot ICAgICAgICAgICAgaWYgKGluZGV4IDwgMCB8fCBpbmRleCA+IGFjdGlvbnMubGVuZ3RoIHx8IGlu ZGV4ID09PSB0aGlzLl9pbmRleCkKLSAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgIHRo aXMuX2FjdGlvbiA9IGFjdGlvbjsKIAotICAgICAgICAgICAgdGhpcy5faW5kZXggPSBpbmRleDsK LQotICAgICAgICAgICAgdGhpcy5jb250ZW50Vmlldy5lbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7 CisgICAgICAgIHRoaXMuY29udGVudFZpZXcuZWxlbWVudC5yZW1vdmVDaGlsZHJlbigpOwogCi0g ICAgICAgICAgICBsZXQgdHJhY2UgPSBhY3Rpb25zW3RoaXMuX2luZGV4XS50cmFjZTsKLSAgICAg ICAgICAgIGlmICghdHJhY2UubGVuZ3RoKSB7Ci0gICAgICAgICAgICAgICAgbGV0IG5vVHJhY2VE YXRhRWxlbWVudCA9IHRoaXMuY29udGVudFZpZXcuZWxlbWVudC5hcHBlbmRDaGlsZChkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJkaXYiKSk7Ci0gICAgICAgICAgICAgICAgbm9UcmFjZURhdGFFbGVt ZW50LmNsYXNzTGlzdC5hZGQoIm5vLXRyYWNlLWRhdGEiKTsKKyAgICAgICAgbGV0IHRyYWNlID0g dGhpcy5fYWN0aW9uLnRyYWNlOworICAgICAgICBpZiAoIXRyYWNlLmxlbmd0aCkgeworICAgICAg ICAgICAgbGV0IG5vVHJhY2VEYXRhRWxlbWVudCA9IHRoaXMuY29udGVudFZpZXcuZWxlbWVudC5h cHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKSk7CisgICAgICAgICAgICBu b1RyYWNlRGF0YUVsZW1lbnQuY2xhc3NMaXN0LmFkZCgibm8tdHJhY2UtZGF0YSIpOwogCi0gICAg ICAgICAgICAgICAgbGV0IG5vVHJhY2VEYXRhTWVzc2FnZUVsZW1lbnQgPSBub1RyYWNlRGF0YUVs ZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2IikpOwotICAgICAg ICAgICAgICAgIG5vVHJhY2VEYXRhTWVzc2FnZUVsZW1lbnQuY2xhc3NMaXN0LmFkZCgibWVzc2Fn ZSIpOwotICAgICAgICAgICAgICAgIG5vVHJhY2VEYXRhTWVzc2FnZUVsZW1lbnQudGV4dENvbnRl bnQgPSBXSS5VSVN0cmluZygiTm8gVHJhY2UgRGF0YSIpOwotICAgICAgICAgICAgICAgIHJldHVy bjsKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgIGxldCBub1RyYWNlRGF0YU1lc3NhZ2VFbGVt ZW50ID0gbm9UcmFjZURhdGFFbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1l bnQoImRpdiIpKTsKKyAgICAgICAgICAgIG5vVHJhY2VEYXRhTWVzc2FnZUVsZW1lbnQuY2xhc3NM aXN0LmFkZCgibWVzc2FnZSIpOworICAgICAgICAgICAgbm9UcmFjZURhdGFNZXNzYWdlRWxlbWVu dC50ZXh0Q29udGVudCA9IFdJLlVJU3RyaW5nKCJDYWxsIFN0YWNrIFVuYXZhaWxhYmxlIik7Cisg ICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KIAotICAgICAgICAgICAgY29uc3Qgc2hvd0Z1 bmN0aW9uTmFtZSA9IHRydWU7Ci0gICAgICAgICAgICBmb3IgKGxldCBjYWxsRnJhbWUgb2YgdHJh Y2UpCi0gICAgICAgICAgICAgICAgdGhpcy5jb250ZW50Vmlldy5lbGVtZW50LmFwcGVuZENoaWxk KG5ldyBXSS5DYWxsRnJhbWVWaWV3KGNhbGxGcmFtZSwgc2hvd0Z1bmN0aW9uTmFtZSkpOwotICAg ICAgICB9KTsKKyAgICAgICAgY29uc3Qgc2hvd0Z1bmN0aW9uTmFtZSA9IHRydWU7CisgICAgICAg IGZvciAobGV0IGNhbGxGcmFtZSBvZiB0cmFjZSkKKyAgICAgICAgICAgIHRoaXMuY29udGVudFZp ZXcuZWxlbWVudC5hcHBlbmRDaGlsZChuZXcgV0kuQ2FsbEZyYW1lVmlldyhjYWxsRnJhbWUsIHNo b3dGdW5jdGlvbk5hbWUpKTsKICAgICB9CiB9Owo= 320979 2017-09-15 17:44:50 -0700 2017-09-15 19:12:20 -0700 Patch bug-176988-20170915174449.patch text/plain 11479 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDU2NTg5YWE2MGNjNDg3NzY4N2Y0MDBjYzgzOGVm MWRlZjQxMjg0OTIuLmZiMjZlMDMzYTRlYWQwYTY5NmNhZDE5ZjNmZGExMjlmMmE3ZjE4NjkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM2IEBACisyMDE3LTA5LTE1ICBEZXZp biBSb3Vzc28gIDx3ZWJraXRAZGV2aW5yb3Vzc28uY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFJFR1JFU1NJT04ocjIyMjA1Nyk6IHJlY29yZGluZyBzdGF0ZSBkb2Vzbid0IHVwZGF0ZSB3 aGVuIGNoYW5naW5nIGFjdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE3Njk4OAorCisgICAgICAgIFJldmlld2VkIGJ5IE1hdHQgQmFrZXIuCisK KyAgICAgICAgUmVwbGFjZSBgdXBkYXRlQWN0aW9uSW5kZXhgIHdpdGggYHVwZGF0ZUFjdGlvbmAs IHdoZXJlIHRoZSBjdXJyZW50bHkgc2VsZWN0ZWQgUmVjb3JkaW5nQWN0aW9uCisgICAgICAgIGlz IHBhc3NlZCB0byB0aGUgRGV0YWlsc1NpZGViYXJQYW5lbC4gQWxzbyByZW1vdmUgdGhlIGNhbGwg dG8gYHRoaXMuX3JlY29yZGluZy5hY3Rpb25zYCBpbgorICAgICAgICBvcmRlciB0byBlbnN1cmUg dGhhdCBhbGwgbG9naWMgcGVyZm9ybWVkIGJ5IGJvdGggRGV0YWlsc1NpZGViYXJQYW5lbCBpcyBz eW5jaHJvbm91cy4KKworICAgICAgICAqIExvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVk U3RyaW5ncy5qczoKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5nVGFi Q29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5SZWNvcmRpbmdUYWJDb250ZW50Vmlldy5wcm90 b3R5cGUuX3VwZGF0ZUFjdGlvbkluZGV4KToKKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmll d3MvUmVjb3JkaW5nQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5SZWNvcmRpbmdDb250ZW50 Vmlldy5wcm90b3R5cGUuYXN5bmMuX2dlbmVyYXRlQ29udGVudENhbnZhczJEKToKKyAgICAgICAg KFdJLlJlY29yZGluZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5hc3luYy5fZ2VuZXJhdGVDb250ZW50 Q2FudmFzV2ViR0wpOgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9SZWNvcmRpbmdT dGF0ZURldGFpbHNTaWRlYmFyUGFuZWwuanM6CisgICAgICAgIChXSS5SZWNvcmRpbmdTdGF0ZURl dGFpbHNTaWRlYmFyUGFuZWwpOgorICAgICAgICAoV0kuUmVjb3JkaW5nU3RhdGVEZXRhaWxzU2lk ZWJhclBhbmVsLnByb3RvdHlwZS5zZXQgcmVjb3JkaW5nKToKKyAgICAgICAgKFdJLlJlY29yZGlu Z1N0YXRlRGV0YWlsc1NpZGViYXJQYW5lbC5wcm90b3R5cGUudXBkYXRlQWN0aW9uKToKKyAgICAg ICAgKFdJLlJlY29yZGluZ1N0YXRlRGV0YWlsc1NpZGViYXJQYW5lbC5wcm90b3R5cGUuX2dlbmVy YXRlRGV0YWlsc0NhbnZhczJEKToKKyAgICAgICAgKFdJLlJlY29yZGluZ1N0YXRlRGV0YWlsc1Np ZGViYXJQYW5lbC5wcm90b3R5cGUudXBkYXRlQWN0aW9uSW5kZXgpOiBEZWxldGVkLgorCisgICAg ICAgICogVXNlckludGVyZmFjZS9WaWV3cy9SZWNvcmRpbmdUcmFjZURldGFpbHNTaWRlYmFyUGFu ZWwuanM6CisgICAgICAgIChXSS5SZWNvcmRpbmdUcmFjZURldGFpbHNTaWRlYmFyUGFuZWwpOgor ICAgICAgICAoV0kuUmVjb3JkaW5nVHJhY2VEZXRhaWxzU2lkZWJhclBhbmVsLnByb3RvdHlwZS5z ZXQgcmVjb3JkaW5nKToKKyAgICAgICAgKFdJLlJlY29yZGluZ1RyYWNlRGV0YWlsc1NpZGViYXJQ YW5lbC5wcm90b3R5cGUudXBkYXRlQWN0aW9uKToKKyAgICAgICAgKFdJLlJlY29yZGluZ1RyYWNl RGV0YWlsc1NpZGViYXJQYW5lbC5wcm90b3R5cGUudXBkYXRlQWN0aW9uSW5kZXgpOiBEZWxldGVk LgorCiAyMDE3LTA5LTE1ICBNYXR0IEJha2VyICA8bWF0dGJha2VyQGFwcGxlLmNvbT4KIAogICAg ICAgICBXZWIgSW5zcGVjdG9yOiBDYW52YXM6IHJlY29yZGluZyBwYXJhbWV0ZXJzIHRoYXQgaW5j bHVkZSBjb2xvcnMgc2hvdWxkIHNob3cgYW4gSW5saW5lU3dhdGNoICgyRCBjYW52YXMpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2Nh bGl6ZWRTdHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4u bHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCAxNTdmYjVkMThiODBiZjAwNmFlN2E4ZmQ3 ZmIwNTcxYzdiOWM3ZWMwLi5iMGNmZjY1ZGRmY2QwNjEwMGMwZjJjZjRiMjM0Yzk1MGRlMTVjZDU2 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJv ai9sb2NhbGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6 YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKQEAgLTE0Niw2ICsxNDYsNyBAQCBs b2NhbGl6ZWRTdHJpbmdzWyJDU1MgY2FudmFzIOKAnCVz4oCdIl0gPSAiQ1NTIGNhbnZhcyDigJwl c+KAnSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDYWNoZWQiXSA9ICJDYWNoZWQiOwogbG9jYWxpemVk U3RyaW5nc1siQ2FsbCBGcmFtZXMgVHJ1bmNhdGVkIl0gPSAiQ2FsbCBGcmFtZXMgVHJ1bmNhdGVk IjsKIGxvY2FsaXplZFN0cmluZ3NbIkNhbGwgU3RhY2siXSA9ICJDYWxsIFN0YWNrIjsKK2xvY2Fs aXplZFN0cmluZ3NbIkNhbGwgU3RhY2sgVW5hdmFpbGFibGUiXSA9ICJDYWxsIFN0YWNrIFVuYXZh aWxhYmxlIjsKIGxvY2FsaXplZFN0cmluZ3NbIkNhbGwgVHJlZXMiXSA9ICJDYWxsIFRyZWVzIjsK IGxvY2FsaXplZFN0cmluZ3NbIkNhbGxzIl0gPSAiQ2FsbHMiOwogbG9jYWxpemVkU3RyaW5nc1si Q2FuY2VsIEF1dG9tYXRpYyBDb250aW51ZSJdID0gIkNhbmNlbCBBdXRvbWF0aWMgQ29udGludWUi OwpAQCAtNTk0LDcgKzU5NSw2IEBAIGxvY2FsaXplZFN0cmluZ3NbIk5vIFJlcXVlc3QgSGVhZGVy cyJdID0gIk5vIFJlcXVlc3QgSGVhZGVycyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJObyBSZXNwb25z ZSBIZWFkZXJzIl0gPSAiTm8gUmVzcG9uc2UgSGVhZGVycyI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJO byBSZXN1bHRzIEZvdW5kIl0gPSAiTm8gUmVzdWx0cyBGb3VuZCI7CiBsb2NhbGl6ZWRTdHJpbmdz WyJObyBTZWFyY2ggUmVzdWx0cyJdID0gIk5vIFNlYXJjaCBSZXN1bHRzIjsKLWxvY2FsaXplZFN0 cmluZ3NbIk5vIFRyYWNlIERhdGEiXSA9ICJObyBUcmFjZSBEYXRhIjsKIGxvY2FsaXplZFN0cmlu Z3NbIk5vIFdhdGNoIEV4cHJlc3Npb25zIl0gPSAiTm8gV2F0Y2ggRXhwcmVzc2lvbnMiOwogbG9j YWxpemVkU3RyaW5nc1siTm8gbWF0Y2hpbmcgQVJJQSByb2xlIl0gPSAiTm8gbWF0Y2hpbmcgQVJJ QSByb2xlIjsKIGxvY2FsaXplZFN0cmluZ3NbIk5vIHByZXZpZXcgYXZhaWxhYmxlIl0gPSAiTm8g cHJldmlldyBhdmFpbGFibGUiOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5nQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZWNvcmRpbmdDb250ZW50Vmlldy5qcwppbmRl eCAyNDMzNjZhZjI5Mjk0N2EwMTE4MTUxZTYyODI5ZjAxM2U2M2JiZjI0Li4yNjQyOWE3YWRjZWU5 ODRiZmRmMGYwZGNlMWYzZjU0YTk2YTdjYWQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZWNvcmRpbmdDb250ZW50Vmlldy5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZWNvcmRpbmdDb250ZW50 Vmlldy5qcwpAQCAtMzk4LDcgKzM5OCw3IEBAIFdJLlJlY29yZGluZ0NvbnRlbnRWaWV3ID0gY2xh c3MgUmVjb3JkaW5nQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50VmlldwogCiAgICAgICAg IGFwcGx5QWN0aW9ucyhzbmFwc2hvdC5pbmRleCwgdGhpcy5faW5kZXgsICgpID0+IHsKICAgICAg ICAgICAgIGlmIChvcHRpb25zLmFjdGlvbkNvbXBsZXRlZENhbGxiYWNrKQotICAgICAgICAgICAg ICAgIG9wdGlvbnMuYWN0aW9uQ29tcGxldGVkQ2FsbGJhY2soc25hcHNob3QuY29udGV4dCk7Cisg ICAgICAgICAgICAgICAgb3B0aW9ucy5hY3Rpb25Db21wbGV0ZWRDYWxsYmFjayhhY3Rpb25zW3Ro aXMuX2luZGV4XSwgc25hcHNob3QuY29udGV4dCk7CiAgICAgICAgIH0pOwogCiAgICAgICAgIHRo aXMuX3ByZXZpZXdDb250YWluZXIuYXBwZW5kQ2hpbGQoc25hcHNob3QuZWxlbWVudCk7CkBAIC00 NDgsNyArNDQ4LDcgQEAgV0kuUmVjb3JkaW5nQ29udGVudFZpZXcgPSBjbGFzcyBSZWNvcmRpbmdD b250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRWaWV3CiAgICAgICAgIH0KIAogICAgICAgICBp ZiAob3B0aW9ucy5hY3Rpb25Db21wbGV0ZWRDYWxsYmFjaykKLSAgICAgICAgICAgIG9wdGlvbnMu YWN0aW9uQ29tcGxldGVkQ2FsbGJhY2soKTsKKyAgICAgICAgICAgIG9wdGlvbnMuYWN0aW9uQ29t cGxldGVkQ2FsbGJhY2soYWN0aW9uc1t0aGlzLl9pbmRleF0pOwogICAgIH0KIAogICAgIF9hcHBs eUFjdGlvbihjb250ZXh0LCBhY3Rpb24sIG9wdGlvbnMgPSB7fSkKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlY29yZGluZ1N0YXRlRGV0YWls c1NpZGViYXJQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1JlY29yZGluZ1N0YXRlRGV0YWlsc1NpZGViYXJQYW5lbC5qcwppbmRleCBhZWJhZmFlOWE4 ZmVkNmM1NWE2YzZmNzg5ZjZiMTI0ZmVlNDFhYzI5Li5hN2UzM2RmYzc1NjYxNThjN2Y2MTA2MDU0 NTIzZjU0NDk2NzY0MDM4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9SZWNvcmRpbmdTdGF0ZURldGFpbHNTaWRlYmFyUGFuZWwuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5nU3RhdGVE ZXRhaWxzU2lkZWJhclBhbmVsLmpzCkBAIC0zMCw3ICszMCw3IEBAIFdJLlJlY29yZGluZ1N0YXRl RGV0YWlsc1NpZGViYXJQYW5lbCA9IGNsYXNzIFJlY29yZGluZ1N0YXRlRGV0YWlsc1NpZGViYXJQ YW5lbCBlCiAgICAgICAgIHN1cGVyKCJyZWNvcmRpbmctc3RhdGUiLCBXSS5VSVN0cmluZygiU3Rh dGUiKSk7CiAKICAgICAgICAgdGhpcy5fcmVjb3JkaW5nID0gbnVsbDsKLSAgICAgICAgdGhpcy5f aW5kZXggPSBOYU47CisgICAgICAgIHRoaXMuX2FjdGlvbiA9IG51bGw7CiAKICAgICAgICAgdGhp cy5fZGF0YUdyaWQgPSBudWxsOwogICAgIH0KQEAgLTYwLDM0ICs2MCwyOCBAQCBXSS5SZWNvcmRp bmdTdGF0ZURldGFpbHNTaWRlYmFyUGFuZWwgPSBjbGFzcyBSZWNvcmRpbmdTdGF0ZURldGFpbHNT aWRlYmFyUGFuZWwgZQogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIHRoaXMuX3JlY29y ZGluZyA9IHJlY29yZGluZzsKLSAgICAgICAgdGhpcy5faW5kZXggPSBOYU47CisgICAgICAgIHRo aXMuX2FjdGlvbiA9IG51bGw7CiAKICAgICAgICAgZm9yIChsZXQgc3VidmlldyBvZiB0aGlzLmNv bnRlbnRWaWV3LnN1YnZpZXdzKQogICAgICAgICAgICAgdGhpcy5jb250ZW50Vmlldy5yZW1vdmVT dWJ2aWV3KHN1YnZpZXcpOwogICAgIH0KIAotICAgIHVwZGF0ZUFjdGlvbkluZGV4KGluZGV4LCBj b250ZXh0LCBvcHRpb25zID0ge30pCisgICAgdXBkYXRlQWN0aW9uKGFjdGlvbiwgY29udGV4dCwg b3B0aW9ucyA9IHt9KQogICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLl9yZWNvcmRpbmcpCisgICAg ICAgIGlmICghdGhpcy5fcmVjb3JkaW5nIHx8IGFjdGlvbiA9PT0gdGhpcy5fYWN0aW9uKQogICAg ICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHRoaXMuX3JlY29yZGluZy5hY3Rpb25zLnRoZW4o KGFjdGlvbnMpID0+IHsKLSAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGluZGV4ID49IDAgJiYg aW5kZXggPCBhY3Rpb25zLmxlbmd0aCk7Ci0gICAgICAgICAgICBpZiAoaW5kZXggPCAwIHx8IGlu ZGV4ID4gYWN0aW9ucy5sZW5ndGggfHwgaW5kZXggPT09IHRoaXMuX2luZGV4KQotICAgICAgICAg ICAgICAgIHJldHVybjsKKyAgICAgICAgdGhpcy5fYWN0aW9uID0gYWN0aW9uOwogCi0gICAgICAg ICAgICB0aGlzLl9pbmRleCA9IGluZGV4OworICAgICAgICBpZiAodGhpcy5fcmVjb3JkaW5nLnR5 cGUgPT09IFdJLlJlY29yZGluZy5UeXBlLkNhbnZhczJEKQorICAgICAgICAgICAgdGhpcy5fZ2Vu ZXJhdGVEZXRhaWxzQ2FudmFzMkQoYWN0aW9uLCBjb250ZXh0LCBvcHRpb25zKTsKIAotICAgICAg ICAgICAgaWYgKHRoaXMuX3JlY29yZGluZy50eXBlID09PSBXSS5SZWNvcmRpbmcuVHlwZS5DYW52 YXMyRCkKLSAgICAgICAgICAgICAgICB0aGlzLl9nZW5lcmF0ZURldGFpbHNDYW52YXMyRChjb250 ZXh0LCBhY3Rpb25zLCBvcHRpb25zKTsKLQotICAgICAgICAgICAgdGhpcy51cGRhdGVMYXlvdXRJ Zk5lZWRlZCgpOwotICAgICAgICB9KTsKKyAgICAgICAgdGhpcy51cGRhdGVMYXlvdXRJZk5lZWRl ZCgpOwogICAgIH0KIAogICAgIC8vIFByaXZhdGUKIAotICAgIF9nZW5lcmF0ZURldGFpbHNDYW52 YXMyRChjb250ZXh0LCBhY3Rpb25zLCBvcHRpb25zID0ge30pCisgICAgX2dlbmVyYXRlRGV0YWls c0NhbnZhczJEKGFjdGlvbiwgY29udGV4dCwgb3B0aW9ucyA9IHt9KQogICAgIHsKICAgICAgICAg aWYgKCF0aGlzLl9kYXRhR3JpZCkgewogICAgICAgICAgICAgdGhpcy5fZGF0YUdyaWQgPSBuZXcg V0kuRGF0YUdyaWQoewpAQCAtMTQ4LDcgKzE0Miw2IEBAIFdJLlJlY29yZGluZ1N0YXRlRGV0YWls c1NpZGViYXJQYW5lbCA9IGNsYXNzIFJlY29yZGluZ1N0YXRlRGV0YWlsc1NpZGViYXJQYW5lbCBl CiAgICAgICAgICAgICByZXR1cm4gbmV3IFdJLklubGluZVN3YXRjaChXSS5JbmxpbmVTd2F0Y2gu VHlwZS5Db2xvciwgY29sb3IsIHJlYWRPbmx5KTsKICAgICAgICAgfQogCi0gICAgICAgIGxldCBh Y3Rpb24gPSBhY3Rpb25zW3RoaXMuX2luZGV4XTsKICAgICAgICAgZm9yIChsZXQgbmFtZSBpbiBz dGF0ZSkgewogICAgICAgICAgICAgbGV0IHZhbHVlID0gc3RhdGVbbmFtZV07CiAgICAgICAgICAg ICBpZiAodHlwZW9mIHZhbHVlID09PSAib2JqZWN0IikgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5nVGFiQ29udGVudFZpZXcu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZWNvcmRpbmdU YWJDb250ZW50Vmlldy5qcwppbmRleCBjNTIxODE2Y2M5MGRiM2JhODE5MTY3YWZhODgxNzAwMmI4 ZmQ2MjdkLi5kOTljNjJiYWNhY2YzZWVmMmNiNTBjMDU5MTk3ZDM4MDBjNTIxZGE0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZWNvcmRpbmdU YWJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9SZWNvcmRpbmdUYWJDb250ZW50Vmlldy5qcwpAQCAtMTMyLDEwICsxMzIsMTAgQEAg V0kuUmVjb3JkaW5nVGFiQ29udGVudFZpZXcgPSBjbGFzcyBSZWNvcmRpbmdUYWJDb250ZW50Vmll dyBleHRlbmRzIFdJLkNvbnRlbnRCcm8KICAgICB7CiAgICAgICAgIHRoaXMuX3NjcnViYmVyTmF2 aWdhdGlvbkl0ZW0udmFsdWUgPSBpbmRleDsKIAotICAgICAgICBvcHRpb25zLmFjdGlvbkNvbXBs ZXRlZENhbGxiYWNrID0gKGNvbnRleHQpID0+IHsKKyAgICAgICAgb3B0aW9ucy5hY3Rpb25Db21w bGV0ZWRDYWxsYmFjayA9IChhY3Rpb24sIGNvbnRleHQpID0+IHsKICAgICAgICAgICAgIGZvciAo bGV0IGRldGFpbHNTaWRlYmFyUGFuZWwgb2YgdGhpcy5kZXRhaWxzU2lkZWJhclBhbmVscykgewot ICAgICAgICAgICAgICAgIGlmIChkZXRhaWxzU2lkZWJhclBhbmVsLnVwZGF0ZUFjdGlvbkluZGV4 KQotICAgICAgICAgICAgICAgICAgICBkZXRhaWxzU2lkZWJhclBhbmVsLnVwZGF0ZUFjdGlvbklu ZGV4KGluZGV4LCBjb250ZXh0LCBvcHRpb25zKTsKKyAgICAgICAgICAgICAgICBpZiAoZGV0YWls c1NpZGViYXJQYW5lbC51cGRhdGVBY3Rpb24pCisgICAgICAgICAgICAgICAgICAgIGRldGFpbHNT aWRlYmFyUGFuZWwudXBkYXRlQWN0aW9uKGFjdGlvbiwgY29udGV4dCwgb3B0aW9ucyk7CiAgICAg ICAgICAgICB9CiAgICAgICAgIH07CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlY29yZGluZ1RyYWNlRGV0YWlsc1NpZGViYXJQYW5lbC5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1JlY29yZGluZ1Ry YWNlRGV0YWlsc1NpZGViYXJQYW5lbC5qcwppbmRleCA2N2E4NGQ1OTRmYzQ1MDc2MWNiMGQ4Njcw ZTE5NzY4YTlkMGU5NjhhLi5mYWI4N2I5ODc3OGQwNmI0NDBkYzQ5NjIyYTFiZjQxMDEzMGE4MTJm IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9S ZWNvcmRpbmdUcmFjZURldGFpbHNTaWRlYmFyUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUmVjb3JkaW5nVHJhY2VEZXRhaWxzU2lkZWJhclBh bmVsLmpzCkBAIC0zMCw3ICszMCw3IEBAIFdJLlJlY29yZGluZ1RyYWNlRGV0YWlsc1NpZGViYXJQ YW5lbCA9IGNsYXNzIFJlY29yZGluZ1RyYWNlRGV0YWlsc1NpZGViYXJQYW5lbCBlCiAgICAgICAg IHN1cGVyKCJyZWNvcmRpbmctdHJhY2UiLCBXSS5VSVN0cmluZygiVHJhY2UiKSk7CiAKICAgICAg ICAgdGhpcy5fcmVjb3JkaW5nID0gbnVsbDsKLSAgICAgICAgdGhpcy5faW5kZXggPSBOYU47Cisg ICAgICAgIHRoaXMuX2FjdGlvbiA9IG51bGw7CiAgICAgfQogCiAgICAgLy8gU3RhdGljCkBAIC01 OCwzOSArNTgsMzMgQEAgV0kuUmVjb3JkaW5nVHJhY2VEZXRhaWxzU2lkZWJhclBhbmVsID0gY2xh c3MgUmVjb3JkaW5nVHJhY2VEZXRhaWxzU2lkZWJhclBhbmVsIGUKICAgICAgICAgICAgIHJldHVy bjsKIAogICAgICAgICB0aGlzLl9yZWNvcmRpbmcgPSByZWNvcmRpbmc7Ci0gICAgICAgIHRoaXMu X2luZGV4ID0gTmFOOworICAgICAgICB0aGlzLl9hY3Rpb24gPSBudWxsOwogCiAgICAgICAgIHRo aXMuY29udGVudFZpZXcuZWxlbWVudC5yZW1vdmVDaGlsZHJlbigpOwogICAgIH0KIAotICAgIHVw ZGF0ZUFjdGlvbkluZGV4KGluZGV4LCBjb250ZXh0LCBvcHRpb25zID0ge30pCisgICAgdXBkYXRl QWN0aW9uKGFjdGlvbiwgY29udGV4dCwgb3B0aW9ucyA9IHt9KQogICAgIHsKLSAgICAgICAgaWYg KCF0aGlzLl9yZWNvcmRpbmcpCisgICAgICAgIGlmICghdGhpcy5fcmVjb3JkaW5nIHx8IGFjdGlv biA9PT0gdGhpcy5fYWN0aW9uKQogICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIHRoaXMu X3JlY29yZGluZy5hY3Rpb25zLnRoZW4oKGFjdGlvbnMpID0+IHsKLSAgICAgICAgICAgIGNvbnNv bGUuYXNzZXJ0KGluZGV4ID49IDAgJiYgaW5kZXggPCBhY3Rpb25zLmxlbmd0aCk7Ci0gICAgICAg ICAgICBpZiAoaW5kZXggPCAwIHx8IGluZGV4ID4gYWN0aW9ucy5sZW5ndGggfHwgaW5kZXggPT09 IHRoaXMuX2luZGV4KQotICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdGhpcy5fYWN0 aW9uID0gYWN0aW9uOwogCi0gICAgICAgICAgICB0aGlzLl9pbmRleCA9IGluZGV4OwotCi0gICAg ICAgICAgICB0aGlzLmNvbnRlbnRWaWV3LmVsZW1lbnQucmVtb3ZlQ2hpbGRyZW4oKTsKKyAgICAg ICAgdGhpcy5jb250ZW50Vmlldy5lbGVtZW50LnJlbW92ZUNoaWxkcmVuKCk7CiAKLSAgICAgICAg ICAgIGxldCB0cmFjZSA9IGFjdGlvbnNbdGhpcy5faW5kZXhdLnRyYWNlOwotICAgICAgICAgICAg aWYgKCF0cmFjZS5sZW5ndGgpIHsKLSAgICAgICAgICAgICAgICBsZXQgbm9UcmFjZURhdGFFbGVt ZW50ID0gdGhpcy5jb250ZW50Vmlldy5lbGVtZW50LmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0 ZUVsZW1lbnQoImRpdiIpKTsKLSAgICAgICAgICAgICAgICBub1RyYWNlRGF0YUVsZW1lbnQuY2xh c3NMaXN0LmFkZCgibm8tdHJhY2UtZGF0YSIpOworICAgICAgICBsZXQgdHJhY2UgPSB0aGlzLl9h Y3Rpb24udHJhY2U7CisgICAgICAgIGlmICghdHJhY2UubGVuZ3RoKSB7CisgICAgICAgICAgICBs ZXQgbm9UcmFjZURhdGFFbGVtZW50ID0gdGhpcy5jb250ZW50Vmlldy5lbGVtZW50LmFwcGVuZENo aWxkKGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIpKTsKKyAgICAgICAgICAgIG5vVHJhY2VE YXRhRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJuby10cmFjZS1kYXRhIik7CiAKLSAgICAgICAgICAg ICAgICBsZXQgbm9UcmFjZURhdGFNZXNzYWdlRWxlbWVudCA9IG5vVHJhY2VEYXRhRWxlbWVudC5h cHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKSk7Ci0gICAgICAgICAgICAg ICAgbm9UcmFjZURhdGFNZXNzYWdlRWxlbWVudC5jbGFzc0xpc3QuYWRkKCJtZXNzYWdlIik7Ci0g ICAgICAgICAgICAgICAgbm9UcmFjZURhdGFNZXNzYWdlRWxlbWVudC50ZXh0Q29udGVudCA9IFdJ LlVJU3RyaW5nKCJObyBUcmFjZSBEYXRhIik7Ci0gICAgICAgICAgICAgICAgcmV0dXJuOwotICAg ICAgICAgICAgfQorICAgICAgICAgICAgbGV0IG5vVHJhY2VEYXRhTWVzc2FnZUVsZW1lbnQgPSBu b1RyYWNlRGF0YUVsZW1lbnQuYXBwZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2 IikpOworICAgICAgICAgICAgbm9UcmFjZURhdGFNZXNzYWdlRWxlbWVudC5jbGFzc0xpc3QuYWRk KCJtZXNzYWdlIik7CisgICAgICAgICAgICBub1RyYWNlRGF0YU1lc3NhZ2VFbGVtZW50LnRleHRD b250ZW50ID0gV0kuVUlTdHJpbmcoIkNhbGwgU3RhY2sgVW5hdmFpbGFibGUiKTsKKyAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgfQogCi0gICAgICAgICAgICBjb25zdCBzaG93RnVuY3Rpb25O YW1lID0gdHJ1ZTsKLSAgICAgICAgICAgIGZvciAobGV0IGNhbGxGcmFtZSBvZiB0cmFjZSkKLSAg ICAgICAgICAgICAgICB0aGlzLmNvbnRlbnRWaWV3LmVsZW1lbnQuYXBwZW5kQ2hpbGQobmV3IFdJ LkNhbGxGcmFtZVZpZXcoY2FsbEZyYW1lLCBzaG93RnVuY3Rpb25OYW1lKSk7Ci0gICAgICAgIH0p OworICAgICAgICBjb25zdCBzaG93RnVuY3Rpb25OYW1lID0gdHJ1ZTsKKyAgICAgICAgZm9yIChs ZXQgY2FsbEZyYW1lIG9mIHRyYWNlKQorICAgICAgICAgICAgdGhpcy5jb250ZW50Vmlldy5lbGVt ZW50LmFwcGVuZENoaWxkKG5ldyBXSS5DYWxsRnJhbWVWaWV3KGNhbGxGcmFtZSwgc2hvd0Z1bmN0 aW9uTmFtZSkpOwogICAgIH0KIH07Cg==