146498 2015-06-30 23:58:34 -0700 Web Inspector: Option+Click not jumping to resource 2015-07-07 10:26:57 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck webkit-unassigned commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1105986 0 joepeck 2015-06-30 23:58:34 -0700 * SUMMARY Option+Click not jumping to resource. * STEPS TO REPRODUCE 1. Inspect <body> on <http://bogojoker.com> 2. In the Styles sidebar, Option+Click anything in the CSS (or the pattern.png resource) => no jump to resource 1105987 1 webkit-bug-importer 2015-06-30 23:59:04 -0700 <rdar://problem/21627454> 1107350 2 256271 hi 2015-07-06 20:01:27 -0700 Created attachment 256271 Patch 1107357 3 256271 timothy 2015-07-06 21:07:21 -0700 Comment on attachment 256271 Patch The force tab stuff was added because I was seeing tab switches during cookie restore. Maybe we don't need it now because cookie restore is only done when the tab is selected? 1107373 4 256271 joepeck 2015-07-06 22:50:00 -0700 Comment on attachment 256271 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=256271&action=review > Source/WebInspectorUI/UserInterface/Controllers/CodeMirrorTokenTrackingController.js:355 > + if (this._delegate && typeof this._delegate.tokenTrackingControllerHighlightedRangeWasClicked === "function") > + this._delegate.tokenTrackingControllerHighlightedRangeWasClicked(this); This is not commented in the ChangeLog. We couldn't determine why the setTimeout was needed... but it looks like it was there to deal with CodeMirror. In any case, if you didn't see a regression with this change it seems find to make. 1107377 5 256271 joepeck 2015-07-06 22:59:42 -0700 Comment on attachment 256271 Patch Doing some quick searches I found a few call sites that were missed. (Maybe you just searched WebInspector.foo and missed these which don't 100% match that call site signature): Base/Main.js 1535: this.showMainFrameDOMTree(event.data.node, true); Base/Main.js 1138: this.showSourceCodeForFrame(frame.id, true); Thanks for looking into this! 1107381 6 joepeck 2015-07-06 23:05:03 -0700 (In reply to comment #3) > Comment on attachment 256271 [details] > Patch > > The force tab stuff was added because I was seeing tab switches during > cookie restore. Maybe we don't need it now because cookie restore is only > done when the tab is selected? That was exactly what I was thinking and why I suggested this approach to Devin. I cannot think of any case where we don't want to switch to a relevant tab when trying to show a new content view. The idea with window.event was clever, but I can't think of cases where we would trigger switching content views that wasn't somehow user gesture triggered. Even if we end up needing to keep/restore this parameter, I'd rather see it negated, and have the default behavior allow for switching tabs. 1107423 7 256290 hi 2015-07-07 01:21:10 -0700 Created attachment 256290 Patch 1107478 8 256290 commit-queue 2015-07-07 10:26:52 -0700 Comment on attachment 256290 Patch Clearing flags on attachment: 256290 Committed r186466: <http://trac.webkit.org/changeset/186466> 1107479 9 commit-queue 2015-07-07 10:26:57 -0700 All reviewed patches have been landed. Closing bug. 256271 2015-07-06 20:01:27 -0700 2015-07-07 01:20:54 -0700 Patch bug-146498-20150706200029.patch text/plain 11605 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGU3OTE3ZmI1YTc4MWExMDUxZmY0ZTdmZjY5ZGJj YWViN2M5Njc4ZWEuLjgzZGExYmE1YjE1ZWI0NGFlYTRhOWFkMGVjYzY2MzJhYmJiYmJlOTIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE1LTA3LTA2ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBP cHRpb24rQ2xpY2sgbm90IGp1bXBpbmcgdG8gcmVzb3VyY2UKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjQ5OAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL01haW4uanM6 IEFsd2F5cyBzaG93IHRoZSB0YWIgd2hpY2ggY29udGFpbnMgdGhlIHJlcHJlc2VudGVkIG9iamVj dC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5zaG93Q29uc29sZVRhYik6CisgICAgICAgIChXZWJJ bnNwZWN0b3Iuc2hvd1JlcHJlc2VudGVkT2JqZWN0KTogUmVtb3ZlZCBmb3JjZVNob3dUYWIgcGFy YW1ldGVyLgorICAgICAgICAoV2ViSW5zcGVjdG9yLnNob3dNYWluRnJhbWVET01UcmVlKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5zaG93Q29udGVudEZsb3dET01UcmVlKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5zaG93U291cmNlQ29kZUZvckZyYW1lKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5zaG93U291cmNlQ29kZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iuc2hvd1NvdXJjZUNvZGVM b2NhdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3Iuc2hvd09yaWdpbmFsVW5mb3JtYXR0ZWRT b3VyY2VDb2RlTG9jYXRpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLnNob3dPcmlnaW5hbE9y Rm9ybWF0dGVkU291cmNlQ29kZUxvY2F0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5zaG93 T3JpZ2luYWxPckZvcm1hdHRlZFNvdXJjZUNvZGVUZXh0UmFuZ2UpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLnNob3dSZXNvdXJjZVJlcXVlc3QpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29u dHJvbGxlcnMvQ29kZU1pcnJvclRva2VuVHJhY2tpbmdDb250cm9sbGVyLmpzOgorICAgICAgICAo V2ViSW5zcGVjdG9yLkNvZGVNaXJyb3JUb2tlblRyYWNraW5nQ29udHJvbGxlci5wcm90b3R5cGUu X21vdXNlQnV0dG9uV2FzUmVsZWFzZWRPdmVyRWRpdG9yKToKKyAgICAgICAgKiBVc2VySW50ZXJm YWNlL1Byb3RvY29sL0luc3BlY3RvckZyb250ZW5kQVBJLmpzOgorICAgICAgICAoSW5zcGVjdG9y RnJvbnRlbmRBUEkuc2hvd01haW5SZXNvdXJjZUZvckZyYW1lKToKKyAgICAgICAgKiBVc2VySW50 ZXJmYWNlL1ZpZXdzL0NvbXB1dGVkU3R5bGVEZXRhaWxzUGFuZWwuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuQ29tcHV0ZWRTdHlsZURldGFpbHNQYW5lbC5wcm90b3R5cGUuX2dvVG9Db250ZW50 Rmxvd0Fycm93V2FzQ2xpY2tlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29tcHV0ZWRTdHls ZURldGFpbHNQYW5lbCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9PYmplY3RUcmVl QmFzZVRyZWVFbGVtZW50LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk9iamVjdFRyZWVCYXNl VHJlZUVsZW1lbnQucHJvdG90eXBlLl9hcHBlbmRNZW51c0l0ZW1zRm9yT2JqZWN0KToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5PYmplY3RUcmVlQmFzZVRyZWVFbGVtZW50KToKKwogMjAxNS0wNy0w NiAgTWF0dCBCYWtlciAgPG1hdHRiYWtlckBhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3Bl Y3RvcjogUmVuZGVyaW5nIEZyYW1lIGJhcnMgYXBwZWFyIG1pc2FsaWduZWQgYW5kIGNvbnRhaW4g Z2FwcyB3aGVuIGRpc3BsYXlpbmcgc21hbGwgdGFzayBzZWdtZW50cwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCmluZGV4IDU5YWZhOTgyMjZm ZjdkOGI1NDE4ODlkZmU1ZTkyNzYwOGVlZGUyNDUuLmU3ZGJmNzM4M2VmMzljNzE0MmM1YjE0Nzli ODRlYjZlYjg0YzlhMmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL0Jhc2UvTWFpbi5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9CYXNlL01haW4uanMKQEAgLTc2MSw3ICs3NjEsNyBAQCBXZWJJbnNwZWN0b3Iuc2hvd0Nv bnNvbGVUYWIgPSBmdW5jdGlvbihyZXF1ZXN0ZWRTY29wZSkKICAgICBpZiAocmVxdWVzdGVkU2Nv cGUgfHwgIXRoaXMuY29uc29sZUNvbnRlbnRWaWV3LnNjb3BlQmFyLnNlbGVjdGVkSXRlbXMubGVu Z3RoKQogICAgICAgICB0aGlzLmNvbnNvbGVDb250ZW50Vmlldy5zY29wZUJhci5pdGVtKHNjb3Bl KS5zZWxlY3RlZCA9IHRydWU7CiAKLSAgICB0aGlzLnNob3dSZXByZXNlbnRlZE9iamVjdCh0aGlz Ll9jb25zb2xlUmVwcmVzZW50ZWRPYmplY3QsIG51bGwsIHRydWUpOworICAgIHRoaXMuc2hvd1Jl cHJlc2VudGVkT2JqZWN0KHRoaXMuX2NvbnNvbGVSZXByZXNlbnRlZE9iamVjdCk7CiAKICAgICBj b25zb2xlLmFzc2VydCh0aGlzLmlzU2hvd2luZ0NvbnNvbGVUYWIoKSk7CiB9OwpAQCAtOTIzLDMz ICs5MjMsMzEgQEAgV2ViSW5zcGVjdG9yLnRhYkNvbnRlbnRWaWV3Rm9yUmVwcmVzZW50ZWRPYmpl Y3QgPSBmdW5jdGlvbihyZXByZXNlbnRlZE9iamVjdCkKICAgICByZXR1cm4gdGFiQ29udGVudFZp ZXc7CiB9OwogCi1XZWJJbnNwZWN0b3Iuc2hvd1JlcHJlc2VudGVkT2JqZWN0ID0gZnVuY3Rpb24o cmVwcmVzZW50ZWRPYmplY3QsIGNvb2tpZSwgZm9yY2VTaG93VGFiKQorV2ViSW5zcGVjdG9yLnNo b3dSZXByZXNlbnRlZE9iamVjdCA9IGZ1bmN0aW9uKHJlcHJlc2VudGVkT2JqZWN0LCBjb29raWUp CiB7CiAgICAgdmFyIHRhYkNvbnRlbnRWaWV3ID0gdGhpcy50YWJDb250ZW50Vmlld0ZvclJlcHJl c2VudGVkT2JqZWN0KHJlcHJlc2VudGVkT2JqZWN0KTsKICAgICBjb25zb2xlLmFzc2VydCh0YWJD b250ZW50Vmlldyk7CiAgICAgaWYgKCF0YWJDb250ZW50VmlldykKICAgICAgICAgcmV0dXJuOwog Ci0gICAgaWYgKHdpbmRvdy5ldmVudCB8fCBmb3JjZVNob3dUYWIpCi0gICAgICAgIHRoaXMudGFi QnJvd3Nlci5zaG93VGFiRm9yQ29udGVudFZpZXcodGFiQ29udGVudFZpZXcpOwotCisgICAgdGhp cy50YWJCcm93c2VyLnNob3dUYWJGb3JDb250ZW50Vmlldyh0YWJDb250ZW50Vmlldyk7CiAgICAg dGFiQ29udGVudFZpZXcuc2hvd1JlcHJlc2VudGVkT2JqZWN0KHJlcHJlc2VudGVkT2JqZWN0LCBj b29raWUpOwogfTsKIAotV2ViSW5zcGVjdG9yLnNob3dNYWluRnJhbWVET01UcmVlID0gZnVuY3Rp b24obm9kZVRvU2VsZWN0LCBmb3JjZVNob3dUYWIpCitXZWJJbnNwZWN0b3Iuc2hvd01haW5GcmFt ZURPTVRyZWUgPSBmdW5jdGlvbihub2RlVG9TZWxlY3QpCiB7CiAgICAgY29uc29sZS5hc3NlcnQo V2ViSW5zcGVjdG9yLmZyYW1lUmVzb3VyY2VNYW5hZ2VyLm1haW5GcmFtZSk7CiAgICAgaWYgKCFX ZWJJbnNwZWN0b3IuZnJhbWVSZXNvdXJjZU1hbmFnZXIubWFpbkZyYW1lKQogICAgICAgICByZXR1 cm47Ci0gICAgdGhpcy5zaG93UmVwcmVzZW50ZWRPYmplY3QoV2ViSW5zcGVjdG9yLmZyYW1lUmVz b3VyY2VNYW5hZ2VyLm1haW5GcmFtZS5kb21UcmVlLCB7bm9kZVRvU2VsZWN0fSwgZm9yY2VTaG93 VGFiKTsKKyAgICB0aGlzLnNob3dSZXByZXNlbnRlZE9iamVjdChXZWJJbnNwZWN0b3IuZnJhbWVS ZXNvdXJjZU1hbmFnZXIubWFpbkZyYW1lLmRvbVRyZWUsIHtub2RlVG9TZWxlY3R9KTsKIH07CiAK LVdlYkluc3BlY3Rvci5zaG93Q29udGVudEZsb3dET01UcmVlID0gZnVuY3Rpb24oY29udGVudEZs b3csIG5vZGVUb1NlbGVjdCwgZm9yY2VTaG93VGFiKQorV2ViSW5zcGVjdG9yLnNob3dDb250ZW50 Rmxvd0RPTVRyZWUgPSBmdW5jdGlvbihjb250ZW50Rmxvdywgbm9kZVRvU2VsZWN0KQogewotICAg IHRoaXMuc2hvd1JlcHJlc2VudGVkT2JqZWN0KGNvbnRlbnRGbG93LCB7bm9kZVRvU2VsZWN0fSwg Zm9yY2VTaG93VGFiKTsKKyAgICB0aGlzLnNob3dSZXByZXNlbnRlZE9iamVjdChjb250ZW50Rmxv dywge25vZGVUb1NlbGVjdH0pOwogfTsKIAotV2ViSW5zcGVjdG9yLnNob3dTb3VyY2VDb2RlRm9y RnJhbWUgPSBmdW5jdGlvbihmcmFtZUlkZW50aWZpZXIsIGZvcmNlU2hvd1RhYikKK1dlYkluc3Bl Y3Rvci5zaG93U291cmNlQ29kZUZvckZyYW1lID0gZnVuY3Rpb24oZnJhbWVJZGVudGlmaWVyKQog ewogICAgIHZhciBmcmFtZSA9IFdlYkluc3BlY3Rvci5mcmFtZVJlc291cmNlTWFuYWdlci5mcmFt ZUZvcklkZW50aWZpZXIoZnJhbWVJZGVudGlmaWVyKTsKICAgICBpZiAoIWZyYW1lKSB7CkBAIC05 NTksMTAgKzk1NywxMCBAQCBXZWJJbnNwZWN0b3Iuc2hvd1NvdXJjZUNvZGVGb3JGcmFtZSA9IGZ1 bmN0aW9uKGZyYW1lSWRlbnRpZmllciwgZm9yY2VTaG93VGFiKQogCiAgICAgdGhpcy5fZnJhbWVJ ZGVudGlmaWVyVG9TaG93U291cmNlQ29kZVdoZW5BdmFpbGFibGUgPSB1bmRlZmluZWQ7CiAKLSAg ICB0aGlzLnNob3dSZXByZXNlbnRlZE9iamVjdChmcmFtZSwgbnVsbCwgZm9yY2VTaG93VGFiKTsK KyAgICB0aGlzLnNob3dSZXByZXNlbnRlZE9iamVjdChmcmFtZSk7CiB9OwogCi1XZWJJbnNwZWN0 b3Iuc2hvd1NvdXJjZUNvZGUgPSBmdW5jdGlvbihzb3VyY2VDb2RlLCBwb3NpdGlvblRvUmV2ZWFs LCB0ZXh0UmFuZ2VUb1NlbGVjdCwgZm9yY2VVbmZvcm1hdHRlZCwgZm9yY2VTaG93VGFiKQorV2Vi SW5zcGVjdG9yLnNob3dTb3VyY2VDb2RlID0gZnVuY3Rpb24oc291cmNlQ29kZSwgcG9zaXRpb25U b1JldmVhbCwgdGV4dFJhbmdlVG9TZWxlY3QsIGZvcmNlVW5mb3JtYXR0ZWQpCiB7CiAgICAgY29u c29sZS5hc3NlcnQoIXBvc2l0aW9uVG9SZXZlYWwgfHwgcG9zaXRpb25Ub1JldmVhbCBpbnN0YW5j ZW9mIFdlYkluc3BlY3Rvci5Tb3VyY2VDb2RlUG9zaXRpb24sIHBvc2l0aW9uVG9SZXZlYWwpOwog ICAgIHZhciByZXByZXNlbnRlZE9iamVjdCA9IHNvdXJjZUNvZGU7CkBAIC05NzMsMzMgKzk3MSwz MyBAQCBXZWJJbnNwZWN0b3Iuc2hvd1NvdXJjZUNvZGUgPSBmdW5jdGlvbihzb3VyY2VDb2RlLCBw b3NpdGlvblRvUmV2ZWFsLCB0ZXh0UmFuZ2VUbwogICAgIH0KIAogICAgIHZhciBjb29raWUgPSBw b3NpdGlvblRvUmV2ZWFsID8ge2xpbmVOdW1iZXI6IHBvc2l0aW9uVG9SZXZlYWwubGluZU51bWJl ciwgY29sdW1uTnVtYmVyOiBwb3NpdGlvblRvUmV2ZWFsLmNvbHVtbk51bWJlcn0gOiB7fTsKLSAg ICB0aGlzLnNob3dSZXByZXNlbnRlZE9iamVjdChyZXByZXNlbnRlZE9iamVjdCwgY29va2llLCBm b3JjZVNob3dUYWIpOworICAgIHRoaXMuc2hvd1JlcHJlc2VudGVkT2JqZWN0KHJlcHJlc2VudGVk T2JqZWN0LCBjb29raWUpOwogfTsKIAotV2ViSW5zcGVjdG9yLnNob3dTb3VyY2VDb2RlTG9jYXRp b24gPSBmdW5jdGlvbihzb3VyY2VDb2RlTG9jYXRpb24sIGZvcmNlU2hvd1RhYikKK1dlYkluc3Bl Y3Rvci5zaG93U291cmNlQ29kZUxvY2F0aW9uID0gZnVuY3Rpb24oc291cmNlQ29kZUxvY2F0aW9u KQogewotICAgIHRoaXMuc2hvd1NvdXJjZUNvZGUoc291cmNlQ29kZUxvY2F0aW9uLmRpc3BsYXlT b3VyY2VDb2RlLCBzb3VyY2VDb2RlTG9jYXRpb24uZGlzcGxheVBvc2l0aW9uKCksIG51bGwsIGZh bHNlLCBmb3JjZVNob3dUYWIpOworICAgIHRoaXMuc2hvd1NvdXJjZUNvZGUoc291cmNlQ29kZUxv Y2F0aW9uLmRpc3BsYXlTb3VyY2VDb2RlLCBzb3VyY2VDb2RlTG9jYXRpb24uZGlzcGxheVBvc2l0 aW9uKCkpOwogfTsKIAotV2ViSW5zcGVjdG9yLnNob3dPcmlnaW5hbFVuZm9ybWF0dGVkU291cmNl Q29kZUxvY2F0aW9uID0gZnVuY3Rpb24oc291cmNlQ29kZUxvY2F0aW9uLCBmb3JjZVNob3dUYWIp CitXZWJJbnNwZWN0b3Iuc2hvd09yaWdpbmFsVW5mb3JtYXR0ZWRTb3VyY2VDb2RlTG9jYXRpb24g PSBmdW5jdGlvbihzb3VyY2VDb2RlTG9jYXRpb24pCiB7CiAgICAgdGhpcy5zaG93U291cmNlQ29k ZShzb3VyY2VDb2RlTG9jYXRpb24uc291cmNlQ29kZSwgc291cmNlQ29kZUxvY2F0aW9uLnBvc2l0 aW9uKCksIG51bGwsIHRydWUpOwogfTsKIAotV2ViSW5zcGVjdG9yLnNob3dPcmlnaW5hbE9yRm9y bWF0dGVkU291cmNlQ29kZUxvY2F0aW9uID0gZnVuY3Rpb24oc291cmNlQ29kZUxvY2F0aW9uLCBm b3JjZVNob3dUYWIpCitXZWJJbnNwZWN0b3Iuc2hvd09yaWdpbmFsT3JGb3JtYXR0ZWRTb3VyY2VD b2RlTG9jYXRpb24gPSBmdW5jdGlvbihzb3VyY2VDb2RlTG9jYXRpb24pCiB7Ci0gICAgdGhpcy5z aG93U291cmNlQ29kZShzb3VyY2VDb2RlTG9jYXRpb24uc291cmNlQ29kZSwgc291cmNlQ29kZUxv Y2F0aW9uLmZvcm1hdHRlZFBvc2l0aW9uKCksIG51bGwsIGZhbHNlLCBmb3JjZVNob3dUYWIpOwor ICAgIHRoaXMuc2hvd1NvdXJjZUNvZGUoc291cmNlQ29kZUxvY2F0aW9uLnNvdXJjZUNvZGUsIHNv dXJjZUNvZGVMb2NhdGlvbi5mb3JtYXR0ZWRQb3NpdGlvbigpKTsKIH07CiAKLVdlYkluc3BlY3Rv ci5zaG93T3JpZ2luYWxPckZvcm1hdHRlZFNvdXJjZUNvZGVUZXh0UmFuZ2UgPSBmdW5jdGlvbihz b3VyY2VDb2RlVGV4dFJhbmdlLCBmb3JjZVNob3dUYWIpCitXZWJJbnNwZWN0b3Iuc2hvd09yaWdp bmFsT3JGb3JtYXR0ZWRTb3VyY2VDb2RlVGV4dFJhbmdlID0gZnVuY3Rpb24oc291cmNlQ29kZVRl eHRSYW5nZSkKIHsKICAgICB2YXIgdGV4dFJhbmdlVG9TZWxlY3QgPSBzb3VyY2VDb2RlVGV4dFJh bmdlLmZvcm1hdHRlZFRleHRSYW5nZTsKLSAgICB0aGlzLnNob3dTb3VyY2VDb2RlKHNvdXJjZUNv ZGVUZXh0UmFuZ2Uuc291cmNlQ29kZSwgdGV4dFJhbmdlVG9TZWxlY3Quc3RhcnRQb3NpdGlvbigp LCB0ZXh0UmFuZ2VUb1NlbGVjdCwgZmFsc2UsIGZvcmNlU2hvd1RhYik7CisgICAgdGhpcy5zaG93 U291cmNlQ29kZShzb3VyY2VDb2RlVGV4dFJhbmdlLnNvdXJjZUNvZGUsIHRleHRSYW5nZVRvU2Vs ZWN0LnN0YXJ0UG9zaXRpb24oKSwgdGV4dFJhbmdlVG9TZWxlY3QpOwogfTsKIAotV2ViSW5zcGVj dG9yLnNob3dSZXNvdXJjZVJlcXVlc3QgPSBmdW5jdGlvbihyZXNvdXJjZSwgZm9yY2VTaG93VGFi KQorV2ViSW5zcGVjdG9yLnNob3dSZXNvdXJjZVJlcXVlc3QgPSBmdW5jdGlvbihyZXNvdXJjZSkK IHsKLSAgICB0aGlzLnNob3dSZXByZXNlbnRlZE9iamVjdChyZXNvdXJjZSwge1tXZWJJbnNwZWN0 b3IuUmVzb3VyY2VDbHVzdGVyQ29udGVudFZpZXcuQ29udGVudFZpZXdJZGVudGlmaWVyQ29va2ll S2V5XTogV2ViSW5zcGVjdG9yLlJlc291cmNlQ2x1c3RlckNvbnRlbnRWaWV3LlJlcXVlc3RJZGVu dGlmaWVyfSwgZm9yY2VTaG93VGFiKTsKKyAgICB0aGlzLnNob3dSZXByZXNlbnRlZE9iamVjdChy ZXNvdXJjZSwge1tXZWJJbnNwZWN0b3IuUmVzb3VyY2VDbHVzdGVyQ29udGVudFZpZXcuQ29udGVu dFZpZXdJZGVudGlmaWVyQ29va2llS2V5XTogV2ViSW5zcGVjdG9yLlJlc291cmNlQ2x1c3RlckNv bnRlbnRWaWV3LlJlcXVlc3RJZGVudGlmaWVyfSk7CiB9OwogCiBXZWJJbnNwZWN0b3IuZGVidWdn ZXJUb2dnbGVCcmVha3BvaW50cyA9IGZ1bmN0aW9uKGV2ZW50KQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ29kZU1pcnJvclRva2Vu VHJhY2tpbmdDb250cm9sbGVyLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvQ29udHJvbGxlcnMvQ29kZU1pcnJvclRva2VuVHJhY2tpbmdDb250cm9sbGVyLmpzCmluZGV4 IGE1YTk0MDM0ZjI3MDhiZTJkMDA3NDNjYzM0NDg3OGFlMzExNjdlMDYuLjc4ZDc2Y2VkOTIxZTIx NWI0YjNmOWU5YjVjOWFmZmI2ODJmNDAwMDQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NvZGVNaXJyb3JUb2tlblRyYWNraW5nQ29u dHJvbGxlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250 cm9sbGVycy9Db2RlTWlycm9yVG9rZW5UcmFja2luZ0NvbnRyb2xsZXIuanMKQEAgLTM1MSwxMCAr MzUxLDkgQEAgV2ViSW5zcGVjdG9yLkNvZGVNaXJyb3JUb2tlblRyYWNraW5nQ29udHJvbGxlciA9 IGNsYXNzIENvZGVNaXJyb3JUb2tlblRyYWNraW5nQ28KICAgICAgICAgICAgIHZhciBtYXJrcyA9 IHRoaXMuX2NvZGVNaXJyb3IuZmluZE1hcmtzQXQocG9zaXRpb24pOwogICAgICAgICAgICAgZm9y ICh2YXIgaSA9IDA7IGkgPCBtYXJrcy5sZW5ndGg7ICsraSkgewogICAgICAgICAgICAgICAgIGlm IChtYXJrc1tpXSA9PT0gdGhpcy5fY29kZU1pcnJvck1hcmtlZFRleHQpIHsKLSAgICAgICAgICAg ICAgICAgICAgaWYgKHRoaXMuX2RlbGVnYXRlICYmIHR5cGVvZiB0aGlzLl9kZWxlZ2F0ZS50b2tl blRyYWNraW5nQ29udHJvbGxlckhpZ2hsaWdodGVkUmFuZ2VXYXNDbGlja2VkID09PSAiZnVuY3Rp b24iKSB7Ci0gICAgICAgICAgICAgICAgICAgICAgICAvLyBUcmlnZ2VyIHRoZSBjbGlja2VkIGRl bGVnYXRlIGFzeW5jaHJvbm91c2x5LCBsZXR0aW5nIHRoZSBlZGl0b3IgY29tcGxldGUgaGFuZGxp bmcgb2YgdGhlIGNsaWNrLgotICAgICAgICAgICAgICAgICAgICAgICAgc2V0VGltZW91dChmdW5j dGlvbigpIHsgdGhpcy5fZGVsZWdhdGUudG9rZW5UcmFja2luZ0NvbnRyb2xsZXJIaWdobGlnaHRl ZFJhbmdlV2FzQ2xpY2tlZCh0aGlzKTsgfS5iaW5kKHRoaXMpLCAwKTsKLSAgICAgICAgICAgICAg ICAgICAgfQorICAgICAgICAgICAgICAgICAgICBpZiAodGhpcy5fZGVsZWdhdGUgJiYgdHlwZW9m IHRoaXMuX2RlbGVnYXRlLnRva2VuVHJhY2tpbmdDb250cm9sbGVySGlnaGxpZ2h0ZWRSYW5nZVdh c0NsaWNrZWQgPT09ICJmdW5jdGlvbiIpCisgICAgICAgICAgICAgICAgICAgICAgICB0aGlzLl9k ZWxlZ2F0ZS50b2tlblRyYWNraW5nQ29udHJvbGxlckhpZ2hsaWdodGVkUmFuZ2VXYXNDbGlja2Vk KHRoaXMpOworCiAgICAgICAgICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICAgICAgICAgIH0K ICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1Byb3RvY29sL0luc3BlY3RvckZyb250ZW5kQVBJLmpzIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvSW5zcGVjdG9yRnJvbnRlbmRBUEkuanMKaW5k ZXggNzI5NGFlNzI4NWFhOGVmZTFlYzc5YTkwZWFiNGYxMWUwOGEwNzhiZi4uNDM1YWVkMGNlNTlj Zjc2MTVlOWYwZGFiZTY4ZTdhZmUzMDM4MTg3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvSW5zcGVjdG9yRnJvbnRlbmRBUEkuanMKKysr IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvSW5zcGVjdG9y RnJvbnRlbmRBUEkuanMKQEAgLTkzLDcgKzkzLDcgQEAgSW5zcGVjdG9yRnJvbnRlbmRBUEkgPSB7 CiAKICAgICBzaG93TWFpblJlc291cmNlRm9yRnJhbWU6IGZ1bmN0aW9uKGZyYW1lSWRlbnRpZmll cikKICAgICB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5zaG93U291cmNlQ29kZUZvckZyYW1lKGZy YW1lSWRlbnRpZmllciwgdHJ1ZSk7CisgICAgICAgIFdlYkluc3BlY3Rvci5zaG93U291cmNlQ29k ZUZvckZyYW1lKGZyYW1lSWRlbnRpZmllcik7CiAgICAgfSwKIAogICAgIGNvbnRleHRNZW51SXRl bVNlbGVjdGVkOiBmdW5jdGlvbihpZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbXB1dGVkU3R5bGVEZXRhaWxzUGFuZWwuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Db21wdXRlZFN0eWxlRGV0YWls c1BhbmVsLmpzCmluZGV4IDI5MjU2NDViZjkzOWM3MmYwNDA3NzZiYTBmMDE1YWMxZTFjYjVjMjUu LmIyMGNlMWM1N2ZlNGEwM2E5MGMyMWUwZDMxOTk4ODVhZDRjMzI5MjQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0NvbXB1dGVkU3R5bGVEZXRh aWxzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvQ29tcHV0ZWRTdHlsZURldGFpbHNQYW5lbC5qcwpAQCAtMjI0LDcgKzIyNCw3IEBAIFdlYklu c3BlY3Rvci5Db21wdXRlZFN0eWxlRGV0YWlsc1BhbmVsID0gY2xhc3MgQ29tcHV0ZWRTdHlsZURl dGFpbHNQYW5lbCBleHRlbmRzCiAKICAgICBfZ29Ub0NvbnRlbnRGbG93QXJyb3dXYXNDbGlja2Vk KCkKICAgICB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5zaG93Q29udGVudEZsb3dET01UcmVlKHRo aXMuX2NvbnRlbnRGbG93LCB0aGlzLm5vZGVTdHlsZXMubm9kZSwgdHJ1ZSk7CisgICAgICAgIFdl Ykluc3BlY3Rvci5zaG93Q29udGVudEZsb3dET01UcmVlKHRoaXMuX2NvbnRlbnRGbG93LCB0aGlz Lm5vZGVTdHlsZXMubm9kZSk7CiAgICAgfQogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJlZUJhc2VUcmVlRWxlbWVudC5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFRyZWVC YXNlVHJlZUVsZW1lbnQuanMKaW5kZXggMTJmMTBiZDdlOWM1ZGMwMWNhNjNiZDM5MDQ5NTUyMDJl MjRlOGNmNC4uOGZmZGZjMTRiMWE2NTFmZDY0YzVhM2QyNDY3MGUwYjNkMWIxMWNlMSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvT2JqZWN0VHJl ZUJhc2VUcmVlRWxlbWVudC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9PYmplY3RUcmVlQmFzZVRyZWVFbGVtZW50LmpzCkBAIC0yMjMsNyArMjIzLDcg QEAgV2ViSW5zcGVjdG9yLk9iamVjdFRyZWVCYXNlVHJlZUVsZW1lbnQgPSBjbGFzcyBPYmplY3RU cmVlQmFzZVRyZWVFbGVtZW50IGV4dGVuZHMKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBy ZXR1cm47CiAKICAgICAgICAgICAgICAgICAgICAgICAgIHZhciBzb3VyY2VDb2RlTG9jYXRpb24g PSBzb3VyY2VDb2RlLmNyZWF0ZVNvdXJjZUNvZGVMb2NhdGlvbihsb2NhdGlvbi5saW5lTnVtYmVy LCBsb2NhdGlvbi5jb2x1bW5OdW1iZXIgfHwgMCk7Ci0gICAgICAgICAgICAgICAgICAgICAgICBX ZWJJbnNwZWN0b3Iuc2hvd1NvdXJjZUNvZGVMb2NhdGlvbihzb3VyY2VDb2RlTG9jYXRpb24sIHRy dWUpOworICAgICAgICAgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnNob3dTb3VyY2VDb2Rl TG9jYXRpb24oc291cmNlQ29kZUxvY2F0aW9uKTsKICAgICAgICAgICAgICAgICAgICAgfSk7CiAg ICAgICAgICAgICAgICAgfSk7CiAgICAgICAgICAgICB9Cg== 256290 2015-07-07 01:21:10 -0700 2015-07-07 10:26:52 -0700 Patch bug-146498-20150707012013.patch text/plain 12309 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGU3OTE3ZmI1YTc4MWExMDUxZmY0ZTdmZjY5ZGJj YWViN2M5Njc4ZWEuLjk1ODBhNmM0OTI0NTc3OTFmZTFmZTI0NmRmNDMzMjcxOTVkMTM4YzkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dl Ykluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM1IEBACisyMDE1LTA3LTA3ICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBP cHRpb24rQ2xpY2sgbm90IGp1bXBpbmcgdG8gcmVzb3VyY2UKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjQ5OAorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL01haW4uanM6 IEFsd2F5cyBzaG93IHRoZSB0YWIgd2hpY2ggY29udGFpbnMgdGhlIHJlcHJlc2VudGVkIG9iamVj dC4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5fZG9tTm9kZVdhc0luc3BlY3RlZCk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuX2ZyYW1lV2FzQWRkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLnNo b3dDb25zb2xlVGFiKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5zaG93UmVwcmVzZW50ZWRPYmpl Y3QpOiBSZW1vdmVkIGZvcmNlU2hvd1RhYiBwYXJhbWV0ZXIuCisgICAgICAgIChXZWJJbnNwZWN0 b3Iuc2hvd01haW5GcmFtZURPTVRyZWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLnNob3dDb250 ZW50Rmxvd0RPTVRyZWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLnNob3dTb3VyY2VDb2RlRm9y RnJhbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLnNob3dTb3VyY2VDb2RlKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5zaG93U291cmNlQ29kZUxvY2F0aW9uKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5zaG93T3JpZ2luYWxVbmZvcm1hdHRlZFNvdXJjZUNvZGVMb2NhdGlvbik6CisgICAgICAg IChXZWJJbnNwZWN0b3Iuc2hvd09yaWdpbmFsT3JGb3JtYXR0ZWRTb3VyY2VDb2RlTG9jYXRpb24p OgorICAgICAgICAoV2ViSW5zcGVjdG9yLnNob3dPcmlnaW5hbE9yRm9ybWF0dGVkU291cmNlQ29k ZVRleHRSYW5nZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iuc2hvd1Jlc291cmNlUmVxdWVzdCk6 CisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVycy9Db2RlTWlycm9yVG9rZW5UcmFj a2luZ0NvbnRyb2xsZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29kZU1pcnJvclRva2Vu VHJhY2tpbmdDb250cm9sbGVyLnByb3RvdHlwZS5fbW91c2VCdXR0b25XYXNSZWxlYXNlZE92ZXJF ZGl0b3IpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvUHJvdG9jb2wvSW5zcGVjdG9yRnJvbnRl bmRBUEkuanM6CisgICAgICAgIChJbnNwZWN0b3JGcm9udGVuZEFQSS5zaG93TWFpblJlc291cmNl Rm9yRnJhbWUpOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvVmlld3MvQ29tcHV0ZWRTdHlsZURl dGFpbHNQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db21wdXRlZFN0eWxlRGV0YWls c1BhbmVsLnByb3RvdHlwZS5fZ29Ub0NvbnRlbnRGbG93QXJyb3dXYXNDbGlja2VkKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5Db21wdXRlZFN0eWxlRGV0YWlsc1BhbmVsKToKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFRyZWVCYXNlVHJlZUVsZW1lbnQuanM6CisgICAgICAg IChXZWJJbnNwZWN0b3IuT2JqZWN0VHJlZUJhc2VUcmVlRWxlbWVudC5wcm90b3R5cGUuX2FwcGVu ZE1lbnVzSXRlbXNGb3JPYmplY3QpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLk9iamVjdFRyZWVC YXNlVHJlZUVsZW1lbnQpOgorCiAyMDE1LTA3LTA2ICBNYXR0IEJha2VyICA8bWF0dGJha2VyQGFw cGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBSZW5kZXJpbmcgRnJhbWUgYmFycyBh cHBlYXIgbWlzYWxpZ25lZCBhbmQgY29udGFpbiBnYXBzIHdoZW4gZGlzcGxheWluZyBzbWFsbCB0 YXNrIHNlZ21lbnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9CYXNlL01haW4uanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9C YXNlL01haW4uanMKaW5kZXggNTlhZmE5ODIyNmZmN2Q4YjU0MTg4OWRmZTVlOTI3NjA4ZWVkZTI0 NS4uZmEzODkzYWY3MTllY2VkMWIwNzhlMWZlZWZlM2VmN2YwNzdlMmZlYSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NYWluLmpzCisrKyBiL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTWFpbi5qcwpAQCAtNzYxLDcg Kzc2MSw3IEBAIFdlYkluc3BlY3Rvci5zaG93Q29uc29sZVRhYiA9IGZ1bmN0aW9uKHJlcXVlc3Rl ZFNjb3BlKQogICAgIGlmIChyZXF1ZXN0ZWRTY29wZSB8fCAhdGhpcy5jb25zb2xlQ29udGVudFZp ZXcuc2NvcGVCYXIuc2VsZWN0ZWRJdGVtcy5sZW5ndGgpCiAgICAgICAgIHRoaXMuY29uc29sZUNv bnRlbnRWaWV3LnNjb3BlQmFyLml0ZW0oc2NvcGUpLnNlbGVjdGVkID0gdHJ1ZTsKIAotICAgIHRo aXMuc2hvd1JlcHJlc2VudGVkT2JqZWN0KHRoaXMuX2NvbnNvbGVSZXByZXNlbnRlZE9iamVjdCwg bnVsbCwgdHJ1ZSk7CisgICAgdGhpcy5zaG93UmVwcmVzZW50ZWRPYmplY3QodGhpcy5fY29uc29s ZVJlcHJlc2VudGVkT2JqZWN0KTsKIAogICAgIGNvbnNvbGUuYXNzZXJ0KHRoaXMuaXNTaG93aW5n Q29uc29sZVRhYigpKTsKIH07CkBAIC05MjMsMzMgKzkyMywzMSBAQCBXZWJJbnNwZWN0b3IudGFi Q29udGVudFZpZXdGb3JSZXByZXNlbnRlZE9iamVjdCA9IGZ1bmN0aW9uKHJlcHJlc2VudGVkT2Jq ZWN0KQogICAgIHJldHVybiB0YWJDb250ZW50VmlldzsKIH07CiAKLVdlYkluc3BlY3Rvci5zaG93 UmVwcmVzZW50ZWRPYmplY3QgPSBmdW5jdGlvbihyZXByZXNlbnRlZE9iamVjdCwgY29va2llLCBm b3JjZVNob3dUYWIpCitXZWJJbnNwZWN0b3Iuc2hvd1JlcHJlc2VudGVkT2JqZWN0ID0gZnVuY3Rp b24ocmVwcmVzZW50ZWRPYmplY3QsIGNvb2tpZSkKIHsKICAgICB2YXIgdGFiQ29udGVudFZpZXcg PSB0aGlzLnRhYkNvbnRlbnRWaWV3Rm9yUmVwcmVzZW50ZWRPYmplY3QocmVwcmVzZW50ZWRPYmpl Y3QpOwogICAgIGNvbnNvbGUuYXNzZXJ0KHRhYkNvbnRlbnRWaWV3KTsKICAgICBpZiAoIXRhYkNv bnRlbnRWaWV3KQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAod2luZG93LmV2ZW50IHx8IGZv cmNlU2hvd1RhYikKLSAgICAgICAgdGhpcy50YWJCcm93c2VyLnNob3dUYWJGb3JDb250ZW50Vmll dyh0YWJDb250ZW50Vmlldyk7Ci0KKyAgICB0aGlzLnRhYkJyb3dzZXIuc2hvd1RhYkZvckNvbnRl bnRWaWV3KHRhYkNvbnRlbnRWaWV3KTsKICAgICB0YWJDb250ZW50Vmlldy5zaG93UmVwcmVzZW50 ZWRPYmplY3QocmVwcmVzZW50ZWRPYmplY3QsIGNvb2tpZSk7CiB9OwogCi1XZWJJbnNwZWN0b3Iu c2hvd01haW5GcmFtZURPTVRyZWUgPSBmdW5jdGlvbihub2RlVG9TZWxlY3QsIGZvcmNlU2hvd1Rh YikKK1dlYkluc3BlY3Rvci5zaG93TWFpbkZyYW1lRE9NVHJlZSA9IGZ1bmN0aW9uKG5vZGVUb1Nl bGVjdCkKIHsKICAgICBjb25zb2xlLmFzc2VydChXZWJJbnNwZWN0b3IuZnJhbWVSZXNvdXJjZU1h bmFnZXIubWFpbkZyYW1lKTsKICAgICBpZiAoIVdlYkluc3BlY3Rvci5mcmFtZVJlc291cmNlTWFu YWdlci5tYWluRnJhbWUpCiAgICAgICAgIHJldHVybjsKLSAgICB0aGlzLnNob3dSZXByZXNlbnRl ZE9iamVjdChXZWJJbnNwZWN0b3IuZnJhbWVSZXNvdXJjZU1hbmFnZXIubWFpbkZyYW1lLmRvbVRy ZWUsIHtub2RlVG9TZWxlY3R9LCBmb3JjZVNob3dUYWIpOworICAgIHRoaXMuc2hvd1JlcHJlc2Vu dGVkT2JqZWN0KFdlYkluc3BlY3Rvci5mcmFtZVJlc291cmNlTWFuYWdlci5tYWluRnJhbWUuZG9t VHJlZSwge25vZGVUb1NlbGVjdH0pOwogfTsKIAotV2ViSW5zcGVjdG9yLnNob3dDb250ZW50Rmxv d0RPTVRyZWUgPSBmdW5jdGlvbihjb250ZW50Rmxvdywgbm9kZVRvU2VsZWN0LCBmb3JjZVNob3dU YWIpCitXZWJJbnNwZWN0b3Iuc2hvd0NvbnRlbnRGbG93RE9NVHJlZSA9IGZ1bmN0aW9uKGNvbnRl bnRGbG93LCBub2RlVG9TZWxlY3QpCiB7Ci0gICAgdGhpcy5zaG93UmVwcmVzZW50ZWRPYmplY3Qo Y29udGVudEZsb3csIHtub2RlVG9TZWxlY3R9LCBmb3JjZVNob3dUYWIpOworICAgIHRoaXMuc2hv d1JlcHJlc2VudGVkT2JqZWN0KGNvbnRlbnRGbG93LCB7bm9kZVRvU2VsZWN0fSk7CiB9OwogCi1X ZWJJbnNwZWN0b3Iuc2hvd1NvdXJjZUNvZGVGb3JGcmFtZSA9IGZ1bmN0aW9uKGZyYW1lSWRlbnRp ZmllciwgZm9yY2VTaG93VGFiKQorV2ViSW5zcGVjdG9yLnNob3dTb3VyY2VDb2RlRm9yRnJhbWUg PSBmdW5jdGlvbihmcmFtZUlkZW50aWZpZXIpCiB7CiAgICAgdmFyIGZyYW1lID0gV2ViSW5zcGVj dG9yLmZyYW1lUmVzb3VyY2VNYW5hZ2VyLmZyYW1lRm9ySWRlbnRpZmllcihmcmFtZUlkZW50aWZp ZXIpOwogICAgIGlmICghZnJhbWUpIHsKQEAgLTk1OSwxMCArOTU3LDEwIEBAIFdlYkluc3BlY3Rv ci5zaG93U291cmNlQ29kZUZvckZyYW1lID0gZnVuY3Rpb24oZnJhbWVJZGVudGlmaWVyLCBmb3Jj ZVNob3dUYWIpCiAKICAgICB0aGlzLl9mcmFtZUlkZW50aWZpZXJUb1Nob3dTb3VyY2VDb2RlV2hl bkF2YWlsYWJsZSA9IHVuZGVmaW5lZDsKIAotICAgIHRoaXMuc2hvd1JlcHJlc2VudGVkT2JqZWN0 KGZyYW1lLCBudWxsLCBmb3JjZVNob3dUYWIpOworICAgIHRoaXMuc2hvd1JlcHJlc2VudGVkT2Jq ZWN0KGZyYW1lKTsKIH07CiAKLVdlYkluc3BlY3Rvci5zaG93U291cmNlQ29kZSA9IGZ1bmN0aW9u KHNvdXJjZUNvZGUsIHBvc2l0aW9uVG9SZXZlYWwsIHRleHRSYW5nZVRvU2VsZWN0LCBmb3JjZVVu Zm9ybWF0dGVkLCBmb3JjZVNob3dUYWIpCitXZWJJbnNwZWN0b3Iuc2hvd1NvdXJjZUNvZGUgPSBm dW5jdGlvbihzb3VyY2VDb2RlLCBwb3NpdGlvblRvUmV2ZWFsLCB0ZXh0UmFuZ2VUb1NlbGVjdCwg Zm9yY2VVbmZvcm1hdHRlZCkKIHsKICAgICBjb25zb2xlLmFzc2VydCghcG9zaXRpb25Ub1JldmVh bCB8fCBwb3NpdGlvblRvUmV2ZWFsIGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlNvdXJjZUNvZGVQ b3NpdGlvbiwgcG9zaXRpb25Ub1JldmVhbCk7CiAgICAgdmFyIHJlcHJlc2VudGVkT2JqZWN0ID0g c291cmNlQ29kZTsKQEAgLTk3MywzMyArOTcxLDMzIEBAIFdlYkluc3BlY3Rvci5zaG93U291cmNl Q29kZSA9IGZ1bmN0aW9uKHNvdXJjZUNvZGUsIHBvc2l0aW9uVG9SZXZlYWwsIHRleHRSYW5nZVRv CiAgICAgfQogCiAgICAgdmFyIGNvb2tpZSA9IHBvc2l0aW9uVG9SZXZlYWwgPyB7bGluZU51bWJl cjogcG9zaXRpb25Ub1JldmVhbC5saW5lTnVtYmVyLCBjb2x1bW5OdW1iZXI6IHBvc2l0aW9uVG9S ZXZlYWwuY29sdW1uTnVtYmVyfSA6IHt9OwotICAgIHRoaXMuc2hvd1JlcHJlc2VudGVkT2JqZWN0 KHJlcHJlc2VudGVkT2JqZWN0LCBjb29raWUsIGZvcmNlU2hvd1RhYik7CisgICAgdGhpcy5zaG93 UmVwcmVzZW50ZWRPYmplY3QocmVwcmVzZW50ZWRPYmplY3QsIGNvb2tpZSk7CiB9OwogCi1XZWJJ bnNwZWN0b3Iuc2hvd1NvdXJjZUNvZGVMb2NhdGlvbiA9IGZ1bmN0aW9uKHNvdXJjZUNvZGVMb2Nh dGlvbiwgZm9yY2VTaG93VGFiKQorV2ViSW5zcGVjdG9yLnNob3dTb3VyY2VDb2RlTG9jYXRpb24g PSBmdW5jdGlvbihzb3VyY2VDb2RlTG9jYXRpb24pCiB7Ci0gICAgdGhpcy5zaG93U291cmNlQ29k ZShzb3VyY2VDb2RlTG9jYXRpb24uZGlzcGxheVNvdXJjZUNvZGUsIHNvdXJjZUNvZGVMb2NhdGlv bi5kaXNwbGF5UG9zaXRpb24oKSwgbnVsbCwgZmFsc2UsIGZvcmNlU2hvd1RhYik7CisgICAgdGhp cy5zaG93U291cmNlQ29kZShzb3VyY2VDb2RlTG9jYXRpb24uZGlzcGxheVNvdXJjZUNvZGUsIHNv dXJjZUNvZGVMb2NhdGlvbi5kaXNwbGF5UG9zaXRpb24oKSk7CiB9OwogCi1XZWJJbnNwZWN0b3Iu c2hvd09yaWdpbmFsVW5mb3JtYXR0ZWRTb3VyY2VDb2RlTG9jYXRpb24gPSBmdW5jdGlvbihzb3Vy Y2VDb2RlTG9jYXRpb24sIGZvcmNlU2hvd1RhYikKK1dlYkluc3BlY3Rvci5zaG93T3JpZ2luYWxV bmZvcm1hdHRlZFNvdXJjZUNvZGVMb2NhdGlvbiA9IGZ1bmN0aW9uKHNvdXJjZUNvZGVMb2NhdGlv bikKIHsKICAgICB0aGlzLnNob3dTb3VyY2VDb2RlKHNvdXJjZUNvZGVMb2NhdGlvbi5zb3VyY2VD b2RlLCBzb3VyY2VDb2RlTG9jYXRpb24ucG9zaXRpb24oKSwgbnVsbCwgdHJ1ZSk7CiB9OwogCi1X ZWJJbnNwZWN0b3Iuc2hvd09yaWdpbmFsT3JGb3JtYXR0ZWRTb3VyY2VDb2RlTG9jYXRpb24gPSBm dW5jdGlvbihzb3VyY2VDb2RlTG9jYXRpb24sIGZvcmNlU2hvd1RhYikKK1dlYkluc3BlY3Rvci5z aG93T3JpZ2luYWxPckZvcm1hdHRlZFNvdXJjZUNvZGVMb2NhdGlvbiA9IGZ1bmN0aW9uKHNvdXJj ZUNvZGVMb2NhdGlvbikKIHsKLSAgICB0aGlzLnNob3dTb3VyY2VDb2RlKHNvdXJjZUNvZGVMb2Nh dGlvbi5zb3VyY2VDb2RlLCBzb3VyY2VDb2RlTG9jYXRpb24uZm9ybWF0dGVkUG9zaXRpb24oKSwg bnVsbCwgZmFsc2UsIGZvcmNlU2hvd1RhYik7CisgICAgdGhpcy5zaG93U291cmNlQ29kZShzb3Vy Y2VDb2RlTG9jYXRpb24uc291cmNlQ29kZSwgc291cmNlQ29kZUxvY2F0aW9uLmZvcm1hdHRlZFBv c2l0aW9uKCkpOwogfTsKIAotV2ViSW5zcGVjdG9yLnNob3dPcmlnaW5hbE9yRm9ybWF0dGVkU291 cmNlQ29kZVRleHRSYW5nZSA9IGZ1bmN0aW9uKHNvdXJjZUNvZGVUZXh0UmFuZ2UsIGZvcmNlU2hv d1RhYikKK1dlYkluc3BlY3Rvci5zaG93T3JpZ2luYWxPckZvcm1hdHRlZFNvdXJjZUNvZGVUZXh0 UmFuZ2UgPSBmdW5jdGlvbihzb3VyY2VDb2RlVGV4dFJhbmdlKQogewogICAgIHZhciB0ZXh0UmFu Z2VUb1NlbGVjdCA9IHNvdXJjZUNvZGVUZXh0UmFuZ2UuZm9ybWF0dGVkVGV4dFJhbmdlOwotICAg IHRoaXMuc2hvd1NvdXJjZUNvZGUoc291cmNlQ29kZVRleHRSYW5nZS5zb3VyY2VDb2RlLCB0ZXh0 UmFuZ2VUb1NlbGVjdC5zdGFydFBvc2l0aW9uKCksIHRleHRSYW5nZVRvU2VsZWN0LCBmYWxzZSwg Zm9yY2VTaG93VGFiKTsKKyAgICB0aGlzLnNob3dTb3VyY2VDb2RlKHNvdXJjZUNvZGVUZXh0UmFu Z2Uuc291cmNlQ29kZSwgdGV4dFJhbmdlVG9TZWxlY3Quc3RhcnRQb3NpdGlvbigpLCB0ZXh0UmFu Z2VUb1NlbGVjdCk7CiB9OwogCi1XZWJJbnNwZWN0b3Iuc2hvd1Jlc291cmNlUmVxdWVzdCA9IGZ1 bmN0aW9uKHJlc291cmNlLCBmb3JjZVNob3dUYWIpCitXZWJJbnNwZWN0b3Iuc2hvd1Jlc291cmNl UmVxdWVzdCA9IGZ1bmN0aW9uKHJlc291cmNlKQogewotICAgIHRoaXMuc2hvd1JlcHJlc2VudGVk T2JqZWN0KHJlc291cmNlLCB7W1dlYkluc3BlY3Rvci5SZXNvdXJjZUNsdXN0ZXJDb250ZW50Vmll dy5Db250ZW50Vmlld0lkZW50aWZpZXJDb29raWVLZXldOiBXZWJJbnNwZWN0b3IuUmVzb3VyY2VD bHVzdGVyQ29udGVudFZpZXcuUmVxdWVzdElkZW50aWZpZXJ9LCBmb3JjZVNob3dUYWIpOworICAg IHRoaXMuc2hvd1JlcHJlc2VudGVkT2JqZWN0KHJlc291cmNlLCB7W1dlYkluc3BlY3Rvci5SZXNv dXJjZUNsdXN0ZXJDb250ZW50Vmlldy5Db250ZW50Vmlld0lkZW50aWZpZXJDb29raWVLZXldOiBX ZWJJbnNwZWN0b3IuUmVzb3VyY2VDbHVzdGVyQ29udGVudFZpZXcuUmVxdWVzdElkZW50aWZpZXJ9 KTsKIH07CiAKIFdlYkluc3BlY3Rvci5kZWJ1Z2dlclRvZ2dsZUJyZWFrcG9pbnRzID0gZnVuY3Rp b24oZXZlbnQpCkBAIC0xMTM1LDcgKzExMzMsNyBAQCBXZWJJbnNwZWN0b3IuX2ZyYW1lV2FzQWRk ZWQgPSBmdW5jdGlvbihldmVudCkKIAogICAgIGZ1bmN0aW9uIGRlbGF5ZWRXb3JrKCkKICAgICB7 Ci0gICAgICAgIHRoaXMuc2hvd1NvdXJjZUNvZGVGb3JGcmFtZShmcmFtZS5pZCwgdHJ1ZSk7Cisg ICAgICAgIHRoaXMuc2hvd1NvdXJjZUNvZGVGb3JGcmFtZShmcmFtZS5pZCk7CiAgICAgfQogCiAg ICAgLy8gRGVsYXkgc2hvd2luZyB0aGUgZnJhbWUgc2luY2UgRnJhbWVXYXNBZGRlZCBpcyBjYWxs ZWQgYmVmb3JlIE1haW5GcmFtZUNoYW5nZWQuCkBAIC0xNTMyLDcgKzE1MzAsNyBAQCBXZWJJbnNw ZWN0b3IuX2RvbU5vZGVXYXNJbnNwZWN0ZWQgPSBmdW5jdGlvbihldmVudCkKICAgICBJbnNwZWN0 b3JGcm9udGVuZEhvc3QuYnJpbmdUb0Zyb250KCk7CiAKICAgICB0aGlzLnNob3dFbGVtZW50c1Rh YigpOwotICAgIHRoaXMuc2hvd01haW5GcmFtZURPTVRyZWUoZXZlbnQuZGF0YS5ub2RlLCB0cnVl KTsKKyAgICB0aGlzLnNob3dNYWluRnJhbWVET01UcmVlKGV2ZW50LmRhdGEubm9kZSk7CiB9Owog CiBXZWJJbnNwZWN0b3IuX2luc3BlY3RNb2RlU3RhdGVDaGFuZ2VkID0gZnVuY3Rpb24oZXZlbnQp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9s bGVycy9Db2RlTWlycm9yVG9rZW5UcmFja2luZ0NvbnRyb2xsZXIuanMgYi9Tb3VyY2UvV2ViSW5z cGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9Db2RlTWlycm9yVG9rZW5UcmFja2lu Z0NvbnRyb2xsZXIuanMKaW5kZXggYTVhOTQwMzRmMjcwOGJlMmQwMDc0M2NjMzQ0ODc4YWUzMTE2 N2UwNi4uNzhkNzZjZWQ5MjFlMjE1YjRiM2Y5ZTliNWM5YWZmYjY4MmY0MDAwNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvQ29kZU1p cnJvclRva2VuVHJhY2tpbmdDb250cm9sbGVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0NvZGVNaXJyb3JUb2tlblRyYWNraW5nQ29udHJv bGxlci5qcwpAQCAtMzUxLDEwICszNTEsOSBAQCBXZWJJbnNwZWN0b3IuQ29kZU1pcnJvclRva2Vu VHJhY2tpbmdDb250cm9sbGVyID0gY2xhc3MgQ29kZU1pcnJvclRva2VuVHJhY2tpbmdDbwogICAg ICAgICAgICAgdmFyIG1hcmtzID0gdGhpcy5fY29kZU1pcnJvci5maW5kTWFya3NBdChwb3NpdGlv bik7CiAgICAgICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IG1hcmtzLmxlbmd0aDsgKytpKSB7 CiAgICAgICAgICAgICAgICAgaWYgKG1hcmtzW2ldID09PSB0aGlzLl9jb2RlTWlycm9yTWFya2Vk VGV4dCkgewotICAgICAgICAgICAgICAgICAgICBpZiAodGhpcy5fZGVsZWdhdGUgJiYgdHlwZW9m IHRoaXMuX2RlbGVnYXRlLnRva2VuVHJhY2tpbmdDb250cm9sbGVySGlnaGxpZ2h0ZWRSYW5nZVdh c0NsaWNrZWQgPT09ICJmdW5jdGlvbiIpIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIC8vIFRy aWdnZXIgdGhlIGNsaWNrZWQgZGVsZWdhdGUgYXN5bmNocm9ub3VzbHksIGxldHRpbmcgdGhlIGVk aXRvciBjb21wbGV0ZSBoYW5kbGluZyBvZiB0aGUgY2xpY2suCi0gICAgICAgICAgICAgICAgICAg ICAgICBzZXRUaW1lb3V0KGZ1bmN0aW9uKCkgeyB0aGlzLl9kZWxlZ2F0ZS50b2tlblRyYWNraW5n Q29udHJvbGxlckhpZ2hsaWdodGVkUmFuZ2VXYXNDbGlja2VkKHRoaXMpOyB9LmJpbmQodGhpcyks IDApOwotICAgICAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgICAgICAgIGlmICh0aGlz Ll9kZWxlZ2F0ZSAmJiB0eXBlb2YgdGhpcy5fZGVsZWdhdGUudG9rZW5UcmFja2luZ0NvbnRyb2xs ZXJIaWdobGlnaHRlZFJhbmdlV2FzQ2xpY2tlZCA9PT0gImZ1bmN0aW9uIikKKyAgICAgICAgICAg ICAgICAgICAgICAgIHRoaXMuX2RlbGVnYXRlLnRva2VuVHJhY2tpbmdDb250cm9sbGVySGlnaGxp Z2h0ZWRSYW5nZVdhc0NsaWNrZWQodGhpcyk7CisKICAgICAgICAgICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl Ykluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvSW5zcGVjdG9yRnJvbnRlbmRBUEku anMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9JbnNwZWN0 b3JGcm9udGVuZEFQSS5qcwppbmRleCA3Mjk0YWU3Mjg1YWE4ZWZlMWVjNzlhOTBlYWI0ZjExZTA4 YTA3OGJmLi40MzVhZWQwY2U1OWNmNzYxNWU5ZjBkYWJlNjhlN2FmZTMwMzgxODdlIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9JbnNwZWN0 b3JGcm9udGVuZEFQSS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Qcm90b2NvbC9JbnNwZWN0b3JGcm9udGVuZEFQSS5qcwpAQCAtOTMsNyArOTMsNyBAQCBJbnNw ZWN0b3JGcm9udGVuZEFQSSA9IHsKIAogICAgIHNob3dNYWluUmVzb3VyY2VGb3JGcmFtZTogZnVu Y3Rpb24oZnJhbWVJZGVudGlmaWVyKQogICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLnNob3dT b3VyY2VDb2RlRm9yRnJhbWUoZnJhbWVJZGVudGlmaWVyLCB0cnVlKTsKKyAgICAgICAgV2ViSW5z cGVjdG9yLnNob3dTb3VyY2VDb2RlRm9yRnJhbWUoZnJhbWVJZGVudGlmaWVyKTsKICAgICB9LAog CiAgICAgY29udGV4dE1lbnVJdGVtU2VsZWN0ZWQ6IGZ1bmN0aW9uKGlkKQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvQ29tcHV0ZWRTdHlsZURl dGFpbHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdz L0NvbXB1dGVkU3R5bGVEZXRhaWxzUGFuZWwuanMKaW5kZXggMjkyNTY0NWJmOTM5YzcyZjA0MDc3 NmJhMGYwMTVhYzFlMWNiNWMyNS4uYjIwY2UxYzU3ZmU0YTAzYTkwYzIxZTBkMzE5OTg4NWFkNGMz MjkyNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmll d3MvQ29tcHV0ZWRTdHlsZURldGFpbHNQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvVXNlckludGVyZmFjZS9WaWV3cy9Db21wdXRlZFN0eWxlRGV0YWlsc1BhbmVsLmpzCkBAIC0y MjQsNyArMjI0LDcgQEAgV2ViSW5zcGVjdG9yLkNvbXB1dGVkU3R5bGVEZXRhaWxzUGFuZWwgPSBj bGFzcyBDb21wdXRlZFN0eWxlRGV0YWlsc1BhbmVsIGV4dGVuZHMKIAogICAgIF9nb1RvQ29udGVu dEZsb3dBcnJvd1dhc0NsaWNrZWQoKQogICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLnNob3dD b250ZW50Rmxvd0RPTVRyZWUodGhpcy5fY29udGVudEZsb3csIHRoaXMubm9kZVN0eWxlcy5ub2Rl LCB0cnVlKTsKKyAgICAgICAgV2ViSW5zcGVjdG9yLnNob3dDb250ZW50Rmxvd0RPTVRyZWUodGhp cy5fY29udGVudEZsb3csIHRoaXMubm9kZVN0eWxlcy5ub2RlKTsKICAgICB9CiB9OwogCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9PYmplY3RU cmVlQmFzZVRyZWVFbGVtZW50LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZh Y2UvVmlld3MvT2JqZWN0VHJlZUJhc2VUcmVlRWxlbWVudC5qcwppbmRleCAxMmYxMGJkN2U5YzVk YzAxY2E2M2JkMzkwNDk1NTIwMmUyNGU4Y2Y0Li44ZmZkZmMxNGIxYTY1MWZkNjRjNWEzZDI0Njcw ZTBiM2QxYjExY2UxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9WaWV3cy9PYmplY3RUcmVlQmFzZVRyZWVFbGVtZW50LmpzCisrKyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL09iamVjdFRyZWVCYXNlVHJlZUVsZW1lbnQu anMKQEAgLTIyMyw3ICsyMjMsNyBAQCBXZWJJbnNwZWN0b3IuT2JqZWN0VHJlZUJhc2VUcmVlRWxl bWVudCA9IGNsYXNzIE9iamVjdFRyZWVCYXNlVHJlZUVsZW1lbnQgZXh0ZW5kcwogICAgICAgICAg ICAgICAgICAgICAgICAgICAgIHJldHVybjsKIAogICAgICAgICAgICAgICAgICAgICAgICAgdmFy IHNvdXJjZUNvZGVMb2NhdGlvbiA9IHNvdXJjZUNvZGUuY3JlYXRlU291cmNlQ29kZUxvY2F0aW9u KGxvY2F0aW9uLmxpbmVOdW1iZXIsIGxvY2F0aW9uLmNvbHVtbk51bWJlciB8fCAwKTsKLSAgICAg ICAgICAgICAgICAgICAgICAgIFdlYkluc3BlY3Rvci5zaG93U291cmNlQ29kZUxvY2F0aW9uKHNv dXJjZUNvZGVMb2NhdGlvbiwgdHJ1ZSk7CisgICAgICAgICAgICAgICAgICAgICAgICBXZWJJbnNw ZWN0b3Iuc2hvd1NvdXJjZUNvZGVMb2NhdGlvbihzb3VyY2VDb2RlTG9jYXRpb24pOwogICAgICAg ICAgICAgICAgICAgICB9KTsKICAgICAgICAgICAgICAgICB9KTsKICAgICAgICAgICAgIH0K