71826 2011-11-08 10:03:18 -0800 Web Inspector: [refactoring] remove a bunch of methods from JavaScriptSourceFrameDelegate 2011-11-09 07:41:12 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 caseq caseq apavlov bweinstein joepeck keishi loislo pfeldman pmuellr podivilov rik timothy yurys oldest_to_newest 498177 0 caseq 2011-11-08 10:03:18 -0800 Those methods that may be implemented with the help of PresentationModel and UISourceCode only don't have to be in JavaScriptsSourceFrameDelegate. 498180 1 114101 caseq 2011-11-08 10:04:43 -0800 Created attachment 114101 Patch 498201 2 114101 pfeldman 2011-11-08 10:14:49 -0800 Comment on attachment 114101 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=114101&action=review > Source/WebCore/inspector/front-end/JavaScriptSourceFrame.js:82 > + this._model.setScriptSource(this._uiSourceCode, newContent, callback); Nit: We could encapsulate setScriptSource in the uiSourceCode for convenience. > Source/WebCore/inspector/front-end/JavaScriptSourceFrame.js:374 > + this._model.removeBreakpoint(this._uiSourceCode, lineNumber); A dozen of methods that now accept uiSourceCode as the first argument suggest that they could be declared on that class. 498208 3 114101 pfeldman 2011-11-08 10:18:25 -0800 Comment on attachment 114101 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=114101&action=review > Source/WebCore/inspector/front-end/ScriptsPanel.js:1183 > this._scriptsPanel._toggleBreakpointsClicked(); I am fine with declaring _scriptsPanel on the JavaScriptSourceFrame. That way you'll be able to get rid of the delegate entirely. You could either make _setScriptSourceIsBeingEdited public or move the entire JavaScriptSourceFrame into ScriptsPanel class and make everything it needs from ScriptsPanel private. 498950 4 114101 caseq 2011-11-09 07:41:03 -0800 Comment on attachment 114101 Patch Clearing flags on attachment: 114101 Committed r99717: <http://trac.webkit.org/changeset/99717> 498951 5 caseq 2011-11-09 07:41:12 -0800 All reviewed patches have been landed. Closing bug. 114101 2011-11-08 10:04:43 -0800 2011-11-09 07:41:03 -0800 Patch bug-71826-20111108220441.patch text/plain 11487 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogOTk1NzUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBlMmZmYzIwYjIxOWIyYjU1 NDczZWYzMmVhNWQyYWUxNzk0ZTIxN2MzLi5hOTYxNTIzNzNlMWFkYTczYmZhOGFmNzVlOGFjZjg0 ZWEwYmEzNTdjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjQgQEAKIDIwMTEtMTEtMDggIEFuZHJl eSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KIAorICAgICAgICBXZWIgSW5zcGVjdG9y OiBbcmVmYWN0b3JpbmddIHJlbW92ZSBhIGJ1bmNoIG9mIG1ldGhvZHMgZnJvbSBKYXZhU2NyaXB0 U291cmNlRnJhbWVEZWxlZ2F0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NzE4MjYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZSk6CisgICAgICAg IChXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lLnByb3RvdHlwZS5yZXF1ZXN0Q29u dGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lLnByb3Rv dHlwZS5jYW5FZGl0U291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291 cmNlRnJhbWUucHJvdG90eXBlLmVkaXRDb250ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5K YXZhU2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlLnBvcHVsYXRlTGluZUd1dHRlckNvbnRleHRN ZW51LmVsc2UuZWRpdEJyZWFrcG9pbnRDb25kaXRpb24uZGlkRWRpdEJyZWFrcG9pbnRDb25kaXRp b24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5 cGUucG9wdWxhdGVMaW5lR3V0dGVyQ29udGV4dE1lbnUuZWxzZSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lLnByb3RvdHlwZS5wb3B1bGF0ZUxpbmVHdXR0ZXJD b250ZXh0TWVudSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1l LnByb3RvdHlwZS5kaWRFZGl0Q29udGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSmF2YVNj cmlwdFNvdXJjZUZyYW1lLnByb3RvdHlwZS5fb25Nb3VzZURvd24pOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzOgorCisyMDExLTExLTA4ICBBbmRyZXkgS29z eWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogW0V4 dGVuc2lvbiBBUEldW0Nocm9taXVtXSBpbmplY3RlZCBleHRlbnNpb24gQVBJIG5lZWRzIHRvIHJl dHVybiBhbiBvYmplY3QKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTcxODIyCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvSmF2YVNjcmlwdFNvdXJjZUZyYW1lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9KYXZhU2NyaXB0U291cmNlRnJhbWUuanMKaW5kZXggZGZjYjNmNzQ3OWFmYjNl M2RmNjE1MTZkNjIwNmIxYzNlOGEzODZiNy4uNzZhNmEwNTZmZjZlYjEzMzllMzBkMDkwMmRhMTJl YzkyNjg5MDY5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9KYXZhU2NyaXB0U291cmNlRnJhbWUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9KYXZhU2NyaXB0U291cmNlRnJhbWUuanMKQEAgLTQ4LDYgKzQ4LDcgQEAgV2Vi SW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZSA9IGZ1bmN0aW9uKGRlbGVnYXRlLCBtb2Rl bCwgdWlTb3VyY2VDb2RlKQogICAgIHRoaXMuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3Iu U291cmNlRnJhbWUuRXZlbnRzLkxvYWRlZCwgdGhpcy5fb25UZXh0Vmlld2VyQ29udGVudExvYWRl ZCwgdGhpcyk7CiAKICAgICB0aGlzLl9tb2RlbCA9IG1vZGVsOworICAgIHRoaXMuX3VpU291cmNl Q29kZSA9IHVpU291cmNlQ29kZTsgCiAgICAgdGhpcy5fcG9wb3Zlck9iamVjdEdyb3VwID0gInBv cG92ZXIiOwogICAgIHRoaXMuX2JyZWFrcG9pbnRzID0ge307CiB9CkBAIC02MywxMiArNjQsMTIg QEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3VyY2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAg Ly8gU291cmNlRnJhbWUgb3ZlcnJpZGVzCiAgICAgcmVxdWVzdENvbnRlbnQ6IGZ1bmN0aW9uKGNh bGxiYWNrKQogICAgIHsKLSAgICAgICAgdGhpcy5fZGVsZWdhdGUucmVxdWVzdENvbnRlbnQoY2Fs bGJhY2spOworICAgICAgICB0aGlzLl91aVNvdXJjZUNvZGUucmVxdWVzdENvbnRlbnQoY2FsbGJh Y2spOwogICAgIH0sCiAKICAgICBjYW5FZGl0U291cmNlOiBmdW5jdGlvbigpCiAgICAgewotICAg ICAgICByZXR1cm4gdGhpcy5fZGVsZWdhdGUuY2FuRWRpdFNjcmlwdFNvdXJjZSgpOworICAgICAg ICByZXR1cm4gdGhpcy5fbW9kZWwuY2FuRWRpdFNjcmlwdFNvdXJjZSh0aGlzLl91aVNvdXJjZUNv ZGUpOwogICAgIH0sCiAKICAgICBzdWdnZXN0ZWRGaWxlTmFtZTogZnVuY3Rpb24oKQpAQCAtNzgs NyArNzksNyBAQCBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lLnByb3RvdHlwZSA9 IHsKIAogICAgIGVkaXRDb250ZW50OiBmdW5jdGlvbihuZXdDb250ZW50LCBjYWxsYmFjaykKICAg ICB7Ci0gICAgICAgIHRoaXMuX2RlbGVnYXRlLnNldFNjcmlwdFNvdXJjZShuZXdDb250ZW50LCBj YWxsYmFjayk7CisgICAgICAgIHRoaXMuX21vZGVsLnNldFNjcmlwdFNvdXJjZSh0aGlzLl91aVNv dXJjZUNvZGUsIG5ld0NvbnRlbnQsIGNhbGxiYWNrKTsKICAgICB9LAogCiAgICAgX29uQ29udGVu dENoYW5nZWQ6IGZ1bmN0aW9uKCkKQEAgLTk5LDkgKzEwMCw5IEBAIFdlYkluc3BlY3Rvci5KYXZh U2NyaXB0U291cmNlRnJhbWUucHJvdG90eXBlID0gewogCiAgICAgcG9wdWxhdGVMaW5lR3V0dGVy Q29udGV4dE1lbnU6IGZ1bmN0aW9uKGxpbmVOdW1iZXIsIGNvbnRleHRNZW51KQogICAgIHsKLSAg ICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoV2ViSW5z cGVjdG9yLnVzZUxvd2VyQ2FzZU1lbnVUaXRsZXMoKSA/ICJDb250aW51ZSB0byBoZXJlIiA6ICJD b250aW51ZSB0byBIZXJlIiksIHRoaXMuX2RlbGVnYXRlLmNvbnRpbnVlVG9MaW5lLmJpbmQodGhp cy5fZGVsZWdhdGUsIGxpbmVOdW1iZXIpKTsKKyAgICAgICAgY29udGV4dE1lbnUuYXBwZW5kSXRl bShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoV2ViSW5zcGVjdG9yLnVzZUxvd2VyQ2FzZU1lbnVUaXRs ZXMoKSA/ICJDb250aW51ZSB0byBoZXJlIiA6ICJDb250aW51ZSB0byBIZXJlIiksIHRoaXMuX21v ZGVsLmNvbnRpbnVlVG9MaW5lLmJpbmQodGhpcy5fbW9kZWwsIHRoaXMuX3VpU291cmNlQ29kZSwg bGluZU51bWJlcikpOwogCi0gICAgICAgIHZhciBicmVha3BvaW50ID0gdGhpcy5fZGVsZWdhdGUu ZmluZEJyZWFrcG9pbnQobGluZU51bWJlcik7CisgICAgICAgIHZhciBicmVha3BvaW50ID0gdGhp cy5fbW9kZWwuZmluZEJyZWFrcG9pbnQodGhpcy5fdWlTb3VyY2VDb2RlLCBsaW5lTnVtYmVyKTsK ICAgICAgICAgaWYgKCFicmVha3BvaW50KSB7CiAgICAgICAgICAgICAvLyBUaGlzIHJvdyBkb2Vz bid0IGhhdmUgYSBicmVha3BvaW50OiBXZSB3YW50IHRvIHNob3cgQWRkIEJyZWFrcG9pbnQgYW5k IEFkZCBhbmQgRWRpdCBCcmVha3BvaW50LgogICAgICAgICAgICAgY29udGV4dE1lbnUuYXBwZW5k SXRlbShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoV2ViSW5zcGVjdG9yLnVzZUxvd2VyQ2FzZU1lbnVU aXRsZXMoKSA/ICJBZGQgYnJlYWtwb2ludCIgOiAiQWRkIEJyZWFrcG9pbnQiKSwgdGhpcy5fZGVs ZWdhdGUuc2V0QnJlYWtwb2ludC5iaW5kKHRoaXMuX2RlbGVnYXRlLCBsaW5lTnVtYmVyLCAiIiwg dHJ1ZSkpOwpAQCAtMTIwLDIwICsxMjEsMjEgQEAgV2ViSW5zcGVjdG9yLkphdmFTY3JpcHRTb3Vy Y2VGcmFtZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVt KFdlYkluc3BlY3Rvci5VSVN0cmluZyhXZWJJbnNwZWN0b3IudXNlTG93ZXJDYXNlTWVudVRpdGxl cygpID8gIkFkZCBjb25kaXRpb25hbCBicmVha3BvaW504oCmIiA6ICJBZGQgQ29uZGl0aW9uYWwg QnJlYWtwb2ludOKApiIpLCBhZGRDb25kaXRpb25hbEJyZWFrcG9pbnQuYmluZCh0aGlzKSk7CiAg ICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAvLyBUaGlzIHJvdyBoYXMgYSBicmVha3BvaW50 LCB3ZSB3YW50IHRvIHNob3cgZWRpdCBhbmQgcmVtb3ZlIGJyZWFrcG9pbnQsIGFuZCBlaXRoZXIg ZGlzYWJsZSBvciBlbmFibGUuCi0gICAgICAgICAgICBjb250ZXh0TWVudS5hcHBlbmRJdGVtKFdl Ykluc3BlY3Rvci5VSVN0cmluZyhXZWJJbnNwZWN0b3IudXNlTG93ZXJDYXNlTWVudVRpdGxlcygp ID8gIlJlbW92ZSBicmVha3BvaW50IiA6ICJSZW1vdmUgQnJlYWtwb2ludCIpLCB0aGlzLl9kZWxl Z2F0ZS5yZW1vdmVCcmVha3BvaW50LmJpbmQodGhpcy5fZGVsZWdhdGUsIGxpbmVOdW1iZXIpKTsK KyAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5n KFdlYkluc3BlY3Rvci51c2VMb3dlckNhc2VNZW51VGl0bGVzKCkgPyAiUmVtb3ZlIGJyZWFrcG9p bnQiIDogIlJlbW92ZSBCcmVha3BvaW50IiksIHRoaXMuX21vZGVsLnJlbW92ZUJyZWFrcG9pbnQu YmluZCh0aGlzLl9tb2RlbCwgdGhpcy5fdWlTb3VyY2VDb2RlLCBsaW5lTnVtYmVyKSk7CisKICAg ICAgICAgICAgIGZ1bmN0aW9uIGVkaXRCcmVha3BvaW50Q29uZGl0aW9uKCkKICAgICAgICAgICAg IHsKICAgICAgICAgICAgICAgICBmdW5jdGlvbiBkaWRFZGl0QnJlYWtwb2ludENvbmRpdGlvbihj b21taXR0ZWQsIGNvbmRpdGlvbikKICAgICAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAg ICAgIGlmIChjb21taXR0ZWQpCi0gICAgICAgICAgICAgICAgICAgICAgICB0aGlzLl9kZWxlZ2F0 ZS51cGRhdGVCcmVha3BvaW50KGxpbmVOdW1iZXIsIGNvbmRpdGlvbiwgYnJlYWtwb2ludC5lbmFi bGVkKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIHRoaXMuX21vZGVsLnVwZGF0ZUJyZWFrcG9p bnQodGhpcy5fdWlTb3VyY2VDb2RlLCBsaW5lTnVtYmVyLCBjb25kaXRpb24sIGJyZWFrcG9pbnQu ZW5hYmxlZCk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIHRoaXMuX2VkaXRC cmVha3BvaW50Q29uZGl0aW9uKGxpbmVOdW1iZXIsIGJyZWFrcG9pbnQuY29uZGl0aW9uLCBkaWRF ZGl0QnJlYWtwb2ludENvbmRpdGlvbi5iaW5kKHRoaXMpKTsKICAgICAgICAgICAgIH0KICAgICAg ICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdlYklu c3BlY3Rvci51c2VMb3dlckNhc2VNZW51VGl0bGVzKCkgPyAiRWRpdCBicmVha3BvaW504oCmIiA6 ICJFZGl0IEJyZWFrcG9pbnTigKYiKSwgZWRpdEJyZWFrcG9pbnRDb25kaXRpb24uYmluZCh0aGlz KSk7CiAgICAgICAgICAgICBmdW5jdGlvbiBzZXRCcmVha3BvaW50RW5hYmxlZChlbmFibGVkKQog ICAgICAgICAgICAgewotICAgICAgICAgICAgICAgIHRoaXMuX2RlbGVnYXRlLnVwZGF0ZUJyZWFr cG9pbnQobGluZU51bWJlciwgYnJlYWtwb2ludC5jb25kaXRpb24sIGVuYWJsZWQpOworICAgICAg ICAgICAgICAgIHRoaXMuX21vZGVsLnVwZGF0ZUJyZWFrcG9pbnQodGhpcy5fdWlTb3VyY2VDb2Rl LCBsaW5lTnVtYmVyLCBicmVha3BvaW50LmNvbmRpdGlvbiwgZW5hYmxlZCk7CiAgICAgICAgICAg ICB9CiAgICAgICAgICAgICBpZiAoYnJlYWtwb2ludC5lbmFibGVkKQogICAgICAgICAgICAgICAg IGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKFdlYkluc3BlY3Rv ci51c2VMb3dlckNhc2VNZW51VGl0bGVzKCkgPyAiRGlzYWJsZSBicmVha3BvaW50IiA6ICJEaXNh YmxlIEJyZWFrcG9pbnQiKSwgc2V0QnJlYWtwb2ludEVuYWJsZWQuYmluZCh0aGlzLCBmYWxzZSkp OwpAQCAtMjMxLDcgKzIzMyw3IEBAIFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUu cHJvdG90eXBlID0gewogICAgICAgICB9CiAKICAgICAgICAgZm9yICh2YXIgbGluZU51bWJlciBp biB0aGlzLl9qYXZhU2NyaXB0U291cmNlRnJhbWVTdGF0ZS5icmVha3BvaW50cykKLSAgICAgICAg ICAgIHRoaXMuX2RlbGVnYXRlLnJlbW92ZUJyZWFrcG9pbnQoTnVtYmVyKGxpbmVOdW1iZXIpKTsK KyAgICAgICAgICAgIHRoaXMuX21vZGVsLnJlbW92ZUJyZWFrcG9pbnQodGhpcy5fdWlTb3VyY2VD b2RlLCBOdW1iZXIobGluZU51bWJlcikpOwogCiAgICAgICAgIGZvciAodmFyIGxpbmVOdW1iZXIg aW4gbmV3QnJlYWtwb2ludHMpIHsKICAgICAgICAgICAgIHZhciBicmVha3BvaW50ID0gbmV3QnJl YWtwb2ludHNbbGluZU51bWJlcl07CkBAIC0zNjQsMTIgKzM2NiwxMiBAQCBXZWJJbnNwZWN0b3Iu SmF2YVNjcmlwdFNvdXJjZUZyYW1lLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJldHVybjsK ICAgICAgICAgdmFyIGxpbmVOdW1iZXIgPSB0YXJnZXQubGluZU51bWJlcjsKIAotICAgICAgICB2 YXIgYnJlYWtwb2ludCA9IHRoaXMuX2RlbGVnYXRlLmZpbmRCcmVha3BvaW50KGxpbmVOdW1iZXIp OworICAgICAgICB2YXIgYnJlYWtwb2ludCA9IHRoaXMuX21vZGVsLmZpbmRCcmVha3BvaW50KHRo aXMuX3VpU291cmNlQ29kZSwgbGluZU51bWJlcik7CiAgICAgICAgIGlmIChicmVha3BvaW50KSB7 CiAgICAgICAgICAgICBpZiAoZXZlbnQuc2hpZnRLZXkpCi0gICAgICAgICAgICAgICAgdGhpcy5f ZGVsZWdhdGUudXBkYXRlQnJlYWtwb2ludChsaW5lTnVtYmVyLCBicmVha3BvaW50LmNvbmRpdGlv biwgIWJyZWFrcG9pbnQuZW5hYmxlZCk7CisgICAgICAgICAgICAgICAgdGhpcy5fbW9kZWwudXBk YXRlQnJlYWtwb2ludCh0aGlzLl91aVNvdXJjZUNvZGUsIGxpbmVOdW1iZXIsIGJyZWFrcG9pbnQu Y29uZGl0aW9uLCAhYnJlYWtwb2ludC5lbmFibGVkKTsKICAgICAgICAgICAgIGVsc2UKLSAgICAg ICAgICAgICAgICB0aGlzLl9kZWxlZ2F0ZS5yZW1vdmVCcmVha3BvaW50KGxpbmVOdW1iZXIpOwor ICAgICAgICAgICAgICAgIHRoaXMuX21vZGVsLnJlbW92ZUJyZWFrcG9pbnQodGhpcy5fdWlTb3Vy Y2VDb2RlLCBsaW5lTnVtYmVyKTsKICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICB0aGlzLl9k ZWxlZ2F0ZS5zZXRCcmVha3BvaW50KGxpbmVOdW1iZXIsICIiLCB0cnVlKTsKICAgICAgICAgZXZl bnQucHJldmVudERlZmF1bHQoKTsKQEAgLTQ3MywyNSArNDc1LDggQEAgV2ViSW5zcGVjdG9yLkph dmFTY3JpcHRTb3VyY2VGcmFtZURlbGVnYXRlID0gZnVuY3Rpb24oKQogfQogCiBXZWJJbnNwZWN0 b3IuSmF2YVNjcmlwdFNvdXJjZUZyYW1lRGVsZWdhdGUucHJvdG90eXBlID0gewotICAgIHJlcXVl c3RDb250ZW50OiBmdW5jdGlvbihjYWxsYmFjaykgeyB9LAotCiAgICAgc2V0QnJlYWtwb2ludDog ZnVuY3Rpb24obGluZU51bWJlciwgY29uZGl0aW9uLCBlbmFibGVkKSB7IH0sCiAKLSAgICByZW1v dmVCcmVha3BvaW50OiBmdW5jdGlvbihsaW5lTnVtYmVyKSB7IH0sCi0KLSAgICB1cGRhdGVCcmVh a3BvaW50OiBmdW5jdGlvbihsaW5lTnVtYmVyLCBjb25kaXRpb24sIGVuYWJsZWQpIHsgfSwKLQot ICAgIC8qKgotICAgICAqIEByZXR1cm4gez9XZWJJbnNwZWN0b3IuQnJlYWtwb2ludH0KLSAgICAg Ki8KLSAgICBmaW5kQnJlYWtwb2ludDogZnVuY3Rpb24obGluZU51bWJlcikgeyB9LAotCi0gICAg Y29udGludWVUb0xpbmU6IGZ1bmN0aW9uKGxpbmVOdW1iZXIpIHsgfSwKLQotICAgIGNhbkVkaXRT Y3JpcHRTb3VyY2U6IGZ1bmN0aW9uKCkgeyByZXR1cm4gZmFsc2U7IH0sCi0KLSAgICBzZXRTY3Jp cHRTb3VyY2U6IGZ1bmN0aW9uKHRleHQsIGNhbGxiYWNrKSB7IH0sCi0KICAgICBzZXRTY3JpcHRT b3VyY2VJc0JlaW5nRWRpdGVkOiBmdW5jdGlvbihpbkVkaXRNb2RlKSB7IH0sCiAKICAgICBzdWdn ZXN0ZWRGaWxlTmFtZTogZnVuY3Rpb24oKSB7IH0sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4IGEwNTRlOWNlYTRlMzQ4Zjc4 NzQxOGRhMWYxODE4NGY0ZmFmNTNjYzguLjZiZWQ1MTlhZDk3NjE3YjA0ZWNiMWVmYTE2ZjUyZDI2 N2RjNGIwMTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U2NyaXB0c1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U2NyaXB0c1BhbmVsLmpzCkBAIC0xMTc1LDExICsxMTc1LDYgQEAgV2ViSW5zcGVjdG9yLlNvdXJj ZUZyYW1lRGVsZWdhdGVGb3JTY3JpcHRzUGFuZWwgPSBmdW5jdGlvbihzY3JpcHRzUGFuZWwsIHVp U291cmMKIH0KIAogV2ViSW5zcGVjdG9yLlNvdXJjZUZyYW1lRGVsZWdhdGVGb3JTY3JpcHRzUGFu ZWwucHJvdG90eXBlID0gewotICAgIHJlcXVlc3RDb250ZW50OiBmdW5jdGlvbihjYWxsYmFjaykK LSAgICB7Ci0gICAgICAgIHRoaXMuX3VpU291cmNlQ29kZS5yZXF1ZXN0Q29udGVudChjYWxsYmFj ayk7Ci0gICAgfSwKLQogICAgIHNldEJyZWFrcG9pbnQ6IGZ1bmN0aW9uKGxpbmVOdW1iZXIsIGNv bmRpdGlvbiwgZW5hYmxlZCkKICAgICB7CiAgICAgICAgIHRoaXMuX21vZGVsLnNldEJyZWFrcG9p bnQodGhpcy5fdWlTb3VyY2VDb2RlLCBsaW5lTnVtYmVyLCBjb25kaXRpb24sIGVuYWJsZWQpOwpA QCAtMTE4OCwzNiArMTE4Myw2IEBAIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZURlbGVnYXRlRm9y U2NyaXB0c1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuX3NjcmlwdHNQYW5l bC5fdG9nZ2xlQnJlYWtwb2ludHNDbGlja2VkKCk7CiAgICAgfSwKIAotICAgIHVwZGF0ZUJyZWFr cG9pbnQ6IGZ1bmN0aW9uKGxpbmVOdW1iZXIsIGNvbmRpdGlvbiwgZW5hYmxlZCkKLSAgICB7Ci0g ICAgICAgIHRoaXMuX21vZGVsLnVwZGF0ZUJyZWFrcG9pbnQodGhpcy5fdWlTb3VyY2VDb2RlLCBs aW5lTnVtYmVyLCBjb25kaXRpb24sIGVuYWJsZWQpOwotICAgIH0sCi0KLSAgICByZW1vdmVCcmVh a3BvaW50OiBmdW5jdGlvbihsaW5lTnVtYmVyKQotICAgIHsKLSAgICAgICAgdGhpcy5fbW9kZWwu cmVtb3ZlQnJlYWtwb2ludCh0aGlzLl91aVNvdXJjZUNvZGUsIGxpbmVOdW1iZXIpOwotICAgIH0s Ci0KLSAgICBmaW5kQnJlYWtwb2ludDogZnVuY3Rpb24obGluZU51bWJlcikKLSAgICB7Ci0gICAg ICAgIHJldHVybiB0aGlzLl9tb2RlbC5maW5kQnJlYWtwb2ludCh0aGlzLl91aVNvdXJjZUNvZGUs IGxpbmVOdW1iZXIpOwotICAgIH0sCi0KLSAgICBjb250aW51ZVRvTGluZTogZnVuY3Rpb24obGlu ZU51bWJlcikKLSAgICB7Ci0gICAgICAgIHRoaXMuX21vZGVsLmNvbnRpbnVlVG9MaW5lKHRoaXMu X3VpU291cmNlQ29kZSwgbGluZU51bWJlcik7Ci0gICAgfSwKLQotICAgIGNhbkVkaXRTY3JpcHRT b3VyY2U6IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9tb2RlbC5jYW5F ZGl0U2NyaXB0U291cmNlKHRoaXMuX3VpU291cmNlQ29kZSk7Ci0gICAgfSwKLQotICAgIHNldFNj cmlwdFNvdXJjZTogZnVuY3Rpb24odGV4dCwgY2FsbGJhY2spCi0gICAgewotICAgICAgICB0aGlz Ll9tb2RlbC5zZXRTY3JpcHRTb3VyY2UodGhpcy5fdWlTb3VyY2VDb2RlLCB0ZXh0LCBjYWxsYmFj ayk7Ci0gICAgfSwKLQogICAgIHNldFNjcmlwdFNvdXJjZUlzQmVpbmdFZGl0ZWQ6IGZ1bmN0aW9u KGluRWRpdE1vZGUpCiAgICAgewogICAgICAgICB0aGlzLl9zY3JpcHRzUGFuZWwuX3NldFNjcmlw dFNvdXJjZUlzQmVpbmdFZGl0ZWQodGhpcy5fdWlTb3VyY2VDb2RlLCBpbkVkaXRNb2RlKTsKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpp bmRleCAxM2RiMWJlNDBiZjE4ZWNmMWY3NmQ4NTUxZWE5ZDA4ZjRhOTE3NzZmLi5lMTBkMGMyMDI5 MTcyOWM3NDQ3ZGQ5NmUwYmZhNDE4OGJiNWZhZmQ4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIw MTEtMTEtMDggIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKworICAgICAg ICBXZWIgSW5zcGVjdG9yOiBbcmVmYWN0b3JpbmddIHJlbW92ZSBhIGJ1bmNoIG9mIG1ldGhvZHMg ZnJvbSBKYXZhU2NyaXB0U291cmNlRnJhbWVEZWxlZ2F0ZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzE4MjYKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGh0dHAvdGVzdHMvaW5zcGVjdG9yL2RlYnVnZ2Vy LXRlc3QuanM6CisgICAgICAgIChpbml0aWFsaXplX0RlYnVnZ2VyVGVzdCk6CisKIDIwMTEtMTEt MDggIE5pa29sYXMgWmltbWVybWFubiAgPG56aW1tZXJtYW5uQHJpbS5jb20+CiAKICAgICAgICAg Tm90IHJldmlld2VkLiBSZWJhc2VsaW5lIHF0IHJlc3VsdHMgYWZ0ZXIgdGhlIHJlY2VudCBTVkdJ bWFnZSBjaGFuZ2VzLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0 b3IvZGVidWdnZXItdGVzdC5qcyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL2Rl YnVnZ2VyLXRlc3QuanMKaW5kZXggZmMyNDdiZmQxM2RkNTc0MmQ4NjU5MTkzY2ZmZDU2YTkwYTUw MjQ2Mi4uYmMxZDViZGQ3NGRiNmZmZmVlNzM0NGQ1MWM0YjU3M2YyZDZlODkyNiAxMDA2NDQKLS0t IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvZGVidWdnZXItdGVzdC5qcworKysg Yi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9kZWJ1Z2dlci10ZXN0LmpzCkBAIC0x ODAsNyArMTgwLDcgQEAgSW5zcGVjdG9yVGVzdC5zZXRCcmVha3BvaW50ID0gZnVuY3Rpb24oc291 cmNlRnJhbWUsIGxpbmVOdW1iZXIsIGNvbmRpdGlvbiwgZW5hYmwKIAogSW5zcGVjdG9yVGVzdC5y ZW1vdmVCcmVha3BvaW50ID0gZnVuY3Rpb24oc291cmNlRnJhbWUsIGxpbmVOdW1iZXIpCiB7Ci0g ICAgc291cmNlRnJhbWUuX2RlbGVnYXRlLnJlbW92ZUJyZWFrcG9pbnQobGluZU51bWJlcik7Cisg ICAgc291cmNlRnJhbWUuX21vZGVsLnJlbW92ZUJyZWFrcG9pbnQoc291cmNlRnJhbWUuX3VpU291 cmNlQ29kZSwgbGluZU51bWJlcik7CiB9OwogCiAK