48839 2010-11-02 08:44:14 -0700 Web Inspector: display frame names in the resources panel. 2010-11-02 12:06:30 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman apavlov bweinstein dbates joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 303381 0 pfeldman 2010-11-02 08:44:14 -0700 Patch to follow. 303383 1 72673 pfeldman 2010-11-02 08:48:34 -0700 Created attachment 72673 [PATCH] Proposed change. 303499 2 72673 timothy 2010-11-02 11:15:52 -0700 Comment on attachment 72673 [PATCH] Proposed change. View in context: https://bugs.webkit.org/attachment.cgi?id=72673&action=review > WebCore/inspector/front-end/ResourceManager.js:487 > + var tmpResource = new WebInspector.Resource(null, frame.url); Would be better just to factor out displayName so you don't need to make a Resource. > WebCore/inspector/front-end/StoragePanel.js:863 > + subtitleElement.textContent = "(" + subtitle + ")"; Why the ()? Screenshot? 303534 3 pfeldman 2010-11-02 12:01:36 -0700 I will factor out displayName into resource manager. But so far it is using lastPathComponent parsing that is not so eary to extract (it uses Resource's field). Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/inspector/Inspector.idl M WebCore/inspector/InspectorResourceAgent.cpp M WebCore/inspector/InspectorResourceAgent.h M WebCore/inspector/front-end/ResourceManager.js M WebCore/inspector/front-end/StoragePanel.js M WebCore/inspector/front-end/inspector.css Committed r71144 72673 2010-11-02 08:48:34 -0700 2010-11-02 11:15:52 -0700 [PATCH] Proposed change. frame_names text/plain 17629 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg M2M1MmRlMC4uOWY3YzY1OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzOSBAQAorMjAxMC0xMS0wMiAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBkaXNwbGF5IGZyYW1lIG5hbWVzIGlu IHRoZSByZXNvdXJjZXMgcGFuZWwuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD00ODgzOQorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3Rvci5pZGw6 CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6ZnJhbWVJZCk6CisgICAgICAgIChXZWJDb3JlOjpidWlsZE9iamVjdEZvckRv Y3VtZW50TG9hZGVyKToKKyAgICAgICAgKFdlYkNvcmU6OmJ1aWxkT2JqZWN0Rm9yRnJhbWUpOgor ICAgICAgICAoV2ViQ29yZTo6YnVpbGRPYmplY3RGb3JGcmFtZVRyZWUpOgorICAgICAgICAoV2Vi Q29yZTo6SW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6ZGlkQ29tbWl0TG9hZCk6CisgICAgICAgIChX ZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpmcmFtZURldGFjaGVkRnJvbVBhcmVudCk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpmcmFtZUZvcklkKToK KyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclJlc291cmNlQWdlbnQ6OnJlc291cmNlQ29udGVu dCk6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuaDoKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlTWFuYWdlci5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5SZXNvdXJjZU1hbmFnZXIucHJvdG90eXBlLmRpZENvbW1pdExvYWRGb3JGcmFt ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VNYW5hZ2VyLnByb3RvdHlwZS5fcHJv Y2Vzc0NhY2hlZFJlc291cmNlcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VNYW5h Z2VyLnByb3RvdHlwZS5fYWRkRnJhbWVzUmVjdXJzaXZlbHkpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlJlc291cmNlVHJlZU1vZGVsLnByb3RvdHlwZS5hZGRPclVwZGF0ZUZyYW1lKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbC5wcm90b3R5cGUuZGlkQ29tbWl0TG9h ZEZvckZyYW1lKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1N0b3JhZ2VQYW5lbC5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5TdG9yYWdlUGFuZWwucHJvdG90eXBlLmFkZE9yVXBk YXRlRnJhbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkJhc2VTdG9yYWdlVHJlZUVsZW1lbnQu cHJvdG90eXBlLmdldCB0aXRsZVRleHQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZyYW1lVHJl ZUVsZW1lbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQucHJvdG90 eXBlLm9uYXR0YWNoKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5GcmFtZVRyZWVFbGVtZW50LnBy b3RvdHlwZS5nZXQgbmFtZUZvclNvcnRpbmcpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkZyYW1l VHJlZUVsZW1lbnQucHJvdG90eXBlLnNldFRpdGxlcyk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu RnJhbWVUcmVlRWxlbWVudC5wcm90b3R5cGUuc2V0IGhvdmVyZWQpOgorICAgICAgICAqIGluc3Bl Y3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNzczoKKyAgICAgICAgKGxpLnNlbGVjdGVkIC5iYXNl LXN0b3JhZ2UtdHJlZS1lbGVtZW50LXN1YnRpdGxlKToKKyAgICAgICAgKC5iYXNlLXN0b3JhZ2Ut dHJlZS1lbGVtZW50LXN1YnRpdGxlKToKKwogMjAxMC0xMS0wMiAgTmlrb2xhcyBaaW1tZXJtYW5u ICA8bnppbW1lcm1hbm5AcmltLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBSb2IgQnVpcy4K ZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwgYi9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3IuaWRsCmluZGV4IDdkMzE3YjEuLmJjYzJmOGYgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvci5pZGwKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yLmlkbApAQCAtMTE0LDcgKzExNCw3IEBAIG1vZHVsZSBjb3JlIHsKICAgICAgICAg W25vdGlmeV0gdm9pZCBkaWRGYWlsTG9hZGluZyhvdXQgbG9uZyBpZGVudGlmaWVyLCBvdXQgZG91 YmxlIHRpbWUsIG91dCBTdHJpbmcgbG9jYWxpemVkRGVzY3JpcHRpb24pOwogICAgICAgICBbbm90 aWZ5XSB2b2lkIGRpZExvYWRSZXNvdXJjZUZyb21NZW1vcnlDYWNoZShvdXQgZG91YmxlIHRpbWUs IG91dCBPYmplY3QgcmVzb3VyY2UpOwogICAgICAgICBbbm90aWZ5XSB2b2lkIHNldE92ZXJyaWRl Q29udGVudChvdXQgbG9uZyBpZGVudGlmaWVyLCBvdXQgU3RyaW5nIHNvdXJjZVN0cmluZywgb3V0 IFN0cmluZyB0eXBlKTsKLSAgICAgICAgW25vdGlmeV0gdm9pZCBkaWRDb21taXRMb2FkRm9yRnJh bWUob3V0IHVuc2lnbmVkIGxvbmcgcGFyZW50RnJhbWVJZCwgb3V0IE9iamVjdCBsb2FkZXIpOwor ICAgICAgICBbbm90aWZ5XSB2b2lkIGRpZENvbW1pdExvYWRGb3JGcmFtZShvdXQgT2JqZWN0IGZy YW1lLCBvdXQgT2JqZWN0IGxvYWRlcik7CiAgICAgICAgIFtub3RpZnldIHZvaWQgZnJhbWVEZXRh Y2hlZEZyb21QYXJlbnQob3V0IHVuc2lnbmVkIGxvbmcgZnJhbWVJZCk7CiAKICAgICAgICAgW25v dGlmeV0gdm9pZCBkaWRDcmVhdGVXZWJTb2NrZXQob3V0IHVuc2lnbmVkIGxvbmcgaWRlbnRpZmll ciwgb3V0IFN0cmluZyByZXF1ZXN0VVJMKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9y UmVzb3VyY2VBZ2VudC5jcHAKaW5kZXggZWM1MGUxMi4uODNmMGY4NCAxMDA2NDQKLS0tIGEvV2Vi Q29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAKKysrIGIvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAKQEAgLTM5LDYgKzM5LDggQEAKICNp bmNsdWRlICJEb2N1bWVudExvYWRlci5oIgogI2luY2x1ZGUgIkZyYW1lLmgiCiAjaW5jbHVkZSAi RnJhbWVMb2FkZXIuaCIKKyNpbmNsdWRlICJIVE1MRnJhbWVPd25lckVsZW1lbnQuaCIKKyNpbmNs dWRlICJIVE1MTmFtZXMuaCIKICNpbmNsdWRlICJIVFRQSGVhZGVyTWFwLmgiCiAjaW5jbHVkZSAi SW5zcGVjdG9yRnJvbnRlbmQuaCIKICNpbmNsdWRlICJJbnNwZWN0b3JWYWx1ZXMuaCIKQEAgLTIw MCwxMCArMjAyLDE1IEBAIHN0YXRpYyBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gYnVpbGRP YmplY3RGb3JSZXNvdXJjZVJlc3BvbnNlKGNvbnN0IFJlc291cmNlCiAgICAgcmV0dXJuIHJlc3Bv bnNlT2JqZWN0OwogfQogCitzdGF0aWMgdW5zaWduZWQgbG9uZyBmcmFtZUlkKEZyYW1lKiBmcmFt ZSkKK3sKKyAgICByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KGZyYW1lKTsKK30K Kwogc3RhdGljIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBidWlsZE9iamVjdEZvckRvY3Vt ZW50TG9hZGVyKERvY3VtZW50TG9hZGVyKiBsb2FkZXIpCiB7CiAgICAgUmVmUHRyPEluc3BlY3Rv ck9iamVjdD4gZG9jdW1lbnRMb2FkZXJPYmplY3QgPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgp OwotICAgIGRvY3VtZW50TG9hZGVyT2JqZWN0LT5zZXROdW1iZXIoImZyYW1lSWQiLCByZWludGVy cHJldF9jYXN0PHVpbnRwdHJfdD4obG9hZGVyLT5mcmFtZSgpKSk7CisgICAgZG9jdW1lbnRMb2Fk ZXJPYmplY3QtPnNldE51bWJlcigiZnJhbWVJZCIsIGZyYW1lSWQobG9hZGVyLT5mcmFtZSgpKSk7 CiAgICAgZG9jdW1lbnRMb2FkZXJPYmplY3QtPnNldE51bWJlcigibG9hZGVySWQiLCByZWludGVy cHJldF9jYXN0PHVpbnRwdHJfdD4obG9hZGVyKSk7CiAgICAgZG9jdW1lbnRMb2FkZXJPYmplY3Qt PnNldFN0cmluZygidXJsIiwgbG9hZGVyLT5yZXF1ZXN0VVJMKCkuc3RyaW5nKCkpOwogICAgIHJl dHVybiBkb2N1bWVudExvYWRlck9iamVjdDsKQEAgLTMzNSwxMSArMzQyLDI1IEBAIHZvaWQgSW5z cGVjdG9yUmVzb3VyY2VBZ2VudDo6c2V0T3ZlcnJpZGVDb250ZW50KHVuc2lnbmVkIGxvbmcgaWRl bnRpZmllciwgY29uc3QKICAgICBtX2Zyb250ZW5kLT5zZXRPdmVycmlkZUNvbnRlbnQoaWRlbnRp Zmllciwgc291cmNlU3RyaW5nLCB0eXBlKTsKIH0KIAotc3RhdGljIFBhc3NSZWZQdHI8SW5zcGVj dG9yT2JqZWN0PiBidWlsZE9iamVjdEZvckZyYW1lVHJlZShGcmFtZSogZnJhbWUsIGJvb2wgZHVt cFJlc291cmNlcykKK3N0YXRpYyBQYXNzUmVmUHRyPEluc3BlY3Rvck9iamVjdD4gYnVpbGRPYmpl Y3RGb3JGcmFtZShGcmFtZSogZnJhbWUpCiB7CiAgICAgUmVmUHRyPEluc3BlY3Rvck9iamVjdD4g ZnJhbWVPYmplY3QgPSBJbnNwZWN0b3JPYmplY3Q6OmNyZWF0ZSgpOwotICAgIGZyYW1lT2JqZWN0 LT5zZXROdW1iZXIoInBhcmVudElkIiwgcmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KGZyYW1l LT50cmVlKCktPnBhcmVudCgpKSk7Ci0gICAgZnJhbWVPYmplY3QtPnNldE51bWJlcigiaWQiLCBy ZWludGVycHJldF9jYXN0PHVpbnRwdHJfdD4oZnJhbWUpKTsKKyAgICBmcmFtZU9iamVjdC0+c2V0 TnVtYmVyKCJpZCIsIGZyYW1lSWQoZnJhbWUpKTsKKyAgICBmcmFtZU9iamVjdC0+c2V0TnVtYmVy KCJwYXJlbnRJZCIsIGZyYW1lSWQoZnJhbWUtPnRyZWUoKS0+cGFyZW50KCkpKTsKKyAgICBpZiAo ZnJhbWUtPm93bmVyRWxlbWVudCgpKSB7DQorICAgICAgICBTdHJpbmcgbmFtZSA9IGZyYW1lLT5v d25lckVsZW1lbnQoKS0+Z2V0QXR0cmlidXRlKEhUTUxOYW1lczo6bmFtZUF0dHIpOw0KKyAgICAg ICAgaWYgKG5hbWUuaXNFbXB0eSgpKQ0KKyAgICAgICAgICAgIG5hbWUgPSBmcmFtZS0+b3duZXJF bGVtZW50KCktPmdldEF0dHJpYnV0ZShIVE1MTmFtZXM6OmlkQXR0cik7DQorICAgICAgICBmcmFt ZU9iamVjdC0+c2V0U3RyaW5nKCJuYW1lIiwgbmFtZSk7CisgICAgfQorICAgIGZyYW1lT2JqZWN0 LT5zZXRTdHJpbmcoInVybCIsIGZyYW1lLT5sb2FkZXIoKS0+dXJsKCkuc3RyaW5nKCkpOworICAg IHJldHVybiBmcmFtZU9iamVjdDsKK30KKworc3RhdGljIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2Jq ZWN0PiBidWlsZE9iamVjdEZvckZyYW1lVHJlZShGcmFtZSogZnJhbWUsIGJvb2wgZHVtcFJlc291 cmNlcykKK3sKKyAgICBSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBmcmFtZU9iamVjdCA9IGJ1aWxk T2JqZWN0Rm9yRnJhbWUoZnJhbWUpOworCiAgICAgaWYgKGR1bXBSZXNvdXJjZXMpCiAgICAgICAg IHBvcHVsYXRlT2JqZWN0V2l0aEZyYW1lUmVzb3VyY2VzKGZyYW1lLCBmcmFtZU9iamVjdCk7CiAg ICAgUmVmUHRyPEluc3BlY3RvckFycmF5PiBjaGlsZHJlbkFycmF5OwpAQCAtMzU1LDEzICszNzYs MTIgQEAgc3RhdGljIFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiBidWlsZE9iamVjdEZvckZy YW1lVHJlZShGcmFtZSogZnJhbWUsIGJvb2wgZHUKIAogdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFn ZW50OjpkaWRDb21taXRMb2FkKERvY3VtZW50TG9hZGVyKiBsb2FkZXIpCiB7Ci0gICAgRnJhbWUq IHBhcmVudEZyYW1lID0gbG9hZGVyLT5mcmFtZSgpLT50cmVlKCktPnBhcmVudCgpOwotICAgIG1f ZnJvbnRlbmQtPmRpZENvbW1pdExvYWRGb3JGcmFtZShyZWludGVycHJldF9jYXN0PHVpbnRwdHJf dD4ocGFyZW50RnJhbWUpLCBidWlsZE9iamVjdEZvckRvY3VtZW50TG9hZGVyKGxvYWRlcikpOwor ICAgIG1fZnJvbnRlbmQtPmRpZENvbW1pdExvYWRGb3JGcmFtZShidWlsZE9iamVjdEZvckZyYW1l KGxvYWRlci0+ZnJhbWUoKSksIGJ1aWxkT2JqZWN0Rm9yRG9jdW1lbnRMb2FkZXIobG9hZGVyKSk7 CiB9CiAKIHZvaWQgSW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6ZnJhbWVEZXRhY2hlZEZyb21QYXJl bnQoRnJhbWUqIGZyYW1lKQogewotICAgIG1fZnJvbnRlbmQtPmZyYW1lRGV0YWNoZWRGcm9tUGFy ZW50KHJlaW50ZXJwcmV0X2Nhc3Q8dWludHB0cl90PihmcmFtZSkpOworICAgIG1fZnJvbnRlbmQt PmZyYW1lRGV0YWNoZWRGcm9tUGFyZW50KGZyYW1lSWQoZnJhbWUpKTsKIH0KIAogI2lmIEVOQUJM RShXRUJfU09DS0VUUykKQEAgLTQxNCwxNSArNDM0LDI1IEBAIHZvaWQgSW5zcGVjdG9yUmVzb3Vy Y2VBZ2VudDo6ZGlkQ2xvc2VXZWJTb2NrZXQodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyKQogfQog I2VuZGlmIC8vIEVOQUJMRShXRUJfU09DS0VUUykKIAorRnJhbWUqIEluc3BlY3RvclJlc291cmNl QWdlbnQ6OmZyYW1lRm9ySWQodW5zaWduZWQgbG9uZyBmcmFtZUlkKQoreworICAgIEZyYW1lKiBt YWluRnJhbWUgPSBtX3BhZ2UtPm1haW5GcmFtZSgpOworICAgIGZvciAoRnJhbWUqIGZyYW1lID0g bWFpbkZyYW1lOyBmcmFtZTsgZnJhbWUgPSBmcmFtZS0+dHJlZSgpLT50cmF2ZXJzZU5leHQobWFp bkZyYW1lKSkgeworICAgICAgICBpZiAocmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KGZyYW1l KSA9PSBmcmFtZUlkKQorICAgICAgICAgICAgcmV0dXJuIGZyYW1lOworICAgIH0KKyAgICByZXR1 cm4gMDsKK30KKwogdm9pZCBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpjYWNoZWRSZXNvdXJjZXMo UmVmUHRyPEluc3BlY3Rvck9iamVjdD4qIG9iamVjdCkKIHsKICAgICAqb2JqZWN0ID0gYnVpbGRP YmplY3RGb3JGcmFtZVRyZWUobV9wYWdlLT5tYWluRnJhbWUoKSwgdHJ1ZSk7CiB9CiAKLXZvaWQg SW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6cmVzb3VyY2VDb250ZW50KHVuc2lnbmVkIGxvbmcgZnJh bWVJZCwgY29uc3QgU3RyaW5nJiB1cmwsIGJvb2wgYmFzZTY0RW5jb2RlLCBTdHJpbmcqIGNvbnRl bnQpCit2b2lkIEluc3BlY3RvclJlc291cmNlQWdlbnQ6OnJlc291cmNlQ29udGVudCh1bnNpZ25l ZCBsb25nIGlkLCBjb25zdCBTdHJpbmcmIHVybCwgYm9vbCBiYXNlNjRFbmNvZGUsIFN0cmluZyog Y29udGVudCkKIHsKICAgICBmb3IgKEZyYW1lKiBmcmFtZSA9IG1fcGFnZS0+bWFpbkZyYW1lKCk7 IGZyYW1lOyBmcmFtZSA9IGZyYW1lLT50cmVlKCktPnRyYXZlcnNlTmV4dChtX3BhZ2UtPm1haW5G cmFtZSgpKSkgewotICAgICAgICBpZiAocmVpbnRlcnByZXRfY2FzdDx1aW50cHRyX3Q+KGZyYW1l KSAhPSBmcmFtZUlkKQorICAgICAgICBpZiAoZnJhbWVJZChmcmFtZSkgIT0gaWQpCiAgICAgICAg ICAgICBjb250aW51ZTsKICAgICAgICAgaWYgKGJhc2U2NEVuY29kZSkKICAgICAgICAgICAgIElu c3BlY3RvclJlc291cmNlQWdlbnQ6OnJlc291cmNlQ29udGVudEJhc2U2NChmcmFtZSwgS1VSTChQ YXJzZWRVUkxTdHJpbmcsIHVybCksIGNvbnRlbnQpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNw ZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5oIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yUmVzb3VyY2VBZ2VudC5oCmluZGV4IGY2MTA3MWMuLmUzMTUzYmYgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuaAorKysgYi9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmgKQEAgLTk2LDYgKzk2LDggQEAgcHVibGlj OgogICAgIHZvaWQgZGlkQ2xvc2VXZWJTb2NrZXQodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyKTsK ICNlbmRpZgogCisgICAgRnJhbWUqIGZyYW1lRm9ySWQodW5zaWduZWQgbG9uZyk7CisKICAgICAv LyBDYWxsZWQgZnJvbSBmcm9udGVuZCAKICAgICB2b2lkIGNhY2hlZFJlc291cmNlcyhSZWZQdHI8 SW5zcGVjdG9yT2JqZWN0PiopOwogICAgIHZvaWQgcmVzb3VyY2VDb250ZW50KHVuc2lnbmVkIGxv bmcgZnJhbWVJRCwgY29uc3QgU3RyaW5nJiB1cmwsIGJvb2wgYmFzZTY0RW5jb2RlLCBTdHJpbmcq IGNvbnRlbnQpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291 cmNlTWFuYWdlci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZU1hbmFn ZXIuanMKaW5kZXggMzNiNzlmYy4uYTFlYzNjOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1Jlc291cmNlTWFuYWdlci5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvUmVzb3VyY2VNYW5hZ2VyLmpzCkBAIC0yNTcsOSArMjU3LDkgQEAgV2ViSW5zcGVj dG9yLlJlc291cmNlTWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgIFdlYkluc3BlY3Rvci5w YW5lbHMubmV0d29yay5yZWZyZXNoUmVzb3VyY2UocmVzb3VyY2UpOwogICAgIH0sCiAKLSAgICBk aWRDb21taXRMb2FkRm9yRnJhbWU6IGZ1bmN0aW9uKHBhcmVudEZyYW1lSWQsIGxvYWRlcikKKyAg ICBkaWRDb21taXRMb2FkRm9yRnJhbWU6IGZ1bmN0aW9uKGZyYW1lLCBsb2FkZXIpCiAgICAgewot ICAgICAgICB0aGlzLl9yZXNvdXJjZVRyZWVNb2RlbC5kaWRDb21taXRMb2FkRm9yRnJhbWUocGFy ZW50RnJhbWVJZCwgbG9hZGVyKTsKKyAgICAgICAgdGhpcy5fcmVzb3VyY2VUcmVlTW9kZWwuZGlk Q29tbWl0TG9hZEZvckZyYW1lKGZyYW1lLCBsb2FkZXIpOwogICAgIH0sCiAKICAgICBmcmFtZURl dGFjaGVkRnJvbVBhcmVudDogZnVuY3Rpb24oZnJhbWVJZCkKQEAgLTMxNSwxMiArMzE1LDEyIEBA IFdlYkluc3BlY3Rvci5SZXNvdXJjZU1hbmFnZXIucHJvdG90eXBlID0gewogCiAgICAgX3Byb2Nl c3NDYWNoZWRSZXNvdXJjZXM6IGZ1bmN0aW9uKG1haW5GcmFtZVBheWxvYWQpCiAgICAgewotICAg ICAgICB2YXIgbWFpblJlc291cmNlID0gdGhpcy5fYWRkRnJhbWVzUmVjdXJzaXZlbHkobnVsbCwg bWFpbkZyYW1lUGF5bG9hZCk7CisgICAgICAgIHZhciBtYWluUmVzb3VyY2UgPSB0aGlzLl9hZGRG cmFtZXNSZWN1cnNpdmVseShtYWluRnJhbWVQYXlsb2FkKTsKICAgICAgICAgV2ViSW5zcGVjdG9y Lm1haW5SZXNvdXJjZSA9IG1haW5SZXNvdXJjZTsKICAgICAgICAgbWFpblJlc291cmNlLmlzTWFp blJlc291cmNlID0gdHJ1ZTsKICAgICB9LAogCi0gICAgX2FkZEZyYW1lc1JlY3Vyc2l2ZWx5OiBm dW5jdGlvbihwYXJlbnRGcmFtZUlkLCBmcmFtZVBheWxvYWQpCisgICAgX2FkZEZyYW1lc1JlY3Vy c2l2ZWx5OiBmdW5jdGlvbihmcmFtZVBheWxvYWQpCiAgICAgewogICAgICAgICB2YXIgZnJhbWVS ZXNvdXJjZSA9IHRoaXMuX2NyZWF0ZVJlc291cmNlKG51bGwsIGZyYW1lUGF5bG9hZC5yZXNvdXJj ZS51cmwsIGZyYW1lUGF5bG9hZC5yZXNvdXJjZS5sb2FkZXIpOwogICAgICAgICB0aGlzLl91cGRh dGVSZXNvdXJjZVdpdGhSZXF1ZXN0KGZyYW1lUmVzb3VyY2UsIGZyYW1lUGF5bG9hZC5yZXNvdXJj ZS5yZXF1ZXN0KTsKQEAgLTMyOSwxMSArMzI5LDExIEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZU1h bmFnZXIucHJvdG90eXBlID0gewogICAgICAgICBmcmFtZVJlc291cmNlLmZpbmlzaGVkID0gdHJ1 ZTsKICAgICAgICAgdGhpcy5fYmluZFJlc291cmNlVVJMKGZyYW1lUmVzb3VyY2UpOwogCi0gICAg ICAgIHRoaXMuX3Jlc291cmNlVHJlZU1vZGVsLmFkZE9yVXBkYXRlRnJhbWUocGFyZW50RnJhbWVJ ZCwgZnJhbWVQYXlsb2FkLmlkLCBmcmFtZVJlc291cmNlLmRpc3BsYXlOYW1lKTsKKyAgICAgICAg dGhpcy5fcmVzb3VyY2VUcmVlTW9kZWwuYWRkT3JVcGRhdGVGcmFtZShmcmFtZVBheWxvYWQpOwog ICAgICAgICB0aGlzLl9yZXNvdXJjZVRyZWVNb2RlbC5hZGRSZXNvdXJjZVRvRnJhbWUoZnJhbWVQ YXlsb2FkLmlkLCBmcmFtZVJlc291cmNlKTsKIAogICAgICAgICBmb3IgKHZhciBpID0gMDsgZnJh bWVQYXlsb2FkLmNoaWxkcmVuICYmIGkgPCBmcmFtZVBheWxvYWQuY2hpbGRyZW4ubGVuZ3RoOyAr K2kpCi0gICAgICAgICAgICB0aGlzLl9hZGRGcmFtZXNSZWN1cnNpdmVseShmcmFtZVBheWxvYWQu aWQsIGZyYW1lUGF5bG9hZC5jaGlsZHJlbltpXSk7CisgICAgICAgICAgICB0aGlzLl9hZGRGcmFt ZXNSZWN1cnNpdmVseShmcmFtZVBheWxvYWQuY2hpbGRyZW5baV0pOwogCiAgICAgICAgIGlmICgh ZnJhbWVQYXlsb2FkLnN1YnJlc291cmNlcykKICAgICAgICAgICAgIHJldHVybjsKQEAgLTQ4Miwy OSArNDgyLDI5IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZVRyZWVNb2RlbCA9IGZ1bmN0aW9uKCkK IH0KIAogV2ViSW5zcGVjdG9yLlJlc291cmNlVHJlZU1vZGVsLnByb3RvdHlwZSA9IHsKLSAgICBh ZGRPclVwZGF0ZUZyYW1lOiBmdW5jdGlvbihwYXJlbnRGcmFtZUlkLCBmcmFtZUlkLCBkaXNwbGF5 TmFtZSkKKyAgICBhZGRPclVwZGF0ZUZyYW1lOiBmdW5jdGlvbihmcmFtZSkKICAgICB7Ci0gICAg ICAgIFdlYkluc3BlY3Rvci5wYW5lbHMuc3RvcmFnZS5hZGRPclVwZGF0ZUZyYW1lKHBhcmVudEZy YW1lSWQsIGZyYW1lSWQsIGRpc3BsYXlOYW1lKTsKLSAgICAgICAgdmFyIHN1YmZyYW1lcyA9IHRo aXMuX3N1YmZyYW1lc1twYXJlbnRGcmFtZUlkXTsKKyAgICAgICAgdmFyIHRtcFJlc291cmNlID0g bmV3IFdlYkluc3BlY3Rvci5SZXNvdXJjZShudWxsLCBmcmFtZS51cmwpOworICAgICAgICBXZWJJ bnNwZWN0b3IucGFuZWxzLnN0b3JhZ2UuYWRkT3JVcGRhdGVGcmFtZShmcmFtZS5wYXJlbnRJZCwg ZnJhbWUuaWQsIGZyYW1lLm5hbWUsIHRtcFJlc291cmNlLmRpc3BsYXlOYW1lKTsKKyAgICAgICAg dmFyIHN1YmZyYW1lcyA9IHRoaXMuX3N1YmZyYW1lc1tmcmFtZS5wYXJlbnRJZF07CiAgICAgICAg IGlmICghc3ViZnJhbWVzKSB7CiAgICAgICAgICAgICBzdWJmcmFtZXMgPSB7fTsKLSAgICAgICAg ICAgIHRoaXMuX3N1YmZyYW1lc1twYXJlbnRGcmFtZUlkIHx8IDBdID0gc3ViZnJhbWVzOworICAg ICAgICAgICAgdGhpcy5fc3ViZnJhbWVzW2ZyYW1lLnBhcmVudElkIHx8IDBdID0gc3ViZnJhbWVz OwogICAgICAgICB9Ci0gICAgICAgIHN1YmZyYW1lc1tmcmFtZUlkXSA9IHRydWU7CisgICAgICAg IHN1YmZyYW1lc1tmcmFtZS5pZF0gPSB0cnVlOwogICAgIH0sCiAKLSAgICBkaWRDb21taXRMb2Fk Rm9yRnJhbWU6IGZ1bmN0aW9uKHBhcmVudEZyYW1lSWQsIGxvYWRlcikKKyAgICBkaWRDb21taXRM b2FkRm9yRnJhbWU6IGZ1bmN0aW9uKGZyYW1lLCBsb2FkZXIpCiAgICAgewotICAgICAgICAvLyBw YXJlbnRGcmFtZUlkID09PSAwIGlzIHdoZW4gbWFpbiBmcmFtZSBuYXZpZ2F0aW9uIGhhcHBlbnMu Ci0gICAgICAgIHRoaXMuX2NsZWFyQ2hpbGRGcmFtZXNBbmRSZXNvdXJjZXMocGFyZW50RnJhbWVJ ZCA/IGxvYWRlci5mcmFtZUlkIDogMCwgbG9hZGVyLmxvYWRlcklkKTsKKyAgICAgICAgLy8gZnJh bWUucGFyZW50SWQgPT09IDAgaXMgd2hlbiBtYWluIGZyYW1lIG5hdmlnYXRpb24gaGFwcGVucy4K KyAgICAgICAgdGhpcy5fY2xlYXJDaGlsZEZyYW1lc0FuZFJlc291cmNlcyhmcmFtZS5wYXJlbnRJ ZCA/IGZyYW1lLmlkIDogMCwgbG9hZGVyLmxvYWRlcklkKTsKIAotICAgICAgICB2YXIgdG1wUmVz b3VyY2UgPSBuZXcgV2ViSW5zcGVjdG9yLlJlc291cmNlKG51bGwsIGxvYWRlci51cmwpOwotICAg ICAgICB0aGlzLmFkZE9yVXBkYXRlRnJhbWUocGFyZW50RnJhbWVJZCwgbG9hZGVyLmZyYW1lSWQs IHRtcFJlc291cmNlLmRpc3BsYXlOYW1lKTsKKyAgICAgICAgdGhpcy5hZGRPclVwZGF0ZUZyYW1l KGZyYW1lKTsKIAotICAgICAgICB2YXIgcmVzb3VyY2VzRm9yRnJhbWUgPSB0aGlzLl9yZXNvdXJj ZXNCeUZyYW1lSWRbbG9hZGVyLmZyYW1lSWRdOworICAgICAgICB2YXIgcmVzb3VyY2VzRm9yRnJh bWUgPSB0aGlzLl9yZXNvdXJjZXNCeUZyYW1lSWRbZnJhbWUuaWRdOwogICAgICAgICBmb3IgKHZh ciBpID0gMDsgcmVzb3VyY2VzRm9yRnJhbWUgJiYgaSA8IHJlc291cmNlc0ZvckZyYW1lLmxlbmd0 aDsgKytpKSB7CiAgICAgICAgICAgICBXZWJJbnNwZWN0b3IucmVzb3VyY2VNYW5hZ2VyLl9iaW5k UmVzb3VyY2VVUkwocmVzb3VyY2VzRm9yRnJhbWVbaV0pOwotICAgICAgICAgICAgV2ViSW5zcGVj dG9yLnBhbmVscy5zdG9yYWdlLmFkZFJlc291cmNlVG9GcmFtZShsb2FkZXIuZnJhbWVJZCwgcmVz b3VyY2VzRm9yRnJhbWVbaV0pOworICAgICAgICAgICAgV2ViSW5zcGVjdG9yLnBhbmVscy5zdG9y YWdlLmFkZFJlc291cmNlVG9GcmFtZShmcmFtZS5pZCwgcmVzb3VyY2VzRm9yRnJhbWVbaV0pOwog ICAgICAgICB9CiAgICAgfSwKIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1N0b3JhZ2VQYW5lbC5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TdG9yYWdl UGFuZWwuanMKaW5kZXggNmY3MTJlNS4uMDgwYzQ4ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL1N0b3JhZ2VQYW5lbC5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvU3RvcmFnZVBhbmVsLmpzCkBAIC0xNjUsMTEgKzE2NSwxMSBAQCBXZWJJbnNwZWN0 b3IuU3RvcmFnZVBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuc2lkZWJhclRy ZWUuc2VsZWN0ZWRUcmVlRWxlbWVudC5kZXNlbGVjdCgpOwogICAgIH0sCiAKLSAgICBhZGRPclVw ZGF0ZUZyYW1lOiBmdW5jdGlvbihwYXJlbnRGcmFtZUlkLCBmcmFtZUlkLCBkaXNwbGF5TmFtZSkK KyAgICBhZGRPclVwZGF0ZUZyYW1lOiBmdW5jdGlvbihwYXJlbnRGcmFtZUlkLCBmcmFtZUlkLCB0 aXRsZSwgc3VidGl0bGUpCiAgICAgewogICAgICAgICB2YXIgZnJhbWVUcmVlRWxlbWVudCA9IHRo aXMuX3RyZWVFbGVtZW50Rm9yRnJhbWVJZFtmcmFtZUlkXTsKICAgICAgICAgaWYgKGZyYW1lVHJl ZUVsZW1lbnQpIHsKLSAgICAgICAgICAgIGZyYW1lVHJlZUVsZW1lbnQuZGlzcGxheU5hbWUgPSBk aXNwbGF5TmFtZTsKKyAgICAgICAgICAgIGZyYW1lVHJlZUVsZW1lbnQuc2V0VGl0bGVzKHRpdGxl LCBzdWJ0aXRsZSk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIApAQCAtMTc5LDcg KzE3OSw3IEBAIFdlYkluc3BlY3Rvci5TdG9yYWdlUGFuZWwucHJvdG90eXBlID0gewogICAgICAg ICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKLSAgICAgICAgdmFyIGZyYW1lVHJlZUVsZW1lbnQg PSBuZXcgV2ViSW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQodGhpcywgZnJhbWVJZCwgZGlzcGxh eU5hbWUpOworICAgICAgICB2YXIgZnJhbWVUcmVlRWxlbWVudCA9IG5ldyBXZWJJbnNwZWN0b3Iu RnJhbWVUcmVlRWxlbWVudCh0aGlzLCBmcmFtZUlkLCB0aXRsZSwgc3VidGl0bGUpOwogICAgICAg ICB0aGlzLl90cmVlRWxlbWVudEZvckZyYW1lSWRbZnJhbWVJZF0gPSBmcmFtZVRyZWVFbGVtZW50 OwogCiAgICAgICAgIC8vIEluc2VydCBpbiB0aGUgYWxwaGFiZXRpY2FsIG9yZGVyLCBmaXJzdCBm cmFtZXMsIHRoZW4gcmVzb3VyY2VzLgpAQCAtMTkwLDcgKzE5MCw3IEBAIFdlYkluc3BlY3Rvci5T dG9yYWdlUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIHBhcmVudFRyZWVFbGVt ZW50Lmluc2VydENoaWxkKGZyYW1lVHJlZUVsZW1lbnQsIGkpOwogICAgICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIGlmIChjaGlsZC5kaXNwbGF5TmFtZS5s b2NhbGVDb21wYXJlKGZyYW1lVHJlZUVsZW1lbnQuZGlzcGxheU5hbWUpID4gMCkgeworICAgICAg ICAgICAgaWYgKGNoaWxkLm5hbWVGb3JTb3J0aW5nLmxvY2FsZUNvbXBhcmUoZnJhbWVUcmVlRWxl bWVudC5uYW1lRm9yU29ydGluZykgPiAwKSB7CiAgICAgICAgICAgICAgICAgcGFyZW50VHJlZUVs ZW1lbnQuaW5zZXJ0Q2hpbGQoZnJhbWVUcmVlRWxlbWVudCwgaSk7CiAgICAgICAgICAgICAgICAg cmV0dXJuOwogICAgICAgICAgICAgfQpAQCAtNzU0LDYgKzc1NCwxMSBAQCBXZWJJbnNwZWN0b3Iu QmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB0aGlzLmxp c3RJdGVtRWxlbWVudC5zY3JvbGxJbnRvVmlld0lmTmVlZGVkKGZhbHNlKTsKICAgICB9LAogCisg ICAgZ2V0IHRpdGxlVGV4dCgpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fdGl0bGVUZXh0 OworICAgIH0sCisKICAgICBzZXQgdGl0bGVUZXh0KHRpdGxlVGV4dCkKICAgICB7CiAgICAgICAg IHRoaXMuX3RpdGxlVGV4dCA9IHRpdGxlVGV4dDsKQEAgLTgxMiwxMSArODE3LDExIEBAIFdlYklu c3BlY3Rvci5TdG9yYWdlQ2F0ZWdvcnlUcmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiB9CiBXZWJJ bnNwZWN0b3IuU3RvcmFnZUNhdGVnb3J5VHJlZUVsZW1lbnQucHJvdG90eXBlLl9fcHJvdG9fXyA9 IFdlYkluc3BlY3Rvci5CYXNlU3RvcmFnZVRyZWVFbGVtZW50LnByb3RvdHlwZTsKIAotV2ViSW5z cGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQgPSBmdW5jdGlvbihzdG9yYWdlUGFuZWwsIGZyYW1lSWQs IGRpc3BsYXlOYW1lKQorV2ViSW5zcGVjdG9yLkZyYW1lVHJlZUVsZW1lbnQgPSBmdW5jdGlvbihz dG9yYWdlUGFuZWwsIGZyYW1lSWQsIHRpdGxlLCBzdWJ0aXRsZSkKIHsKLSAgICBXZWJJbnNwZWN0 b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5jYWxsKHRoaXMsIHN0b3JhZ2VQYW5lbCwgbnVsbCwg ZGlzcGxheU5hbWUsICJmcmFtZS1zdG9yYWdlLXRyZWUtaXRlbSIpOworICAgIFdlYkluc3BlY3Rv ci5CYXNlU3RvcmFnZVRyZWVFbGVtZW50LmNhbGwodGhpcywgc3RvcmFnZVBhbmVsLCBudWxsLCAi IiwgImZyYW1lLXN0b3JhZ2UtdHJlZS1pdGVtIik7CiAgICAgdGhpcy5fZnJhbWVJZCA9IGZyYW1l SWQ7Ci0gICAgdGhpcy5fZGlzcGxheU5hbWUgPSBkaXNwbGF5TmFtZTsKKyAgICB0aGlzLnNldFRp dGxlcyh0aXRsZSwgc3VidGl0bGUpOwogfQogCiBXZWJJbnNwZWN0b3IuRnJhbWVUcmVlRWxlbWVu dC5wcm90b3R5cGUgPSB7CkBAIC04MjUsMjEgKzgzMCw1NCBAQCBXZWJJbnNwZWN0b3IuRnJhbWVU cmVlRWxlbWVudC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiAiZnJhbWU6Ly8iICsgZW5j b2RlVVJJKHRoaXMuX2Rpc3BsYXlOYW1lKTsKICAgICB9LAogCisgICAgb25hdHRhY2g6IGZ1bmN0 aW9uKCkKKyAgICB7CisgICAgICAgIFdlYkluc3BlY3Rvci5CYXNlU3RvcmFnZVRyZWVFbGVtZW50 LnByb3RvdHlwZS5vbmF0dGFjaC5jYWxsKHRoaXMpOworICAgICAgICBpZiAodGhpcy5fdGl0bGVU b1NldE9uQXR0YWNoIHx8IHRoaXMuX3N1YnRpdGxlVG9TZXRPbkF0dGFjaCkgeworICAgICAgICAg ICAgdGhpcy5zZXRUaXRsZXModGhpcy5fdGl0bGVUb1NldE9uQXR0YWNoLCB0aGlzLl9zdWJ0aXRs ZVRvU2V0T25BdHRhY2gpOworICAgICAgICAgICAgZGVsZXRlIHRoaXMuX3RpdGxlVG9TZXRPbkF0 dGFjaDsKKyAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9zdWJ0aXRsZVRvU2V0T25BdHRhY2g7Cisg ICAgICAgIH0KKyAgICB9LAorCiAgICAgb25zZWxlY3Q6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAg ICAgIFdlYkluc3BlY3Rvci5CYXNlU3RvcmFnZVRyZWVFbGVtZW50LnByb3RvdHlwZS5vbnNlbGVj dC5jYWxsKHRoaXMpOwogICAgICAgICB0aGlzLl9zdG9yYWdlUGFuZWwuc2hvd0NhdGVnb3J5Vmll dyh0aGlzLl9kaXNwbGF5TmFtZSk7CiAgICAgfSwKIAotICAgIGdldCBkaXNwbGF5TmFtZSgpCisg ICAgZ2V0IG5hbWVGb3JTb3J0aW5nKCkKICAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9kaXNw bGF5TmFtZTsKKyAgICAgICAgcmV0dXJuIHRoaXMuX25hbWVGb3JTb3J0aW5nOwogICAgIH0sCiAK LSAgICBzZXQgZGlzcGxheU5hbWUoZGlzcGxheU5hbWUpCisgICAgc2V0VGl0bGVzOiBmdW5jdGlv bih0aXRsZSwgc3VidGl0bGUpCiAgICAgewotICAgICAgICB0aGlzLl9kaXNwbGF5TmFtZSA9IGRp c3BsYXlOYW1lOwotICAgICAgICB0aGlzLnRpdGxlVGV4dCA9IGRpc3BsYXlOYW1lOworICAgICAg ICB0aGlzLl9uYW1lRm9yU29ydGluZyA9ICh0aXRsZSA/IHRpdGxlIDogIiIpICsgKHN1YnRpdGxl ID8gc3VidGl0bGUgOiAiIik7CisgICAgICAgIGlmICh0aGlzLnBhcmVudCkgeworICAgICAgICAg ICAgaWYgKHRpdGxlKQorICAgICAgICAgICAgICAgIHRoaXMudGl0bGVFbGVtZW50LnRleHRDb250 ZW50ID0gdGl0bGU7CisgICAgICAgICAgICBpZiAoc3VidGl0bGUpIHsKKyAgICAgICAgICAgICAg ICB2YXIgc3VidGl0bGVFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgic3BhbiIpOwor ICAgICAgICAgICAgICAgIHN1YnRpdGxlRWxlbWVudC5jbGFzc05hbWUgPSAiYmFzZS1zdG9yYWdl LXRyZWUtZWxlbWVudC1zdWJ0aXRsZSI7CisgICAgICAgICAgICAgICAgc3VidGl0bGVFbGVtZW50 LnRleHRDb250ZW50ID0gIigiICsgc3VidGl0bGUgKyAiKSI7CisgICAgICAgICAgICAgICAgdGhp cy50aXRsZUVsZW1lbnQuYXBwZW5kQ2hpbGQoc3VidGl0bGVFbGVtZW50KTsKKyAgICAgICAgICAg IH0KKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAgIHRoaXMuX3RpdGxlVG9TZXRPbkF0dGFj aCA9IHRpdGxlOworICAgICAgICAgICAgdGhpcy5fc3VidGl0bGVUb1NldE9uQXR0YWNoID0gc3Vi dGl0bGU7CisgICAgICAgIH0KKyAgICB9LAorCisgICAgc2V0IGhvdmVyZWQoaG92ZXJlZCkKKyAg ICB7CisgICAgICAgIGlmIChob3ZlcmVkKSB7CisgICAgICAgICAgICB0aGlzLmxpc3RJdGVtRWxl bWVudC5hZGRTdHlsZUNsYXNzKCJob3ZlcmVkIik7CisgICAgICAgICAgICBJbnNwZWN0b3JCYWNr ZW5kLmhpZ2hsaWdodEZyYW1lKHRoaXMuX2ZyYW1lSWQpOworICAgICAgICB9IGVsc2UgeworICAg ICAgICAgICAgdGhpcy5saXN0SXRlbUVsZW1lbnQucmVtb3ZlU3R5bGVDbGFzcygiaG92ZXJlZCIp OworICAgICAgICAgICAgSW5zcGVjdG9yQmFja2VuZC5oaWRlRnJhbWVIaWdobGlnaHQoKTsKKyAg ICAgICAgfQogICAgIH0KIH0KIFdlYkluc3BlY3Rvci5GcmFtZVRyZWVFbGVtZW50LnByb3RvdHlw ZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuQmFzZVN0b3JhZ2VUcmVlRWxlbWVudC5wcm90b3R5 cGU7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmNz cyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3NzCmluZGV4IGQ5MDFm YjcuLjg4NTgxNWUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNw ZWN0b3IuY3NzCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuY3Nz CkBAIC0xOTk4LDYgKzE5OTgsMTYgQEAgYm9keS5pbmFjdGl2ZSAuc3RvcmFnZS5wYW5lbCAuc2lk ZWJhciBsaSAuc2VsZWN0aW9uIHsKICAgICB0b3A6IDFweDsKIH0KIAorbGkuc2VsZWN0ZWQgLmJh c2Utc3RvcmFnZS10cmVlLWVsZW1lbnQtc3VidGl0bGUgeworICAgIGNvbG9yOiB3aGl0ZTsKK30K KworLmJhc2Utc3RvcmFnZS10cmVlLWVsZW1lbnQtc3VidGl0bGUgeworICAgIHBhZGRpbmctbGVm dDogMnB4OworICAgIGNvbG9yOiByZ2IoODAsIDgwLCA4MCk7CisgICAgdGV4dC1zaGFkb3c6IG5v bmU7Cit9CisKIC5zdG9yYWdlLnBhbmVsIC5zdGF0dXMgewogICAgIGZsb2F0OiByaWdodDsKICAg ICBoZWlnaHQ6IDE2cHg7Cg==