230286 2021-09-14 18:16:10 -0700 Web Inspector: Don't maintain a back-forward stack for `ContentBrowser`/`ContentViewContainer` when not necessary 2021-09-16 15:35:34 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 pangle pangle ews-watchlist hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1793551 0 pangle 2021-09-14 18:16:10 -0700 Many content views explicitly request hidden back/forward navigation buttons, but many of them also do not need to maintain a full stack of back/forward history for navigation. This makes it more difficult for us to ensure that stale views are discarded in a timely manner, particularly on page reload. 1793552 1 webkit-bug-importer 2021-09-14 18:16:23 -0700 <rdar://problem/83125792> 1793564 2 438202 pangle 2021-09-14 18:38:22 -0700 Created attachment 438202 Patch v1.0 1793774 3 438202 hi 2021-09-15 11:20:32 -0700 Comment on attachment 438202 Patch v1.0 View in context: https://bugs.webkit.org/attachment.cgi?id=438202&action=review r=me, awesome stuff =D > Source/WebInspectorUI/UserInterface/Views/AuditTabContentView.js:32 > + disableBackForwardButtons: true, NIT: `disableBackForwardButtons` makes me think that it's gonna leave the buttons where they are but just `.enabled = false`. Perhaps `hideBackFowardButtons` instead? > Source/WebInspectorUI/UserInterface/Views/AuditTabContentView.js:33 > + disableBackForwardNavigation: true, Does this tab also need to remember selection like the Graphics Tab, or am I misremembering/mistaken? > Source/WebInspectorUI/UserInterface/Views/NetworkDetailView.js:88 > + this._contentBrowser = new WI.ContentBrowser(element, this, {disableBackForwardButtons: true, disableBackForwardNavigation: true, contentViewNavigationItemsFlexItem, contentViewNavigationItemsGroup}); I feel like this may want to keep a back-forward list for the various alternate representations of the resource's content (e.g. "Response" vs "Response (JSON)"). Can you confirm? 1794150 4 438202 pangle 2021-09-16 12:12:46 -0700 Comment on attachment 438202 Patch v1.0 View in context: https://bugs.webkit.org/attachment.cgi?id=438202&action=review >> Source/WebInspectorUI/UserInterface/Views/AuditTabContentView.js:33 >> + disableBackForwardNavigation: true, > > Does this tab also need to remember selection like the Graphics Tab, or am I misremembering/mistaken? I've confirmed you are correct - this was hidden before by Bug 230322 which hid either the only, or most noticeable, use for the stack in the Audit tab. >> Source/WebInspectorUI/UserInterface/Views/NetworkDetailView.js:88 >> + this._contentBrowser = new WI.ContentBrowser(element, this, {disableBackForwardButtons: true, disableBackForwardNavigation: true, contentViewNavigationItemsFlexItem, contentViewNavigationItemsGroup}); > > I feel like this may want to keep a back-forward list for the various alternate representations of the resource's content (e.g. "Response" vs "Response (JSON)"). Can you confirm? This state isn't remembered in ToT/STP... I'll open a bug for that. 1794154 5 438202 pangle 2021-09-16 12:19:21 -0700 Comment on attachment 438202 Patch v1.0 This patch appears to have unintentionally moved the "Response" format dropdown menu in network details from being right justified to being left justified because of a name mismatch for that variable in this patch. contentViewNavigationItemsGroup is also affected. 1794161 6 438386 pangle 2021-09-16 12:32:46 -0700 Created attachment 438386 Patch v1.1 1794162 7 438387 pangle 2021-09-16 12:33:53 -0700 Created attachment 438387 Patch v1.1.1 - Add reviewer to change log 1794234 8 ews-feeder 2021-09-16 15:35:33 -0700 Committed r282610 (241770@main): <https://commits.webkit.org/241770@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 438387. 438202 2021-09-14 18:38:22 -0700 2021-09-16 12:32:44 -0700 Patch v1.0 bug-230286-20210914183821.patch text/plain 16253 pangle U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMzY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAz NTJiZDZjODI5ODA4ZTdhNmM3YzZkNmUwMTA2YTdkNGQzOTYwZTk3Li5lMmM4NzZjZThhMDQwMjBh NDNiYTBlYzZmMzgxNmFlNjE2YmEwYTRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzOSBAQAorMjAyMS0wOS0xNCAgUGF0cmljayBBbmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRG9uJ3QgbWFpbnRhaW4gYSBiYWNrLWZvcndhcmQg c3RhY2sgZm9yIGBDb250ZW50QnJvd3NlcmAvYENvbnRlbnRWaWV3Q29udGFpbmVyYCB3aGVuIG5v dCBuZWNlc3NhcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIzMDI4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFdlIGN1cnJlbnRseSBtYWludGFpbiBhIGJhY2svZm9yd2FyZCBzdGFjayBmb3IgYWxsIENv bnRlbnRWaWV3Q29udGFpbmVycywgZXZlbiBpZiBvdGhlciBoaXN0b3J5IGVudHJpZXMgd29uJ3Qg YmUKKyAgICAgICAgdXNlZC4gSW5zdGVhZCwgc3ViY2xhc3NlcyBvZiBDb250ZW50QnJvd3NlclRh YkNvbnRlbnRWaWV3IHNob3VsZCBiZSBhYmxlIHRvIGRpc2FibGUgdGhlIGhpc3Rvcnkgc3RhY2ss IHdoaWNoCisgICAgICAgIGhlbHBzIHVzIGVuc3VyZSB0aGF0IG91dGRhdGVkIGNvbnRlbnQgdmll d3MgYXJlIG5vdCBrZXB0IGFyb3VuZCBmb3IgdGhlc2Ugc3ViY2xhc3NlcyBhbmQgdGhlaXIgdmll d3MuCisKKyAgICAgICAgVGhpcyBkb2VzIG5vdCBsaW5lIHVwIG9uZS10by1vbmUgd2l0aCB2aWV3 cyB0aGF0IGhpZGUgdGhlIGJhY2svZm9yd2FyZCBidXR0b25zLCBhcyB0aGUgYmFjay9mb3J3YXJk IHN0YWNrIGlzCisgICAgICAgIHVzZWQgaW4gc29tZSBwbGFjZXMgdG8gcHJvdmlkZSBhIG1lbW9y eSBvZiBzZWxlY3Rpb24gYWNyb3NzIGRpZmZlcmVudCB2aWV3cywgbGlrZSBpbiB0aGUgR3JhcGhp Y3MgdGFiLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9BdWRpdFRhYkNvbnRlbnRW aWV3LmpzOgorICAgICAgICAoV0kuQXVkaXRUYWJDb250ZW50Vmlldyk6CisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9Db25zb2xlVGFiQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5D b25zb2xlVGFiQ29udGVudFZpZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29u dGVudEJyb3dzZXIuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJv d3NlclRhYkNvbnRlbnRWaWV3LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29u dGVudFZpZXdDb250YWluZXIuanM6CisgICAgICAgIChXSS5Db250ZW50Vmlld0NvbnRhaW5lci5w cm90b3R5cGUuc2hvd0NvbnRlbnRWaWV3KToKKyAgICAgICAgKFdJLkNvbnRlbnRWaWV3Q29udGFp bmVyLnByb3RvdHlwZS5yZXBsYWNlQ29udGVudFZpZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvRWxlbWVudHNUYWJDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLkVsZW1lbnRz VGFiQ29udGVudFZpZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvR3JhcGhpY3NU YWJDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLkdyYXBoaWNzVGFiQ29udGVudFZpZXcpOgor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJzVGFiQ29udGVudFZpZXcuanM6Cisg ICAgICAgIChXSS5MYXllcnNUYWJDb250ZW50Vmlldyk6CisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9OZXR3b3JrRGV0YWlsVmlldy5qczoKKyAgICAgICAgKFdJLk5ldHdvcmtEZXRhaWxW aWV3LnByb3RvdHlwZS5pbml0aWFsTGF5b3V0KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL05ldHdvcmtUYWJDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLk5ldHdvcmtUYWJDb250 ZW50Vmlldyk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZGlu Z0NvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmll dyk6CisKIDIwMjEtMDktMTMgIFJhenZhbiBDYWxpbWFuICA8cmNhbGltYW5AYXBwbGUuY29tPgog CiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFVwZGF0ZSBuYW1pbmcgb2YgV0kuQ1NTQ29tcGxldGlv bnMgY2FsbGJhY2sgdXNlZCBmb3IgY29sbGVjdGluZyBzdXBwb3J0ZWQgQ1NTIHByb3BlcnRpZXMg ZnJvbSB0aGUgdGFyZ2V0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9BdWRpdFRhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQXVkaXRUYWJDb250ZW50Vmlldy5qcwppbmRleCA4Zjg5 MzhlNDRjNDNlMDRlYTFhZjNmNmEzOGIyZTk1MDRmNmM0YzU5Li43MGQ5MzFjZmQxNjc4YzBlYmY2 MWNmNDFlYzhkODc4NWJmMzdjODFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9BdWRpdFRhYkNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0F1ZGl0VGFiQ29udGVudFZpZXcuanMK QEAgLTI5LDcgKzI5LDggQEAgV0kuQXVkaXRUYWJDb250ZW50VmlldyA9IGNsYXNzIEF1ZGl0VGFi Q29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50QnJvd3NlclRhYkMKICAgICB7CiAgICAgICAg IHN1cGVyKEF1ZGl0VGFiQ29udGVudFZpZXcudGFiSW5mbygpLCB7CiAgICAgICAgICAgICBuYXZp Z2F0aW9uU2lkZWJhclBhbmVsQ29uc3RydWN0b3I6IFdJLkF1ZGl0TmF2aWdhdGlvblNpZGViYXJQ YW5lbCwKLSAgICAgICAgICAgIGRpc2FibGVCYWNrRm9yd2FyZDogdHJ1ZSwKKyAgICAgICAgICAg IGRpc2FibGVCYWNrRm9yd2FyZEJ1dHRvbnM6IHRydWUsCisgICAgICAgICAgICBkaXNhYmxlQmFj a0ZvcndhcmROYXZpZ2F0aW9uOiB0cnVlLAogICAgICAgICB9KTsKIAogICAgICAgICB0aGlzLl9z dGFydFN0b3BTaG9ydGN1dCA9IG5ldyBXSS5LZXlib2FyZFNob3J0Y3V0KG51bGwsIFdJLktleWJv YXJkU2hvcnRjdXQuS2V5LlNwYWNlLCB0aGlzLl9oYW5kbGVTcGFjZS5iaW5kKHRoaXMpKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnNv bGVUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0NvbnNvbGVUYWJDb250ZW50Vmlldy5qcwppbmRleCA3OWVmYzU2NTE0ZGVkNTZjOTk2 YWI2YWYwYTIyYjlkZDRhNzI4ZTAxLi4xNjdmNjYyYjExNTFiMjNmMTRjZjc2NmEwZDI1NDU4NGNl NzM2M2Q3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9Db25zb2xlVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvQ29uc29sZVRhYkNvbnRlbnRWaWV3LmpzCkBAIC0yNyw3ICsy Nyw3IEBAIFdJLkNvbnNvbGVUYWJDb250ZW50VmlldyA9IGNsYXNzIENvbnNvbGVUYWJDb250ZW50 VmlldyBleHRlbmRzIFdJLkNvbnRlbnRCcm93c2VyCiB7CiAgICAgY29uc3RydWN0b3IoKQogICAg IHsKLSAgICAgICAgc3VwZXIoQ29uc29sZVRhYkNvbnRlbnRWaWV3LnRhYkluZm8oKSwge2Rpc2Fi bGVCYWNrRm9yd2FyZDogdHJ1ZX0pOworICAgICAgICBzdXBlcihDb25zb2xlVGFiQ29udGVudFZp ZXcudGFiSW5mbygpLCB7ZGlzYWJsZUJhY2tGb3J3YXJkQnV0dG9uczogdHJ1ZSwgZGlzYWJsZUJh Y2tGb3J3YXJkTmF2aWdhdGlvbjogdHJ1ZX0pOwogCiAgICAgICAgIHRoaXMuX3dhc1Nob3dpbmdT cGxpdENvbnNvbGUgPSBmYWxzZTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyLmpzCmluZGV4IGU1 NjhmOTY2MTNkNWMzOTg1MGE2YzE0YTg4NDU2MTljMDVlYjliNTYuLmQ2NjgxMDdjMTc4ZDJhNmRj MzhlZWEyNjBkZGQ1ZTc0M2RhNzQwNDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyLmpzCkBAIC0yNSw3 ICsyNSw3IEBACiAKIFdJLkNvbnRlbnRCcm93c2VyID0gY2xhc3MgQ29udGVudEJyb3dzZXIgZXh0 ZW5kcyBXSS5WaWV3CiB7Ci0gICAgY29uc3RydWN0b3IoZWxlbWVudCwgZGVsZWdhdGUsIGRpc2Fi bGVCYWNrRm9yd2FyZCwgZGlzYWJsZUZpbmRCYW5uZXIsIGZsZXhpYmxlTmF2aWdhdGlvbkl0ZW0s IGNvbnRlbnRWaWV3TmF2aWdhdGlvbkl0ZW1Hcm91cCkKKyAgICBjb25zdHJ1Y3RvcihlbGVtZW50 LCBkZWxlZ2F0ZSwge2Rpc2FibGVCYWNrRm9yd2FyZEJ1dHRvbnMsIGRpc2FibGVCYWNrRm9yd2Fy ZE5hdmlnYXRpb24sIGRpc2FibGVGaW5kQmFubmVyLCBmbGV4aWJsZU5hdmlnYXRpb25JdGVtLCBj b250ZW50Vmlld05hdmlnYXRpb25JdGVtR3JvdXB9ID0ge30pCiAgICAgewogICAgICAgICBzdXBl cihlbGVtZW50KTsKIApAQCAtMzQsMTEgKzM0LDExIEBAIFdJLkNvbnRlbnRCcm93c2VyID0gY2xh c3MgQ29udGVudEJyb3dzZXIgZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgIHRoaXMuX25hdmlnYXRp b25CYXIgPSBuZXcgV0kuTmF2aWdhdGlvbkJhcjsKICAgICAgICAgdGhpcy5hZGRTdWJ2aWV3KHRo aXMuX25hdmlnYXRpb25CYXIpOwogCi0gICAgICAgIHRoaXMuX2NvbnRlbnRWaWV3Q29udGFpbmVy ID0gbmV3IFdJLkNvbnRlbnRWaWV3Q29udGFpbmVyOworICAgICAgICB0aGlzLl9jb250ZW50Vmll d0NvbnRhaW5lciA9IG5ldyBXSS5Db250ZW50Vmlld0NvbnRhaW5lcih7ZGlzYWJsZUJhY2tGb3J3 YXJkTmF2aWdhdGlvbn0pOwogICAgICAgICB0aGlzLl9jb250ZW50Vmlld0NvbnRhaW5lci5hZGRF dmVudExpc3RlbmVyKFdJLkNvbnRlbnRWaWV3Q29udGFpbmVyLkV2ZW50LkN1cnJlbnRDb250ZW50 Vmlld0RpZENoYW5nZSwgdGhpcy5fY3VycmVudENvbnRlbnRWaWV3RGlkQ2hhbmdlLCB0aGlzKTsK ICAgICAgICAgdGhpcy5hZGRTdWJ2aWV3KHRoaXMuX2NvbnRlbnRWaWV3Q29udGFpbmVyKTsKIAot ICAgICAgICBpZiAoIWRpc2FibGVCYWNrRm9yd2FyZCkgeworICAgICAgICBpZiAoIWRpc2FibGVC YWNrRm9yd2FyZEJ1dHRvbnMpIHsKICAgICAgICAgICAgIGxldCBpc1JUTCA9IFdJLnJlc29sdmVk TGF5b3V0RGlyZWN0aW9uKCkgPT09IFdJLkxheW91dERpcmVjdGlvbi5SVEw7CiAKICAgICAgICAg ICAgIGxldCBnb0JhY2sgPSAoKSA9PiB7IHRoaXMuZ29CYWNrKCk7IH07CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3NlclRh YkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvQ29udGVudEJyb3dzZXJUYWJDb250ZW50Vmlldy5qcwppbmRleCAyZTI3ZTg0MzE4MTEyZTZm ZjNiNzFiZTRjZWUxNWE5NjYwY2RmMDA0Li44MTFmYzM3MGE1YjdlMTA4Njc3M2NhNTZmOWNkOTg3 NWYxY2I2NTQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9Db250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyVGFiQ29udGVudFZp ZXcuanMKQEAgLTI1LDEzICsyNSwxMyBAQAogCiBXSS5Db250ZW50QnJvd3NlclRhYkNvbnRlbnRW aWV3ID0gY2xhc3MgQ29udGVudEJyb3dzZXJUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLlRhYkNv bnRlbnRWaWV3CiB7Ci0gICAgY29uc3RydWN0b3IodGFiSW5mbywge25hdmlnYXRpb25TaWRlYmFy UGFuZWxDb25zdHJ1Y3RvciwgZGV0YWlsc1NpZGViYXJQYW5lbENvbnN0cnVjdG9ycywgZGlzYWJs ZUJhY2tGb3J3YXJkLCBmbGV4aWJsZU5hdmlnYXRpb25JdGVtfSA9IHt9KQorICAgIGNvbnN0cnVj dG9yKHRhYkluZm8sIHtuYXZpZ2F0aW9uU2lkZWJhclBhbmVsQ29uc3RydWN0b3IsIGRldGFpbHNT aWRlYmFyUGFuZWxDb25zdHJ1Y3RvcnMsIGRpc2FibGVCYWNrRm9yd2FyZEJ1dHRvbnMsIGRpc2Fi bGVCYWNrRm9yd2FyZE5hdmlnYXRpb24sIGZsZXhpYmxlTmF2aWdhdGlvbkl0ZW19ID0ge30pCiAg ICAgewogICAgICAgICBzdXBlcih0YWJJbmZvLCB7bmF2aWdhdGlvblNpZGViYXJQYW5lbENvbnN0 cnVjdG9yLCBkZXRhaWxzU2lkZWJhclBhbmVsQ29uc3RydWN0b3JzfSk7CiAKICAgICAgICAgY29u c3QgY29udGVudEJyb3dzZXJFbGVtZW50ID0gbnVsbDsKICAgICAgICAgY29uc3QgZGlzYWJsZUZp bmRCYW5uZXIgPSBmYWxzZTsKLSAgICAgICAgdGhpcy5fY29udGVudEJyb3dzZXIgPSBuZXcgV0ku Q29udGVudEJyb3dzZXIoY29udGVudEJyb3dzZXJFbGVtZW50LCB0aGlzLCBkaXNhYmxlQmFja0Zv cndhcmQsIGRpc2FibGVGaW5kQmFubmVyLCBmbGV4aWJsZU5hdmlnYXRpb25JdGVtKTsKKyAgICAg ICAgdGhpcy5fY29udGVudEJyb3dzZXIgPSBuZXcgV0kuQ29udGVudEJyb3dzZXIoY29udGVudEJy b3dzZXJFbGVtZW50LCB0aGlzLCB7ZGlzYWJsZUJhY2tGb3J3YXJkQnV0dG9ucywgZGlzYWJsZUJh Y2tGb3J3YXJkTmF2aWdhdGlvbiwgZmxleGlibGVOYXZpZ2F0aW9uSXRlbX0pOwogCiAgICAgICAg IHRoaXMuX2lnbm9yZU5hdmlnYXRpb25TaWRlYmFyUGFuZWxDb2xsYXBzZWRFdmVudCA9IGZhbHNl OwogICAgICAgICB0aGlzLl9pZ25vcmVEZXRhaWxzU2lkZWJhclBhbmVsQ29sbGFwc2VkRXZlbnQg PSBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0NvbnRlbnRWaWV3Q29udGFpbmVyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudFZpZXdDb250YWluZXIuanMKaW5kZXggMzZhNmFhMGJh MDJhNjA2Y2VmMmJiOTIzNzcyMThiOWUzZTkwMzA0ZC4uYWIwNTZlZjkzNTIxNWFkMDkwNDNhODdm Yzk3NjIwYmM3ZTg0ZjA1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvQ29udGVudFZpZXdDb250YWluZXIuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudFZpZXdDb250YWluZXIuanMKQEAg LTI1LDEwICsyNSwxMiBAQAogCiBXSS5Db250ZW50Vmlld0NvbnRhaW5lciA9IGNsYXNzIENvbnRl bnRWaWV3Q29udGFpbmVyIGV4dGVuZHMgV0kuVmlldwogewotICAgIGNvbnN0cnVjdG9yKCkKKyAg ICBjb25zdHJ1Y3Rvcih7ZGlzYWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbn0gPSB7fSkKICAgICB7 CiAgICAgICAgIHN1cGVyKCk7CiAKKyAgICAgICAgdGhpcy5fZGlzYWJsZUJhY2tGb3J3YXJkTmF2 aWdhdGlvbiA9ICEhZGlzYWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbjsKKwogICAgICAgICB0aGlz LmVsZW1lbnQuY2xhc3NMaXN0LmFkZCgiY29udGVudC12aWV3LWNvbnRhaW5lciIpOwogCiAgICAg ICAgIHRoaXMuX2JhY2tGb3J3YXJkTGlzdCA9IFtdOwpAQCAtNzksNiArODEsMTEgQEAgV0kuQ29u dGVudFZpZXdDb250YWluZXIgPSBjbGFzcyBDb250ZW50Vmlld0NvbnRhaW5lciBleHRlbmRzIFdJ LlZpZXcKIAogICAgIHNob3dDb250ZW50Vmlldyhjb250ZW50VmlldywgY29va2llKQogICAgIHsK KyAgICAgICAgaWYgKHRoaXMuX2Rpc2FibGVCYWNrRm9yd2FyZE5hdmlnYXRpb24gJiYgdGhpcy5j dXJyZW50Q29udGVudFZpZXcpIHsKKyAgICAgICAgICAgIHRoaXMucmVwbGFjZUNvbnRlbnRWaWV3 KHRoaXMuY3VycmVudENvbnRlbnRWaWV3LCBjb250ZW50VmlldywgY29va2llKTsKKyAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgfQorCiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGNvbnRlbnRW aWV3IGluc3RhbmNlb2YgV0kuQ29udGVudFZpZXcpOwogICAgICAgICBpZiAoIShjb250ZW50Vmll dyBpbnN0YW5jZW9mIFdJLkNvbnRlbnRWaWV3KSkKICAgICAgICAgICAgIHJldHVybiBudWxsOwpA QCAtMTQwLDYgKzE0Nyw4IEBAIFdJLkNvbnRlbnRWaWV3Q29udGFpbmVyID0gY2xhc3MgQ29udGVu dFZpZXdDb250YWluZXIgZXh0ZW5kcyBXSS5WaWV3CiAKICAgICAgICAgdGhpcy5zaG93QmFja0Zv cndhcmRFbnRyeUZvckluZGV4KG5ld0luZGV4KTsKIAorICAgICAgICBjb25zb2xlLmFzc2VydCgh dGhpcy5fZGlzYWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbiB8fCB0aGlzLl9iYWNrRm9yd2FyZExp c3QubGVuZ3RoIDw9IDEpOworCiAgICAgICAgIHJldHVybiBjb250ZW50VmlldzsKICAgICB9CiAK QEAgLTE2NCw3ICsxNzMsNyBAQCBXSS5Db250ZW50Vmlld0NvbnRhaW5lciA9IGNsYXNzIENvbnRl bnRWaWV3Q29udGFpbmVyIGV4dGVuZHMgV0kuVmlldwogICAgICAgICB0aGlzLmRpc3BhdGNoRXZl bnRUb0xpc3RlbmVycyhXSS5Db250ZW50Vmlld0NvbnRhaW5lci5FdmVudC5DdXJyZW50Q29udGVu dFZpZXdEaWRDaGFuZ2UpOwogICAgIH0KIAotICAgIHJlcGxhY2VDb250ZW50VmlldyhvbGRDb250 ZW50VmlldywgbmV3Q29udGVudFZpZXcpCisgICAgcmVwbGFjZUNvbnRlbnRWaWV3KG9sZENvbnRl bnRWaWV3LCBuZXdDb250ZW50VmlldywgbmV3Q29va2llKQogICAgIHsKICAgICAgICAgY29uc29s ZS5hc3NlcnQob2xkQ29udGVudFZpZXcgaW5zdGFuY2VvZiBXSS5Db250ZW50Vmlldyk7CiAgICAg ICAgIGlmICghKG9sZENvbnRlbnRWaWV3IGluc3RhbmNlb2YgV0kuQ29udGVudFZpZXcpKQpAQCAt MTk2LDcgKzIwNSw3IEBAIFdJLkNvbnRlbnRWaWV3Q29udGFpbmVyID0gY2xhc3MgQ29udGVudFZp ZXdDb250YWluZXIgZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwg dGhpcy5fYmFja0ZvcndhcmRMaXN0Lmxlbmd0aDsgKytpKSB7CiAgICAgICAgICAgICBpZiAodGhp cy5fYmFja0ZvcndhcmRMaXN0W2ldLmNvbnRlbnRWaWV3ID09PSBvbGRDb250ZW50Vmlldykgewog ICAgICAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KCF0aGlzLl9iYWNrRm9yd2FyZExpc3RbaV0u dG9tYnN0b25lKTsKLSAgICAgICAgICAgICAgICBsZXQgY3VycmVudENvb2tpZSA9IHRoaXMuX2Jh Y2tGb3J3YXJkTGlzdFtpXS5jb29raWU7CisgICAgICAgICAgICAgICAgbGV0IGN1cnJlbnRDb29r aWUgPSBuZXdDb29raWUgPz8gdGhpcy5fYmFja0ZvcndhcmRMaXN0W2ldLmNvb2tpZTsKICAgICAg ICAgICAgICAgICB0aGlzLl9iYWNrRm9yd2FyZExpc3RbaV0gPSBuZXcgV0kuQmFja0ZvcndhcmRF bnRyeShuZXdDb250ZW50VmlldywgY3VycmVudENvb2tpZSk7CiAgICAgICAgICAgICB9CiAgICAg ICAgIH0KQEAgLTIwOCw2ICsyMTcsOCBAQCBXSS5Db250ZW50Vmlld0NvbnRhaW5lciA9IGNsYXNz IENvbnRlbnRWaWV3Q29udGFpbmVyIGV4dGVuZHMgV0kuVmlldwogICAgICAgICAgICAgdGhpcy5f c2hvd0VudHJ5KHRoaXMuY3VycmVudEJhY2tGb3J3YXJkRW50cnkpOwogICAgICAgICAgICAgdGhp cy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV0kuQ29udGVudFZpZXdDb250YWluZXIuRXZlbnQu Q3VycmVudENvbnRlbnRWaWV3RGlkQ2hhbmdlKTsKICAgICAgICAgfQorCisgICAgICAgIGNvbnNv bGUuYXNzZXJ0KCF0aGlzLl9kaXNhYmxlQmFja0ZvcndhcmROYXZpZ2F0aW9uIHx8IHRoaXMuX2Jh Y2tGb3J3YXJkTGlzdC5sZW5ndGggPD0gMSk7CiAgICAgfQogCiAgICAgY2xvc2VDb250ZW50Vmll dyhjb250ZW50Vmlld1RvQ2xvc2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9FbGVtZW50c1RhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRWxlbWVudHNUYWJDb250ZW50Vmlldy5q cwppbmRleCAzNWMwMGI2Zjc1MmNmNWY3OTY5NzM3NWRkMDlmNzNhMjBjZTQxMTUwLi40MzA5MmJj NjNhMjNhNzIxMjY1ZGE3NzU1ODZlMjU5NGVlMGI2YTM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9FbGVtZW50c1RhYkNvbnRlbnRWaWV3Lmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0VsZW1lbnRz VGFiQ29udGVudFZpZXcuanMKQEAgLTQzLDcgKzQzLDcgQEAgV0kuRWxlbWVudHNUYWJDb250ZW50 VmlldyA9IGNsYXNzIEVsZW1lbnRzVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50QnJv d3MKICAgICAgICAgaWYgKEluc3BlY3RvckJhY2tlbmQuaGFzRG9tYWluKCJMYXllclRyZWUiKSkK ICAgICAgICAgICAgIGRldGFpbHNTaWRlYmFyUGFuZWxDb25zdHJ1Y3RvcnMucHVzaChXSS5MYXll clRyZWVEZXRhaWxzU2lkZWJhclBhbmVsKTsKIAotICAgICAgICBzdXBlcihFbGVtZW50c1RhYkNv bnRlbnRWaWV3LnRhYkluZm8oKSwge2RldGFpbHNTaWRlYmFyUGFuZWxDb25zdHJ1Y3RvcnMsIGRp c2FibGVCYWNrRm9yd2FyZDogdHJ1ZX0pOworICAgICAgICBzdXBlcihFbGVtZW50c1RhYkNvbnRl bnRWaWV3LnRhYkluZm8oKSwge2RldGFpbHNTaWRlYmFyUGFuZWxDb25zdHJ1Y3RvcnMsIGRpc2Fi bGVCYWNrRm9yd2FyZEJ1dHRvbnM6IHRydWUsIGRpc2FibGVCYWNrRm9yd2FyZE5hdmlnYXRpb246 IHRydWV9KTsKICAgICB9CiAKICAgICBzdGF0aWMgdGFiSW5mbygpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9HcmFwaGljc1RhYkNvbnRlbnRW aWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvR3JhcGhp Y3NUYWJDb250ZW50Vmlldy5qcwppbmRleCA4MWM0N2M1OWFmMzg3YTJjNmYzMGNlY2QyNGEzMDE5 NWM4NjUyODM2Li5jZjU5OGVlMjBkNjY5N2NhOThhN2IyZTRhZmE2YWZjZDIzMzNhZGUxIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9HcmFwaGlj c1RhYkNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0dyYXBoaWNzVGFiQ29udGVudFZpZXcuanMKQEAgLTM1LDcgKzM1LDcgQEAgV0ku R3JhcGhpY3NUYWJDb250ZW50VmlldyA9IGNsYXNzIEdyYXBoaWNzVGFiQ29udGVudFZpZXcgZXh0 ZW5kcyBXSS5Db250ZW50QnJvd3MKICAgICAgICAgICAgICAgICBXSS5DYW52YXNEZXRhaWxzU2lk ZWJhclBhbmVsLAogICAgICAgICAgICAgICAgIFdJLkFuaW1hdGlvbkRldGFpbHNTaWRlYmFyUGFu ZWwsCiAgICAgICAgICAgICBdLAotICAgICAgICAgICAgZGlzYWJsZUJhY2tGb3J3YXJkOiB0cnVl LAorICAgICAgICAgICAgZGlzYWJsZUJhY2tGb3J3YXJkQnV0dG9uczogdHJ1ZSwKICAgICAgICAg fSk7CiAKICAgICAgICAgdGhpcy5fY2FudmFzZXNUcmVlT3V0bGluZSA9IG5ldyBXSS5UcmVlT3V0 bGluZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0xheWVyc1RhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVmlld3MvTGF5ZXJzVGFiQ29udGVudFZpZXcuanMKaW5kZXggYjkyM2RlZjRiNTJm MWEzNWE3NzU3YmNhMTM2OGI5ZDkzYmIzZmM5Zi4uYzJiMmI3ZGQ3MTE0YzE3NmE4NWQyNzFiYzlh MGIxZGY3YzdhZGI1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvTGF5ZXJzVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJzVGFiQ29udGVudFZpZXcuanMKQEAgLTI5 LDcgKzI5LDggQEAgV0kuTGF5ZXJzVGFiQ29udGVudFZpZXcgPSBjbGFzcyBMYXllcnNUYWJDb250 ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRCcm93c2VyVGEKICAgICB7CiAgICAgICAgIHN1cGVy KExheWVyc1RhYkNvbnRlbnRWaWV3LnRhYkluZm8oKSwgewogICAgICAgICAgICAgZGV0YWlsc1Np ZGViYXJQYW5lbENvbnN0cnVjdG9yczogW1dJLkxheWVyRGV0YWlsc1NpZGViYXJQYW5lbF0sCi0g ICAgICAgICAgICBkaXNhYmxlQmFja0ZvcndhcmQ6IHRydWUsCisgICAgICAgICAgICBkaXNhYmxl QmFja0ZvcndhcmRCdXR0b25zOiB0cnVlLAorICAgICAgICAgICAgZGlzYWJsZUJhY2tGb3J3YXJk TmF2aWdhdGlvbjogdHJ1ZSwKICAgICAgICAgfSk7CiAKICAgICAgICAgdGhpcy5fbGF5ZXJEZXRh aWxzU2lkZWJhclBhbmVsID0gdGhpcy5kZXRhaWxzU2lkZWJhclBhbmVsc1swXTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtEZXRh aWxWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0 d29ya0RldGFpbFZpZXcuanMKaW5kZXggNmYzODY4NzhlMWE3MWFjZjEyZTllNmQzOGUyZDk0MDQ4 YjA5MjMwMi4uMTFkOTkwN2EwZjVhZDhlY2MyYTA4MWY5YjhkZTY5MmMyMjYxMzYyZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya0Rl dGFpbFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvTmV0d29ya0RldGFpbFZpZXcuanMKQEAgLTg1LDkgKzg1LDcgQEAgV0kuTmV0d29ya0RldGFp bFZpZXcgPSBjbGFzcyBOZXR3b3JrRGV0YWlsVmlldyBleHRlbmRzIFdJLlZpZXcKICAgICAgICAg Y29udGVudFZpZXdOYXZpZ2F0aW9uSXRlbXNGbGV4SXRlbS52aXNpYmlsaXR5UHJpb3JpdHkgPSBX SS5OYXZpZ2F0aW9uSXRlbS5WaXNpYmlsaXR5UHJpb3JpdHkuTG93OwogCiAgICAgICAgIGNvbnN0 IGVsZW1lbnQgPSBudWxsOwotICAgICAgICBjb25zdCBkaXNhYmxlQmFja0ZvcndhcmQgPSB0cnVl OwotICAgICAgICBjb25zdCBkaXNhYmxlRmluZEJhbm5lciA9IGZhbHNlOwotICAgICAgICB0aGlz Ll9jb250ZW50QnJvd3NlciA9IG5ldyBXSS5Db250ZW50QnJvd3NlcihlbGVtZW50LCB0aGlzLCBk aXNhYmxlQmFja0ZvcndhcmQsIGRpc2FibGVGaW5kQmFubmVyLCBjb250ZW50Vmlld05hdmlnYXRp b25JdGVtc0ZsZXhJdGVtLCBjb250ZW50Vmlld05hdmlnYXRpb25JdGVtc0dyb3VwKTsKKyAgICAg ICAgdGhpcy5fY29udGVudEJyb3dzZXIgPSBuZXcgV0kuQ29udGVudEJyb3dzZXIoZWxlbWVudCwg dGhpcywge2Rpc2FibGVCYWNrRm9yd2FyZEJ1dHRvbnM6IHRydWUsIGRpc2FibGVCYWNrRm9yd2Fy ZE5hdmlnYXRpb246IHRydWUsIGNvbnRlbnRWaWV3TmF2aWdhdGlvbkl0ZW1zRmxleEl0ZW0sIGNv bnRlbnRWaWV3TmF2aWdhdGlvbkl0ZW1zR3JvdXB9KTsKIAogICAgICAgICAvLyBJbnNlcnQgYWxs IG9mIG91ciBjdXN0b20gbmF2aWdhdGlvbiBpdGVtcyBhdCB0aGUgc3RhcnQgb2YgdGhlIENvbnRl bnRCcm93c2VyJ3MgTmF2aWdhdGlvbkJhci4KICAgICAgICAgbGV0IGluZGV4ID0gMDsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtU YWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL05ldHdvcmtUYWJDb250ZW50Vmlldy5qcwppbmRleCBkNTZiMTYwNDAwMWY1NzEyOWExY2Nk OTUxMjQ4NWZkZjFjMmVhN2U5Li5iZTEzZWI4ZmIzN2RlMzNhYmYyZWUyYjIzYTMxNjA3YThiY2Ey MGRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9OZXR3b3JrVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYkNvbnRlbnRWaWV3LmpzCkBAIC0zMSw5ICszMSw3 IEBAIFdJLk5ldHdvcmtUYWJDb250ZW50VmlldyA9IGNsYXNzIE5ldHdvcmtUYWJDb250ZW50Vmll dyBleHRlbmRzIFdJLlRhYkNvbnRlbnRWaWV3CiAKICAgICAgICAgdGhpcy5fbmV0d29ya1RhYmxl Q29udGVudFZpZXcgPSBuZXcgV0kuTmV0d29ya1RhYmxlQ29udGVudFZpZXc7CiAKLSAgICAgICAg Y29uc3QgZGlzYWJsZUJhY2tGb3J3YXJkID0gdHJ1ZTsKLSAgICAgICAgY29uc3QgZGlzYWJsZUZp bmRCYW5uZXIgPSB0cnVlOwotICAgICAgICB0aGlzLl9jb250ZW50QnJvd3NlciA9IG5ldyBXSS5D b250ZW50QnJvd3NlcihudWxsLCB0aGlzLCBkaXNhYmxlQmFja0ZvcndhcmQsIGRpc2FibGVGaW5k QmFubmVyKTsKKyAgICAgICAgdGhpcy5fY29udGVudEJyb3dzZXIgPSBuZXcgV0kuQ29udGVudEJy b3dzZXIobnVsbCwgdGhpcywge2Rpc2FibGVCYWNrRm9yd2FyZEJ1dHRvbnM6IHRydWUsIGRpc2Fi bGVCYWNrRm9yd2FyZE5hdmlnYXRpb246IHRydWUsIGRpc2FibGVGaW5kQmFubmVyOiB0cnVlfSk7 CiAgICAgICAgIHRoaXMuX2NvbnRlbnRCcm93c2VyLnNob3dDb250ZW50Vmlldyh0aGlzLl9uZXR3 b3JrVGFibGVDb250ZW50Vmlldyk7CiAKICAgICAgICAgbGV0IGZpbHRlck5hdmlnYXRpb25JdGVt cyA9IHRoaXMuX25ldHdvcmtUYWJsZUNvbnRlbnRWaWV3LmZpbHRlck5hdmlnYXRpb25JdGVtczsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Rp bWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3LmpzCmluZGV4IDRi N2YwNTQzZGI1NjIzZTBmMmNjNGFhMGEzYWNmYzAzNGY0Yzc0MDguLjRjN2RkMGJlYjhmZGM3ZmI2 ZTZiNWNiMjc2NDFkZmU2YmY5ZmE2YWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNv cmRpbmdDb250ZW50Vmlldy5qcwpAQCAtNDEsOSArNDEsNyBAQCBXSS5UaW1lbGluZVJlY29yZGlu Z0NvbnRlbnRWaWV3ID0gY2xhc3MgVGltZWxpbmVSZWNvcmRpbmdDb250ZW50VmlldyBleHRlbmRz IFdJLgogICAgICAgICB0aGlzLl90aW1lbGluZU92ZXJ2aWV3LmFkZEV2ZW50TGlzdGVuZXIoV0ku VGltZWxpbmVPdmVydmlldy5FdmVudC5FZGl0aW5nSW5zdHJ1bWVudHNEaWRDaGFuZ2UsIHRoaXMu X2VkaXRpbmdJbnN0cnVtZW50c0RpZENoYW5nZSwgdGhpcyk7CiAgICAgICAgIHRoaXMuYWRkU3Vi dmlldyh0aGlzLl90aW1lbGluZU92ZXJ2aWV3KTsKIAotICAgICAgICBjb25zdCBkaXNhYmxlQmFj a0ZvcndhcmQgPSB0cnVlOwotICAgICAgICBjb25zdCBkaXNhYmxlRmluZEJhbm5lciA9IHRydWU7 Ci0gICAgICAgIHRoaXMuX3RpbWVsaW5lQ29udGVudEJyb3dzZXIgPSBuZXcgV0kuQ29udGVudEJy b3dzZXIobnVsbCwgdGhpcywgZGlzYWJsZUJhY2tGb3J3YXJkLCBkaXNhYmxlRmluZEJhbm5lcik7 CisgICAgICAgIHRoaXMuX3RpbWVsaW5lQ29udGVudEJyb3dzZXIgPSBuZXcgV0kuQ29udGVudEJy b3dzZXIobnVsbCwgdGhpcywge2Rpc2FibGVCYWNrRm9yd2FyZEJ1dHRvbnM6IHRydWUsIGRpc2Fi bGVGaW5kQmFubmVyOiB0cnVlfSk7CiAgICAgICAgIHRoaXMuX3RpbWVsaW5lQ29udGVudEJyb3dz ZXIuYWRkRXZlbnRMaXN0ZW5lcihXSS5Db250ZW50QnJvd3Nlci5FdmVudC5DdXJyZW50Q29udGVu dFZpZXdEaWRDaGFuZ2UsIHRoaXMuX2N1cnJlbnRDb250ZW50Vmlld0RpZENoYW5nZSwgdGhpcyk7 CiAKICAgICAgICAgdGhpcy5fZW50aXJlUmVjb3JkaW5nUGF0aENvbXBvbmVudCA9IHRoaXMuX2Ny ZWF0ZVRpbWVsaW5lUmFuZ2VQYXRoQ29tcG9uZW50KFdJLlVJU3RyaW5nKCJFbnRpcmUgUmVjb3Jk aW5nIikpOwo= 438386 2021-09-16 12:32:46 -0700 2021-09-16 12:33:50 -0700 Patch v1.1 bug-230286-20210916123245.patch text/plain 16850 pangle U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMzY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAz NTJiZDZjODI5ODA4ZTdhNmM3YzZkNmUwMTA2YTdkNGQzOTYwZTk3Li5lMmM4NzZjZThhMDQwMjBh NDNiYTBlYzZmMzgxNmFlNjE2YmEwYTRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzOSBAQAorMjAyMS0wOS0xNCAgUGF0cmljayBBbmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRG9uJ3QgbWFpbnRhaW4gYSBiYWNrLWZvcndhcmQg c3RhY2sgZm9yIGBDb250ZW50QnJvd3NlcmAvYENvbnRlbnRWaWV3Q29udGFpbmVyYCB3aGVuIG5v dCBuZWNlc3NhcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIzMDI4NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFdlIGN1cnJlbnRseSBtYWludGFpbiBhIGJhY2svZm9yd2FyZCBzdGFjayBmb3IgYWxsIENv bnRlbnRWaWV3Q29udGFpbmVycywgZXZlbiBpZiBvdGhlciBoaXN0b3J5IGVudHJpZXMgd29uJ3Qg YmUKKyAgICAgICAgdXNlZC4gSW5zdGVhZCwgc3ViY2xhc3NlcyBvZiBDb250ZW50QnJvd3NlclRh YkNvbnRlbnRWaWV3IHNob3VsZCBiZSBhYmxlIHRvIGRpc2FibGUgdGhlIGhpc3Rvcnkgc3RhY2ss IHdoaWNoCisgICAgICAgIGhlbHBzIHVzIGVuc3VyZSB0aGF0IG91dGRhdGVkIGNvbnRlbnQgdmll d3MgYXJlIG5vdCBrZXB0IGFyb3VuZCBmb3IgdGhlc2Ugc3ViY2xhc3NlcyBhbmQgdGhlaXIgdmll d3MuCisKKyAgICAgICAgVGhpcyBkb2VzIG5vdCBsaW5lIHVwIG9uZS10by1vbmUgd2l0aCB2aWV3 cyB0aGF0IGhpZGUgdGhlIGJhY2svZm9yd2FyZCBidXR0b25zLCBhcyB0aGUgYmFjay9mb3J3YXJk IHN0YWNrIGlzCisgICAgICAgIHVzZWQgaW4gc29tZSBwbGFjZXMgdG8gcHJvdmlkZSBhIG1lbW9y eSBvZiBzZWxlY3Rpb24gYWNyb3NzIGRpZmZlcmVudCB2aWV3cywgbGlrZSBpbiB0aGUgR3JhcGhp Y3MgdGFiLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9BdWRpdFRhYkNvbnRlbnRW aWV3LmpzOgorICAgICAgICAoV0kuQXVkaXRUYWJDb250ZW50Vmlldyk6CisgICAgICAgICogVXNl ckludGVyZmFjZS9WaWV3cy9Db25zb2xlVGFiQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5D b25zb2xlVGFiQ29udGVudFZpZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29u dGVudEJyb3dzZXIuanM6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJv d3NlclRhYkNvbnRlbnRWaWV3LmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29u dGVudFZpZXdDb250YWluZXIuanM6CisgICAgICAgIChXSS5Db250ZW50Vmlld0NvbnRhaW5lci5w cm90b3R5cGUuc2hvd0NvbnRlbnRWaWV3KToKKyAgICAgICAgKFdJLkNvbnRlbnRWaWV3Q29udGFp bmVyLnByb3RvdHlwZS5yZXBsYWNlQ29udGVudFZpZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZh Y2UvVmlld3MvRWxlbWVudHNUYWJDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLkVsZW1lbnRz VGFiQ29udGVudFZpZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvR3JhcGhpY3NU YWJDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLkdyYXBoaWNzVGFiQ29udGVudFZpZXcpOgor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJzVGFiQ29udGVudFZpZXcuanM6Cisg ICAgICAgIChXSS5MYXllcnNUYWJDb250ZW50Vmlldyk6CisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9OZXR3b3JrRGV0YWlsVmlldy5qczoKKyAgICAgICAgKFdJLk5ldHdvcmtEZXRhaWxW aWV3LnByb3RvdHlwZS5pbml0aWFsTGF5b3V0KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Zp ZXdzL05ldHdvcmtUYWJDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLk5ldHdvcmtUYWJDb250 ZW50Vmlldyk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZGlu Z0NvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmll dyk6CisKIDIwMjEtMDktMTMgIFJhenZhbiBDYWxpbWFuICA8cmNhbGltYW5AYXBwbGUuY29tPgog CiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFVwZGF0ZSBuYW1pbmcgb2YgV0kuQ1NTQ29tcGxldGlv bnMgY2FsbGJhY2sgdXNlZCBmb3IgY29sbGVjdGluZyBzdXBwb3J0ZWQgQ1NTIHByb3BlcnRpZXMg ZnJvbSB0aGUgdGFyZ2V0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9BdWRpdFRhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQXVkaXRUYWJDb250ZW50Vmlldy5qcwppbmRleCA4Zjg5 MzhlNDRjNDNlMDRlYTFhZjNmNmEzOGIyZTk1MDRmNmM0YzU5Li4wNGU1NGQzMzU1YmY3MDZkNTUw ZmMwMDI3N2I2ODI0NzczMjZhZDk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9BdWRpdFRhYkNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0F1ZGl0VGFiQ29udGVudFZpZXcuanMK QEAgLTI5LDcgKzI5LDcgQEAgV0kuQXVkaXRUYWJDb250ZW50VmlldyA9IGNsYXNzIEF1ZGl0VGFi Q29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50QnJvd3NlclRhYkMKICAgICB7CiAgICAgICAg IHN1cGVyKEF1ZGl0VGFiQ29udGVudFZpZXcudGFiSW5mbygpLCB7CiAgICAgICAgICAgICBuYXZp Z2F0aW9uU2lkZWJhclBhbmVsQ29uc3RydWN0b3I6IFdJLkF1ZGl0TmF2aWdhdGlvblNpZGViYXJQ YW5lbCwKLSAgICAgICAgICAgIGRpc2FibGVCYWNrRm9yd2FyZDogdHJ1ZSwKKyAgICAgICAgICAg IGhpZGVCYWNrRm9yd2FyZEJ1dHRvbnM6IHRydWUsCiAgICAgICAgIH0pOwogCiAgICAgICAgIHRo aXMuX3N0YXJ0U3RvcFNob3J0Y3V0ID0gbmV3IFdJLktleWJvYXJkU2hvcnRjdXQobnVsbCwgV0ku S2V5Ym9hcmRTaG9ydGN1dC5LZXkuU3BhY2UsIHRoaXMuX2hhbmRsZVNwYWNlLmJpbmQodGhpcykp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3Mv Q29uc29sZVRhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvQ29uc29sZVRhYkNvbnRlbnRWaWV3LmpzCmluZGV4IDc5ZWZjNTY1MTRkZWQ1 NmM5OTZhYjZhZjBhMjJiOWRkNGE3MjhlMDEuLjIxYTk5NTJkZTc2OTAwNDJiZGRiZDhjOTI1NTdh ZTIyNTYyYmE2ZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0NvbnNvbGVUYWJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db25zb2xlVGFiQ29udGVudFZpZXcuanMKQEAgLTI3 LDcgKzI3LDcgQEAgV0kuQ29uc29sZVRhYkNvbnRlbnRWaWV3ID0gY2xhc3MgQ29uc29sZVRhYkNv bnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudEJyb3dzZXIKIHsKICAgICBjb25zdHJ1Y3Rvcigp CiAgICAgewotICAgICAgICBzdXBlcihDb25zb2xlVGFiQ29udGVudFZpZXcudGFiSW5mbygpLCB7 ZGlzYWJsZUJhY2tGb3J3YXJkOiB0cnVlfSk7CisgICAgICAgIHN1cGVyKENvbnNvbGVUYWJDb250 ZW50Vmlldy50YWJJbmZvKCksIHtoaWRlQmFja0ZvcndhcmRCdXR0b25zOiB0cnVlLCBkaXNhYmxl QmFja0ZvcndhcmROYXZpZ2F0aW9uOiB0cnVlfSk7CiAKICAgICAgICAgdGhpcy5fd2FzU2hvd2lu Z1NwbGl0Q29uc29sZSA9IGZhbHNlOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIuanMKaW5kZXgg ZTU2OGY5NjYxM2Q1YzM5ODUwYTZjMTRhODg0NTYxOWMwNWViOWI1Ni4uOGZjMTY5YzQ1ZWQzNjEx NzExMTY0YmQ5Yzc5ZTk5NTM3YzQ3MTJkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIuanMKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXIuanMKQEAgLTI1 LDcgKzI1LDcgQEAKIAogV0kuQ29udGVudEJyb3dzZXIgPSBjbGFzcyBDb250ZW50QnJvd3NlciBl eHRlbmRzIFdJLlZpZXcKIHsKLSAgICBjb25zdHJ1Y3RvcihlbGVtZW50LCBkZWxlZ2F0ZSwgZGlz YWJsZUJhY2tGb3J3YXJkLCBkaXNhYmxlRmluZEJhbm5lciwgZmxleGlibGVOYXZpZ2F0aW9uSXRl bSwgY29udGVudFZpZXdOYXZpZ2F0aW9uSXRlbUdyb3VwKQorICAgIGNvbnN0cnVjdG9yKGVsZW1l bnQsIGRlbGVnYXRlLCB7aGlkZUJhY2tGb3J3YXJkQnV0dG9ucywgZGlzYWJsZUJhY2tGb3J3YXJk TmF2aWdhdGlvbiwgZGlzYWJsZUZpbmRCYW5uZXIsIGZsZXhpYmxlTmF2aWdhdGlvbkl0ZW0sIGNv bnRlbnRWaWV3TmF2aWdhdGlvbkl0ZW1Hcm91cH0gPSB7fSkKICAgICB7CiAgICAgICAgIHN1cGVy KGVsZW1lbnQpOwogCkBAIC0zNCwxMSArMzQsMTEgQEAgV0kuQ29udGVudEJyb3dzZXIgPSBjbGFz cyBDb250ZW50QnJvd3NlciBleHRlbmRzIFdJLlZpZXcKICAgICAgICAgdGhpcy5fbmF2aWdhdGlv bkJhciA9IG5ldyBXSS5OYXZpZ2F0aW9uQmFyOwogICAgICAgICB0aGlzLmFkZFN1YnZpZXcodGhp cy5fbmF2aWdhdGlvbkJhcik7CiAKLSAgICAgICAgdGhpcy5fY29udGVudFZpZXdDb250YWluZXIg PSBuZXcgV0kuQ29udGVudFZpZXdDb250YWluZXI7CisgICAgICAgIHRoaXMuX2NvbnRlbnRWaWV3 Q29udGFpbmVyID0gbmV3IFdJLkNvbnRlbnRWaWV3Q29udGFpbmVyKHtkaXNhYmxlQmFja0Zvcndh cmROYXZpZ2F0aW9ufSk7CiAgICAgICAgIHRoaXMuX2NvbnRlbnRWaWV3Q29udGFpbmVyLmFkZEV2 ZW50TGlzdGVuZXIoV0kuQ29udGVudFZpZXdDb250YWluZXIuRXZlbnQuQ3VycmVudENvbnRlbnRW aWV3RGlkQ2hhbmdlLCB0aGlzLl9jdXJyZW50Q29udGVudFZpZXdEaWRDaGFuZ2UsIHRoaXMpOwog ICAgICAgICB0aGlzLmFkZFN1YnZpZXcodGhpcy5fY29udGVudFZpZXdDb250YWluZXIpOwogCi0g ICAgICAgIGlmICghZGlzYWJsZUJhY2tGb3J3YXJkKSB7CisgICAgICAgIGlmICghaGlkZUJhY2tG b3J3YXJkQnV0dG9ucykgewogICAgICAgICAgICAgbGV0IGlzUlRMID0gV0kucmVzb2x2ZWRMYXlv dXREaXJlY3Rpb24oKSA9PT0gV0kuTGF5b3V0RGlyZWN0aW9uLlJUTDsKIAogICAgICAgICAgICAg bGV0IGdvQmFjayA9ICgpID0+IHsgdGhpcy5nb0JhY2soKTsgfTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyVGFiQ29u dGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9D b250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3LmpzCmluZGV4IDJlMjdlODQzMTgxMTJlNmZmM2I3 MWJlNGNlZTE1YTk2NjBjZGYwMDQuLmUxYTY0OThlMzA1NDJiODIxODU0ZmE4MDdkOTQyNWM0ZGY0 NTMxMGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0NvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dzZXJUYWJDb250ZW50Vmlldy5q cwpAQCAtMjUsMTMgKzI1LDEzIEBACiAKIFdJLkNvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcg PSBjbGFzcyBDb250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3IGV4dGVuZHMgV0kuVGFiQ29udGVu dFZpZXcKIHsKLSAgICBjb25zdHJ1Y3Rvcih0YWJJbmZvLCB7bmF2aWdhdGlvblNpZGViYXJQYW5l bENvbnN0cnVjdG9yLCBkZXRhaWxzU2lkZWJhclBhbmVsQ29uc3RydWN0b3JzLCBkaXNhYmxlQmFj a0ZvcndhcmQsIGZsZXhpYmxlTmF2aWdhdGlvbkl0ZW19ID0ge30pCisgICAgY29uc3RydWN0b3Io dGFiSW5mbywge25hdmlnYXRpb25TaWRlYmFyUGFuZWxDb25zdHJ1Y3RvciwgZGV0YWlsc1NpZGVi YXJQYW5lbENvbnN0cnVjdG9ycywgaGlkZUJhY2tGb3J3YXJkQnV0dG9ucywgZGlzYWJsZUJhY2tG b3J3YXJkTmF2aWdhdGlvbiwgZmxleGlibGVOYXZpZ2F0aW9uSXRlbX0gPSB7fSkKICAgICB7CiAg ICAgICAgIHN1cGVyKHRhYkluZm8sIHtuYXZpZ2F0aW9uU2lkZWJhclBhbmVsQ29uc3RydWN0b3Is IGRldGFpbHNTaWRlYmFyUGFuZWxDb25zdHJ1Y3RvcnN9KTsKIAogICAgICAgICBjb25zdCBjb250 ZW50QnJvd3NlckVsZW1lbnQgPSBudWxsOwogICAgICAgICBjb25zdCBkaXNhYmxlRmluZEJhbm5l ciA9IGZhbHNlOwotICAgICAgICB0aGlzLl9jb250ZW50QnJvd3NlciA9IG5ldyBXSS5Db250ZW50 QnJvd3Nlcihjb250ZW50QnJvd3NlckVsZW1lbnQsIHRoaXMsIGRpc2FibGVCYWNrRm9yd2FyZCwg ZGlzYWJsZUZpbmRCYW5uZXIsIGZsZXhpYmxlTmF2aWdhdGlvbkl0ZW0pOworICAgICAgICB0aGlz Ll9jb250ZW50QnJvd3NlciA9IG5ldyBXSS5Db250ZW50QnJvd3Nlcihjb250ZW50QnJvd3NlckVs ZW1lbnQsIHRoaXMsIHtoaWRlQmFja0ZvcndhcmRCdXR0b25zLCBkaXNhYmxlQmFja0ZvcndhcmRO YXZpZ2F0aW9uLCBmbGV4aWJsZU5hdmlnYXRpb25JdGVtfSk7CiAKICAgICAgICAgdGhpcy5faWdu b3JlTmF2aWdhdGlvblNpZGViYXJQYW5lbENvbGxhcHNlZEV2ZW50ID0gZmFsc2U7CiAgICAgICAg IHRoaXMuX2lnbm9yZURldGFpbHNTaWRlYmFyUGFuZWxDb2xsYXBzZWRFdmVudCA9IGZhbHNlOwpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29u dGVudFZpZXdDb250YWluZXIuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9Db250ZW50Vmlld0NvbnRhaW5lci5qcwppbmRleCAzNmE2YWEwYmEwMmE2MDZjZWYy YmI5MjM3NzIxOGI5ZTNlOTAzMDRkLi5hYjA1NmVmOTM1MjE1YWQwOTA0M2E4N2ZjOTc2MjBiYzdl ODRmMDUwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9W aWV3cy9Db250ZW50Vmlld0NvbnRhaW5lci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50Vmlld0NvbnRhaW5lci5qcwpAQCAtMjUsMTAgKzI1 LDEyIEBACiAKIFdJLkNvbnRlbnRWaWV3Q29udGFpbmVyID0gY2xhc3MgQ29udGVudFZpZXdDb250 YWluZXIgZXh0ZW5kcyBXSS5WaWV3CiB7Ci0gICAgY29uc3RydWN0b3IoKQorICAgIGNvbnN0cnVj dG9yKHtkaXNhYmxlQmFja0ZvcndhcmROYXZpZ2F0aW9ufSA9IHt9KQogICAgIHsKICAgICAgICAg c3VwZXIoKTsKIAorICAgICAgICB0aGlzLl9kaXNhYmxlQmFja0ZvcndhcmROYXZpZ2F0aW9uID0g ISFkaXNhYmxlQmFja0ZvcndhcmROYXZpZ2F0aW9uOworCiAgICAgICAgIHRoaXMuZWxlbWVudC5j bGFzc0xpc3QuYWRkKCJjb250ZW50LXZpZXctY29udGFpbmVyIik7CiAKICAgICAgICAgdGhpcy5f YmFja0ZvcndhcmRMaXN0ID0gW107CkBAIC03OSw2ICs4MSwxMSBAQCBXSS5Db250ZW50Vmlld0Nv bnRhaW5lciA9IGNsYXNzIENvbnRlbnRWaWV3Q29udGFpbmVyIGV4dGVuZHMgV0kuVmlldwogCiAg ICAgc2hvd0NvbnRlbnRWaWV3KGNvbnRlbnRWaWV3LCBjb29raWUpCiAgICAgeworICAgICAgICBp ZiAodGhpcy5fZGlzYWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbiAmJiB0aGlzLmN1cnJlbnRDb250 ZW50VmlldykgeworICAgICAgICAgICAgdGhpcy5yZXBsYWNlQ29udGVudFZpZXcodGhpcy5jdXJy ZW50Q29udGVudFZpZXcsIGNvbnRlbnRWaWV3LCBjb29raWUpOworICAgICAgICAgICAgcmV0dXJu OworICAgICAgICB9CisKICAgICAgICAgY29uc29sZS5hc3NlcnQoY29udGVudFZpZXcgaW5zdGFu Y2VvZiBXSS5Db250ZW50Vmlldyk7CiAgICAgICAgIGlmICghKGNvbnRlbnRWaWV3IGluc3RhbmNl b2YgV0kuQ29udGVudFZpZXcpKQogICAgICAgICAgICAgcmV0dXJuIG51bGw7CkBAIC0xNDAsNiAr MTQ3LDggQEAgV0kuQ29udGVudFZpZXdDb250YWluZXIgPSBjbGFzcyBDb250ZW50Vmlld0NvbnRh aW5lciBleHRlbmRzIFdJLlZpZXcKIAogICAgICAgICB0aGlzLnNob3dCYWNrRm9yd2FyZEVudHJ5 Rm9ySW5kZXgobmV3SW5kZXgpOwogCisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KCF0aGlzLl9kaXNh YmxlQmFja0ZvcndhcmROYXZpZ2F0aW9uIHx8IHRoaXMuX2JhY2tGb3J3YXJkTGlzdC5sZW5ndGgg PD0gMSk7CisKICAgICAgICAgcmV0dXJuIGNvbnRlbnRWaWV3OwogICAgIH0KIApAQCAtMTY0LDcg KzE3Myw3IEBAIFdJLkNvbnRlbnRWaWV3Q29udGFpbmVyID0gY2xhc3MgQ29udGVudFZpZXdDb250 YWluZXIgZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVu ZXJzKFdJLkNvbnRlbnRWaWV3Q29udGFpbmVyLkV2ZW50LkN1cnJlbnRDb250ZW50Vmlld0RpZENo YW5nZSk7CiAgICAgfQogCi0gICAgcmVwbGFjZUNvbnRlbnRWaWV3KG9sZENvbnRlbnRWaWV3LCBu ZXdDb250ZW50VmlldykKKyAgICByZXBsYWNlQ29udGVudFZpZXcob2xkQ29udGVudFZpZXcsIG5l d0NvbnRlbnRWaWV3LCBuZXdDb29raWUpCiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydChv bGRDb250ZW50VmlldyBpbnN0YW5jZW9mIFdJLkNvbnRlbnRWaWV3KTsKICAgICAgICAgaWYgKCEo b2xkQ29udGVudFZpZXcgaW5zdGFuY2VvZiBXSS5Db250ZW50VmlldykpCkBAIC0xOTYsNyArMjA1 LDcgQEAgV0kuQ29udGVudFZpZXdDb250YWluZXIgPSBjbGFzcyBDb250ZW50Vmlld0NvbnRhaW5l ciBleHRlbmRzIFdJLlZpZXcKICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCB0aGlzLl9iYWNr Rm9yd2FyZExpc3QubGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAgIGlmICh0aGlzLl9iYWNrRm9y d2FyZExpc3RbaV0uY29udGVudFZpZXcgPT09IG9sZENvbnRlbnRWaWV3KSB7CiAgICAgICAgICAg ICAgICAgY29uc29sZS5hc3NlcnQoIXRoaXMuX2JhY2tGb3J3YXJkTGlzdFtpXS50b21ic3RvbmUp OwotICAgICAgICAgICAgICAgIGxldCBjdXJyZW50Q29va2llID0gdGhpcy5fYmFja0ZvcndhcmRM aXN0W2ldLmNvb2tpZTsKKyAgICAgICAgICAgICAgICBsZXQgY3VycmVudENvb2tpZSA9IG5ld0Nv b2tpZSA/PyB0aGlzLl9iYWNrRm9yd2FyZExpc3RbaV0uY29va2llOwogICAgICAgICAgICAgICAg IHRoaXMuX2JhY2tGb3J3YXJkTGlzdFtpXSA9IG5ldyBXSS5CYWNrRm9yd2FyZEVudHJ5KG5ld0Nv bnRlbnRWaWV3LCBjdXJyZW50Q29va2llKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQpAQCAt MjA4LDYgKzIxNyw4IEBAIFdJLkNvbnRlbnRWaWV3Q29udGFpbmVyID0gY2xhc3MgQ29udGVudFZp ZXdDb250YWluZXIgZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgICAgICB0aGlzLl9zaG93RW50cnko dGhpcy5jdXJyZW50QmFja0ZvcndhcmRFbnRyeSk7CiAgICAgICAgICAgICB0aGlzLmRpc3BhdGNo RXZlbnRUb0xpc3RlbmVycyhXSS5Db250ZW50Vmlld0NvbnRhaW5lci5FdmVudC5DdXJyZW50Q29u dGVudFZpZXdEaWRDaGFuZ2UpOwogICAgICAgICB9CisKKyAgICAgICAgY29uc29sZS5hc3NlcnQo IXRoaXMuX2Rpc2FibGVCYWNrRm9yd2FyZE5hdmlnYXRpb24gfHwgdGhpcy5fYmFja0ZvcndhcmRM aXN0Lmxlbmd0aCA8PSAxKTsKICAgICB9CiAKICAgICBjbG9zZUNvbnRlbnRWaWV3KGNvbnRlbnRW aWV3VG9DbG9zZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0VsZW1lbnRzVGFiQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9FbGVtZW50c1RhYkNvbnRlbnRWaWV3LmpzCmluZGV4IDM1 YzAwYjZmNzUyY2Y1Zjc5Njk3Mzc1ZGQwOWY3M2EyMGNlNDExNTAuLjk3ZGVhMzNkYTI2NzczNTI0 NDdiNGQ1MGE2OThjNmQzYTUyNzFkZmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0VsZW1lbnRzVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRWxlbWVudHNUYWJDb250ZW50 Vmlldy5qcwpAQCAtNDMsNyArNDMsNyBAQCBXSS5FbGVtZW50c1RhYkNvbnRlbnRWaWV3ID0gY2xh c3MgRWxlbWVudHNUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRCcm93cwogICAgICAg ICBpZiAoSW5zcGVjdG9yQmFja2VuZC5oYXNEb21haW4oIkxheWVyVHJlZSIpKQogICAgICAgICAg ICAgZGV0YWlsc1NpZGViYXJQYW5lbENvbnN0cnVjdG9ycy5wdXNoKFdJLkxheWVyVHJlZURldGFp bHNTaWRlYmFyUGFuZWwpOwogCi0gICAgICAgIHN1cGVyKEVsZW1lbnRzVGFiQ29udGVudFZpZXcu dGFiSW5mbygpLCB7ZGV0YWlsc1NpZGViYXJQYW5lbENvbnN0cnVjdG9ycywgZGlzYWJsZUJhY2tG b3J3YXJkOiB0cnVlfSk7CisgICAgICAgIHN1cGVyKEVsZW1lbnRzVGFiQ29udGVudFZpZXcudGFi SW5mbygpLCB7ZGV0YWlsc1NpZGViYXJQYW5lbENvbnN0cnVjdG9ycywgaGlkZUJhY2tGb3J3YXJk QnV0dG9uczogdHJ1ZSwgZGlzYWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbjogdHJ1ZX0pOwogICAg IH0KIAogICAgIHN0YXRpYyB0YWJJbmZvKCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0dyYXBoaWNzVGFiQ29udGVudFZpZXcuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9HcmFwaGljc1RhYkNvbnRlbnRW aWV3LmpzCmluZGV4IDgxYzQ3YzU5YWYzODdhMmM2ZjMwY2VjZDI0YTMwMTk1Yzg2NTI4MzYuLjE2 YWIxMDUxOTY4MThmNDg4MGQwMzA2ZjExZjI5MzE1NTdhMzdkMzAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0dyYXBoaWNzVGFiQ29udGVudFZp ZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvR3Jh cGhpY3NUYWJDb250ZW50Vmlldy5qcwpAQCAtMzUsNyArMzUsNyBAQCBXSS5HcmFwaGljc1RhYkNv bnRlbnRWaWV3ID0gY2xhc3MgR3JhcGhpY3NUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLkNvbnRl bnRCcm93cwogICAgICAgICAgICAgICAgIFdJLkNhbnZhc0RldGFpbHNTaWRlYmFyUGFuZWwsCiAg ICAgICAgICAgICAgICAgV0kuQW5pbWF0aW9uRGV0YWlsc1NpZGViYXJQYW5lbCwKICAgICAgICAg ICAgIF0sCi0gICAgICAgICAgICBkaXNhYmxlQmFja0ZvcndhcmQ6IHRydWUsCisgICAgICAgICAg ICBoaWRlQmFja0ZvcndhcmRCdXR0b25zOiB0cnVlLAogICAgICAgICB9KTsKIAogICAgICAgICB0 aGlzLl9jYW52YXNlc1RyZWVPdXRsaW5lID0gbmV3IFdJLlRyZWVPdXRsaW5lOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJzVGFiQ29u dGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9M YXllcnNUYWJDb250ZW50Vmlldy5qcwppbmRleCBiOTIzZGVmNGI1MmYxYTM1YTc3NTdiY2ExMzY4 YjlkOTNiYjNmYzlmLi5mYWE4MmExY2I3YmIxNDFmYjRhMzExMTkxNjg5ZDlhMjJjNDFjYmE4IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9MYXll cnNUYWJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9MYXllcnNUYWJDb250ZW50Vmlldy5qcwpAQCAtMjksNyArMjksOCBAQCBXSS5M YXllcnNUYWJDb250ZW50VmlldyA9IGNsYXNzIExheWVyc1RhYkNvbnRlbnRWaWV3IGV4dGVuZHMg V0kuQ29udGVudEJyb3dzZXJUYQogICAgIHsKICAgICAgICAgc3VwZXIoTGF5ZXJzVGFiQ29udGVu dFZpZXcudGFiSW5mbygpLCB7CiAgICAgICAgICAgICBkZXRhaWxzU2lkZWJhclBhbmVsQ29uc3Ry dWN0b3JzOiBbV0kuTGF5ZXJEZXRhaWxzU2lkZWJhclBhbmVsXSwKLSAgICAgICAgICAgIGRpc2Fi bGVCYWNrRm9yd2FyZDogdHJ1ZSwKKyAgICAgICAgICAgIGhpZGVCYWNrRm9yd2FyZEJ1dHRvbnM6 IHRydWUsCisgICAgICAgICAgICBkaXNhYmxlQmFja0ZvcndhcmROYXZpZ2F0aW9uOiB0cnVlLAog ICAgICAgICB9KTsKIAogICAgICAgICB0aGlzLl9sYXllckRldGFpbHNTaWRlYmFyUGFuZWwgPSB0 aGlzLmRldGFpbHNTaWRlYmFyUGFuZWxzWzBdOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya0RldGFpbFZpZXcuanMgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrRGV0YWlsVmlldy5qcwpp bmRleCA2ZjM4Njg3OGUxYTcxYWNmMTJlOWU2ZDM4ZTJkOTQwNDhiMDkyMzAyLi4yYWFhNTFlZGNl ZDEzYzU3NmE4NjZjMDdhMTVlMzhhZTdlOGZhODFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrRGV0YWlsVmlldy5qcworKysgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrRGV0YWlsVmll dy5qcwpAQCAtODAsMTQgKzgwLDEyIEBAIFdJLk5ldHdvcmtEZXRhaWxWaWV3ID0gY2xhc3MgTmV0 d29ya0RldGFpbFZpZXcgZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgIGNsb3NlTmF2aWdhdGlvbkl0 ZW0uYWRkRXZlbnRMaXN0ZW5lcihXSS5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2Vk LCB0aGlzLl9oYW5kbGVDbG9zZUJ1dHRvbiwgdGhpcyk7CiAgICAgICAgIGNsb3NlTmF2aWdhdGlv bkl0ZW0udmlzaWJpbGl0eVByaW9yaXR5ID0gV0kuTmF2aWdhdGlvbkl0ZW0uVmlzaWJpbGl0eVBy aW9yaXR5LkhpZ2g7CiAKLSAgICAgICAgbGV0IGNvbnRlbnRWaWV3TmF2aWdhdGlvbkl0ZW1zR3Jv dXAgPSBuZXcgV0kuR3JvdXBOYXZpZ2F0aW9uSXRlbTsKLSAgICAgICAgbGV0IGNvbnRlbnRWaWV3 TmF2aWdhdGlvbkl0ZW1zRmxleEl0ZW0gPSBuZXcgV0kuRmxleGlibGVTcGFjZU5hdmlnYXRpb25J dGVtKGNvbnRlbnRWaWV3TmF2aWdhdGlvbkl0ZW1zR3JvdXAsIFdJLkZsZXhpYmxlU3BhY2VOYXZp Z2F0aW9uSXRlbS5BbGlnbi5FbmQpOwotICAgICAgICBjb250ZW50Vmlld05hdmlnYXRpb25JdGVt c0ZsZXhJdGVtLnZpc2liaWxpdHlQcmlvcml0eSA9IFdJLk5hdmlnYXRpb25JdGVtLlZpc2liaWxp dHlQcmlvcml0eS5Mb3c7CisgICAgICAgIGxldCBjb250ZW50Vmlld05hdmlnYXRpb25JdGVtR3Jv dXAgPSBuZXcgV0kuR3JvdXBOYXZpZ2F0aW9uSXRlbTsKKyAgICAgICAgbGV0IGZsZXhpYmxlTmF2 aWdhdGlvbkl0ZW0gPSBuZXcgV0kuRmxleGlibGVTcGFjZU5hdmlnYXRpb25JdGVtKGNvbnRlbnRW aWV3TmF2aWdhdGlvbkl0ZW1Hcm91cCwgV0kuRmxleGlibGVTcGFjZU5hdmlnYXRpb25JdGVtLkFs aWduLkVuZCk7CisgICAgICAgIGZsZXhpYmxlTmF2aWdhdGlvbkl0ZW0udmlzaWJpbGl0eVByaW9y aXR5ID0gV0kuTmF2aWdhdGlvbkl0ZW0uVmlzaWJpbGl0eVByaW9yaXR5LkxvdzsKIAogICAgICAg ICBjb25zdCBlbGVtZW50ID0gbnVsbDsKLSAgICAgICAgY29uc3QgZGlzYWJsZUJhY2tGb3J3YXJk ID0gdHJ1ZTsKLSAgICAgICAgY29uc3QgZGlzYWJsZUZpbmRCYW5uZXIgPSBmYWxzZTsKLSAgICAg ICAgdGhpcy5fY29udGVudEJyb3dzZXIgPSBuZXcgV0kuQ29udGVudEJyb3dzZXIoZWxlbWVudCwg dGhpcywgZGlzYWJsZUJhY2tGb3J3YXJkLCBkaXNhYmxlRmluZEJhbm5lciwgY29udGVudFZpZXdO YXZpZ2F0aW9uSXRlbXNGbGV4SXRlbSwgY29udGVudFZpZXdOYXZpZ2F0aW9uSXRlbXNHcm91cCk7 CisgICAgICAgIHRoaXMuX2NvbnRlbnRCcm93c2VyID0gbmV3IFdJLkNvbnRlbnRCcm93c2VyKGVs ZW1lbnQsIHRoaXMsIHtoaWRlQmFja0ZvcndhcmRCdXR0b25zOiB0cnVlLCBmbGV4aWJsZU5hdmln YXRpb25JdGVtLCBjb250ZW50Vmlld05hdmlnYXRpb25JdGVtR3JvdXB9KTsKIAogICAgICAgICAv LyBJbnNlcnQgYWxsIG9mIG91ciBjdXN0b20gbmF2aWdhdGlvbiBpdGVtcyBhdCB0aGUgc3RhcnQg b2YgdGhlIENvbnRlbnRCcm93c2VyJ3MgTmF2aWdhdGlvbkJhci4KICAgICAgICAgbGV0IGluZGV4 ID0gMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL05ldHdvcmtUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJDb250ZW50Vmlldy5qcwppbmRleCBkNTZiMTYwNDAw MWY1NzEyOWExY2NkOTUxMjQ4NWZkZjFjMmVhN2U5Li5hY2MxMDkyYjI0OTY5NTVhMmUyMWNkYTg2 ZjIwYWM4NTcxZTY0M2Q2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya1RhYkNvbnRlbnRWaWV3LmpzCkBA IC0zMSw5ICszMSw3IEBAIFdJLk5ldHdvcmtUYWJDb250ZW50VmlldyA9IGNsYXNzIE5ldHdvcmtU YWJDb250ZW50VmlldyBleHRlbmRzIFdJLlRhYkNvbnRlbnRWaWV3CiAKICAgICAgICAgdGhpcy5f bmV0d29ya1RhYmxlQ29udGVudFZpZXcgPSBuZXcgV0kuTmV0d29ya1RhYmxlQ29udGVudFZpZXc7 CiAKLSAgICAgICAgY29uc3QgZGlzYWJsZUJhY2tGb3J3YXJkID0gdHJ1ZTsKLSAgICAgICAgY29u c3QgZGlzYWJsZUZpbmRCYW5uZXIgPSB0cnVlOwotICAgICAgICB0aGlzLl9jb250ZW50QnJvd3Nl ciA9IG5ldyBXSS5Db250ZW50QnJvd3NlcihudWxsLCB0aGlzLCBkaXNhYmxlQmFja0ZvcndhcmQs IGRpc2FibGVGaW5kQmFubmVyKTsKKyAgICAgICAgdGhpcy5fY29udGVudEJyb3dzZXIgPSBuZXcg V0kuQ29udGVudEJyb3dzZXIobnVsbCwgdGhpcywge2hpZGVCYWNrRm9yd2FyZEJ1dHRvbnM6IHRy dWUsIGRpc2FibGVGaW5kQmFubmVyOiB0cnVlfSk7CiAgICAgICAgIHRoaXMuX2NvbnRlbnRCcm93 c2VyLnNob3dDb250ZW50Vmlldyh0aGlzLl9uZXR3b3JrVGFibGVDb250ZW50Vmlldyk7CiAKICAg ICAgICAgbGV0IGZpbHRlck5hdmlnYXRpb25JdGVtcyA9IHRoaXMuX25ldHdvcmtUYWJsZUNvbnRl bnRWaWV3LmZpbHRlck5hdmlnYXRpb25JdGVtczsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcu anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJl Y29yZGluZ0NvbnRlbnRWaWV3LmpzCmluZGV4IDRiN2YwNTQzZGI1NjIzZTBmMmNjNGFhMGEzYWNm YzAzNGY0Yzc0MDguLmQ2ZmUzZGJkNjM4NTY1NjQwMTg0ODBlOTBjMmQ0MmMyODI2MGY2MDggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1RpbWVs aW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRpbmdDb250ZW50Vmlldy5qcwpAQCAtNDEs OSArNDEsNyBAQCBXSS5UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3ID0gY2xhc3MgVGltZWxp bmVSZWNvcmRpbmdDb250ZW50VmlldyBleHRlbmRzIFdJLgogICAgICAgICB0aGlzLl90aW1lbGlu ZU92ZXJ2aWV3LmFkZEV2ZW50TGlzdGVuZXIoV0kuVGltZWxpbmVPdmVydmlldy5FdmVudC5FZGl0 aW5nSW5zdHJ1bWVudHNEaWRDaGFuZ2UsIHRoaXMuX2VkaXRpbmdJbnN0cnVtZW50c0RpZENoYW5n ZSwgdGhpcyk7CiAgICAgICAgIHRoaXMuYWRkU3Vidmlldyh0aGlzLl90aW1lbGluZU92ZXJ2aWV3 KTsKIAotICAgICAgICBjb25zdCBkaXNhYmxlQmFja0ZvcndhcmQgPSB0cnVlOwotICAgICAgICBj b25zdCBkaXNhYmxlRmluZEJhbm5lciA9IHRydWU7Ci0gICAgICAgIHRoaXMuX3RpbWVsaW5lQ29u dGVudEJyb3dzZXIgPSBuZXcgV0kuQ29udGVudEJyb3dzZXIobnVsbCwgdGhpcywgZGlzYWJsZUJh Y2tGb3J3YXJkLCBkaXNhYmxlRmluZEJhbm5lcik7CisgICAgICAgIHRoaXMuX3RpbWVsaW5lQ29u dGVudEJyb3dzZXIgPSBuZXcgV0kuQ29udGVudEJyb3dzZXIobnVsbCwgdGhpcywge2hpZGVCYWNr Rm9yd2FyZEJ1dHRvbnM6IHRydWUsIGRpc2FibGVGaW5kQmFubmVyOiB0cnVlfSk7CiAgICAgICAg IHRoaXMuX3RpbWVsaW5lQ29udGVudEJyb3dzZXIuYWRkRXZlbnRMaXN0ZW5lcihXSS5Db250ZW50 QnJvd3Nlci5FdmVudC5DdXJyZW50Q29udGVudFZpZXdEaWRDaGFuZ2UsIHRoaXMuX2N1cnJlbnRD b250ZW50Vmlld0RpZENoYW5nZSwgdGhpcyk7CiAKICAgICAgICAgdGhpcy5fZW50aXJlUmVjb3Jk aW5nUGF0aENvbXBvbmVudCA9IHRoaXMuX2NyZWF0ZVRpbWVsaW5lUmFuZ2VQYXRoQ29tcG9uZW50 KFdJLlVJU3RyaW5nKCJFbnRpcmUgUmVjb3JkaW5nIikpOwo= 438387 2021-09-16 12:33:53 -0700 2021-09-16 15:35:33 -0700 Patch v1.1.1 - Add reviewer to change log bug-230286-20210916123352.patch text/plain 16848 pangle U3VidmVyc2lvbiBSZXZpc2lvbjogMjgyMzY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAz NTJiZDZjODI5ODA4ZTdhNmM3YzZkNmUwMTA2YTdkNGQzOTYwZTk3Li5jNTQzOGEzZmJhMzRjYjc0 ZjBkNmQ3MWYwMGQ2ZmExODBlNDZmYjU0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzOSBAQAorMjAyMS0wOS0xNCAgUGF0cmljayBBbmdsZSAgPHBhbmdsZUBhcHBsZS5jb20+ CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRG9uJ3QgbWFpbnRhaW4gYSBiYWNrLWZvcndhcmQg c3RhY2sgZm9yIGBDb250ZW50QnJvd3NlcmAvYENvbnRlbnRWaWV3Q29udGFpbmVyYCB3aGVuIG5v dCBuZWNlc3NhcnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIzMDI4NgorCisgICAgICAgIFJldmlld2VkIGJ5IERldmluIFJvdXNzby4KKworICAgICAg ICBXZSBjdXJyZW50bHkgbWFpbnRhaW4gYSBiYWNrL2ZvcndhcmQgc3RhY2sgZm9yIGFsbCBDb250 ZW50Vmlld0NvbnRhaW5lcnMsIGV2ZW4gaWYgb3RoZXIgaGlzdG9yeSBlbnRyaWVzIHdvbid0IGJl CisgICAgICAgIHVzZWQuIEluc3RlYWQsIHN1YmNsYXNzZXMgb2YgQ29udGVudEJyb3dzZXJUYWJD b250ZW50VmlldyBzaG91bGQgYmUgYWJsZSB0byBkaXNhYmxlIHRoZSBoaXN0b3J5IHN0YWNrLCB3 aGljaAorICAgICAgICBoZWxwcyB1cyBlbnN1cmUgdGhhdCBvdXRkYXRlZCBjb250ZW50IHZpZXdz IGFyZSBub3Qga2VwdCBhcm91bmQgZm9yIHRoZXNlIHN1YmNsYXNzZXMgYW5kIHRoZWlyIHZpZXdz LgorCisgICAgICAgIFRoaXMgZG9lcyBub3QgbGluZSB1cCBvbmUtdG8tb25lIHdpdGggdmlld3Mg dGhhdCBoaWRlIHRoZSBiYWNrL2ZvcndhcmQgYnV0dG9ucywgYXMgdGhlIGJhY2svZm9yd2FyZCBz dGFjayBpcworICAgICAgICB1c2VkIGluIHNvbWUgcGxhY2VzIHRvIHByb3ZpZGUgYSBtZW1vcnkg b2Ygc2VsZWN0aW9uIGFjcm9zcyBkaWZmZXJlbnQgdmlld3MsIGxpa2UgaW4gdGhlIEdyYXBoaWNz IHRhYi4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQXVkaXRUYWJDb250ZW50Vmll dy5qczoKKyAgICAgICAgKFdJLkF1ZGl0VGFiQ29udGVudFZpZXcpOgorICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvQ29uc29sZVRhYkNvbnRlbnRWaWV3LmpzOgorICAgICAgICAoV0kuQ29u c29sZVRhYkNvbnRlbnRWaWV3KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRl bnRCcm93c2VyLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudEJyb3dz ZXJUYWJDb250ZW50Vmlldy5qczoKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRl bnRWaWV3Q29udGFpbmVyLmpzOgorICAgICAgICAoV0kuQ29udGVudFZpZXdDb250YWluZXIucHJv dG90eXBlLnNob3dDb250ZW50Vmlldyk6CisgICAgICAgIChXSS5Db250ZW50Vmlld0NvbnRhaW5l ci5wcm90b3R5cGUucmVwbGFjZUNvbnRlbnRWaWV3KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L1ZpZXdzL0VsZW1lbnRzVGFiQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5FbGVtZW50c1Rh YkNvbnRlbnRWaWV3KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0dyYXBoaWNzVGFi Q29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5HcmFwaGljc1RhYkNvbnRlbnRWaWV3KToKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyc1RhYkNvbnRlbnRWaWV3LmpzOgorICAg ICAgICAoV0kuTGF5ZXJzVGFiQ29udGVudFZpZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2Uv Vmlld3MvTmV0d29ya0RldGFpbFZpZXcuanM6CisgICAgICAgIChXSS5OZXR3b3JrRGV0YWlsVmll dy5wcm90b3R5cGUuaW5pdGlhbExheW91dCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3 cy9OZXR3b3JrVGFiQ29udGVudFZpZXcuanM6CisgICAgICAgIChXSS5OZXR3b3JrVGFiQ29udGVu dFZpZXcpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNvcmRpbmdD b250ZW50Vmlldy5qczoKKyAgICAgICAgKFdJLlRpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcp OgorCiAyMDIxLTA5LTEzICBSYXp2YW4gQ2FsaW1hbiAgPHJjYWxpbWFuQGFwcGxlLmNvbT4KIAog ICAgICAgICBXZWIgSW5zcGVjdG9yOiBVcGRhdGUgbmFtaW5nIG9mIFdJLkNTU0NvbXBsZXRpb25z IGNhbGxiYWNrIHVzZWQgZm9yIGNvbGxlY3Rpbmcgc3VwcG9ydGVkIENTUyBwcm9wZXJ0aWVzIGZy b20gdGhlIHRhcmdldApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvQXVkaXRUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0F1ZGl0VGFiQ29udGVudFZpZXcuanMKaW5kZXggOGY4OTM4 ZTQ0YzQzZTA0ZWExYWYzZjZhMzhiMmU5NTA0ZjZjNGM1OS4uMDRlNTRkMzM1NWJmNzA2ZDU1MGZj MDAyNzdiNjgyNDc3MzI2YWQ5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvQXVkaXRUYWJDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9BdWRpdFRhYkNvbnRlbnRWaWV3LmpzCkBA IC0yOSw3ICsyOSw3IEBAIFdJLkF1ZGl0VGFiQ29udGVudFZpZXcgPSBjbGFzcyBBdWRpdFRhYkNv bnRlbnRWaWV3IGV4dGVuZHMgV0kuQ29udGVudEJyb3dzZXJUYWJDCiAgICAgewogICAgICAgICBz dXBlcihBdWRpdFRhYkNvbnRlbnRWaWV3LnRhYkluZm8oKSwgewogICAgICAgICAgICAgbmF2aWdh dGlvblNpZGViYXJQYW5lbENvbnN0cnVjdG9yOiBXSS5BdWRpdE5hdmlnYXRpb25TaWRlYmFyUGFu ZWwsCi0gICAgICAgICAgICBkaXNhYmxlQmFja0ZvcndhcmQ6IHRydWUsCisgICAgICAgICAgICBo aWRlQmFja0ZvcndhcmRCdXR0b25zOiB0cnVlLAogICAgICAgICB9KTsKIAogICAgICAgICB0aGlz Ll9zdGFydFN0b3BTaG9ydGN1dCA9IG5ldyBXSS5LZXlib2FyZFNob3J0Y3V0KG51bGwsIFdJLktl eWJvYXJkU2hvcnRjdXQuS2V5LlNwYWNlLCB0aGlzLl9oYW5kbGVTcGFjZS5iaW5kKHRoaXMpKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0Nv bnNvbGVUYWJDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL0NvbnNvbGVUYWJDb250ZW50Vmlldy5qcwppbmRleCA3OWVmYzU2NTE0ZGVkNTZj OTk2YWI2YWYwYTIyYjlkZDRhNzI4ZTAxLi4yMWE5OTUyZGU3NjkwMDQyYmRkYmQ4YzkyNTU3YWUy MjU2MmJhNmYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9Db25zb2xlVGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29uc29sZVRhYkNvbnRlbnRWaWV3LmpzCkBAIC0yNyw3 ICsyNyw3IEBAIFdJLkNvbnNvbGVUYWJDb250ZW50VmlldyA9IGNsYXNzIENvbnNvbGVUYWJDb250 ZW50VmlldyBleHRlbmRzIFdJLkNvbnRlbnRCcm93c2VyCiB7CiAgICAgY29uc3RydWN0b3IoKQog ICAgIHsKLSAgICAgICAgc3VwZXIoQ29uc29sZVRhYkNvbnRlbnRWaWV3LnRhYkluZm8oKSwge2Rp c2FibGVCYWNrRm9yd2FyZDogdHJ1ZX0pOworICAgICAgICBzdXBlcihDb25zb2xlVGFiQ29udGVu dFZpZXcudGFiSW5mbygpLCB7aGlkZUJhY2tGb3J3YXJkQnV0dG9uczogdHJ1ZSwgZGlzYWJsZUJh Y2tGb3J3YXJkTmF2aWdhdGlvbjogdHJ1ZX0pOwogCiAgICAgICAgIHRoaXMuX3dhc1Nob3dpbmdT cGxpdENvbnNvbGUgPSBmYWxzZTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3Nlci5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyLmpzCmluZGV4IGU1 NjhmOTY2MTNkNWMzOTg1MGE2YzE0YTg4NDU2MTljMDVlYjliNTYuLjhmYzE2OWM0NWVkMzYxMTcx MTE2NGJkOWM3OWU5OTUzN2M0NzEyZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyLmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyLmpzCkBAIC0yNSw3 ICsyNSw3IEBACiAKIFdJLkNvbnRlbnRCcm93c2VyID0gY2xhc3MgQ29udGVudEJyb3dzZXIgZXh0 ZW5kcyBXSS5WaWV3CiB7Ci0gICAgY29uc3RydWN0b3IoZWxlbWVudCwgZGVsZWdhdGUsIGRpc2Fi bGVCYWNrRm9yd2FyZCwgZGlzYWJsZUZpbmRCYW5uZXIsIGZsZXhpYmxlTmF2aWdhdGlvbkl0ZW0s IGNvbnRlbnRWaWV3TmF2aWdhdGlvbkl0ZW1Hcm91cCkKKyAgICBjb25zdHJ1Y3RvcihlbGVtZW50 LCBkZWxlZ2F0ZSwge2hpZGVCYWNrRm9yd2FyZEJ1dHRvbnMsIGRpc2FibGVCYWNrRm9yd2FyZE5h dmlnYXRpb24sIGRpc2FibGVGaW5kQmFubmVyLCBmbGV4aWJsZU5hdmlnYXRpb25JdGVtLCBjb250 ZW50Vmlld05hdmlnYXRpb25JdGVtR3JvdXB9ID0ge30pCiAgICAgewogICAgICAgICBzdXBlcihl bGVtZW50KTsKIApAQCAtMzQsMTEgKzM0LDExIEBAIFdJLkNvbnRlbnRCcm93c2VyID0gY2xhc3Mg Q29udGVudEJyb3dzZXIgZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgIHRoaXMuX25hdmlnYXRpb25C YXIgPSBuZXcgV0kuTmF2aWdhdGlvbkJhcjsKICAgICAgICAgdGhpcy5hZGRTdWJ2aWV3KHRoaXMu X25hdmlnYXRpb25CYXIpOwogCi0gICAgICAgIHRoaXMuX2NvbnRlbnRWaWV3Q29udGFpbmVyID0g bmV3IFdJLkNvbnRlbnRWaWV3Q29udGFpbmVyOworICAgICAgICB0aGlzLl9jb250ZW50Vmlld0Nv bnRhaW5lciA9IG5ldyBXSS5Db250ZW50Vmlld0NvbnRhaW5lcih7ZGlzYWJsZUJhY2tGb3J3YXJk TmF2aWdhdGlvbn0pOwogICAgICAgICB0aGlzLl9jb250ZW50Vmlld0NvbnRhaW5lci5hZGRFdmVu dExpc3RlbmVyKFdJLkNvbnRlbnRWaWV3Q29udGFpbmVyLkV2ZW50LkN1cnJlbnRDb250ZW50Vmll d0RpZENoYW5nZSwgdGhpcy5fY3VycmVudENvbnRlbnRWaWV3RGlkQ2hhbmdlLCB0aGlzKTsKICAg ICAgICAgdGhpcy5hZGRTdWJ2aWV3KHRoaXMuX2NvbnRlbnRWaWV3Q29udGFpbmVyKTsKIAotICAg ICAgICBpZiAoIWRpc2FibGVCYWNrRm9yd2FyZCkgeworICAgICAgICBpZiAoIWhpZGVCYWNrRm9y d2FyZEJ1dHRvbnMpIHsKICAgICAgICAgICAgIGxldCBpc1JUTCA9IFdJLnJlc29sdmVkTGF5b3V0 RGlyZWN0aW9uKCkgPT09IFdJLkxheW91dERpcmVjdGlvbi5SVEw7CiAKICAgICAgICAgICAgIGxl dCBnb0JhY2sgPSAoKSA9PiB7IHRoaXMuZ29CYWNrKCk7IH07CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db250ZW50QnJvd3NlclRhYkNvbnRl bnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29u dGVudEJyb3dzZXJUYWJDb250ZW50Vmlldy5qcwppbmRleCAyZTI3ZTg0MzE4MTEyZTZmZjNiNzFi ZTRjZWUxNWE5NjYwY2RmMDA0Li5lMWE2NDk4ZTMwNTQyYjgyMTg1NGZhODA3ZDk0MjVjNGRmNDUz MTBhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9Db250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRlbnRCcm93c2VyVGFiQ29udGVudFZpZXcuanMK QEAgLTI1LDEzICsyNSwxMyBAQAogCiBXSS5Db250ZW50QnJvd3NlclRhYkNvbnRlbnRWaWV3ID0g Y2xhc3MgQ29udGVudEJyb3dzZXJUYWJDb250ZW50VmlldyBleHRlbmRzIFdJLlRhYkNvbnRlbnRW aWV3CiB7Ci0gICAgY29uc3RydWN0b3IodGFiSW5mbywge25hdmlnYXRpb25TaWRlYmFyUGFuZWxD b25zdHJ1Y3RvciwgZGV0YWlsc1NpZGViYXJQYW5lbENvbnN0cnVjdG9ycywgZGlzYWJsZUJhY2tG b3J3YXJkLCBmbGV4aWJsZU5hdmlnYXRpb25JdGVtfSA9IHt9KQorICAgIGNvbnN0cnVjdG9yKHRh YkluZm8sIHtuYXZpZ2F0aW9uU2lkZWJhclBhbmVsQ29uc3RydWN0b3IsIGRldGFpbHNTaWRlYmFy UGFuZWxDb25zdHJ1Y3RvcnMsIGhpZGVCYWNrRm9yd2FyZEJ1dHRvbnMsIGRpc2FibGVCYWNrRm9y d2FyZE5hdmlnYXRpb24sIGZsZXhpYmxlTmF2aWdhdGlvbkl0ZW19ID0ge30pCiAgICAgewogICAg ICAgICBzdXBlcih0YWJJbmZvLCB7bmF2aWdhdGlvblNpZGViYXJQYW5lbENvbnN0cnVjdG9yLCBk ZXRhaWxzU2lkZWJhclBhbmVsQ29uc3RydWN0b3JzfSk7CiAKICAgICAgICAgY29uc3QgY29udGVu dEJyb3dzZXJFbGVtZW50ID0gbnVsbDsKICAgICAgICAgY29uc3QgZGlzYWJsZUZpbmRCYW5uZXIg PSBmYWxzZTsKLSAgICAgICAgdGhpcy5fY29udGVudEJyb3dzZXIgPSBuZXcgV0kuQ29udGVudEJy b3dzZXIoY29udGVudEJyb3dzZXJFbGVtZW50LCB0aGlzLCBkaXNhYmxlQmFja0ZvcndhcmQsIGRp c2FibGVGaW5kQmFubmVyLCBmbGV4aWJsZU5hdmlnYXRpb25JdGVtKTsKKyAgICAgICAgdGhpcy5f Y29udGVudEJyb3dzZXIgPSBuZXcgV0kuQ29udGVudEJyb3dzZXIoY29udGVudEJyb3dzZXJFbGVt ZW50LCB0aGlzLCB7aGlkZUJhY2tGb3J3YXJkQnV0dG9ucywgZGlzYWJsZUJhY2tGb3J3YXJkTmF2 aWdhdGlvbiwgZmxleGlibGVOYXZpZ2F0aW9uSXRlbX0pOwogCiAgICAgICAgIHRoaXMuX2lnbm9y ZU5hdmlnYXRpb25TaWRlYmFyUGFuZWxDb2xsYXBzZWRFdmVudCA9IGZhbHNlOwogICAgICAgICB0 aGlzLl9pZ25vcmVEZXRhaWxzU2lkZWJhclBhbmVsQ29sbGFwc2VkRXZlbnQgPSBmYWxzZTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbnRl bnRWaWV3Q29udGFpbmVyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2Uv Vmlld3MvQ29udGVudFZpZXdDb250YWluZXIuanMKaW5kZXggMzZhNmFhMGJhMDJhNjA2Y2VmMmJi OTIzNzcyMThiOWUzZTkwMzA0ZC4uYWIwNTZlZjkzNTIxNWFkMDkwNDNhODdmYzk3NjIwYmM3ZTg0 ZjA1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvQ29udGVudFZpZXdDb250YWluZXIuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1Vz ZXJJbnRlcmZhY2UvVmlld3MvQ29udGVudFZpZXdDb250YWluZXIuanMKQEAgLTI1LDEwICsyNSwx MiBAQAogCiBXSS5Db250ZW50Vmlld0NvbnRhaW5lciA9IGNsYXNzIENvbnRlbnRWaWV3Q29udGFp bmVyIGV4dGVuZHMgV0kuVmlldwogewotICAgIGNvbnN0cnVjdG9yKCkKKyAgICBjb25zdHJ1Y3Rv cih7ZGlzYWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbn0gPSB7fSkKICAgICB7CiAgICAgICAgIHN1 cGVyKCk7CiAKKyAgICAgICAgdGhpcy5fZGlzYWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbiA9ICEh ZGlzYWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbjsKKwogICAgICAgICB0aGlzLmVsZW1lbnQuY2xh c3NMaXN0LmFkZCgiY29udGVudC12aWV3LWNvbnRhaW5lciIpOwogCiAgICAgICAgIHRoaXMuX2Jh Y2tGb3J3YXJkTGlzdCA9IFtdOwpAQCAtNzksNiArODEsMTEgQEAgV0kuQ29udGVudFZpZXdDb250 YWluZXIgPSBjbGFzcyBDb250ZW50Vmlld0NvbnRhaW5lciBleHRlbmRzIFdJLlZpZXcKIAogICAg IHNob3dDb250ZW50Vmlldyhjb250ZW50VmlldywgY29va2llKQogICAgIHsKKyAgICAgICAgaWYg KHRoaXMuX2Rpc2FibGVCYWNrRm9yd2FyZE5hdmlnYXRpb24gJiYgdGhpcy5jdXJyZW50Q29udGVu dFZpZXcpIHsKKyAgICAgICAgICAgIHRoaXMucmVwbGFjZUNvbnRlbnRWaWV3KHRoaXMuY3VycmVu dENvbnRlbnRWaWV3LCBjb250ZW50VmlldywgY29va2llKTsKKyAgICAgICAgICAgIHJldHVybjsK KyAgICAgICAgfQorCiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KGNvbnRlbnRWaWV3IGluc3RhbmNl b2YgV0kuQ29udGVudFZpZXcpOwogICAgICAgICBpZiAoIShjb250ZW50VmlldyBpbnN0YW5jZW9m IFdJLkNvbnRlbnRWaWV3KSkKICAgICAgICAgICAgIHJldHVybiBudWxsOwpAQCAtMTQwLDYgKzE0 Nyw4IEBAIFdJLkNvbnRlbnRWaWV3Q29udGFpbmVyID0gY2xhc3MgQ29udGVudFZpZXdDb250YWlu ZXIgZXh0ZW5kcyBXSS5WaWV3CiAKICAgICAgICAgdGhpcy5zaG93QmFja0ZvcndhcmRFbnRyeUZv ckluZGV4KG5ld0luZGV4KTsKIAorICAgICAgICBjb25zb2xlLmFzc2VydCghdGhpcy5fZGlzYWJs ZUJhY2tGb3J3YXJkTmF2aWdhdGlvbiB8fCB0aGlzLl9iYWNrRm9yd2FyZExpc3QubGVuZ3RoIDw9 IDEpOworCiAgICAgICAgIHJldHVybiBjb250ZW50VmlldzsKICAgICB9CiAKQEAgLTE2NCw3ICsx NzMsNyBAQCBXSS5Db250ZW50Vmlld0NvbnRhaW5lciA9IGNsYXNzIENvbnRlbnRWaWV3Q29udGFp bmVyIGV4dGVuZHMgV0kuVmlldwogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVy cyhXSS5Db250ZW50Vmlld0NvbnRhaW5lci5FdmVudC5DdXJyZW50Q29udGVudFZpZXdEaWRDaGFu Z2UpOwogICAgIH0KIAotICAgIHJlcGxhY2VDb250ZW50VmlldyhvbGRDb250ZW50VmlldywgbmV3 Q29udGVudFZpZXcpCisgICAgcmVwbGFjZUNvbnRlbnRWaWV3KG9sZENvbnRlbnRWaWV3LCBuZXdD b250ZW50VmlldywgbmV3Q29va2llKQogICAgIHsKICAgICAgICAgY29uc29sZS5hc3NlcnQob2xk Q29udGVudFZpZXcgaW5zdGFuY2VvZiBXSS5Db250ZW50Vmlldyk7CiAgICAgICAgIGlmICghKG9s ZENvbnRlbnRWaWV3IGluc3RhbmNlb2YgV0kuQ29udGVudFZpZXcpKQpAQCAtMTk2LDcgKzIwNSw3 IEBAIFdJLkNvbnRlbnRWaWV3Q29udGFpbmVyID0gY2xhc3MgQ29udGVudFZpZXdDb250YWluZXIg ZXh0ZW5kcyBXSS5WaWV3CiAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdGhpcy5fYmFja0Zv cndhcmRMaXN0Lmxlbmd0aDsgKytpKSB7CiAgICAgICAgICAgICBpZiAodGhpcy5fYmFja0Zvcndh cmRMaXN0W2ldLmNvbnRlbnRWaWV3ID09PSBvbGRDb250ZW50VmlldykgewogICAgICAgICAgICAg ICAgIGNvbnNvbGUuYXNzZXJ0KCF0aGlzLl9iYWNrRm9yd2FyZExpc3RbaV0udG9tYnN0b25lKTsK LSAgICAgICAgICAgICAgICBsZXQgY3VycmVudENvb2tpZSA9IHRoaXMuX2JhY2tGb3J3YXJkTGlz dFtpXS5jb29raWU7CisgICAgICAgICAgICAgICAgbGV0IGN1cnJlbnRDb29raWUgPSBuZXdDb29r aWUgPz8gdGhpcy5fYmFja0ZvcndhcmRMaXN0W2ldLmNvb2tpZTsKICAgICAgICAgICAgICAgICB0 aGlzLl9iYWNrRm9yd2FyZExpc3RbaV0gPSBuZXcgV0kuQmFja0ZvcndhcmRFbnRyeShuZXdDb250 ZW50VmlldywgY3VycmVudENvb2tpZSk7CiAgICAgICAgICAgICB9CiAgICAgICAgIH0KQEAgLTIw OCw2ICsyMTcsOCBAQCBXSS5Db250ZW50Vmlld0NvbnRhaW5lciA9IGNsYXNzIENvbnRlbnRWaWV3 Q29udGFpbmVyIGV4dGVuZHMgV0kuVmlldwogICAgICAgICAgICAgdGhpcy5fc2hvd0VudHJ5KHRo aXMuY3VycmVudEJhY2tGb3J3YXJkRW50cnkpOwogICAgICAgICAgICAgdGhpcy5kaXNwYXRjaEV2 ZW50VG9MaXN0ZW5lcnMoV0kuQ29udGVudFZpZXdDb250YWluZXIuRXZlbnQuQ3VycmVudENvbnRl bnRWaWV3RGlkQ2hhbmdlKTsKICAgICAgICAgfQorCisgICAgICAgIGNvbnNvbGUuYXNzZXJ0KCF0 aGlzLl9kaXNhYmxlQmFja0ZvcndhcmROYXZpZ2F0aW9uIHx8IHRoaXMuX2JhY2tGb3J3YXJkTGlz dC5sZW5ndGggPD0gMSk7CiAgICAgfQogCiAgICAgY2xvc2VDb250ZW50Vmlldyhjb250ZW50Vmll d1RvQ2xvc2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9FbGVtZW50c1RhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvRWxlbWVudHNUYWJDb250ZW50Vmlldy5qcwppbmRleCAzNWMw MGI2Zjc1MmNmNWY3OTY5NzM3NWRkMDlmNzNhMjBjZTQxMTUwLi45N2RlYTMzZGEyNjc3MzUyNDQ3 YjRkNTBhNjk4YzZkM2E1MjcxZGZjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9FbGVtZW50c1RhYkNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0VsZW1lbnRzVGFiQ29udGVudFZp ZXcuanMKQEAgLTQzLDcgKzQzLDcgQEAgV0kuRWxlbWVudHNUYWJDb250ZW50VmlldyA9IGNsYXNz IEVsZW1lbnRzVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50QnJvd3MKICAgICAgICAg aWYgKEluc3BlY3RvckJhY2tlbmQuaGFzRG9tYWluKCJMYXllclRyZWUiKSkKICAgICAgICAgICAg IGRldGFpbHNTaWRlYmFyUGFuZWxDb25zdHJ1Y3RvcnMucHVzaChXSS5MYXllclRyZWVEZXRhaWxz U2lkZWJhclBhbmVsKTsKIAotICAgICAgICBzdXBlcihFbGVtZW50c1RhYkNvbnRlbnRWaWV3LnRh YkluZm8oKSwge2RldGFpbHNTaWRlYmFyUGFuZWxDb25zdHJ1Y3RvcnMsIGRpc2FibGVCYWNrRm9y d2FyZDogdHJ1ZX0pOworICAgICAgICBzdXBlcihFbGVtZW50c1RhYkNvbnRlbnRWaWV3LnRhYklu Zm8oKSwge2RldGFpbHNTaWRlYmFyUGFuZWxDb25zdHJ1Y3RvcnMsIGhpZGVCYWNrRm9yd2FyZEJ1 dHRvbnM6IHRydWUsIGRpc2FibGVCYWNrRm9yd2FyZE5hdmlnYXRpb246IHRydWV9KTsKICAgICB9 CiAKICAgICBzdGF0aWMgdGFiSW5mbygpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9HcmFwaGljc1RhYkNvbnRlbnRWaWV3LmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvR3JhcGhpY3NUYWJDb250ZW50Vmll dy5qcwppbmRleCA4MWM0N2M1OWFmMzg3YTJjNmYzMGNlY2QyNGEzMDE5NWM4NjUyODM2Li4xNmFi MTA1MTk2ODE4ZjQ4ODBkMDMwNmYxMWYyOTMxNTU3YTM3ZDMwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9HcmFwaGljc1RhYkNvbnRlbnRWaWV3 LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0dyYXBo aWNzVGFiQ29udGVudFZpZXcuanMKQEAgLTM1LDcgKzM1LDcgQEAgV0kuR3JhcGhpY3NUYWJDb250 ZW50VmlldyA9IGNsYXNzIEdyYXBoaWNzVGFiQ29udGVudFZpZXcgZXh0ZW5kcyBXSS5Db250ZW50 QnJvd3MKICAgICAgICAgICAgICAgICBXSS5DYW52YXNEZXRhaWxzU2lkZWJhclBhbmVsLAogICAg ICAgICAgICAgICAgIFdJLkFuaW1hdGlvbkRldGFpbHNTaWRlYmFyUGFuZWwsCiAgICAgICAgICAg ICBdLAotICAgICAgICAgICAgZGlzYWJsZUJhY2tGb3J3YXJkOiB0cnVlLAorICAgICAgICAgICAg aGlkZUJhY2tGb3J3YXJkQnV0dG9uczogdHJ1ZSwKICAgICAgICAgfSk7CiAKICAgICAgICAgdGhp cy5fY2FudmFzZXNUcmVlT3V0bGluZSA9IG5ldyBXSS5UcmVlT3V0bGluZTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xheWVyc1RhYkNvbnRl bnRWaWV3LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5 ZXJzVGFiQ29udGVudFZpZXcuanMKaW5kZXggYjkyM2RlZjRiNTJmMWEzNWE3NzU3YmNhMTM2OGI5 ZDkzYmIzZmM5Zi4uZmFhODJhMWNiN2JiMTQxZmI0YTMxMTE5MTY4OWQ5YTIyYzQxY2JhOCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTGF5ZXJz VGFiQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvTGF5ZXJzVGFiQ29udGVudFZpZXcuanMKQEAgLTI5LDcgKzI5LDggQEAgV0kuTGF5 ZXJzVGFiQ29udGVudFZpZXcgPSBjbGFzcyBMYXllcnNUYWJDb250ZW50VmlldyBleHRlbmRzIFdJ LkNvbnRlbnRCcm93c2VyVGEKICAgICB7CiAgICAgICAgIHN1cGVyKExheWVyc1RhYkNvbnRlbnRW aWV3LnRhYkluZm8oKSwgewogICAgICAgICAgICAgZGV0YWlsc1NpZGViYXJQYW5lbENvbnN0cnVj dG9yczogW1dJLkxheWVyRGV0YWlsc1NpZGViYXJQYW5lbF0sCi0gICAgICAgICAgICBkaXNhYmxl QmFja0ZvcndhcmQ6IHRydWUsCisgICAgICAgICAgICBoaWRlQmFja0ZvcndhcmRCdXR0b25zOiB0 cnVlLAorICAgICAgICAgICAgZGlzYWJsZUJhY2tGb3J3YXJkTmF2aWdhdGlvbjogdHJ1ZSwKICAg ICAgICAgfSk7CiAKICAgICAgICAgdGhpcy5fbGF5ZXJEZXRhaWxzU2lkZWJhclBhbmVsID0gdGhp cy5kZXRhaWxzU2lkZWJhclBhbmVsc1swXTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtEZXRhaWxWaWV3LmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya0RldGFpbFZpZXcuanMKaW5k ZXggNmYzODY4NzhlMWE3MWFjZjEyZTllNmQzOGUyZDk0MDQ4YjA5MjMwMi4uMmFhYTUxZWRjZWQx M2M1NzZhODY2YzA3YTE1ZTM4YWU3ZThmYTgxZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya0RldGFpbFZpZXcuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya0RldGFpbFZpZXcu anMKQEAgLTgwLDE0ICs4MCwxMiBAQCBXSS5OZXR3b3JrRGV0YWlsVmlldyA9IGNsYXNzIE5ldHdv cmtEZXRhaWxWaWV3IGV4dGVuZHMgV0kuVmlldwogICAgICAgICBjbG9zZU5hdmlnYXRpb25JdGVt LmFkZEV2ZW50TGlzdGVuZXIoV0kuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwg dGhpcy5faGFuZGxlQ2xvc2VCdXR0b24sIHRoaXMpOwogICAgICAgICBjbG9zZU5hdmlnYXRpb25J dGVtLnZpc2liaWxpdHlQcmlvcml0eSA9IFdJLk5hdmlnYXRpb25JdGVtLlZpc2liaWxpdHlQcmlv cml0eS5IaWdoOwogCi0gICAgICAgIGxldCBjb250ZW50Vmlld05hdmlnYXRpb25JdGVtc0dyb3Vw ID0gbmV3IFdJLkdyb3VwTmF2aWdhdGlvbkl0ZW07Ci0gICAgICAgIGxldCBjb250ZW50Vmlld05h dmlnYXRpb25JdGVtc0ZsZXhJdGVtID0gbmV3IFdJLkZsZXhpYmxlU3BhY2VOYXZpZ2F0aW9uSXRl bShjb250ZW50Vmlld05hdmlnYXRpb25JdGVtc0dyb3VwLCBXSS5GbGV4aWJsZVNwYWNlTmF2aWdh dGlvbkl0ZW0uQWxpZ24uRW5kKTsKLSAgICAgICAgY29udGVudFZpZXdOYXZpZ2F0aW9uSXRlbXNG bGV4SXRlbS52aXNpYmlsaXR5UHJpb3JpdHkgPSBXSS5OYXZpZ2F0aW9uSXRlbS5WaXNpYmlsaXR5 UHJpb3JpdHkuTG93OworICAgICAgICBsZXQgY29udGVudFZpZXdOYXZpZ2F0aW9uSXRlbUdyb3Vw ID0gbmV3IFdJLkdyb3VwTmF2aWdhdGlvbkl0ZW07CisgICAgICAgIGxldCBmbGV4aWJsZU5hdmln YXRpb25JdGVtID0gbmV3IFdJLkZsZXhpYmxlU3BhY2VOYXZpZ2F0aW9uSXRlbShjb250ZW50Vmll d05hdmlnYXRpb25JdGVtR3JvdXAsIFdJLkZsZXhpYmxlU3BhY2VOYXZpZ2F0aW9uSXRlbS5BbGln bi5FbmQpOworICAgICAgICBmbGV4aWJsZU5hdmlnYXRpb25JdGVtLnZpc2liaWxpdHlQcmlvcml0 eSA9IFdJLk5hdmlnYXRpb25JdGVtLlZpc2liaWxpdHlQcmlvcml0eS5Mb3c7CiAKICAgICAgICAg Y29uc3QgZWxlbWVudCA9IG51bGw7Ci0gICAgICAgIGNvbnN0IGRpc2FibGVCYWNrRm9yd2FyZCA9 IHRydWU7Ci0gICAgICAgIGNvbnN0IGRpc2FibGVGaW5kQmFubmVyID0gZmFsc2U7Ci0gICAgICAg IHRoaXMuX2NvbnRlbnRCcm93c2VyID0gbmV3IFdJLkNvbnRlbnRCcm93c2VyKGVsZW1lbnQsIHRo aXMsIGRpc2FibGVCYWNrRm9yd2FyZCwgZGlzYWJsZUZpbmRCYW5uZXIsIGNvbnRlbnRWaWV3TmF2 aWdhdGlvbkl0ZW1zRmxleEl0ZW0sIGNvbnRlbnRWaWV3TmF2aWdhdGlvbkl0ZW1zR3JvdXApOwor ICAgICAgICB0aGlzLl9jb250ZW50QnJvd3NlciA9IG5ldyBXSS5Db250ZW50QnJvd3NlcihlbGVt ZW50LCB0aGlzLCB7aGlkZUJhY2tGb3J3YXJkQnV0dG9uczogdHJ1ZSwgZmxleGlibGVOYXZpZ2F0 aW9uSXRlbSwgY29udGVudFZpZXdOYXZpZ2F0aW9uSXRlbUdyb3VwfSk7CiAKICAgICAgICAgLy8g SW5zZXJ0IGFsbCBvZiBvdXIgY3VzdG9tIG5hdmlnYXRpb24gaXRlbXMgYXQgdGhlIHN0YXJ0IG9m IHRoZSBDb250ZW50QnJvd3NlcidzIE5hdmlnYXRpb25CYXIuCiAgICAgICAgIGxldCBpbmRleCA9 IDA7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3 cy9OZXR3b3JrVGFiQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9OZXR3b3JrVGFiQ29udGVudFZpZXcuanMKaW5kZXggZDU2YjE2MDQwMDFm NTcxMjlhMWNjZDk1MTI0ODVmZGYxYzJlYTdlOS4uYWNjMTA5MmIyNDk2OTU1YTJlMjFjZGE4NmYy MGFjODU3MWU2NDNkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvVmlld3MvTmV0d29ya1RhYkNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtUYWJDb250ZW50Vmlldy5qcwpAQCAt MzEsOSArMzEsNyBAQCBXSS5OZXR3b3JrVGFiQ29udGVudFZpZXcgPSBjbGFzcyBOZXR3b3JrVGFi Q29udGVudFZpZXcgZXh0ZW5kcyBXSS5UYWJDb250ZW50VmlldwogCiAgICAgICAgIHRoaXMuX25l dHdvcmtUYWJsZUNvbnRlbnRWaWV3ID0gbmV3IFdJLk5ldHdvcmtUYWJsZUNvbnRlbnRWaWV3Owog Ci0gICAgICAgIGNvbnN0IGRpc2FibGVCYWNrRm9yd2FyZCA9IHRydWU7Ci0gICAgICAgIGNvbnN0 IGRpc2FibGVGaW5kQmFubmVyID0gdHJ1ZTsKLSAgICAgICAgdGhpcy5fY29udGVudEJyb3dzZXIg PSBuZXcgV0kuQ29udGVudEJyb3dzZXIobnVsbCwgdGhpcywgZGlzYWJsZUJhY2tGb3J3YXJkLCBk aXNhYmxlRmluZEJhbm5lcik7CisgICAgICAgIHRoaXMuX2NvbnRlbnRCcm93c2VyID0gbmV3IFdJ LkNvbnRlbnRCcm93c2VyKG51bGwsIHRoaXMsIHtoaWRlQmFja0ZvcndhcmRCdXR0b25zOiB0cnVl LCBkaXNhYmxlRmluZEJhbm5lcjogdHJ1ZX0pOwogICAgICAgICB0aGlzLl9jb250ZW50QnJvd3Nl ci5zaG93Q29udGVudFZpZXcodGhpcy5fbmV0d29ya1RhYmxlQ29udGVudFZpZXcpOwogCiAgICAg ICAgIGxldCBmaWx0ZXJOYXZpZ2F0aW9uSXRlbXMgPSB0aGlzLl9uZXR3b3JrVGFibGVDb250ZW50 Vmlldy5maWx0ZXJOYXZpZ2F0aW9uSXRlbXM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGluZVJlY29yZGluZ0NvbnRlbnRWaWV3Lmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvVGltZWxpbmVSZWNv cmRpbmdDb250ZW50Vmlldy5qcwppbmRleCA0YjdmMDU0M2RiNTYyM2UwZjJjYzRhYTBhM2FjZmMw MzRmNGM3NDA4Li5kNmZlM2RiZDYzODU2NTY0MDE4NDgwZTkwYzJkNDJjMjgyNjBmNjA4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9UaW1lbGlu ZVJlY29yZGluZ0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1ZpZXdzL1RpbWVsaW5lUmVjb3JkaW5nQ29udGVudFZpZXcuanMKQEAgLTQxLDkg KzQxLDcgQEAgV0kuVGltZWxpbmVSZWNvcmRpbmdDb250ZW50VmlldyA9IGNsYXNzIFRpbWVsaW5l UmVjb3JkaW5nQ29udGVudFZpZXcgZXh0ZW5kcyBXSS4KICAgICAgICAgdGhpcy5fdGltZWxpbmVP dmVydmlldy5hZGRFdmVudExpc3RlbmVyKFdJLlRpbWVsaW5lT3ZlcnZpZXcuRXZlbnQuRWRpdGlu Z0luc3RydW1lbnRzRGlkQ2hhbmdlLCB0aGlzLl9lZGl0aW5nSW5zdHJ1bWVudHNEaWRDaGFuZ2Us IHRoaXMpOwogICAgICAgICB0aGlzLmFkZFN1YnZpZXcodGhpcy5fdGltZWxpbmVPdmVydmlldyk7 CiAKLSAgICAgICAgY29uc3QgZGlzYWJsZUJhY2tGb3J3YXJkID0gdHJ1ZTsKLSAgICAgICAgY29u c3QgZGlzYWJsZUZpbmRCYW5uZXIgPSB0cnVlOwotICAgICAgICB0aGlzLl90aW1lbGluZUNvbnRl bnRCcm93c2VyID0gbmV3IFdJLkNvbnRlbnRCcm93c2VyKG51bGwsIHRoaXMsIGRpc2FibGVCYWNr Rm9yd2FyZCwgZGlzYWJsZUZpbmRCYW5uZXIpOworICAgICAgICB0aGlzLl90aW1lbGluZUNvbnRl bnRCcm93c2VyID0gbmV3IFdJLkNvbnRlbnRCcm93c2VyKG51bGwsIHRoaXMsIHtoaWRlQmFja0Zv cndhcmRCdXR0b25zOiB0cnVlLCBkaXNhYmxlRmluZEJhbm5lcjogdHJ1ZX0pOwogICAgICAgICB0 aGlzLl90aW1lbGluZUNvbnRlbnRCcm93c2VyLmFkZEV2ZW50TGlzdGVuZXIoV0kuQ29udGVudEJy b3dzZXIuRXZlbnQuQ3VycmVudENvbnRlbnRWaWV3RGlkQ2hhbmdlLCB0aGlzLl9jdXJyZW50Q29u dGVudFZpZXdEaWRDaGFuZ2UsIHRoaXMpOwogCiAgICAgICAgIHRoaXMuX2VudGlyZVJlY29yZGlu Z1BhdGhDb21wb25lbnQgPSB0aGlzLl9jcmVhdGVUaW1lbGluZVJhbmdlUGF0aENvbXBvbmVudChX SS5VSVN0cmluZygiRW50aXJlIFJlY29yZGluZyIpKTsK