126738 2014-01-09 23:06:34 -0800 Clean up ProgressTracker a little 2014-01-09 23:15:59 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca commit-queue japhet oldest_to_newest 966241 0 andersca 2014-01-09 23:06:34 -0800 Clean up ProgressTracker a little 966243 1 220807 andersca 2014-01-09 23:10:34 -0800 Created attachment 220807 Patch 966245 2 andersca 2014-01-09 23:15:59 -0800 Committed r161622: <http://trac.webkit.org/changeset/161622> 220807 2014-01-09 23:10:34 -0800 2014-01-09 23:13:11 -0800 Patch bug-126738-20140109231034.patch text/plain 11612 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxNjIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWIwZWQ3NzlhYjE4MDg2 YWFhNmI4NjJiZmU1YTliZGVmYTU1YTJlNS4uMTdjNGViMjRhZTQ3NWE4MDlmOGQ3MTkyZDkyOGMy ZDEwMmYyOTkzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDE0LTAxLTA5ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQ2xlYW4gdXAgUHJv Z3Jlc3NUcmFja2VyIGEgbGl0dGxlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMjY3MzgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBVc2UgRnJhbWUmIHdoZXJlIHRoZSBmcmFtZSBjYW4gbmV2ZXIgYmUgbnVs bCwgYXZvaWQgYW4gZXh0cmEgaGFzaCBsb29rdXAgYW5kCisgICAgICAgIHN3aXRjaCB0aGUgbV9w cm9ncmVzc0l0ZW1zIG1hcCBvdmVyIHRvIHN0ZDo6dW5pcXVlX3B0ci4KKworICAgICAgICAqIGlu c3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaDoKKyAgICAgICAgKFdlYkNvcmU6Oklu c3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZnJhbWVTdGFydGVkTG9hZGluZyk6CisgICAgICAgICog bG9hZGVyL0ZyYW1lTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpG cmFtZVByb2dyZXNzVHJhY2tlcjo6fkZyYW1lUHJvZ3Jlc3NUcmFja2VyKToKKyAgICAgICAgKFdl YkNvcmU6OkZyYW1lTG9hZGVyOjpGcmFtZVByb2dyZXNzVHJhY2tlcjo6cHJvZ3Jlc3NTdGFydGVk KToKKyAgICAgICAgKFdlYkNvcmU6OkZyYW1lTG9hZGVyOjpGcmFtZVByb2dyZXNzVHJhY2tlcjo6 cHJvZ3Jlc3NDb21wbGV0ZWQpOgorICAgICAgICAqIGxvYWRlci9Qcm9ncmVzc1RyYWNrZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6UHJvZ3Jlc3NUcmFja2VyOjpwcm9ncmVzc1N0YXJ0ZWQpOgor ICAgICAgICAoV2ViQ29yZTo6UHJvZ3Jlc3NUcmFja2VyOjpwcm9ncmVzc0NvbXBsZXRlZCk6Cisg ICAgICAgIChXZWJDb3JlOjpQcm9ncmVzc1RyYWNrZXI6OmluY3JlbWVudFByb2dyZXNzKToKKyAg ICAgICAgKiBsb2FkZXIvUHJvZ3Jlc3NUcmFja2VyLmg6CisgICAgICAgICogbG9hZGVyL1Jlc291 cmNlTG9hZE5vdGlmaWVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZE5vdGlm aWVyOjpkaWRSZWNlaXZlRGF0YSk6CisKKzIwMTQtMDEtMDkgIEFuZGVycyBDYXJsc3NvbiAgPGFu ZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBSZW1vdmUgdW51c2VkIEZyYW1lTG9hZGVyIG1l bWJlciBmdW5jdGlvbnMKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEyNjczNAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9ySW5zdHJ1bWVudGF0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9ySW5zdHJ1bWVudGF0aW9uLmgKaW5kZXggOTExYmQ5NWY2ZTkxYWVmMjkwOWYwYjhlYjU4ZDUx MzhiN2E5NmI4MS4uNTFmYzIyOWQzNGYwZjNjNWY3YWU2NjNhYTg3MzJmZmRjOGYzMmQzYiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRhdGlv bi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRp b24uaApAQCAtMTk1LDggKzE5NSw4IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgdm9pZCBkaWRDb21t aXRMb2FkKEZyYW1lKiwgRG9jdW1lbnRMb2FkZXIqKTsKICAgICBzdGF0aWMgdm9pZCBmcmFtZURv Y3VtZW50VXBkYXRlZChGcmFtZSopOwogICAgIHN0YXRpYyB2b2lkIGxvYWRlckRldGFjaGVkRnJv bUZyYW1lKEZyYW1lKiwgRG9jdW1lbnRMb2FkZXIqKTsKLSAgICBzdGF0aWMgdm9pZCBmcmFtZVN0 YXJ0ZWRMb2FkaW5nKEZyYW1lKik7Ci0gICAgc3RhdGljIHZvaWQgZnJhbWVTdG9wcGVkTG9hZGlu ZyhGcmFtZSopOworICAgIHN0YXRpYyB2b2lkIGZyYW1lU3RhcnRlZExvYWRpbmcoRnJhbWUmKTsK KyAgICBzdGF0aWMgdm9pZCBmcmFtZVN0b3BwZWRMb2FkaW5nKEZyYW1lJik7CiAgICAgc3RhdGlj IHZvaWQgZnJhbWVTY2hlZHVsZWROYXZpZ2F0aW9uKEZyYW1lKiwgZG91YmxlIGRlbGF5KTsKICAg ICBzdGF0aWMgdm9pZCBmcmFtZUNsZWFyZWRTY2hlZHVsZWROYXZpZ2F0aW9uKEZyYW1lKik7CiAg ICAgc3RhdGljIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbkNvb2tpZSB3aWxsUnVuSmF2YVNjcmlw dERpYWxvZyhQYWdlKiwgY29uc3QgU3RyaW5nJiBtZXNzYWdlKTsKQEAgLTE2MDYsMjEgKzE2MDYs MjEgQEAgaW5saW5lIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpsb2FkZXJEZXRhY2hl ZEZyb21GcmFtZShGcmFtZSogZnJhbWUsIERvY3UKICNlbmRpZgogfQogCi1pbmxpbmUgdm9pZCBJ bnNwZWN0b3JJbnN0cnVtZW50YXRpb246OmZyYW1lU3RhcnRlZExvYWRpbmcoRnJhbWUqIGZyYW1l KQoraW5saW5lIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpmcmFtZVN0YXJ0ZWRMb2Fk aW5nKEZyYW1lJiBmcmFtZSkKIHsKICNpZiBFTkFCTEUoSU5TUEVDVE9SKQotICAgIGlmIChJbnN0 cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzID0gaW5zdHJ1bWVudGluZ0FnZW50 c0ZvckZyYW1lKGZyYW1lKSkKLSAgICAgICAgZnJhbWVTdGFydGVkTG9hZGluZ0ltcGwoaW5zdHJ1 bWVudGluZ0FnZW50cywgZnJhbWUpOworICAgIGlmIChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0 cnVtZW50aW5nQWdlbnRzID0gaW5zdHJ1bWVudGluZ0FnZW50c0ZvckZyYW1lKCZmcmFtZSkpCisg ICAgICAgIGZyYW1lU3RhcnRlZExvYWRpbmdJbXBsKGluc3RydW1lbnRpbmdBZ2VudHMsICZmcmFt ZSk7CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTShmcmFtZSk7CiAjZW5kaWYKIH0KIAotaW5saW5l IHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpmcmFtZVN0b3BwZWRMb2FkaW5nKEZyYW1l KiBmcmFtZSkKK2lubGluZSB2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZnJhbWVTdG9w cGVkTG9hZGluZyhGcmFtZSYgZnJhbWUpCiB7CiAjaWYgRU5BQkxFKElOU1BFQ1RPUikKLSAgICBp ZiAoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1bWVudGluZ0FnZW50cyA9IGluc3RydW1lbnRp bmdBZ2VudHNGb3JGcmFtZShmcmFtZSkpCi0gICAgICAgIGZyYW1lU3RvcHBlZExvYWRpbmdJbXBs KGluc3RydW1lbnRpbmdBZ2VudHMsIGZyYW1lKTsKKyAgICBpZiAoSW5zdHJ1bWVudGluZ0FnZW50 cyogaW5zdHJ1bWVudGluZ0FnZW50cyA9IGluc3RydW1lbnRpbmdBZ2VudHNGb3JGcmFtZSgmZnJh bWUpKQorICAgICAgICBmcmFtZVN0b3BwZWRMb2FkaW5nSW1wbChpbnN0cnVtZW50aW5nQWdlbnRz LCAmZnJhbWUpOwogI2Vsc2UKICAgICBVTlVTRURfUEFSQU0oZnJhbWUpOwogI2VuZGlmCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcAppbmRleCAxNTJmMzc0ZTgwZWZkN2I5OTNjYTQ3 Y2E1ODJmNjIzN2YwNDgyNWI2Li41M2NhNmQwNjA3YzU5ZmQ2NGI4NDQ5ZGUxYmQ1M2VkNjE3ODhk ZGQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKQEAgLTE5OCwxNCArMTk4 LDE0IEBAIHB1YmxpYzoKICAgICB7CiAgICAgICAgIEFTU0VSVCghbV9pblByb2dyZXNzIHx8IG1f ZnJhbWUucGFnZSgpKTsKICAgICAgICAgaWYgKG1faW5Qcm9ncmVzcykKLSAgICAgICAgICAgIG1f ZnJhbWUucGFnZSgpLT5wcm9ncmVzcygpLnByb2dyZXNzQ29tcGxldGVkKCZtX2ZyYW1lKTsKKyAg ICAgICAgICAgIG1fZnJhbWUucGFnZSgpLT5wcm9ncmVzcygpLnByb2dyZXNzQ29tcGxldGVkKG1f ZnJhbWUpOwogICAgIH0KIAogICAgIHZvaWQgcHJvZ3Jlc3NTdGFydGVkKCkKICAgICB7CiAgICAg ICAgIEFTU0VSVChtX2ZyYW1lLnBhZ2UoKSk7CiAgICAgICAgIGlmICghbV9pblByb2dyZXNzKQot ICAgICAgICAgICAgbV9mcmFtZS5wYWdlKCktPnByb2dyZXNzKCkucHJvZ3Jlc3NTdGFydGVkKCZt X2ZyYW1lKTsKKyAgICAgICAgICAgIG1fZnJhbWUucGFnZSgpLT5wcm9ncmVzcygpLnByb2dyZXNz U3RhcnRlZChtX2ZyYW1lKTsKICAgICAgICAgbV9pblByb2dyZXNzID0gdHJ1ZTsKICAgICB9CiAK QEAgLTIxNCw3ICsyMTQsNyBAQCBwdWJsaWM6CiAgICAgICAgIEFTU0VSVChtX2luUHJvZ3Jlc3Mp OwogICAgICAgICBBU1NFUlQobV9mcmFtZS5wYWdlKCkpOwogICAgICAgICBtX2luUHJvZ3Jlc3Mg PSBmYWxzZTsKLSAgICAgICAgbV9mcmFtZS5wYWdlKCktPnByb2dyZXNzKCkucHJvZ3Jlc3NDb21w bGV0ZWQoJm1fZnJhbWUpOworICAgICAgICBtX2ZyYW1lLnBhZ2UoKS0+cHJvZ3Jlc3MoKS5wcm9n cmVzc0NvbXBsZXRlZChtX2ZyYW1lKTsKICAgICB9CiAKIHByaXZhdGU6CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvUHJvZ3Jlc3NUcmFja2VyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9Qcm9ncmVzc1RyYWNrZXIuY3BwCmluZGV4IGMxMTAzZTBiNmQ5NTQxZTcwMTUyNzY2 MTdkM2QxNWM5YmY4ZDRhY2UuLmZiYTBjMTI5ZTRmYmQ1YjFkMmZkODg1YWYzMDA0MzliOWM0Yjlh M2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Qcm9ncmVzc1RyYWNrZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Qcm9ncmVzc1RyYWNrZXIuY3BwCkBAIC0xMTIs MTYgKzExMiwxNiBAQCB2b2lkIFByb2dyZXNzVHJhY2tlcjo6cmVzZXQoKQogICAgIG1fcHJvZ3Jl c3NIZWFydGJlYXRUaW1lci5zdG9wKCk7CiB9CiAKLXZvaWQgUHJvZ3Jlc3NUcmFja2VyOjpwcm9n cmVzc1N0YXJ0ZWQoRnJhbWUqIGZyYW1lKQordm9pZCBQcm9ncmVzc1RyYWNrZXI6OnByb2dyZXNz U3RhcnRlZChGcmFtZSYgZnJhbWUpCiB7Ci0gICAgTE9HKFByb2dyZXNzLCAiUHJvZ3Jlc3Mgc3Rh cnRlZCAoJXApIC0gZnJhbWUgJXAoXCIlc1wiKSwgdmFsdWUgJWYsIHRyYWNrZWQgZnJhbWVzICVk LCBvcmlnaW5hdGluZyBmcmFtZSAlcCIsIHRoaXMsIGZyYW1lLCBmcmFtZS0+dHJlZSgpLnVuaXF1 ZU5hbWUoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpLCBtX3Byb2dyZXNzVmFsdWUsIG1fbnVtUHJv Z3Jlc3NUcmFja2VkRnJhbWVzLCBtX29yaWdpbmF0aW5nUHJvZ3Jlc3NGcmFtZS5nZXQoKSk7Cisg ICAgTE9HKFByb2dyZXNzLCAiUHJvZ3Jlc3Mgc3RhcnRlZCAoJXApIC0gZnJhbWUgJXAoXCIlc1wi KSwgdmFsdWUgJWYsIHRyYWNrZWQgZnJhbWVzICVkLCBvcmlnaW5hdGluZyBmcmFtZSAlcCIsIHRo aXMsICZmcmFtZSwgZnJhbWUudHJlZSgpLnVuaXF1ZU5hbWUoKS5zdHJpbmcoKS51dGY4KCkuZGF0 YSgpLCBtX3Byb2dyZXNzVmFsdWUsIG1fbnVtUHJvZ3Jlc3NUcmFja2VkRnJhbWVzLCBtX29yaWdp bmF0aW5nUHJvZ3Jlc3NGcmFtZS5nZXQoKSk7CiAKLSAgICBmcmFtZS0+bG9hZGVyKCkuY2xpZW50 KCkud2lsbENoYW5nZUVzdGltYXRlZFByb2dyZXNzKCk7CisgICAgZnJhbWUubG9hZGVyKCkuY2xp ZW50KCkud2lsbENoYW5nZUVzdGltYXRlZFByb2dyZXNzKCk7CiAgICAgCi0gICAgaWYgKG1fbnVt UHJvZ3Jlc3NUcmFja2VkRnJhbWVzID09IDAgfHwgbV9vcmlnaW5hdGluZ1Byb2dyZXNzRnJhbWUg PT0gZnJhbWUpIHsKKyAgICBpZiAoIW1fbnVtUHJvZ3Jlc3NUcmFja2VkRnJhbWVzIHx8IG1fb3Jp Z2luYXRpbmdQcm9ncmVzc0ZyYW1lID09ICZmcmFtZSkgewogICAgICAgICByZXNldCgpOwogICAg ICAgICBtX3Byb2dyZXNzVmFsdWUgPSBpbml0aWFsUHJvZ3Jlc3NWYWx1ZTsKLSAgICAgICAgbV9v cmlnaW5hdGluZ1Byb2dyZXNzRnJhbWUgPSBmcmFtZTsKKyAgICAgICAgbV9vcmlnaW5hdGluZ1By b2dyZXNzRnJhbWUgPSAmZnJhbWU7CiAKICAgICAgICAgbV9wcm9ncmVzc0hlYXJ0YmVhdFRpbWVy LnN0YXJ0UmVwZWF0aW5nKHByb2dyZXNzSGVhcnRiZWF0SW50ZXJ2YWwpOwogICAgICAgICBtX29y aWdpbmF0aW5nUHJvZ3Jlc3NGcmFtZS0+bG9hZGVyKCkubG9hZFByb2dyZXNzaW5nU3RhdHVzQ2hh bmdlZCgpOwpAQCAtMTMwLDI0ICsxMzAsMjQgQEAgdm9pZCBQcm9ncmVzc1RyYWNrZXI6OnByb2dy ZXNzU3RhcnRlZChGcmFtZSogZnJhbWUpCiAgICAgfQogICAgIG1fbnVtUHJvZ3Jlc3NUcmFja2Vk RnJhbWVzKys7CiAKLSAgICBmcmFtZS0+bG9hZGVyKCkuY2xpZW50KCkuZGlkQ2hhbmdlRXN0aW1h dGVkUHJvZ3Jlc3MoKTsKKyAgICBmcmFtZS5sb2FkZXIoKS5jbGllbnQoKS5kaWRDaGFuZ2VFc3Rp bWF0ZWRQcm9ncmVzcygpOwogICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZnJhbWVTdGFy dGVkTG9hZGluZyhmcmFtZSk7CiB9CiAKLXZvaWQgUHJvZ3Jlc3NUcmFja2VyOjpwcm9ncmVzc0Nv bXBsZXRlZChGcmFtZSogZnJhbWUpCit2b2lkIFByb2dyZXNzVHJhY2tlcjo6cHJvZ3Jlc3NDb21w bGV0ZWQoRnJhbWUmIGZyYW1lKQogewotICAgIExPRyhQcm9ncmVzcywgIlByb2dyZXNzIGNvbXBs ZXRlZCAoJXApIC0gZnJhbWUgJXAoXCIlc1wiKSwgdmFsdWUgJWYsIHRyYWNrZWQgZnJhbWVzICVk LCBvcmlnaW5hdGluZyBmcmFtZSAlcCIsIHRoaXMsIGZyYW1lLCBmcmFtZS0+dHJlZSgpLnVuaXF1 ZU5hbWUoKS5zdHJpbmcoKS51dGY4KCkuZGF0YSgpLCBtX3Byb2dyZXNzVmFsdWUsIG1fbnVtUHJv Z3Jlc3NUcmFja2VkRnJhbWVzLCBtX29yaWdpbmF0aW5nUHJvZ3Jlc3NGcmFtZS5nZXQoKSk7Cisg ICAgTE9HKFByb2dyZXNzLCAiUHJvZ3Jlc3MgY29tcGxldGVkICglcCkgLSBmcmFtZSAlcChcIiVz XCIpLCB2YWx1ZSAlZiwgdHJhY2tlZCBmcmFtZXMgJWQsIG9yaWdpbmF0aW5nIGZyYW1lICVwIiwg dGhpcywgJmZyYW1lLCBmcmFtZS50cmVlKCkudW5pcXVlTmFtZSgpLnN0cmluZygpLnV0ZjgoKS5k YXRhKCksIG1fcHJvZ3Jlc3NWYWx1ZSwgbV9udW1Qcm9ncmVzc1RyYWNrZWRGcmFtZXMsIG1fb3Jp Z2luYXRpbmdQcm9ncmVzc0ZyYW1lLmdldCgpKTsKICAgICAKICAgICBpZiAobV9udW1Qcm9ncmVz c1RyYWNrZWRGcmFtZXMgPD0gMCkKICAgICAgICAgcmV0dXJuOwogICAgIAotICAgIGZyYW1lLT5s b2FkZXIoKS5jbGllbnQoKS53aWxsQ2hhbmdlRXN0aW1hdGVkUHJvZ3Jlc3MoKTsKKyAgICBmcmFt ZS5sb2FkZXIoKS5jbGllbnQoKS53aWxsQ2hhbmdlRXN0aW1hdGVkUHJvZ3Jlc3MoKTsKICAgICAg ICAgCiAgICAgbV9udW1Qcm9ncmVzc1RyYWNrZWRGcmFtZXMtLTsKLSAgICBpZiAoIW1fbnVtUHJv Z3Jlc3NUcmFja2VkRnJhbWVzIHx8IG1fb3JpZ2luYXRpbmdQcm9ncmVzc0ZyYW1lID09IGZyYW1l KQorICAgIGlmICghbV9udW1Qcm9ncmVzc1RyYWNrZWRGcmFtZXMgfHwgbV9vcmlnaW5hdGluZ1By b2dyZXNzRnJhbWUgPT0gJmZyYW1lKQogICAgICAgICBmaW5hbFByb2dyZXNzQ29tcGxldGUoKTsK ICAgICAKLSAgICBmcmFtZS0+bG9hZGVyKCkuY2xpZW50KCkuZGlkQ2hhbmdlRXN0aW1hdGVkUHJv Z3Jlc3MoKTsKKyAgICBmcmFtZS5sb2FkZXIoKS5jbGllbnQoKS5kaWRDaGFuZ2VFc3RpbWF0ZWRQ cm9ncmVzcygpOwogfQogCiB2b2lkIFByb2dyZXNzVHJhY2tlcjo6ZmluYWxQcm9ncmVzc0NvbXBs ZXRlKCkKQEAgLTE2OSw3ICsxNjksNyBAQCB2b2lkIFByb2dyZXNzVHJhY2tlcjo6ZmluYWxQcm9n cmVzc0NvbXBsZXRlKCkKICAgICBmcmFtZS0+bG9hZGVyKCkuY2xpZW50KCkucG9zdFByb2dyZXNz RmluaXNoZWROb3RpZmljYXRpb24oKTsKICAgICBmcmFtZS0+bG9hZGVyKCkubG9hZFByb2dyZXNz aW5nU3RhdHVzQ2hhbmdlZCgpOwogCi0gICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpmcmFt ZVN0b3BwZWRMb2FkaW5nKGZyYW1lLmdldCgpKTsKKyAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRp b246OmZyYW1lU3RvcHBlZExvYWRpbmcoKmZyYW1lKTsKIH0KIAogdm9pZCBQcm9ncmVzc1RyYWNr ZXI6OmluY3JlbWVudFByb2dyZXNzKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgUmVz b3VyY2VSZXNwb25zZSYgcmVzcG9uc2UpCkBAIC0xODUsMTQgKzE4NSwxNyBAQCB2b2lkIFByb2dy ZXNzVHJhY2tlcjo6aW5jcmVtZW50UHJvZ3Jlc3ModW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBj b25zdCBSZXNvdXJjZQogICAgIAogICAgIG1fdG90YWxQYWdlQW5kUmVzb3VyY2VCeXRlc1RvTG9h ZCArPSBlc3RpbWF0ZWRMZW5ndGg7CiAKLSAgICBpZiAoUHJvZ3Jlc3NJdGVtKiBpdGVtID0gbV9w cm9ncmVzc0l0ZW1zLmdldChpZGVudGlmaWVyKSkgewotICAgICAgICBpdGVtLT5ieXRlc1JlY2Vp dmVkID0gMDsKLSAgICAgICAgaXRlbS0+ZXN0aW1hdGVkTGVuZ3RoID0gZXN0aW1hdGVkTGVuZ3Ro OwotICAgIH0gZWxzZQotICAgICAgICBtX3Byb2dyZXNzSXRlbXMuc2V0KGlkZW50aWZpZXIsIGFk b3B0UHRyKG5ldyBQcm9ncmVzc0l0ZW0oZXN0aW1hdGVkTGVuZ3RoKSkpOworICAgIGF1dG8mIGl0 ZW0gPSBtX3Byb2dyZXNzSXRlbXMuYWRkKGlkZW50aWZpZXIsIG51bGxwdHIpLml0ZXJhdG9yLT52 YWx1ZTsKKyAgICBpZiAoIWl0ZW0pIHsKKyAgICAgICAgaXRlbSA9IHN0ZDo6bWFrZV91bmlxdWU8 UHJvZ3Jlc3NJdGVtPihlc3RpbWF0ZWRMZW5ndGgpOworICAgICAgICByZXR1cm47CisgICAgfQor ICAgIAorICAgIGl0ZW0tPmJ5dGVzUmVjZWl2ZWQgPSAwOworICAgIGl0ZW0tPmVzdGltYXRlZExl bmd0aCA9IGVzdGltYXRlZExlbmd0aDsKIH0KIAotdm9pZCBQcm9ncmVzc1RyYWNrZXI6OmluY3Jl bWVudFByb2dyZXNzKHVuc2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgY2hhciosIGludCBs ZW5ndGgpCit2b2lkIFByb2dyZXNzVHJhY2tlcjo6aW5jcmVtZW50UHJvZ3Jlc3ModW5zaWduZWQg bG9uZyBpZGVudGlmaWVyLCB1bnNpZ25lZCBieXRlc1JlY2VpdmVkKQogewogICAgIFByb2dyZXNz SXRlbSogaXRlbSA9IG1fcHJvZ3Jlc3NJdGVtcy5nZXQoaWRlbnRpZmllcik7CiAgICAgCkBAIC0y MDQsNyArMjA3LDYgQEAgdm9pZCBQcm9ncmVzc1RyYWNrZXI6OmluY3JlbWVudFByb2dyZXNzKHVu c2lnbmVkIGxvbmcgaWRlbnRpZmllciwgY29uc3QgY2hhciosIGkKICAgICAKICAgICBmcmFtZS0+ bG9hZGVyKCkuY2xpZW50KCkud2lsbENoYW5nZUVzdGltYXRlZFByb2dyZXNzKCk7CiAgICAgCi0g ICAgdW5zaWduZWQgYnl0ZXNSZWNlaXZlZCA9IGxlbmd0aDsKICAgICBkb3VibGUgaW5jcmVtZW50 LCBwZXJjZW50T2ZSZW1haW5pbmdCeXRlczsKICAgICBsb25nIGxvbmcgcmVtYWluaW5nQnl0ZXMs IGVzdGltYXRlZEJ5dGVzRm9yUGVuZGluZ1JlcXVlc3RzOwogICAgIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbG9hZGVyL1Byb2dyZXNzVHJhY2tlci5oIGIvU291cmNlL1dlYkNvcmUvbG9h ZGVyL1Byb2dyZXNzVHJhY2tlci5oCmluZGV4IDVjZWE5MTJhMmI1YmY5MmMzZGYyMGQwYjE1YjYx YzJlNDMwMmEzMDMuLmUwMTdhYThkZTdkMjM1ZDcwMGZiMzJlNDIzNWU5ZDI5YWYyOWEzMzcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Qcm9ncmVzc1RyYWNrZXIuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvUHJvZ3Jlc3NUcmFja2VyLmgKQEAgLTQ5LDExICs0OSwxMSBA QCBwdWJsaWM6CiAKICAgICBkb3VibGUgZXN0aW1hdGVkUHJvZ3Jlc3MoKSBjb25zdDsKIAotICAg IHZvaWQgcHJvZ3Jlc3NTdGFydGVkKEZyYW1lKik7Ci0gICAgdm9pZCBwcm9ncmVzc0NvbXBsZXRl ZChGcmFtZSopOworICAgIHZvaWQgcHJvZ3Jlc3NTdGFydGVkKEZyYW1lJik7CisgICAgdm9pZCBw cm9ncmVzc0NvbXBsZXRlZChGcmFtZSYpOwogICAgIAogICAgIHZvaWQgaW5jcmVtZW50UHJvZ3Jl c3ModW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBjb25zdCBSZXNvdXJjZVJlc3BvbnNlJik7Ci0g ICAgdm9pZCBpbmNyZW1lbnRQcm9ncmVzcyh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0 IGNoYXIqLCBpbnQpOworICAgIHZvaWQgaW5jcmVtZW50UHJvZ3Jlc3ModW5zaWduZWQgbG9uZyBp ZGVudGlmaWVyLCB1bnNpZ25lZCBieXRlc1JlY2VpdmVkKTsKICAgICB2b2lkIGNvbXBsZXRlUHJv Z3Jlc3ModW5zaWduZWQgbG9uZyBpZGVudGlmaWVyKTsKIAogICAgIGxvbmcgbG9uZyB0b3RhbFBh Z2VBbmRSZXNvdXJjZUJ5dGVzVG9Mb2FkKCkgY29uc3QgeyByZXR1cm4gbV90b3RhbFBhZ2VBbmRS ZXNvdXJjZUJ5dGVzVG9Mb2FkOyB9CkBAIC04MCw3ICs4MCw3IEBAIHByaXZhdGU6CiAgICAgUmVm UHRyPEZyYW1lPiBtX29yaWdpbmF0aW5nUHJvZ3Jlc3NGcmFtZTsKICAgICAKICAgICBpbnQgbV9u dW1Qcm9ncmVzc1RyYWNrZWRGcmFtZXM7Ci0gICAgSGFzaE1hcDx1bnNpZ25lZCBsb25nLCBPd25Q dHI8UHJvZ3Jlc3NJdGVtPj4gbV9wcm9ncmVzc0l0ZW1zOworICAgIEhhc2hNYXA8dW5zaWduZWQg bG9uZywgc3RkOjp1bmlxdWVfcHRyPFByb2dyZXNzSXRlbT4+IG1fcHJvZ3Jlc3NJdGVtczsKIAog ICAgIFRpbWVyPFByb2dyZXNzVHJhY2tlcj4gbV9wcm9ncmVzc0hlYXJ0YmVhdFRpbWVyOwogICAg IHVuc2lnbmVkIG1faGVhcnRiZWF0c1dpdGhOb1Byb2dyZXNzOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE5vdGlmaWVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2xvYWRlci9SZXNvdXJjZUxvYWROb3RpZmllci5jcHAKaW5kZXggZjAyMGQ3MzkzNDk4OWNiODAw MzFlNzUwNzc5OGY2ZTlhNjE3YWU2ZC4uOWQ2YjcwMjkwYzg3Y2Q1NjhmZjdiM2I2ZTZkYTI4Mjdj NjAyOWRmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE5v dGlmaWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkTm90aWZp ZXIuY3BwCkBAIC05MSw3ICs5MSw3IEBAIHZvaWQgUmVzb3VyY2VMb2FkTm90aWZpZXI6OmRpZFJl Y2VpdmVSZXNwb25zZShSZXNvdXJjZUxvYWRlciogbG9hZGVyLCBjb25zdCBSZXNvCiB2b2lkIFJl c291cmNlTG9hZE5vdGlmaWVyOjpkaWRSZWNlaXZlRGF0YShSZXNvdXJjZUxvYWRlciogbG9hZGVy LCBjb25zdCBjaGFyKiBkYXRhLCBpbnQgZGF0YUxlbmd0aCwgaW50IGVuY29kZWREYXRhTGVuZ3Ro KQogewogICAgIGlmIChQYWdlKiBwYWdlID0gbV9mcmFtZS5wYWdlKCkpCi0gICAgICAgIHBhZ2Ut PnByb2dyZXNzKCkuaW5jcmVtZW50UHJvZ3Jlc3MobG9hZGVyLT5pZGVudGlmaWVyKCksIGRhdGEs IGRhdGFMZW5ndGgpOworICAgICAgICBwYWdlLT5wcm9ncmVzcygpLmluY3JlbWVudFByb2dyZXNz KGxvYWRlci0+aWRlbnRpZmllcigpLCBkYXRhTGVuZ3RoKTsKIAogICAgIGRpc3BhdGNoRGlkUmVj ZWl2ZURhdGEobG9hZGVyLT5kb2N1bWVudExvYWRlcigpLCBsb2FkZXItPmlkZW50aWZpZXIoKSwg ZGF0YSwgZGF0YUxlbmd0aCwgZW5jb2RlZERhdGFMZW5ndGgpOwogfQo=