84331 2012-04-19 05:40:46 -0700 Web Inspector: introduce styles panel as an experiment 2012-04-19 09:20:16 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 605516 0 pfeldman 2012-04-19 05:40:46 -0700 This change introduces new "Styles" panel that looks like the "Scripts" one, but operates only stylesheets. This is happening under the experimental flag. 605518 1 137885 pfeldman 2012-04-19 05:44:04 -0700 Created attachment 137885 Patch 605597 2 137885 vsevik 2012-04-19 08:13:54 -0700 Comment on attachment 137885 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=137885&action=review > Source/WebCore/inspector/front-end/StylesPanel.js:51 > + this._navigatorView = this._navigator.view; Is this field needed? > Source/WebCore/inspector/front-end/StylesPanel.js:69 > + Please remove this line. > Source/WebCore/inspector/front-end/StylesPanel.js:154 > + var sourceFrame = this._showFile(uiSourceCode); _showFile does not return anything. Did you mean: this._showFile(uiSourceCode); var sourceFrame = this._sourceFramesForResource.get(uiSourceCode); 605623 3 pfeldman 2012-04-19 09:20:16 -0700 Committed r114637: <http://trac.webkit.org/changeset/114637> 137885 2012-04-19 05:44:04 -0700 2012-04-19 08:13:54 -0700 Patch bug-84331-20120419164402.patch text/plain 26356 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0NjIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZmQ3NTliNmQ3NDIwODIy ZTFjNjhmMTRjNzE3NWFjMTk3MmM4ZDRiOC4uNmFhYjY1MzJiM2YyNWEwN2RmODdjODUyMDhiMjM2 MWMwNjFlN2E4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDYwIEBACiAyMDEyLTA0LTE5ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgogCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGludHJvZHVjZSBzdHlsZXMgcGFuZWwgYXMgYW4gZXhwZXJpbWVudAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQzMzEKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGNoYW5nZSBpbnRyb2R1Y2Vz IG5ldyAiU3R5bGVzIiBwYW5lbCB0aGF0IGxvb2tzIGxpa2UgdGhlICJTY3JpcHRzIiBvbmUsCisg ICAgICAgIGJ1dCBvcGVyYXRlcyBzdHlsZXNoZWV0cy4gVGhpcyBpcyBoYXBwZW5pbmcgdW5kZXIg dGhlIGV4cGVyaW1lbnRhbCBmbGFnLgorCisgICAgICAgICogRW5nbGlzaC5scHJvai9sb2NhbGl6 ZWRTdHJpbmdzLmpzOgorICAgICAgICAqIFdlYkNvcmUuZ3lwaToKKyAgICAgICAgKiBXZWJDb3Jl LnZjcHJvai9XZWJDb3JlLnZjcHJvajoKKyAgICAgICAgKiBpbnNwZWN0b3IvY29tcGlsZS1mcm9u dC1lbmQucHk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5QYW5lbC5wcm90b3R5cGUuc2hvd0FuY2hvckxvY2F0aW9uKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlVmlldy5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5FZGl0YWJsZVJlc291cmNlU291cmNlRnJhbWUucHJvdG90eXBlLmRpZEVkaXRD b250ZW50KToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNOYXZpZ2F0b3Iu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvckNvbnRyb2xsZXIucHJv dG90eXBlLl9uYXZpZ2F0b3JPdmVybGF5V2FzU2hvd24pOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQv U2V0dGluZ3MuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRXhwZXJpbWVudHNTZXR0aW5ncyk6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9Tb3VyY2VGcmFtZS5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5wcm90b3R5cGUuX2NsZWFyTGluZUhpZ2hsaWdodCk6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNQYW5lbC5qczogQWRkZWQuCisg ICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVzUGFuZWwpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlN0eWxlc1BhbmVsLnByb3RvdHlwZS53YXNTaG93bik6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu U3R5bGVzUGFuZWwucHJvdG90eXBlLl9pbml0aWFsaXplKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5TdHlsZXNQYW5lbC5wcm90b3R5cGUuX3BvcHVsYXRlUmVzb3VyY2VUcmVlLnBvcHVsYXRlRnJh bWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlc1BhbmVsLnByb3RvdHlwZS5fcG9wdWxh dGVSZXNvdXJjZVRyZWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlc1BhbmVsLnByb3Rv dHlwZS5fcmVzb3VyY2VBZGRlZCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVzUGFuZWwu cHJvdG90eXBlLl9yZXNldCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVzUGFuZWwucHJv dG90eXBlLl9jYWNoZWRSZXNvdXJjZXNMb2FkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0 eWxlc1BhbmVsLnByb3RvdHlwZS5nZXQgdG9vbGJhckl0ZW1MYWJlbCk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuU3R5bGVzUGFuZWwucHJvdG90eXBlLnZpZXdGb3JGaWxlLmdldCBpZik6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU3R5bGVzUGFuZWwucHJvdG90eXBlLnZpZXdGb3JGaWxlKToKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZXNQYW5lbC5wcm90b3R5cGUuX3RleHRFZGl0ZWQpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlc1BhbmVsLnByb3RvdHlwZS5fc2NyaXB0U2VsZWN0 ZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlc1BhbmVsLnByb3RvdHlwZS5fc2hvd0Zp bGUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlc1BhbmVsLnByb3RvdHlwZS5jYW5TaG93 QW5jaG9yTG9jYXRpb24pOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lk ZWJhclBhbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlv bik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbi5wcm90b3R5 cGUuX2NyZWF0ZVJ1bGVPcmlnaW5Ob2RlKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5k L1RhYmJlZEVkaXRvckNvbnRhaW5lci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UYWJiZWRF ZGl0b3JDb250YWluZXIpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFy YzoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sOgorICAgICAg ICAqIGluc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLl9jcmVhdGVQYW5lbHMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLl9zaG93QW5jaG9yTG9j YXRpb25JblBhbmVsKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL3NjcmlwdHNQYW5l bC5jc3M6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9zcGxpdFZpZXcuY3NzOgorICAg ICAgICAoLnNpZGViYXItb3ZlcmxheSk6CisKKzIwMTItMDQtMTkgIFBhdmVsIEZlbGRtYW4gIDxw ZmVsZG1hbkBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogcmV1c2UgUGFy c2VkVXJsIGluIHRoZSBVSVNvdXJjZUNvZGUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTg0MzI2CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0Vu Z2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJDb3JlL0VuZ2xpc2gu bHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCAzNmNiNGJiZWUwOTgwMGE1YzYwMTc2NDFi ODBmNTAzMTI5NGRhN2YxLi5lOTdmYmRiMThmZjQzMzYzZDI1ZDY1NDViOTc4MjYzZjUxMTFhYjM0 IDEwMDY0NApHSVQgYmluYXJ5IHBhdGNoCmRlbHRhIDY1CnpjbWNjZWk+MmlrT1QhayVpTXJFMj5v Sk48S2Q7QmdIR1JKPlY7cTd6eHBveTdoLVdrVGQ/dUl5UndjMz5EM3IodApFMENVbkFQNT1NXgoK ZGVsdGEgODgKemNtWnFxI2Q3NXJPVCFrJWlNckZiPm9UZkxAN0g3R24hYTlfRj5YMzk0PHBhPyFA NyhUVjZuLXl0R0s0eUx4bWhCCmRwVT5vKSshYHFge2tTZnAydU5OOCM8U1VlVXlvNmg0KitrIzlx PDRFCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5neXBpIGIvU291cmNlL1dl YkNvcmUvV2ViQ29yZS5neXBpCmluZGV4IDY1NTZlODAwYWEyMzIxMjM1MmJhY2UwZDM4YWZkMjIz ZDM0MTFlYjUuLmNmZjY0MTYyNmViZDQ0ZTg4YzNkODExMDkyYzRjYWE5YzU3OGFiZTcgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwaQorKysgYi9Tb3VyY2UvV2ViQ29yZS9X ZWJDb3JlLmd5cGkKQEAgLTY0MjMsNiArNjQyMyw3IEBACiAgICAgICAgICAgICAnaW5zcGVjdG9y L2Zyb250LWVuZC9TcGVjdHJ1bS5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVu ZC9TcGxpdFZpZXcuanMnLAogICAgICAgICAgICAgJ2luc3BlY3Rvci9mcm9udC1lbmQvU3RhdHVz QmFyQnV0dG9uLmpzJywKKyAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1Bh bmVsLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQ YW5lLmpzJywKICAgICAgICAgICAgICdpbnNwZWN0b3IvZnJvbnQtZW5kL1RhYmJlZEVkaXRvckNv bnRhaW5lci5qcycsCiAgICAgICAgICAgICAnaW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRQYW5l LmpzJywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUudmNwcm9qL1dlYkNvcmUu dmNwcm9qIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2oKaW5k ZXggZGFjNjg5MTllODc4NWU1OTBkYzAzMDg1M2U0NTYwNTM5YWM2ODgzNS4uYzg1MzI5N2U2NjE0 NTRhYzA4NTQxZDJlMTI3ZTI0NTJmNGI0YjFlMCAxMDA3NTUKLS0tIGEvU291cmNlL1dlYkNvcmUv V2ViQ29yZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2oKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29y ZS52Y3Byb2ovV2ViQ29yZS52Y3Byb2oKQEAgLTc0NDQ1LDYgKzc0NDQ1LDEwIEBACiAJCQkJCT4K IAkJCQk8L0ZpbGU+CiAJCQkJPEZpbGUKKwkJCQkJUmVsYXRpdmVQYXRoPSIuLlxpbnNwZWN0b3Jc ZnJvbnQtZW5kXFN0eWxlc1BhbmVsLmpzIgorCQkJCQk+CisJCQkJPC9GaWxlPgorCQkJCTxGaWxl CiAJCQkJCVJlbGF0aXZlUGF0aD0iLi5caW5zcGVjdG9yXGZyb250LWVuZFxTdHlsZXNTaWRlYmFy UGFuZS5qcyIKIAkJCQkJPgogCQkJCTwvRmlsZT4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9jb21waWxlLWZyb250LWVuZC5weSBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9jb21waWxlLWZyb250LWVuZC5weQppbmRleCA0YTE2Yzk4NGM0NmFlZmU2ZGVhZDgzYTJmMjMy MTJmMmVjYmIzNjdmLi45OWI3ZWNiYzAzNGFmYmVhODA3MmE2OTY4YzExY2M5ODUwMDM4YTY4IDEw MDc1NQotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvY29tcGlsZS1mcm9udC1lbmQucHkK KysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2NvbXBpbGUtZnJvbnQtZW5kLnB5CkBAIC0y NDgsNiArMjQ4LDEzIEBAIG1vZHVsZXMgPSBbCiAgICAgICAgIF0KICAgICB9LAogICAgIHsKKyAg ICAgICAgInRhcmdldF9uYW1lIjogInN0eWxlcyIsCisgICAgICAgICJkZXBlbmRlbmNpZXMiOiBb ImNvbXBvbmVudHMiXSwKKyAgICAgICAgInNvdXJjZXMiOiBbCisgICAgICAgICAgICAiU3R5bGVz UGFuZWwuanMiLAorICAgICAgICBdCisgICAgfSwKKyAgICB7CiAgICAgICAgICJ0YXJnZXRfbmFt ZSI6ICJleHRlbnNpb25zIiwKICAgICAgICAgImRlcGVuZGVuY2llcyI6IFsiY29tcG9uZW50cyJd LAogICAgICAgICAic291cmNlcyI6IFsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1BhbmVsLmpzCmluZGV4IGM5YTFjN2Q3YzQ1YTBhODMyY2U5NTU0YzQ4NDhkM2Q4NjgyYWIy ZTQuLmE5ZmRmMGE0ZGNkNjBmYzBlMDk5ZWI3NWU1M2U3MTYyNmFlNjg3NmUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUGFuZWwuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9QYW5lbC5qcwpAQCAtMTg0LDE0ICsxODQsMjAg QEAgV2ViSW5zcGVjdG9yLlBhbmVsLnByb3RvdHlwZSA9IHsKICAgICB7CiAgICAgfSwKIAorICAg IC8qKgorICAgICAqIEBwYXJhbSB7RWxlbWVudH0gYW5jaG9yCisgICAgICogQHJldHVybiB7Ym9v bGVhbn0KKyAgICAgKi8KICAgICBjYW5TaG93QW5jaG9yTG9jYXRpb246IGZ1bmN0aW9uKGFuY2hv cikKICAgICB7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9LAogCisgICAgLyoqCisgICAg ICogQHBhcmFtIHtFbGVtZW50fSBhbmNob3IKKyAgICAgKi8KICAgICBzaG93QW5jaG9yTG9jYXRp b246IGZ1bmN0aW9uKGFuY2hvcikKICAgICB7Ci0gICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9 LAogCiAgICAgZWxlbWVudHNUb1Jlc3RvcmVTY3JvbGxQb3NpdGlvbnNGb3I6IGZ1bmN0aW9uKCkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2VW aWV3LmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVZpZXcu anMKaW5kZXggZmFiMTQ1YTM0OTc0MjgwMjc1NzNlOWViMTY0OGE4MDI1ZGY2N2ViMi4uMzA1ZGZm ODMzOWQ4ODQxZWNhNjFiMDJjZjEwYTk1YjRlNDhkY2I5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVZpZXcuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZVZpZXcuanMKQEAgLTE5Myw2ICsxOTMs MTIgQEAgV2ViSW5zcGVjdG9yLkVkaXRhYmxlUmVzb3VyY2VTb3VyY2VGcmFtZS5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuUmVzb3VyY2VTb3VyY2VGcmFtZS5wcm90b3R5 cGUuX2NvbnRlbnRDaGFuZ2VkLmNhbGwodGhpcywgZXZlbnQpOwogICAgIH0sCiAKKyAgICBkaWRF ZGl0Q29udGVudDogZnVuY3Rpb24oZXJyb3IsIGNvbnRlbnQpCisgICAgeworICAgICAgICBXZWJJ bnNwZWN0b3IuU291cmNlRnJhbWUucHJvdG90eXBlLmRpZEVkaXRDb250ZW50LmNhbGwodGhpcywg ZXJyb3IsIGNvbnRlbnQpOworICAgICAgICB0aGlzLmRpc3BhdGNoRXZlbnRUb0xpc3RlbmVycyhX ZWJJbnNwZWN0b3IuRWRpdGFibGVSZXNvdXJjZVNvdXJjZUZyYW1lLkV2ZW50cy5UZXh0RWRpdGVk LCB0aGlzKTsKKyAgICB9LAorCiAgICAgaXNEaXJ0eTogZnVuY3Rpb24oKQogICAgIHsKICAgICAg ICAgcmV0dXJuIHRoaXMuX3Jlc291cmNlLmNvbnRlbnQgIT09IHRoaXMudGV4dE1vZGVsLnRleHQ7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNO YXZpZ2F0b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNO YXZpZ2F0b3IuanMKaW5kZXggY2ExY2MxMzhlZWM4Y2IzMDMwM2IwYTQ3YzI0MDkzMjBlNDVhY2I4 MS4uMTQ2NmMwYjgxOTk3MjZjYzE5NGZmNmU2OTE3ZGZiZTQ1NWQxYzA1MCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzTmF2aWdhdG9yLmpzCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c05hdmlnYXRvci5q cwpAQCAtNzk0LDEyICs3OTQsMTIgQEAgV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3JDb250 cm9sbGVyID0gZnVuY3Rpb24ocGFuZWwsIGVkaXRvclZpZXcsIG5hdmlnYXRvciwKICAgICB0aGlz Ll9lZGl0b3JWaWV3Lmluc3RhbGxSZXNpemVyKHRoaXMuX25hdmlnYXRvclNpZGViYXJSZXNpemVX aWRnZXRFbGVtZW50KTsKICAgICB0aGlzLl9uYXZpZ2F0b3Iudmlldy5lbGVtZW50LmFwcGVuZENo aWxkKHRoaXMuX25hdmlnYXRvclNpZGViYXJSZXNpemVXaWRnZXRFbGVtZW50KTsKIAotICAgIHRo aXMuX25hdmlnYXRvclNob3dIaWRlQnV0dG9uID0gdGhpcy5fY3JlYXRlTmF2aWdhdG9yQ29udHJv bEJ1dHRvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNob3cgc2NyaXB0cyBuYXZpZ2F0b3IiKSwg InNjcmlwdHMtbmF2aWdhdG9yLXNob3ctaGlkZS1idXR0b24iLCB0aGlzLl90b2dnbGVOYXZpZ2F0 b3IuYmluZCh0aGlzKSk7CisgICAgdGhpcy5fbmF2aWdhdG9yU2hvd0hpZGVCdXR0b24gPSB0aGlz Ll9jcmVhdGVOYXZpZ2F0b3JDb250cm9sQnV0dG9uKFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2hv dyBuYXZpZ2F0b3IiKSwgInNjcmlwdHMtbmF2aWdhdG9yLXNob3ctaGlkZS1idXR0b24iLCB0aGlz Ll90b2dnbGVOYXZpZ2F0b3IuYmluZCh0aGlzKSk7CiAgICAgdGhpcy5fbmF2aWdhdG9yU2hvd0hp ZGVCdXR0b24uYWRkU3R5bGVDbGFzcygidG9nZ2xlZC1vbiIpOwogICAgIHRoaXMuX25hdmlnYXRv clNob3dIaWRlQnV0dG9uLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJIaWRlIHNjcmlw dHMgbmF2aWdhdG9yIik7CiAgICAgdGhpcy5fZWRpdG9yVmlldy5lbGVtZW50LmFwcGVuZENoaWxk KHRoaXMuX25hdmlnYXRvclNob3dIaWRlQnV0dG9uKTsKIAotICAgIHRoaXMuX25hdmlnYXRvclBp bkJ1dHRvbiA9IHRoaXMuX2NyZWF0ZU5hdmlnYXRvckNvbnRyb2xCdXR0b24oV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJQaW4gc2NyaXB0cyBuYXZpZ2F0b3IiKSwgInNjcmlwdHMtbmF2aWdhdG9yLXBp bi1idXR0b24iLCB0aGlzLl9waW5OYXZpZ2F0b3IuYmluZCh0aGlzKSk7CisgICAgdGhpcy5fbmF2 aWdhdG9yUGluQnV0dG9uID0gdGhpcy5fY3JlYXRlTmF2aWdhdG9yQ29udHJvbEJ1dHRvbihXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIlBpbiBuYXZpZ2F0b3IiKSwgInNjcmlwdHMtbmF2aWdhdG9yLXBp bi1idXR0b24iLCB0aGlzLl9waW5OYXZpZ2F0b3IuYmluZCh0aGlzKSk7CiAgICAgdGhpcy5fbmF2 aWdhdG9yUGluQnV0dG9uLmFkZFN0eWxlQ2xhc3MoImhpZGRlbiIpOwogICAgIHRoaXMuX25hdmln YXRvci52aWV3LmVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fbmF2aWdhdG9yUGluQnV0dG9uKTsK IApAQCAtOTEwLDcgKzkxMCw3IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdhdG9yQ29udHJv bGxlci5wcm90b3R5cGUgPSB7CiAgICAgewogICAgICAgICB0aGlzLl9uYXZpZ2F0b3Iudmlldy5l bGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX25hdmlnYXRvclNob3dIaWRlQnV0dG9uKTsKICAgICAg ICAgdGhpcy5fbmF2aWdhdG9yU2hvd0hpZGVCdXR0b24uYWRkU3R5bGVDbGFzcygidG9nZ2xlZC1v biIpOwotICAgICAgICB0aGlzLl9uYXZpZ2F0b3JTaG93SGlkZUJ1dHRvbi50aXRsZSA9IFdlYklu c3BlY3Rvci5VSVN0cmluZygiSGlkZSBzY3JpcHRzIG5hdmlnYXRvciIpOworICAgICAgICB0aGlz Ll9uYXZpZ2F0b3JTaG93SGlkZUJ1dHRvbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygi SGlkZSBuYXZpZ2F0b3IiKTsKICAgICAgICAgdGhpcy5fbmF2aWdhdG9yLmZvY3VzKCk7CiAgICAg ICAgIHRoaXMuX3BhbmVsLnJlZ2lzdGVyU2hvcnRjdXQoV2ViSW5zcGVjdG9yLktleWJvYXJkU2hv cnRjdXQuS2V5cy5Fc2MuY29kZSwgdGhpcy5fZXNjRG93bldoaWxlTmF2aWdhdG9yT3ZlcmxheU9w ZW4uYmluZCh0aGlzKSk7CiAgICAgfSwKQEAgLTkyMSw3ICs5MjEsNyBAQCBXZWJJbnNwZWN0b3Iu U2NyaXB0c05hdmlnYXRvckNvbnRyb2xsZXIucHJvdG90eXBlID0gewogICAgICAgICBXZWJJbnNw ZWN0b3Iuc2V0dGluZ3MubmF2aWdhdG9yV2FzT25jZUhpZGRlbi5zZXQodHJ1ZSk7CiAgICAgICAg IHRoaXMuX2VkaXRvclZpZXcuZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9uYXZpZ2F0b3JTaG93 SGlkZUJ1dHRvbik7CiAgICAgICAgIHRoaXMuX25hdmlnYXRvclNob3dIaWRlQnV0dG9uLnJlbW92 ZVN0eWxlQ2xhc3MoInRvZ2dsZWQtb24iKTsKLSAgICAgICAgdGhpcy5fbmF2aWdhdG9yU2hvd0hp ZGVCdXR0b24udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNob3cgc2NyaXB0cyBuYXZp Z2F0b3IiKTsKKyAgICAgICAgdGhpcy5fbmF2aWdhdG9yU2hvd0hpZGVCdXR0b24udGl0bGUgPSBX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNob3cgbmF2aWdhdG9yIik7CiAgICAgICAgIHRoaXMuX3Bh bmVsLnVucmVnaXN0ZXJTaG9ydGN1dChXZWJJbnNwZWN0b3IuS2V5Ym9hcmRTaG9ydGN1dC5LZXlz LkVzYy5jb2RlKTsKICAgICB9CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NjcmlwdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCmluZGV4IDJkZDgxNWQ3ZjIwZGIxMzU5YTI3ZDViZDc3 ODU5ZDQ2YTUxMzMzYmEuLjQ3NzVmZWJmOGFiODJlOTg5NzY1ZmVlYTVmY2JkZGY5NjA4MGY0Y2Ig MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1Bh bmVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1Bh bmVsLmpzCkBAIC02NSw3ICs2NSw2IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwgPSBmdW5j dGlvbihwcmVzZW50YXRpb25Nb2RlbCkKICAgICBjb25zdCBpbml0aWFsTmF2aWdhdG9yV2lkdGgg PSAyMjU7CiAgICAgY29uc3QgbWluaW1hbFZpZXdzQ29udGFpbmVyV2lkdGhQZXJjZW50ID0gNTA7 CiAgICAgdGhpcy5lZGl0b3JWaWV3ID0gbmV3IFdlYkluc3BlY3Rvci5TcGxpdFZpZXcoV2ViSW5z cGVjdG9yLlNwbGl0Vmlldy5TaWRlYmFyUG9zaXRpb24uTGVmdCwgInNjcmlwdHNQYW5lbE5hdmln YXRvclNpZGViYXJXaWR0aCIsIGluaXRpYWxOYXZpZ2F0b3JXaWR0aCk7Ci0gICAgdGhpcy5lZGl0 b3JWaWV3LmVsZW1lbnQuaWQgPSAic2NyaXB0cy1lZGl0b3ItdmlldyI7CiAgICAgdGhpcy5lZGl0 b3JWaWV3LmVsZW1lbnQudGFiSW5kZXggPSAwOwogCiAgICAgdGhpcy5lZGl0b3JWaWV3Lm1pbmlt YWxTaWRlYmFyV2lkdGggPSBQcmVmZXJlbmNlcy5taW5TY3JpcHRzU2lkZWJhcldpZHRoOwpAQCAt NzUsNyArNzQsNyBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsID0gZnVuY3Rpb24ocHJlc2Vu dGF0aW9uTW9kZWwpCiAgICAgdGhpcy5fbmF2aWdhdG9yID0gbmV3IFdlYkluc3BlY3Rvci5TY3Jp cHRzTmF2aWdhdG9yKCk7CiAgICAgdGhpcy5fbmF2aWdhdG9yLnNob3codGhpcy5lZGl0b3JWaWV3 LnNpZGViYXJFbGVtZW50KTsKIAotICAgIHRoaXMuX2VkaXRvckNvbnRhaW5lciA9IG5ldyBXZWJJ bnNwZWN0b3IuVGFiYmVkRWRpdG9yQ29udGFpbmVyKHRoaXMpOworICAgIHRoaXMuX2VkaXRvckNv bnRhaW5lciA9IG5ldyBXZWJJbnNwZWN0b3IuVGFiYmVkRWRpdG9yQ29udGFpbmVyKHRoaXMsICJw cmV2aW91c2x5Vmlld2VkRmlsZXMiKTsKICAgICB0aGlzLl9lZGl0b3JDb250YWluZXIuc2hvdyh0 aGlzLmVkaXRvclZpZXcubWFpbkVsZW1lbnQpOwogICAgIFdlYkluc3BlY3Rvci5PcGVuUmVzb3Vy Y2VEaWFsb2cuaW5zdGFsbCh0aGlzLCB0aGlzLl9wcmVzZW50YXRpb25Nb2RlbCwgdGhpcy5lZGl0 b3JWaWV3Lm1haW5FbGVtZW50KTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU2V0dGluZ3MuanMKaW5kZXggOTM2NWMwYTcxYWNkZTMwY2Q4YzFjOTBkNTFlOGFjZjdm MTdjMDliNi4uNTg5YTZjZDk1MDBhZmU5MGI5NTkzZTIxMDlkNmQ2ZWM0MWViYjNmZCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcworKysg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzCkBAIC0xODEs NiArMTgxLDcgQEAgV2ViSW5zcGVjdG9yLkV4cGVyaW1lbnRzU2V0dGluZ3MgPSBmdW5jdGlvbigp CiAgICAgdGhpcy50aW1lbGluZVZlcnRpY2FsT3ZlcnZpZXcgPSB0aGlzLl9jcmVhdGVFeHBlcmlt ZW50KCJ0aW1lbGluZVN0YXJ0QXRaZXJvIiwgIkVuYWJsZSB2ZXJ0aWNhbCBvdmVydmlldyBtb2Rl IGluIHRoZSBUaW1lbGluZSBwYW5lbCIpOwogICAgIHRoaXMuc2hvd1NoYWRvd0RPTSA9IHRoaXMu X2NyZWF0ZUV4cGVyaW1lbnQoInNob3dTaGFkb3dET00iLCAiU2hvdyBzaGFkb3cgRE9NIik7CiAg ICAgdGhpcy5zbmlwcGV0c1N1cHBvcnQgPSB0aGlzLl9jcmVhdGVFeHBlcmltZW50KCJzbmlwcGV0 c1N1cHBvcnQiLCAiU25pcHBldHMgc3VwcG9ydCIpOworICAgIHRoaXMuc2hvd1N0eWxlc1BhbmVs ID0gdGhpcy5fY3JlYXRlRXhwZXJpbWVudCgic3R5bGVzUGFuZWwiLCAiU2hvdyBzdHlsZXMgcGFu ZWwiKTsKIAogICAgIHRoaXMuX2NsZWFuVXBTZXR0aW5nKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1BhbmVsLmpzIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNQYW5lbC5qcwpuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi40NzVi ZjY5Njk3Zjc0M2I1NmU0NmYxZTdjM2I5M2IyNmUyOWU3NzdiCi0tLSAvZGV2L251bGwKKysrIGIv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNQYW5lbC5qcwpAQCAtMCww ICsxLDE4NiBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxMiBHb29nbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFu ZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVy bWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zIGFyZQorICogbWV0 OgorICoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0 aGUgYWJvdmUgY29weXJpZ2h0CisgKiBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFu ZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKgorICogMi4gUmVkaXN0cmlidXRpb25zIGlu IGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZQorICogY29weXJpZ2h0IG5vdGlj ZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lcgor ICogaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3 aXRoIHRoZQorICogZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklE RUQgQlkgR09PR0xFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMKKyAqICJBUyBJUyIgQU5EIEFO WSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UCisgKiBM SU1JVEVEIFRPLCBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQg RklUTkVTUyBGT1IKKyAqIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBO TyBFVkVOVCBTSEFMTCBHT09HTEUgSU5DLgorICogT1IgSVRTIENPTlRSSUJVVE9SUyBCRSBMSUFC TEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAorICogU1BFQ0lBTCwgRVhF TVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVAorICog TElNSVRFRCBUTywgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsg TE9TUyBPRiBVU0UsCisgKiBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJ T04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKKyAqIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdI RVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJ TkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhF IFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJ TElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisvKioKKyAqIEBjb25zdHJ1Y3RvcgorICogQGV4 dGVuZHMge1dlYkluc3BlY3Rvci5QYW5lbH0KKyAqIEBpbXBsZW1lbnRzIHtXZWJJbnNwZWN0b3Iu VGFiYmVkRWRpdG9yQ29udGFpbmVyRGVsZWdhdGV9CisgKi8KK1dlYkluc3BlY3Rvci5TdHlsZXNQ YW5lbCA9IGZ1bmN0aW9uKCkKK3sKKyAgICBXZWJJbnNwZWN0b3IuUGFuZWwuY2FsbCh0aGlzLCAi c3R5bGVzIik7CisgICAgdGhpcy5yZWdpc3RlclJlcXVpcmVkQ1NTKCJzY3JpcHRzUGFuZWwuY3Nz Iik7CisKKyAgICBjb25zdCBpbml0aWFsTmF2aWdhdG9yV2lkdGggPSAyMjU7CisgICAgY29uc3Qg bWluaW1hbFZpZXdzQ29udGFpbmVyV2lkdGhQZXJjZW50ID0gNTA7CisKKyAgICB0aGlzLl9tYWlu VmlldyA9IG5ldyBXZWJJbnNwZWN0b3IuU3BsaXRWaWV3KFdlYkluc3BlY3Rvci5TcGxpdFZpZXcu U2lkZWJhclBvc2l0aW9uLkxlZnQsICJzdHlsZXNQYW5lbE5hdmlnYXRvclNpZGViYXJXaWR0aCIs IGluaXRpYWxOYXZpZ2F0b3JXaWR0aCk7CisgICAgdGhpcy5fbWFpblZpZXcuZWxlbWVudC5pZCA9 ICJzdHlsZXMtbWFpbi12aWV3IjsKKyAgICB0aGlzLl9tYWluVmlldy5lbGVtZW50LnRhYkluZGV4 ID0gMDsKKworICAgIHRoaXMuX21haW5WaWV3Lm1pbmltYWxTaWRlYmFyV2lkdGggPSBQcmVmZXJl bmNlcy5taW5TY3JpcHRzU2lkZWJhcldpZHRoOworICAgIHRoaXMuX21haW5WaWV3Lm1pbmltYWxN YWluV2lkdGhQZXJjZW50ID0gbWluaW1hbFZpZXdzQ29udGFpbmVyV2lkdGhQZXJjZW50OworICAg IHRoaXMuX21haW5WaWV3LnNob3codGhpcy5lbGVtZW50KTsKKworICAgIHRoaXMuX25hdmlnYXRv ciA9IG5ldyBXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvcigpOworICAgIHRoaXMuX25hdmln YXRvclZpZXcgPSB0aGlzLl9uYXZpZ2F0b3IudmlldzsKKyAgICB0aGlzLl9uYXZpZ2F0b3Iuc2hv dyh0aGlzLl9tYWluVmlldy5zaWRlYmFyRWxlbWVudCk7CisgICAgdGhpcy5fbmF2aWdhdG9yLmFk ZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNjcmlwdHNOYXZpZ2F0b3IuRXZlbnRzLlNjcmlw dFNlbGVjdGVkLCB0aGlzLl9zY3JpcHRTZWxlY3RlZCwgdGhpcyk7CisKKyAgICB0aGlzLl9lZGl0 b3JDb250YWluZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlRhYmJlZEVkaXRvckNvbnRhaW5lcih0aGlz LCAicHJldmlvdXNseVZpZXdlZENTU0ZpbGVzIik7CisgICAgdGhpcy5fZWRpdG9yQ29udGFpbmVy LnNob3codGhpcy5fbWFpblZpZXcubWFpbkVsZW1lbnQpOworCisgICAgdGhpcy5fbmF2aWdhdG9y Q29udHJvbGxlciA9IG5ldyBXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvckNvbnRyb2xsZXIo dGhpcywgdGhpcy5fbWFpblZpZXcsIHRoaXMuX25hdmlnYXRvciwgdGhpcy5fZWRpdG9yQ29udGFp bmVyKTsKKworICAgIHRoaXMuX3NvdXJjZUZyYW1lc0ZvclJlc291cmNlID0gbmV3IE1hcCgpOwor ICAgIHRoaXMuX3VybFRvUmVzb3VyY2UgPSB7fTsKKworICAgIFdlYkluc3BlY3Rvci5yZXNvdXJj ZVRyZWVNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2Rl bC5FdmVudFR5cGVzLkNhY2hlZFJlc291cmNlc0xvYWRlZCwgdGhpcy5fY2FjaGVkUmVzb3VyY2Vz TG9hZGVkLCB0aGlzKTsKKyAgICBXZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVlTW9kZWwuYWRkRXZl bnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5XaWxs TG9hZENhY2hlZFJlc291cmNlcywgdGhpcy5fcmVzZXQsIHRoaXMpOworICAgIFdlYkluc3BlY3Rv ci5yZXNvdXJjZVRyZWVNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SZXNvdXJj ZVRyZWVNb2RlbC5FdmVudFR5cGVzLk1haW5GcmFtZU5hdmlnYXRlZCwgdGhpcy5fcmVzZXQsIHRo aXMpOworfQorCitXZWJJbnNwZWN0b3IuU3R5bGVzUGFuZWwucHJvdG90eXBlID0geworCisgICAg d2FzU2hvd246IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIFdlYkluc3BlY3Rvci5QYW5lbC5w cm90b3R5cGUud2FzU2hvd24uY2FsbCh0aGlzKTsKKyAgICAgICAgdGhpcy5fbmF2aWdhdG9yQ29u dHJvbGxlci53YXNTaG93bigpOworICAgICAgICB0aGlzLl9pbml0aWFsaXplKCk7CisgICAgfSwK KworICAgIF9pbml0aWFsaXplOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICBpZiAoIXRoaXMu X2luaXRpYWxpemVkICYmIHRoaXMuaXNTaG93aW5nKCkgJiYgdGhpcy5fY2FjaGVkUmVzb3VyY2Vz V2VyZUxvYWRlZCkgeworICAgICAgICAgICAgdGhpcy5fcG9wdWxhdGVSZXNvdXJjZVRyZWUoKTsK KyAgICAgICAgICAgIHRoaXMuX2luaXRpYWxpemVkID0gdHJ1ZTsKKyAgICAgICAgfQorICAgIH0s CisKKyAgICBfcG9wdWxhdGVSZXNvdXJjZVRyZWU6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAg IFdlYkluc3BlY3Rvci5yZXNvdXJjZVRyZWVNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3Bl Y3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5FdmVudFR5cGVzLlJlc291cmNlQWRkZWQsIHRoaXMuX3Jl c291cmNlQWRkZWQsIHRoaXMpOworCisgICAgICAgIGZ1bmN0aW9uIHBvcHVsYXRlRnJhbWUoZnJh bWUpCisgICAgICAgIHsKKyAgICAgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgZnJhbWUuY2hp bGRGcmFtZXMubGVuZ3RoOyArK2kpCisgICAgICAgICAgICAgICAgcG9wdWxhdGVGcmFtZS5jYWxs KHRoaXMsIGZyYW1lLmNoaWxkRnJhbWVzW2ldKTsKKworICAgICAgICAgICAgdmFyIHJlc291cmNl cyA9IGZyYW1lLnJlc291cmNlcygpOworICAgICAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBy ZXNvdXJjZXMubGVuZ3RoOyArK2kpCisgICAgICAgICAgICAgICAgdGhpcy5fcmVzb3VyY2VBZGRl ZCh7ZGF0YTpyZXNvdXJjZXNbaV19KTsKKyAgICAgICAgfQorICAgICAgICBwb3B1bGF0ZUZyYW1l LmNhbGwodGhpcywgV2ViSW5zcGVjdG9yLnJlc291cmNlVHJlZU1vZGVsLm1haW5GcmFtZSk7Cisg ICAgfSwKKworICAgIF9yZXNvdXJjZUFkZGVkOiBmdW5jdGlvbihldmVudCkKKyAgICB7CisgICAg ICAgIHZhciByZXNvdXJjZSA9IGV2ZW50LmRhdGE7CisgICAgICAgIGlmIChyZXNvdXJjZS50eXBl ICE9PSBXZWJJbnNwZWN0b3IucmVzb3VyY2VUeXBlcy5TdHlsZXNoZWV0KQorICAgICAgICAgICAg cmV0dXJuOworICAgICAgICB0aGlzLl91cmxUb1Jlc291cmNlW3Jlc291cmNlLnVybF0gPSByZXNv dXJjZTsKKyAgICAgICAgdGhpcy5fbmF2aWdhdG9yLmFkZFVJU291cmNlQ29kZShyZXNvdXJjZSk7 CisgICAgICAgIHRoaXMuX2VkaXRvckNvbnRhaW5lci51aVNvdXJjZUNvZGVBZGRlZChyZXNvdXJj ZSk7CisgICAgfSwKKworICAgIF9yZXNldDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhp cy5fbmF2aWdhdG9yLnJlc2V0KCk7CisgICAgICAgIHRoaXMuX2VkaXRvckNvbnRhaW5lci5yZXNl dCgpOworICAgICAgICB0aGlzLl91cmxUb1Jlc291cmNlID0ge307CisgICAgICAgIHRoaXMuX3Nv dXJjZUZyYW1lc0ZvclJlc291cmNlID0gbmV3IE1hcCgpOworICAgIH0sCisKKyAgICBfY2FjaGVk UmVzb3VyY2VzTG9hZGVkOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICB0aGlzLl9jYWNoZWRS ZXNvdXJjZXNXZXJlTG9hZGVkID0gdHJ1ZTsKKyAgICAgICAgdGhpcy5faW5pdGlhbGl6ZSgpOwor ICAgIH0sCisKKyAgICBnZXQgdG9vbGJhckl0ZW1MYWJlbCgpCisgICAgeworICAgICAgICByZXR1 cm4gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTdHlsZXMiKTsKKyAgICB9LAorCisgICAgLyoqCisg ICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlfSB1aVNvdXJjZUNvZGUKKyAg ICAgKiBAcmV0dXJuIHtXZWJJbnNwZWN0b3IuU291cmNlRnJhbWV9CisgICAgICovCisgICAgdmll d0ZvckZpbGU6IGZ1bmN0aW9uKHVpU291cmNlQ29kZSkKKyAgICB7CisgICAgICAgIHZhciBzb3Vy Y2VGcmFtZSA9IHRoaXMuX3NvdXJjZUZyYW1lc0ZvclJlc291cmNlLmdldCh1aVNvdXJjZUNvZGUp OworICAgICAgICBpZiAoIXNvdXJjZUZyYW1lKSB7CisgICAgICAgICAgICBzb3VyY2VGcmFtZSA9 IG5ldyBXZWJJbnNwZWN0b3IuRWRpdGFibGVSZXNvdXJjZVNvdXJjZUZyYW1lKHVpU291cmNlQ29k ZSk7CisgICAgICAgICAgICBzb3VyY2VGcmFtZS5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rv ci5FZGl0YWJsZVJlc291cmNlU291cmNlRnJhbWUuRXZlbnRzLlRleHRFZGl0ZWQsIHRoaXMuX3Rl eHRFZGl0ZWQsIHRoaXMpOworICAgICAgICAgICAgdGhpcy5fc291cmNlRnJhbWVzRm9yUmVzb3Vy Y2UucHV0KHVpU291cmNlQ29kZSwgc291cmNlRnJhbWUpOworICAgICAgICB9CisgICAgICAgIHJl dHVybiBzb3VyY2VGcmFtZTsKKyAgICB9LAorCisgICAgX3RleHRFZGl0ZWQ6IGZ1bmN0aW9uKGV2 ZW50KQorICAgIHsKKyAgICAgICAgdmFyIHNvdXJjZUZyYW1lID0gLyoqIEB0eXBlIHtXZWJJbnNw ZWN0b3IuRWRpdGFibGVSZXNvdXJjZVNvdXJjZUZyYW1lfSAqLyBldmVudC5kYXRhOworICAgICAg ICB0aGlzLl9lZGl0b3JDb250YWluZXIuc2V0RmlsZUlzRGlydHkoc291cmNlRnJhbWUucmVzb3Vy Y2UsIHNvdXJjZUZyYW1lLmlzRGlydHkoKSk7CisgICAgfSwKKworICAgIF9zY3JpcHRTZWxlY3Rl ZDogZnVuY3Rpb24oZXZlbnQpCisgICAgeworICAgICAgICB2YXIgdWlTb3VyY2VDb2RlID0gLyoq IEB0eXBlIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlfSAqLyBldmVudC5kYXRhLnVpU291cmNl Q29kZTsKKyAgICAgICAgdmFyIHNvdXJjZUZyYW1lID0gdGhpcy5fc2hvd0ZpbGUodWlTb3VyY2VD b2RlKTsKKyAgICAgICAgdGhpcy5fbmF2aWdhdG9yQ29udHJvbGxlci5oaWRlTmF2aWdhdG9yT3Zl cmxheSgpOworICAgICAgICBpZiAoc291cmNlRnJhbWUgJiYgZXZlbnQuZGF0YS5mb2N1c1NvdXJj ZSkKKyAgICAgICAgICAgIHNvdXJjZUZyYW1lLmZvY3VzKCk7CisgICAgfSwKKworICAgIF9zaG93 RmlsZTogZnVuY3Rpb24odWlTb3VyY2VDb2RlKQorICAgIHsKKyAgICAgICAgdGhpcy5fbmF2aWdh dG9yLnJldmVhbFVJU291cmNlQ29kZSh1aVNvdXJjZUNvZGUpOworICAgICAgICB0aGlzLl9lZGl0 b3JDb250YWluZXIuc2hvd0ZpbGUodWlTb3VyY2VDb2RlKTsKKyAgICB9LAorCisgICAgY2FuU2hv d0FuY2hvckxvY2F0aW9uOiBmdW5jdGlvbihhbmNob3IpCisgICAgeworICAgICAgICB2YXIgcmVz b3VyY2UgPSBXZWJJbnNwZWN0b3IucmVzb3VyY2VGb3JVUkwoYW5jaG9yLmhyZWYpOworICAgICAg ICByZXR1cm4gISFyZXNvdXJjZSAmJiByZXNvdXJjZS50eXBlID09PSBXZWJJbnNwZWN0b3IucmVz b3VyY2VUeXBlcy5TdHlsZXNoZWV0OworICAgIH0sCisKKyAgICBzaG93QW5jaG9yTG9jYXRpb246 IGZ1bmN0aW9uKGFuY2hvcikKKyAgICB7CisgICAgICAgIHZhciByZXNvdXJjZSA9IHRoaXMuX3Vy bFRvUmVzb3VyY2VbYW5jaG9yLmhyZWZdOworICAgICAgICBpZiAoIXJlc291cmNlKQorICAgICAg ICAgICAgcmV0dXJuOworCisgICAgICAgIHRoaXMuX3Nob3dGaWxlKHJlc291cmNlKTsKKyAgICAg ICAgdmFyIHNvdXJjZUZyYW1lID0gdGhpcy5fc291cmNlRnJhbWVzRm9yUmVzb3VyY2UuZ2V0KHJl c291cmNlKTsKKyAgICAgICAgaWYgKHR5cGVvZiBhbmNob3IubGluZU51bWJlciA9PT0gIm51bWJl ciIpCisgICAgICAgICAgICBzb3VyY2VGcmFtZS5oaWdobGlnaHRMaW5lKGFuY2hvci5saW5lTnVt YmVyKTsKKyAgICAgICAgc291cmNlRnJhbWUuZm9jdXMoKTsKKyAgICB9Cit9CisKK1dlYkluc3Bl Y3Rvci5TdHlsZXNQYW5lbC5wcm90b3R5cGUuX19wcm90b19fID0gV2ViSW5zcGVjdG9yLlBhbmVs LnByb3RvdHlwZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU3R5bGVzU2lkZWJhclBhbmUuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzCmluZGV4IGFkODAxNGI4MGZiZTcwYWE4YTM3YTAyZjFl MDExYzU3NWMyZWI3MGYuLjNmMDdlMDA3MTI2YjQwZDIxOWIyMTdkNDYwMDhmNDM3MmFlNzRkZjkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzU2lk ZWJhclBhbmUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHls ZXNTaWRlYmFyUGFuZS5qcwpAQCAtOTU5LDYgKzk1OSw3IEBAIFdlYkluc3BlY3Rvci5TdHlsZVBy b3BlcnRpZXNTZWN0aW9uID0gZnVuY3Rpb24ocGFyZW50UGFuZSwgc3R5bGVSdWxlLCBlZGl0YWJs ZSwKICAgICAgICAgICAgICAgICB2YXIgcmVmRWxlbWVudCA9IG1lZGlhRGF0YUVsZW1lbnQuY3Jl YXRlQ2hpbGQoImRpdiIsICJzdWJ0aXRsZSIpOwogICAgICAgICAgICAgICAgIHZhciBsaW5lTnVt YmVyID0gbWVkaWEuc291cmNlTGluZSA8IDAgPyB1bmRlZmluZWQgOiBtZWRpYS5zb3VyY2VMaW5l OwogICAgICAgICAgICAgICAgIHZhciBhbmNob3IgPSBXZWJJbnNwZWN0b3IubGlua2lmeVJlc291 cmNlQXNOb2RlKG1lZGlhLnNvdXJjZVVSTCwgbGluZU51bWJlciwgInN1YnRpdGxlIiwgbWVkaWEu c291cmNlVVJMICsgKGlzTmFOKGxpbmVOdW1iZXIpID8gIiIgOiAoIjoiICsgKGxpbmVOdW1iZXIg KyAxKSkpKTsKKyAgICAgICAgICAgICAgICBhbmNob3IucHJlZmVycmVkUGFuZWwgPSAic3R5bGVz IjsKICAgICAgICAgICAgICAgICBhbmNob3Iuc3R5bGUuZmxvYXQgPSAicmlnaHQiOwogICAgICAg ICAgICAgICAgIHJlZkVsZW1lbnQuYXBwZW5kQ2hpbGQoYW5jaG9yKTsKICAgICAgICAgICAgIH0K QEAgLTEyMTIsNiArMTIxMyw3IEBAIFdlYkluc3BlY3Rvci5TdHlsZVByb3BlcnRpZXNTZWN0aW9u LnByb3RvdHlwZSA9IHsKICAgICAgICAgZnVuY3Rpb24gbGlua2lmeVVuY29weWFibGUodXJsLCBs aW5lKQogICAgICAgICB7CiAgICAgICAgICAgICB2YXIgbGluayA9IFdlYkluc3BlY3Rvci5saW5r aWZ5UmVzb3VyY2VBc05vZGUodXJsLCBsaW5lLCAiIiwgdXJsICsgIjoiICsgKGxpbmUgKyAxKSk7 CisgICAgICAgICAgICBsaW5rLnByZWZlcnJlZFBhbmVsID0gInN0eWxlcyI7CiAgICAgICAgICAg ICBsaW5rLmNsYXNzTGlzdC5hZGQoIndlYmtpdC1odG1sLXJlc291cmNlLWxpbmsiKTsKICAgICAg ICAgICAgIGxpbmsuc2V0QXR0cmlidXRlKCJkYXRhLXVuY29weWFibGUiLCBsaW5rLnRleHRDb250 ZW50KTsKICAgICAgICAgICAgIGxpbmsudGV4dENvbnRlbnQgPSAiIjsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGFiYmVkRWRpdG9yQ29udGFpbmVyLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRFZGl0b3JDb250YWlu ZXIuanMKaW5kZXggYTFlMGNjYjg4OWFjZTk4YmY3ZGRmZTMxZjU2MzQxNGJmMjk3NjUzMi4uMzY5 NjU3YWEzNGVlNjlkZjU5MzRkZjZiNWY5ZmY2OGQ1ODg0NzEzZCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRFZGl0b3JDb250YWluZXIuanMKKysr IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UYWJiZWRFZGl0b3JDb250YWlu ZXIuanMKQEAgLTQzLDggKzQzLDkgQEAgV2ViSW5zcGVjdG9yLlRhYmJlZEVkaXRvckNvbnRhaW5l ckRlbGVnYXRlLnByb3RvdHlwZSA9IHsKICAqIEBjb25zdHJ1Y3RvcgogICogQGV4dGVuZHMge1dl Ykluc3BlY3Rvci5PYmplY3R9CiAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5UYWJiZWRFZGl0b3JD b250YWluZXJEZWxlZ2F0ZX0gZGVsZWdhdGUKKyAqIEBwYXJhbSB7c3RyaW5nfSBzZXR0aW5nTmFt ZQogICovCi1XZWJJbnNwZWN0b3IuVGFiYmVkRWRpdG9yQ29udGFpbmVyID0gZnVuY3Rpb24oZGVs ZWdhdGUpCitXZWJJbnNwZWN0b3IuVGFiYmVkRWRpdG9yQ29udGFpbmVyID0gZnVuY3Rpb24oZGVs ZWdhdGUsIHNldHRpbmdOYW1lKQogewogICAgIHRoaXMuX2RlbGVnYXRlID0gZGVsZWdhdGU7CiAK QEAgLTU5LDcgKzYwLDcgQEAgV2ViSW5zcGVjdG9yLlRhYmJlZEVkaXRvckNvbnRhaW5lciA9IGZ1 bmN0aW9uKGRlbGVnYXRlKQogICAgIHRoaXMuX2ZpbGVzID0ge307CiAgICAgdGhpcy5fbG9hZGVk VVJMcyA9IHt9OwogCi0gICAgdGhpcy5fcHJldmlvdXNseVZpZXdlZEZpbGVzU2V0dGluZyA9IFdl Ykluc3BlY3Rvci5zZXR0aW5ncy5jcmVhdGVTZXR0aW5nKCJwcmV2aW91c2x5Vmlld2VkRmlsZXMi LCBbXSk7CisgICAgdGhpcy5fcHJldmlvdXNseVZpZXdlZEZpbGVzU2V0dGluZyA9IFdlYkluc3Bl Y3Rvci5zZXR0aW5ncy5jcmVhdGVTZXR0aW5nKHNldHRpbmdOYW1lLCBbXSk7CiAgICAgdGhpcy5f aGlzdG9yeSA9IG5ldyBXZWJJbnNwZWN0b3IuVGFiYmVkRWRpdG9yQ29udGFpbmVyLkhpc3Rvcnko dGhpcy5fcHJldmlvdXNseVZpZXdlZEZpbGVzU2V0dGluZy5nZXQoKSk7CiB9CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvV2ViS2l0LnFyYwppbmRleCA2Y2ViODE1NThm NDg5YmU3NTk0ZDViZDBkMjI0NmU2ZDE3MTExOTZhLi41MzVjNDA1N2M4MDE2N2VjN2I3NThkNDUz NTA2ZWIzZjBkN2MxNjc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1dlYktpdC5xcmMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9XZWJLaXQucXJjCkBAIC0xNDUsNiArMTQ1LDcgQEAKICAgICA8ZmlsZT5TcGVjdHJ1bS5qczwv ZmlsZT4KICAgICA8ZmlsZT5TcGxpdFZpZXcuanM8L2ZpbGU+CiAgICAgPGZpbGU+U3RhdHVzQmFy QnV0dG9uLmpzPC9maWxlPgorICAgIDxmaWxlPlN0eWxlc1BhbmVsLmpzPC9maWxlPgogICAgIDxm aWxlPlN0eWxlc1NpZGViYXJQYW5lLmpzPC9maWxlPgogICAgIDxmaWxlPlRhYmJlZEVkaXRvckNv bnRhaW5lci5qczwvZmlsZT4KICAgICA8ZmlsZT5UYWJiZWRQYW5lLmpzPC9maWxlPgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbCBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmh0bWwKaW5kZXgg ZjllM2M3OGFiZGMxNTFjZWIxZTljNTQ1ZmJjNjljYjAxZTU1ODNmMS4uN2Y0MjJkMzY4MTQzMTUx ZGVlMDg1N2E3NTM4OTk2NDI1MDAyZjhmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuaHRtbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5odG1sCkBAIC0xMjYsNiArMTI2LDcgQEAgVEhJUyBT T0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFH RS4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJTY3JpcHRzUGFuZWwu anMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZhc2NyaXB0IiBzcmM9IlNj cmlwdHNOYXZpZ2F0b3IuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgdHlwZT0idGV4dC9qYXZh c2NyaXB0IiBzcmM9IlJlc291cmNlc1BhbmVsLmpzIj48L3NjcmlwdD4KKyAgICA8c2NyaXB0IHR5 cGU9InRleHQvamF2YXNjcmlwdCIgc3JjPSJTdHlsZXNQYW5lbC5qcyI+PC9zY3JpcHQ+CiAgICAg PHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iUHJvZmlsZXNQYW5lbC5qcyI+PC9z Y3JpcHQ+CiAgICAgPHNjcmlwdCB0eXBlPSJ0ZXh0L2phdmFzY3JpcHQiIHNyYz0iQ29uc29sZVBh bmVsLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHR5cGU9InRleHQvamF2YXNjcmlwdCIgc3Jj PSJFeHRlbnNpb25BUEkuanMiPjwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwppbmRleCA0MjMxZTRjMjE4MjFiYTEzZTVlMjBmN2Mw NmU1NGJlNjM3NWUyMWU1Li44ZTgyNDM3NWFkNjg4NmIwOGUwMGRmMzkzZjQ5M2ZmN2UzNzBlZGQ3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rv ci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5q cwpAQCAtNTMsNiArNTMsOCBAQCB2YXIgV2ViSW5zcGVjdG9yID0gewogICAgICAgICAgICAgdGhp cy5wYW5lbHMubmV0d29yayA9IG5ldyBXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVsKCk7CiAgICAg ICAgIGlmIChoaWRkZW5QYW5lbHMuaW5kZXhPZigic2NyaXB0cyIpID09PSAtMSkKICAgICAgICAg ICAgIHRoaXMucGFuZWxzLnNjcmlwdHMgPSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbCh0 aGlzLmRlYnVnZ2VyUHJlc2VudGF0aW9uTW9kZWwpOworICAgICAgICBpZiAoaGlkZGVuUGFuZWxz LmluZGV4T2YoInN0eWxlcyIpID09PSAtMSAmJiBXZWJJbnNwZWN0b3IuZXhwZXJpbWVudHNTZXR0 aW5ncy5zaG93U3R5bGVzUGFuZWwuaXNFbmFibGVkKCkpCisgICAgICAgICAgICB0aGlzLnBhbmVs cy5zdHlsZXMgPSBuZXcgV2ViSW5zcGVjdG9yLlN0eWxlc1BhbmVsKCk7CiAgICAgICAgIGlmICho aWRkZW5QYW5lbHMuaW5kZXhPZigidGltZWxpbmUiKSA9PT0gLTEpCiAgICAgICAgICAgICB0aGlz LnBhbmVscy50aW1lbGluZSA9IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbCgpOwogICAg ICAgICBpZiAoaGlkZGVuUGFuZWxzLmluZGV4T2YoInByb2ZpbGVzIikgPT09IC0xKQpAQCAtOTcy LDcgKzk3NCw3IEBAIFdlYkluc3BlY3Rvci5fc2hvd0FuY2hvckxvY2F0aW9uID0gZnVuY3Rpb24o YW5jaG9yKQogCiBXZWJJbnNwZWN0b3IuX3Nob3dBbmNob3JMb2NhdGlvbkluUGFuZWwgPSBmdW5j dGlvbihhbmNob3IsIHBhbmVsKQogewotICAgIGlmICghcGFuZWwuY2FuU2hvd0FuY2hvckxvY2F0 aW9uKGFuY2hvcikpCisgICAgaWYgKCFwYW5lbCB8fCAhcGFuZWwuY2FuU2hvd0FuY2hvckxvY2F0 aW9uKGFuY2hvcikpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIC8vIEZJWE1FOiBzdXBw b3J0IHdlYmtpdC1odG1sLWV4dGVybmFsLWxpbmsgbGlua3MgaGVyZS4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvc2NyaXB0c1BhbmVsLmNzcyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvc2NyaXB0c1BhbmVsLmNzcwppbmRleCA3ZTE5 M2IxMzJlOTJkZGMzNTk1YzlkYTRhNDA2OGMzNWNjNzZhNjdiLi5iYTE3YzkxYjZhZDQ1YjM5ZWQz ZTQ4ZmU5ZDMwN2FiYjA4N2NhNDU4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL3NjcmlwdHNQYW5lbC5jc3MKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9zY3JpcHRzUGFuZWwuY3NzCkBAIC0yODMsMTUgKzI4Myw2IEBACiAgICAg bWFyZ2luLXJpZ2h0OiAyOHB4OwogfQogCi0jc2NyaXB0cy1lZGl0b3ItdmlldyAuc2lkZWJhci1v dmVybGF5IHsKLSAgICBkaXNwbGF5OiAtd2Via2l0LWJveDsKLSAgICBiYWNrZ3JvdW5kLWNvbG9y OiB3aGl0ZTsKLSAgICBib3JkZXItcmlnaHQ6IDFweCBzb2xpZCBncmF5OwotICAgIC13ZWJraXQt Ym94LXNoYWRvdzogcmdiKDkwLDkwLDkwKSAyMHB4IDBweCA1MHB4IC0yNXB4OwotICAgIGRpc3Bs YXk6IC13ZWJraXQtYm94OwotICAgIC13ZWJraXQtYm94LW9yaWVudDogdmVydGljYWw7Ci19Ci0K ICNzY3JpcHRzLWVkaXRvci1jb250YWluZXItdGFiYmVkLXBhbmUgLnRhYmJlZC1wYW5lLWhlYWRl ciB7CiAgICAgYmFja2dyb3VuZC1pbWFnZTogLXdlYmtpdC1ncmFkaWVudChsaW5lYXIsIDAlIDAl LCAwJSAxMDAlLCBmcm9tKCNGNUY1RjUpLCB0bygjRTVFNUU1KSk7CiB9CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3NwbGl0Vmlldy5jc3MgYi9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3NwbGl0Vmlldy5jc3MKaW5kZXggMTQ2MWViODQw NTJhMzM5NzczOTk1ZTFhOWI5Nzg2ZTQ0OTFkN2VmNi4uMDYxNGM2ZjkyOWJjODM2YjY3OGNlYWFi OGFhY2I4MDM5MDYwNWU3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9zcGxpdFZpZXcuY3NzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvc3BsaXRWaWV3LmNzcwpAQCAtNzQsNiArNzQsMTEgQEAKICAgICBib3R0b206IDA7CiAg ICAgbGVmdDogMDsKICAgICB6LWluZGV4OiAxMDsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiB3aGl0 ZTsKKyAgICBib3JkZXItcmlnaHQ6IDFweCBzb2xpZCBncmF5OworICAgIC13ZWJraXQtYm94LXNo YWRvdzogcmdiKDkwLDkwLDkwKSAyMHB4IDBweCA1MHB4IC0yNXB4OworICAgIGRpc3BsYXk6IC13 ZWJraXQtYm94OworICAgIC13ZWJraXQtYm94LW9yaWVudDogdmVydGljYWw7CiB9CiAKIC5zaWRl YmFyLW92ZXJsYXktcmVzaXplciB7Cg==