107116 2013-01-17 04:47:04 -0800 Web Inspector: [Network] Fix JSDocs and deduplicate code. 2013-01-18 01:14:47 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 eustas eustas apavlov caseq eustas keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 809273 0 eustas 2013-01-17 04:47:04 -0800 Add / fix JSDocs to see possible type mismatches. Deduplicate code for styling network log items. 809275 1 183166 eustas 2013-01-17 04:48:57 -0800 Created attachment 183166 Patch 809278 2 183167 eustas 2013-01-17 05:02:24 -0800 Created attachment 183167 Patch 810344 3 183167 webkit.review.bot 2013-01-18 01:14:43 -0800 Comment on attachment 183167 Patch Clearing flags on attachment: 183167 Committed r140107: <http://trac.webkit.org/changeset/140107> 810345 4 webkit.review.bot 2013-01-18 01:14:47 -0800 All reviewed patches have been landed. Closing bug. 183166 2013-01-17 04:48:57 -0800 2013-01-17 05:02:18 -0800 Patch bug-107116-20130117164557.patch text/plain 6921 eustas U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5OTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTRlNjVjNWI1OWI1MjA0 NTdiMzIyOGI2MTE2YzFlYmEyNWNjMTAzNS4uZjlhZWM1NWQzYzE2NGIzNjIyZDlkM2EwZmZhMzQ0 NWMwNmQxMDhjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTAxLTE3ICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFtOZXR3b3JrXSBGaXggSlNEb2NzIGFuZCBkZWR1cGxpY2F0ZSBjb2RlLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3MTE2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIC8gZml4IEpTRG9j cyB0byBzZWUgcG9zc2libGUgdHlwZSBtaXNtYXRjaGVzLgorICAgICAgICBEZWR1cGxpY2F0ZSBj b2RlIGZvciBzdHlsaW5nIG5ldHdvcmsgbG9nIGl0ZW1zLgorCisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanM6IEZpeCBKU0RvY3MuCisgICAgICAgIChXZWJJbnNw ZWN0b3IuTmV0d29ya0RhdGFHcmlkTm9kZS5wcm90b3R5cGUuX3VwZGF0ZUVsZW1lbnRTdHlsZUNs YXNzZXMpOgorICAgICAgICBFeHRyYWN0IGNvbW1vbiBjb2RlLgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvTmV0d29ya1JlcXVlc3QuanM6IEZpeCBKU0RvY3MuCisKIDIwMTMtMDEtMTYg IE1PUklUQSBIYWppbWUgIDxtb3JyaXRhQGdvb2dsZS5jb20+CiAKICAgICAgICAgQXR0ci5vd25l ckRvY3VtZW50IHNob3VsZCBjaGFuZ2UgaWYgaXRzIHBhcmVudCdzIG93bmVyIGRpZApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwppbmRl eCBlOTAzZWI1MWMzNTg0ZDJmY2ZmZWQxMzg0NzFiMGFmNzljMjc2NGQxLi5mZWM4Nzc1N2M0MDI4 YjE2YmM0NTk2MjQwMjE4NTE5ZWZjNjA3ZDhiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwpAQCAtNDIyLDcgKzQyMiw3IEBAIFdl Ykluc3BlY3Rvci5OZXR3b3JrTG9nVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB2YXIg cmVxdWVzdCA9IHRoaXMuX3JlcXVlc3RzW2ldOwogICAgICAgICAgICAgdmFyIHJlcXVlc3RUcmFu c2ZlclNpemUgPSAocmVxdWVzdC5jYWNoZWQgfHwgIXJlcXVlc3QudHJhbnNmZXJTaXplKSA/IDAg OiByZXF1ZXN0LnRyYW5zZmVyU2l6ZTsKICAgICAgICAgICAgIHRyYW5zZmVyU2l6ZSArPSByZXF1 ZXN0VHJhbnNmZXJTaXplOwotICAgICAgICAgICAgaWYgKCghdGhpcy5faGlkZGVuQ2F0ZWdvcmll cy5hbGwgfHwgIXRoaXMuX2hpZGRlbkNhdGVnb3JpZXNbcmVxdWVzdC50eXBlLm5hbWUoKV0pICYm ICF0aGlzLl9maWx0ZXJlZE91dFJlcXVlc3RzLmdldChyZXF1ZXN0KSkgeworICAgICAgICAgICAg aWYgKCghdGhpcy5faGlkZGVuQ2F0ZWdvcmllc1siYWxsIl0gfHwgIXRoaXMuX2hpZGRlbkNhdGVn b3JpZXNbcmVxdWVzdC50eXBlLm5hbWUoKV0pICYmICF0aGlzLl9maWx0ZXJlZE91dFJlcXVlc3Rz LmdldChyZXF1ZXN0KSkgewogICAgICAgICAgICAgICAgIHNlbGVjdGVkUmVxdWVzdHNOdW1iZXIr KzsKICAgICAgICAgICAgICAgICBzZWxlY3RlZFRyYW5zZmVyU2l6ZSArPSByZXF1ZXN0VHJhbnNm ZXJTaXplOwogICAgICAgICAgICAgfQpAQCAtMTg2OCw2ICsxODY4LDggQEAgV2ViSW5zcGVjdG9y Lk5ldHdvcmtUcmFuc2ZlckR1cmF0aW9uQ2FsY3VsYXRvci5wcm90b3R5cGUgPSB7CiAvKioKICAq IEBjb25zdHJ1Y3RvcgogICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5EYXRhR3JpZE5vZGV9Cisg KiBAcGFyYW0geyFXZWJJbnNwZWN0b3IuTmV0d29ya0xvZ1ZpZXd9IHBhcmVudFZpZXcKKyAqIEBw YXJhbSB7IVdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdH0gcmVxdWVzdAogICovCiBXZWJJbnNw ZWN0b3IuTmV0d29ya0RhdGFHcmlkTm9kZSA9IGZ1bmN0aW9uKHBhcmVudFZpZXcsIHJlcXVlc3Qp CiB7CkBAIC0xODk4LDcgKzE5MDAsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0RhdGFHcmlkTm9k ZS5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICBpZiAodGhpcy5fcGFyZW50Vmlldy5fZmls dGVyZWRPdXRSZXF1ZXN0cy5nZXQodGhpcy5fcmVxdWVzdCkpCiAgICAgICAgICAgICByZXR1cm4g dHJ1ZTsKLSAgICAgICAgaWYgKCF0aGlzLl9wYXJlbnRWaWV3Ll9oaWRkZW5DYXRlZ29yaWVzLmFs bCkKKyAgICAgICAgaWYgKCF0aGlzLl9wYXJlbnRWaWV3Ll9oaWRkZW5DYXRlZ29yaWVzWyJhbGwi XSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgcmV0dXJuIHRoaXMuX3JlcXVl c3QudHlwZS5uYW1lKCkgaW4gdGhpcy5fcGFyZW50Vmlldy5faGlkZGVuQ2F0ZWdvcmllczsKICAg ICB9LApAQCAtMjAwMiw5ICsyMDA0LDE4IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrRGF0YUdyaWRO b2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuX2dyYXBoRWxlbWVudC5hZGRTdHls ZUNsYXNzKCJyZXNvdXJjZS1jYWNoZWQiKTsKIAogICAgICAgICB0aGlzLl9lbGVtZW50LmFkZFN0 eWxlQ2xhc3MoIm5ldHdvcmstaXRlbSIpOwotICAgICAgICBpZiAoIXRoaXMuX2VsZW1lbnQuaGFz U3R5bGVDbGFzcygibmV0d29yay10eXBlLSIgKyB0aGlzLl9yZXF1ZXN0LnR5cGUubmFtZSgpKSkg eworICAgICAgICB0aGlzLl91cGRhdGVFbGVtZW50U3R5bGVDbGFzc2VzKHRoaXMuX2VsZW1lbnQp OworICAgIH0sCisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0geyFFbGVtZW50fSBlbGVtZW50Cisg ICAgICovCisgICAgX3VwZGF0ZUVsZW1lbnRTdHlsZUNsYXNzZXM6IGZ1bmN0aW9uKGVsZW1lbnQp CisgICAgeworICAgICAgICB2YXIgdHlwZUNsYXNzTmFtZSA9ICJuZXR3b3JrLXR5cGUtIiArIHRo aXMuX3JlcXVlc3QudHlwZS5uYW1lKCk7CisgICAgICAgIGlmICghdGhpcy5fZWxlbWVudC5oYXNT dHlsZUNsYXNzKHR5cGVDbGFzc05hbWUpKSB7CiAgICAgICAgICAgICB0aGlzLl9lbGVtZW50LnJl bW92ZU1hdGNoaW5nU3R5bGVDbGFzc2VzKCJuZXR3b3JrLXR5cGUtXFx3KyIpOwotICAgICAgICAg ICAgdGhpcy5fZWxlbWVudC5hZGRTdHlsZUNsYXNzKCJuZXR3b3JrLXR5cGUtIiArIHRoaXMuX3Jl cXVlc3QudHlwZS5uYW1lKCkpOworICAgICAgICAgICAgdGhpcy5fZWxlbWVudC5hZGRTdHlsZUNs YXNzKHR5cGVDbGFzc05hbWUpOwogICAgICAgICB9CiAgICAgfSwKIApAQCAtMjA1Miw3ICsyMDYz LDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtEYXRhR3JpZE5vZGUucHJvdG90eXBlID0gewogICAg ICAgICB0aGlzLmVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygibmV0d29yay1lcnJvci1yb3ciKTsK IAogICAgICAgICBpZiAodGhpcy5fcmVxdWVzdC5zdGF0dXNDb2RlKSB7Ci0gICAgICAgICAgICB0 aGlzLl9zdGF0dXNDZWxsLmFwcGVuZENoaWxkKGRvY3VtZW50LmNyZWF0ZVRleHROb2RlKHRoaXMu X3JlcXVlc3Quc3RhdHVzQ29kZSkpOworICAgICAgICAgICAgdGhpcy5fc3RhdHVzQ2VsbC5hcHBl bmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSgiIiArIHRoaXMuX3JlcXVlc3Quc3RhdHVz Q29kZSkpOwogICAgICAgICAgICAgdGhpcy5fYXBwZW5kU3VidGl0bGUodGhpcy5fc3RhdHVzQ2Vs bCwgdGhpcy5fcmVxdWVzdC5zdGF0dXNUZXh0KTsKICAgICAgICAgICAgIHRoaXMuX3N0YXR1c0Nl bGwudGl0bGUgPSB0aGlzLl9yZXF1ZXN0LnN0YXR1c0NvZGUgKyAiICIgKyB0aGlzLl9yZXF1ZXN0 LnN0YXR1c1RleHQ7CiAgICAgICAgICAgICBpZiAodGhpcy5fcmVxdWVzdC5zdGF0dXNDb2RlID49 IDQwMCkKQEAgLTIwOTYsMTMgKzIxMDcsMTMgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtEYXRhR3Jp ZE5vZGUucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9pbml0aWF0b3JDZWxsLnJlbW92ZVN0 eWxlQ2xhc3MoIm5ldHdvcmstZGltLWNlbGwiKTsKICAgICAgICAgdGhpcy5faW5pdGlhdG9yQ2Vs bC5yZW1vdmVTdHlsZUNsYXNzKCJuZXR3b3JrLXNjcmlwdC1pbml0aWF0ZWQiKTsKICAgICAgICAg ZGVsZXRlIHRoaXMuX2luaXRpYXRvckNlbGwucmVxdWVzdDsKLSAgICAgICAgdGhpcy5faW5pdGlh dG9yQ2VsbC50aXRsZSA9IG51bGw7CisgICAgICAgIHRoaXMuX2luaXRpYXRvckNlbGwudGl0bGUg PSAiIjsKIAogICAgICAgICB2YXIgaW5pdGlhdG9yID0gdGhpcy5fcmVxdWVzdC5pbml0aWF0b3I7 CiAgICAgICAgIGlmICgoaW5pdGlhdG9yICYmIGluaXRpYXRvci50eXBlICE9PSAib3RoZXIiKSB8 fCB0aGlzLl9yZXF1ZXN0LnJlZGlyZWN0U291cmNlKSB7CiAgICAgICAgICAgICB0aGlzLl9pbml0 aWF0b3JDZWxsLnJlbW92ZUNoaWxkcmVuKCk7Ci0gICAgICAgICAgICBpZiAodGhpcy5fcmVxdWVz dC5yZWRpcmVjdFNvdXJjZSkgewotICAgICAgICAgICAgICAgIHZhciByZWRpcmVjdFNvdXJjZSA9 IHRoaXMuX3JlcXVlc3QucmVkaXJlY3RTb3VyY2U7CisgICAgICAgICAgICB2YXIgcmVkaXJlY3RT b3VyY2UgPSB0aGlzLl9yZXF1ZXN0LnJlZGlyZWN0U291cmNlOworICAgICAgICAgICAgaWYgKHJl ZGlyZWN0U291cmNlKSB7CiAgICAgICAgICAgICAgICAgdGhpcy5faW5pdGlhdG9yQ2VsbC50aXRs ZSA9IHJlZGlyZWN0U291cmNlLnVybDsKICAgICAgICAgICAgICAgICB0aGlzLl9pbml0aWF0b3JD ZWxsLmFwcGVuZENoaWxkKFdlYkluc3BlY3Rvci5saW5raWZ5UmVxdWVzdEFzTm9kZShyZWRpcmVj dFNvdXJjZSkpOwogICAgICAgICAgICAgICAgIHRoaXMuX2FwcGVuZFN1YnRpdGxlKHRoaXMuX2lu aXRpYXRvckNlbGwsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVkaXJlY3QiKSk7CkBAIC0yMTE1 LDcgKzIxMjYsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0RhdGFHcmlkTm9kZS5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgICAgICB9CiAgICAg ICAgICAgICAgICAgdmFyIHVybEVsZW1lbnQgPSB0aGlzLl9wYXJlbnRWaWV3Ll9saW5raWZpZXIu bGlua2lmeUxvY2F0aW9uKHRvcEZyYW1lLnVybCwgdG9wRnJhbWUubGluZU51bWJlciAtIDEsIDAp OwotICAgICAgICAgICAgICAgIHVybEVsZW1lbnQudGl0bGUgPSBudWxsOworICAgICAgICAgICAg ICAgIHVybEVsZW1lbnQudGl0bGUgPSAiIjsKICAgICAgICAgICAgICAgICB0aGlzLl9pbml0aWF0 b3JDZWxsLmFwcGVuZENoaWxkKHVybEVsZW1lbnQpOwogICAgICAgICAgICAgICAgIHRoaXMuX2Fw cGVuZFN1YnRpdGxlKHRoaXMuX2luaXRpYXRvckNlbGwsIFdlYkluc3BlY3Rvci5VSVN0cmluZygi U2NyaXB0IikpOwogICAgICAgICAgICAgICAgIHRoaXMuX2luaXRpYXRvckNlbGwuYWRkU3R5bGVD bGFzcygibmV0d29yay1zY3JpcHQtaW5pdGlhdGVkIik7CkBAIC0yMTcxLDExICsyMTgyLDcgQEAg V2ViSW5zcGVjdG9yLk5ldHdvcmtEYXRhR3JpZE5vZGUucHJvdG90eXBlID0gewogICAgICAgICB0 aGlzLl9wZXJjZW50YWdlcyA9IHBlcmNlbnRhZ2VzOwogCiAgICAgICAgIHRoaXMuX2JhckFyZWFF bGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoImhpZGRlbiIpOwotCi0gICAgICAgIGlmICghdGhpcy5f Z3JhcGhFbGVtZW50Lmhhc1N0eWxlQ2xhc3MoIm5ldHdvcmstdHlwZS0iICsgdGhpcy5fcmVxdWVz dC50eXBlLm5hbWUoKSkpIHsKLSAgICAgICAgICAgIHRoaXMuX2dyYXBoRWxlbWVudC5yZW1vdmVN YXRjaGluZ1N0eWxlQ2xhc3NlcygibmV0d29yay10eXBlLVxcdysiKTsKLSAgICAgICAgICAgIHRo aXMuX2dyYXBoRWxlbWVudC5hZGRTdHlsZUNsYXNzKCJuZXR3b3JrLXR5cGUtIiArIHRoaXMuX3Jl cXVlc3QudHlwZS5uYW1lKCkpOwotICAgICAgICB9CisgICAgICAgIHRoaXMuX3VwZGF0ZUVsZW1l bnRTdHlsZUNsYXNzZXModGhpcy5fZ3JhcGhFbGVtZW50KTsKIAogICAgICAgICB0aGlzLl9iYXJM ZWZ0RWxlbWVudC5zdHlsZS5zZXRQcm9wZXJ0eSgibGVmdCIsIHBlcmNlbnRhZ2VzLnN0YXJ0ICsg IiUiKTsKICAgICAgICAgdGhpcy5fYmFyUmlnaHRFbGVtZW50LnN0eWxlLnNldFByb3BlcnR5KCJy aWdodCIsICgxMDAgLSBwZXJjZW50YWdlcy5lbmQpICsgIiUiKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya1JlcXVlc3QuanMgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtSZXF1ZXN0LmpzCmluZGV4IGMwMGNk Y2JlNGViZWNkMjAwYjQ0M2JmNWU4ZTQ3YjdiODFlYzI2ZjYuLjU1Y2M0ZThjNTk4YmI2NzlkYzVi ODlmMzlkMmZiZTdkNWI0OTZkZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvTmV0d29ya1JlcXVlc3QuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9OZXR3b3JrUmVxdWVzdC5qcwpAQCAtNDMyLDcgKzQzMiw3IEBAIFdlYklu c3BlY3Rvci5OZXR3b3JrUmVxdWVzdC5wcm90b3R5cGUgPSB7CiAgICAgfSwKIAogICAgIC8qKgot ICAgICAqIEByZXR1cm4ge1dlYkluc3BlY3Rvci5SZXNvdXJjZXx1bmRlZmluZWR9CisgICAgICog QHJldHVybiB7P1dlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdH0KICAgICAgKi8KICAgICBnZXQg cmVkaXJlY3RTb3VyY2UoKQogICAgIHsK 183167 2013-01-17 05:02:24 -0800 2013-01-18 01:14:43 -0800 Patch bug-107116-20130117165924.patch text/plain 6979 eustas U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5OTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTRlNjVjNWI1OWI1MjA0 NTdiMzIyOGI2MTE2YzFlYmEyNWNjMTAzNS4uZjlhZWM1NWQzYzE2NGIzNjIyZDlkM2EwZmZhMzQ0 NWMwNmQxMDhjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEzLTAxLTE3ICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFtOZXR3b3JrXSBGaXggSlNEb2NzIGFuZCBkZWR1cGxpY2F0ZSBjb2RlLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTA3MTE2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIC8gZml4IEpTRG9j cyB0byBzZWUgcG9zc2libGUgdHlwZSBtaXNtYXRjaGVzLgorICAgICAgICBEZWR1cGxpY2F0ZSBj b2RlIGZvciBzdHlsaW5nIG5ldHdvcmsgbG9nIGl0ZW1zLgorCisgICAgICAgICogaW5zcGVjdG9y L2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanM6IEZpeCBKU0RvY3MuCisgICAgICAgIChXZWJJbnNw ZWN0b3IuTmV0d29ya0RhdGFHcmlkTm9kZS5wcm90b3R5cGUuX3VwZGF0ZUVsZW1lbnRTdHlsZUNs YXNzZXMpOgorICAgICAgICBFeHRyYWN0IGNvbW1vbiBjb2RlLgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvTmV0d29ya1JlcXVlc3QuanM6IEZpeCBKU0RvY3MuCisKIDIwMTMtMDEtMTYg IE1PUklUQSBIYWppbWUgIDxtb3JyaXRhQGdvb2dsZS5jb20+CiAKICAgICAgICAgQXR0ci5vd25l ckRvY3VtZW50IHNob3VsZCBjaGFuZ2UgaWYgaXRzIHBhcmVudCdzIG93bmVyIGRpZApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUGFuZWwuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwppbmRl eCBlOTAzZWI1MWMzNTg0ZDJmY2ZmZWQxMzg0NzFiMGFmNzljMjc2NGQxLi45NjA4YWQ4MTRkY2Nm M2FiN2FlOGY5NzYwYzFmN2I3NjU1NTBiZmIwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtQYW5lbC5qcwpAQCAtNDIyLDcgKzQyMiw3IEBAIFdl Ykluc3BlY3Rvci5OZXR3b3JrTG9nVmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB2YXIg cmVxdWVzdCA9IHRoaXMuX3JlcXVlc3RzW2ldOwogICAgICAgICAgICAgdmFyIHJlcXVlc3RUcmFu c2ZlclNpemUgPSAocmVxdWVzdC5jYWNoZWQgfHwgIXJlcXVlc3QudHJhbnNmZXJTaXplKSA/IDAg OiByZXF1ZXN0LnRyYW5zZmVyU2l6ZTsKICAgICAgICAgICAgIHRyYW5zZmVyU2l6ZSArPSByZXF1 ZXN0VHJhbnNmZXJTaXplOwotICAgICAgICAgICAgaWYgKCghdGhpcy5faGlkZGVuQ2F0ZWdvcmll cy5hbGwgfHwgIXRoaXMuX2hpZGRlbkNhdGVnb3JpZXNbcmVxdWVzdC50eXBlLm5hbWUoKV0pICYm ICF0aGlzLl9maWx0ZXJlZE91dFJlcXVlc3RzLmdldChyZXF1ZXN0KSkgeworICAgICAgICAgICAg aWYgKCghdGhpcy5faGlkZGVuQ2F0ZWdvcmllc1siYWxsIl0gfHwgIXRoaXMuX2hpZGRlbkNhdGVn b3JpZXNbcmVxdWVzdC50eXBlLm5hbWUoKV0pICYmICF0aGlzLl9maWx0ZXJlZE91dFJlcXVlc3Rz LmdldChyZXF1ZXN0KSkgewogICAgICAgICAgICAgICAgIHNlbGVjdGVkUmVxdWVzdHNOdW1iZXIr KzsKICAgICAgICAgICAgICAgICBzZWxlY3RlZFRyYW5zZmVyU2l6ZSArPSByZXF1ZXN0VHJhbnNm ZXJTaXplOwogICAgICAgICAgICAgfQpAQCAtMTg2OCw2ICsxODY4LDggQEAgV2ViSW5zcGVjdG9y Lk5ldHdvcmtUcmFuc2ZlckR1cmF0aW9uQ2FsY3VsYXRvci5wcm90b3R5cGUgPSB7CiAvKioKICAq IEBjb25zdHJ1Y3RvcgogICogQGV4dGVuZHMge1dlYkluc3BlY3Rvci5EYXRhR3JpZE5vZGV9Cisg KiBAcGFyYW0geyFXZWJJbnNwZWN0b3IuTmV0d29ya0xvZ1ZpZXd9IHBhcmVudFZpZXcKKyAqIEBw YXJhbSB7IVdlYkluc3BlY3Rvci5OZXR3b3JrUmVxdWVzdH0gcmVxdWVzdAogICovCiBXZWJJbnNw ZWN0b3IuTmV0d29ya0RhdGFHcmlkTm9kZSA9IGZ1bmN0aW9uKHBhcmVudFZpZXcsIHJlcXVlc3Qp CiB7CkBAIC0xODk4LDcgKzE5MDAsNyBAQCBXZWJJbnNwZWN0b3IuTmV0d29ya0RhdGFHcmlkTm9k ZS5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICBpZiAodGhpcy5fcGFyZW50Vmlldy5fZmls dGVyZWRPdXRSZXF1ZXN0cy5nZXQodGhpcy5fcmVxdWVzdCkpCiAgICAgICAgICAgICByZXR1cm4g dHJ1ZTsKLSAgICAgICAgaWYgKCF0aGlzLl9wYXJlbnRWaWV3Ll9oaWRkZW5DYXRlZ29yaWVzLmFs bCkKKyAgICAgICAgaWYgKCF0aGlzLl9wYXJlbnRWaWV3Ll9oaWRkZW5DYXRlZ29yaWVzWyJhbGwi XSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgcmV0dXJuIHRoaXMuX3JlcXVl c3QudHlwZS5uYW1lKCkgaW4gdGhpcy5fcGFyZW50Vmlldy5faGlkZGVuQ2F0ZWdvcmllczsKICAg ICB9LApAQCAtMjAwMiw5ICsyMDA0LDE4IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrRGF0YUdyaWRO b2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuX2dyYXBoRWxlbWVudC5hZGRTdHls ZUNsYXNzKCJyZXNvdXJjZS1jYWNoZWQiKTsKIAogICAgICAgICB0aGlzLl9lbGVtZW50LmFkZFN0 eWxlQ2xhc3MoIm5ldHdvcmstaXRlbSIpOwotICAgICAgICBpZiAoIXRoaXMuX2VsZW1lbnQuaGFz U3R5bGVDbGFzcygibmV0d29yay10eXBlLSIgKyB0aGlzLl9yZXF1ZXN0LnR5cGUubmFtZSgpKSkg ewotICAgICAgICAgICAgdGhpcy5fZWxlbWVudC5yZW1vdmVNYXRjaGluZ1N0eWxlQ2xhc3Nlcygi bmV0d29yay10eXBlLVxcdysiKTsKLSAgICAgICAgICAgIHRoaXMuX2VsZW1lbnQuYWRkU3R5bGVD bGFzcygibmV0d29yay10eXBlLSIgKyB0aGlzLl9yZXF1ZXN0LnR5cGUubmFtZSgpKTsKKyAgICAg ICAgdGhpcy5fdXBkYXRlRWxlbWVudFN0eWxlQ2xhc3Nlcyh0aGlzLl9lbGVtZW50KTsKKyAgICB9 LAorCisgICAgLyoqCisgICAgICogQHBhcmFtIHshRWxlbWVudH0gZWxlbWVudAorICAgICAqLwor ICAgIF91cGRhdGVFbGVtZW50U3R5bGVDbGFzc2VzOiBmdW5jdGlvbihlbGVtZW50KQorICAgIHsK KyAgICAgICAgdmFyIHR5cGVDbGFzc05hbWUgPSAibmV0d29yay10eXBlLSIgKyB0aGlzLl9yZXF1 ZXN0LnR5cGUubmFtZSgpOworICAgICAgICBpZiAoIWVsZW1lbnQuaGFzU3R5bGVDbGFzcyh0eXBl Q2xhc3NOYW1lKSkgeworICAgICAgICAgICAgZWxlbWVudC5yZW1vdmVNYXRjaGluZ1N0eWxlQ2xh c3NlcygibmV0d29yay10eXBlLVxcdysiKTsKKyAgICAgICAgICAgIGVsZW1lbnQuYWRkU3R5bGVD bGFzcyh0eXBlQ2xhc3NOYW1lKTsKICAgICAgICAgfQogICAgIH0sCiAKQEAgLTIwNTIsNyArMjA2 Myw3IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrRGF0YUdyaWROb2RlLnByb3RvdHlwZSA9IHsKICAg ICAgICAgdGhpcy5lbGVtZW50LnJlbW92ZVN0eWxlQ2xhc3MoIm5ldHdvcmstZXJyb3Itcm93Iik7 CiAKICAgICAgICAgaWYgKHRoaXMuX3JlcXVlc3Quc3RhdHVzQ29kZSkgewotICAgICAgICAgICAg dGhpcy5fc3RhdHVzQ2VsbC5hcHBlbmRDaGlsZChkb2N1bWVudC5jcmVhdGVUZXh0Tm9kZSh0aGlz Ll9yZXF1ZXN0LnN0YXR1c0NvZGUpKTsKKyAgICAgICAgICAgIHRoaXMuX3N0YXR1c0NlbGwuYXBw ZW5kQ2hpbGQoZG9jdW1lbnQuY3JlYXRlVGV4dE5vZGUoIiIgKyB0aGlzLl9yZXF1ZXN0LnN0YXR1 c0NvZGUpKTsKICAgICAgICAgICAgIHRoaXMuX2FwcGVuZFN1YnRpdGxlKHRoaXMuX3N0YXR1c0Nl bGwsIHRoaXMuX3JlcXVlc3Quc3RhdHVzVGV4dCk7CiAgICAgICAgICAgICB0aGlzLl9zdGF0dXND ZWxsLnRpdGxlID0gdGhpcy5fcmVxdWVzdC5zdGF0dXNDb2RlICsgIiAiICsgdGhpcy5fcmVxdWVz dC5zdGF0dXNUZXh0OwogICAgICAgICAgICAgaWYgKHRoaXMuX3JlcXVlc3Quc3RhdHVzQ29kZSA+ PSA0MDApCkBAIC0yMDk2LDEzICsyMTA3LDEzIEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrRGF0YUdy aWROb2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5faW5pdGlhdG9yQ2VsbC5yZW1vdmVT dHlsZUNsYXNzKCJuZXR3b3JrLWRpbS1jZWxsIik7CiAgICAgICAgIHRoaXMuX2luaXRpYXRvckNl bGwucmVtb3ZlU3R5bGVDbGFzcygibmV0d29yay1zY3JpcHQtaW5pdGlhdGVkIik7CiAgICAgICAg IGRlbGV0ZSB0aGlzLl9pbml0aWF0b3JDZWxsLnJlcXVlc3Q7Ci0gICAgICAgIHRoaXMuX2luaXRp YXRvckNlbGwudGl0bGUgPSBudWxsOworICAgICAgICB0aGlzLl9pbml0aWF0b3JDZWxsLnRpdGxl ID0gIiI7CiAKICAgICAgICAgdmFyIGluaXRpYXRvciA9IHRoaXMuX3JlcXVlc3QuaW5pdGlhdG9y OwogICAgICAgICBpZiAoKGluaXRpYXRvciAmJiBpbml0aWF0b3IudHlwZSAhPT0gIm90aGVyIikg fHwgdGhpcy5fcmVxdWVzdC5yZWRpcmVjdFNvdXJjZSkgewogICAgICAgICAgICAgdGhpcy5faW5p dGlhdG9yQ2VsbC5yZW1vdmVDaGlsZHJlbigpOwotICAgICAgICAgICAgaWYgKHRoaXMuX3JlcXVl c3QucmVkaXJlY3RTb3VyY2UpIHsKLSAgICAgICAgICAgICAgICB2YXIgcmVkaXJlY3RTb3VyY2Ug PSB0aGlzLl9yZXF1ZXN0LnJlZGlyZWN0U291cmNlOworICAgICAgICAgICAgdmFyIHJlZGlyZWN0 U291cmNlID0gdGhpcy5fcmVxdWVzdC5yZWRpcmVjdFNvdXJjZTsKKyAgICAgICAgICAgIGlmIChy ZWRpcmVjdFNvdXJjZSkgewogICAgICAgICAgICAgICAgIHRoaXMuX2luaXRpYXRvckNlbGwudGl0 bGUgPSByZWRpcmVjdFNvdXJjZS51cmw7CiAgICAgICAgICAgICAgICAgdGhpcy5faW5pdGlhdG9y Q2VsbC5hcHBlbmRDaGlsZChXZWJJbnNwZWN0b3IubGlua2lmeVJlcXVlc3RBc05vZGUocmVkaXJl Y3RTb3VyY2UpKTsKICAgICAgICAgICAgICAgICB0aGlzLl9hcHBlbmRTdWJ0aXRsZSh0aGlzLl9p bml0aWF0b3JDZWxsLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlZGlyZWN0IikpOwpAQCAtMjEx NSw3ICsyMTI2LDcgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtEYXRhR3JpZE5vZGUucHJvdG90eXBl ID0gewogICAgICAgICAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgICAgICAgfQogICAg ICAgICAgICAgICAgIHZhciB1cmxFbGVtZW50ID0gdGhpcy5fcGFyZW50Vmlldy5fbGlua2lmaWVy LmxpbmtpZnlMb2NhdGlvbih0b3BGcmFtZS51cmwsIHRvcEZyYW1lLmxpbmVOdW1iZXIgLSAxLCAw KTsKLSAgICAgICAgICAgICAgICB1cmxFbGVtZW50LnRpdGxlID0gbnVsbDsKKyAgICAgICAgICAg ICAgICB1cmxFbGVtZW50LnRpdGxlID0gIiI7CiAgICAgICAgICAgICAgICAgdGhpcy5faW5pdGlh dG9yQ2VsbC5hcHBlbmRDaGlsZCh1cmxFbGVtZW50KTsKICAgICAgICAgICAgICAgICB0aGlzLl9h cHBlbmRTdWJ0aXRsZSh0aGlzLl9pbml0aWF0b3JDZWxsLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlNjcmlwdCIpKTsKICAgICAgICAgICAgICAgICB0aGlzLl9pbml0aWF0b3JDZWxsLmFkZFN0eWxl Q2xhc3MoIm5ldHdvcmstc2NyaXB0LWluaXRpYXRlZCIpOwpAQCAtMjE3MSwxMSArMjE4Miw3IEBA IFdlYkluc3BlY3Rvci5OZXR3b3JrRGF0YUdyaWROb2RlLnByb3RvdHlwZSA9IHsKICAgICAgICAg dGhpcy5fcGVyY2VudGFnZXMgPSBwZXJjZW50YWdlczsKIAogICAgICAgICB0aGlzLl9iYXJBcmVh RWxlbWVudC5yZW1vdmVTdHlsZUNsYXNzKCJoaWRkZW4iKTsKLQotICAgICAgICBpZiAoIXRoaXMu X2dyYXBoRWxlbWVudC5oYXNTdHlsZUNsYXNzKCJuZXR3b3JrLXR5cGUtIiArIHRoaXMuX3JlcXVl c3QudHlwZS5uYW1lKCkpKSB7Ci0gICAgICAgICAgICB0aGlzLl9ncmFwaEVsZW1lbnQucmVtb3Zl TWF0Y2hpbmdTdHlsZUNsYXNzZXMoIm5ldHdvcmstdHlwZS1cXHcrIik7Ci0gICAgICAgICAgICB0 aGlzLl9ncmFwaEVsZW1lbnQuYWRkU3R5bGVDbGFzcygibmV0d29yay10eXBlLSIgKyB0aGlzLl9y ZXF1ZXN0LnR5cGUubmFtZSgpKTsKLSAgICAgICAgfQorICAgICAgICB0aGlzLl91cGRhdGVFbGVt ZW50U3R5bGVDbGFzc2VzKHRoaXMuX2dyYXBoRWxlbWVudCk7CiAKICAgICAgICAgdGhpcy5fYmFy TGVmdEVsZW1lbnQuc3R5bGUuc2V0UHJvcGVydHkoImxlZnQiLCBwZXJjZW50YWdlcy5zdGFydCAr ICIlIik7CiAgICAgICAgIHRoaXMuX2JhclJpZ2h0RWxlbWVudC5zdHlsZS5zZXRQcm9wZXJ0eSgi cmlnaHQiLCAoMTAwIC0gcGVyY2VudGFnZXMuZW5kKSArICIlIik7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtSZXF1ZXN0LmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrUmVxdWVzdC5qcwppbmRleCBjMDBj ZGNiZTRlYmVjZDIwMGI0NDNiZjVlOGU0N2I3YjgxZWMyNmY2Li41NWNjNGU4YzU5OGJiNjc5ZGM1 Yjg5ZjM5ZDJmYmU3ZDViNDk2ZGUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL05ldHdvcmtSZXF1ZXN0LmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvTmV0d29ya1JlcXVlc3QuanMKQEAgLTQzMiw3ICs0MzIsNyBAQCBXZWJJ bnNwZWN0b3IuTmV0d29ya1JlcXVlc3QucHJvdG90eXBlID0gewogICAgIH0sCiAKICAgICAvKioK LSAgICAgKiBAcmV0dXJuIHtXZWJJbnNwZWN0b3IuUmVzb3VyY2V8dW5kZWZpbmVkfQorICAgICAq IEByZXR1cm4gez9XZWJJbnNwZWN0b3IuTmV0d29ya1JlcXVlc3R9CiAgICAgICovCiAgICAgZ2V0 IHJlZGlyZWN0U291cmNlKCkKICAgICB7Cg==