86734 2012-05-17 08:08:37 -0700 Web Inspector: convert styles panel into UISourceCodeProvider in the scripts panel. 2012-05-17 08:50:28 -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 626581 0 pfeldman 2012-05-17 08:08:37 -0700 This change also makes Scripts render ans Source Code under that experiment. 626595 1 142476 pfeldman 2012-05-17 08:21:34 -0700 Created attachment 142476 Patch 626611 2 pfeldman 2012-05-17 08:50:28 -0700 Committed r117452: <http://trac.webkit.org/changeset/117452> 142476 2012-05-17 08:21:34 -0700 2012-05-17 08:40:40 -0700 Patch bug-86734-20120517192132.patch text/plain 21917 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3NDM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzk0NDg2ZWQxZTIyZmVk NTUwN2U1MDk3ZWFjYmI3MDI2ZjA2YzA4MS4uNmI2Yzg2OWZiZDA5NTEzNzFiYjczOWE4ZGZmYzBi Yzg0ZjUyYTQ5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQyIEBACisyMDEyLTA1LTE3ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IGNvbnZlcnQgc3R5bGVzIHBhbmVsIGludG8gVUlTb3VyY2VDb2RlUHJvdmlkZXIgaW4gdGhl IHNjcmlwdHMgcGFuZWwuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD04NjczNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFRoaXMgY2hhbmdlIGFsc28gbWFrZXMgU2NyaXB0cyByZW5kZXIgYW5zIFNvdXJjZSBD b2RlIHVuZGVyIHRoYXQgZXhwZXJpbWVudC4KKworICAgICAgICAqIEVuZ2xpc2gubHByb2ovbG9j YWxpemVkU3RyaW5ncy5qczoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1NjcmlwdHNO YXZpZ2F0b3IuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c05hdmlnYXRvcik6Cisg ICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TY3JpcHRzUGFuZWwuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5nZXQgdG9vbGJhckl0ZW1MYWJlbCk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsLnByb3RvdHlwZS5jYW5TaG93QW5j aG9yTG9jYXRpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlNjcmlwdHNQYW5lbC5wcm90b3R5 cGUuX2NyZWF0ZVNvdXJjZUZyYW1lKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Nl dHRpbmdzLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkV4cGVyaW1lbnRzU2V0dGluZ3MpOgor ICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzUGFuZWwuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuU3R5bGVzVUlTb3VyY2VDb2RlUHJvdmlkZXIpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlN0eWxlc1VJU291cmNlQ29kZVByb3ZpZGVyLnByb3RvdHlwZS51aVNvdXJjZUNvZGVz KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZXNVSVNvdXJjZUNvZGVQcm92aWRlci5wcm90 b3R5cGUuX2luaXRpYWxpemUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlc1VJU291cmNl Q29kZVByb3ZpZGVyLnByb3RvdHlwZS5fcmVzb3VyY2VBZGRlZCk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuU3R5bGVzVUlTb3VyY2VDb2RlUHJvdmlkZXIucHJvdG90eXBlLl9yZXNldCk6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuU3R5bGVTb3VyY2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0 eWxlU291cmNlRnJhbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlU291cmNlRnJhbWUu cHJvdG90eXBlLmNhbkVkaXRTb3VyY2UpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlN0eWxlU291 cmNlRnJhbWUucHJvdG90eXBlLnJlcXVlc3RDb250ZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5TdHlsZVNvdXJjZUZyYW1lLnByb3RvdHlwZS5jb21taXRFZGl0aW5nKToKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5TdHlsZVNvdXJjZUZyYW1lLnByb3RvdHlwZS5hZnRlclRleHRDaGFuZ2VkKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVNvdXJjZUZyYW1lLnByb3RvdHlwZS5fY2xlYXJJ bmNyZW1lbnRhbFVwZGF0ZVRpbWVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdHlsZVNvdXJj ZUZyYW1lLnByb3RvdHlwZS5fY29udGVudENoYW5nZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5 bGVQcm9wZXJ0aWVzU2VjdGlvbik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuU3R5bGVQcm9wZXJ0 aWVzU2VjdGlvbi5wcm90b3R5cGUuX2NyZWF0ZVJ1bGVPcmlnaW5Ob2RlKToKKyAgICAgICAgKiBp bnNwZWN0b3IvZnJvbnQtZW5kL1VJU291cmNlQ29kZS5qczoKKyAgICAgICAgKiBpbnNwZWN0b3Iv ZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5fY3JlYXRlUGFu ZWxzKToKKwogMjAxMi0wNS0xMSAgS2ludWtvIFlhc3VkYSAgPGtpbnVrb0BjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgQWxsb3cgRmlsZVN5c3RlbSBBUEkgaW1wbGVtZW50YXRpb24gdG8gcGFzcyBz bmFwc2hvdCBtZXRhZGF0YSBhdCBGaWxlIGNyZWF0aW9uIHRpbWUKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcyBiL1NvdXJjZS9XZWJD b3JlL0VuZ2xpc2gubHByb2ovbG9jYWxpemVkU3RyaW5ncy5qcwppbmRleCA2YTA2ODJmNDk0Zjcz Mjc1M2QzODVhNmFkMzYzYTI4YzFmMDM2MGFjLi40NjllODMxMzU1NGFlMzVkMjgyNmZjNDc0OTQ4 NWVmMjI4Y2JlZTU4IDEwMDY0NApHSVQgYmluYXJ5IHBhdGNoCmRlbHRhIDcyCnpjbWJPPm5mMjVa KSh0NjN4YnFvRzhIeU5eOEIhUyhDVnc7KzxxbD9taSVlZC0jZUF+TjkwXykpKnpgYXBNI0lTbApS RF9OIXMkVE08bkU/QTxyNmFZRmU3QXliJgoKZGVsdGEgMjMKZmNtWD4jZz5+OXcpKHQ2M3JrQGdH PGVLY1Rsdy01alFpWWBlYyE+IyoKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NjcmlwdHNOYXZpZ2F0b3IuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1NjcmlwdHNOYXZpZ2F0b3IuanMKaW5kZXggNjJkNzhhZDA0ZjFlMTBhOTk2 NDljYzI5MjY4Yzk5ZDQ2OGZhYjVhZi4uMjM2M2YyZDE0NzQ4Y2ZhY2M5YWY3YTEzNzI1YjY4NzY0 Yzg4NDM4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9T Y3JpcHRzTmF2aWdhdG9yLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2NyaXB0c05hdmlnYXRvci5qcwpAQCAtNDksNyArNDksOCBAQCBXZWJJbnNwZWN0b3IuU2Ny aXB0c05hdmlnYXRvciA9IGZ1bmN0aW9uKCkKICAgICB0aGlzLl9zbmlwcGV0c1ZpZXcuYWRkRXZl bnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuTmF2aWdhdG9yVmlldy5FdmVudHMuRmlsZVJlbmFtZWQs IHRoaXMuX2ZpbGVSZW5hbWVkLCB0aGlzKTsKICAgICB0aGlzLl9zbmlwcGV0c1ZpZXcuYWRkRXZl bnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuU25pcHBldHNOYXZpZ2F0b3JWaWV3LkV2ZW50cy5Tbmlw cGV0Q3JlYXRpb25SZXF1ZXN0ZWQsIHRoaXMuX3NuaXBwZXRDcmVhdGlvblJlcXVlc3RlZCwgdGhp cyk7CiAKLSAgICB0aGlzLl90YWJiZWRQYW5lLmFwcGVuZFRhYihXZWJJbnNwZWN0b3IuU2NyaXB0 c05hdmlnYXRvci5TY3JpcHRzVGFiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNjcmlwdHMiKSwg dGhpcy5fc2NyaXB0c1ZpZXcpOworICAgIHZhciBzb3VyY2VzVGl0bGUgPSBXZWJJbnNwZWN0b3Iu ZXhwZXJpbWVudHNTZXR0aW5ncy5zb3VyY2VDb2RlUGFuZWwuaXNFbmFibGVkKCkgPyBXZWJJbnNw ZWN0b3IuVUlTdHJpbmcoIlNvdXJjZXMiKSA6IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2NyaXB0 cyIpOworICAgIHRoaXMuX3RhYmJlZFBhbmUuYXBwZW5kVGFiKFdlYkluc3BlY3Rvci5TY3JpcHRz TmF2aWdhdG9yLlNjcmlwdHNUYWIsIHNvdXJjZXNUaXRsZSwgdGhpcy5fc2NyaXB0c1ZpZXcpOwog ICAgIHRoaXMuX3RhYmJlZFBhbmUuc2VsZWN0VGFiKFdlYkluc3BlY3Rvci5TY3JpcHRzTmF2aWdh dG9yLlNjcmlwdHNUYWIpOwogICAgIHRoaXMuX3RhYmJlZFBhbmUuYXBwZW5kVGFiKFdlYkluc3Bl Y3Rvci5TY3JpcHRzTmF2aWdhdG9yLkNvbnRlbnRTY3JpcHRzVGFiLCBXZWJJbnNwZWN0b3IuVUlT dHJpbmcoIkNvbnRlbnQgc2NyaXB0cyIpLCB0aGlzLl9jb250ZW50U2NyaXB0c1ZpZXcpOwogICAg IGlmIChXZWJJbnNwZWN0b3IuZXhwZXJpbWVudHNTZXR0aW5ncy5zbmlwcGV0c1N1cHBvcnQuaXNF bmFibGVkKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1NjcmlwdHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2Ny aXB0c1BhbmVsLmpzCmluZGV4IDlhMmUxMTU2ZDQwMGNlMjI2YWI0NGYwNzk5OTg3NTEzYzEzNDQw MjcuLmRjZWI4YmQ0YjYxY2U0NzRkMjI5MGU1NTI3ZjMxMGM2ZGIyY2U5OTUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2NyaXB0c1BhbmVsLmpzCkBAIC00 MCw3ICs0MCwxMCBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVsID0gZnVuY3Rpb24odWlTb3Vy Y2VDb2RlUHJvdmlkZXJGb3JUZXN0KQogICAgIFdlYkluc3BlY3Rvci5zZXR0aW5ncy5kZWJ1Z2dl clNpZGViYXJIaWRkZW4gPSBXZWJJbnNwZWN0b3Iuc2V0dGluZ3MuY3JlYXRlU2V0dGluZygiZGVi dWdnZXJTaWRlYmFySGlkZGVuIiwgZmFsc2UpOwogCiAgICAgdmFyIHNjcmlwdE1hcHBpbmcgPSBu ZXcgV2ViSW5zcGVjdG9yLkRlYnVnZ2VyU2NyaXB0TWFwcGluZygpOwotICAgIHRoaXMuX3VpU291 cmNlQ29kZVByb3ZpZGVyID0gdWlTb3VyY2VDb2RlUHJvdmlkZXJGb3JUZXN0IHx8IG5ldyBXZWJJ bnNwZWN0b3IuQ29tcG9zaXRlVUlTb3VyY2VDb2RlUHJvdmlkZXIoc2NyaXB0TWFwcGluZy51aVNv dXJjZUNvZGVQcm92aWRlcnMoKSk7CisgICAgdmFyIHByb3ZpZGVycyA9IHNjcmlwdE1hcHBpbmcu dWlTb3VyY2VDb2RlUHJvdmlkZXJzKCk7CisgICAgaWYgKFdlYkluc3BlY3Rvci5leHBlcmltZW50 c1NldHRpbmdzLnNvdXJjZUNvZGVQYW5lbC5pc0VuYWJsZWQoKSkKKyAgICAgICAgcHJvdmlkZXJz ID0gcHJvdmlkZXJzLmNvbmNhdChuZXcgV2ViSW5zcGVjdG9yLlN0eWxlc1VJU291cmNlQ29kZVBy b3ZpZGVyKCkpOworICAgIHRoaXMuX3VpU291cmNlQ29kZVByb3ZpZGVyID0gdWlTb3VyY2VDb2Rl UHJvdmlkZXJGb3JUZXN0IHx8IG5ldyBXZWJJbnNwZWN0b3IuQ29tcG9zaXRlVUlTb3VyY2VDb2Rl UHJvdmlkZXIocHJvdmlkZXJzKTsKIAogICAgIG5ldyBXZWJJbnNwZWN0b3IuUHJlc2VudGF0aW9u Q29uc29sZU1lc3NhZ2VIZWxwZXIodGhpcy5fdWlTb3VyY2VDb2RlUHJvdmlkZXIpOwogICAgIG5l dyBXZWJJbnNwZWN0b3IuRGVidWdnZXJSZXNvdXJjZUJpbmRpbmcodGhpcy5fdWlTb3VyY2VDb2Rl UHJvdmlkZXIpOwpAQCAtMTk1LDYgKzE5OCw4IEBAIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwu UGF1c2VPbkV4Y2VwdGlvbnNTdGF0ZSA9IHsKIFdlYkluc3BlY3Rvci5TY3JpcHRzUGFuZWwucHJv dG90eXBlID0gewogICAgIGdldCB0b29sYmFySXRlbUxhYmVsKCkKICAgICB7CisgICAgICAgIGlm IChXZWJJbnNwZWN0b3IuZXhwZXJpbWVudHNTZXR0aW5ncy5zb3VyY2VDb2RlUGFuZWwuaXNFbmFi bGVkKCkpCisgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTb3VyY2Ug Q29kZSIpOwogICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTY3JpcHRzIik7 CiAgICAgfSwKIApAQCAtMzkwLDcgKzM5NSwxNiBAQCBXZWJJbnNwZWN0b3IuU2NyaXB0c1BhbmVs LnByb3RvdHlwZSA9IHsKIAogICAgIGNhblNob3dBbmNob3JMb2NhdGlvbjogZnVuY3Rpb24oYW5j aG9yKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX2RlYnVnZ2VyRW5hYmxlZCAmJiBhbmNo b3IudWlTb3VyY2VDb2RlOworICAgICAgICBpZiAodGhpcy5fZGVidWdnZXJFbmFibGVkICYmIGFu Y2hvci51aVNvdXJjZUNvZGUpCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAgICAgdmFy IHVpU291cmNlQ29kZXMgPSB0aGlzLl91aVNvdXJjZUNvZGVQcm92aWRlci51aVNvdXJjZUNvZGVz KCk7CisgICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgdWlTb3VyY2VDb2Rlcy5sZW5ndGg7ICsr aSkgeworICAgICAgICAgICAgaWYgKHVpU291cmNlQ29kZXNbaV0udXJsID09PSBhbmNob3IuaHJl ZikgeworICAgICAgICAgICAgICAgIGFuY2hvci51aVNvdXJjZUNvZGUgPSB1aVNvdXJjZUNvZGVz W2ldOworICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICAgICAgfQorICAgICAg ICB9CisgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9LAogCiAgICAgc2hvd0FuY2hvckxvY2F0 aW9uOiBmdW5jdGlvbihhbmNob3IpCkBAIC00NDcsOSArNDYxLDE2IEBAIFdlYkluc3BlY3Rvci5T Y3JpcHRzUGFuZWwucHJvdG90eXBlID0gewogICAgICAqLwogICAgIF9jcmVhdGVTb3VyY2VGcmFt ZTogZnVuY3Rpb24odWlTb3VyY2VDb2RlKQogICAgIHsKLSAgICAgICAgdmFyIHNvdXJjZUZyYW1l ID0gbmV3IFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUodGhpcywgdWlTb3VyY2VD b2RlKTsKLQotICAgICAgICBzb3VyY2VGcmFtZS5fdWlTb3VyY2VDb2RlID0gdWlTb3VyY2VDb2Rl OworICAgICAgICB2YXIgc291cmNlRnJhbWU7CisgICAgICAgIGlmICh1aVNvdXJjZUNvZGUgaW5z dGFuY2VvZiBXZWJJbnNwZWN0b3IuSmF2YVNjcmlwdFNvdXJjZSkKKyAgICAgICAgICAgIHNvdXJj ZUZyYW1lID0gbmV3IFdlYkluc3BlY3Rvci5KYXZhU2NyaXB0U291cmNlRnJhbWUodGhpcywgdWlT b3VyY2VDb2RlKTsKKyAgICAgICAgZWxzZSBpZiAodWlTb3VyY2VDb2RlIGluc3RhbmNlb2YgV2Vi SW5zcGVjdG9yLlN0eWxlU291cmNlKQorICAgICAgICAgICAgc291cmNlRnJhbWUgPSBuZXcgV2Vi SW5zcGVjdG9yLlN0eWxlU291cmNlRnJhbWUodWlTb3VyY2VDb2RlKTsKKyAgICAgICAgZWxzZSB7 CisgICAgICAgICAgICBjb25zb2xlLmFzc2VydChmYWxzZSwgIlVua25vd24gVUlTb3VyY2VDb2Rl IHR5cGUiKTsKKyAgICAgICAgICAgIHNvdXJjZUZyYW1lID0gbmV3IFdlYkluc3BlY3Rvci5Tb3Vy Y2VGcmFtZSh1aVNvdXJjZUNvZGUudXJsKTsKKyAgICAgICAgfQorICAgICAgICAgCiAgICAgICAg IHRoaXMuX3NvdXJjZUZyYW1lc0J5VUlTb3VyY2VDb2RlLnB1dCh1aVNvdXJjZUNvZGUsIHNvdXJj ZUZyYW1lKTsKICAgICAgICAgcmV0dXJuIHNvdXJjZUZyYW1lOwogICAgIH0sCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5ncy5qcwppbmRleCAzZGIyNTkzNzdm NDgyZjIwZWUxOTA4Mzk4Y2JjYzQxYTFjYzE0M2FlLi44MzZmYmEwYmI3MjMwZDVmODI1ZjYxZmU2 N2QxNTc2ZmM3ZGU2ODg2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1NldHRpbmdzLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvU2V0dGluZ3MuanMKQEAgLTE4Miw3ICsxODIsNyBAQCBXZWJJbnNwZWN0b3IuRXhwZXJpbWVu dHNTZXR0aW5ncyA9IGZ1bmN0aW9uKCkKICAgICAvLyBBZGQgY3VycmVudGx5IHJ1bm5pbmcgZXhw ZXJpbWVudHMgaGVyZS4KICAgICB0aGlzLnNob3dTaGFkb3dET00gPSB0aGlzLl9jcmVhdGVFeHBl cmltZW50KCJzaG93U2hhZG93RE9NIiwgIlNob3cgc2hhZG93IERPTSIpOwogICAgIHRoaXMuc25p cHBldHNTdXBwb3J0ID0gdGhpcy5fY3JlYXRlRXhwZXJpbWVudCgic25pcHBldHNTdXBwb3J0Iiwg IlNuaXBwZXRzIHN1cHBvcnQiKTsKLSAgICB0aGlzLnNob3dTdHlsZXNQYW5lbCA9IHRoaXMuX2Ny ZWF0ZUV4cGVyaW1lbnQoInN0eWxlc1BhbmVsIiwgIlNob3cgc3R5bGVzIHBhbmVsIik7CisgICAg dGhpcy5zb3VyY2VDb2RlUGFuZWwgPSB0aGlzLl9jcmVhdGVFeHBlcmltZW50KCJzb3VyY2VDb2Rl UGFuZWwiLCAiU291cmNlIENvZGUgcGFuZWwiKTsKIAogICAgIHRoaXMuX2NsZWFuVXBTZXR0aW5n KCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0 eWxlc1BhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdHlsZXNQ YW5lbC5qcwppbmRleCA0YzkzN2I5MWU4MThkNWRjMjcwNGNhMGNlM2VmZDZiNjFmZmNlNmVmLi4y Yzg2MDZkZjg3ODBkZDljZmNkOGI1MjY0NDYwNmU5NDZiYmFmOWQyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1N0eWxlc1BhbmVsLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU3R5bGVzUGFuZWwuanMKQEAgLTI4LDcwICsy OCwzMSBAQAogCiAvKioKICAqIEBjb25zdHJ1Y3RvcgotICogQGV4dGVuZHMge1dlYkluc3BlY3Rv ci5QYW5lbH0KLSAqIEBpbXBsZW1lbnRzIHtXZWJJbnNwZWN0b3IuVGFiYmVkRWRpdG9yQ29udGFp bmVyRGVsZWdhdGV9CisgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLk9iamVjdH0KKyAqIEBpbXBs ZW1lbnRzIHtXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlUHJvdmlkZXJ9CiAgKi8KLVdlYkluc3Bl Y3Rvci5TdHlsZXNQYW5lbCA9IGZ1bmN0aW9uKCkKK1dlYkluc3BlY3Rvci5TdHlsZXNVSVNvdXJj ZUNvZGVQcm92aWRlciA9IGZ1bmN0aW9uKCkKIHsKLSAgICBXZWJJbnNwZWN0b3IuUGFuZWwuY2Fs bCh0aGlzLCAic3R5bGVzIik7Ci0gICAgdGhpcy5yZWdpc3RlclJlcXVpcmVkQ1NTKCJzY3JpcHRz UGFuZWwuY3NzIik7Ci0KLSAgICBjb25zdCBpbml0aWFsTmF2aWdhdG9yV2lkdGggPSAyMjU7Ci0g ICAgY29uc3QgbWluaW1hbFZpZXdzQ29udGFpbmVyV2lkdGhQZXJjZW50ID0gNTA7Ci0KLSAgICB0 aGlzLl9tYWluVmlldyA9IG5ldyBXZWJJbnNwZWN0b3IuU3BsaXRWaWV3KFdlYkluc3BlY3Rvci5T cGxpdFZpZXcuU2lkZWJhclBvc2l0aW9uLkxlZnQsICJzdHlsZXNQYW5lbE5hdmlnYXRvclNpZGVi YXJXaWR0aCIsIGluaXRpYWxOYXZpZ2F0b3JXaWR0aCk7Ci0gICAgdGhpcy5fbWFpblZpZXcuZWxl bWVudC5pZCA9ICJzdHlsZXMtbWFpbi12aWV3IjsKLSAgICB0aGlzLl9tYWluVmlldy5lbGVtZW50 LnRhYkluZGV4ID0gMDsKLQotICAgIHRoaXMuX21haW5WaWV3Lm1pbmltYWxTaWRlYmFyV2lkdGgg PSBQcmVmZXJlbmNlcy5taW5TY3JpcHRzU2lkZWJhcldpZHRoOwotICAgIHRoaXMuX21haW5WaWV3 Lm1pbmltYWxNYWluV2lkdGhQZXJjZW50ID0gbWluaW1hbFZpZXdzQ29udGFpbmVyV2lkdGhQZXJj ZW50OwotCi0gICAgdGhpcy5fbmF2aWdhdG9yVmlldyA9IG5ldyBXZWJJbnNwZWN0b3IuTmF2aWdh dG9yVmlldygpOwotICAgIHRoaXMuX25hdmlnYXRvclZpZXcuYWRkRXZlbnRMaXN0ZW5lcihXZWJJ bnNwZWN0b3IuTmF2aWdhdG9yVmlldy5FdmVudHMuSXRlbVNlbGVjdGVkLCB0aGlzLl9pdGVtU2Vs ZWN0ZWQsIHRoaXMpOwotCi0gICAgdGhpcy5fdGFiYmVkUGFuZSA9IG5ldyBXZWJJbnNwZWN0b3Iu VGFiYmVkUGFuZSgpOwotICAgIHRoaXMuX3RhYmJlZFBhbmUuZWxlbWVudC5hZGRTdHlsZUNsYXNz KCJuYXZpZ2F0b3ItdGFiYmVkLXBhbmUiKTsKLSAgICB0aGlzLl90YWJiZWRQYW5lLnNocmlua2Fi bGVUYWJzID0gdHJ1ZTsKLSAgICB0aGlzLl90YWJiZWRQYW5lLmFwcGVuZFRhYihXZWJJbnNwZWN0 b3IuU2NyaXB0c05hdmlnYXRvci5TY3JpcHRzVGFiLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlN0 eWxlc2hlZXRzIiksIHRoaXMuX25hdmlnYXRvclZpZXcpOwotICAgIHRoaXMuX3RhYmJlZFBhbmUu c2hvdyh0aGlzLl9tYWluVmlldy5zaWRlYmFyRWxlbWVudCk7Ci0KLSAgICB0aGlzLl9lZGl0b3JD b250YWluZXIgPSBuZXcgV2ViSW5zcGVjdG9yLlRhYmJlZEVkaXRvckNvbnRhaW5lcih0aGlzLCAi cHJldmlvdXNseVZpZXdlZENTU0ZpbGVzIik7Ci0gICAgdGhpcy5fZWRpdG9yQ29udGFpbmVyLnNo b3codGhpcy5fbWFpblZpZXcubWFpbkVsZW1lbnQpOwotCi0gICAgdGhpcy5fbWFpblZpZXcuc2hv dyh0aGlzLmVsZW1lbnQpOwotCi0gICAgdGhpcy5fbmF2aWdhdG9yQ29udHJvbGxlciA9IG5ldyBX ZWJJbnNwZWN0b3IuTmF2aWdhdG9yT3ZlcmxheUNvbnRyb2xsZXIodGhpcywgdGhpcy5fbWFpblZp ZXcsIHRoaXMuX3RhYmJlZFBhbmUsIHRoaXMuX2VkaXRvckNvbnRhaW5lci52aWV3KTsKLQotICAg IFdlYkluc3BlY3Rvci5yZXNvdXJjZVRyZWVNb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3Bl Y3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5FdmVudFR5cGVzLkNhY2hlZFJlc291cmNlc0xvYWRlZCwg dGhpcy5fY2FjaGVkUmVzb3VyY2VzTG9hZGVkLCB0aGlzKTsKKyAgICBXZWJJbnNwZWN0b3IucmVz b3VyY2VUcmVlTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVl TW9kZWwuRXZlbnRUeXBlcy5DYWNoZWRSZXNvdXJjZXNMb2FkZWQsIHRoaXMuX2luaXRpYWxpemUs IHRoaXMpOwogICAgIFdlYkluc3BlY3Rvci5yZXNvdXJjZVRyZWVNb2RlbC5hZGRFdmVudExpc3Rl bmVyKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5FdmVudFR5cGVzLldpbGxMb2FkQ2Fj aGVkUmVzb3VyY2VzLCB0aGlzLl9yZXNldCwgdGhpcyk7CiAgICAgV2ViSW5zcGVjdG9yLnJlc291 cmNlVHJlZU1vZGVsLmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1v ZGVsLkV2ZW50VHlwZXMuTWFpbkZyYW1lTmF2aWdhdGVkLCB0aGlzLl9yZXNldCwgdGhpcyk7CiAK LSAgICB0aGlzLl9zb3VyY2VGcmFtZXNGb3JSZXNvdXJjZSA9IG5ldyBNYXAoKTsKLSAgICB0aGlz Ll91cmxUb1Jlc291cmNlID0ge307Ci0KLSAgICB2YXIgb3BlblJlc291cmNlU2hvcnRjdXQgPSBX ZWJJbnNwZWN0b3IuT3BlblJlc291cmNlRGlhbG9nLmNyZWF0ZVNob3J0Y3V0KCk7Ci0gICAgdGhp cy5yZWdpc3RlclNob3J0Y3V0KG9wZW5SZXNvdXJjZVNob3J0Y3V0LmtleSwgdGhpcy5fc2hvd09w ZW5TdHlsZXNoZWV0RGlhbG9nLmJpbmQodGhpcykpOworICAgIHRoaXMuX3VpU291cmNlQ29kZXMg PSBbXTsKIH0KIAotV2ViSW5zcGVjdG9yLlN0eWxlc1BhbmVsLnByb3RvdHlwZSA9IHsKLSAgICB3 YXNTaG93bjogZnVuY3Rpb24oKQorV2ViSW5zcGVjdG9yLlN0eWxlc1VJU291cmNlQ29kZVByb3Zp ZGVyLnByb3RvdHlwZSA9IHsKKyAgICAvKioKKyAgICAgKiBAcmV0dXJuIHtBcnJheS48V2ViSW5z cGVjdG9yLlVJU291cmNlQ29kZT59CisgICAgICovCisgICAgdWlTb3VyY2VDb2RlczogZnVuY3Rp b24oKQogICAgIHsKLSAgICAgICAgV2ViSW5zcGVjdG9yLlBhbmVsLnByb3RvdHlwZS53YXNTaG93 bi5jYWxsKHRoaXMpOwotICAgICAgICB0aGlzLl9uYXZpZ2F0b3JDb250cm9sbGVyLndhc1Nob3du KCk7Ci0gICAgICAgIHRoaXMuX2luaXRpYWxpemUoKTsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3Vp U291cmNlQ29kZXM7CiAgICAgfSwKIAogICAgIF9pbml0aWFsaXplOiBmdW5jdGlvbigpCiAgICAg ewotICAgICAgICBpZiAoIXRoaXMuX2luaXRpYWxpemVkICYmIHRoaXMuaXNTaG93aW5nKCkgJiYg dGhpcy5fY2FjaGVkUmVzb3VyY2VzV2VyZUxvYWRlZCkgewotICAgICAgICAgICAgdGhpcy5fcG9w dWxhdGVSZXNvdXJjZVRyZWUoKTsKLSAgICAgICAgICAgIHRoaXMuX2luaXRpYWxpemVkID0gdHJ1 ZTsKLSAgICAgICAgfQotICAgIH0sCi0KLSAgICBfcG9wdWxhdGVSZXNvdXJjZVRyZWU6IGZ1bmN0 aW9uKCkKLSAgICB7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5yZXNvdXJjZVRyZWVNb2RlbC5hZGRF dmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5FdmVudFR5cGVzLlJl c291cmNlQWRkZWQsIHRoaXMuX3Jlc291cmNlQWRkZWQsIHRoaXMpOworICAgICAgICBpZiAodGhp cy5faW5pdGlhbGl6ZWQpCisgICAgICAgICAgICByZXR1cm47CiAKICAgICAgICAgZnVuY3Rpb24g cG9wdWxhdGVGcmFtZShmcmFtZSkKICAgICAgICAgewpAQCAtMTAzLDYgKzY0LDkgQEAgV2ViSW5z cGVjdG9yLlN0eWxlc1BhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICB0aGlzLl9y ZXNvdXJjZUFkZGVkKHtkYXRhOnJlc291cmNlc1tpXX0pOwogICAgICAgICB9CiAgICAgICAgIHBv cHVsYXRlRnJhbWUuY2FsbCh0aGlzLCBXZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVlTW9kZWwubWFp bkZyYW1lKTsKKworICAgICAgICBXZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVlTW9kZWwuYWRkRXZl bnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuUmVzb3VyY2VUcmVlTW9kZWwuRXZlbnRUeXBlcy5SZXNv dXJjZUFkZGVkLCB0aGlzLl9yZXNvdXJjZUFkZGVkLCB0aGlzKTsKKyAgICAgICAgdGhpcy5faW5p dGlhbGl6ZWQgPSB0cnVlOwogICAgIH0sCiAKICAgICBfcmVzb3VyY2VBZGRlZDogZnVuY3Rpb24o ZXZlbnQpCkBAIC0xMTAsMTEzICs3NCw5OCBAQCBXZWJJbnNwZWN0b3IuU3R5bGVzUGFuZWwucHJv dG90eXBlID0gewogICAgICAgICB2YXIgcmVzb3VyY2UgPSBldmVudC5kYXRhOwogICAgICAgICBp ZiAocmVzb3VyY2UudHlwZSAhPT0gV2ViSW5zcGVjdG9yLnJlc291cmNlVHlwZXMuU3R5bGVzaGVl dCkKICAgICAgICAgICAgIHJldHVybjsKLSAgICAgICAgdGhpcy5fdXJsVG9SZXNvdXJjZVtyZXNv dXJjZS51cmxdID0gcmVzb3VyY2U7Ci0gICAgICAgIHRoaXMuX25hdmlnYXRvclZpZXcuYWRkVUlT b3VyY2VDb2RlKHJlc291cmNlKTsKLSAgICAgICAgdGhpcy5fZWRpdG9yQ29udGFpbmVyLnVpU291 cmNlQ29kZUFkZGVkKHJlc291cmNlKTsKKyAgICAgICAgdmFyIHVpU291cmNlQ29kZSA9IG5ldyBX ZWJJbnNwZWN0b3IuU3R5bGVTb3VyY2UocmVzb3VyY2UpOworICAgICAgICB0aGlzLl91aVNvdXJj ZUNvZGVzLnB1c2godWlTb3VyY2VDb2RlKTsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9M aXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZVByb3ZpZGVyLkV2ZW50cy5VSVNvdXJj ZUNvZGVBZGRlZCwgdWlTb3VyY2VDb2RlKTsKICAgICB9LAogCiAgICAgX3Jlc2V0OiBmdW5jdGlv bigpCiAgICAgewotICAgICAgICB0aGlzLl9uYXZpZ2F0b3JWaWV3LnJlc2V0KCk7Ci0gICAgICAg IHRoaXMuX2VkaXRvckNvbnRhaW5lci5yZXNldCgpOwotICAgICAgICB0aGlzLl91cmxUb1Jlc291 cmNlID0ge307Ci0gICAgICAgIHRoaXMuX3NvdXJjZUZyYW1lc0ZvclJlc291cmNlID0gbmV3IE1h cCgpOwotICAgIH0sCisgICAgICAgIHRoaXMuX3VpU291cmNlQ29kZXMgPSBbXTsKKyAgICB9Cit9 CiAKLSAgICBfY2FjaGVkUmVzb3VyY2VzTG9hZGVkOiBmdW5jdGlvbigpCi0gICAgewotICAgICAg ICB0aGlzLl9jYWNoZWRSZXNvdXJjZXNXZXJlTG9hZGVkID0gdHJ1ZTsKLSAgICAgICAgdGhpcy5f aW5pdGlhbGl6ZSgpOwotICAgIH0sCitXZWJJbnNwZWN0b3IuU3R5bGVzVUlTb3VyY2VDb2RlUHJv dmlkZXIucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5PYmplY3QucHJvdG90eXBl OwogCi0gICAgZ2V0IHRvb2xiYXJJdGVtTGFiZWwoKQotICAgIHsKLSAgICAgICAgcmV0dXJuIFdl Ykluc3BlY3Rvci5VSVN0cmluZygiU3R5bGVzIik7Ci0gICAgfSwKKy8qKgorICogQGNvbnN0cnVj dG9yCisgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0KKyAqIEBwYXJhbSB7 V2ViSW5zcGVjdG9yLlJlc291cmNlfSByZXNvdXJjZQorICovCitXZWJJbnNwZWN0b3IuU3R5bGVT b3VyY2UgPSBmdW5jdGlvbihyZXNvdXJjZSkKK3sKKyAgICBXZWJJbnNwZWN0b3IuVUlTb3VyY2VD b2RlLmNhbGwodGhpcywgcmVzb3VyY2UudXJsLCByZXNvdXJjZSk7CisgICAgdGhpcy5fcmVzb3Vy Y2UgPSByZXNvdXJjZTsKK30KKworV2ViSW5zcGVjdG9yLlN0eWxlU291cmNlLnByb3RvdHlwZSA9 IHsKKyAgICAKK30KKworV2ViSW5zcGVjdG9yLlN0eWxlU291cmNlLnByb3RvdHlwZS5fX3Byb3Rv X18gPSBXZWJJbnNwZWN0b3IuVUlTb3VyY2VDb2RlLnByb3RvdHlwZTsKIAorLyoqCisgKiBAY29u c3RydWN0b3IKKyAqIEBleHRlbmRzIHtXZWJJbnNwZWN0b3IuU291cmNlRnJhbWV9CisgKiBAcGFy YW0ge1dlYkluc3BlY3Rvci5TdHlsZVNvdXJjZX0gc3R5bGVTb3VyY2UKKyAqLworV2ViSW5zcGVj dG9yLlN0eWxlU291cmNlRnJhbWUgPSBmdW5jdGlvbihzdHlsZVNvdXJjZSkKK3sKKyAgICB0aGlz Ll9yZXNvdXJjZSA9IHN0eWxlU291cmNlLl9yZXNvdXJjZTsKKyAgICB0aGlzLl9zdHlsZVNvdXJj ZSA9IHN0eWxlU291cmNlOworICAgIFdlYkluc3BlY3Rvci5Tb3VyY2VGcmFtZS5jYWxsKHRoaXMs IHRoaXMuX3Jlc291cmNlLnVybCk7CisgICAgdGhpcy5fcmVzb3VyY2UuYWRkRXZlbnRMaXN0ZW5l cihXZWJJbnNwZWN0b3IuUmVzb3VyY2UuRXZlbnRzLlJldmlzaW9uQWRkZWQsIHRoaXMuX2NvbnRl bnRDaGFuZ2VkLCB0aGlzKTsKK30KKworV2ViSW5zcGVjdG9yLlN0eWxlU291cmNlRnJhbWUucHJv dG90eXBlID0gewogICAgIC8qKgotICAgICAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlVJU291cmNl Q29kZX0gdWlTb3VyY2VDb2RlCi0gICAgICogQHJldHVybiB7V2ViSW5zcGVjdG9yLlNvdXJjZUZy YW1lfQorICAgICAqIEByZXR1cm4ge2Jvb2xlYW59CiAgICAgICovCi0gICAgdmlld0ZvckZpbGU6 IGZ1bmN0aW9uKHVpU291cmNlQ29kZSkKKyAgICBjYW5FZGl0U291cmNlOiBmdW5jdGlvbigpCiAg ICAgewotICAgICAgICB2YXIgc291cmNlRnJhbWUgPSB0aGlzLl9zb3VyY2VGcmFtZXNGb3JSZXNv dXJjZS5nZXQodWlTb3VyY2VDb2RlKTsKLSAgICAgICAgaWYgKCFzb3VyY2VGcmFtZSkgewotICAg ICAgICAgICAgc291cmNlRnJhbWUgPSBuZXcgV2ViSW5zcGVjdG9yLkVkaXRhYmxlUmVzb3VyY2VT b3VyY2VGcmFtZSh1aVNvdXJjZUNvZGUpOwotICAgICAgICAgICAgdGhpcy5fc291cmNlRnJhbWVz Rm9yUmVzb3VyY2UucHV0KHVpU291cmNlQ29kZSwgc291cmNlRnJhbWUpOwotICAgICAgICB9Ci0g ICAgICAgIHJldHVybiBzb3VyY2VGcmFtZTsKKyAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfSwK IAotICAgIF9pdGVtU2VsZWN0ZWQ6IGZ1bmN0aW9uKGV2ZW50KQorICAgIC8qKgorICAgICAqIEBw YXJhbSB7ZnVuY3Rpb24oP3N0cmluZyxib29sZWFuLHN0cmluZyl9IGNhbGxiYWNrCisgICAgICov CisgICAgcmVxdWVzdENvbnRlbnQ6IGZ1bmN0aW9uKGNhbGxiYWNrKQogICAgIHsKLSAgICAgICAg dmFyIHVpU291cmNlQ29kZSA9IC8qKiBAdHlwZSB7V2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZX0g Ki8gZXZlbnQuZGF0YS51aVNvdXJjZUNvZGU7Ci0gICAgICAgIHRoaXMuX3Nob3dGaWxlKHVpU291 cmNlQ29kZSk7Ci0gICAgICAgIHRoaXMuX25hdmlnYXRvckNvbnRyb2xsZXIuaGlkZU5hdmlnYXRv ck92ZXJsYXkoKTsKLSAgICAgICAgaWYgKGV2ZW50LmRhdGEuZm9jdXNTb3VyY2UpCi0gICAgICAg ICAgICB0aGlzLl9lZGl0b3JDb250YWluZXIudmlldy5mb2N1cygpOworICAgICAgICB0aGlzLl9z dHlsZVNvdXJjZS5yZXF1ZXN0Q29udGVudChjYWxsYmFjayk7CiAgICAgfSwKIAotICAgIF9zaG93 RmlsZTogZnVuY3Rpb24odWlTb3VyY2VDb2RlKQorICAgIC8qKgorICAgICAqIEBwYXJhbSB7c3Ry aW5nfSB0ZXh0CisgICAgICovCisgICAgY29tbWl0RWRpdGluZzogZnVuY3Rpb24odGV4dCkKICAg ICB7Ci0gICAgICAgIHRoaXMuX25hdmlnYXRvclZpZXcucmV2ZWFsVUlTb3VyY2VDb2RlKHVpU291 cmNlQ29kZSk7Ci0gICAgICAgIHRoaXMuX2VkaXRvckNvbnRhaW5lci5zaG93RmlsZSh1aVNvdXJj ZUNvZGUpOworICAgICAgICB0aGlzLl9yZXNvdXJjZS5zZXRDb250ZW50KHRleHQsIHRydWUsIGZ1 bmN0aW9uKCkge30pOwogICAgIH0sCiAKLSAgICBjYW5TaG93QW5jaG9yTG9jYXRpb246IGZ1bmN0 aW9uKGFuY2hvcikKKyAgICBhZnRlclRleHRDaGFuZ2VkOiBmdW5jdGlvbihvbGRSYW5nZSwgbmV3 UmFuZ2UpCiAgICAgewotICAgICAgICB2YXIgcmVzb3VyY2UgPSBXZWJJbnNwZWN0b3IucmVzb3Vy Y2VGb3JVUkwoYW5jaG9yLmhyZWYpOwotICAgICAgICByZXR1cm4gISFyZXNvdXJjZSAmJiByZXNv dXJjZS50eXBlID09PSBXZWJJbnNwZWN0b3IucmVzb3VyY2VUeXBlcy5TdHlsZXNoZWV0OworICAg ICAgICBmdW5jdGlvbiBjb21taXRJbmNyZW1lbnRhbEVkaXQoKQorICAgICAgICB7CisgICAgICAg ICAgICB2YXIgdGV4dCA9IHRoaXMuX3RleHRNb2RlbC50ZXh0OworICAgICAgICAgICAgdGhpcy5f c3R5bGVTb3VyY2Uuc2V0V29ya2luZ0NvcHkodGV4dCk7CisgICAgICAgICAgICB0aGlzLl9yZXNv dXJjZS5zZXRDb250ZW50KHRleHQsIGZhbHNlLCBmdW5jdGlvbigpIHt9KTsKKyAgICAgICAgfQor ICAgICAgICBjb25zdCB1cGRhdGVUaW1lb3V0ID0gMjAwOworICAgICAgICB0aGlzLl9pbmNyZW1l bnRhbFVwZGF0ZVRpbWVyID0gc2V0VGltZW91dChjb21taXRJbmNyZW1lbnRhbEVkaXQuYmluZCh0 aGlzKSwgdXBkYXRlVGltZW91dCk7CiAgICAgfSwKIAotICAgIHNob3dBbmNob3JMb2NhdGlvbjog ZnVuY3Rpb24oYW5jaG9yKQorICAgIF9jbGVhckluY3JlbWVudGFsVXBkYXRlVGltZXI6IGZ1bmN0 aW9uKCkKICAgICB7Ci0gICAgICAgIHZhciByZXNvdXJjZSA9IHRoaXMuX3VybFRvUmVzb3VyY2Vb YW5jaG9yLmhyZWZdOwotICAgICAgICBpZiAoIXJlc291cmNlKQotICAgICAgICAgICAgcmV0dXJu OwotCi0gICAgICAgIHRoaXMuX3Nob3dGaWxlKHJlc291cmNlKTsKLSAgICAgICAgdmFyIHNvdXJj ZUZyYW1lID0gdGhpcy5fc291cmNlRnJhbWVzRm9yUmVzb3VyY2UuZ2V0KHJlc291cmNlKTsKLSAg ICAgICAgaWYgKHR5cGVvZiBhbmNob3IubGluZU51bWJlciA9PT0gIm51bWJlciIpCi0gICAgICAg ICAgICBzb3VyY2VGcmFtZS5oaWdobGlnaHRMaW5lKGFuY2hvci5saW5lTnVtYmVyKTsKLSAgICAg ICAgdGhpcy5fZWRpdG9yQ29udGFpbmVyLnZpZXcuZm9jdXMoKTsKKyAgICAgICAgaWYgKHRoaXMu X2luY3JlbWVudGFsVXBkYXRlVGltZXIpCisgICAgICAgICAgICBjbGVhclRpbWVvdXQodGhpcy5f aW5jcmVtZW50YWxVcGRhdGVUaW1lcik7CisgICAgICAgIGRlbGV0ZSB0aGlzLl9pbmNyZW1lbnRh bFVwZGF0ZVRpbWVyOwogICAgIH0sCiAKLSAgICBfc2hvd09wZW5TdHlsZXNoZWV0RGlhbG9nOiBm dW5jdGlvbigpCi0gICAgewotICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLkRpYWxvZy5jdXJyZW50 SW5zdGFuY2UoKSkKLSAgICAgICAgICAgIHJldHVybjsKLQotICAgICAgICB2YXIgZGlhbG9nID0g bmV3IFdlYkluc3BlY3Rvci5GaWx0ZXJlZEl0ZW1TZWxlY3Rpb25EaWFsb2cobmV3IFdlYkluc3Bl Y3Rvci5PcGVuU3R5bGVzaGVldERpYWxvZyh0aGlzKSk7Ci0gICAgICAgIFdlYkluc3BlY3Rvci5E aWFsb2cuc2hvdyh0aGlzLmVsZW1lbnQsIGRpYWxvZyk7Ci0gICAgfQotfQotCi1XZWJJbnNwZWN0 b3IuU3R5bGVzUGFuZWwucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5QYW5lbC5w cm90b3R5cGU7Ci0KLS8qKgotICogQGNvbnN0cnVjdG9yCi0gKiBAZXh0ZW5kcyB7V2ViSW5zcGVj dG9yLk9wZW5SZXNvdXJjZURpYWxvZ30KLSAqIEBwYXJhbSB7V2ViSW5zcGVjdG9yLlN0eWxlc1Bh bmVsfSBwYW5lbAotICovCi1XZWJJbnNwZWN0b3IuT3BlblN0eWxlc2hlZXREaWFsb2cgPSBmdW5j dGlvbihwYW5lbCkKLXsKLSAgICB2YXIgcmVzb3VyY2VzID0gW107Ci0gICAgZm9yICh2YXIgdXJs IGluIHBhbmVsLl91cmxUb1Jlc291cmNlKQotICAgICAgICByZXNvdXJjZXMucHVzaChwYW5lbC5f dXJsVG9SZXNvdXJjZVt1cmxdKTsKLSAgICBXZWJJbnNwZWN0b3IuT3BlblJlc291cmNlRGlhbG9n LmNhbGwodGhpcywgcmVzb3VyY2VzKTsKLQotICAgIHRoaXMuX3BhbmVsID0gcGFuZWw7Ci19Ci0K LVdlYkluc3BlY3Rvci5PcGVuU3R5bGVzaGVldERpYWxvZy5wcm90b3R5cGUgPSB7Ci0gICAgLyoq Ci0gICAgICogQHBhcmFtIHtudW1iZXJ9IGl0ZW1JbmRleAotICAgICAqLwotICAgIHNlbGVjdEl0 ZW06IGZ1bmN0aW9uKGl0ZW1JbmRleCkKKyAgICBfY29udGVudENoYW5nZWQ6IGZ1bmN0aW9uKGV2 ZW50KQogICAgIHsKLSAgICAgICAgdGhpcy5fcGFuZWwuX3Nob3dGaWxlKHRoaXMucmVzb3VyY2Vz W2l0ZW1JbmRleF0pOworICAgICAgICB0aGlzLl9zdHlsZVNvdXJjZS5jb250ZW50Q2hhbmdlZCh0 aGlzLl9yZXNvdXJjZS5jb250ZW50IHx8ICIiKTsKKyAgICAgICAgdGhpcy5zZXRDb250ZW50KHRo aXMuX3Jlc291cmNlLmNvbnRlbnQsIGZhbHNlLCAidGV4dC9zdHlsZXNoZWV0Iik7CiAgICAgfQog fQogCi1XZWJJbnNwZWN0b3IuT3BlblN0eWxlc2hlZXREaWFsb2cucHJvdG90eXBlLl9fcHJvdG9f XyA9IFdlYkluc3BlY3Rvci5PcGVuUmVzb3VyY2VEaWFsb2cucHJvdG90eXBlOworV2ViSW5zcGVj dG9yLlN0eWxlU291cmNlRnJhbWUucHJvdG90eXBlLl9fcHJvdG9fXyA9IFdlYkluc3BlY3Rvci5T b3VyY2VGcmFtZS5wcm90b3R5cGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1N0eWxlc1NpZGViYXJQYW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL2Zyb250LWVuZC9TdHlsZXNTaWRlYmFyUGFuZS5qcwppbmRleCA5NGJmOWRkYWQwYjczNjQz MjIxM2U5ZGJkZjM2M2E1ZDVkNTFiMDM2Li5lYTE4NTZjZWQ4OGExZmFjNWRkYzY2MTBlNjU0YjYw YzU1ZDg3NTAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1N0eWxlc1NpZGViYXJQYW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvU3R5bGVzU2lkZWJhclBhbmUuanMKQEAgLTk1OSw3ICs5NTksNyBAQCBXZWJJbnNwZWN0 b3IuU3R5bGVQcm9wZXJ0aWVzU2VjdGlvbiA9IGZ1bmN0aW9uKHBhcmVudFBhbmUsIHN0eWxlUnVs ZSwgZWRpdGFibGUsCiAgICAgICAgICAgICAgICAgdmFyIHJlZkVsZW1lbnQgPSBtZWRpYURhdGFF bGVtZW50LmNyZWF0ZUNoaWxkKCJkaXYiLCAic3VidGl0bGUiKTsKICAgICAgICAgICAgICAgICB2 YXIgbGluZU51bWJlciA9IG1lZGlhLnNvdXJjZUxpbmUgPCAwID8gdW5kZWZpbmVkIDogbWVkaWEu c291cmNlTGluZTsKICAgICAgICAgICAgICAgICB2YXIgYW5jaG9yID0gV2ViSW5zcGVjdG9yLmxp bmtpZnlSZXNvdXJjZUFzTm9kZShtZWRpYS5zb3VyY2VVUkwsIGxpbmVOdW1iZXIsICJzdWJ0aXRs ZSIsIG1lZGlhLnNvdXJjZVVSTCArIChpc05hTihsaW5lTnVtYmVyKSA/ICIiIDogKCI6IiArIChs aW5lTnVtYmVyICsgMSkpKSk7Ci0gICAgICAgICAgICAgICAgYW5jaG9yLnByZWZlcnJlZFBhbmVs ID0gInN0eWxlcyI7CisgICAgICAgICAgICAgICAgYW5jaG9yLnByZWZlcnJlZFBhbmVsID0gInNj cmlwdHMiOwogICAgICAgICAgICAgICAgIGFuY2hvci5zdHlsZS5mbG9hdCA9ICJyaWdodCI7CiAg ICAgICAgICAgICAgICAgcmVmRWxlbWVudC5hcHBlbmRDaGlsZChhbmNob3IpOwogICAgICAgICAg ICAgfQpAQCAtMTIxMyw3ICsxMjEzLDcgQEAgV2ViSW5zcGVjdG9yLlN0eWxlUHJvcGVydGllc1Nl Y3Rpb24ucHJvdG90eXBlID0gewogICAgICAgICBmdW5jdGlvbiBsaW5raWZ5VW5jb3B5YWJsZSh1 cmwsIGxpbmUpCiAgICAgICAgIHsKICAgICAgICAgICAgIHZhciBsaW5rID0gV2ViSW5zcGVjdG9y LmxpbmtpZnlSZXNvdXJjZUFzTm9kZSh1cmwsIGxpbmUsICIiLCB1cmwgKyAiOiIgKyAobGluZSAr IDEpKTsKLSAgICAgICAgICAgIGxpbmsucHJlZmVycmVkUGFuZWwgPSAic3R5bGVzIjsKKyAgICAg ICAgICAgIGxpbmsucHJlZmVycmVkUGFuZWwgPSAic2NyaXB0cyI7CiAgICAgICAgICAgICBsaW5r LmNsYXNzTGlzdC5hZGQoIndlYmtpdC1odG1sLXJlc291cmNlLWxpbmsiKTsKICAgICAgICAgICAg IGxpbmsuc2V0QXR0cmlidXRlKCJkYXRhLXVuY29weWFibGUiLCBsaW5rLnRleHRDb250ZW50KTsK ICAgICAgICAgICAgIGxpbmsudGV4dENvbnRlbnQgPSAiIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVUlTb3VyY2VDb2RlLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9VSVNvdXJjZUNvZGUuanMKaW5kZXggYmFkZmZhNTgyYzc2 MjdkMDhmNTc0ZmU1ZWFjNGE5YTE3YWE0ZDBhNC4uY2ZmM2YxYjY3NjRiZTViYjhmYTg1OWUwZjI2 MWIyYTBjMjFmZjU5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9VSVNvdXJjZUNvZGUuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9VSVNvdXJjZUNvZGUuanMKQEAgLTM0LDcgKzM0LDcgQEAKICAqIEBleHRlbmRzIHtXZWJJ bnNwZWN0b3IuT2JqZWN0fQogICogQHBhcmFtIHtzdHJpbmd9IHVybAogICogQHBhcmFtIHtXZWJJ bnNwZWN0b3IuQ29udGVudFByb3ZpZGVyfSBjb250ZW50UHJvdmlkZXIKLSAqIEBwYXJhbSB7V2Vi SW5zcGVjdG9yLlNvdXJjZU1hcHBpbmd9IHNvdXJjZU1hcHBpbmcKKyAqIEBwYXJhbSB7V2ViSW5z cGVjdG9yLlNvdXJjZU1hcHBpbmc9fSBzb3VyY2VNYXBwaW5nCiAgKi8KIFdlYkluc3BlY3Rvci5V SVNvdXJjZUNvZGUgPSBmdW5jdGlvbih1cmwsIGNvbnRlbnRQcm92aWRlciwgc291cmNlTWFwcGlu ZykKIHsKQEAgLTE1NSwxMSArMTU1LDYgQEAgV2ViSW5zcGVjdG9yLlVJU291cmNlQ29kZS5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlzLl9jb250ZW50TG9hZGVkICYmIHR5cGVvZiB0 aGlzLl93b3JraW5nQ29weSAhPT0gInVuZGVmaW5lZCIgJiYgdGhpcy5fd29ya2luZ0NvcHkgIT09 IHRoaXMuX2NvbnRlbnQ7CiAgICAgfSwKIAotICAgIGNvbW1pdFdvcmtpbmdDb3B5OiBmdW5jdGlv bihjYWxsYmFjaykKLSAgICB7Ci0gICAgICAgIC8vIE92ZXJyaWRlbi4KLSAgICB9LAotCiAgICAg LyoqCiAgICAgICogQHJldHVybiB7c3RyaW5nfQogICAgICAqLwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qcwppbmRleCA0NGMwOGYxODFlMGNiNDJm YmIxYWZiM2YzYWZkZGEzMmRiN2E0MTllLi5mMTBlNDc4NjllMGU1OGE4MWEyOWU3ZmE3YjNhMWMz OTRhNmE2Y2M2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L2luc3BlY3Rvci5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2lu c3BlY3Rvci5qcwpAQCAtNTMsOCArNTMsNiBAQCB2YXIgV2ViSW5zcGVjdG9yID0gewogICAgICAg ICAgICAgdGhpcy5wYW5lbHMubmV0d29yayA9IG5ldyBXZWJJbnNwZWN0b3IuTmV0d29ya1BhbmVs KCk7CiAgICAgICAgIGlmIChoaWRkZW5QYW5lbHMuaW5kZXhPZigic2NyaXB0cyIpID09PSAtMSkK ICAgICAgICAgICAgIHRoaXMucGFuZWxzLnNjcmlwdHMgPSBuZXcgV2ViSW5zcGVjdG9yLlNjcmlw dHNQYW5lbCgpOwotICAgICAgICBpZiAoaGlkZGVuUGFuZWxzLmluZGV4T2YoInN0eWxlcyIpID09 PSAtMSAmJiBXZWJJbnNwZWN0b3IuZXhwZXJpbWVudHNTZXR0aW5ncy5zaG93U3R5bGVzUGFuZWwu aXNFbmFibGVkKCkpCi0gICAgICAgICAgICB0aGlzLnBhbmVscy5zdHlsZXMgPSBuZXcgV2ViSW5z cGVjdG9yLlN0eWxlc1BhbmVsKCk7CiAgICAgICAgIGlmIChoaWRkZW5QYW5lbHMuaW5kZXhPZigi dGltZWxpbmUiKSA9PT0gLTEpCiAgICAgICAgICAgICB0aGlzLnBhbmVscy50aW1lbGluZSA9IG5l dyBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbCgpOwogICAgICAgICBpZiAoaGlkZGVuUGFuZWxz LmluZGV4T2YoInByb2ZpbGVzIikgPT09IC0xKQo=