144415 2015-04-29 15:40:49 -0700 Web Inspector: Remove FrameContentView.js 2015-05-01 07:25:53 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED DoNotImportToRadar P2 Normal --- 1 timothy timothy agomez commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1090183 0 timothy 2015-04-29 15:40:49 -0700 We don't use FrameContentView.js anymore. 1090184 1 251996 timothy 2015-04-29 15:42:32 -0700 Created attachment 251996 Patch 1090415 2 251996 agomez 2015-04-30 04:27:06 -0700 Comment on attachment 251996 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=251996&action=review > Source/WebInspectorUI/ChangeLog:9 > + * UserInterface/Images/SourceCode.svg: Removed. Could you also remove these SVG images in the gtk subdir? 1090526 3 251996 joepeck 2015-04-30 12:09:50 -0700 Comment on attachment 251996 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=251996&action=review r=me, Might still be able to remove the GTK images. > Source/WebInspectorUI/ChangeLog:19 > + * UserInterface/Views/ResourceSidebarPanel.js: > + (WebInspector.ResourceSidebarPanel.prototype._mainFrameMainResourceDidChange.delayedWork): > + (WebInspector.ResourceSidebarPanel.prototype._mainFrameMainResourceDidChange): > + Simplify the code here. We don't need these checks now with tabs and the Storage tab. Could be its own change. 1090773 4 251996 timothy 2015-05-01 07:25:47 -0700 Comment on attachment 251996 Patch https://trac.webkit.org/r183671 251996 2015-04-29 15:42:32 -0700 2015-05-01 07:25:47 -0700 Patch bug-144415-20150429154121.patch text/plain 15887 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTgzNTgwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBh Y2U3ZGFkMDgwMjM5ZDMzYzQ2YWExYmU5ZmJjNDVhNzFiYTdjNDRhLi4wYTk0N2RiNWI2ZWIzZWU1 NDFjZmE5ZDBiNWNjNzI1M2RjZTdjNTIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSwyNSBAQAogMjAxNS0wNC0yOSAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogUmVtb3ZlIEZyYW1lQ29udGVudFZpZXcuanMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NDQxNQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVXNlcklu dGVyZmFjZS9JbWFnZXMvRE9NVHJlZS5zdmc6IFJlbW92ZWQuCisgICAgICAgICogVXNlckludGVy ZmFjZS9JbWFnZXMvU291cmNlQ29kZS5zdmc6IFJlbW92ZWQuCisgICAgICAgICogVXNlckludGVy ZmFjZS9NYWluLmh0bWw6IFJlbW92ZWQgRnJhbWVDb250ZW50Vmlldy5qcy4KKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1ZpZXdzL0ZyYW1lQ29udGVudFZpZXcuanM6IFJlbW92ZWQuCisgICAgICAg ICogVXNlckludGVyZmFjZS9WaWV3cy9QYXRoQ29tcG9uZW50SWNvbnMuY3NzOgorICAgICAgICAo LnNvdXJjZS1jb2RlLWljb24gLmljb24pOiBEZWxldGVkLgorICAgICAgICAoLmRvbS10cmVlLWlj b24gLmljb24pOiBEZWxldGVkLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9SZXNv dXJjZVNpZGViYXJQYW5lbC5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVNpZGVi YXJQYW5lbC5wcm90b3R5cGUuX21haW5GcmFtZU1haW5SZXNvdXJjZURpZENoYW5nZS5kZWxheWVk V29yayk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VTaWRlYmFyUGFuZWwucHJvdG90 eXBlLl9tYWluRnJhbWVNYWluUmVzb3VyY2VEaWRDaGFuZ2UpOgorICAgICAgICBTaW1wbGlmeSB0 aGUgY29kZSBoZXJlLiBXZSBkb24ndCBuZWVkIHRoZXNlIGNoZWNrcyBub3cgd2l0aCB0YWJzIGFu ZCB0aGUgU3RvcmFnZSB0YWIuCisKKzIwMTUtMDQtMjkgIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90 aHlAYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFJlbW92ZSBzb21lIHVudXNl ZCBJbWFnZXMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTE0NDQxMgogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9JbWFnZXMvRE9NVHJlZS5zdmcgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9JbWFnZXMvRE9NVHJlZS5zdmcKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDBkYTk4 NGE3OTBlYTdlMGNiOGEwNTc1NDFkYWI5Mzg5MjQ0ZDg3MTcuLjAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRl cmZhY2UvSW1hZ2VzL0RPTVRyZWUuc3ZnCisrKyAvZGV2L251bGwKQEAgLTEsOCArMCwwIEBACi08 P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29kaW5nPSJ1dGYtOCI/PgotPCEtLSBDb3B5cmlnaHQgwqkg MjAxMyBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuIC0tPgotPHN2ZyB2ZXJzaW9uPSIx LjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDE2IDE2 Ij4KLSAgICA8cGF0aCBmaWxsPSJyZ2IoMTY1LCAyMDIsIDE2NCkiIGQ9Ik0gMTMgMSBMIDMgMSBD IDEuODk4NDM4IDEgMSAxLjg5ODQzOCAxIDMgTCAxIDEzIEMgMSAxNC4xMDE1NjIgMS44OTg0Mzgg MTUgMyAxNSBMIDEzIDE1IEMgMTQuMTAxNTYyIDE1IDE1IDE0LjEwMTU2MiAxNSAxMyBMIDE1IDMg QyAxNSAxLjg5ODQzOCAxNC4xMDE1NjIgMSAxMyAxIFoiLz4KLSAgICA8cGF0aCBmaWxsPSJyZ2Io MTE4LCAxNTMsIDExNikiIGQ9Ik0gMTMgMSBMIDMgMSBDIDEuODk4NDM4IDEgMSAxLjg5ODQzOCAx IDMgTCAxIDEzIEMgMSAxNC4xMDE1NjIgMS44OTg0MzggMTUgMyAxNSBMIDEzIDE1IEMgMTQuMTAx NTYyIDE1IDE1IDE0LjEwMTU2MiAxNSAxMyBMIDE1IDMgQyAxNSAxLjg5ODQzOCAxNC4xMDE1NjIg MSAxMyAxIE0gMTMgMiBDIDEzLjU1MDc4MSAyIDE0IDIuNDQ5MjE5IDE0IDMgTCAxNCAxMyBDIDE0 IDEzLjU1MDc4MSAxMy41NTA3ODEgMTQgMTMgMTQgTCAzIDE0IEMgMi40NDkyMTkgMTQgMiAxMy41 NTA3ODEgMiAxMyBMIDIgMyBDIDIgMi40NDkyMTkgMi40NDkyMTkgMiAzIDIgTCAxMyAyIi8+Ci0g ICAgPHBhdGggZmlsbD0icmdiKDEyOCwgMTY2LCAxMjYpIiBkPSJNIDkgMTIgQyA4LjQ0OTIxOSAx MiA4IDExLjU1MDc4MSA4IDExIEwgOCA5IEMgOCA4LjQ0OTIxOSA4LjQ0OTIxOSA4IDkgOCBDIDgu MjUgOCA3Ljc1IDggNyA4IEMgNy41NTA3ODEgOCA4IDguNDQ5MjE5IDggOSBMIDggMTEgQyA4IDEx LjU1MDc4MSA3LjU1MDc4MSAxMiA3IDEyIEwgNCAxMiBDIDMuNDQ1MzEyIDEyIDMgMTEuNTUwNzgx IDMgMTEgTCAzIDkgQyAzIDguNDQ5MjE5IDMuNDQ1MzEyIDggNCA4IEMgMy40NDUzMTIgOCAzIDcu NTUwNzgxIDMgNyBMIDMgNSBDIDMgNC40NDkyMTkgMy40NDUzMTIgNCA0IDQgTCAxMiA0IEMgMTIu NTU0Njg4IDQgMTMgNC40NDkyMTkgMTMgNSBMIDEzIDcgQyAxMyA3LjU1MDc4MSAxMi41NTQ2ODgg OCAxMiA4IEMgMTIuNTU0Njg4IDggMTMgOC40NDkyMTkgMTMgOSBMIDEzIDExIEMgMTMgMTEuNTUw NzgxIDEyLjU1NDY4OCAxMiAxMiAxMiBMIDkgMTIiLz4KLSAgICA8cGF0aCBmaWxsPSJ3aGl0ZSIg ZD0iTSAxMiA5IEwgMTIgMTEgTCA5IDExIEwgOSA5IEwgMTAgOSBMIDEwIDcgTCA2IDcgTCA2IDkg TCA3IDkgTCA3IDExIEwgNCAxMSBMIDQgOSBMIDUgOSBMIDUgNyBMIDQgNyBMIDQgNSBMIDEyIDUg TCAxMiA3IEwgMTEgNyBMIDExIDkgWiIvPgotPC9zdmc+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvU291cmNlQ29kZS5zdmcgYi9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9JbWFnZXMvU291cmNlQ29kZS5zdmcKZGVsZXRl ZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDVmNzI3ODA4ZjBkZDQyYzhhM2ZjOTM3ODJhZWRjOGUy YTI3NzkwZTYuLjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvSW1hZ2VzL1NvdXJjZUNvZGUuc3Zn CisrKyAvZGV2L251bGwKQEAgLTEsOSArMCwwIEBACi08P3htbCB2ZXJzaW9uPSIxLjAiIGVuY29k aW5nPSJ1dGYtOCI/PgotPCEtLSBDb3B5cmlnaHQgwqkgMjAxMyBBcHBsZSBJbmMuIEFsbCByaWdo dHMgcmVzZXJ2ZWQuIC0tPgotPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3Lncz Lm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDE2IDE2Ij4KLSAgICA8cGF0aCBmaWxsPSJyZ2Io MjQ1LCAyNDUsIDI0NSkiIGQ9Ik0gMTMgMSBMIDMgMSBDIDEuODk4NDM4IDEgMSAxLjg5ODQzOCAx IDMgTCAxIDEzIEMgMSAxNC4xMDE1NjIgMS44OTg0MzggMTUgMyAxNSBMIDEzIDE1IEMgMTQuMTAx NTYyIDE1IDE1IDE0LjEwMTU2MiAxNSAxMyBMIDE1IDMgQyAxNSAxLjg5ODQzOCAxNC4xMDE1NjIg MSAxMyAxIFoiLz4KLSAgICA8cGF0aCBmaWxsPSJyZ2IoMTkxLCAxOTEsIDE5MSkiIGQ9Ik0gMTMg MSBMIDMgMSBDIDEuODk4NDM4IDEgMSAxLjg5ODQzOCAxIDMgTCAxIDEzIEMgMSAxNC4xMDE1NjIg MS44OTg0MzggMTUgMyAxNSBMIDEzIDE1IEMgMTQuMTAxNTYyIDE1IDE1IDE0LjEwMTU2MiAxNSAx MyBMIDE1IDMgQyAxNSAxLjg5ODQzOCAxNC4xMDE1NjIgMSAxMyAxIE0gMTMgMiBDIDEzLjU1MDc4 MSAyIDE0IDIuNDQ5MjE5IDE0IDMgTCAxNCAxMyBDIDE0IDEzLjU1MDc4MSAxMy41NTA3ODEgMTQg MTMgMTQgTCAzIDE0IEMgMi40NDkyMTkgMTQgMiAxMy41NTA3ODEgMiAxMyBMIDIgMyBDIDIgMi40 NDkyMTkgMi40NDkyMTkgMiAzIDIgTCAxMyAyIi8+Ci0gICAgPHBhdGggZmlsbD0icmdiKDIwMywg MjAzLCAyMDMpIiBkPSJNIDQgMTAgTCAxMiAxMCBMIDEyIDEyIEwgNCAxMiBaIi8+Ci0gICAgPHBh dGggZmlsbD0icmdiKDIwMywgMjAzLCAyMDMpIiBkPSJNIDQgNyBMIDEyIDcgTCAxMiA5IEwgNCA5 IFoiLz4KLSAgICA8cGF0aCBmaWxsPSJyZ2IoMjAzLCAyMDMsIDIwMykiIGQ9Ik0gNCA0IEwgMTIg NCBMIDEyIDYgTCA0IDYgWiIvPgotPC9zdmc+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9NYWluLmh0bWwgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9NYWluLmh0bWwKaW5kZXggMjUwZDJkNGEwNmFmNTEwMDRkNjkxZThhODcwODRi ODI4MGZiOTFhNS4uMzhlMDc0ZTdjOTg1ZTc3ZjI0ZmE5NTc2MTFlMjYxNjg3NTgwM2JkMSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTWFpbi5odG1sCisr KyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01haW4uaHRtbApAQCAtNDI2 LDcgKzQyNiw2IEBACiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL0ZsZXhpYmxlU3BhY2VOYXZpZ2F0 aW9uSXRlbS5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IlZpZXdzL0ZvbnRSZXNvdXJj ZUNvbnRlbnRWaWV3LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iVmlld3MvRm9ybWF0 dGVkVmFsdWUuanMiPjwvc2NyaXB0PgotICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9GcmFtZUNvbnRl bnRWaWV3LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iVmlld3MvRnJhbWVET01UcmVl Q29udGVudFZpZXcuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJWaWV3cy9GcmFtZVRy ZWVFbGVtZW50LmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iVmlld3MvR2VuZXJhbFRy ZWVFbGVtZW50UGF0aENvbXBvbmVudC5qcyI+PC9zY3JpcHQ+CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GcmFtZUNvbnRlbnRWaWV3LmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvRnJhbWVDb250ZW50Vmll dy5qcwpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggNDg0NWY5OTNlMjczZmE0NjNkMDVk NjE5NGY0NTkyOWQ3Mjk3MWRkYi4uMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9GcmFt ZUNvbnRlbnRWaWV3LmpzCisrKyAvZGV2L251bGwKQEAgLTEsMTk1ICswLDAgQEAKLS8qCi0gKiBD b3B5cmlnaHQgKEMpIDIwMTMgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotICoKLSAq IFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGgg b3Igd2l0aG91dAotICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQg dGhlIGZvbGxvd2luZyBjb25kaXRpb25zCi0gKiBhcmUgbWV0OgotICogMS4gUmVkaXN0cmlidXRp b25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSAqICAg IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xh aW1lci4KLSAqIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVj ZSB0aGUgYWJvdmUgY29weXJpZ2h0Ci0gKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRp b25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCi0gKiAgICBkb2N1bWVudGF0 aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9u LgotICoKLSAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRT IENPTlRSSUJVVE9SUyBgYEFTIElTJycKLSAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdB UlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAotICogVEhFIElNUExJRUQg V0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxB UgotICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5D LiBPUiBJVFMgQ09OVFJJQlVUT1JTCi0gKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElS RUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCi0gKiBDT05TRVFVRU5USUFM IERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgot ICogU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBS T0ZJVFM7IE9SIEJVU0lORVNTCi0gKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBP TiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgotICogQ09OVFJBQ1QsIFNUUklD VCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkK LSAqIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBF VkVOIElGIEFEVklTRUQgT0YKLSAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KLSAq LwotCi1XZWJJbnNwZWN0b3IuRnJhbWVDb250ZW50VmlldyA9IGZ1bmN0aW9uKGZyYW1lKQotewot ICAgIFdlYkluc3BlY3Rvci5DbHVzdGVyQ29udGVudFZpZXcuY2FsbCh0aGlzLCBmcmFtZSk7Ci0K LSAgICB0aGlzLl9mcmFtZSA9IGZyYW1lOwotCi0gICAgZnVuY3Rpb24gY3JlYXRlUGF0aENvbXBv bmVudChkaXNwbGF5TmFtZSwgY2xhc3NOYW1lLCBpZGVudGlmaWVyKQotICAgIHsKLSAgICAgICAg dmFyIHBhdGhDb21wb25lbnQgPSBuZXcgV2ViSW5zcGVjdG9yLkhpZXJhcmNoaWNhbFBhdGhDb21w b25lbnQoZGlzcGxheU5hbWUsIGNsYXNzTmFtZSwgaWRlbnRpZmllciwgZmFsc2UsIHRydWUpOwot ICAgICAgICBwYXRoQ29tcG9uZW50LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLkhpZXJh cmNoaWNhbFBhdGhDb21wb25lbnQuRXZlbnQuU2libGluZ1dhc1NlbGVjdGVkLCB0aGlzLl9wYXRo Q29tcG9uZW50U2VsZWN0ZWQsIHRoaXMpOwotICAgICAgICByZXR1cm4gcGF0aENvbXBvbmVudDsK LSAgICB9Ci0KLSAgICB0aGlzLl9zb3VyY2VDb2RlUGF0aENvbXBvbmVudCA9IGNyZWF0ZVBhdGhD b21wb25lbnQuY2FsbCh0aGlzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNvdXJjZSBDb2RlIiks IFdlYkluc3BlY3Rvci5GcmFtZUNvbnRlbnRWaWV3LlNvdXJjZUNvZGVJY29uU3R5bGVDbGFzc05h bWUsIFdlYkluc3BlY3Rvci5GcmFtZUNvbnRlbnRWaWV3LlNvdXJjZUNvZGVJZGVudGlmaWVyKTsK LSAgICB0aGlzLl9kb21UcmVlUGF0aENvbXBvbmVudCA9IGNyZWF0ZVBhdGhDb21wb25lbnQuY2Fs bCh0aGlzLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkRPTSBUcmVlIiksIFdlYkluc3BlY3Rvci5G cmFtZUNvbnRlbnRWaWV3LkRPTVRyZWVJY29uU3R5bGVDbGFzc05hbWUsIFdlYkluc3BlY3Rvci5G cmFtZUNvbnRlbnRWaWV3LkRPTVRyZWVJZGVudGlmaWVyKTsKLQotICAgIHRoaXMuX3NvdXJjZUNv ZGVQYXRoQ29tcG9uZW50Lm5leHRTaWJsaW5nID0gdGhpcy5fZG9tVHJlZVBhdGhDb21wb25lbnQ7 Ci0gICAgdGhpcy5fZG9tVHJlZVBhdGhDb21wb25lbnQucHJldmlvdXNTaWJsaW5nID0gdGhpcy5f c291cmNlQ29kZVBhdGhDb21wb25lbnQ7Ci0KLSAgICB0aGlzLmVsZW1lbnQuY2xhc3NMaXN0LmFk ZChXZWJJbnNwZWN0b3IuRnJhbWVDb250ZW50Vmlldy5TdHlsZUNsYXNzTmFtZSk7Ci0KLSAgICB0 aGlzLl9jdXJyZW50Q29udGVudFZpZXdTZXR0aW5nID0gbmV3IFdlYkluc3BlY3Rvci5TZXR0aW5n KCJmcmFtZS1jdXJyZW50LXZpZXctIiArIHRoaXMuX2ZyYW1lLnVybC5oYXNoLCBXZWJJbnNwZWN0 b3IuRnJhbWVDb250ZW50Vmlldy5ET01UcmVlSWRlbnRpZmllcik7Ci19OwotCi1XZWJJbnNwZWN0 b3IuRnJhbWVDb250ZW50Vmlldy5TdHlsZUNsYXNzTmFtZSA9ICJmcmFtZSI7Ci1XZWJJbnNwZWN0 b3IuRnJhbWVDb250ZW50Vmlldy5Tb3VyY2VDb2RlSWNvblN0eWxlQ2xhc3NOYW1lID0gInNvdXJj ZS1jb2RlLWljb24iOwotV2ViSW5zcGVjdG9yLkZyYW1lQ29udGVudFZpZXcuU291cmNlQ29kZUlk ZW50aWZpZXIgPSAic291cmNlLWNvZGUiOwotV2ViSW5zcGVjdG9yLkZyYW1lQ29udGVudFZpZXcu RE9NVHJlZUljb25TdHlsZUNsYXNzTmFtZSA9ICJkb20tdHJlZS1pY29uIjsKLVdlYkluc3BlY3Rv ci5GcmFtZUNvbnRlbnRWaWV3LkRPTVRyZWVJZGVudGlmaWVyID0gImRvbS10cmVlIjsKLQotV2Vi SW5zcGVjdG9yLkZyYW1lQ29udGVudFZpZXcucHJvdG90eXBlID0gewotICAgIGNvbnN0cnVjdG9y OiBXZWJJbnNwZWN0b3IuRnJhbWVDb250ZW50VmlldywKLQotICAgIC8vIFB1YmxpYwotCi0gICAg Z2V0IGZyYW1lKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9mcmFtZTsKLSAgICB9LAot Ci0gICAgZ2V0IHNlbGVjdGlvblBhdGhDb21wb25lbnRzKCkKLSAgICB7Ci0gICAgICAgIGlmICgh dGhpcy5fY29udGVudFZpZXdDb250YWluZXIuY3VycmVudENvbnRlbnRWaWV3KQotICAgICAgICAg ICAgcmV0dXJuIFtdOwotCi0gICAgICAgIC8vIEFwcGVuZCB0aGUgY3VycmVudCB2aWV3J3MgcGF0 aCBjb21wb25lbnRzIHRvIHRoZSBwYXRoIGNvbXBvbmVudCByZXByZXNlbnRpbmcgdGhlIGN1cnJl bnQgdmlldy4KLSAgICAgICAgdmFyIGNvbXBvbmVudHMgPSBbdGhpcy5fcGF0aENvbXBvbmVudEZv ckNvbnRlbnRWaWV3KHRoaXMuX2NvbnRlbnRWaWV3Q29udGFpbmVyLmN1cnJlbnRDb250ZW50Vmll dyldOwotICAgICAgICByZXR1cm4gY29tcG9uZW50cy5jb25jYXQodGhpcy5fY29udGVudFZpZXdD b250YWluZXIuY3VycmVudENvbnRlbnRWaWV3LnNlbGVjdGlvblBhdGhDb21wb25lbnRzKTsKLSAg ICB9LAotCi0gICAgc2hvd246IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIFdlYkluc3BlY3Rv ci5DbHVzdGVyQ29udGVudFZpZXcucHJvdG90eXBlLnNob3duLmNhbGwodGhpcyk7Ci0KLSAgICAg ICAgaWYgKHRoaXMuX3Nob3duSW5pdGlhbENvbnRlbnQpCi0gICAgICAgICAgICByZXR1cm47Ci0K LSAgICAgICAgdGhpcy5fc2hvd0NvbnRlbnRWaWV3Rm9ySWRlbnRpZmllcih0aGlzLl9jdXJyZW50 Q29udGVudFZpZXdTZXR0aW5nLnZhbHVlKTsKLSAgICB9LAotCi0gICAgY2xvc2VkOiBmdW5jdGlv bigpCi0gICAgewotICAgICAgICBXZWJJbnNwZWN0b3IuQ2x1c3RlckNvbnRlbnRWaWV3LnByb3Rv dHlwZS5jbG9zZWQuY2FsbCh0aGlzKTsKLQotICAgICAgICB0aGlzLl9zaG93bkluaXRpYWxDb250 ZW50ID0gZmFsc2U7Ci0gICAgfSwKLQotICAgIHNhdmVUb0Nvb2tpZTogZnVuY3Rpb24oY29va2ll KQotICAgIHsKLSAgICAgICAgY29va2llLnR5cGUgPSBXZWJJbnNwZWN0b3IuQ29udGVudFZpZXdD b29raWVUeXBlLlJlc291cmNlOwotICAgICAgICBjb29raWUuc3VidmlldyA9IHRoaXMuX2N1cnJl bnRDb250ZW50Vmlld1NldHRpbmcudmFsdWU7Ci0gICAgICAgIGlmICghdGhpcy5yZXByZXNlbnRl ZE9iamVjdC5pc01haW5GcmFtZSgpKQotICAgICAgICAgICAgY29va2llLnVybCA9IHRoaXMucmVw cmVzZW50ZWRPYmplY3QudXJsOwotICAgIH0sCi0KLSAgICByZXN0b3JlRnJvbUNvb2tpZTogZnVu Y3Rpb24oY29va2llKQotICAgIHsKLSAgICAgICAgdmFyIHNob3duVmlldyA9IHRoaXMuX3Nob3dD b250ZW50Vmlld0ZvcklkZW50aWZpZXIoY29va2llLnN1YnZpZXcpOwotICAgICAgICBpZiAoImxp bmVOdW1iZXIiIGluIGNvb2tpZSAmJiAiY29sdW1uTnVtYmVyIiBpbiBjb29raWUpCi0gICAgICAg ICAgICB0aGlzLnNob3dTb3VyY2VDb2RlKG5ldyBXZWJJbnNwZWN0b3IuU291cmNlQ29kZVBvc2l0 aW9uKGNvb2tpZS5saW5lTnVtYmVyLCBjb29raWUuY29sdW1uTnVtYmVyKSk7Ci0gICAgfSwKLQot ICAgIHNob3dSZXNvdXJjZTogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgdGhpcy5fc2hvd25J bml0aWFsQ29udGVudCA9IHRydWU7Ci0KLSAgICAgICAgcmV0dXJuIHRoaXMuX3Nob3dDb250ZW50 Vmlld0ZvcklkZW50aWZpZXIoV2ViSW5zcGVjdG9yLkZyYW1lQ29udGVudFZpZXcuU291cmNlQ29k ZUlkZW50aWZpZXIpOwotICAgIH0sCi0KLSAgICBzaG93U291cmNlQ29kZTogZnVuY3Rpb24ocG9z aXRpb25Ub1JldmVhbCwgdGV4dFJhbmdlVG9TZWxlY3QsIGZvcmNlVW5mb3JtYXR0ZWQpCi0gICAg ewotICAgICAgICB2YXIgcmVzb3VyY2VDb250ZW50VmlldyA9IHRoaXMuc2hvd1Jlc291cmNlKCk7 Ci0gICAgICAgIGNvbnNvbGUuYXNzZXJ0KHJlc291cmNlQ29udGVudFZpZXcgaW5zdGFuY2VvZiBX ZWJJbnNwZWN0b3IuUmVzb3VyY2VDbHVzdGVyQ29udGVudFZpZXcpOwotICAgICAgICBpZiAoIXJl c291cmNlQ29udGVudFZpZXcpCi0gICAgICAgICAgICByZXR1cm4gbnVsbDsKLQotICAgICAgICBy ZXR1cm4gcmVzb3VyY2VDb250ZW50Vmlldy5zaG93UmVzcG9uc2UocG9zaXRpb25Ub1JldmVhbCwg dGV4dFJhbmdlVG9TZWxlY3QsIGZvcmNlVW5mb3JtYXR0ZWQpOwotICAgIH0sCi0KLSAgICBzaG93 RE9NVHJlZTogZnVuY3Rpb24oZG9tTm9kZVRvU2VsZWN0LCBwcmV2ZW50Rm9jdXNDaGFuZ2UpCi0g ICAgewotICAgICAgICB0aGlzLl9zaG93bkluaXRpYWxDb250ZW50ID0gdHJ1ZTsKLQotICAgICAg ICB2YXIgZG9tVHJlZUNvbnRlbnRWaWV3ID0gdGhpcy5fc2hvd0NvbnRlbnRWaWV3Rm9ySWRlbnRp ZmllcihXZWJJbnNwZWN0b3IuRnJhbWVDb250ZW50Vmlldy5ET01UcmVlSWRlbnRpZmllcik7Ci0g ICAgICAgIGNvbnNvbGUuYXNzZXJ0KGRvbVRyZWVDb250ZW50Vmlldyk7Ci0gICAgICAgIGlmICgh ZG9tVHJlZUNvbnRlbnRWaWV3IHx8ICFkb21Ob2RlVG9TZWxlY3QpCi0gICAgICAgICAgICByZXR1 cm4gbnVsbDsKLQotICAgICAgICBkb21UcmVlQ29udGVudFZpZXcuc2VsZWN0QW5kUmV2ZWFsRE9N Tm9kZShkb21Ob2RlVG9TZWxlY3QsIHByZXZlbnRGb2N1c0NoYW5nZSk7Ci0KLSAgICAgICAgcmV0 dXJuIGRvbVRyZWVDb250ZW50VmlldzsKLSAgICB9LAotCi0gICAgLy8gUHJpdmF0ZQotCi0gICAg X3BhdGhDb21wb25lbnRGb3JDb250ZW50VmlldzogZnVuY3Rpb24oY29udGVudFZpZXcpCi0gICAg ewotICAgICAgICBjb25zb2xlLmFzc2VydChjb250ZW50Vmlldyk7Ci0gICAgICAgIGlmICghY29u dGVudFZpZXcpCi0gICAgICAgICAgICByZXR1cm4gbnVsbDsKLSAgICAgICAgaWYgKGNvbnRlbnRW aWV3LnJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlJlc291cmNlKQot ICAgICAgICAgICAgcmV0dXJuIHRoaXMuX3NvdXJjZUNvZGVQYXRoQ29tcG9uZW50OwotICAgICAg ICBpZiAoY29udGVudFZpZXcucmVwcmVzZW50ZWRPYmplY3QgaW5zdGFuY2VvZiBXZWJJbnNwZWN0 b3IuRE9NVHJlZSkKLSAgICAgICAgICAgIHJldHVybiB0aGlzLl9kb21UcmVlUGF0aENvbXBvbmVu dDsKLSAgICAgICAgY29uc29sZS5lcnJvcigiVW5rbm93biBjb250ZW50Vmlldy4iKTsKLSAgICAg ICAgcmV0dXJuIG51bGw7Ci0gICAgfSwKLQotICAgIF9pZGVudGlmaWVyRm9yQ29udGVudFZpZXc6 IGZ1bmN0aW9uKGNvbnRlbnRWaWV3KQotICAgIHsKLSAgICAgICAgY29uc29sZS5hc3NlcnQoY29u dGVudFZpZXcpOwotICAgICAgICBpZiAoIWNvbnRlbnRWaWV3KQotICAgICAgICAgICAgcmV0dXJu IG51bGw7Ci0gICAgICAgIGlmIChjb250ZW50Vmlldy5yZXByZXNlbnRlZE9iamVjdCBpbnN0YW5j ZW9mIFdlYkluc3BlY3Rvci5SZXNvdXJjZSkKLSAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0 b3IuRnJhbWVDb250ZW50Vmlldy5Tb3VyY2VDb2RlSWRlbnRpZmllcjsKLSAgICAgICAgaWYgKGNv bnRlbnRWaWV3LnJlcHJlc2VudGVkT2JqZWN0IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLkRPTVRy ZWUpCi0gICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLkZyYW1lQ29udGVudFZpZXcuRE9N VHJlZUlkZW50aWZpZXI7Ci0gICAgICAgIGNvbnNvbGUuZXJyb3IoIlVua25vd24gY29udGVudFZp ZXcuIik7Ci0gICAgICAgIHJldHVybiBudWxsOwotICAgIH0sCi0KLSAgICBfc2hvd0NvbnRlbnRW aWV3Rm9ySWRlbnRpZmllcjogZnVuY3Rpb24oaWRlbnRpZmllcikKLSAgICB7Ci0gICAgICAgIHZh ciByZXByZXNlbnRlZE9iamVjdFRvU2hvdyA9IG51bGw7Ci0KLSAgICAgICAgc3dpdGNoIChpZGVu dGlmaWVyKSB7Ci0gICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLkZyYW1lQ29udGVudFZpZXcuU291 cmNlQ29kZUlkZW50aWZpZXI6Ci0gICAgICAgICAgICByZXByZXNlbnRlZE9iamVjdFRvU2hvdyA9 IHRoaXMuX2ZyYW1lLm1haW5SZXNvdXJjZTsKLSAgICAgICAgICAgIGJyZWFrOwotICAgICAgICBj YXNlIFdlYkluc3BlY3Rvci5GcmFtZUNvbnRlbnRWaWV3LkRPTVRyZWVJZGVudGlmaWVyOgotICAg ICAgICAgICAgcmVwcmVzZW50ZWRPYmplY3RUb1Nob3cgPSB0aGlzLl9mcmFtZS5kb21UcmVlOwot ICAgICAgICAgICAgYnJlYWs7Ci0gICAgICAgIH0KLQotICAgICAgICBjb25zb2xlLmFzc2VydChy ZXByZXNlbnRlZE9iamVjdFRvU2hvdyk7Ci0gICAgICAgIGlmICghcmVwcmVzZW50ZWRPYmplY3RU b1Nob3cpCi0gICAgICAgICAgICByZXR1cm4gbnVsbDsKLQotICAgICAgICB0aGlzLl9jdXJyZW50 Q29udGVudFZpZXdTZXR0aW5nLnZhbHVlID0gaWRlbnRpZmllcjsKLQotICAgICAgICByZXR1cm4g dGhpcy5jb250ZW50Vmlld0NvbnRhaW5lci5zaG93Q29udGVudFZpZXdGb3JSZXByZXNlbnRlZE9i amVjdChyZXByZXNlbnRlZE9iamVjdFRvU2hvdyk7Ci0gICAgfSwKLQotICAgIF9wYXRoQ29tcG9u ZW50U2VsZWN0ZWQ6IGZ1bmN0aW9uKGV2ZW50KQotICAgIHsKLSAgICAgICAgdGhpcy5fc2hvd0Nv bnRlbnRWaWV3Rm9ySWRlbnRpZmllcihldmVudC5kYXRhLnBhdGhDb21wb25lbnQucmVwcmVzZW50 ZWRPYmplY3QpOwotICAgIH0KLX07Ci0KLVdlYkluc3BlY3Rvci5GcmFtZUNvbnRlbnRWaWV3LnBy b3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuQ2x1c3RlckNvbnRlbnRWaWV3LnByb3Rv dHlwZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1BhdGhDb21wb25lbnRJY29ucy5jc3MgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9WaWV3cy9QYXRoQ29tcG9uZW50SWNvbnMuY3NzCmluZGV4IDFmYjBkMDlhM2M4Y2My YjExZTg0YTQ5NjMyOTE5MDNlY2QwMzI5N2MuLjRkMzg3N2JjZDg0ZjQ1YjY4OTJhYmU2ZDJjZWU1 NzRiNDU5YTRkZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1ZpZXdzL1BhdGhDb21wb25lbnRJY29ucy5jc3MKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVmlld3MvUGF0aENvbXBvbmVudEljb25zLmNzcwpAQCAtMjMsMTQg KzIzLDYgQEAKICAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KICAqLwogCi0uc291 cmNlLWNvZGUtaWNvbiAuaWNvbiB7Ci0gICAgY29udGVudDogdXJsKC4uL0ltYWdlcy9Tb3VyY2VD b2RlLnN2Zyk7Ci19Ci0KLS5kb20tdHJlZS1pY29uIC5pY29uIHsKLSAgICBjb250ZW50OiB1cmwo Li4vSW1hZ2VzL0RPTVRyZWUuc3ZnKTsKLX0KLQogLnJlcXVlc3QtaWNvbiAuaWNvbiB7CiAgICAg Y29udGVudDogdXJsKC4uL0ltYWdlcy9SZXF1ZXN0LnN2Zyk7CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9SZXNvdXJjZVNpZGViYXJQYW5l bC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNl U2lkZWJhclBhbmVsLmpzCmluZGV4IDg0MTYzMjk2YTQxZWQ3MzE2MTgwNmNjYzA5N2Q1YjM2NTI4 NTZhY2MuLmU2YWZjODg4NjRlNmM5YTBlMjYyODk5M2Q0YTcyYTNjOWU3NmJhZDAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Jlc291cmNlU2lk ZWJhclBhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1Jlc291cmNlU2lkZWJhclBhbmVsLmpzCkBAIC0xNzksMjAgKzE3OSwxMyBAQCBXZWJJbnNw ZWN0b3IuUmVzb3VyY2VTaWRlYmFyUGFuZWwgPSBjbGFzcyBSZXNvdXJjZVNpZGViYXJQYW5lbCBl eHRlbmRzIFdlYkluc3BlYwogCiAgICAgX21haW5GcmFtZU1haW5SZXNvdXJjZURpZENoYW5nZShl dmVudCkKICAgICB7Ci0gICAgICAgIHZhciB3YXNTaG93aW5nUmVzb3VyY2VTaWRlYmFyID0gdGhp cy5zZWxlY3RlZDsKLSAgICAgICAgdmFyIGN1cnJlbnRDb250ZW50VmlldyA9IHRoaXMuY29udGVu dEJyb3dzZXIuY3VycmVudENvbnRlbnRWaWV3OwotICAgICAgICB2YXIgd2FzU2hvd2luZ1Jlc291 cmNlQ29udGVudFZpZXcgPSBjdXJyZW50Q29udGVudFZpZXcgaW5zdGFuY2VvZiBXZWJJbnNwZWN0 b3IuUmVzb3VyY2VDb250ZW50VmlldwotICAgICAgICAgICAgfHwgY3VycmVudENvbnRlbnRWaWV3 IGluc3RhbmNlb2YgV2ViSW5zcGVjdG9yLlJlc291cmNlQ2x1c3RlckNvbnRlbnRWaWV3Ci0gICAg ICAgICAgICB8fCBjdXJyZW50Q29udGVudFZpZXcgaW5zdGFuY2VvZiBXZWJJbnNwZWN0b3IuRnJh bWVDb250ZW50VmlldwotICAgICAgICAgICAgfHwgY3VycmVudENvbnRlbnRWaWV3IGluc3RhbmNl b2YgV2ViSW5zcGVjdG9yLlNjcmlwdENvbnRlbnRWaWV3OwotCiAgICAgICAgIHRoaXMuY29udGVu dEJyb3dzZXIuY29udGVudFZpZXdDb250YWluZXIuY2xvc2VBbGxDb250ZW50Vmlld3MoKTsKIAog ICAgICAgICBmdW5jdGlvbiBkZWxheWVkV29yaygpCiAgICAgICAgIHsKLSAgICAgICAgICAgIC8v IFNob3cgdGhlIG1haW4gZnJhbWUgc2luY2UgdGhlcmUgaXMgbm8gY29udGVudCB2aWV3IHNob3dp bmcgb3Igd2Ugd2VyZSBzaG93aW5nIGEgcmVzb3VyY2UgYmVmb3JlLgorICAgICAgICAgICAgLy8g U2hvdyB0aGUgbWFpbiBmcmFtZSBzaW5jZSB0aGVyZSBpcyBubyBjb250ZW50IHZpZXcgc2hvd2lu Zy4KICAgICAgICAgICAgIC8vIENvb2tpZSByZXN0b3JhdGlvbiB3aWxsIGF0dGVtcHQgdG8gcmUt c2VsZWN0IHRoZSByZXNvdXJjZSB3ZSB3ZXJlIHNob3dpbmcuCi0gICAgICAgICAgICBpZiAoIXRo aXMuY29udGVudEJyb3dzZXIuY3VycmVudENvbnRlbnRWaWV3IHx8IHdhc1Nob3dpbmdSZXNvdXJj ZUNvbnRlbnRWaWV3KSB7CisgICAgICAgICAgICBpZiAoIXRoaXMuY29udGVudEJyb3dzZXIuY3Vy cmVudENvbnRlbnRWaWV3KSB7CiAgICAgICAgICAgICAgICAgLy8gTk9URTogVGhpcyBzZWxlY3Rp b24sIGR1cmluZyBwcm92aXNpb25hbCBsb2FkaW5nLCB3b24ndCBiZSBzYXZlZCwgc28gaXQgaXMK ICAgICAgICAgICAgICAgICAvLyBzYWZlIHRvIGRvIGFuZCBub3QtY2xvYmJlciBjb29raWUgcmVz dG9yYXRpb24uCiAgICAgICAgICAgICAgICAgdGhpcy5zaG93RGVmYXVsdENvbnRlbnRWaWV3Rm9y VHJlZUVsZW1lbnQodGhpcy5fbWFpbkZyYW1lVHJlZUVsZW1lbnQpOwo=