166943 2017-01-11 15:33:55 -0800 Web Inspector: Network Tab's "Clear Network Items" button should have keyboard shortcuts 2017-01-19 10:32:23 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg hi bburg commit-queue hi inspector-bugzilla-changes webkit-bug-importer oldest_to_newest 1265926 0 bburg 2017-01-11 15:33:55 -0800 Let's use the ones Timeline tab has. 1265927 1 webkit-bug-importer 2017-01-11 15:34:23 -0800 <rdar://problem/29978622> 1266021 2 hi 2017-01-11 18:14:17 -0800 (In reply to comment #0) > Let's use the ones Timeline tab has. ...does it have a keyboard shortcut? If so, we should add it to the tooltip on the Trash icon. 1266185 3 bburg 2017-01-12 10:08:58 -0800 (In reply to comment #2) > (In reply to comment #0) > > Let's use the ones Timeline tab has. > > ...does it have a keyboard shortcut? If so, we should add it to the tooltip > on the Trash icon. Oops, I was misremembering. It's the Console. You'll probably need to adjust the console one to be non-global, it currently works even if Console messages are not visible. 1267779 4 299155 hi 2017-01-18 10:34:15 -0800 Created attachment 299155 Patch 1268020 5 299155 timothy 2017-01-18 20:49:30 -0800 Comment on attachment 299155 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=299155&action=review > Source/WebInspectorUI/UserInterface/Base/Main.js:2027 > + return; Perhaps this should still clear the console globally if the focused view does not handle it. I know folks (me included) that clear the console from other tabs just to reset the dashboard counters. 1268107 6 299247 hi 2017-01-19 09:48:53 -0800 Created attachment 299247 Patch 1268121 7 299247 commit-queue 2017-01-19 10:32:20 -0800 Comment on attachment 299247 Patch Clearing flags on attachment: 299247 Committed r210930: <http://trac.webkit.org/changeset/210930> 1268122 8 commit-queue 2017-01-19 10:32:23 -0800 All reviewed patches have been landed. Closing bug. 299155 2017-01-18 10:34:15 -0800 2017-01-19 09:48:53 -0800 Patch bug-166943-20170118103225.patch text/plain 10700 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDI0MGFlZTkzOTY0ZTI0NmY4ZDc5M2JlOGY2Mzll NmU2OThjZTgzYjMuLjk5ZjY1M2VlOWYyZmIyY2YyNWUxNGQ2OGM2NDFlMDg0OTEyZWQ4NDIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE3LTAxLTE4ICBEZXZp biBSb3Vzc28gIDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IE5ldHdvcmsgVGFiJ3MgIkNsZWFyIE5ldHdvcmsgSXRlbXMiIGJ1dHRvbiBzaG91bGQg aGF2ZSBrZXlib2FyZCBzaG9ydGN1dHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE2Njk0MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdz LmpzOgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL01haW4uanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuY29udGVudExvYWRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuX2NsZWFy KToKKyAgICAgICAgTW92ZSBjbGVhciBrZXlib2FyZCBzaG9ydGN1dCB0byBtYWluIG9iamVjdCBh bmQgY2FsbCBfaGFuZGxlQ2xlYXJTaG9ydGN1dCBvbiB0aGUgdmlzaWJsZQorICAgICAgICBjb250 ZW50IHZpZXcgaWYgYWJsZS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMv SmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkph dmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSmF2YVNj cmlwdExvZ1ZpZXdDb250cm9sbGVyLnByb3RvdHlwZS5yZXF1ZXN0Q2xlYXJNZXNzYWdlcyk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyLnByb3RvdHlw ZS5faGFuZGxlQ2xlYXJTaG9ydGN1dCk6IERlbGV0ZWQuCisgICAgICAgICogVXNlckludGVyZmFj ZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Mb2dDb250 ZW50Vmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTG9nQ29udGVudFZpZXcucHJvdG90eXBl LmhhbmRsZUNsZWFyU2hvcnRjdXQpOgorICAgICAgICBNb3ZlIGxvZ2ljIGZvciByZXF1ZXN0aW5n IHRvIGNsZWFyIG1lc3NhZ2VzIGZyb20gdGhlIExvZ01hbmFnZXIgdG8gYSBiZXR0ZXIgbmFtZWQg ZnVuY3Rpb24uCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL05ldHdvcmtHcmlkQ29u dGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0dyaWRDb250ZW50Vmll dyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0dyaWRDb250ZW50Vmlldy5wcm90b3R5 cGUuaGFuZGxlQ2xlYXJTaG9ydGN1dCk6CisKIDIwMTctMDEtMTYgIERldmluIFJvdXNzbyAgPGRj cm91c3NvK3dlYmtpdEBnbWFpbC5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogYWRkICJQ ZXJzaXN0IExvZ3Mgb24gTmF2aWdhdGlvbiIgdG8gc2V0dGluZ3Mgc2NyZWVuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRT dHJpbmdzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2FsaXphdGlvbnMvZW4ubHByb2ov bG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCBlOWRkYzIxYWJjZjI0OTllY2MxNzYxOGVlOGI4NDE1 NGFhM2VkYjRkLi4yNjJlMjcyOTFkYjhhMzI5NzBlZTY5OGU4NWY1MDc5YzBmY2FiNjU0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2Nh bGl6ZWRTdHJpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Mb2NhbGl6YXRpb25z L2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKQEAgLTE0NSw3ICsxNDUsNyBAQCBsb2NhbGl6 ZWRTdHJpbmdzWyJDaGlsZHJlbiJdID0gIkNoaWxkcmVuIjsKIGxvY2FsaXplZFN0cmluZ3NbIkNs YXNzZXMiXSA9ICJDbGFzc2VzIjsKIGxvY2FsaXplZFN0cmluZ3NbIkNsZWFyIl0gPSAiQ2xlYXIi OwogbG9jYWxpemVkU3RyaW5nc1siQ2xlYXIgTG9nIl0gPSAiQ2xlYXIgTG9nIjsKLWxvY2FsaXpl ZFN0cmluZ3NbIkNsZWFyIE5ldHdvcmsgSXRlbXMiXSA9ICJDbGVhciBOZXR3b3JrIEl0ZW1zIjsK K2xvY2FsaXplZFN0cmluZ3NbIkNsZWFyIE5ldHdvcmsgSXRlbXMgKCVzKSJdID0gIkNsZWFyIE5l dHdvcmsgSXRlbXMgKCVzKSI7CiBsb2NhbGl6ZWRTdHJpbmdzWyJDbGVhciBUaW1lbGluZSJdID0g IkNsZWFyIFRpbWVsaW5lIjsKIGxvY2FsaXplZFN0cmluZ3NbIkNsZWFyIGZvY3VzIl0gPSAiQ2xl YXIgZm9jdXMiOwogbG9jYWxpemVkU3RyaW5nc1siQ2xlYXIgbG9nICglcyBvciAlcykiXSA9ICJD bGVhciBsb2cgKCVzIG9yICVzKSI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9CYXNlL01haW4uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9CYXNlL01haW4uanMKaW5kZXggNzBlYzAzOTA0NTk0OWM2ODk3MGI4YjI1NTI2Mjg5 NzVmZTNjNGMxNy4uMjk1OWJmMjAxOGM1MzVmMTViNTNlMDBmOWQ5NjI4MWRlMWM1ZjNiZiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwpA QCAtMjc2LDYgKzI3Niw4IEBAIFdlYkluc3BlY3Rvci5jb250ZW50TG9hZGVkID0gZnVuY3Rpb24o KQogICAgIHRoaXMuc3BsaXRDb250ZW50QnJvd3NlciA9IG5ldyBXZWJJbnNwZWN0b3IuQ29udGVu dEJyb3dzZXIoZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoInNwbGl0LWNvbnRlbnQtYnJvd3NlciIp LCB0aGlzLCBkaXNhYmxlQmFja0ZvcndhcmQsIGRpc2FibGVGaW5kQmFubmVyKTsKICAgICB0aGlz LnNwbGl0Q29udGVudEJyb3dzZXIubmF2aWdhdGlvbkJhci5lbGVtZW50LmFkZEV2ZW50TGlzdGVu ZXIoIm1vdXNlZG93biIsIHRoaXMuX2NvbnNvbGVSZXNpemVyTW91c2VEb3duLmJpbmQodGhpcykp OwogCisgICAgdGhpcy5jbGVhcktleWJvYXJkU2hvcnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9yLktl eWJvYXJkU2hvcnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29t bWFuZE9yQ29udHJvbCwgIksiLCB0aGlzLl9jbGVhci5iaW5kKHRoaXMpKTsKKwogICAgIHRoaXMu cXVpY2tDb25zb2xlID0gbmV3IFdlYkluc3BlY3Rvci5RdWlja0NvbnNvbGUoZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoInF1aWNrLWNvbnNvbGUiKSk7CiAgICAgdGhpcy5xdWlja0NvbnNvbGUuYWRk RXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUXVpY2tDb25zb2xlLkV2ZW50LkRpZFJlc2l6ZSwg dGhpcy5fcXVpY2tDb25zb2xlRGlkUmVzaXplLCB0aGlzKTsKIApAQCAtMjAxOCw2ICsyMDIwLDE1 IEBAIFdlYkluc3BlY3Rvci5fc2F2ZUFzID0gZnVuY3Rpb24oZXZlbnQpCiAgICAgV2ViSW5zcGVj dG9yLnNhdmVEYXRhVG9GaWxlKGNvbnRlbnRWaWV3LnNhdmVEYXRhLCB0cnVlKTsKIH07CiAKK1dl Ykluc3BlY3Rvci5fY2xlYXIgPSBmdW5jdGlvbihldmVudCkKK3sKKyAgICBsZXQgY29udGVudFZp ZXcgPSB0aGlzLmZvY3VzZWRPclZpc2libGVDb250ZW50VmlldygpOworICAgIGlmICghY29udGVu dFZpZXcgfHwgdHlwZW9mIGNvbnRlbnRWaWV3LmhhbmRsZUNsZWFyU2hvcnRjdXQgIT09ICJmdW5j dGlvbiIpCisgICAgICAgIHJldHVybjsKKworICAgIGNvbnRlbnRWaWV3LmhhbmRsZUNsZWFyU2hv cnRjdXQoZXZlbnQpOworfTsKKwogV2ViSW5zcGVjdG9yLl9jb3B5ID0gZnVuY3Rpb24oZXZlbnQp CiB7CiAgICAgdmFyIHNlbGVjdGlvbiA9IHdpbmRvdy5nZXRTZWxlY3Rpb24oKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0phdmFT Y3JpcHRMb2dWaWV3Q29udHJvbGxlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0NvbnRyb2xsZXJzL0phdmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlci5qcwppbmRleCBj NmU3YzJkM2Q4YTIwNGQ3ODgyYWFkYWU1MWZiODQwNGE5NTc1Y2I5Li43MjYyMTMyNGM4ZTFlNTAz MDdlYjA5Y2FkZmYwZjI0ZGNlYjQ4YjA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9KYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMv SmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyLmpzCkBAIC01MCwxMyArNTAsMTIgQEAgV2ViSW5z cGVjdG9yLkphdmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlciA9IGNsYXNzIEphdmFTY3JpcHRMb2dW aWV3Q29udHJvbGxlciBleHQKIAogICAgICAgICB0aGlzLl9zZXNzaW9ucyA9IFtdOwogCi0gICAg ICAgIHRoaXMubWVzc2FnZXNDbGVhcktleWJvYXJkU2hvcnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9y LktleWJvYXJkU2hvcnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIu Q29tbWFuZE9yQ29udHJvbCwgIksiLCB0aGlzLl9oYW5kbGVDbGVhclNob3J0Y3V0LmJpbmQodGhp cykpOwotICAgICAgICB0aGlzLm1lc3NhZ2VzQWx0ZXJuYXRlQ2xlYXJLZXlib2FyZFNob3J0Y3V0 ID0gbmV3IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdlYkluc3BlY3Rvci5LZXlib2Fy ZFNob3J0Y3V0Lk1vZGlmaWVyLkNvbnRyb2wsICJMIiwgdGhpcy5faGFuZGxlQ2xlYXJTaG9ydGN1 dC5iaW5kKHRoaXMpLCB0aGlzLl9lbGVtZW50KTsKKyAgICAgICAgdGhpcy5tZXNzYWdlc0FsdGVy bmF0ZUNsZWFyS2V5Ym9hcmRTaG9ydGN1dCA9IG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9y dGN1dChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db250cm9sLCAiTCIs IHRoaXMucmVxdWVzdENsZWFyTWVzc2FnZXMuYmluZCh0aGlzKSwgdGhpcy5fZWxlbWVudCk7CiAK ICAgICAgICAgdGhpcy5fbWVzc2FnZXNGaW5kTmV4dEtleWJvYXJkU2hvcnRjdXQgPSBuZXcgV2Vi SW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQu TW9kaWZpZXIuQ29tbWFuZE9yQ29udHJvbCwgIkciLCB0aGlzLl9oYW5kbGVGaW5kTmV4dFNob3J0 Y3V0LmJpbmQodGhpcyksIHRoaXMuX2VsZW1lbnQpOwogICAgICAgICB0aGlzLl9tZXNzYWdlc0Zp bmRQcmV2aW91c0tleWJvYXJkU2hvcnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hv cnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29tbWFuZE9yQ29u dHJvbCB8IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLlNoaWZ0LCAiRyIs IHRoaXMuX2hhbmRsZUZpbmRQcmV2aW91c1Nob3J0Y3V0LmJpbmQodGhpcyksIHRoaXMuX2VsZW1l bnQpOwogCi0gICAgICAgIHRoaXMuX3Byb21wdEFsdGVybmF0ZUNsZWFyS2V5Ym9hcmRTaG9ydGN1 dCA9IG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChXZWJJbnNwZWN0b3IuS2V5Ym9h cmRTaG9ydGN1dC5Nb2RpZmllci5Db250cm9sLCAiTCIsIHRoaXMuX2hhbmRsZUNsZWFyU2hvcnRj dXQuYmluZCh0aGlzKSwgdGhpcy5fcHJvbXB0LmVsZW1lbnQpOworICAgICAgICB0aGlzLl9wcm9t cHRBbHRlcm5hdGVDbGVhcktleWJvYXJkU2hvcnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9yLktleWJv YXJkU2hvcnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29udHJv bCwgIkwiLCB0aGlzLnJlcXVlc3RDbGVhck1lc3NhZ2VzLmJpbmQodGhpcyksIHRoaXMuX3Byb21w dC5lbGVtZW50KTsKICAgICAgICAgdGhpcy5fcHJvbXB0RmluZE5leHRLZXlib2FyZFNob3J0Y3V0 ID0gbmV3IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdlYkluc3BlY3Rvci5LZXlib2Fy ZFNob3J0Y3V0Lk1vZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wsICJHIiwgdGhpcy5faGFuZGxlRmlu ZE5leHRTaG9ydGN1dC5iaW5kKHRoaXMpLCB0aGlzLl9wcm9tcHQuZWxlbWVudCk7CiAgICAgICAg IHRoaXMuX3Byb21wdEZpbmRQcmV2aW91c0tleWJvYXJkU2hvcnRjdXQgPSBuZXcgV2ViSW5zcGVj dG9yLktleWJvYXJkU2hvcnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZp ZXIuQ29tbWFuZE9yQ29udHJvbCB8IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlm aWVyLlNoaWZ0LCAiRyIsIHRoaXMuX2hhbmRsZUZpbmRQcmV2aW91c1Nob3J0Y3V0LmJpbmQodGhp cyksIHRoaXMuX3Byb21wdC5lbGVtZW50KTsKIApAQCAtMTkyLDYgKzE5MSwxMSBAQCBXZWJJbnNw ZWN0b3IuSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyID0gY2xhc3MgSmF2YVNjcmlwdExvZ1Zp ZXdDb250cm9sbGVyIGV4dAogICAgICAgICB0aGlzLl9zY3JvbGxUb0JvdHRvbVRpbWVvdXQgPSBz ZXRUaW1lb3V0KGRlbGF5ZWRXb3JrLmJpbmQodGhpcyksIDApOwogICAgIH0KIAorICAgIHJlcXVl c3RDbGVhck1lc3NhZ2VzKCkKKyAgICB7CisgICAgICAgIFdlYkluc3BlY3Rvci5sb2dNYW5hZ2Vy LnJlcXVlc3RDbGVhck1lc3NhZ2VzKCk7CisgICAgfQorCiAgICAgLy8gUHJvdGVjdGVkCiAKICAg ICBjb25zb2xlUHJvbXB0SGlzdG9yeURpZENoYW5nZShwcm9tcHQpCkBAIC0yNTEsMTEgKzI1NSw2 IEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIgPSBjbGFzcyBKYXZh U2NyaXB0TG9nVmlld0NvbnRyb2xsZXIgZXh0CiAKICAgICAvLyBQcml2YXRlCiAKLSAgICBfaGFu ZGxlQ2xlYXJTaG9ydGN1dCgpCi0gICAgewotICAgICAgICBXZWJJbnNwZWN0b3IubG9nTWFuYWdl ci5yZXF1ZXN0Q2xlYXJNZXNzYWdlcygpOwotICAgIH0KLQogICAgIF9oYW5kbGVGaW5kTmV4dFNo b3J0Y3V0KCkKICAgICB7CiAgICAgICAgIHRoaXMuZGVsZWdhdGUuaGlnaGxpZ2h0TmV4dFNlYXJj aE1hdGNoKCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9Mb2dDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCmluZGV4IDQyZDIxNTZiMjE4NGE5OGJhOWEw OGVhZmFjMmRkZmUzMTI2MmY0Y2IuLjQ0OTYxN2RkNjE5MjBhYjcwZTIwYzIxMmVjNmI4YjRlYjg5 NzRjNDUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzCkBAIC03Nyw3ICs3Nyw3IEBAIFdlYkluc3Bl Y3Rvci5Mb2dDb250ZW50VmlldyA9IGNsYXNzIExvZ0NvbnRlbnRWaWV3IGV4dGVuZHMgV2ViSW5z cGVjdG9yLkNvbnRlbnRWCiAgICAgICAgIHRoaXMuX3Njb3BlQmFyID0gbmV3IFdlYkluc3BlY3Rv ci5TY29wZUJhcigibG9nLXNjb3BlLWJhciIsIHNjb3BlQmFySXRlbXMsIHNjb3BlQmFySXRlbXNb MF0pOwogICAgICAgICB0aGlzLl9zY29wZUJhci5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rv ci5TY29wZUJhci5FdmVudC5TZWxlY3Rpb25DaGFuZ2VkLCB0aGlzLl9zY29wZUJhclNlbGVjdGlv bkRpZENoYW5nZSwgdGhpcyk7CiAKLSAgICAgICAgdGhpcy5fY2xlYXJMb2dOYXZpZ2F0aW9uSXRl bSA9IG5ldyBXZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0oImNsZWFyLWxvZyIsIFdl Ykluc3BlY3Rvci5VSVN0cmluZygiQ2xlYXIgbG9nICglcyBvciAlcykiKS5mb3JtYXQodGhpcy5f bG9nVmlld0NvbnRyb2xsZXIubWVzc2FnZXNDbGVhcktleWJvYXJkU2hvcnRjdXQuZGlzcGxheU5h bWUsIHRoaXMuX2xvZ1ZpZXdDb250cm9sbGVyLm1lc3NhZ2VzQWx0ZXJuYXRlQ2xlYXJLZXlib2Fy ZFNob3J0Y3V0LmRpc3BsYXlOYW1lKSwgIkltYWdlcy9OYXZpZ2F0aW9uSXRlbVRyYXNoLnN2ZyIs IDE1LCAxNSk7CisgICAgICAgIHRoaXMuX2NsZWFyTG9nTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV2Vi SW5zcGVjdG9yLkJ1dHRvbk5hdmlnYXRpb25JdGVtKCJjbGVhci1sb2ciLCBXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIkNsZWFyIGxvZyAoJXMgb3IgJXMpIikuZm9ybWF0KFdlYkluc3BlY3Rvci5jbGVh cktleWJvYXJkU2hvcnRjdXQuZGlzcGxheU5hbWUsIHRoaXMuX2xvZ1ZpZXdDb250cm9sbGVyLm1l c3NhZ2VzQWx0ZXJuYXRlQ2xlYXJLZXlib2FyZFNob3J0Y3V0LmRpc3BsYXlOYW1lKSwgIkltYWdl cy9OYXZpZ2F0aW9uSXRlbVRyYXNoLnN2ZyIsIDE1LCAxNSk7CiAgICAgICAgIHRoaXMuX2NsZWFy TG9nTmF2aWdhdGlvbkl0ZW0uYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuQnV0dG9uTmF2 aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwgdGhpcy5fY2xlYXJMb2csIHRoaXMpOwogCiAgICAg ICAgIHZhciB0b29sVGlwID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTaG93IGNvbnNvbGUgdGFi Iik7CkBAIC0yNDIsNiArMjQyLDExIEBAIFdlYkluc3BlY3Rvci5Mb2dDb250ZW50VmlldyA9IGNs YXNzIExvZ0NvbnRlbnRWaWV3IGV4dGVuZHMgV2ViSW5zcGVjdG9yLkNvbnRlbnRWCiAgICAgICAg ICAgICB0aGlzLnByb21wdC5mb2N1cygpOwogICAgIH0KIAorICAgIGhhbmRsZUNsZWFyU2hvcnRj dXQoZXZlbnQpCisgICAgeworICAgICAgICB0aGlzLl9sb2dWaWV3Q29udHJvbGxlci5yZXF1ZXN0 Q2xlYXJNZXNzYWdlcygpOworICAgIH0KKwogICAgIC8vIFByb3RlY3RlZAogCiAgICAgbGF5b3V0 KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L05ldHdvcmtHcmlkQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9OZXR3b3JrR3JpZENvbnRlbnRWaWV3LmpzCmluZGV4IGEzMmIyMDgzY2Vj MTE5MzhmNWUzODI4N2M3MDBmY2JmODc5YzljNzguLjgzOGFhNzlmNWRjNjExMGQzZmRkMWMwZmIz YWEzMzhiNjM4MGRhNWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL05ldHdvcmtHcmlkQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya0dyaWRDb250ZW50Vmlldy5qcwpA QCAtMTAxLDcgKzEwMSw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrR3JpZENvbnRlbnRWaWV3ID0g Y2xhc3MgTmV0d29ya0dyaWRDb250ZW50VmlldyBleHRlbmRzIFdlYkluCiAgICAgICAgIG5ldHdv cmtUaW1lbGluZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZS5FdmVudC5S ZWNvcmRBZGRlZCwgdGhpcy5fbmV0d29ya1RpbWVsaW5lUmVjb3JkQWRkZWQsIHRoaXMpOwogICAg ICAgICBuZXR3b3JrVGltZWxpbmUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxp bmUuRXZlbnQuUmVzZXQsIHRoaXMuX25ldHdvcmtUaW1lbGluZVJlc2V0LCB0aGlzKTsKIAotICAg ICAgICB0aGlzLl9jbGVhck5ldHdvcmtJdGVtc05hdmlnYXRpb25JdGVtID0gbmV3IFdlYkluc3Bl Y3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbSgiY2xlYXItbmV0d29yay1pdGVtcyIsIFdlYkluc3Bl Y3Rvci5VSVN0cmluZygiQ2xlYXIgTmV0d29yayBJdGVtcyIpLCAiSW1hZ2VzL05hdmlnYXRpb25J dGVtVHJhc2guc3ZnIiwgMTUsIDE1KTsKKyAgICAgICAgdGhpcy5fY2xlYXJOZXR3b3JrSXRlbXNO YXZpZ2F0aW9uSXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0oImNs ZWFyLW5ldHdvcmstaXRlbXMiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNsZWFyIE5ldHdvcmsg SXRlbXMgKCVzKSIpLmZvcm1hdChXZWJJbnNwZWN0b3IuY2xlYXJLZXlib2FyZFNob3J0Y3V0LmRp c3BsYXlOYW1lKSwgIkltYWdlcy9OYXZpZ2F0aW9uSXRlbVRyYXNoLnN2ZyIsIDE1LCAxNSk7CiAg ICAgICAgIHRoaXMuX2NsZWFyTmV0d29ya0l0ZW1zTmF2aWdhdGlvbkl0ZW0uYWRkRXZlbnRMaXN0 ZW5lcihXZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0uRXZlbnQuQ2xpY2tlZCwgKCkg PT4gdGhpcy5yZXNldCgpKTsKIAogICAgICAgICB0aGlzLl9wZW5kaW5nUmVjb3JkcyA9IFtdOwpA QCAtMjE3LDYgKzIxNywxMSBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0dyaWRDb250ZW50VmlldyA9 IGNsYXNzIE5ldHdvcmtHcmlkQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbgogICAgICAgICB0aGlz Ll9wcm9jZXNzUGVuZGluZ1JlY29yZHMoKTsKICAgICB9CiAKKyAgICBoYW5kbGVDbGVhclNob3J0 Y3V0KGV2ZW50KQorICAgIHsKKyAgICAgICAgdGhpcy5yZXNldCgpOworICAgIH0KKwogICAgIC8v IFByaXZhdGUKIAogICAgIF9wcm9jZXNzUGVuZGluZ1JlY29yZHMoKQo= 299247 2017-01-19 09:48:53 -0800 2017-01-19 10:32:20 -0800 Patch 166943.diff text/plain 10624 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDhhMjJkY2QuLmZmMWY0ODkgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDE3LTAxLTE5ICBEZXZpbiBSb3Vzc28g IDxkY3JvdXNzbyt3ZWJraXRAZ21haWwuY29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IE5l dHdvcmsgVGFiJ3MgIkNsZWFyIE5ldHdvcmsgSXRlbXMiIGJ1dHRvbiBzaG91bGQgaGF2ZSBrZXli b2FyZCBzaG9ydGN1dHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE2Njk0MworCisgICAgICAgIFJldmlld2VkIGJ5IFRpbW90aHkgSGF0Y2hlci4KKwor ICAgICAgICAqIExvY2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qczoKKwor ICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLmNvbnRlbnRMb2FkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLl9jbGVhcik6CisgICAg ICAgIE1vdmUgY2xlYXIga2V5Ym9hcmQgc2hvcnRjdXQgdG8gbWFpbiBvYmplY3QgYW5kIGNhbGwg X2hhbmRsZUNsZWFyU2hvcnRjdXQgb24gdGhlIHZpc2libGUKKyAgICAgICAgY29udGVudCB2aWV3 IGlmIGFibGUuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0phdmFTY3Jp cHRMb2dWaWV3Q29udHJvbGxlci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0 TG9nVmlld0NvbnRyb2xsZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRMb2dW aWV3Q29udHJvbGxlci5wcm90b3R5cGUucmVxdWVzdENsZWFyTWVzc2FnZXMpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkphdmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlci5wcm90b3R5cGUuX2hhbmRs ZUNsZWFyU2hvcnRjdXQpOiBEZWxldGVkLgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3Mv TG9nQ29udGVudFZpZXcuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTG9nQ29udGVudFZpZXcp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkxvZ0NvbnRlbnRWaWV3LnByb3RvdHlwZS5oYW5kbGVD bGVhclNob3J0Y3V0KToKKyAgICAgICAgTW92ZSBsb2dpYyBmb3IgcmVxdWVzdGluZyB0byBjbGVh ciBtZXNzYWdlcyBmcm9tIHRoZSBMb2dNYW5hZ2VyIHRvIGEgYmV0dGVyIG5hbWVkIGZ1bmN0aW9u LgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9OZXR3b3JrR3JpZENvbnRlbnRWaWV3 LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtHcmlkQ29udGVudFZpZXcpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLk5ldHdvcmtHcmlkQ29udGVudFZpZXcucHJvdG90eXBlLmhhbmRs ZUNsZWFyU2hvcnRjdXQpOgorCiAyMDE3LTAxLTE4ICBEZXZpbiBSb3Vzc28gIDxkY3JvdXNzbyt3 ZWJraXRAZ21haWwuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IHNwbGl0IGNvbnNvbGUg c2hvdWxkIGJlIGFsbG93ZWQgZm9yIE5ldHdvcmsgYW5kIFRpbWVsaW5lIHRhYnMgd2hlbiBJbnNw ZWN0b3IgaXMgbm90IGRvY2tlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xv Y2FsaXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Mb2NhbGl6YXRpb25zL2VuLmxwcm9qL2xvY2FsaXplZFN0cmluZ3MuanMKaW5kZXgg ZTlkZGMyMS4uMjYyZTI3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0xvY2Fs aXphdGlvbnMvZW4ubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcworKysgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvTG9jYWxpemF0aW9ucy9lbi5scHJvai9sb2NhbGl6ZWRTdHJpbmdzLmpzCkBAIC0x NDUsNyArMTQ1LDcgQEAgbG9jYWxpemVkU3RyaW5nc1siQ2hpbGRyZW4iXSA9ICJDaGlsZHJlbiI7 CiBsb2NhbGl6ZWRTdHJpbmdzWyJDbGFzc2VzIl0gPSAiQ2xhc3NlcyI7CiBsb2NhbGl6ZWRTdHJp bmdzWyJDbGVhciJdID0gIkNsZWFyIjsKIGxvY2FsaXplZFN0cmluZ3NbIkNsZWFyIExvZyJdID0g IkNsZWFyIExvZyI7Ci1sb2NhbGl6ZWRTdHJpbmdzWyJDbGVhciBOZXR3b3JrIEl0ZW1zIl0gPSAi Q2xlYXIgTmV0d29yayBJdGVtcyI7Citsb2NhbGl6ZWRTdHJpbmdzWyJDbGVhciBOZXR3b3JrIEl0 ZW1zICglcykiXSA9ICJDbGVhciBOZXR3b3JrIEl0ZW1zICglcykiOwogbG9jYWxpemVkU3RyaW5n c1siQ2xlYXIgVGltZWxpbmUiXSA9ICJDbGVhciBUaW1lbGluZSI7CiBsb2NhbGl6ZWRTdHJpbmdz WyJDbGVhciBmb2N1cyJdID0gIkNsZWFyIGZvY3VzIjsKIGxvY2FsaXplZFN0cmluZ3NbIkNsZWFy IGxvZyAoJXMgb3IgJXMpIl0gPSAiQ2xlYXIgbG9nICglcyBvciAlcykiOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzIGIvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCmluZGV4IDIyNWUyODIu LmM4YTM5NDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L0Jhc2UvTWFpbi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9C YXNlL01haW4uanMKQEAgLTI3Niw2ICsyNzYsOCBAQCBXZWJJbnNwZWN0b3IuY29udGVudExvYWRl ZCA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLnNwbGl0Q29udGVudEJyb3dzZXIgPSBuZXcgV2ViSW5z cGVjdG9yLkNvbnRlbnRCcm93c2VyKGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJzcGxpdC1jb250 ZW50LWJyb3dzZXIiKSwgdGhpcywgZGlzYWJsZUJhY2tGb3J3YXJkLCBkaXNhYmxlRmluZEJhbm5l cik7CiAgICAgdGhpcy5zcGxpdENvbnRlbnRCcm93c2VyLm5hdmlnYXRpb25CYXIuZWxlbWVudC5h ZGRFdmVudExpc3RlbmVyKCJtb3VzZWRvd24iLCB0aGlzLl9jb25zb2xlUmVzaXplck1vdXNlRG93 bi5iaW5kKHRoaXMpKTsKIAorICAgIHRoaXMuY2xlYXJLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdl Ykluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0 Lk1vZGlmaWVyLkNvbW1hbmRPckNvbnRyb2wsICJLIiwgdGhpcy5fY2xlYXIuYmluZCh0aGlzKSk7 CisKICAgICB0aGlzLnF1aWNrQ29uc29sZSA9IG5ldyBXZWJJbnNwZWN0b3IuUXVpY2tDb25zb2xl KGRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJxdWljay1jb25zb2xlIikpOwogICAgIHRoaXMucXVp Y2tDb25zb2xlLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlF1aWNrQ29uc29sZS5FdmVu dC5EaWRSZXNpemUsIHRoaXMuX3F1aWNrQ29uc29sZURpZFJlc2l6ZSwgdGhpcyk7CiAKQEAgLTIw MjMsNiArMjAyNSwxOSBAQCBXZWJJbnNwZWN0b3IuX3NhdmVBcyA9IGZ1bmN0aW9uKGV2ZW50KQog ICAgIFdlYkluc3BlY3Rvci5zYXZlRGF0YVRvRmlsZShjb250ZW50Vmlldy5zYXZlRGF0YSwgdHJ1 ZSk7CiB9OwogCitXZWJJbnNwZWN0b3IuX2NsZWFyID0gZnVuY3Rpb24oZXZlbnQpCit7CisgICAg bGV0IGNvbnRlbnRWaWV3ID0gdGhpcy5mb2N1c2VkT3JWaXNpYmxlQ29udGVudFZpZXcoKTsKKyAg ICBpZiAoIWNvbnRlbnRWaWV3IHx8IHR5cGVvZiBjb250ZW50Vmlldy5oYW5kbGVDbGVhclNob3J0 Y3V0ICE9PSAiZnVuY3Rpb24iKSB7CisgICAgICAgIC8vIElmIHRoZSBjdXJyZW50IGNvbnRlbnQg dmlldyBpcyB1bmFibGUgdG8gaGFuZGxlIHRoaXMgZXZlbnQsIGNsZWFyIHRoZSBjb25zb2xlIHRv IHJlc2V0CisgICAgICAgIC8vIHRoZSBkYXNoYm9hcmQgY291bnRlcnMuCisgICAgICAgIHRoaXMu bG9nTWFuYWdlci5yZXF1ZXN0Q2xlYXJNZXNzYWdlcygpOworICAgICAgICByZXR1cm47CisgICAg fQorCisgICAgY29udGVudFZpZXcuaGFuZGxlQ2xlYXJTaG9ydGN1dChldmVudCk7Cit9OworCiBX ZWJJbnNwZWN0b3IuX2NvcHkgPSBmdW5jdGlvbihldmVudCkKIHsKICAgICB2YXIgc2VsZWN0aW9u ID0gd2luZG93LmdldFNlbGVjdGlvbigpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVy LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvSmF2 YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyLmpzCmluZGV4IGM2ZTdjMmQuLjcyNjIxMzIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0ph dmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Db250cm9sbGVycy9KYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIuanMK QEAgLTUwLDEzICs1MCwxMiBAQCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9s bGVyID0gY2xhc3MgSmF2YVNjcmlwdExvZ1ZpZXdDb250cm9sbGVyIGV4dAogCiAgICAgICAgIHRo aXMuX3Nlc3Npb25zID0gW107CiAKLSAgICAgICAgdGhpcy5tZXNzYWdlc0NsZWFyS2V5Ym9hcmRT aG9ydGN1dCA9IG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChXZWJJbnNwZWN0b3Iu S2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kT3JDb250cm9sLCAiSyIsIHRoaXMuX2hh bmRsZUNsZWFyU2hvcnRjdXQuYmluZCh0aGlzKSk7Ci0gICAgICAgIHRoaXMubWVzc2FnZXNBbHRl cm5hdGVDbGVhcktleWJvYXJkU2hvcnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hv cnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29udHJvbCwgIkwi LCB0aGlzLl9oYW5kbGVDbGVhclNob3J0Y3V0LmJpbmQodGhpcyksIHRoaXMuX2VsZW1lbnQpOwor ICAgICAgICB0aGlzLm1lc3NhZ2VzQWx0ZXJuYXRlQ2xlYXJLZXlib2FyZFNob3J0Y3V0ID0gbmV3 IFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0 Y3V0Lk1vZGlmaWVyLkNvbnRyb2wsICJMIiwgdGhpcy5yZXF1ZXN0Q2xlYXJNZXNzYWdlcy5iaW5k KHRoaXMpLCB0aGlzLl9lbGVtZW50KTsKIAogICAgICAgICB0aGlzLl9tZXNzYWdlc0ZpbmROZXh0 S2V5Ym9hcmRTaG9ydGN1dCA9IG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChXZWJJ bnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kT3JDb250cm9sLCAiRyIs IHRoaXMuX2hhbmRsZUZpbmROZXh0U2hvcnRjdXQuYmluZCh0aGlzKSwgdGhpcy5fZWxlbWVudCk7 CiAgICAgICAgIHRoaXMuX21lc3NhZ2VzRmluZFByZXZpb3VzS2V5Ym9hcmRTaG9ydGN1dCA9IG5l dyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9y dGN1dC5Nb2RpZmllci5Db21tYW5kT3JDb250cm9sIHwgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hv cnRjdXQuTW9kaWZpZXIuU2hpZnQsICJHIiwgdGhpcy5faGFuZGxlRmluZFByZXZpb3VzU2hvcnRj dXQuYmluZCh0aGlzKSwgdGhpcy5fZWxlbWVudCk7CiAKLSAgICAgICAgdGhpcy5fcHJvbXB0QWx0 ZXJuYXRlQ2xlYXJLZXlib2FyZFNob3J0Y3V0ID0gbmV3IFdlYkluc3BlY3Rvci5LZXlib2FyZFNo b3J0Y3V0KFdlYkluc3BlY3Rvci5LZXlib2FyZFNob3J0Y3V0Lk1vZGlmaWVyLkNvbnRyb2wsICJM IiwgdGhpcy5faGFuZGxlQ2xlYXJTaG9ydGN1dC5iaW5kKHRoaXMpLCB0aGlzLl9wcm9tcHQuZWxl bWVudCk7CisgICAgICAgIHRoaXMuX3Byb21wdEFsdGVybmF0ZUNsZWFyS2V5Ym9hcmRTaG9ydGN1 dCA9IG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChXZWJJbnNwZWN0b3IuS2V5Ym9h cmRTaG9ydGN1dC5Nb2RpZmllci5Db250cm9sLCAiTCIsIHRoaXMucmVxdWVzdENsZWFyTWVzc2Fn ZXMuYmluZCh0aGlzKSwgdGhpcy5fcHJvbXB0LmVsZW1lbnQpOwogICAgICAgICB0aGlzLl9wcm9t cHRGaW5kTmV4dEtleWJvYXJkU2hvcnRjdXQgPSBuZXcgV2ViSW5zcGVjdG9yLktleWJvYXJkU2hv cnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuQ29tbWFuZE9yQ29u dHJvbCwgIkciLCB0aGlzLl9oYW5kbGVGaW5kTmV4dFNob3J0Y3V0LmJpbmQodGhpcyksIHRoaXMu X3Byb21wdC5lbGVtZW50KTsKICAgICAgICAgdGhpcy5fcHJvbXB0RmluZFByZXZpb3VzS2V5Ym9h cmRTaG9ydGN1dCA9IG5ldyBXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dChXZWJJbnNwZWN0 b3IuS2V5Ym9hcmRTaG9ydGN1dC5Nb2RpZmllci5Db21tYW5kT3JDb250cm9sIHwgV2ViSW5zcGVj dG9yLktleWJvYXJkU2hvcnRjdXQuTW9kaWZpZXIuU2hpZnQsICJHIiwgdGhpcy5faGFuZGxlRmlu ZFByZXZpb3VzU2hvcnRjdXQuYmluZCh0aGlzKSwgdGhpcy5fcHJvbXB0LmVsZW1lbnQpOwogCkBA IC0xOTIsNiArMTkxLDExIEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xs ZXIgPSBjbGFzcyBKYXZhU2NyaXB0TG9nVmlld0NvbnRyb2xsZXIgZXh0CiAgICAgICAgIHRoaXMu X3Njcm9sbFRvQm90dG9tVGltZW91dCA9IHNldFRpbWVvdXQoZGVsYXllZFdvcmsuYmluZCh0aGlz KSwgMCk7CiAgICAgfQogCisgICAgcmVxdWVzdENsZWFyTWVzc2FnZXMoKQorICAgIHsKKyAgICAg ICAgV2ViSW5zcGVjdG9yLmxvZ01hbmFnZXIucmVxdWVzdENsZWFyTWVzc2FnZXMoKTsKKyAgICB9 CisKICAgICAvLyBQcm90ZWN0ZWQKIAogICAgIGNvbnNvbGVQcm9tcHRIaXN0b3J5RGlkQ2hhbmdl KHByb21wdCkKQEAgLTI1MSwxMSArMjU1LDYgQEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRMb2dW aWV3Q29udHJvbGxlciA9IGNsYXNzIEphdmFTY3JpcHRMb2dWaWV3Q29udHJvbGxlciBleHQKIAog ICAgIC8vIFByaXZhdGUKIAotICAgIF9oYW5kbGVDbGVhclNob3J0Y3V0KCkKLSAgICB7Ci0gICAg ICAgIFdlYkluc3BlY3Rvci5sb2dNYW5hZ2VyLnJlcXVlc3RDbGVhck1lc3NhZ2VzKCk7Ci0gICAg fQotCiAgICAgX2hhbmRsZUZpbmROZXh0U2hvcnRjdXQoKQogICAgIHsKICAgICAgICAgdGhpcy5k ZWxlZ2F0ZS5oaWdobGlnaHROZXh0U2VhcmNoTWF0Y2goKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0xvZ0NvbnRlbnRWaWV3LmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanMK aW5kZXggNDJkMjE1Ni4uNDliNjYyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanMKKysrIGIvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTG9nQ29udGVudFZpZXcuanMKQEAgLTc3LDcg Kzc3LDcgQEAgV2ViSW5zcGVjdG9yLkxvZ0NvbnRlbnRWaWV3ID0gY2xhc3MgTG9nQ29udGVudFZp ZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuQ29udGVudFYKICAgICAgICAgdGhpcy5fc2NvcGVCYXIg PSBuZXcgV2ViSW5zcGVjdG9yLlNjb3BlQmFyKCJsb2ctc2NvcGUtYmFyIiwgc2NvcGVCYXJJdGVt cywgc2NvcGVCYXJJdGVtc1swXSk7CiAgICAgICAgIHRoaXMuX3Njb3BlQmFyLmFkZEV2ZW50TGlz dGVuZXIoV2ViSW5zcGVjdG9yLlNjb3BlQmFyLkV2ZW50LlNlbGVjdGlvbkNoYW5nZWQsIHRoaXMu X3Njb3BlQmFyU2VsZWN0aW9uRGlkQ2hhbmdlLCB0aGlzKTsKIAotICAgICAgICB0aGlzLl9jbGVh ckxvZ05hdmlnYXRpb25JdGVtID0gbmV3IFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRl bSgiY2xlYXItbG9nIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDbGVhciBsb2cgKCVzIG9yICVz KSIpLmZvcm1hdCh0aGlzLl9sb2dWaWV3Q29udHJvbGxlci5tZXNzYWdlc0NsZWFyS2V5Ym9hcmRT aG9ydGN1dC5kaXNwbGF5TmFtZSwgdGhpcy5fbG9nVmlld0NvbnRyb2xsZXIubWVzc2FnZXNBbHRl cm5hdGVDbGVhcktleWJvYXJkU2hvcnRjdXQuZGlzcGxheU5hbWUpLCAiSW1hZ2VzL05hdmlnYXRp b25JdGVtVHJhc2guc3ZnIiwgMTUsIDE1KTsKKyAgICAgICAgdGhpcy5fY2xlYXJMb2dOYXZpZ2F0 aW9uSXRlbSA9IG5ldyBXZWJJbnNwZWN0b3IuQnV0dG9uTmF2aWdhdGlvbkl0ZW0oImNsZWFyLWxv ZyIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ2xlYXIgbG9nICglcyBvciAlcykiKS5mb3JtYXQo V2ViSW5zcGVjdG9yLmNsZWFyS2V5Ym9hcmRTaG9ydGN1dC5kaXNwbGF5TmFtZSwgdGhpcy5fbG9n Vmlld0NvbnRyb2xsZXIubWVzc2FnZXNBbHRlcm5hdGVDbGVhcktleWJvYXJkU2hvcnRjdXQuZGlz cGxheU5hbWUpLCAiSW1hZ2VzL05hdmlnYXRpb25JdGVtVHJhc2guc3ZnIiwgMTUsIDE1KTsKICAg ICAgICAgdGhpcy5fY2xlYXJMb2dOYXZpZ2F0aW9uSXRlbS5hZGRFdmVudExpc3RlbmVyKFdlYklu c3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCB0aGlzLl9jbGVhckxv ZywgdGhpcyk7CiAKICAgICAgICAgdmFyIHRvb2xUaXAgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlNob3cgY29uc29sZSB0YWIiKTsKQEAgLTIxNiw2ICsyMTYsMTEgQEAgV2ViSW5zcGVjdG9yLkxv Z0NvbnRlbnRWaWV3ID0gY2xhc3MgTG9nQ29udGVudFZpZXcgZXh0ZW5kcyBXZWJJbnNwZWN0b3Iu Q29udGVudFYKICAgICAgICAgZXZlbnQucHJldmVudERlZmF1bHQoKTsKICAgICB9CiAKKyAgICBo YW5kbGVDbGVhclNob3J0Y3V0KGV2ZW50KQorICAgIHsKKyAgICAgICAgdGhpcy5fbG9nVmlld0Nv bnRyb2xsZXIucmVxdWVzdENsZWFyTWVzc2FnZXMoKTsKKyAgICB9CisKICAgICBmaW5kQmFubmVy UmV2ZWFsUHJldmlvdXNSZXN1bHQoKQogICAgIHsKICAgICAgICAgaWYgKCF0aGlzLmhhc1BlcmZv cm1lZFNlYXJjaCB8fCBpc0VtcHR5T2JqZWN0KHRoaXMuX3NlYXJjaE1hdGNoZXMpKQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29ya0dy aWRDb250ZW50Vmlldy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL05ldHdvcmtHcmlkQ29udGVudFZpZXcuanMKaW5kZXggYTMyYjIwOC4uODM4YWE3OSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvTmV0d29y a0dyaWRDb250ZW50Vmlldy5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9OZXR3b3JrR3JpZENvbnRlbnRWaWV3LmpzCkBAIC0xMDEsNyArMTAxLDcgQEAg V2ViSW5zcGVjdG9yLk5ldHdvcmtHcmlkQ29udGVudFZpZXcgPSBjbGFzcyBOZXR3b3JrR3JpZENv bnRlbnRWaWV3IGV4dGVuZHMgV2ViSW4KICAgICAgICAgbmV0d29ya1RpbWVsaW5lLmFkZEV2ZW50 TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlRpbWVsaW5lLkV2ZW50LlJlY29yZEFkZGVkLCB0aGlzLl9u ZXR3b3JrVGltZWxpbmVSZWNvcmRBZGRlZCwgdGhpcyk7CiAgICAgICAgIG5ldHdvcmtUaW1lbGlu ZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZS5FdmVudC5SZXNldCwgdGhp cy5fbmV0d29ya1RpbWVsaW5lUmVzZXQsIHRoaXMpOwogCi0gICAgICAgIHRoaXMuX2NsZWFyTmV0 d29ya0l0ZW1zTmF2aWdhdGlvbkl0ZW0gPSBuZXcgV2ViSW5zcGVjdG9yLkJ1dHRvbk5hdmlnYXRp b25JdGVtKCJjbGVhci1uZXR3b3JrLWl0ZW1zIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDbGVh ciBOZXR3b3JrIEl0ZW1zIiksICJJbWFnZXMvTmF2aWdhdGlvbkl0ZW1UcmFzaC5zdmciLCAxNSwg MTUpOworICAgICAgICB0aGlzLl9jbGVhck5ldHdvcmtJdGVtc05hdmlnYXRpb25JdGVtID0gbmV3 IFdlYkluc3BlY3Rvci5CdXR0b25OYXZpZ2F0aW9uSXRlbSgiY2xlYXItbmV0d29yay1pdGVtcyIs IFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ2xlYXIgTmV0d29yayBJdGVtcyAoJXMpIikuZm9ybWF0 KFdlYkluc3BlY3Rvci5jbGVhcktleWJvYXJkU2hvcnRjdXQuZGlzcGxheU5hbWUpLCAiSW1hZ2Vz L05hdmlnYXRpb25JdGVtVHJhc2guc3ZnIiwgMTUsIDE1KTsKICAgICAgICAgdGhpcy5fY2xlYXJO ZXR3b3JrSXRlbXNOYXZpZ2F0aW9uSXRlbS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5C dXR0b25OYXZpZ2F0aW9uSXRlbS5FdmVudC5DbGlja2VkLCAoKSA9PiB0aGlzLnJlc2V0KCkpOwog CiAgICAgICAgIHRoaXMuX3BlbmRpbmdSZWNvcmRzID0gW107CkBAIC0yMTcsNiArMjE3LDExIEBA IFdlYkluc3BlY3Rvci5OZXR3b3JrR3JpZENvbnRlbnRWaWV3ID0gY2xhc3MgTmV0d29ya0dyaWRD b250ZW50VmlldyBleHRlbmRzIFdlYkluCiAgICAgICAgIHRoaXMuX3Byb2Nlc3NQZW5kaW5nUmVj b3JkcygpOwogICAgIH0KIAorICAgIGhhbmRsZUNsZWFyU2hvcnRjdXQoZXZlbnQpCisgICAgewor ICAgICAgICB0aGlzLnJlc2V0KCk7CisgICAgfQorCiAgICAgLy8gUHJpdmF0ZQogCiAgICAgX3By b2Nlc3NQZW5kaW5nUmVjb3JkcygpCg==