70033 2011-10-13 09:41:57 -0700 Web Inspector: move JS specific popover handling to JavaScriptSourceFrame. 2011-10-19 02:47:48 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 podivilov podivilov apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 483243 0 podivilov 2011-10-13 09:41:57 -0700 Web Inspector: move JS specific popover handling to JavaScriptSourceFrame. 483245 1 110860 podivilov 2011-10-13 09:43:36 -0700 Created attachment 110860 Patch 484784 2 110860 pfeldman 2011-10-16 10:37:21 -0700 Comment on attachment 110860 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=110860&action=review > Source/WebCore/inspector/front-end/SourceFrame.js:836 > + shouldShowPopover: function(element) { }, It is not clear what part of extensibility is achieved by means of the delegate versus the abstract methods. You should choose one way of extensibility and stick to it. r- for that. 485038 3 podivilov 2011-10-17 03:48:45 -0700 Extensibility should be achieved by means of the abstract methods. Delegate only serves for eliminating circular dependency between ScriptsPanel and JSSF. Delegate will have just two methods after refactoring: setScriptSourceIsBeingEdited and suggestedFileName. We may even get rid of it completely. 485101 4 110860 pfeldman 2011-10-17 06:34:57 -0700 Comment on attachment 110860 Patch Ok, I'd like to see delegates gone in the end of this refactoring then. 486642 5 podivilov 2011-10-19 02:47:48 -0700 Committed r97843: <http://trac.webkit.org/changeset/97843> 110860 2011-10-13 09:43:36 -0700 2011-10-17 06:34:57 -0700 Patch bug-70033-20111013204333.patch text/plain 16904 podivilov U3VidmVyc2lvbiBSZXZpc2lvbjogOTcyNzYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBiZWY4ODZiMjA3Njg5YzAw Nzg0ZGU4ZWIyZjdlZTFhYjA0NzRhZDRlLi40ODgwNzEyNGU1NDU5NGM1NjcyZDdiM2U2MzBiNDJl MjM1MjJjM2NhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzUgQEAKKzIwMTEtMTAtMTMgIFBhdmVs IFBvZGl2aWxvdiAgPHBvZGl2aWxvdkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogbW92ZSBKUyBzcGVjaWZpYyBwb3BvdmVyIGhhbmRsaW5nIHRvIEphdmFTY3JpcHRTb3Vy Y2VGcmFtZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTcwMDMzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBpbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUudWlT b3VyY2VDb2Rlcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25N b2RlbC5wcm90b3R5cGUuZ2V0IHBhdXNlZCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9KYXZhU2NyaXB0U291cmNlRnJhbWUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSmF2YVNj cmlwdFNvdXJjZUZyYW1lKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNl RnJhbWUucHJvdG90eXBlLnNob3VsZFNob3dQb3BvdmVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlLm9uU2hvd1BvcG92ZXIuc2hvd09iamVj dFBvcG92ZXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5w cm90b3R5cGUub25TaG93UG9wb3Zlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSmF2YVNjcmlw dFNvdXJjZUZyYW1lLnByb3RvdHlwZS5vbkhpZGVQb3BvdmVyKToKKyAgICAgICAgKFdlYkluc3Bl Y3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlLl9oaWdobGlnaHRFeHByZXNzaW9u KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlLl9jcmVhdGVTb3VyY2VGcmFt ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclNjcmlwdHNQ YW5lbCk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu U291cmNlRnJhbWUucHJvdG90eXBlLndpbGxIaWRlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5T b3VyY2VGcmFtZS5wcm90b3R5cGUuX2luaXRpYWxpemVUZXh0Vmlld2VyKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuX2dldFBvcG92ZXJBbmNob3IpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5nZXQgcmVhZE9ubHkpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5fc2V0UmVhZE9ubHkp OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZS5jb250ZW50Q2hh bmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLnNob3Vs ZFNob3dQb3BvdmVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5 cGUub25TaG93UG9wb3Zlcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJv dG90eXBlLm9uSGlkZVBvcG92ZXIpOgorCiAyMDExLTEwLTEyICBKaWFuIExpICA8amlhbmxpQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBTdXBwb3J0IHBhc3Npbmcgb3B0aW9uYWwgZmlsZW5hbWUg d2hlbiBGb3JtRGF0YS5hcHBlbmQoKSBpcyB1c2VkIHRvCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwuanMgYi9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0RlYnVnZ2VyUHJlc2VudGF0aW9uTW9k ZWwuanMKaW5kZXggZDIxNTFkODJhNDA5MDU0MTFjNmZiYmEzNmEzZDNhYjg5NDgwNzQzZC4uYjIz NjYxYWYwNWEzNzQ2Y2Y3NTVmZDMyNDJiYWM3M2EzODMxODFjMSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9EZWJ1Z2dlclByZXNlbnRhdGlvbk1vZGVsLmpz CisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRGVidWdnZXJQcmVzZW50 YXRpb25Nb2RlbC5qcwpAQCAtMTU2LDcgKzE1Niw3IEBAIFdlYkluc3BlY3Rvci5EZWJ1Z2dlclBy ZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIGZvciAodmFyIGkgPSAw OyBpIDwgdWlTb3VyY2VDb2RlTGlzdC5sZW5ndGg7ICsraSkKICAgICAgICAgICAgICAgICByZXN1 bHQucHVzaCh1aVNvdXJjZUNvZGVMaXN0W2ldKTsKICAgICAgICAgfQotICAgICAgICByZXR1cm4g cmVzdWx0OyAgICAgICAgICAgIAorICAgICAgICByZXR1cm4gcmVzdWx0OwogICAgIH0sCiAKICAg ICAvKioKQEAgLTQ5MSw2ICs0OTEsMTEgQEAgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyUHJlc2VudGF0 aW9uTW9kZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3Rl bmVycyhXZWJJbnNwZWN0b3IuRGVidWdnZXJQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMuRGVidWdn ZXJSZXN1bWVkKTsKICAgICB9LAogCisgICAgZ2V0IHBhdXNlZCgpCisgICAgeworICAgICAgICBy ZXR1cm4gISFXZWJJbnNwZWN0b3IuZGVidWdnZXJNb2RlbC5kZWJ1Z2dlclBhdXNlZERldGFpbHM7 CisgICAgfSwKKwogICAgIHNldCBzZWxlY3RlZENhbGxGcmFtZShjYWxsRnJhbWUpCiAgICAgewog ICAgICAgICBpZiAodGhpcy5fc2VsZWN0ZWRDYWxsRnJhbWUpCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0phdmFTY3JpcHRTb3VyY2VGcmFtZS5qcyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpz CmluZGV4IDY5YjU0MWE4ODJjODUxZGNjMTgyY2Y1MGYwYTQ3NjRhZDE1NmY4MzIuLjJmNmY4NzMw NmI5N2Y0YjM3ZGUxNmRhN2U4NzU2ZjUwZmZmMGViNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpz CkBAIC0zMiwxNSArMzIsOTYgQEAKICAqIEBjb25zdHJ1Y3RvcgogICogQGV4dGVuZHMge1dlYklu c3BlY3Rvci5Tb3VyY2VGcmFtZX0KICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1l RGVsZWdhdGV9IGRlbGVnYXRlCisgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5EZWJ1Z2dlclByZXNl bnRhdGlvbk1vZGVsfSBtb2RlbAogICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2Rl fSB1aVNvdXJjZUNvZGUKICAqLwotV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZSA9 IGZ1bmN0aW9uKGRlbGVnYXRlLCB1aVNvdXJjZUNvZGUpCitXZWJJbnNwZWN0b3IuSmF2YVNjcmlw dFNvdXJjZUZyYW1lID0gZnVuY3Rpb24oZGVsZWdhdGUsIG1vZGVsLCB1aVNvdXJjZUNvZGUpCiB7 CiAgICAgLy8gRklYTUU6IG1vdmUgYWxsIFNvdXJjZUZyYW1lIG1ldGhvZHMgcmVsYXRlZCB0byBK YXZhU2NyaXB0IGRlYnVnZ2luZyBoZXJlIGFuZAogICAgIC8vIGdldCByaWQgb2YgU291cmNlRnJh bWUuX2RlbGVnYXRlLgogICAgIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5jYWxsKHRoaXMsIGRl bGVnYXRlLCB1aVNvdXJjZUNvZGUudXJsKTsKIAorICAgIHRoaXMuX21vZGVsID0gbW9kZWw7Cisg ICAgdGhpcy5fcG9wb3Zlck9iamVjdEdyb3VwID0gInBvcG92ZXIiOworCiAgICAgdWlTb3VyY2VD b2RlLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5FdmVudHMuQ29u dGVudENoYW5nZWQsIHRoaXMuY29udGVudENoYW5nZWQsIHRoaXMpOwogfQogCitXZWJJbnNwZWN0 b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKKyAgICBzaG91bGRTaG93UG9w b3ZlcjogZnVuY3Rpb24oZWxlbWVudCkKKyAgICB7CisgICAgICAgIGlmICghdGhpcy5fbW9kZWwu cGF1c2VkKQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICBpZiAoIWVsZW1lbnQu ZW5jbG9zaW5nTm9kZU9yU2VsZldpdGhDbGFzcygid2Via2l0LWxpbmUtY29udGVudCIpKQorICAg ICAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgICAgIC8vIFdlIGFyZSBpbnRlcmVzdGVkIGlu IGlkZW50aWZpZXJzIGFuZCAidGhpcyIga2V5d29yZC4KKyAgICAgICAgaWYgKGVsZW1lbnQuaGFz U3R5bGVDbGFzcygid2Via2l0LWphdmFzY3JpcHQta2V5d29yZCIpKQorICAgICAgICAgICAgcmV0 dXJuIGVsZW1lbnQudGV4dENvbnRlbnQgPT09ICJ0aGlzIjsKKworICAgICAgICByZXR1cm4gZWxl bWVudC5oYXNTdHlsZUNsYXNzKCJ3ZWJraXQtamF2YXNjcmlwdC1pZGVudCIpOworICAgIH0sCisK KyAgICBvblNob3dQb3BvdmVyOiBmdW5jdGlvbihlbGVtZW50LCBzaG93Q2FsbGJhY2spCisgICAg eworICAgICAgICBpZiAoIXRoaXMucmVhZE9ubHkpIHsKKyAgICAgICAgICAgIHRoaXMucG9wb3Zl ckhlbHBlci5oaWRlUG9wb3ZlcigpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9Cisg ICAgICAgIHRoaXMuX2hpZ2hsaWdodEVsZW1lbnQgPSB0aGlzLl9oaWdobGlnaHRFeHByZXNzaW9u KGVsZW1lbnQpOworCisgICAgICAgIGZ1bmN0aW9uIHNob3dPYmplY3RQb3BvdmVyKHJlc3VsdCwg d2FzVGhyb3duKQorICAgICAgICB7CisgICAgICAgICAgICBpZiAoIXRoaXMuX21vZGVsLnBhdXNl ZCkgeworICAgICAgICAgICAgICAgIHRoaXMucG9wb3ZlckhlbHBlci5oaWRlUG9wb3ZlcigpOwor ICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgIH0KKyAgICAgICAgICAgIHNob3dD YWxsYmFjayhXZWJJbnNwZWN0b3IuUmVtb3RlT2JqZWN0LmZyb21QYXlsb2FkKHJlc3VsdCksIHdh c1Rocm93bik7CisgICAgICAgICAgICB0aGlzLl9oaWdobGlnaHRFbGVtZW50LmFkZFN0eWxlQ2xh c3MoInNvdXJjZS1mcmFtZS1ldmFsLWV4cHJlc3Npb24iKTsKKyAgICAgICAgfQorCisgICAgICAg IHZhciBzZWxlY3RlZENhbGxGcmFtZSA9IHRoaXMuX21vZGVsLnNlbGVjdGVkQ2FsbEZyYW1lOwor ICAgICAgICBzZWxlY3RlZENhbGxGcmFtZS5ldmFsdWF0ZSh0aGlzLl9oaWdobGlnaHRFbGVtZW50 LnRleHRDb250ZW50LCB0aGlzLl9wb3BvdmVyT2JqZWN0R3JvdXAsIGZhbHNlLCBmYWxzZSwgc2hv d09iamVjdFBvcG92ZXIuYmluZCh0aGlzKSk7CisgICAgfSwKKworICAgIG9uSGlkZVBvcG92ZXI6 IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIC8vIFJlcGxhY2UgaGlnbGlnaHQgZWxlbWVudCB3 aXRoIGl0cyBjb250ZW50cyBpbnBsYWNlLgorICAgICAgICB2YXIgaGlnaGxpZ2h0RWxlbWVudCA9 IHRoaXMuX2hpZ2hsaWdodEVsZW1lbnQ7CisgICAgICAgIGlmICghaGlnaGxpZ2h0RWxlbWVudCkK KyAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgdmFyIHBhcmVudEVsZW1lbnQgPSBoaWdobGln aHRFbGVtZW50LnBhcmVudEVsZW1lbnQ7CisgICAgICAgIHZhciBjaGlsZCA9IGhpZ2hsaWdodEVs ZW1lbnQuZmlyc3RDaGlsZDsKKyAgICAgICAgd2hpbGUgKGNoaWxkKSB7CisgICAgICAgICAgICB2 YXIgbmV4dFNpYmxpbmcgPSBjaGlsZC5uZXh0U2libGluZzsKKyAgICAgICAgICAgIHBhcmVudEVs ZW1lbnQuaW5zZXJ0QmVmb3JlKGNoaWxkLCBoaWdobGlnaHRFbGVtZW50KTsKKyAgICAgICAgICAg IGNoaWxkID0gbmV4dFNpYmxpbmc7CisgICAgICAgIH0KKyAgICAgICAgcGFyZW50RWxlbWVudC5y ZW1vdmVDaGlsZChoaWdobGlnaHRFbGVtZW50KTsKKyAgICAgICAgZGVsZXRlIHRoaXMuX2hpZ2hs aWdodEVsZW1lbnQ7CisgICAgICAgIFJ1bnRpbWVBZ2VudC5yZWxlYXNlT2JqZWN0R3JvdXAodGhp cy5fcG9wb3Zlck9iamVjdEdyb3VwKTsKKyAgICB9LAorCisgICAgX2hpZ2hsaWdodEV4cHJlc3Np b246IGZ1bmN0aW9uKGVsZW1lbnQpCisgICAgeworICAgICAgICAvLyBDb2xsZWN0IHRva2VucyBi ZWxvbmdpbmcgdG8gZXZhbHVhdGVkIGV4cHJlc3Npb24uCisgICAgICAgIHZhciB0b2tlbnMgPSBb IGVsZW1lbnQgXTsKKyAgICAgICAgdmFyIHRva2VuID0gZWxlbWVudC5wcmV2aW91c1NpYmxpbmc7 CisgICAgICAgIHdoaWxlICh0b2tlbiAmJiAodG9rZW4uY2xhc3NOYW1lID09PSAid2Via2l0LWph dmFzY3JpcHQtaWRlbnQiIHx8IHRva2VuLmNsYXNzTmFtZSA9PT0gIndlYmtpdC1qYXZhc2NyaXB0 LWtleXdvcmQiIHx8IHRva2VuLnRleHRDb250ZW50LnRyaW0oKSA9PT0gIi4iKSkgeworICAgICAg ICAgICAgdG9rZW5zLnB1c2godG9rZW4pOworICAgICAgICAgICAgdG9rZW4gPSB0b2tlbi5wcmV2 aW91c1NpYmxpbmc7CisgICAgICAgIH0KKyAgICAgICAgdG9rZW5zLnJldmVyc2UoKTsKKworICAg ICAgICAvLyBXcmFwIHRoZW0gd2l0aCBoaWdobGlnaHQgZWxlbWVudC4KKyAgICAgICAgdmFyIHBh cmVudEVsZW1lbnQgPSBlbGVtZW50LnBhcmVudEVsZW1lbnQ7CisgICAgICAgIHZhciBuZXh0RWxl bWVudCA9IGVsZW1lbnQubmV4dFNpYmxpbmc7CisgICAgICAgIHZhciBjb250YWluZXIgPSBkb2N1 bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwg dG9rZW5zLmxlbmd0aDsgKytpKQorICAgICAgICAgICAgY29udGFpbmVyLmFwcGVuZENoaWxkKHRv a2Vuc1tpXSk7CisgICAgICAgIHBhcmVudEVsZW1lbnQuaW5zZXJ0QmVmb3JlKGNvbnRhaW5lciwg bmV4dEVsZW1lbnQpOworICAgICAgICByZXR1cm4gY29udGFpbmVyOworICAgIH0KK30KKwogV2Vi SW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUuX19wcm90b19fID0gV2Vi SW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanMKaW5kZXggZTk0ZWJhMTc2M2ZmMWE5 OWQ2MmNjY2MwZmRhZjRjOWMzZTcyMDYzNy4uNWM1ZjFhMGU3NjA3Yjc5OWEwNWUxOTgzMGI3NGJj NjIxOWMwMzM2YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRzUGFuZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TY3JpcHRzUGFuZWwuanMKQEAgLTE4Niw3ICsxODYsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0 c1BhbmVsID0gZnVuY3Rpb24ocHJlc2VudGF0aW9uTW9kZWwpCiAgICAgICAgIFdlYkluc3BlY3Rv ci5kZWJ1Z2dlck1vZGVsLmVuYWJsZURlYnVnZ2VyKCk7CiAKICAgICBXZWJJbnNwZWN0b3Iuc2V0 dGluZ3Muc2hvd1NjcmlwdEZvbGRlcnMuYWRkQ2hhbmdlTGlzdGVuZXIodGhpcy5fc2hvd1Njcmlw dEZvbGRlcnNTZXR0aW5nQ2hhbmdlZC5iaW5kKHRoaXMpKTsKLSAgICAKKwogICAgIFdlYkluc3Bl Y3Rvci5hZHZhbmNlZFNlYXJjaENvbnRyb2xsZXIucmVnaXN0ZXJTZWFyY2hTY29wZShuZXcgV2Vi SW5zcGVjdG9yLlNjcmlwdHNTZWFyY2hTY29wZSgpKTsKIH0KIApAQCAtNjg3LDcgKzY4Nyw3IEBA IFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgIF9jcmVhdGVTb3Vy Y2VGcmFtZTogZnVuY3Rpb24odWlTb3VyY2VDb2RlKQogICAgIHsKICAgICAgICAgdmFyIGRlbGVn YXRlID0gbmV3IFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVs KHRoaXMsIHVpU291cmNlQ29kZSk7Ci0gICAgICAgIHZhciBzb3VyY2VGcmFtZSA9IG5ldyBXZWJJ bnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lKGRlbGVnYXRlLCB1aVNvdXJjZUNvZGUpOwor ICAgICAgICB2YXIgc291cmNlRnJhbWUgPSBuZXcgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3Vy Y2VGcmFtZShkZWxlZ2F0ZSwgdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwsIHVpU291cmNlQ29kZSk7 CiAKICAgICAgICAgdGhpcy5hZGRDaGlsZFZpZXcoc291cmNlRnJhbWUpOwogICAgICAgICBzb3Vy Y2VGcmFtZS5fdWlTb3VyY2VDb2RlID0gdWlTb3VyY2VDb2RlOwpAQCAtMTIxNiw3ICsxMjE2LDYg QEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGVGb3JTY3JpcHRzUGFuZWwgPSBmdW5j dGlvbihzY3JpcHRzUGFuZWwsIHVpU291cmMKICAgICB0aGlzLl9zY3JpcHRzUGFuZWwgPSBzY3Jp cHRzUGFuZWw7CiAgICAgdGhpcy5fbW9kZWwgPSB0aGlzLl9zY3JpcHRzUGFuZWwuX3ByZXNlbnRh dGlvbk1vZGVsOwogICAgIHRoaXMuX3VpU291cmNlQ29kZSA9IHVpU291cmNlQ29kZTsKLSAgICB0 aGlzLl9wb3BvdmVyT2JqZWN0R3JvdXAgPSAicG9wb3ZlciI7CiB9CiAKIFdlYkluc3BlY3Rvci5T b3VyY2VGcmFtZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKQEAgLTEyMjUs MTEgKzEyMjQsNiBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWVEZWxlZ2F0ZUZvclNjcmlwdHNQ YW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX3VpU291cmNlQ29kZS5yZXF1ZXN0Q29u dGVudChjYWxsYmFjayk7CiAgICAgfSwKIAotICAgIGRlYnVnZ2luZ1N1cHBvcnRlZDogZnVuY3Rp b24oKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0gICAgfSwKLQogICAgIHNldEJyZWFr cG9pbnQ6IGZ1bmN0aW9uKGxpbmVOdW1iZXIsIGNvbmRpdGlvbiwgZW5hYmxlZCkKICAgICB7CiAg ICAgICAgIHRoaXMuX21vZGVsLnNldEJyZWFrcG9pbnQodGhpcy5fdWlTb3VyY2VDb2RlLCBsaW5l TnVtYmVyLCBjb25kaXRpb24sIGVuYWJsZWQpOwpAQCAtMTI3MywyMSArMTI2Nyw2IEBAIFdlYklu c3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9yU2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsK ICAgICAgICAgdGhpcy5fc2NyaXB0c1BhbmVsLl9zZXRTY3JpcHRTb3VyY2VJc0JlaW5nRWRpdGVk KHRoaXMuX3VpU291cmNlQ29kZSwgaW5FZGl0TW9kZSk7CiAgICAgfSwKIAotICAgIGRlYnVnZ2Vy UGF1c2VkOiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLnBh bmVscy5zY3JpcHRzLnBhdXNlZDsKLSAgICB9LAotCi0gICAgZXZhbHVhdGVJblNlbGVjdGVkQ2Fs bEZyYW1lOiBmdW5jdGlvbihzdHJpbmcsIGNhbGxiYWNrKQotICAgIHsKLSAgICAgICAgdGhpcy5f c2NyaXB0c1BhbmVsLmV2YWx1YXRlSW5TZWxlY3RlZENhbGxGcmFtZShzdHJpbmcsIHRoaXMuX3Bv cG92ZXJPYmplY3RHcm91cCwgZmFsc2UsIGZhbHNlLCBjYWxsYmFjayk7Ci0gICAgfSwKLQotICAg IHJlbGVhc2VFdmFsdWF0aW9uUmVzdWx0OiBmdW5jdGlvbigpCi0gICAgewotICAgICAgICBSdW50 aW1lQWdlbnQucmVsZWFzZU9iamVjdEdyb3VwKHRoaXMuX3BvcG92ZXJPYmplY3RHcm91cCk7Ci0g ICAgfSwKLQogICAgIHN1Z2dlc3RlZEZpbGVOYW1lOiBmdW5jdGlvbigpCiAgICAgewogICAgICAg ICB2YXIgbmFtZXMgPSB0aGlzLl9zY3JpcHRzUGFuZWwuX2ZvbGRlckFuZERpc3BsYXlOYW1lRm9y U2NyaXB0VVJMKHRoaXMuX3VpU291cmNlQ29kZS51cmwpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvU291cmNlRnJhbWUuanMKaW5kZXggNzk2MDhlYTNmMjVjMTg0 YWEyMjFlMmM3MzIyNWMxYmQ1YWJiMDdmMy4uOTUyY2E1ZjYyNTlkNWY1MzE4NGExZWYxNzNmMDU4 Y2FjOWNmNGZlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9Tb3VyY2VGcmFtZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NvdXJjZUZyYW1lLmpzCkBAIC00Nyw2ICs0NywxMCBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJh bWUgPSBmdW5jdGlvbihkZWxlZ2F0ZSwgdXJsKQogICAgIHRoaXMuYWRkQ2hpbGRWaWV3KHRoaXMu X3RleHRWaWV3ZXIpOwogICAgIHRoaXMuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl90ZXh0Vmll d2VyLmVsZW1lbnQpOwogCisgICAgdGhpcy5wb3BvdmVySGVscGVyID0gbmV3IFdlYkluc3BlY3Rv ci5PYmplY3RQb3BvdmVySGVscGVyKHRoaXMuX3RleHRWaWV3ZXIuZWxlbWVudCwKKyAgICAgICAg ICAgIHRoaXMuX2dldFBvcG92ZXJBbmNob3IuYmluZCh0aGlzKSwgdGhpcy5vblNob3dQb3BvdmVy LmJpbmQodGhpcyksIHRoaXMub25IaWRlUG9wb3Zlci5iaW5kKHRoaXMpLCB0cnVlKTsKKyAgICB0 aGlzLl90ZXh0Vmlld2VyLmVsZW1lbnQuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vkb3duIiwgdGhp cy5fbW91c2VEb3duLmJpbmQodGhpcyksIHRydWUpOworCiAgICAgdGhpcy5fZWRpdEJ1dHRvbiA9 IG5ldyBXZWJJbnNwZWN0b3IuU3RhdHVzQmFyQnV0dG9uKFdlYkluc3BlY3Rvci5VSVN0cmluZygi RWRpdCIpLCAiZWRpdC1zb3VyY2Utc3RhdHVzLWJhci1pdGVtIik7CiAgICAgdGhpcy5fZWRpdEJ1 dHRvbi5hZGRFdmVudExpc3RlbmVyKCJjbGljayIsIHRoaXMuX2VkaXRCdXR0b25DbGlja2VkLmJp bmQodGhpcyksIHRoaXMpOwogCkBAIC05OCw4ICsxMDIsOCBAQCBXZWJJbnNwZWN0b3IuU291cmNl RnJhbWUucHJvdG90eXBlID0gewogICAgICAgICBpZiAodGhpcy5sb2FkZWQpCiAgICAgICAgICAg ICB0aGlzLl90ZXh0Vmlld2VyLmZyZWVDYWNoZWRFbGVtZW50cygpOwogCi0gICAgICAgIGlmICh0 aGlzLl9wb3BvdmVySGVscGVyKQotICAgICAgICAgICAgdGhpcy5fcG9wb3ZlckhlbHBlci5oaWRl UG9wb3ZlcigpOworICAgICAgICBpZiAodGhpcy5wb3BvdmVySGVscGVyKQorICAgICAgICAgICAg dGhpcy5wb3BvdmVySGVscGVyLmhpZGVQb3BvdmVyKCk7CiAgICAgICAgIHRoaXMuX2NsZWFyTGlu ZUhpZ2hsaWdodCgpOwogICAgICAgICB0aGlzLl90ZXh0Vmlld2VyLnJlYWRPbmx5ID0gdHJ1ZTsK ICAgICB9LApAQCAtMzAwLDEzICszMDQsNiBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJhbWUucHJv dG90eXBlID0gewogICAgICAgICB0aGlzLl9sb2FkZWQgPSB0cnVlOwogICAgICAgICB0aGlzLl90 ZXh0TW9kZWwuc2V0VGV4dChudWxsLCBjb250ZW50KTsKIAotICAgICAgICB2YXIgZWxlbWVudCA9 IHRoaXMuX3RleHRWaWV3ZXIuZWxlbWVudDsKLSAgICAgICAgaWYgKHRoaXMuX2RlbGVnYXRlLmRl YnVnZ2luZ1N1cHBvcnRlZCgpKSB7Ci0gICAgICAgICAgICB0aGlzLl9wb3BvdmVySGVscGVyID0g bmV3IFdlYkluc3BlY3Rvci5PYmplY3RQb3BvdmVySGVscGVyKGVsZW1lbnQsCi0gICAgICAgICAg ICAgICAgdGhpcy5fZ2V0UG9wb3ZlckFuY2hvci5iaW5kKHRoaXMpLCB0aGlzLl9vblNob3dQb3Bv dmVyLmJpbmQodGhpcyksIHRoaXMuX29uSGlkZVBvcG92ZXIuYmluZCh0aGlzKSwgdHJ1ZSk7Ci0g ICAgICAgICAgICBlbGVtZW50LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNlZG93biIsIHRoaXMuX21v dXNlRG93bi5iaW5kKHRoaXMpLCB0cnVlKTsKLSAgICAgICAgfQotCiAgICAgICAgIHRoaXMuX3Rl eHRWaWV3ZXIuYmVnaW5VcGRhdGVzKCk7CiAKICAgICAgICAgdGhpcy5fc2V0VGV4dFZpZXdlckRl Y29yYXRpb25zKCk7CkBAIC02NzcsODcgKzY3NCwxMyBAQCBXZWJJbnNwZWN0b3IuU291cmNlRnJh bWUucHJvdG90eXBlID0gewogICAgICAgICBldmVudC5wcmV2ZW50RGVmYXVsdCgpOwogICAgIH0s CiAKLSAgICBfb25IaWRlUG9wb3ZlcjogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgLy8gUmVw bGFjZSBoaWdsaWdodCBlbGVtZW50IHdpdGggaXRzIGNvbnRlbnRzIGlucGxhY2UuCi0gICAgICAg IHZhciBoaWdobGlnaHRFbGVtZW50ID0gdGhpcy5faGlnaGxpZ2h0RWxlbWVudDsKLSAgICAgICAg aWYgKCFoaWdobGlnaHRFbGVtZW50KQotICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB2YXIg cGFyZW50RWxlbWVudCA9IGhpZ2hsaWdodEVsZW1lbnQucGFyZW50RWxlbWVudDsKLSAgICAgICAg dmFyIGNoaWxkID0gaGlnaGxpZ2h0RWxlbWVudC5maXJzdENoaWxkOwotICAgICAgICB3aGlsZSAo Y2hpbGQpIHsKLSAgICAgICAgICAgIHZhciBuZXh0U2libGluZyA9IGNoaWxkLm5leHRTaWJsaW5n OwotICAgICAgICAgICAgcGFyZW50RWxlbWVudC5pbnNlcnRCZWZvcmUoY2hpbGQsIGhpZ2hsaWdo dEVsZW1lbnQpOwotICAgICAgICAgICAgY2hpbGQgPSBuZXh0U2libGluZzsKLSAgICAgICAgfQot ICAgICAgICBwYXJlbnRFbGVtZW50LnJlbW92ZUNoaWxkKGhpZ2hsaWdodEVsZW1lbnQpOwotICAg ICAgICBkZWxldGUgdGhpcy5faGlnaGxpZ2h0RWxlbWVudDsKLSAgICAgICAgdGhpcy5fZGVsZWdh dGUucmVsZWFzZUV2YWx1YXRpb25SZXN1bHQoKTsKLSAgICB9LAotCi0gICAgX3Nob3VsZFNob3dQ b3BvdmVyOiBmdW5jdGlvbihlbGVtZW50KQotICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLl9kZWxl Z2F0ZS5kZWJ1Z2dlclBhdXNlZCgpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAg ICBpZiAoIWVsZW1lbnQuZW5jbG9zaW5nTm9kZU9yU2VsZldpdGhDbGFzcygid2Via2l0LWxpbmUt Y29udGVudCIpKQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotCi0gICAgICAgIC8vIFdlIGFy ZSBpbnRlcmVzdGVkIGluIGlkZW50aWZpZXJzIGFuZCAidGhpcyIga2V5d29yZC4KLSAgICAgICAg aWYgKGVsZW1lbnQuaGFzU3R5bGVDbGFzcygid2Via2l0LWphdmFzY3JpcHQta2V5d29yZCIpKQot ICAgICAgICAgICAgcmV0dXJuIGVsZW1lbnQudGV4dENvbnRlbnQgPT09ICJ0aGlzIjsKLQotICAg ICAgICByZXR1cm4gZWxlbWVudC5oYXNTdHlsZUNsYXNzKCJ3ZWJraXQtamF2YXNjcmlwdC1pZGVu dCIpOwotICAgIH0sCi0KICAgICBfZ2V0UG9wb3ZlckFuY2hvcjogZnVuY3Rpb24oZWxlbWVudCkK ICAgICB7Ci0gICAgICAgIGlmICghdGhpcy5fc2hvdWxkU2hvd1BvcG92ZXIoZWxlbWVudCkpCisg ICAgICAgIGlmICghdGhpcy5zaG91bGRTaG93UG9wb3ZlcihlbGVtZW50KSkKICAgICAgICAgICAg IHJldHVybjsKICAgICAgICAgcmV0dXJuIGVsZW1lbnQ7CiAgICAgfSwKIAotICAgIF9oaWdobGln aHRFeHByZXNzaW9uOiBmdW5jdGlvbihlbGVtZW50KQotICAgIHsKLSAgICAgICAgLy8gQ29sbGVj dCB0b2tlbnMgYmVsb25naW5nIHRvIGV2YWx1YXRlZCBleHJlc3Npb24uCi0gICAgICAgIHZhciB0 b2tlbnMgPSBbIGVsZW1lbnQgXTsKLSAgICAgICAgdmFyIHRva2VuID0gZWxlbWVudC5wcmV2aW91 c1NpYmxpbmc7Ci0gICAgICAgIHdoaWxlICh0b2tlbiAmJiAodG9rZW4uY2xhc3NOYW1lID09PSAi d2Via2l0LWphdmFzY3JpcHQtaWRlbnQiIHx8IHRva2VuLmNsYXNzTmFtZSA9PT0gIndlYmtpdC1q YXZhc2NyaXB0LWtleXdvcmQiIHx8IHRva2VuLnRleHRDb250ZW50LnRyaW0oKSA9PT0gIi4iKSkg ewotICAgICAgICAgICAgdG9rZW5zLnB1c2godG9rZW4pOwotICAgICAgICAgICAgdG9rZW4gPSB0 b2tlbi5wcmV2aW91c1NpYmxpbmc7Ci0gICAgICAgIH0KLSAgICAgICAgdG9rZW5zLnJldmVyc2Uo KTsKLQotICAgICAgICAvLyBXcmFwIHRoZW0gd2l0aCBoaWdobGlnaHQgZWxlbWVudC4KLSAgICAg ICAgdmFyIHBhcmVudEVsZW1lbnQgPSBlbGVtZW50LnBhcmVudEVsZW1lbnQ7Ci0gICAgICAgIHZh ciBuZXh0RWxlbWVudCA9IGVsZW1lbnQubmV4dFNpYmxpbmc7Ci0gICAgICAgIHZhciBjb250YWlu ZXIgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzcGFuIik7Ci0gICAgICAgIGZvciAodmFyIGkg PSAwOyBpIDwgdG9rZW5zLmxlbmd0aDsgKytpKQotICAgICAgICAgICAgY29udGFpbmVyLmFwcGVu ZENoaWxkKHRva2Vuc1tpXSk7Ci0gICAgICAgIHBhcmVudEVsZW1lbnQuaW5zZXJ0QmVmb3JlKGNv bnRhaW5lciwgbmV4dEVsZW1lbnQpOwotICAgICAgICByZXR1cm4gY29udGFpbmVyOwotICAgIH0s Ci0KLSAgICBfb25TaG93UG9wb3ZlcjogZnVuY3Rpb24oZWxlbWVudCwgc2hvd0NhbGxiYWNrKQot ICAgIHsKLSAgICAgICAgaWYgKCF0aGlzLl90ZXh0Vmlld2VyLnJlYWRPbmx5KSB7Ci0gICAgICAg ICAgICB0aGlzLl9wb3BvdmVySGVscGVyLmhpZGVQb3BvdmVyKCk7Ci0gICAgICAgICAgICByZXR1 cm47Ci0gICAgICAgIH0KLSAgICAgICAgdGhpcy5faGlnaGxpZ2h0RWxlbWVudCA9IHRoaXMuX2hp Z2hsaWdodEV4cHJlc3Npb24oZWxlbWVudCk7Ci0KLSAgICAgICAgZnVuY3Rpb24gc2hvd09iamVj dFBvcG92ZXIocmVzdWx0LCB3YXNUaHJvd24pCi0gICAgICAgIHsKLSAgICAgICAgICAgIGlmICgh dGhpcy5fZGVsZWdhdGUuZGVidWdnZXJQYXVzZWQoKSkgewotICAgICAgICAgICAgICAgIHRoaXMu X3BvcG92ZXJIZWxwZXIuaGlkZVBvcG92ZXIoKTsKLSAgICAgICAgICAgICAgICByZXR1cm47Ci0g ICAgICAgICAgICB9Ci0gICAgICAgICAgICBzaG93Q2FsbGJhY2socmVzdWx0LCB3YXNUaHJvd24p OwotICAgICAgICAgICAgdGhpcy5faGlnaGxpZ2h0RWxlbWVudC5hZGRTdHlsZUNsYXNzKCJzb3Vy Y2UtZnJhbWUtZXZhbC1leHByZXNzaW9uIik7Ci0gICAgICAgIH0KLQotICAgICAgICB0aGlzLl9k ZWxlZ2F0ZS5ldmFsdWF0ZUluU2VsZWN0ZWRDYWxsRnJhbWUodGhpcy5faGlnaGxpZ2h0RWxlbWVu dC50ZXh0Q29udGVudCwgc2hvd09iamVjdFBvcG92ZXIuYmluZCh0aGlzKSk7Ci0gICAgfSwKLQog ICAgIF9lZGl0QnJlYWtwb2ludENvbmRpdGlvbjogZnVuY3Rpb24obGluZU51bWJlciwgY29uZGl0 aW9uLCBjYWxsYmFjaykKICAgICB7CiAgICAgICAgIHRoaXMuX2NvbmRpdGlvbkVsZW1lbnQgPSB0 aGlzLl9jcmVhdGVDb25kaXRpb25FbGVtZW50KGxpbmVOdW1iZXIpOwpAQCAtODg1LDEwICs4MDgs MTUgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhp cy5fc2V0UmVhZE9ubHkodHJ1ZSk7CiAgICAgfSwKIAorICAgIGdldCByZWFkT25seSgpCisgICAg eworICAgICAgICByZXR1cm4gdGhpcy5fdGV4dFZpZXdlci5yZWFkT25seTsKKyAgICB9LAorCiAg ICAgX3NldFJlYWRPbmx5OiBmdW5jdGlvbihyZWFkT25seSkKICAgICB7Ci0gICAgICAgIGlmICgh cmVhZE9ubHkgJiYgdGhpcy5fcG9wb3ZlckhlbHBlcikKLSAgICAgICAgICAgIHRoaXMuX3BvcG92 ZXJIZWxwZXIuaGlkZVBvcG92ZXIoKTsKKyAgICAgICAgaWYgKCFyZWFkT25seSAmJiB0aGlzLnBv cG92ZXJIZWxwZXIpCisgICAgICAgICAgICB0aGlzLnBvcG92ZXJIZWxwZXIuaGlkZVBvcG92ZXIo KTsKIAogICAgICAgICB0aGlzLl90ZXh0Vmlld2VyLnJlYWRPbmx5ID0gcmVhZE9ubHk7CiAgICAg ICAgIHRoaXMuX2VkaXRCdXR0b24udG9nZ2xlZCA9ICFyZWFkT25seTsKQEAgLTkwMiw3ICs4MzAs MTQgQEAgV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgaWYg KCF0aGlzLl9jb250ZW50UmVxdWVzdGVkIHx8ICF0aGlzLl90ZXh0Vmlld2VyLnJlYWRPbmx5KQog ICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5yZXF1ZXN0Q29udGVu dCh0aGlzLl9pbml0aWFsaXplVGV4dFZpZXdlci5iaW5kKHRoaXMpKTsKLSAgICB9CisgICAgfSwK KworCisgICAgc2hvdWxkU2hvd1BvcG92ZXI6IGZ1bmN0aW9uKGVsZW1lbnQpIHsgfSwKKworICAg IG9uU2hvd1BvcG92ZXI6IGZ1bmN0aW9uKGVsZW1lbnQsIHNob3dDYWxsYmFjaykgeyB9LAorCisg ICAgb25IaWRlUG9wb3ZlcjogZnVuY3Rpb24oKSB7IH0sCiB9CiAKIFdlYkluc3BlY3Rvci5Tb3Vy Y2VGcmFtZS5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLlZpZXcucHJvdG90eXBl OwpAQCAtOTcyLDggKzkwNyw2IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlID0g ZnVuY3Rpb24oKQogV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGUucHJvdG90eXBlID0g ewogICAgIHJlcXVlc3RDb250ZW50OiBmdW5jdGlvbihjYWxsYmFjaykgeyB9LAogCi0gICAgZGVi dWdnaW5nU3VwcG9ydGVkOiBmdW5jdGlvbigpIHsgcmV0dXJuIGZhbHNlOyB9LAotCiAgICAgc2V0 QnJlYWtwb2ludDogZnVuY3Rpb24obGluZU51bWJlciwgY29uZGl0aW9uLCBlbmFibGVkKSB7IH0s CiAKICAgICByZW1vdmVCcmVha3BvaW50OiBmdW5jdGlvbihsaW5lTnVtYmVyKSB7IH0sCkBAIC05 OTAsMTIgKzkyMyw2IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlLnByb3RvdHlw ZSA9IHsKIAogICAgIHNldFNjcmlwdFNvdXJjZUlzQmVpbmdFZGl0ZWQ6IGZ1bmN0aW9uKGluRWRp dE1vZGUpIHsgfSwKIAotICAgIGRlYnVnZ2VyUGF1c2VkOiBmdW5jdGlvbigpIHsgfSwKLQotICAg IGV2YWx1YXRlSW5TZWxlY3RlZENhbGxGcmFtZTogZnVuY3Rpb24oc3RyaW5nKSB7IH0sCi0KLSAg ICByZWxlYXNlRXZhbHVhdGlvblJlc3VsdDogZnVuY3Rpb24oKSB7IH0sCi0KICAgICBzdWdnZXN0 ZWRGaWxlTmFtZTogZnVuY3Rpb24oKSB7IH0KIH0KIAo=