42297 2010-07-14 15:36:02 -0700 WebKit2: Make titles in WebBackForwardListItems work 2010-07-14 15:44:21 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 sam webkit-unassigned oldest_to_newest 251470 0 sam 2010-07-14 15:36:02 -0700 Make titles in WebBackForwardListItems work in WebKit2. 251471 1 61576 sam 2010-07-14 15:37:51 -0700 Created attachment 61576 Patch 251472 2 sam 2010-07-14 15:44:21 -0700 Landed in r63362. 61576 2010-07-14 15:37:51 -0700 2010-07-14 15:40:05 -0700 Patch patch.diff text/plain 14260 sam SW5kZXg6IFdlYktpdDIvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MzM2MSkKKysrIFdlYktpdDIvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsNTMgQEAKKzIwMTAtMDctMTQgIFNhbSBXZWluaWcgIDxzYW1Ad2Via2l0Lm9yZz4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBQYXRjaCBm b3IgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyMjk3CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS84MTg3MzU1PgorICAgICAgICBNYWtlIHRpdGxlcyBpbiBXZWJCYWNr Rm9yd2FyZExpc3RJdGVtcyB3b3JrLgorCisgICAgICAgIC0gTWFrZSBXZWJCYWNrRm9yd2FyZExp c3RJdGVtTWFwIHBlciBXZWJQcm9jZXNzUHJveHkgdG8gYWxsb3cgdXBkYXRpbmcKKyAgICAgICAg ICB0aGVtIHNlcGFyYXRlIGZyb20gYSBwYWdlLiBUaGV5IGFyZSBjb25jZXB0dWFsbHkgcGVyIHBy b2Nlc3MgYW55d2F5LgorICAgICAgICAtIEFkZCBhIG1lc3NhZ2UgdG8gYWRkIG9yIHVwZGF0ZSBh IFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW1NYXAgdHJpZ2dlcmVkCisgICAgICAgICAgYnkgdGhlIFdl YkNvcmU6Om5vdGlmeUhpc3RvcnlJdGVtQ2hhbmdlZCBtZWNoYW5pc20uCisKKyAgICAgICAgKiBT aGFyZWQvQ29yZUlQQ1N1cHBvcnQvV2ViUHJvY2Vzc1Byb3h5TWVzc2FnZUtpbmRzLmg6CisgICAg ICAgIChXZWJQcm9jZXNzUHJveHlNZXNzYWdlOjopOgorICAgICAgICBBZGQgQWRkT3JVcGRhdGVC YWNrRm9yd2FyZEl0ZW0gbWVzc2FnZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJCYWNrRm9y d2FyZExpc3RJdGVtLmg6CisgICAgICAgIChXZWJLaXQ6OldlYkJhY2tGb3J3YXJkTGlzdEl0ZW06 OnNldE9yaWdpbmFsVVJMKToKKyAgICAgICAgKFdlYktpdDo6V2ViQmFja0ZvcndhcmRMaXN0SXRl bTo6c2V0VVJMKToKKyAgICAgICAgKFdlYktpdDo6V2ViQmFja0ZvcndhcmRMaXN0SXRlbTo6c2V0 VGl0bGUpOgorICAgICAgICBBZGQgc2V0dGVycy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQ YWdlUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVN ZXNzYWdlKToKKyAgICAgICAgQmFja0ZvcndhcmRBZGRJdGVtIG5vdyBhc3N1bWVzIHRoZSBpdGVt IGhhcyBhbHJlYWR5IGJlZW4gY3JlYXRlZCwgc28KKyAgICAgICAgbm93IGp1c3QgZm9yd2FyZHMg dGhlIGFkZCBtZXNzYWdlIG9udG8gdGhlIFdlYkJhY2tGb3J3YXJkTGlzdC4KKworICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OmFkZEl0ZW1Ub0JhY2tGb3J3YXJkTGlzdCk6IFRha2UgYSBX ZWJCYWNrRm9yd2FyZExpc3QgaW5zdGVhZCBvZiBhbiBJRC4KKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZVByb3h5Ojpnb1RvSXRlbUluQmFja0ZvcndhcmRMaXN0KTogRGl0dG8uCisgICAgICAgICog VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOiBEaXR0by4KKworICAgICAgICAqIFVJUHJvY2Vzcy9X ZWJQcm9jZXNzUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6Ondl YkJhY2tGb3J3YXJkSXRlbSk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6YWRk T3JVcGRhdGVCYWNrRm9yd2FyZExpc3RJdGVtKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vz c1Byb3h5OjpkaWRSZWNlaXZlTWVzc2FnZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQ cm94eTo6ZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJv Y2Vzc1Byb3h5Lmg6CisgICAgICAgIEhhdmUgdGhlIFdlYlByb2Nlc3NQcm94eSBtYW5hZ2UgdGhl IFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW1zLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdl L1dlYkJhY2tGb3J3YXJkTGlzdFByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6dXBkYXRlQmFj a0ZvcndhcmRJdGVtKToKKyAgICAgICAgKFdlYktpdDo6V0syTm90aWZ5SGlzdG9yeUl0ZW1DaGFu Z2VkKTogVXNlIHRoaXMgdG8gbm90aWZ5IFVJUHJvY2VzcworICAgICAgICBvZiBIaXN0b3J5SXRl bSBjaGFuZ2VzIChzdWNoIGFzIHRoZSB0aXRsZSBiZWluZyBhZGRlZCkuCisgICAgICAgIChXZWJL aXQ6OldlYkJhY2tGb3J3YXJkTGlzdFByb3h5OjpXZWJCYWNrRm9yd2FyZExpc3RQcm94eSk6Cisg ICAgICAgIFJlZ2lzdGVyIHRoZSBub3RpZnlIaXN0b3J5SXRlbUNoYW5nZWQgZnVuY3Rpb24uCisg ICAgICAgIChXZWJLaXQ6OldlYkJhY2tGb3J3YXJkTGlzdFByb3h5OjphZGRJdGVtKToKKyAgICAg ICAgSnVzdCBzZW5kIHRoZSBJRCBhcyB0aGUgdXBkYXRlQmFja0ZvcndhcmRJdGVtIGlzIGFscmVh ZHkgZ29pbmcgdG8gaGF2ZQorICAgICAgICBiZWVuIGNhbGxlZCBieSB0aGlzIHRpbWUuCisKIDIw MTAtMDctMTQgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgpJbmRleDogV2ViS2l0Mi9TaGFyZWQvQ29yZUlQQ1N1 cHBvcnQvV2ViUHJvY2Vzc1Byb3h5TWVzc2FnZUtpbmRzLmgKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0 Mi9TaGFyZWQvQ29yZUlQQ1N1cHBvcnQvV2ViUHJvY2Vzc1Byb3h5TWVzc2FnZUtpbmRzLmgJKHJl dmlzaW9uIDYzMzQ1KQorKysgV2ViS2l0Mi9TaGFyZWQvQ29yZUlQQ1N1cHBvcnQvV2ViUHJvY2Vz c1Byb3h5TWVzc2FnZUtpbmRzLmgJKHdvcmtpbmcgY29weSkKQEAgLTMzLDkgKzMzLDEwIEBACiBu YW1lc3BhY2UgV2ViUHJvY2Vzc1Byb3h5TWVzc2FnZSB7CiAKIGVudW0gS2luZCB7Ci0gICAgUG9z dE1lc3NhZ2UsCisgICAgQWRkQmFja0ZvcndhcmRJdGVtLAorICAgIEdldFBsdWdpbkhvc3RDb25u ZWN0aW9uLAogICAgIEdldFBsdWdpbnMsCi0gICAgR2V0UGx1Z2luSG9zdENvbm5lY3Rpb24KKyAg ICBQb3N0TWVzc2FnZSwKIH07CiAKIH0KSW5kZXg6IFdlYktpdDIvVUlQcm9jZXNzL1dlYkJhY2tG b3J3YXJkTGlzdEl0ZW0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJCYWNr Rm9yd2FyZExpc3RJdGVtLmgJKHJldmlzaW9uIDYzMzQ1KQorKysgV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViQmFja0ZvcndhcmRMaXN0SXRlbS5oCSh3b3JraW5nIGNvcHkpCkBAIC00NCw4ICs0NCwxMyBA QCBwdWJsaWM6CiAKICAgICB1aW50NjRfdCBpdGVtSUQoKSBjb25zdCB7IHJldHVybiBtX2l0ZW1J RDsgfQogCisgICAgdm9pZCBzZXRPcmlnaW5hbFVSTChjb25zdCBXZWJDb3JlOjpTdHJpbmcmIG9y aWdpbmFsVVJMKSB7IG1fb3JpZ2luYWxVUkwgPSBvcmlnaW5hbFVSTDsgfQogICAgIGNvbnN0IFdl YkNvcmU6OlN0cmluZyYgb3JpZ2luYWxVUkwoKSBjb25zdCB7IHJldHVybiBtX29yaWdpbmFsVVJM OyB9CisKKyAgICB2b2lkIHNldFVSTChjb25zdCBXZWJDb3JlOjpTdHJpbmcmIHVybCkgeyBtX3Vy bCA9IHVybDsgfQogICAgIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgdXJsKCkgY29uc3QgeyByZXR1 cm4gbV91cmw7IH0KKworICAgIHZvaWQgc2V0VGl0bGUoY29uc3QgV2ViQ29yZTo6U3RyaW5nJiB0 aXRsZSkgeyBtX3RpdGxlID0gdGl0bGU7IH0KICAgICBjb25zdCBXZWJDb3JlOjpTdHJpbmcmIHRp dGxlKCkgY29uc3QgeyByZXR1cm4gbV90aXRsZTsgfQogCiBwcml2YXRlOgpJbmRleDogV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkuY3BwCShyZXZpc2lvbiA2MzM0NSkKKysrIFdlYktpdDIvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTU4MywxMiArNTgzLDkgQEAg dm9pZCBXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVNZXNzYWdlKENvcgogICAgICAgICB9CiAgICAg ICAgIGNhc2UgV2ViUGFnZVByb3h5TWVzc2FnZTo6QmFja0ZvcndhcmRBZGRJdGVtOiB7CiAgICAg ICAgICAgICB1aW50NjRfdCBpdGVtSUQ7Ci0gICAgICAgICAgICBTdHJpbmcgb3JpZ2luYWxVUkxT dHJpbmc7Ci0gICAgICAgICAgICBTdHJpbmcgdXJsU3RyaW5nOwotICAgICAgICAgICAgU3RyaW5n IHRpdGxlOwotICAgICAgICAgICAgaWYgKCFhcmd1bWVudHMuZGVjb2RlKENvcmVJUEM6Ok91dChp dGVtSUQsIG9yaWdpbmFsVVJMU3RyaW5nLCB1cmxTdHJpbmcsIHRpdGxlKSkpCisgICAgICAgICAg ICBpZiAoIWFyZ3VtZW50cy5kZWNvZGUoQ29yZUlQQzo6T3V0KGl0ZW1JRCkpKQogICAgICAgICAg ICAgICAgIHJldHVybjsKLSAgICAgICAgICAgIGFkZEl0ZW1Ub0JhY2tGb3J3YXJkTGlzdChpdGVt SUQsIG9yaWdpbmFsVVJMU3RyaW5nLCB1cmxTdHJpbmcsIHRpdGxlKTsKKyAgICAgICAgICAgIGFk ZEl0ZW1Ub0JhY2tGb3J3YXJkTGlzdChwcm9jZXNzKCktPndlYkJhY2tGb3J3YXJkSXRlbShpdGVt SUQpKTsKICAgICAgICAgICAgIGJyZWFrOwogICAgICAgICB9CiAgICAgICAgIGRlZmF1bHQ6CkBA IC04MTcsMjIgKzgxNCwxMyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGlkVXBkYXRlSGlzdG9yeVRp dGxlCiAKIC8vIEJhY2tGb3J3YXJkTGlzdAogCi12b2lkIFdlYlBhZ2VQcm94eTo6YWRkSXRlbVRv QmFja0ZvcndhcmRMaXN0KHVpbnQ2NF90IGl0ZW1JRCwgY29uc3QgU3RyaW5nJiBvcmlnaW5hbFVS TFN0cmluZywgY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcsIGNvbnN0IFN0cmluZyYgdGl0bGUpCit2 b2lkIFdlYlBhZ2VQcm94eTo6YWRkSXRlbVRvQmFja0ZvcndhcmRMaXN0KFdlYkJhY2tGb3J3YXJk TGlzdEl0ZW0qIGl0ZW0pCiB7Ci0gICAgc3RkOjpwYWlyPEhhc2hNYXA8dWludDY0X3QsIFJlZlB0 cjxXZWJCYWNrRm9yd2FyZExpc3RJdGVtPiA+OjppdGVyYXRvciwgYm9vbD4gcmVzdWx0ID0gbV9i YWNrRm9yd2FyZExpc3RJdGVtTWFwLmFkZChpdGVtSUQsIDApOwotICAgIGlmIChyZXN1bHQuc2Vj b25kKQotICAgICAgICByZXN1bHQuZmlyc3QtPnNlY29uZCA9IFdlYkJhY2tGb3J3YXJkTGlzdEl0 ZW06OmNyZWF0ZShvcmlnaW5hbFVSTFN0cmluZywgdXJsU3RyaW5nLCB0aXRsZSwgaXRlbUlEKTsK LQotICAgIEFTU0VSVChyZXN1bHQuZmlyc3QtPnNlY29uZC0+b3JpZ2luYWxVUkwoKSA9PSBvcmln aW5hbFVSTFN0cmluZyk7Ci0gICAgQVNTRVJUKHJlc3VsdC5maXJzdC0+c2Vjb25kLT51cmwoKSA9 PSB1cmxTdHJpbmcpOwotICAgIEFTU0VSVChyZXN1bHQuZmlyc3QtPnNlY29uZC0+dGl0bGUoKSA9 PSB0aXRsZSk7Ci0KLSAgICBtX2JhY2tGb3J3YXJkTGlzdC0+YWRkSXRlbShyZXN1bHQuZmlyc3Qt PnNlY29uZC5nZXQoKSk7CisgICAgbV9iYWNrRm9yd2FyZExpc3QtPmFkZEl0ZW0oaXRlbSk7CiB9 CiAKLXZvaWQgV2ViUGFnZVByb3h5Ojpnb1RvSXRlbUluQmFja0ZvcndhcmRMaXN0KHVpbnQ2NF90 IGl0ZW1JRCkKK3ZvaWQgV2ViUGFnZVByb3h5Ojpnb1RvSXRlbUluQmFja0ZvcndhcmRMaXN0KFdl YkJhY2tGb3J3YXJkTGlzdEl0ZW0qIGl0ZW0pCiB7Ci0gICAgV2ViQmFja0ZvcndhcmRMaXN0SXRl bSogaXRlbSA9IG1fYmFja0ZvcndhcmRMaXN0SXRlbU1hcC5nZXQoaXRlbUlEKS5nZXQoKTsKICAg ICBtX2JhY2tGb3J3YXJkTGlzdC0+Z29Ub0l0ZW0oaXRlbSk7CiB9CiAKSW5kZXg6IFdlYktpdDIv VUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5oCShyZXZpc2lvbiA2MzM0NSkKKysrIFdlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xODYsOCArMTg2LDggQEAgcHJpdmF0ZToK ICAgICB2b2lkIGRpZFBlcmZvcm1TZXJ2ZXJSZWRpcmVjdChXZWJGcmFtZVByb3h5KiwgY29uc3Qg V2ViQ29yZTo6U3RyaW5nJiBzb3VyY2VVUkxTdHJpbmcsIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYg ZGVzdGluYXRpb25VUkxTdHJpbmcpOwogICAgIHZvaWQgZGlkVXBkYXRlSGlzdG9yeVRpdGxlKFdl YkZyYW1lUHJveHkqLCBjb25zdCBXZWJDb3JlOjpTdHJpbmcmIHRpdGxlLCBjb25zdCBXZWJDb3Jl OjpTdHJpbmcmIHVybCk7CiAKLSAgICB2b2lkIGFkZEl0ZW1Ub0JhY2tGb3J3YXJkTGlzdCh1aW50 NjRfdCBpdGVtSUQsIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgb3JpZ2luYWxVUkxTdHJpbmcsIGNv bnN0IFdlYkNvcmU6OlN0cmluZyYgdXJsU3RyaW5nLCBjb25zdCBXZWJDb3JlOjpTdHJpbmcmIHRp dGxlKTsKLSAgICB2b2lkIGdvVG9JdGVtSW5CYWNrRm9yd2FyZExpc3QodWludDY0X3QgaXRlbUlE KTsKKyAgICB2b2lkIGFkZEl0ZW1Ub0JhY2tGb3J3YXJkTGlzdChXZWJCYWNrRm9yd2FyZExpc3RJ dGVtKik7CisgICAgdm9pZCBnb1RvSXRlbUluQmFja0ZvcndhcmRMaXN0KFdlYkJhY2tGb3J3YXJk TGlzdEl0ZW0qKTsKIAogICAgIHZvaWQgdGFrZUZvY3VzKGJvb2wgZGlyZWN0aW9uKTsKICAgICB2 b2lkIHNldFRvb2xUaXAoY29uc3QgV2ViQ29yZTo6U3RyaW5nJik7CkBAIC0yMjcsNyArMjI3LDYg QEAgcHJpdmF0ZToKICAgICBib29sIG1fY2FuR29CYWNrOwogICAgIGJvb2wgbV9jYW5Hb0Zvcndh cmQ7CiAgICAgUmVmUHRyPFdlYkJhY2tGb3J3YXJkTGlzdD4gbV9iYWNrRm9yd2FyZExpc3Q7Ci0g ICAgSGFzaE1hcDx1aW50NjRfdCwgUmVmUHRyPFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0+ID4gbV9i YWNrRm9yd2FyZExpc3RJdGVtTWFwOwogCiAgICAgV2ViQ29yZTo6U3RyaW5nIG1fdG9vbFRpcDsK IApJbmRleDogV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCShyZXZpc2lvbiA2MzM0 NSkKKysrIFdlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAJKHdvcmtpbmcgY29w eSkKQEAgLTI3LDYgKzI3LDcgQEAKIAogI2luY2x1ZGUgIlBsdWdpbkluZm9TdG9yZS5oIgogI2lu Y2x1ZGUgIlByb2Nlc3NMYXVuY2hlci5oIgorI2luY2x1ZGUgIldlYkJhY2tGb3J3YXJkTGlzdEl0 ZW0uaCIKICNpbmNsdWRlICJXZWJDb250ZXh0LmgiCiAjaW5jbHVkZSAiV2ViUGFnZU5hbWVzcGFj ZS5oIgogI2luY2x1ZGUgIldlYlBhZ2VQcm94eS5oIgpAQCAtMTU2LDYgKzE1NywxMSBAQCBzaXpl X3QgV2ViUHJvY2Vzc1Byb3h5OjpudW1iZXJPZlBhZ2VzKCkKICAgICByZXR1cm4gbV9wYWdlTWFw LnNpemUoKTsKIH0KIAorV2ViQmFja0ZvcndhcmRMaXN0SXRlbSogV2ViUHJvY2Vzc1Byb3h5Ojp3 ZWJCYWNrRm9yd2FyZEl0ZW0odWludDY0X3QgaXRlbUlEKSBjb25zdAoreworICAgIHJldHVybiBt X2JhY2tGb3J3YXJkTGlzdEl0ZW1NYXAuZ2V0KGl0ZW1JRCkuZ2V0KCk7Cit9CisKIHZvaWQgV2Vi UHJvY2Vzc1Byb3h5Ojpmb3J3YXJkTWVzc2FnZVRvV2ViQ29udGV4dChjb25zdCBTdHJpbmcmIG1l c3NhZ2UpCiB7CiAgICAgbV9jb250ZXh0LT5kaWRSZWNpZXZlTWVzc2FnZUZyb21JbmplY3RlZEJ1 bmRsZShtZXNzYWdlKTsKQEAgLTE3OSw2ICsxODUsMjEgQEAgdm9pZCBXZWJQcm9jZXNzUHJveHk6 OmdldFBsdWdpbkhvc3RDb25uZQogICAgIHBsdWdpblBhdGggPSBwbHVnaW4ucGF0aDsKIH0KIAor dm9pZCBXZWJQcm9jZXNzUHJveHk6OmFkZE9yVXBkYXRlQmFja0ZvcndhcmRMaXN0SXRlbSh1aW50 NjRfdCBpdGVtSUQsIGNvbnN0IFN0cmluZyYgb3JpZ2luYWxVUkwsIGNvbnN0IFN0cmluZyYgdXJs LCBjb25zdCBTdHJpbmcmIHRpdGxlKQoreworICAgIHN0ZDo6cGFpcjxXZWJCYWNrRm9yd2FyZExp c3RJdGVtTWFwOjppdGVyYXRvciwgYm9vbD4gcmVzdWx0ID0gbV9iYWNrRm9yd2FyZExpc3RJdGVt TWFwLmFkZChpdGVtSUQsIDApOworICAgIGlmIChyZXN1bHQuc2Vjb25kKSB7CisgICAgICAgIC8v IE5ldyBpdGVtLgorICAgICAgICByZXN1bHQuZmlyc3QtPnNlY29uZCA9IFdlYkJhY2tGb3J3YXJk TGlzdEl0ZW06OmNyZWF0ZShvcmlnaW5hbFVSTCwgdXJsLCB0aXRsZSwgaXRlbUlEKTsKKyAgICAg ICAgcmV0dXJuOworICAgIH0KKworICAgIC8vIFVwZGF0ZSBleGlzdGluZyBpdGVtLgorICAgIHJl c3VsdC5maXJzdC0+c2Vjb25kLT5zZXRPcmlnaW5hbFVSTChvcmlnaW5hbFVSTCk7CisgICAgcmVz dWx0LmZpcnN0LT5zZWNvbmQtPnNldFVSTCh1cmwpOworICAgIHJlc3VsdC5maXJzdC0+c2Vjb25k LT5zZXRUaXRsZSh0aXRsZSk7Cit9CisKIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpkaWRSZWNlaXZl TWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uLCBDb3JlSVBDOjpNZXNzYWdl SUQgbWVzc2FnZUlELCBDb3JlSVBDOjpBcmd1bWVudERlY29kZXIqIGFyZ3VtZW50cykKIHsKICAg ICBpZiAobWVzc2FnZUlELmlzPENvcmVJUEM6Ok1lc3NhZ2VDbGFzc1dlYlByb2Nlc3NQcm94eT4o KSkgewpAQCAtMTkxLDcgKzIxMiwxNyBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6ZGlkUmVjZWl2 ZU1lc3NhZ2UoCiAgICAgICAgICAgICAgICAgZm9yd2FyZE1lc3NhZ2VUb1dlYkNvbnRleHQobWVz c2FnZSk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQotICAgICAgICAg ICAgICAgIAorICAgICAgICAgICAgY2FzZSBXZWJQcm9jZXNzUHJveHlNZXNzYWdlOjpBZGRCYWNr Rm9yd2FyZEl0ZW06IHsKKyAgICAgICAgICAgICAgICB1aW50NjRfdCBpdGVtSUQ7CisgICAgICAg ICAgICAgICAgU3RyaW5nIG9yaWdpbmFsVVJMOworICAgICAgICAgICAgICAgIFN0cmluZyB1cmw7 CisgICAgICAgICAgICAgICAgU3RyaW5nIHRpdGxlOworICAgICAgICAgICAgICAgIGlmICghYXJn dW1lbnRzLT5kZWNvZGUoQ29yZUlQQzo6T3V0KGl0ZW1JRCwgb3JpZ2luYWxVUkwsIHVybCwgdGl0 bGUpKSkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworICAgICAgICAgICAgICAgIGFkZE9y VXBkYXRlQmFja0ZvcndhcmRMaXN0SXRlbShpdGVtSUQsIG9yaWdpbmFsVVJMLCB1cmwsIHRpdGxl KTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisKICAgICAgICAgICAg IC8vIFRoZXNlIGFyZSBzeW5jaHJvbm91cyBtZXNzYWdlcyBhbmQgc2hvdWxkIG5ldmVyIGJlIGhh bmRsZWQgaGVyZS4KICAgICAgICAgICAgIGNhc2UgV2ViUHJvY2Vzc1Byb3h5TWVzc2FnZTo6R2V0 UGx1Z2luczoKICAgICAgICAgICAgIGNhc2UgV2ViUHJvY2Vzc1Byb3h5TWVzc2FnZTo6R2V0UGx1 Z2luSG9zdENvbm5lY3Rpb246CkBAIC0yNDUsNiArMjc2LDcgQEAgdm9pZCBXZWJQcm9jZXNzUHJv eHk6OmRpZFJlY2VpdmVTeW5jTWVzcwogCiAgICAgICAgICAgICAvLyBUaGVzZSBhcmUgYXN5bmNo cm9ub3VzIG1lc3NhZ2VzIGFuZCBzaG91bGQgbmV2ZXIgYmUgaGFuZGxlZCBoZXJlLgogICAgICAg ICAgICAgY2FzZSBXZWJQcm9jZXNzUHJveHlNZXNzYWdlOjpQb3N0TWVzc2FnZToKKyAgICAgICAg ICAgIGNhc2UgV2ViUHJvY2Vzc1Byb3h5TWVzc2FnZTo6QWRkQmFja0ZvcndhcmRJdGVtOgogICAg ICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICAgICAgICAgIGJyZWFr OwogICAgICAgICB9CkluZGV4OiBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaAkocmV2aXNp b24gNjMzNDUpCisrKyBXZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaAkod29ya2lu ZyBjb3B5KQpAQCAtNDMsNiArNDMsNyBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIG5hbWVzcGFj ZSBXZWJLaXQgewogCitjbGFzcyBXZWJCYWNrRm9yd2FyZExpc3RJdGVtOwogY2xhc3MgV2ViQ29u dGV4dDsKIGNsYXNzIFdlYlBhZ2VOYW1lc3BhY2U7CiAgICAgCkBAIC01MCw2ICs1MSw3IEBAIGNs YXNzIFdlYlByb2Nlc3NQcm94eSA6IHB1YmxpYyBSZWZDb3VudGUKIHB1YmxpYzoKICAgICB0eXBl ZGVmIEhhc2hNYXA8dWludDY0X3QsIFJlZlB0cjxXZWJQYWdlUHJveHk+ID4gV2ViUGFnZVByb3h5 TWFwOwogICAgIHR5cGVkZWYgV2ViUGFnZVByb3h5TWFwOjpjb25zdF9pdGVyYXRvcjo6VmFsdWVz IHBhZ2VzX2NvbnN0X2l0ZXJhdG9yOworICAgIHR5cGVkZWYgSGFzaE1hcDx1aW50NjRfdCwgUmVm UHRyPFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW0+ID4gV2ViQmFja0ZvcndhcmRMaXN0SXRlbU1hcDsK IAogICAgIHN0YXRpYyBQYXNzUmVmUHRyPFdlYlByb2Nlc3NQcm94eT4gY3JlYXRlKFdlYkNvbnRl eHQqKTsKICAgICB+V2ViUHJvY2Vzc1Byb3h5KCk7CkBAIC03Niw2ICs3OCw4IEBAIHB1YmxpYzoK ICAgICBwYWdlc19jb25zdF9pdGVyYXRvciBwYWdlc19lbmQoKTsKICAgICBzaXplX3QgbnVtYmVy T2ZQYWdlcygpOwogCisgICAgV2ViQmFja0ZvcndhcmRMaXN0SXRlbSogd2ViQmFja0ZvcndhcmRJ dGVtKHVpbnQ2NF90IGl0ZW1JRCkgY29uc3Q7CisKICAgICBSZXNwb25zaXZlbmVzc1RpbWVyKiBy ZXNwb25zaXZlbmVzc1RpbWVyKCkgeyByZXR1cm4gJm1fcmVzcG9uc2l2ZW5lc3NUaW1lcjsgfQog CiAgICAgYm9vbCBpc1ZhbGlkKCkgY29uc3QgeyByZXR1cm4gbV9jb25uZWN0aW9uOyB9CkBAIC05 NSw2ICs5OSw4IEBAIHByaXZhdGU6CiAgICAgdm9pZCBnZXRQbHVnaW5zKGJvb2wgcmVmcmVzaCwg VmVjdG9yPFdlYkNvcmU6OlBsdWdpbkluZm8+Jik7CiAgICAgdm9pZCBnZXRQbHVnaW5Ib3N0Q29u bmVjdGlvbihjb25zdCBXZWJDb3JlOjpTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBXZWJDb3JlOjpL VVJMJiB1cmwsIFdlYkNvcmU6OlN0cmluZyYgcGx1Z2luUGF0aCk7CiAKKyAgICB2b2lkIGFkZE9y VXBkYXRlQmFja0ZvcndhcmRMaXN0SXRlbSh1aW50NjRfdCBpdGVtSUQsIGNvbnN0IFdlYkNvcmU6 OlN0cmluZyYgb3JpZ2luYWxVUkxTdHJpbmcsIGNvbnN0IFdlYkNvcmU6OlN0cmluZyYgdXJsU3Ry aW5nLCBjb25zdCBXZWJDb3JlOjpTdHJpbmcmIHRpdGxlKTsKKwogICAgIC8vIENvcmVJUEM6OkNv bm5lY3Rpb246OkNsaWVudAogICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2UoQ29yZUlQQzo6Q29u bmVjdGlvbiosIENvcmVJUEM6Ok1lc3NhZ2VJRCwgQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKik7 CiAgICAgdm9pZCBkaWRSZWNlaXZlU3luY01lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbiosIENv cmVJUEM6Ok1lc3NhZ2VJRCwgQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKiwgQ29yZUlQQzo6QXJn dW1lbnRFbmNvZGVyKik7CkBAIC0xMTUsOCArMTIxLDExIEBAIHByaXZhdGU6CiAKICAgICBXZWJD b250ZXh0KiBtX2NvbnRleHQ7CiAKLSAgICAvLyBOT1RFOiBUaGlzIG1hcCBpcyBmb3IgcGFnZXMg aW4gYWxsIFdlYlBhZ2VOYW1lc3BhY2VzIHRoYXQgdXNlIHRoaXMgcHJvY2Vzcy4KKyAgICAvLyBO T1RFOiBUaGlzIG1hcCBpcyBmb3IgV2ViUGFnZVByb3hpZXMgaW4gYWxsIFdlYlBhZ2VOYW1lc3Bh Y2VzIHRoYXQgdXNlIHRoaXMgcHJvY2Vzcy4KICAgICBXZWJQYWdlUHJveHlNYXAgbV9wYWdlTWFw OworCisgICAgLy8gTk9URTogVGhpcyBtYXAgaXMgZm9yIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW1z IGluIGFsbCBXZWJQYWdlTmFtZXNwYWNlcyBhbmQgV2ViUGFnZVByb3hpZXMgdGhhdCB1c2UgdGhp cyBwcm9jZXNzLgorICAgIFdlYkJhY2tGb3J3YXJkTGlzdEl0ZW1NYXAgbV9iYWNrRm9yd2FyZExp c3RJdGVtTWFwOwogfTsKIAogdGVtcGxhdGU8dHlwZW5hbWUgRSwgdHlwZW5hbWUgVD4KSW5kZXg6 IFdlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYkJhY2tGb3J3YXJkTGlzdFByb3h5LmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJCYWNrRm9yd2FyZExp c3RQcm94eS5jcHAJKHJldmlzaW9uIDYzMzQ1KQorKysgV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBh Z2UvV2ViQmFja0ZvcndhcmRMaXN0UHJveHkuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yOSw2ICsy OSw3IEBACiAjaW5jbHVkZSAiV2ViUGFnZS5oIgogI2luY2x1ZGUgIldlYlBhZ2VQcm94eU1lc3Nh Z2VLaW5kcy5oIgogI2luY2x1ZGUgIldlYlByb2Nlc3MuaCIKKyNpbmNsdWRlICJXZWJQcm9jZXNz UHJveHlNZXNzYWdlS2luZHMuaCIKICNpbmNsdWRlIDxXZWJDb3JlL0hpc3RvcnlJdGVtLmg+CiAj aW5jbHVkZSA8d3RmL0hhc2hNYXAuaD4KIApAQCAtNzksNiArODAsMjAgQEAgc3RhdGljIHVpbnQ2 NF90IGdldElERm9ySGlzdG9yeUl0ZW0oSGlzdAogICAgIHJldHVybiBpdGVtSUQ7CiB9CiAKK3N0 YXRpYyB2b2lkIHVwZGF0ZUJhY2tGb3J3YXJkSXRlbShIaXN0b3J5SXRlbSogaXRlbSkKK3sKKyAg ICB1aW50NjRfdCBpdGVtSUQgPSBnZXRJREZvckhpc3RvcnlJdGVtKGl0ZW0pOworICAgIGNvbnN0 IFN0cmluZyYgb3JpZ2luYWxVUkxTdHJpbmcgPSBpdGVtLT5vcmlnaW5hbFVSTFN0cmluZygpOwor ICAgIGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nID0gaXRlbS0+dXJsU3RyaW5nKCk7CisgICAgY29u c3QgU3RyaW5nJiB0aXRsZSA9IGl0ZW0tPnRpdGxlKCk7CisgICAgV2ViUHJvY2Vzczo6c2hhcmVk KCkuY29ubmVjdGlvbigpLT5zZW5kKFdlYlByb2Nlc3NQcm94eU1lc3NhZ2U6OkFkZEJhY2tGb3J3 YXJkSXRlbSwgMCwgQ29yZUlQQzo6SW4oaXRlbUlELCBvcmlnaW5hbFVSTFN0cmluZywgdXJsU3Ry aW5nLCB0aXRsZSkpOworfQorCitzdGF0aWMgdm9pZCBXSzJOb3RpZnlIaXN0b3J5SXRlbUNoYW5n ZWQoSGlzdG9yeUl0ZW0qIGl0ZW0pCit7CisgICAgdXBkYXRlQmFja0ZvcndhcmRJdGVtKGl0ZW0p OworfQorCiBIaXN0b3J5SXRlbSogV2ViQmFja0ZvcndhcmRMaXN0UHJveHk6Oml0ZW1Gb3JJRCh1 aW50NjRfdCBpdGVtSUQpCiB7CiAgICAgcmV0dXJuIGlkVG9IaXN0b3J5SXRlbU1hcCgpLmdldChp dGVtSUQpLmdldCgpOwpAQCAtOTAsNiArMTA1LDcgQEAgV2ViQmFja0ZvcndhcmRMaXN0UHJveHk6 OldlYkJhY2tGb3J3YXJkTAogICAgICwgbV9jbG9zZWQodHJ1ZSkKICAgICAsIG1fZW5hYmxlZCh0 cnVlKQogeworICAgIFdlYkNvcmU6Om5vdGlmeUhpc3RvcnlJdGVtQ2hhbmdlZCA9IFdLMk5vdGlm eUhpc3RvcnlJdGVtQ2hhbmdlZDsKIH0KIAogV2ViQmFja0ZvcndhcmRMaXN0UHJveHk6On5XZWJC YWNrRm9yd2FyZExpc3RQcm94eSgpCkBAIC0xMDIsMTMgKzExOCw4IEBAIHZvaWQgV2ViQmFja0Zv cndhcmRMaXN0UHJveHk6OmFkZEl0ZW0oUGEKICAgICAgICAgcmV0dXJuOwogCiAgICAgUmVmUHRy PEhpc3RvcnlJdGVtPiBpdGVtID0gcHJwSXRlbTsKLQotICAgIHVpbnQ2NF90IGl0ZW1JRCA9IGdl dElERm9ySGlzdG9yeUl0ZW0oaXRlbS5nZXQoKSk7Ci0gICAgY29uc3QgU3RyaW5nJiBvcmlnaW5h bFVSTFN0cmluZyA9IGl0ZW0tPm9yaWdpbmFsVVJMU3RyaW5nKCk7Ci0gICAgY29uc3QgU3RyaW5n JiB1cmxTdHJpbmcgPSBpdGVtLT51cmxTdHJpbmcoKTsKLSAgICBjb25zdCBTdHJpbmcmIHRpdGxl ID0gaXRlbS0+dGl0bGUoKTsKLQotICAgIFdlYlByb2Nlc3M6OnNoYXJlZCgpLmNvbm5lY3Rpb24o KS0+c2VuZChXZWJQYWdlUHJveHlNZXNzYWdlOjpCYWNrRm9yd2FyZEFkZEl0ZW0sIG1fcGFnZS0+ cGFnZUlEKCksIENvcmVJUEM6OkluKGl0ZW1JRCwgb3JpZ2luYWxVUkxTdHJpbmcsIHVybFN0cmlu ZywgdGl0bGUpKTsKKyAgICB1aW50NjRfdCBpdGVtSUQgPSBoaXN0b3J5SXRlbVRvSURNYXAoKS5n ZXQoaXRlbSk7CisgICAgV2ViUHJvY2Vzczo6c2hhcmVkKCkuY29ubmVjdGlvbigpLT5zZW5kKFdl YlBhZ2VQcm94eU1lc3NhZ2U6OkJhY2tGb3J3YXJkQWRkSXRlbSwgbV9wYWdlLT5wYWdlSUQoKSwg Q29yZUlQQzo6SW4oaXRlbUlEKSk7CiB9CiAKIHZvaWQgV2ViQmFja0ZvcndhcmRMaXN0UHJveHk6 OmdvQmFjaygpCg==