55848 2011-03-06 12:54:10 -0800 QuickTime based media engines should respect private browsing mode 2011-03-06 20:22:08 -0800 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 eric.carlson eric.carlson oldest_to_newest 363116 0 eric.carlson 2011-03-06 12:54:10 -0800 QuickTime based media engines download files for <audio> and <video> directly, so they need enough information to manage media data appropriately for WebKit's privacy mode. 363117 1 eric.carlson 2011-03-06 12:54:33 -0800 <rdar://problem/9090709> 363119 2 84896 eric.carlson 2011-03-06 13:19:38 -0800 Created attachment 84896 Proposed patch 363136 3 84896 koivisto 2011-03-06 14:28:58 -0800 Comment on attachment 84896 Proposed patch On this level, some more specific name than "private browsing" would be better. MediaPlayer::setAllowsCaching or similar. Looks like the term was used already there though. 363147 4 eric.carlson 2011-03-06 15:49:59 -0800 (In reply to comment #3) > (From update of attachment 84896 [details]) > On this level, some more specific name than "private browsing" would be better. MediaPlayer::setAllowsCaching or similar. Looks like the term was used already there though. The is intentionally vague because the meaning varies from port to port, and can change more than just caching (eg. cookies). 363154 5 eric.carlson 2011-03-06 17:02:16 -0800 http://trac.webkit.org/changeset/80442 84896 2011-03-06 13:19:38 -0800 2011-03-06 20:22:08 -0800 Proposed patch patch_4.txt text/plain 13435 eric.carlson SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDgwNDM2KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDYgQEAKKzIwMTEtMDMtMDYgIEVyaWMgQ2Fy bHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgUXVpY2tUaW1lIGJhc2VkIG1lZGlhIGVuZ2luZXMgc2hv dWxkIHJlc3BlY3QgcHJpdmF0ZSBicm93c2luZyBtb2RlCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NTg0OAorCisgICAgICAgIE5vIG5ldyB0ZXN0cywg aXQgaXMgb25seSBwb3NzaWJsZSB0byB0ZXN0IHRoaXMgYnkgbWFudWFsbHkgZGVsZXRpbmcgYW5k IG1vbml0b3JpbmcgdGhlCisgICAgICAgIHRoZSBRdWlja3RpbWUgY2FjaGVzLgorCisgICAgICAg ICogaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxNZWRp YUVsZW1lbnQ6OnByaXZhdGVCcm93c2luZ1N0YXRlRGlkQ2hhbmdlKTogQWRkIGxvZ2dpbmcuCisK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpNZWRpYVBsYXllcjo6TWVkaWFQbGF5ZXIpOiBJbml0aWFsaXplIG1fcHJpdmF0ZUJy b3dzaW5nLgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXI6OmxvYWRXaXRoTmV4dE1lZGlh RW5naW5lKTogU2V0IHByaXZhY3kgbW9kZSBvbiBuZXcgbWVkaWEgZW5naW5lLgorICAgICAgICAo V2ViQ29yZTo6TWVkaWFQbGF5ZXI6OnNldFByaXZhdGVCcm93c2luZ01vZGUpOiBTdGFzaCBzZXR0 aW5nIGluIG1fcHJpdmF0ZUJyb3dzaW5nLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL01l ZGlhUGxheWVyLmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXJQcml2 YXRlLmg6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVBsYXllclByaXZhdGVJbnRlcmZhY2U6OnNl dFByaXZhdGVCcm93c2luZ01vZGUpOgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvbWFj L01lZGlhUGxheWVyUHJpdmF0ZVFUS2l0Lmg6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv bWFjL01lZGlhUGxheWVyUHJpdmF0ZVFUS2l0Lm1tOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQ bGF5ZXJQcml2YXRlUVRLaXQ6Ok1lZGlhUGxheWVyUHJpdmF0ZVFUS2l0KTogSW5pdGlhbGl6ZSBt X3ByaXZhdGVCcm93c2luZy4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZVFU S2l0OjpjcmVhdGVRVE1vdmllKTogUGFzcyBwcml2YXRlIGJyb3dzaW5nIGF0dHJpYnV0ZSB3aGVu CisgICAgICAgICAgICBjcmVhdGluZyBuZXcgbW92aWUuCisgICAgICAgIChXZWJDb3JlOjpNZWRp YVBsYXllclByaXZhdGVRVEtpdDo6c2V0UHJpdmF0ZUJyb3dzaW5nTW9kZSk6IE5ldywgc3RvcmUg cHJpdmFjeSBzZXR0aW5nIGluCisgICAgICAgICAgICBtX3ByaXZhdGVCcm93c2luZyBhbmQgc2V0 IG1vdmllIGF0dHJpYnV0ZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3dpbi9NZWRp YVBsYXllclByaXZhdGVRdWlja1RpbWVWaXN1YWxDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNv cmU6Ok1lZGlhUGxheWVyUHJpdmF0ZVF1aWNrVGltZVZpc3VhbENvbnRleHQ6Ok1lZGlhUGxheWVy UHJpdmF0ZVF1aWNrVGltZVZpc3VhbENvbnRleHQpOgorICAgICAgICAgICAgSW5pdGlhbGl6ZSBt X3ByaXZhdGVCcm93c2luZy4KKyAgICAgICAgKFdlYkNvcmU6Ok1lZGlhUGxheWVyUHJpdmF0ZVF1 aWNrVGltZVZpc3VhbENvbnRleHQ6OnNldFByaXZhdGVCcm93c2luZ01vZGUpOiBOZXcsIHN0b3Jl IAorICAgICAgICAgICAgcHJpdmFjeSBzZXR0aW5nIGluIG1fcHJpdmF0ZUJyb3dzaW5nIGFuZCBj YWxsIFFUTW92aWUuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvd2luL01lZGlhUGxheWVy UHJpdmF0ZVF1aWNrVGltZVZpc3VhbENvbnRleHQuaDoKKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL3dpbi9RVE1vdmllLmNwcDoKKyAgICAgICAgKFFUTW92aWVQcml2YXRlOjpRVE1vdmll UHJpdmF0ZSk6IEluaXRpYWxpemUgbV9wcml2YXRlQnJvd3NpbmcuCisgICAgICAgIChRVE1vdmll Ojpsb2FkKTpQYXNzIHByaXZhdGUgYnJvd3NpbmcgcHJvcGVydHkgd2hlbiBjcmVhdGluZyBuZXcg bW92aWUuCisgICAgICAgIChRVE1vdmllOjpzZXRQcml2YXRlQnJvd3NpbmdNb2RlKTogIE5ldywg c3RvcmUgcHJpdmFjeSBzZXR0aW5nIGluIG1fcHJpdmF0ZUJyb3dzaW5nIGFuZCAKKyAgICAgICAg ICAgIHNldCBtb3ZpZSBwcm9wZXJ0eS4KKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy93aW4v UVRNb3ZpZS5oOgorCiAyMDExLTAzLTA2ICBKZXNzaWUgQmVybGluICA8amJlcmxpbkBhcHBsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KSW5kZXg6IFNvdXJjZS9XZWJD b3JlL2h0bWwvSFRNTE1lZGlhRWxlbWVudC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MTWVkaWFFbGVtZW50LmNwcAkocmV2aXNpb24gODAzNzApCisrKyBTb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxNZWRpYUVsZW1lbnQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNTY5 LDYgKzI1NjksNyBAQCB2b2lkIEhUTUxNZWRpYUVsZW1lbnQ6OnByaXZhdGVCcm93c2luZ1N0CiAK ICAgICBTZXR0aW5ncyogc2V0dGluZ3MgPSBkb2N1bWVudCgpLT5zZXR0aW5ncygpOwogICAgIGJv b2wgcHJpdmF0ZU1vZGUgPSAhc2V0dGluZ3MgfHwgc2V0dGluZ3MtPnByaXZhdGVCcm93c2luZ0Vu YWJsZWQoKTsKKyAgICBMT0coTWVkaWEsICJIVE1MTWVkaWFFbGVtZW50Ojpwcml2YXRlQnJvd3Np bmdTdGF0ZURpZENoYW5nZSglcykiLCBib29sU3RyaW5nKHByaXZhdGVNb2RlKSk7CiAgICAgbV9w bGF5ZXItPnNldFByaXZhdGVCcm93c2luZ01vZGUocHJpdmF0ZU1vZGUpOwogfQogCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXllci5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvTWVkaWFQbGF5ZXIuY3BwCShy ZXZpc2lvbiA4MDM3MCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlh UGxheWVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjc4LDYgKzI3OCw3IEBAIE1lZGlhUGxheWVy OjpNZWRpYVBsYXllcihNZWRpYVBsYXllckNsaWUKICAgICAsIG1fdm9sdW1lKDEuMGYpCiAgICAg LCBtX211dGVkKGZhbHNlKQogICAgICwgbV9wcmVzZXJ2ZXNQaXRjaCh0cnVlKQorICAgICwgbV9w cml2YXRlQnJvd3NpbmcoZmFsc2UpCiAjaWYgRU5BQkxFKFBMVUdJTl9QUk9YWV9GT1JfVklERU8p CiAgICAgLCBtX3BsYXllclByb3h5KDApCiAjZW5kaWYKQEAgLTM0OCw2ICszNDksNyBAQCB2b2lk IE1lZGlhUGxheWVyOjpsb2FkV2l0aE5leHRNZWRpYUVuZ2luCiAjaWYgRU5BQkxFKFBMVUdJTl9Q Uk9YWV9GT1JfVklERU8pCiAgICAgICAgIG1fcHJpdmF0ZS0+c2V0TWVkaWFQbGF5ZXJQcm94eSht X3BsYXllclByb3h5KTsKICNlbmRpZgorICAgICAgICBtX3ByaXZhdGUtPnNldFByaXZhdGVCcm93 c2luZ01vZGUobV9wcml2YXRlQnJvd3NpbmcpOwogICAgICAgICBtX3ByaXZhdGUtPnNldFByZWxv YWQobV9wcmVsb2FkKTsKICAgICAgICAgbV9wcml2YXRlLT5zZXRQcmVzZXJ2ZXNQaXRjaChwcmVz ZXJ2ZXNQaXRjaCgpKTsKICAgICB9CkBAIC03MzUsNyArNzM3LDggQEAgdm9pZCBNZWRpYVBsYXll cjo6Y2xlYXJNZWRpYUNhY2hlRm9yU2l0ZQogCiB2b2lkIE1lZGlhUGxheWVyOjpzZXRQcml2YXRl QnJvd3NpbmdNb2RlKGJvb2wgcHJpdmF0ZUJyb3dzaW5nTW9kZSkKIHsKLSAgICBtX3ByaXZhdGUt PnNldFByaXZhdGVCcm93c2luZ01vZGUocHJpdmF0ZUJyb3dzaW5nTW9kZSk7CisgICAgbV9wcml2 YXRlQnJvd3NpbmcgPSBwcml2YXRlQnJvd3NpbmdNb2RlOworICAgIG1fcHJpdmF0ZS0+c2V0UHJp dmF0ZUJyb3dzaW5nTW9kZShtX3ByaXZhdGVCcm93c2luZyk7CiB9CiAKIC8vIENsaWVudCBjYWxs YmFja3MuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9NZWRpYVBsYXll ci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlh UGxheWVyLmgJKHJldmlzaW9uIDgwMzcwKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvTWVkaWFQbGF5ZXIuaAkod29ya2luZyBjb3B5KQpAQCAtMzE2LDYgKzMxNiw3IEBAIHBy aXZhdGU6CiAgICAgZmxvYXQgbV92b2x1bWU7CiAgICAgYm9vbCBtX211dGVkOwogICAgIGJvb2wg bV9wcmVzZXJ2ZXNQaXRjaDsKKyAgICBib29sIG1fcHJpdmF0ZUJyb3dzaW5nOwogI2lmIEVOQUJM RShQTFVHSU5fUFJPWFlfRk9SX1ZJREVPKQogICAgIFdlYk1lZGlhUGxheWVyUHJveHkqIG1fcGxh eWVyUHJveHk7ICAgIC8vIG5vdCBvd25lZCBvciB1c2VkLCBwYXNzZWQgdG8gbV9wcml2YXRlCiAj ZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVy UHJpdmF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L01lZGlhUGxheWVyUHJpdmF0ZS5oCShyZXZpc2lvbiA4MDM3MCkKKysrIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL01lZGlhUGxheWVyUHJpdmF0ZS5oCSh3b3JraW5nIGNvcHkpCkBA IC0xNDUsNyArMTQ1LDcgQEAgcHVibGljOgogICAgIHZvaWQgY2xlYXJNZWRpYUNhY2hlKCkgeyB9 CiAgICAgdm9pZCBjbGVhck1lZGlhQ2FjaGVGb3JTaXRlKGNvbnN0IFN0cmluZyYpIHsgfQogCi0g ICAgdm9pZCBzZXRQcml2YXRlQnJvd3NpbmdNb2RlKGJvb2wpIHsgfQorICAgIHZpcnR1YWwgdm9p ZCBzZXRQcml2YXRlQnJvd3NpbmdNb2RlKGJvb2wpIHsgfQogfTsKIAogfQpJbmRleDogU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL01lZGlhUGxheWVyUHJpdmF0ZVFUS2l0LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvbWFjL01lZGlh UGxheWVyUHJpdmF0ZVFUS2l0LmgJKHJldmlzaW9uIDgwMzcwKQorKysgU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvbWFjL01lZGlhUGxheWVyUHJpdmF0ZVFUS2l0LmgJKHdvcmtpbmcg Y29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDA3LCAyMDA4LCAy MDA5LCAyMDEwIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAo QykgMjAwNywgMjAwOCwgMjAwOSwgMjAxMCwgMjAxMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFy eSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQg cHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKQEAgLTE3Nyw2ICsxNzcsOCBA QCBwcml2YXRlOgogCiAgICAgdmlydHVhbCBkb3VibGUgbWF4aW11bUR1cmF0aW9uVG9DYWNoZU1l ZGlhVGltZSgpIGNvbnN0IHsgcmV0dXJuIDU7IH0KIAorICAgIHZpcnR1YWwgdm9pZCBzZXRQcml2 YXRlQnJvd3NpbmdNb2RlKGJvb2wpOworCiAgICAgTWVkaWFQbGF5ZXIqIG1fcGxheWVyOwogICAg IFJldGFpblB0cjxRVE1vdmllPiBtX3F0TW92aWU7CiAgICAgUmV0YWluUHRyPFFUTW92aWVWaWV3 PiBtX3F0TW92aWVWaWV3OwpAQCAtMjAzLDYgKzIwNSw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBt X3ZpZGVvRnJhbWVIYXNEcmF3bjsKICAgICBib29sIG1fZGVsYXlpbmdMb2FkOwogICAgIGJvb2wg bV9pc0FsbG93ZWRUb1JlbmRlcjsKKyAgICBib29sIG1fcHJpdmF0ZUJyb3dzaW5nOwogI2lmIERS QVdfRlJBTUVfUkFURQogICAgIGludCAgbV9mcmFtZUNvdW50V2hpbGVQbGF5aW5nOwogICAgIGRv dWJsZSBtX3RpbWVTdGFydGVkUGxheWluZzsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL21hYy9NZWRpYVBsYXllclByaXZhdGVRVEtpdC5tbQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9tYWMvTWVkaWFQbGF5ZXJQcml2YXRlUVRL aXQubW0JKHJldmlzaW9uIDgwMzcwKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvbWFjL01lZGlhUGxheWVyUHJpdmF0ZVFUS2l0Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUg KzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAwNywgMjAwOCwgMjAwOSwgMjAxMCBBcHBs ZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDcsIDIwMDgs IDIwMDksIDIwMTAsIDIwMTEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICoKICAq IFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGgg b3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQg dGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yMjQsNiArMjI0LDcgQEAgTWVkaWFQbGF5ZXJQ cml2YXRlUVRLaXQ6Ok1lZGlhUGxheWVyUHJpdgogICAgICwgbV9oYXNVbnN1cHBvcnRlZFRyYWNr cyhmYWxzZSkKICAgICAsIG1fdmlkZW9GcmFtZUhhc0RyYXduKGZhbHNlKQogICAgICwgbV9pc0Fs bG93ZWRUb1JlbmRlcihmYWxzZSkKKyAgICAsIG1fcHJpdmF0ZUJyb3dzaW5nKGZhbHNlKQogI2lm IERSQVdfRlJBTUVfUkFURQogICAgICwgbV9mcmFtZUNvdW50V2hpbGVQbGF5aW5nKDApCiAgICAg LCBtX3RpbWVTdGFydGVkUGxheWluZygwKQpAQCAtMjUwLDYgKzI1MSw3IEBAIHZvaWQgTWVkaWFQ bGF5ZXJQcml2YXRlUVRLaXQ6OmNyZWF0ZVFUTW8KICAgICAgICAgICAgICAgICAgICAgICAgW05T TnVtYmVyIG51bWJlcldpdGhCb29sOllFU10sIFFUU2VjdXJpdHlQb2xpY3lOb0Nyb3NzU2l0ZUF0 dHJpYnV0ZSwKICAgICAgICAgICAgICAgICAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29s Ok5PXSwgUVRNb3ZpZUFza1VucmVzb2x2ZWREYXRhUmVmc0F0dHJpYnV0ZSwKICAgICAgICAgICAg ICAgICAgICAgICAgW05TTnVtYmVyIG51bWJlcldpdGhCb29sOk5PXSwgUVRNb3ZpZUxvb3BzQXR0 cmlidXRlLAorICAgICAgICAgICAgICAgICAgICAgICBbTlNOdW1iZXIgbnVtYmVyV2l0aEJvb2w6 IW1fcHJpdmF0ZUJyb3dzaW5nXSwgQCJRVE1vdmllQWxsb3dQZXJzaXN0ZW50Q2FjaGVBdHRyaWJ1 dGUiLAogI2lmbmRlZiBCVUlMRElOR19PTl9USUdFUgogICAgICAgICAgICAgICAgICAgICAgICBR VE1vdmllQXBlcnR1cmVNb2RlQ2xlYW4sIFFUTW92aWVBcGVydHVyZU1vZGVBdHRyaWJ1dGUsCiAj ZW5kaWYKQEAgLTE1NzUsNiArMTU3NywxNSBAQCBmbG9hdCBNZWRpYVBsYXllclByaXZhdGVRVEtp dDo6bWVkaWFUaW1lCiAgICAgcmV0dXJuIHN0YXRpY19jYXN0PGZsb2F0PihxdHRpbWUudGltZVZh bHVlKSAvIHF0dGltZS50aW1lU2NhbGU7CiB9CiAKK3ZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlUVRL aXQ6OnNldFByaXZhdGVCcm93c2luZ01vZGUoYm9vbCBwcml2YXRlQnJvd3NpbmcpCit7CisgICAg bV9wcml2YXRlQnJvd3NpbmcgPSBwcml2YXRlQnJvd3Npbmc7CisgICAgaWYgKCFtX3F0TW92aWUp CisgICAgICAgIHJldHVybjsKKyAgICBbbV9xdE1vdmllLmdldCgpIHNldEF0dHJpYnV0ZTpbTlNO dW1iZXIgbnVtYmVyV2l0aEJvb2w6IXByaXZhdGVCcm93c2luZ10gZm9yS2V5OkAiUVRNb3ZpZUFs bG93UGVyc2lzdGVudENhY2hlQXR0cmlidXRlIl07Cit9CisKKwogfSAvLyBuYW1lc3BhY2UgV2Vi Q29yZQogCiBAaW1wbGVtZW50YXRpb24gV2ViQ29yZU1vdmllT2JzZXJ2ZXIKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9NZWRpYVBsYXllclByaXZhdGVRdWlja1Rp bWVWaXN1YWxDb250ZXh0LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy93aW4vTWVkaWFQbGF5ZXJQcml2YXRlUXVpY2tUaW1lVmlzdWFsQ29udGV4dC5j cHAJKHJldmlzaW9uIDgwMzcwKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv d2luL01lZGlhUGxheWVyUHJpdmF0ZVF1aWNrVGltZVZpc3VhbENvbnRleHQuY3BwCSh3b3JraW5n IGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAwNywgMjAwOCwg MjAwOSwgMjAxMCBBcHBsZSwgSW5jLiAgQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdo dCAoQykgMjAwNywgMjAwOCwgMjAwOSwgMjAxMCwgMjAxMSBBcHBsZSwgSW5jLiAgQWxsIHJpZ2h0 cyByZXNlcnZlZC4KICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQg YmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1p dHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwpAQCAtMTc3LDYgKzE3 Nyw3IEBAIE1lZGlhUGxheWVyUHJpdmF0ZVF1aWNrVGltZVZpc3VhbENvbnRleHQKICNlbmRpZgog ICAgICwgbV92aXN1YWxDb250ZXh0Q2xpZW50KG5ldyBNZWRpYVBsYXllclByaXZhdGVRdWlja1Rp bWVWaXN1YWxDb250ZXh0OjpWaXN1YWxDb250ZXh0Q2xpZW50KHRoaXMpKQogICAgICwgbV9kZWxh eWluZ0xvYWQoZmFsc2UpCisgICAgLCBtX3ByaXZhdGVCcm93c2luZyhmYWxzZSkKICAgICAsIG1f cHJlbG9hZChNZWRpYVBsYXllcjo6QXV0bykKIHsKIH0KQEAgLTEyNDYsNiArMTI0NywxMyBAQCB2 b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVF1aWNrVGltZVZpc3VhbENvCiAgICAgc2V0VXBWaWRlb1Jl bmRlcmluZygpOwogfQogCit2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZVF1aWNrVGltZVZpc3VhbENv bnRleHQ6OnNldFByaXZhdGVCcm93c2luZ01vZGUoYm9vbCBwcml2YXRlQnJvd3NpbmcpCit7Cisg ICAgbV9wcml2YXRlQnJvd3NpbmcgPSBwcml2YXRlQnJvd3Npbmc7CisgICAgaWYgKG1fbW92aWUp CisgICAgICAgIG1fbW92aWUtPnNldFByaXZhdGVCcm93c2luZ01vZGUobV9wcml2YXRlQnJvd3Np bmcpOworfQorICAgIAogI2VuZGlmCiAKIApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3Mvd2luL01lZGlhUGxheWVyUHJpdmF0ZVF1aWNrVGltZVZpc3VhbENvbnRleHQuaAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vTWVkaWFQ bGF5ZXJQcml2YXRlUXVpY2tUaW1lVmlzdWFsQ29udGV4dC5oCShyZXZpc2lvbiA4MDM3MCkKKysr IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9NZWRpYVBsYXllclByaXZhdGVR dWlja1RpbWVWaXN1YWxDb250ZXh0LmgJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAv KgotICogQ29weXJpZ2h0IChDKSAyMDA3LCAyMDA4LCAyMDA5LCAyMDEwIEFwcGxlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAwNywgMjAwOCwgMjAwOSwgMjAx MCwgMjAxMSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmli dXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0 CiAgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93 aW5nIGNvbmRpdGlvbnMKQEAgLTE1NCw2ICsxNTQsOCBAQCBwcml2YXRlOgogICAgIHZvaWQgdmlz dWFsQ29udGV4dFRpbWVyRmlyZWQoVGltZXI8TWVkaWFQbGF5ZXJQcml2YXRlUXVpY2tUaW1lVmlz dWFsQ29udGV4dD4qKTsKICAgICB2b2lkIHJldHJpZXZlQ3VycmVudEltYWdlKCk7CiAKKyAgICB2 aXJ0dWFsIHZvaWQgc2V0UHJpdmF0ZUJyb3dzaW5nTW9kZShib29sKTsKKwogICAgIGNsYXNzIE1v dmllQ2xpZW50OwogICAgIGZyaWVuZCBjbGFzcyBNb3ZpZUNsaWVudDsKICAgICBPd25QdHI8TW92 aWVDbGllbnQ+IG1fbW92aWVDbGllbnQ7CkBAIC0xOTcsNiArMTk5LDcgQEAgcHJpdmF0ZToKICAg ICBib29sIG1fbmV3RnJhbWVBdmFpbGFibGU7CiAgICAgYm9vbCBtX2RlbGF5aW5nTG9hZDsKICAg ICBTdHJpbmcgbV9tb3ZpZVVSTDsKKyAgICBib29sIG1fcHJpdmF0ZUJyb3dzaW5nOwogICAgIE1l ZGlhUGxheWVyOjpQcmVsb2FkIG1fcHJlbG9hZDsKICNpZiBEUkFXX0ZSQU1FX1JBVEUKICAgICBk b3VibGUgbV9mcmFtZUNvdW50V2hpbGVQbGF5aW5nOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3Mvd2luL1FUTW92aWUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9RVE1vdmllLmNwcAkocmV2aXNpb24gODAzNzApCisr KyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vUVRNb3ZpZS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDA3LCAyMDA4 LCAyMDA5LCAyMDEwIEFwcGxlLCBJbmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJp Z2h0IChDKSAyMDA3LCAyMDA4LCAyMDA5LCAyMDEwLCAyMDExIEFwcGxlLCBJbmMuICBBbGwgcmln aHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFu ZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVy bWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC05Niw2ICs5 Niw3IEBAIHB1YmxpYzoKICAgICBDRlVSTFJlZiBtX2N1cnJlbnRVUkw7CiAgICAgZmxvYXQgbV90 aW1lVG9SZXN0b3JlOwogICAgIGZsb2F0IG1fcmF0ZVRvUmVzdG9yZTsKKyAgICBib29sIG1fcHJp dmF0ZUJyb3dzaW5nOwogI2lmICFBU1NFUlRfRElTQUJMRUQKICAgICBib29sIG1fc2NhbGVDYWNo ZWQ7CiAjZW5kaWYKQEAgLTEyMSw2ICsxMjIsNyBAQCBRVE1vdmllUHJpdmF0ZTo6UVRNb3ZpZVBy aXZhdGUoKQogICAgICwgbV90aW1lVG9SZXN0b3JlKC0xLjBmKQogICAgICwgbV9yYXRlVG9SZXN0 b3JlKC0xLjBmKQogICAgICwgbV9kaXNhYmxlZChmYWxzZSkKKyAgICAsIG1fcHJpdmF0ZUJyb3dz aW5nKGZhbHNlKQogI2lmICFBU1NFUlRfRElTQUJMRUQKICAgICAsIG1fc2NhbGVDYWNoZWQoZmFs c2UpCiAjZW5kaWYKQEAgLTU1MCw2ICs1NTIsMTMgQEAgdm9pZCBRVE1vdmllOjpsb2FkKENGVVJM UmVmIHVybCwgYm9vbCBwcgogICAgIG1vdmllUHJvcHNbbW92aWVQcm9wQ291bnRdLnByb3BTdGF0 dXMgPSAwOyAKICAgICBtb3ZpZVByb3BDb3VudCsrOyAKIAorICAgIG1vdmllUHJvcHNbbW92aWVQ cm9wQ291bnRdLnByb3BDbGFzcyA9IGtRVFByb3BlcnR5Q2xhc3NfTW92aWVJbnN0YW50aWF0aW9u OyAKKyAgICBtb3ZpZVByb3BzW21vdmllUHJvcENvdW50XS5wcm9wSUQgPSAncGVycyc7CisgICAg bW92aWVQcm9wc1ttb3ZpZVByb3BDb3VudF0ucHJvcFZhbHVlU2l6ZSA9IHNpemVvZihtX3ByaXZh dGUtPm1fcHJpdmF0ZUJyb3dzaW5nKTsgCisgICAgbW92aWVQcm9wc1ttb3ZpZVByb3BDb3VudF0u cHJvcFZhbHVlQWRkcmVzcyA9ICZtX3ByaXZhdGUtPm1fcHJpdmF0ZUJyb3dzaW5nOyAKKyAgICBt b3ZpZVByb3BzW21vdmllUHJvcENvdW50XS5wcm9wU3RhdHVzID0gMDsgCisgICAgbW92aWVQcm9w Q291bnQrKzsKKwogICAgIEFTU0VSVChtb3ZpZVByb3BDb3VudCA8PSBXVEZfQVJSQVlfTEVOR1RI KG1vdmllUHJvcHMpKTsKICAgICBtX3ByaXZhdGUtPm1fbG9hZEVycm9yID0gTmV3TW92aWVGcm9t UHJvcGVydGllcyhtb3ZpZVByb3BDb3VudCwgbW92aWVQcm9wcywgMCwgMCwgJm1fcHJpdmF0ZS0+ bV9tb3ZpZSk7CiAKQEAgLTg0Niw2ICs4NTUsMTIgQEAgdm9pZCBRVE1vdmllOjpyZXNldFRyYW5z Zm9ybSgpCiAgICAgbV9wcml2YXRlLT5jYWNoZU1vdmllU2NhbGUoKTsKIH0KIAordm9pZCBRVE1v dmllOjpzZXRQcml2YXRlQnJvd3NpbmdNb2RlKGJvb2wgcHJpdmF0ZUJyb3dzaW5nKQoreworICAg IG1fcHJpdmF0ZS0+bV9wcml2YXRlQnJvd3NpbmcgPSBwcml2YXRlQnJvd3Npbmc7CisgICAgaWYg KG1fcHJpdmF0ZS0+bV9tb3ZpZSkKKyAgICAgICAgUVRTZXRNb3ZpZVByb3BlcnR5KG1fcHJpdmF0 ZS0+bV9tb3ZpZSwgJ2NhY2gnLCAncGVycycsIHNpemVvZihwcml2YXRlQnJvd3NpbmcpLCAmcHJp dmF0ZUJyb3dzaW5nKTsKK30KIAogYm9vbCBRVE1vdmllOjppbml0aWFsaXplUXVpY2tUaW1lKCkg CiB7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy93aW4vUVRNb3ZpZS5o Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3dpbi9RVE1v dmllLmgJKHJldmlzaW9uIDgwMzcwKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3Mvd2luL1FUTW92aWUuaAkod29ya2luZyBjb3B5KQpAQCAtMTE3LDYgKzExNyw4IEBAIHB1Ymxp YzoKIAogICAgIGxvbmcgdGltZVNjYWxlKCkgY29uc3Q7CiAKKyAgICB2b2lkIHNldFByaXZhdGVC cm93c2luZ01vZGUoYm9vbCk7CisKIHByaXZhdGU6CiAgICAgUVRNb3ZpZVByaXZhdGUqIG1fcHJp dmF0ZTsKICAgICBmcmllbmQgY2xhc3MgUVRNb3ZpZVByaXZhdGU7Cg==