30106 2009-10-05 21:40:49 -0700 Cleanup MediaPlayer and MediaPlayerPrivateInterface to remove dead methods 2010-01-21 11:23:07 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) All OS X 10.5 RESOLVED FIXED P2 Normal --- 0 hclam eric.carlson eric.carlson hausmann ossy vestbo oldest_to_newest 152569 0 hclam 2009-10-05 21:40:49 -0700 MediaPlayer and MediaPlayerPrivateInterface has some dead methods that are unrelated to the spec: setRate(float) float dataRate() setEndTime(float) etc.. These classes need to be cleaned up to match the spec. 182973 1 47077 eric.carlson 2010-01-20 16:46:18 -0800 Created attachment 47077 Proposed patch 183196 2 eric.carlson 2010-01-21 08:21:03 -0800 http://trac.webkit.org/changeset/53625 183244 3 ossy 2010-01-21 10:49:50 -0800 This patch broke Qt build, because it removed totalBytesKnown(), but WebCore/platform/qt/RenderThemeQt.cpp used it. totalBytesKnown() always returned false, so it was really unreachable code, but it can be useful in the future. error message: ( http://build.webkit.org/builders/Qt%20Linux%20Release/builds/6325/steps/compile-webkit/logs/stdio ) /../../WebCore/platform/qt/RenderThemeQt.cpp:983: error: 'class WebCore::MediaPlayer' has no member named 'totalBytesKnown' ../../../WebCore/platform/qt/RenderThemeQt.cpp:984: error: 'class WebCore::MediaPlayer' has no member named 'totalBytes' I committed a buildfix into http://trac.webkit.org/changeset/53632, but I'm not sure if we really want to remove this code introduced in http://trac.webkit.org/changeset/34300. Simon? Tor Arne? 183253 4 eric.carlson 2010-01-21 11:23:07 -0800 Filed https://bugs.webkit.org/show_bug.cgi?id=33960 to restore totalBytesKnown and totalBytes methods. 47077 2010-01-20 16:46:18 -0800 2010-01-20 16:47:49 -0800 Proposed patch patch_4.txt text/plain 15422 eric.carlson SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1MzU3OCkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjggQEAKKzIwMTAtMDEtMjAgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBh cHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQ2xlYW51cCBNZWRpYVBsYXllciBhbmQgTWVkaWFQbGF5ZXJQcml2YXRlSW50ZXJmYWNlIHRv IHJlbW92ZSBkZWFkIG1ldGhvZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTMwMTA2CisKKyAgICAgICAgTm8gbmV3IHRlc3RzLCBvbmx5IGRlYWQgY29k ZSB3YXMgcmVtb3ZlZC4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVy LmNwcDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5oOgorICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyUHJpdmF0ZS5oOgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2d0ay9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwOgorICAg ICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2d0ay9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIu aDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvTWVkaWFQbGF5ZXJQcml2YXRlUVRL aXQuaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9tYWMvTWVkaWFQbGF5ZXJQcml2YXRl UVRLaXQubW06CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2 YXRlUGhvbm9uLmNwcDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXll clByaXZhdGVQaG9ub24uaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93aW4vTWVkaWFQ bGF5ZXJQcml2YXRlUXVpY2tUaW1lV2luLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxh eWVyUHJpdmF0ZTo6TWVkaWFQbGF5ZXJQcml2YXRlKToKKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlh UGxheWVyUHJpdmF0ZTo6Y3VycmVudFRpbWUpOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5 ZXJQcml2YXRlOjpkb1NlZWspOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9NZWRp YVBsYXllclByaXZhdGVRdWlja1RpbWVXaW4uaDoKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy93aW5jZS9NZWRpYVBsYXllclByaXZhdGVXaW5jZS5oOgorCiAyMDEwLTAxLTE5ICBPbGl2ZXIg SHVudCAgPG9saXZlckBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5z dGVpbi4KSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwCShy ZXZpc2lvbiA1MzQ4NikKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIu Y3BwCSh3b3JraW5nIGNvcHkpCkBAIC04MSw4ICs4MSw2IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFs IHZvaWQgc2VlayhmbG9hdCkgeyB9CiAgICAgdmlydHVhbCBib29sIHNlZWtpbmcoKSBjb25zdCB7 IHJldHVybiBmYWxzZTsgfQogCi0gICAgdmlydHVhbCB2b2lkIHNldEVuZFRpbWUoZmxvYXQpIHsg fQotCiAgICAgdmlydHVhbCB2b2lkIHNldFJhdGUoZmxvYXQpIHsgfQogICAgIHZpcnR1YWwgdm9p ZCBzZXRQcmVzZXJ2ZXNQaXRjaChib29sKSB7IH0KICAgICB2aXJ0dWFsIGJvb2wgcGF1c2VkKCkg Y29uc3QgeyByZXR1cm4gZmFsc2U7IH0KQEAgLTk4LDkgKzk2LDYgQEAgcHVibGljOgogICAgIHZp cnR1YWwgZmxvYXQgbWF4VGltZVNlZWthYmxlKCkgY29uc3QgeyByZXR1cm4gMDsgfQogICAgIHZp cnR1YWwgUGFzc1JlZlB0cjxUaW1lUmFuZ2VzPiBidWZmZXJlZCgpIGNvbnN0IHsgcmV0dXJuIFRp bWVSYW5nZXM6OmNyZWF0ZSgpOyB9CiAKLSAgICB2aXJ0dWFsIGludCBkYXRhUmF0ZSgpIGNvbnN0 IHsgcmV0dXJuIDA7IH0KLQotICAgIHZpcnR1YWwgYm9vbCB0b3RhbEJ5dGVzS25vd24oKSBjb25z dCB7IHJldHVybiBmYWxzZTsgfQogICAgIHZpcnR1YWwgdW5zaWduZWQgdG90YWxCeXRlcygpIGNv bnN0IHsgcmV0dXJuIDA7IH0KICAgICB2aXJ0dWFsIHVuc2lnbmVkIGJ5dGVzTG9hZGVkKCkgY29u c3QgeyByZXR1cm4gMDsgfQogCkBAIC00MTUsMTYgKzQxMCw2IEBAIHZvaWQgTWVkaWFQbGF5ZXI6 OnNldFByZXNlcnZlc1BpdGNoKGJvb2wKICAgICBtX3ByaXZhdGUtPnNldFByZXNlcnZlc1BpdGNo KHByZXNlcnZlc1BpdGNoKTsKIH0KIAotaW50IE1lZGlhUGxheWVyOjpkYXRhUmF0ZSgpIGNvbnN0 Ci17Ci0gICAgcmV0dXJuIG1fcHJpdmF0ZS0+ZGF0YVJhdGUoKTsKLX0KLQotdm9pZCBNZWRpYVBs YXllcjo6c2V0RW5kVGltZShmbG9hdCB0aW1lKQotewotICAgIG1fcHJpdmF0ZS0+c2V0RW5kVGlt ZSh0aW1lKTsKLX0KLQogUGFzc1JlZlB0cjxUaW1lUmFuZ2VzPiBNZWRpYVBsYXllcjo6YnVmZmVy ZWQoKQogewogICAgIHJldHVybiBtX3ByaXZhdGUtPmJ1ZmZlcmVkKCk7CkBAIC00NDAsMTYgKzQy NSw2IEBAIHVuc2lnbmVkIE1lZGlhUGxheWVyOjpieXRlc0xvYWRlZCgpCiAgICAgcmV0dXJuIG1f cHJpdmF0ZS0+Ynl0ZXNMb2FkZWQoKTsKIH0KIAotYm9vbCBNZWRpYVBsYXllcjo6dG90YWxCeXRl c0tub3duKCkKLXsKLSAgICByZXR1cm4gbV9wcml2YXRlLT50b3RhbEJ5dGVzS25vd24oKTsKLX0K LQotdW5zaWduZWQgTWVkaWFQbGF5ZXI6OnRvdGFsQnl0ZXMoKQotewotICAgIHJldHVybiBtX3By aXZhdGUtPnRvdGFsQnl0ZXMoKTsKLX0KLQogdm9pZCBNZWRpYVBsYXllcjo6c2V0U2l6ZShjb25z dCBJbnRTaXplJiBzaXplKQogeyAKICAgICBtX3NpemUgPSBzaXplOwpJbmRleDogV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuaAkocmV2aXNpb24gNTM0ODYpCisrKyBXZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTE2Myw4 ICsxNjMsNiBAQCBwdWJsaWM6CiAKICAgICBmbG9hdCBzdGFydFRpbWUoKSBjb25zdDsKICAgICAK LSAgICB2b2lkIHNldEVuZFRpbWUoZmxvYXQgdGltZSk7Ci0gICAgCiAgICAgZmxvYXQgcmF0ZSgp IGNvbnN0OwogICAgIHZvaWQgc2V0UmF0ZShmbG9hdCk7CiAKQEAgLTE3NSw4ICsxNzMsNiBAQCBw dWJsaWM6CiAgICAgZmxvYXQgbWF4VGltZVNlZWthYmxlKCk7CiAKICAgICB1bnNpZ25lZCBieXRl c0xvYWRlZCgpOwotICAgIGJvb2wgdG90YWxCeXRlc0tub3duKCk7Ci0gICAgdW5zaWduZWQgdG90 YWxCeXRlcygpOwogICAgIAogICAgIGZsb2F0IHZvbHVtZSgpIGNvbnN0OwogICAgIHZvaWQgc2V0 Vm9sdW1lKGZsb2F0KTsKQEAgLTE4NCw4ICsxODAsNiBAQCBwdWJsaWM6CiAgICAgYm9vbCBoYXND bG9zZWRDYXB0aW9ucygpIGNvbnN0OwogICAgIHZvaWQgc2V0Q2xvc2VkQ2FwdGlvbnNWaXNpYmxl KGJvb2wgY2xvc2VkQ2FwdGlvbnNWaXNpYmxlKTsKIAotICAgIGludCBkYXRhUmF0ZSgpIGNvbnN0 OwotCiAgICAgYm9vbCBhdXRvYnVmZmVyKCkgY29uc3Q7ICAgIAogICAgIHZvaWQgc2V0QXV0b2J1 ZmZlcihib29sKTsKIApJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXll clByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlh UGxheWVyUHJpdmF0ZS5oCShyZXZpc2lvbiA1MzQ4NikKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvTWVkaWFQbGF5ZXJQcml2YXRlLmgJKHdvcmtpbmcgY29weSkKQEAgLTY3LDggKzY3LDYg QEAgcHVibGljOgogCiAgICAgdmlydHVhbCBmbG9hdCBzdGFydFRpbWUoKSBjb25zdCB7IHJldHVy biAwOyB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgc2V0RW5kVGltZShmbG9hdCkgPSAwOwotCiAgICAg dmlydHVhbCB2b2lkIHNldFJhdGUoZmxvYXQpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgc2V0UHJl c2VydmVzUGl0Y2goYm9vbCkgeyB9CiAKQEAgLTg1LDEwICs4Myw2IEBAIHB1YmxpYzoKICAgICB2 aXJ0dWFsIGZsb2F0IG1heFRpbWVTZWVrYWJsZSgpIGNvbnN0ID0gMDsKICAgICB2aXJ0dWFsIFBh c3NSZWZQdHI8VGltZVJhbmdlcz4gYnVmZmVyZWQoKSBjb25zdCA9IDA7CiAKLSAgICB2aXJ0dWFs IGludCBkYXRhUmF0ZSgpIGNvbnN0ID0gMDsKLQotICAgIHZpcnR1YWwgYm9vbCB0b3RhbEJ5dGVz S25vd24oKSBjb25zdCB7IHJldHVybiB0b3RhbEJ5dGVzKCkgPiAwOyB9Ci0gICAgdmlydHVhbCB1 bnNpZ25lZCB0b3RhbEJ5dGVzKCkgY29uc3QgPSAwOwogICAgIHZpcnR1YWwgdW5zaWduZWQgYnl0 ZXNMb2FkZWQoKSBjb25zdCA9IDA7CiAKICAgICB2aXJ0dWFsIHZvaWQgc2V0U2l6ZShjb25zdCBJ bnRTaXplJikgPSAwOwpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvTWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2d0ay9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCShyZXZpc2lvbiA1 MzQ4NikKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3RrL01lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTM1NywxMSArMzU3LDYgQEAgdm9pZCBN ZWRpYVBsYXllclByaXZhdGU6OnNlZWsoZmxvYXQgdGltZQogICAgIH0KIH0KIAotdm9pZCBNZWRp YVBsYXllclByaXZhdGU6OnNldEVuZFRpbWUoZmxvYXQgdGltZSkKLXsKLSAgICBub3RJbXBsZW1l bnRlZCgpOwotfQotCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZTo6c3RhcnRFbmRQb2ludFRpbWVy SWZOZWVkZWQoKQogewogICAgIG5vdEltcGxlbWVudGVkKCk7CkBAIC01MDcsMTIgKzUwMiw2IEBA IHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlOjpzZXRSYXRlKGZsb2F0IHIKICAgICAgICAgZ19vYmpl Y3Rfc2V0KG1fcGxheUJpbiwgIm11dGUiLCBtdXRlLCBOVUxMKTsKIH0KIAotaW50IE1lZGlhUGxh eWVyUHJpdmF0ZTo6ZGF0YVJhdGUoKSBjb25zdAotewotICAgIG5vdEltcGxlbWVudGVkKCk7Ci0g ICAgcmV0dXJuIDE7Ci19Ci0KIE1lZGlhUGxheWVyOjpOZXR3b3JrU3RhdGUgTWVkaWFQbGF5ZXJQ cml2YXRlOjpuZXR3b3JrU3RhdGUoKSBjb25zdAogewogICAgIHJldHVybiBtX25ldHdvcmtTdGF0 ZTsKQEAgLTU3MCwxMiArNTU5LDYgQEAgdW5zaWduZWQgTWVkaWFQbGF5ZXJQcml2YXRlOjpieXRl c0xvYWRlZAogICAgIHJldHVybiAxOyAvLyB0b3RhbEJ5dGVzKCkgKiBtYXhUaW1lIC8gZHVyOwog fQogCi1ib29sIE1lZGlhUGxheWVyUHJpdmF0ZTo6dG90YWxCeXRlc0tub3duKCkgY29uc3QKLXsK LSAgICBMT0dfVkVSQk9TRShNZWRpYSwgInRvdGFsQnl0ZXNLbm93biIpOwotICAgIHJldHVybiB0 b3RhbEJ5dGVzKCkgPiAwOwotfQotCiB1bnNpZ25lZCBNZWRpYVBsYXllclByaXZhdGU6OnRvdGFs Qnl0ZXMoKSBjb25zdAogewogICAgIExPR19WRVJCT1NFKE1lZGlhLCAidG90YWxCeXRlcyIpOwpJ bmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ndGsvTWVk aWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmgJKHJldmlzaW9uIDUzNDg2KQorKysgV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9ndGsvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyLmgJKHdvcmtp bmcgY29weSkKQEAgLTcxLDIxICs3MSwxNyBAQCBjbGFzcyBNZWRpYVBsYXllclByaXZhdGUgOiBw dWJsaWMgTWVkaWFQCiAgICAgICAgICAgICBmbG9hdCBkdXJhdGlvbigpIGNvbnN0OwogICAgICAg ICAgICAgZmxvYXQgY3VycmVudFRpbWUoKSBjb25zdDsKICAgICAgICAgICAgIHZvaWQgc2Vlayhm bG9hdCk7Ci0gICAgICAgICAgICB2b2lkIHNldEVuZFRpbWUoZmxvYXQpOwogCiAgICAgICAgICAg ICB2b2lkIHNldFJhdGUoZmxvYXQpOwogICAgICAgICAgICAgdm9pZCBzZXRWb2x1bWUoZmxvYXQp OwogICAgICAgICAgICAgdm9pZCB2b2x1bWVDaGFuZ2VkKCk7CiAKLSAgICAgICAgICAgIGludCBk YXRhUmF0ZSgpIGNvbnN0OwotCiAgICAgICAgICAgICBNZWRpYVBsYXllcjo6TmV0d29ya1N0YXRl IG5ldHdvcmtTdGF0ZSgpIGNvbnN0OwogICAgICAgICAgICAgTWVkaWFQbGF5ZXI6OlJlYWR5U3Rh dGUgcmVhZHlTdGF0ZSgpIGNvbnN0OwogCiAgICAgICAgICAgICBQYXNzUmVmUHRyPFRpbWVSYW5n ZXM+IGJ1ZmZlcmVkKCkgY29uc3Q7CiAgICAgICAgICAgICBmbG9hdCBtYXhUaW1lU2Vla2FibGUo KSBjb25zdDsKICAgICAgICAgICAgIHVuc2lnbmVkIGJ5dGVzTG9hZGVkKCkgY29uc3Q7Ci0gICAg ICAgICAgICBib29sIHRvdGFsQnl0ZXNLbm93bigpIGNvbnN0OwogICAgICAgICAgICAgdW5zaWdu ZWQgdG90YWxCeXRlcygpIGNvbnN0OwogCiAgICAgICAgICAgICB2b2lkIHNldFZpc2libGUoYm9v bCk7CkluZGV4OiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL21hYy9NZWRpYVBsYXllclByaXZh dGVRVEtpdC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL01l ZGlhUGxheWVyUHJpdmF0ZVFUS2l0LmgJKHJldmlzaW9uIDUzNDg2KQorKysgV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9tYWMvTWVkaWFQbGF5ZXJQcml2YXRlUVRLaXQuaAkod29ya2luZyBjb3B5 KQpAQCAtMTA0LDE3ICsxMDQsMTIgQEAgcHJpdmF0ZToKICAgICBib29sIGhhc0Nsb3NlZENhcHRp b25zKCkgY29uc3Q7CiAgICAgdm9pZCBzZXRDbG9zZWRDYXB0aW9uc1Zpc2libGUoYm9vbCk7CiAK LSAgICB2b2lkIHNldEVuZFRpbWUoZmxvYXQgdGltZSk7Ci0KLSAgICBpbnQgZGF0YVJhdGUoKSBj b25zdDsKLSAgICAKICAgICBNZWRpYVBsYXllcjo6TmV0d29ya1N0YXRlIG5ldHdvcmtTdGF0ZSgp IGNvbnN0IHsgcmV0dXJuIG1fbmV0d29ya1N0YXRlOyB9CiAgICAgTWVkaWFQbGF5ZXI6OlJlYWR5 U3RhdGUgcmVhZHlTdGF0ZSgpIGNvbnN0IHsgcmV0dXJuIG1fcmVhZHlTdGF0ZTsgfQogICAgIAog ICAgIFBhc3NSZWZQdHI8VGltZVJhbmdlcz4gYnVmZmVyZWQoKSBjb25zdDsKICAgICBmbG9hdCBt YXhUaW1lU2Vla2FibGUoKSBjb25zdDsKICAgICB1bnNpZ25lZCBieXRlc0xvYWRlZCgpIGNvbnN0 OwotICAgIGJvb2wgdG90YWxCeXRlc0tub3duKCkgY29uc3Q7CiAgICAgdW5zaWduZWQgdG90YWxC eXRlcygpIGNvbnN0OwogICAgIAogICAgIHZvaWQgc2V0VmlzaWJsZShib29sKTsKSW5kZXg6IFdl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL01lZGlhUGxheWVyUHJpdmF0ZVFUS2l0Lm1tCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL01lZGlhUGxheWVyUHJp dmF0ZVFUS2l0Lm1tCShyZXZpc2lvbiA1MzQ4NikKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvbWFjL01lZGlhUGxheWVyUHJpdmF0ZVFUS2l0Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC02ODks MTAgKzY4OSw2IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlOjpzZWVrVGltZXJGaXJlZCgKICAg ICB9CiB9CiAKLXZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlOjpzZXRFbmRUaW1lKGZsb2F0KQotewot fQotCiBib29sIE1lZGlhUGxheWVyUHJpdmF0ZTo6cGF1c2VkKCkgY29uc3QKIHsKICAgICBpZiAo IW1ldGFEYXRhQXZhaWxhYmxlKCkpCkBAIC03OTgsMTMgKzc5NCw2IEBAIHZvaWQgTWVkaWFQbGF5 ZXJQcml2YXRlOjpzZXRQcmVzZXJ2ZXNQaXQKICAgICBjcmVhdGVRVE1vdmllKFttb3ZpZUF0dHJp YnV0ZXMgdmFsdWVGb3JLZXk6UVRNb3ZpZVVSTEF0dHJpYnV0ZV0sIG1vdmllQXR0cmlidXRlcyk7 CiB9CiAKLWludCBNZWRpYVBsYXllclByaXZhdGU6OmRhdGFSYXRlKCkgY29uc3QKLXsKLSAgICBp ZiAoIW1ldGFEYXRhQXZhaWxhYmxlKCkpCi0gICAgICAgIHJldHVybiAwOwotICAgIHJldHVybiB3 a1FUTW92aWVEYXRhUmF0ZShtX3F0TW92aWUuZ2V0KCkpOyAKLX0KLQogUGFzc1JlZlB0cjxUaW1l UmFuZ2VzPiBNZWRpYVBsYXllclByaXZhdGU6OmJ1ZmZlcmVkKCkgY29uc3QKIHsKICAgICBSZWZQ dHI8VGltZVJhbmdlcz4gdGltZVJhbmdlcyA9IFRpbWVSYW5nZXM6OmNyZWF0ZSgpOwpAQCAtODQx LDExICs4MzAsNiBAQCB1bnNpZ25lZCBNZWRpYVBsYXllclByaXZhdGU6OmJ5dGVzTG9hZGVkCiAg ICAgcmV0dXJuIHRvdGFsQnl0ZXMoKSAqIG1heFRpbWVMb2FkZWQoKSAvIGR1cjsKIH0KIAotYm9v bCBNZWRpYVBsYXllclByaXZhdGU6OnRvdGFsQnl0ZXNLbm93bigpIGNvbnN0Ci17Ci0gICAgcmV0 dXJuIHRvdGFsQnl0ZXMoKSA+IDA7Ci19Ci0KIHVuc2lnbmVkIE1lZGlhUGxheWVyUHJpdmF0ZTo6 dG90YWxCeXRlcygpIGNvbnN0CiB7CiAgICAgaWYgKCFtZXRhRGF0YUF2YWlsYWJsZSgpKQpJbmRl eDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXllclByaXZhdGVQaG9ub24u Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5 ZXJQcml2YXRlUGhvbm9uLmNwcAkocmV2aXNpb24gNTM0ODYpCisrKyBXZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVBob25vbi5jcHAJKHdvcmtpbmcgY29weSkK QEAgLTI1OSwxMSArMjU5LDYgQEAgZmxvYXQgTWVkaWFQbGF5ZXJQcml2YXRlOjpjdXJyZW50VGlt ZSgpIAogICAgIHJldHVybiBjdXJyZW50VGltZTsKIH0KIAotdm9pZCBNZWRpYVBsYXllclByaXZh dGU6OnNldEVuZFRpbWUoZmxvYXQpCi17Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKLX0KLQogUGFz c1JlZlB0cjxUaW1lUmFuZ2VzPiBNZWRpYVBsYXllclByaXZhdGU6OmJ1ZmZlcmVkKCkgY29uc3QK IHsKICAgICBub3RJbXBsZW1lbnRlZCgpOwpAQCAtMjgyLDEyICsyNzcsNiBAQCB1bnNpZ25lZCBN ZWRpYVBsYXllclByaXZhdGU6OmJ5dGVzTG9hZGVkCiAgICAgcmV0dXJuIDA7CiB9CiAKLWJvb2wg TWVkaWFQbGF5ZXJQcml2YXRlOjp0b3RhbEJ5dGVzS25vd24oKSBjb25zdAotewotICAgIC8vbm90 SW1wbGVtZW50ZWQoKTsKLSAgICByZXR1cm4gZmFsc2U7Ci19Ci0KIHVuc2lnbmVkIE1lZGlhUGxh eWVyUHJpdmF0ZTo6dG90YWxCeXRlcygpIGNvbnN0CiB7CiAgICAgLy9ub3RJbXBsZW1lbnRlZCgp OwpAQCAtMzExLDE0ICszMDAsNiBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZTo6c2V0TXV0ZWQo Ym9vbCBtCiAgICAgbV9hdWRpb091dHB1dC0+c2V0TXV0ZWQobXV0ZWQpOwogfQogCi0KLWludCBN ZWRpYVBsYXllclByaXZhdGU6OmRhdGFSYXRlKCkgY29uc3QKLXsKLSAgICAvLyBUaGlzIGlzIG5v dCB1c2VkIGF0IHRoZSBtb21lbnQKLSAgICByZXR1cm4gMDsKLX0KLQotCiBNZWRpYVBsYXllcjo6 TmV0d29ya1N0YXRlIE1lZGlhUGxheWVyUHJpdmF0ZTo6bmV0d29ya1N0YXRlKCkgY29uc3QKIHsK ICAgICBjb25zdCBRTWV0YU9iamVjdCogbWV0YU9iaiA9IHRoaXMtPm1ldGFPYmplY3QoKTsKSW5k ZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvTWVkaWFQbGF5ZXJQcml2YXRlUGhvbm9u LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9NZWRpYVBsYXll clByaXZhdGVQaG9ub24uaAkocmV2aXNpb24gNTM0ODYpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL3F0L01lZGlhUGxheWVyUHJpdmF0ZVBob25vbi5oCSh3b3JraW5nIGNvcHkpCkBAIC05 NCwyMSArOTQsMTcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogICAgICAgICBmbG9hdCBkdXJhdGlv bigpIGNvbnN0OwogICAgICAgICBmbG9hdCBjdXJyZW50VGltZSgpIGNvbnN0OwogICAgICAgICB2 b2lkIHNlZWsoZmxvYXQpOwotICAgICAgICB2b2lkIHNldEVuZFRpbWUoZmxvYXQpOwogCiAgICAg ICAgIHZvaWQgc2V0UmF0ZShmbG9hdCk7CiAgICAgICAgIHZvaWQgc2V0Vm9sdW1lKGZsb2F0KTsK ICAgICAgICAgdm9pZCBzZXRNdXRlZChib29sKTsKIAotICAgICAgICBpbnQgZGF0YVJhdGUoKSBj b25zdDsKLQogICAgICAgICBNZWRpYVBsYXllcjo6TmV0d29ya1N0YXRlIG5ldHdvcmtTdGF0ZSgp IGNvbnN0OwogICAgICAgICBNZWRpYVBsYXllcjo6UmVhZHlTdGF0ZSByZWFkeVN0YXRlKCkgY29u c3Q7CiAKICAgICAgICAgUGFzc1JlZlB0cjxUaW1lUmFuZ2VzPiBidWZmZXJlZCgpIGNvbnN0Owog ICAgICAgICBmbG9hdCBtYXhUaW1lU2Vla2FibGUoKSBjb25zdDsKICAgICAgICAgdW5zaWduZWQg Ynl0ZXNMb2FkZWQoKSBjb25zdDsKLSAgICAgICAgYm9vbCB0b3RhbEJ5dGVzS25vd24oKSBjb25z dDsKICAgICAgICAgdW5zaWduZWQgdG90YWxCeXRlcygpIGNvbnN0OwogCiAgICAgICAgIHZvaWQg c2V0VmlzaWJsZShib29sKTsKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL01l ZGlhUGxheWVyUHJpdmF0ZVF1aWNrVGltZVdpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy93aW4vTWVkaWFQbGF5ZXJQcml2YXRlUXVpY2tUaW1lV2luLmNwcAko cmV2aXNpb24gNTM0ODYpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9NZWRpYVBs YXllclByaXZhdGVRdWlja1RpbWVXaW4uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02Nyw3ICs2Nyw2 IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlOjpyZWdpc3Rlck1lZGlhRW4KIE1lZGlhUGxheWVy UHJpdmF0ZTo6TWVkaWFQbGF5ZXJQcml2YXRlKE1lZGlhUGxheWVyKiBwbGF5ZXIpCiAgICAgOiBt X3BsYXllcihwbGF5ZXIpCiAgICAgLCBtX3NlZWtUbygtMSkKLSAgICAsIG1fZW5kVGltZShudW1l cmljX2xpbWl0czxmbG9hdD46OmluZmluaXR5KCkpCiAgICAgLCBtX3NlZWtUaW1lcih0aGlzLCAm TWVkaWFQbGF5ZXJQcml2YXRlOjpzZWVrVGltZXJGaXJlZCkKICAgICAsIG1fbmV0d29ya1N0YXRl KE1lZGlhUGxheWVyOjpFbXB0eSkKICAgICAsIG1fcmVhZHlTdGF0ZShNZWRpYVBsYXllcjo6SGF2 ZU5vdGhpbmcpCkBAIC0yMDYsNyArMjA1LDcgQEAgZmxvYXQgTWVkaWFQbGF5ZXJQcml2YXRlOjpj dXJyZW50VGltZSgpIAogewogICAgIGlmICghbV9xdE1vdmllKQogICAgICAgICByZXR1cm4gMDsK LSAgICByZXR1cm4gbWluKG1fcXRNb3ZpZS0+Y3VycmVudFRpbWUoKSwgbV9lbmRUaW1lKTsKKyAg ICByZXR1cm4gbV9xdE1vdmllLT5jdXJyZW50VGltZSgpOwogfQogCiB2b2lkIE1lZGlhUGxheWVy UHJpdmF0ZTo6c2VlayhmbG9hdCB0aW1lKQpAQCAtMjM0LDcgKzIzMyw3IEBAIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlOjpkb1NlZWsoKSAKICAgICBtX3F0TW92aWUtPnNldEN1cnJlbnRUaW1lKG1f c2Vla1RvKTsKICAgICBmbG9hdCB0aW1lQWZ0ZXJTZWVrID0gY3VycmVudFRpbWUoKTsKICAgICAv LyByZXN0b3JlIHBsYXliYWNrIG9ubHkgaWYgbm90IGF0IGVuZCwgb3RoZXdpc2UgUVRNb3ZpZSB3 aWxsIGxvb3AKLSAgICBpZiAob2xkUmF0ZSAmJiB0aW1lQWZ0ZXJTZWVrIDwgZHVyYXRpb24oKSAm JiB0aW1lQWZ0ZXJTZWVrIDwgbV9lbmRUaW1lKQorICAgIGlmIChvbGRSYXRlICYmIHRpbWVBZnRl clNlZWsgPCBkdXJhdGlvbigpKQogICAgICAgICBtX3F0TW92aWUtPnNldFJhdGUob2xkUmF0ZSk7 CiAgICAgY2FuY2VsU2VlaygpOwogfQpAQCAtMjY2LDExICsyNjUsNiBAQCB2b2lkIE1lZGlhUGxh eWVyUHJpdmF0ZTo6c2Vla1RpbWVyRmlyZWQoCiAgICAgfQogfQogCi12b2lkIE1lZGlhUGxheWVy UHJpdmF0ZTo6c2V0RW5kVGltZShmbG9hdCB0aW1lKQotewotICAgIG1fZW5kVGltZSA9IHRpbWU7 Ci19Ci0KIGJvb2wgTWVkaWFQbGF5ZXJQcml2YXRlOjpwYXVzZWQoKSBjb25zdAogewogICAgIGlm ICghbV9xdE1vdmllKQpAQCAtMzQ0LDEyICszMzgsNiBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0 ZTo6c2V0Q2xvc2VkQ2FwdGlvCiAgICAgbV9xdE1vdmllLT5zZXRDbG9zZWRDYXB0aW9uc1Zpc2li bGUodmlzaWJsZSk7CiB9CiAKLWludCBNZWRpYVBsYXllclByaXZhdGU6OmRhdGFSYXRlKCkgY29u c3QKLXsKLSAgICAvLyBUaGlzIGlzIG5vdCB1c2VkIGF0IHRoZSBtb21lbnQKLSAgICByZXR1cm4g MDsKLX0KLQogUGFzc1JlZlB0cjxUaW1lUmFuZ2VzPiBNZWRpYVBsYXllclByaXZhdGU6OmJ1ZmZl cmVkKCkgY29uc3QKIHsKICAgICBSZWZQdHI8VGltZVJhbmdlcz4gdGltZVJhbmdlcyA9IFRpbWVS YW5nZXM6OmNyZWF0ZSgpOwpAQCAtMzg0LDExICszNzIsNiBAQCB1bnNpZ25lZCBNZWRpYVBsYXll clByaXZhdGU6OmJ5dGVzTG9hZGVkCiAgICAgcmV0dXJuIHRvdGFsQnl0ZXMoKSAqIG1heFRpbWUg LyBkdXI7CiB9CiAKLWJvb2wgTWVkaWFQbGF5ZXJQcml2YXRlOjp0b3RhbEJ5dGVzS25vd24oKSBj b25zdAotewotICAgIHJldHVybiB0b3RhbEJ5dGVzKCkgPiAwOwotfQotCiB1bnNpZ25lZCBNZWRp YVBsYXllclByaXZhdGU6OnRvdGFsQnl0ZXMoKSBjb25zdAogewogICAgIGlmICghbV9xdE1vdmll KQpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vTWVkaWFQbGF5ZXJQcml2YXRl UXVpY2tUaW1lV2luLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93 aW4vTWVkaWFQbGF5ZXJQcml2YXRlUXVpY2tUaW1lV2luLmgJKHJldmlzaW9uIDUzNDg2KQorKysg V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vTWVkaWFQbGF5ZXJQcml2YXRlUXVpY2tUaW1l V2luLmgJKHdvcmtpbmcgY29weSkKQEAgLTcyLDIxICs3MiwxNyBAQCBwcml2YXRlOgogICAgIGZs b2F0IGR1cmF0aW9uKCkgY29uc3Q7CiAgICAgZmxvYXQgY3VycmVudFRpbWUoKSBjb25zdDsKICAg ICB2b2lkIHNlZWsoZmxvYXQgdGltZSk7Ci0gICAgdm9pZCBzZXRFbmRUaW1lKGZsb2F0KTsKICAg ICAKICAgICB2b2lkIHNldFJhdGUoZmxvYXQpOwogICAgIHZvaWQgc2V0Vm9sdW1lKGZsb2F0KTsK ICAgICB2b2lkIHNldFByZXNlcnZlc1BpdGNoKGJvb2wpOwogICAgIAotICAgIGludCBkYXRhUmF0 ZSgpIGNvbnN0OwotICAgIAogICAgIE1lZGlhUGxheWVyOjpOZXR3b3JrU3RhdGUgbmV0d29ya1N0 YXRlKCkgY29uc3QgeyByZXR1cm4gbV9uZXR3b3JrU3RhdGU7IH0KICAgICBNZWRpYVBsYXllcjo6 UmVhZHlTdGF0ZSByZWFkeVN0YXRlKCkgY29uc3QgeyByZXR1cm4gbV9yZWFkeVN0YXRlOyB9CiAg ICAgCiAgICAgUGFzc1JlZlB0cjxUaW1lUmFuZ2VzPiBidWZmZXJlZCgpIGNvbnN0OwogICAgIGZs b2F0IG1heFRpbWVTZWVrYWJsZSgpIGNvbnN0OwogICAgIHVuc2lnbmVkIGJ5dGVzTG9hZGVkKCkg Y29uc3Q7Ci0gICAgYm9vbCB0b3RhbEJ5dGVzS25vd24oKSBjb25zdDsKICAgICB1bnNpZ25lZCB0 b3RhbEJ5dGVzKCkgY29uc3Q7CiAgICAgCiAgICAgdm9pZCBzZXRWaXNpYmxlKGJvb2wpOwpAQCAt MTIzLDcgKzExOSw2IEBAIHByaXZhdGU6CiAgICAgTWVkaWFQbGF5ZXIqIG1fcGxheWVyOwogICAg IE93blB0cjxRVE1vdmllV2luPiBtX3F0TW92aWU7CiAgICAgZmxvYXQgbV9zZWVrVG87Ci0gICAg ZmxvYXQgbV9lbmRUaW1lOwogICAgIFRpbWVyPE1lZGlhUGxheWVyUHJpdmF0ZT4gbV9zZWVrVGlt ZXI7CiAgICAgTWVkaWFQbGF5ZXI6Ok5ldHdvcmtTdGF0ZSBtX25ldHdvcmtTdGF0ZTsKICAgICBN ZWRpYVBsYXllcjo6UmVhZHlTdGF0ZSBtX3JlYWR5U3RhdGU7CkluZGV4OiBXZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL3dpbmNlL01lZGlhUGxheWVyUHJpdmF0ZVdpbmNlLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW5jZS9NZWRpYVBsYXllclByaXZhdGVXaW5j ZS5oCShyZXZpc2lvbiA1MzQ4NikKKysrIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvd2luY2Uv TWVkaWFQbGF5ZXJQcml2YXRlV2luY2UuaAkod29ya2luZyBjb3B5KQpAQCAtNjEsMjAgKzYxLDE2 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgZmxvYXQgZHVyYXRpb24oKSBjb25zdDsK ICAgICAgICAgZmxvYXQgY3VycmVudFRpbWUoKSBjb25zdDsKICAgICAgICAgdm9pZCBzZWVrKGZs b2F0IHRpbWUpOwotICAgICAgICB2b2lkIHNldEVuZFRpbWUoZmxvYXQpOwogCiAgICAgICAgIHZv aWQgc2V0UmF0ZShmbG9hdCk7CiAgICAgICAgIHZvaWQgc2V0Vm9sdW1lKGZsb2F0KTsKIAotICAg ICAgICBpbnQgZGF0YVJhdGUoKSBjb25zdDsKLQogICAgICAgICBNZWRpYVBsYXllcjo6TmV0d29y a1N0YXRlIG5ldHdvcmtTdGF0ZSgpIGNvbnN0IHsgcmV0dXJuIG1fbmV0d29ya1N0YXRlOyB9CiAg ICAgICAgIE1lZGlhUGxheWVyOjpSZWFkeVN0YXRlIHJlYWR5U3RhdGUoKSBjb25zdCB7IHJldHVy biBtX3JlYWR5U3RhdGU7IH0KIAogICAgICAgICBQYXNzUmVmUHRyPFRpbWVSYW5nZXM+IGJ1ZmZl cmVkKCkgY29uc3Q7CiAgICAgICAgIGZsb2F0IG1heFRpbWVTZWVrYWJsZSgpIGNvbnN0OwogICAg ICAgICB1bnNpZ25lZCBieXRlc0xvYWRlZCgpIGNvbnN0OwotICAgICAgICBib29sIHRvdGFsQnl0 ZXNLbm93bigpIGNvbnN0OwogICAgICAgICB1bnNpZ25lZCB0b3RhbEJ5dGVzKCkgY29uc3Q7CiAK ICAgICAgICAgdm9pZCBzZXRWaXNpYmxlKGJvb2wpOwo=