89495 2012-06-19 11:58:02 -0700 Web Inspector: Simplify InspectorIndexedDBAgent to use IDB metadata API 2012-06-24 08:07:16 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 88467 89701 0 jsbell jsbell alecflett dgrogan vsevik webkit.review.bot oldest_to_newest 652666 0 jsbell 2012-06-19 11:58:02 -0700 Right now the DatabaseLoaderCallback::execute() needs to grovel through IDB structures via transactions to gather the database schema (object stores, indexes). Once http://webkit.org/b/88467 lands this can be replaced with a call to idbDatabase->metadata() which will provide everything via simple structs. 654980 1 jsbell 2012-06-21 15:57:35 -0700 I can take this on, actually - I need to do it to unblock another patch I have in the works so I'll have this change locally already. 655796 2 149109 jsbell 2012-06-22 14:47:12 -0700 Created attachment 149109 Patch 655802 3 149109 jsbell 2012-06-22 14:52:44 -0700 Comment on attachment 149109 Patch Dropping review bit - won't pass until the dependent bug lands. 655855 4 149125 jsbell 2012-06-22 15:38:53 -0700 Created attachment 149125 Patch 655876 5 jsbell 2012-06-22 16:04:12 -0700 This can land now - vsevik@ - who'd be a good reviewer? 656197 6 149125 vsevik 2012-06-24 06:17:50 -0700 Comment on attachment 149125 Patch I am :) 656202 7 149125 webkit.review.bot 2012-06-24 08:07:11 -0700 Comment on attachment 149125 Patch Clearing flags on attachment: 149125 Committed r121117: <http://trac.webkit.org/changeset/121117> 656203 8 webkit.review.bot 2012-06-24 08:07:16 -0700 All reviewed patches have been landed. Closing bug. 149109 2012-06-22 14:47:12 -0700 2012-06-22 15:38:38 -0700 Patch bug-89495-20120622144711.patch text/plain 4807 jsbell U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxMDE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmFlM2RhNDliMTkwNzBj M2Q2NjllMWMzYTFlNDdjZWZhNjdlYzk1Zi4uNWQ2MmJjY2YxZjM0YjQwZGU4OWZjNjUwNzYxNmYz YzZmNTM2ZTEzNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA2LTIyICBKb3No dWEgQmVsbCAgPGpzYmVsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjog U2ltcGxpZnkgSW5zcGVjdG9ySW5kZXhlZERCQWdlbnQgdG8gdXNlIElEQiBtZXRhZGF0YSBBUEkK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5NDk1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRl c3RzIC0gbm8gZnVuY3Rpb25hbCBjaGFuZ2VzLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3Bl Y3RvckluZGV4ZWREQkFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorCiAyMDEyLTA2LTE5 ICBKb3NodWEgQmVsbCAgPGpzYmVsbEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgSW5kZXhlZERC OiBTbmFwc2hvdCBtZXRhZGF0YSBpbiBmcm9udCBlbmQgdG8gYXZvaWQgSVBDIHJvdW5kLXRyaXBz CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5kZXhlZERC QWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckluZGV4ZWREQkFn ZW50LmNwcAppbmRleCA4YzRiZmY1ZmQ4YTJhOTJiMWQ0M2RjOTdhNGU1YzU3ZDNhNjQ3NzZmLi5k NGVkZTIxYTdjNTA5YTBiMTJlMmRkMjIxZjIyNzEyMjcyMDkzMTI4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5kZXhlZERCQWdlbnQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbmRleGVkREJBZ2VudC5jcHAKQEAgLTQ5 LDYgKzQ5LDcgQEAKICNpbmNsdWRlICJJREJLZXkuaCIKICNpbmNsdWRlICJJREJLZXlQYXRoLmgi CiAjaW5jbHVkZSAiSURCS2V5UmFuZ2UuaCIKKyNpbmNsdWRlICJJREJNZXRhZGF0YS5oIgogI2lu Y2x1ZGUgIklEQk9iamVjdFN0b3JlQmFja2VuZEludGVyZmFjZS5oIgogI2luY2x1ZGUgIklEQlBl bmRpbmdUcmFuc2FjdGlvbk1vbml0b3IuaCIKICNpbmNsdWRlICJJREJUcmFuc2FjdGlvbi5oIgpA QCAtMzA5LDQyICszMTAsMzUgQEAgcHVibGljOgogICAgICAgICBpZiAoIW1fZnJvbnRlbmRQcm92 aWRlci0+ZnJvbnRlbmQoKSkKICAgICAgICAgICAgIHJldHVybjsKIAorICAgICAgICBjb25zdCBJ REJEYXRhYmFzZU1ldGFkYXRhIGRhdGFiYXNlTWV0YWRhdGEgPSBpZGJEYXRhYmFzZS0+bWV0YWRh dGEoKTsKKwogICAgICAgICBSZWZQdHI8VHlwZUJ1aWxkZXI6OkFycmF5PFR5cGVCdWlsZGVyOjpJ bmRleGVkREI6Ok9iamVjdFN0b3JlPiA+IG9iamVjdFN0b3JlcyA9IFR5cGVCdWlsZGVyOjpBcnJh eTxUeXBlQnVpbGRlcjo6SW5kZXhlZERCOjpPYmplY3RTdG9yZT46OmNyZWF0ZSgpOwogCi0gICAg ICAgIFJlZlB0cjxET01TdHJpbmdMaXN0PiBvYmplY3RTdG9yZU5hbWVzTGlzdCA9IGlkYkRhdGFi YXNlLT5vYmplY3RTdG9yZU5hbWVzKCk7Ci0gICAgICAgIGZvciAoc2l6ZV90IGkgPSAwOyBpIDwg b2JqZWN0U3RvcmVOYW1lc0xpc3QtPmxlbmd0aCgpOyArK2kpIHsKLSAgICAgICAgICAgIFN0cmlu ZyBvYmplY3RTdG9yZU5hbWUgPSBvYmplY3RTdG9yZU5hbWVzTGlzdC0+aXRlbShpKTsKLSAgICAg ICAgICAgIFJlZlB0cjxJREJUcmFuc2FjdGlvbkJhY2tlbmRJbnRlcmZhY2U+IGlkYlRyYW5zYWN0 aW9uID0gdHJhbnNhY3Rpb25Gb3JEYXRhYmFzZShpZGJEYXRhYmFzZS5nZXQoKSwgb2JqZWN0U3Rv cmVOYW1lKTsKLSAgICAgICAgICAgIGlmICghaWRiVHJhbnNhY3Rpb24pCi0gICAgICAgICAgICAg ICAgY29udGludWU7Ci0gICAgICAgICAgICBSZWZQdHI8SURCT2JqZWN0U3RvcmVCYWNrZW5kSW50 ZXJmYWNlPiBpZGJPYmplY3RTdG9yZSA9IG9iamVjdFN0b3JlRm9yVHJhbnNhY3Rpb24oaWRiVHJh bnNhY3Rpb24uZ2V0KCksIG9iamVjdFN0b3JlTmFtZSk7Ci0gICAgICAgICAgICBpZiAoIWlkYk9i amVjdFN0b3JlKQotICAgICAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICBmb3IgKElEQkRh dGFiYXNlTWV0YWRhdGE6Ok9iamVjdFN0b3JlTWFwOjpjb25zdF9pdGVyYXRvciBpdCA9IGRhdGFi YXNlTWV0YWRhdGEub2JqZWN0U3RvcmVzLmJlZ2luKCk7IGl0ICE9IGRhdGFiYXNlTWV0YWRhdGEu b2JqZWN0U3RvcmVzLmVuZCgpOyArK2l0KSB7CisgICAgICAgICAgICBjb25zdCBJREJPYmplY3RT dG9yZU1ldGFkYXRhJiBvYmplY3RTdG9yZU1ldGFkYXRhID0gaXQtPnNlY29uZDsKIAogICAgICAg ICAgICAgUmVmUHRyPFR5cGVCdWlsZGVyOjpBcnJheTxUeXBlQnVpbGRlcjo6SW5kZXhlZERCOjpP YmplY3RTdG9yZUluZGV4PiA+IGluZGV4ZXMgPSBUeXBlQnVpbGRlcjo6QXJyYXk8VHlwZUJ1aWxk ZXI6OkluZGV4ZWREQjo6T2JqZWN0U3RvcmVJbmRleD46OmNyZWF0ZSgpOwotICAgICAgICAgICAg UmVmUHRyPERPTVN0cmluZ0xpc3Q+IGluZGV4TmFtZXNMaXN0ID0gaWRiT2JqZWN0U3RvcmUtPmlu ZGV4TmFtZXMoKTsKLSAgICAgICAgICAgIGZvciAoc2l6ZV90IGogPSAwOyBqIDwgaW5kZXhOYW1l c0xpc3QtPmxlbmd0aCgpOyArK2opIHsKLSAgICAgICAgICAgICAgICBSZWZQdHI8SURCSW5kZXhC YWNrZW5kSW50ZXJmYWNlPiBpZGJJbmRleCA9IGluZGV4Rm9yT2JqZWN0U3RvcmUoaWRiT2JqZWN0 U3RvcmUuZ2V0KCksIGluZGV4TmFtZXNMaXN0LT5pdGVtKGopKTsKLSAgICAgICAgICAgICAgICBp ZiAoIWlkYkluZGV4KQotICAgICAgICAgICAgICAgICAgICBjb250aW51ZTsKKworICAgICAgICAg ICAgZm9yIChJREJPYmplY3RTdG9yZU1ldGFkYXRhOjpJbmRleE1hcDo6Y29uc3RfaXRlcmF0b3Ig aXQgPSBvYmplY3RTdG9yZU1ldGFkYXRhLmluZGV4ZXMuYmVnaW4oKTsgaXQgIT0gb2JqZWN0U3Rv cmVNZXRhZGF0YS5pbmRleGVzLmVuZCgpOyArK2l0KSB7CisgICAgICAgICAgICAgICAgY29uc3Qg SURCSW5kZXhNZXRhZGF0YSYgaW5kZXhNZXRhZGF0YSA9IGl0LT5zZWNvbmQ7CiAKICAgICAgICAg ICAgICAgICBSZWZQdHI8T2JqZWN0U3RvcmVJbmRleD4gb2JqZWN0U3RvcmVJbmRleCA9IE9iamVj dFN0b3JlSW5kZXg6OmNyZWF0ZSgpCi0gICAgICAgICAgICAgICAgICAgIC5zZXROYW1lKGlkYklu ZGV4LT5uYW1lKCkpCi0gICAgICAgICAgICAgICAgICAgIC5zZXRLZXlQYXRoKGtleVBhdGhGcm9t SURCS2V5UGF0aChpZGJJbmRleC0+a2V5UGF0aCgpKSkKLSAgICAgICAgICAgICAgICAgICAgLnNl dFVuaXF1ZShpZGJJbmRleC0+dW5pcXVlKCkpCi0gICAgICAgICAgICAgICAgICAgIC5zZXRNdWx0 aUVudHJ5KGlkYkluZGV4LT5tdWx0aUVudHJ5KCkpOworICAgICAgICAgICAgICAgICAgICAuc2V0 TmFtZShpbmRleE1ldGFkYXRhLm5hbWUpCisgICAgICAgICAgICAgICAgICAgIC5zZXRLZXlQYXRo KGtleVBhdGhGcm9tSURCS2V5UGF0aChpbmRleE1ldGFkYXRhLmtleVBhdGgpKQorICAgICAgICAg ICAgICAgICAgICAuc2V0VW5pcXVlKGluZGV4TWV0YWRhdGEudW5pcXVlKQorICAgICAgICAgICAg ICAgICAgICAuc2V0TXVsdGlFbnRyeShpbmRleE1ldGFkYXRhLm11bHRpRW50cnkpOwogICAgICAg ICAgICAgICAgIGluZGV4ZXMtPmFkZEl0ZW0ob2JqZWN0U3RvcmVJbmRleCk7CiAgICAgICAgICAg ICB9Ci0KKyAgICAgICAgICAgIC8vIEZJWE1FOiBhZGQgb2JqZWN0U3RvcmVNZXRhZGF0YS5hdXRv SW5jcmVtZW50IHByb3BlcnR5IGh0dHA6Ly93ZWJraXQub3JnL2IvODk3MDEKICAgICAgICAgICAg IFJlZlB0cjxPYmplY3RTdG9yZT4gb2JqZWN0U3RvcmUgPSBPYmplY3RTdG9yZTo6Y3JlYXRlKCkK LSAgICAgICAgICAgICAgICAuc2V0TmFtZShpZGJPYmplY3RTdG9yZS0+bmFtZSgpKQotICAgICAg ICAgICAgICAgIC5zZXRLZXlQYXRoKGtleVBhdGhGcm9tSURCS2V5UGF0aChpZGJPYmplY3RTdG9y ZS0+a2V5UGF0aCgpKSkKKyAgICAgICAgICAgICAgICAuc2V0TmFtZShvYmplY3RTdG9yZU1ldGFk YXRhLm5hbWUpCisgICAgICAgICAgICAgICAgLnNldEtleVBhdGgoa2V5UGF0aEZyb21JREJLZXlQ YXRoKG9iamVjdFN0b3JlTWV0YWRhdGEua2V5UGF0aCkpCiAgICAgICAgICAgICAgICAgLnNldElu ZGV4ZXMoaW5kZXhlcyk7CiAgICAgICAgICAgICBvYmplY3RTdG9yZXMtPmFkZEl0ZW0ob2JqZWN0 U3RvcmUpOwogICAgICAgICB9CiAgICAgICAgIFJlZlB0cjxEYXRhYmFzZVdpdGhPYmplY3RTdG9y ZXM+IHJlc3VsdCA9IERhdGFiYXNlV2l0aE9iamVjdFN0b3Jlczo6Y3JlYXRlKCkKLSAgICAgICAg ICAgIC5zZXROYW1lKGlkYkRhdGFiYXNlLT5uYW1lKCkpCi0gICAgICAgICAgICAuc2V0VmVyc2lv bihpZGJEYXRhYmFzZS0+dmVyc2lvbigpKQorICAgICAgICAgICAgLnNldE5hbWUoZGF0YWJhc2VN ZXRhZGF0YS5uYW1lKQorICAgICAgICAgICAgLnNldFZlcnNpb24oZGF0YWJhc2VNZXRhZGF0YS52 ZXJzaW9uKQogICAgICAgICAgICAgLnNldE9iamVjdFN0b3JlcyhvYmplY3RTdG9yZXMpOwogCiAg ICAgICAgIG1fZnJvbnRlbmRQcm92aWRlci0+ZnJvbnRlbmQoKS0+ZGF0YWJhc2VMb2FkZWQobV9y ZXF1ZXN0SWQsIHJlc3VsdCk7Cg== 149125 2012-06-22 15:38:53 -0700 2012-06-24 08:07:11 -0700 Patch bug-89495-20120622153853.patch text/plain 4817 jsbell U3VidmVyc2lvbiBSZXZpc2lvbjogMTIxMDYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDAyNGY0YWI4NTNmMGU2 NmI4YzdhNGUzMDk5MGVkNDRjZDlhNTkxOS4uMDJjZjIxOTBhODhhNzJhNzdhMTc5ODVhODIxNTIw YjdjZDllYTQ5YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA2LTIyICBKb3No dWEgQmVsbCAgPGpzYmVsbEBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjog U2ltcGxpZnkgSW5zcGVjdG9ySW5kZXhlZERCQWdlbnQgdG8gdXNlIElEQiBtZXRhZGF0YSBBUEkK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg5NDk1CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3IHRl c3RzIC0gbm8gZnVuY3Rpb25hbCBjaGFuZ2VzLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3Bl Y3RvckluZGV4ZWREQkFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmUpOgorCiAyMDEyLTA2LTIy ICBTaGF3biBTaW5naCAgPHNoYXduc2luZ2hAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJv bWl1bV0gRG8gbm90IGFjY3VtdWxhdGUgb2NjbHVzaW9uIGZyb20gM2QgbGF5ZXJzIG9uIHRoZSBt YWluIHRocmVhZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckluZGV4ZWREQkFnZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJ bmRleGVkREJBZ2VudC5jcHAKaW5kZXggOGM0YmZmNWZkOGEyYTkyYjFkNDNkYzk3YTRlNWM1N2Qz YTY0Nzc2Zi4uZDRlZGUyMWE3YzUwOWEwYjEyZTJkZDIyMWYyMjcxMjI3MjA5MzEyOCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvckluZGV4ZWREQkFnZW50LmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5kZXhlZERCQWdlbnQu Y3BwCkBAIC00OSw2ICs0OSw3IEBACiAjaW5jbHVkZSAiSURCS2V5LmgiCiAjaW5jbHVkZSAiSURC S2V5UGF0aC5oIgogI2luY2x1ZGUgIklEQktleVJhbmdlLmgiCisjaW5jbHVkZSAiSURCTWV0YWRh dGEuaCIKICNpbmNsdWRlICJJREJPYmplY3RTdG9yZUJhY2tlbmRJbnRlcmZhY2UuaCIKICNpbmNs dWRlICJJREJQZW5kaW5nVHJhbnNhY3Rpb25Nb25pdG9yLmgiCiAjaW5jbHVkZSAiSURCVHJhbnNh Y3Rpb24uaCIKQEAgLTMwOSw0MiArMzEwLDM1IEBAIHB1YmxpYzoKICAgICAgICAgaWYgKCFtX2Zy b250ZW5kUHJvdmlkZXItPmZyb250ZW5kKCkpCiAgICAgICAgICAgICByZXR1cm47CiAKKyAgICAg ICAgY29uc3QgSURCRGF0YWJhc2VNZXRhZGF0YSBkYXRhYmFzZU1ldGFkYXRhID0gaWRiRGF0YWJh c2UtPm1ldGFkYXRhKCk7CisKICAgICAgICAgUmVmUHRyPFR5cGVCdWlsZGVyOjpBcnJheTxUeXBl QnVpbGRlcjo6SW5kZXhlZERCOjpPYmplY3RTdG9yZT4gPiBvYmplY3RTdG9yZXMgPSBUeXBlQnVp bGRlcjo6QXJyYXk8VHlwZUJ1aWxkZXI6OkluZGV4ZWREQjo6T2JqZWN0U3RvcmU+OjpjcmVhdGUo KTsKIAotICAgICAgICBSZWZQdHI8RE9NU3RyaW5nTGlzdD4gb2JqZWN0U3RvcmVOYW1lc0xpc3Qg PSBpZGJEYXRhYmFzZS0+b2JqZWN0U3RvcmVOYW1lcygpOwotICAgICAgICBmb3IgKHNpemVfdCBp ID0gMDsgaSA8IG9iamVjdFN0b3JlTmFtZXNMaXN0LT5sZW5ndGgoKTsgKytpKSB7Ci0gICAgICAg ICAgICBTdHJpbmcgb2JqZWN0U3RvcmVOYW1lID0gb2JqZWN0U3RvcmVOYW1lc0xpc3QtPml0ZW0o aSk7Ci0gICAgICAgICAgICBSZWZQdHI8SURCVHJhbnNhY3Rpb25CYWNrZW5kSW50ZXJmYWNlPiBp ZGJUcmFuc2FjdGlvbiA9IHRyYW5zYWN0aW9uRm9yRGF0YWJhc2UoaWRiRGF0YWJhc2UuZ2V0KCks IG9iamVjdFN0b3JlTmFtZSk7Ci0gICAgICAgICAgICBpZiAoIWlkYlRyYW5zYWN0aW9uKQotICAg ICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgUmVmUHRyPElEQk9iamVjdFN0b3Jl QmFja2VuZEludGVyZmFjZT4gaWRiT2JqZWN0U3RvcmUgPSBvYmplY3RTdG9yZUZvclRyYW5zYWN0 aW9uKGlkYlRyYW5zYWN0aW9uLmdldCgpLCBvYmplY3RTdG9yZU5hbWUpOwotICAgICAgICAgICAg aWYgKCFpZGJPYmplY3RTdG9yZSkKLSAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAg Zm9yIChJREJEYXRhYmFzZU1ldGFkYXRhOjpPYmplY3RTdG9yZU1hcDo6Y29uc3RfaXRlcmF0b3Ig aXQgPSBkYXRhYmFzZU1ldGFkYXRhLm9iamVjdFN0b3Jlcy5iZWdpbigpOyBpdCAhPSBkYXRhYmFz ZU1ldGFkYXRhLm9iamVjdFN0b3Jlcy5lbmQoKTsgKytpdCkgeworICAgICAgICAgICAgY29uc3Qg SURCT2JqZWN0U3RvcmVNZXRhZGF0YSYgb2JqZWN0U3RvcmVNZXRhZGF0YSA9IGl0LT5zZWNvbmQ7 CiAKICAgICAgICAgICAgIFJlZlB0cjxUeXBlQnVpbGRlcjo6QXJyYXk8VHlwZUJ1aWxkZXI6Oklu ZGV4ZWREQjo6T2JqZWN0U3RvcmVJbmRleD4gPiBpbmRleGVzID0gVHlwZUJ1aWxkZXI6OkFycmF5 PFR5cGVCdWlsZGVyOjpJbmRleGVkREI6Ok9iamVjdFN0b3JlSW5kZXg+OjpjcmVhdGUoKTsKLSAg ICAgICAgICAgIFJlZlB0cjxET01TdHJpbmdMaXN0PiBpbmRleE5hbWVzTGlzdCA9IGlkYk9iamVj dFN0b3JlLT5pbmRleE5hbWVzKCk7Ci0gICAgICAgICAgICBmb3IgKHNpemVfdCBqID0gMDsgaiA8 IGluZGV4TmFtZXNMaXN0LT5sZW5ndGgoKTsgKytqKSB7Ci0gICAgICAgICAgICAgICAgUmVmUHRy PElEQkluZGV4QmFja2VuZEludGVyZmFjZT4gaWRiSW5kZXggPSBpbmRleEZvck9iamVjdFN0b3Jl KGlkYk9iamVjdFN0b3JlLmdldCgpLCBpbmRleE5hbWVzTGlzdC0+aXRlbShqKSk7Ci0gICAgICAg ICAgICAgICAgaWYgKCFpZGJJbmRleCkKLSAgICAgICAgICAgICAgICAgICAgY29udGludWU7CisK KyAgICAgICAgICAgIGZvciAoSURCT2JqZWN0U3RvcmVNZXRhZGF0YTo6SW5kZXhNYXA6OmNvbnN0 X2l0ZXJhdG9yIGl0ID0gb2JqZWN0U3RvcmVNZXRhZGF0YS5pbmRleGVzLmJlZ2luKCk7IGl0ICE9 IG9iamVjdFN0b3JlTWV0YWRhdGEuaW5kZXhlcy5lbmQoKTsgKytpdCkgeworICAgICAgICAgICAg ICAgIGNvbnN0IElEQkluZGV4TWV0YWRhdGEmIGluZGV4TWV0YWRhdGEgPSBpdC0+c2Vjb25kOwog CiAgICAgICAgICAgICAgICAgUmVmUHRyPE9iamVjdFN0b3JlSW5kZXg+IG9iamVjdFN0b3JlSW5k ZXggPSBPYmplY3RTdG9yZUluZGV4OjpjcmVhdGUoKQotICAgICAgICAgICAgICAgICAgICAuc2V0 TmFtZShpZGJJbmRleC0+bmFtZSgpKQotICAgICAgICAgICAgICAgICAgICAuc2V0S2V5UGF0aChr ZXlQYXRoRnJvbUlEQktleVBhdGgoaWRiSW5kZXgtPmtleVBhdGgoKSkpCi0gICAgICAgICAgICAg ICAgICAgIC5zZXRVbmlxdWUoaWRiSW5kZXgtPnVuaXF1ZSgpKQotICAgICAgICAgICAgICAgICAg ICAuc2V0TXVsdGlFbnRyeShpZGJJbmRleC0+bXVsdGlFbnRyeSgpKTsKKyAgICAgICAgICAgICAg ICAgICAgLnNldE5hbWUoaW5kZXhNZXRhZGF0YS5uYW1lKQorICAgICAgICAgICAgICAgICAgICAu c2V0S2V5UGF0aChrZXlQYXRoRnJvbUlEQktleVBhdGgoaW5kZXhNZXRhZGF0YS5rZXlQYXRoKSkK KyAgICAgICAgICAgICAgICAgICAgLnNldFVuaXF1ZShpbmRleE1ldGFkYXRhLnVuaXF1ZSkKKyAg ICAgICAgICAgICAgICAgICAgLnNldE11bHRpRW50cnkoaW5kZXhNZXRhZGF0YS5tdWx0aUVudHJ5 KTsKICAgICAgICAgICAgICAgICBpbmRleGVzLT5hZGRJdGVtKG9iamVjdFN0b3JlSW5kZXgpOwog ICAgICAgICAgICAgfQotCisgICAgICAgICAgICAvLyBGSVhNRTogYWRkIG9iamVjdFN0b3JlTWV0 YWRhdGEuYXV0b0luY3JlbWVudCBwcm9wZXJ0eSBodHRwOi8vd2Via2l0Lm9yZy9iLzg5NzAxCiAg ICAgICAgICAgICBSZWZQdHI8T2JqZWN0U3RvcmU+IG9iamVjdFN0b3JlID0gT2JqZWN0U3RvcmU6 OmNyZWF0ZSgpCi0gICAgICAgICAgICAgICAgLnNldE5hbWUoaWRiT2JqZWN0U3RvcmUtPm5hbWUo KSkKLSAgICAgICAgICAgICAgICAuc2V0S2V5UGF0aChrZXlQYXRoRnJvbUlEQktleVBhdGgoaWRi T2JqZWN0U3RvcmUtPmtleVBhdGgoKSkpCisgICAgICAgICAgICAgICAgLnNldE5hbWUob2JqZWN0 U3RvcmVNZXRhZGF0YS5uYW1lKQorICAgICAgICAgICAgICAgIC5zZXRLZXlQYXRoKGtleVBhdGhG cm9tSURCS2V5UGF0aChvYmplY3RTdG9yZU1ldGFkYXRhLmtleVBhdGgpKQogICAgICAgICAgICAg ICAgIC5zZXRJbmRleGVzKGluZGV4ZXMpOwogICAgICAgICAgICAgb2JqZWN0U3RvcmVzLT5hZGRJ dGVtKG9iamVjdFN0b3JlKTsKICAgICAgICAgfQogICAgICAgICBSZWZQdHI8RGF0YWJhc2VXaXRo T2JqZWN0U3RvcmVzPiByZXN1bHQgPSBEYXRhYmFzZVdpdGhPYmplY3RTdG9yZXM6OmNyZWF0ZSgp Ci0gICAgICAgICAgICAuc2V0TmFtZShpZGJEYXRhYmFzZS0+bmFtZSgpKQotICAgICAgICAgICAg LnNldFZlcnNpb24oaWRiRGF0YWJhc2UtPnZlcnNpb24oKSkKKyAgICAgICAgICAgIC5zZXROYW1l KGRhdGFiYXNlTWV0YWRhdGEubmFtZSkKKyAgICAgICAgICAgIC5zZXRWZXJzaW9uKGRhdGFiYXNl TWV0YWRhdGEudmVyc2lvbikKICAgICAgICAgICAgIC5zZXRPYmplY3RTdG9yZXMob2JqZWN0U3Rv cmVzKTsKIAogICAgICAgICBtX2Zyb250ZW5kUHJvdmlkZXItPmZyb250ZW5kKCktPmRhdGFiYXNl TG9hZGVkKG1fcmVxdWVzdElkLCByZXN1bHQpOwo=