157405 2016-05-05 18:58:58 -0700 Don't use DiskCache for media resource loads 2016-05-31 23:51:24 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 achristensen achristensen commit-queue oldest_to_newest 1190567 0 achristensen 2016-05-05 18:58:58 -0700 Don't use DiskCache for media resource loads 1190568 1 278217 achristensen 2016-05-05 19:00:53 -0700 Created attachment 278217 Patch 1190569 2 commit-queue 2016-05-05 19:03:26 -0700 Attachment 278217 did not pass style-queue: ERROR: Source/WebCore/platform/network/ResourceRequestBase.h:153: enum members should use InterCaps with an initial capital letter or initial 'k' for C-style enums. [readability/enum_casing] [4] Total errors found: 1 in 9 files If any of these errors are false positives, please file a bug against check-webkit-style. 1191201 3 278217 commit-queue 2016-05-09 09:53:51 -0700 Comment on attachment 278217 Patch Clearing flags on attachment: 278217 Committed r200578: <http://trac.webkit.org/changeset/200578> 1191202 4 commit-queue 2016-05-09 09:53:54 -0700 All reviewed patches have been landed. Closing bug. 1195481 5 278217 cgarcia 2016-05-23 03:01:00 -0700 Comment on attachment 278217 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=278217&action=review > Source/WebCore/loader/MediaResourceLoader.cpp:67 > + auto cachingPolicy = options & LoadOption::DisallowCaching ? CachingPolicy::DisallowCaching : CachingPolicy::AllowCaching; I'm confused. This is not about disk cache, but about memory cache, right? Why is this added as an option? Why not passing CachingPolicy::DisallowCaching unconditionally for media loads? Looking at the code below we disallow caching in the disk cache always for media requests. 1198086 6 achristensen 2016-05-31 23:51:24 -0700 (In reply to comment #5) > Comment on attachment 278217 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=278217&action=review > > > Source/WebCore/loader/MediaResourceLoader.cpp:67 > > + auto cachingPolicy = options & LoadOption::DisallowCaching ? CachingPolicy::DisallowCaching : CachingPolicy::AllowCaching; > > I'm confused. This is not about disk cache, but about memory cache, right? > Why is this added as an option? Why not passing > CachingPolicy::DisallowCaching unconditionally for media loads? Looking at > the code below we disallow caching in the disk cache always for media > requests. This just translates one place where we store the caching policy to another place where we store the same policy. These are indeed about the memory cache, and we did it this way to not touch GTK/GStreamer's caching policy. The disk cache is disabled by the uses of WebCore::ResourceRequest::Requester::Media in NetworkCache.cpp. We do not want to use WebKit's caches right now because we are using AVFoundation's caches. 278217 2016-05-05 19:00:53 -0700 2016-05-09 09:53:51 -0700 Patch bug-157405-20160505190134.patch text/plain 10404 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwMDQ2MSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI1IEBACisyMDE2LTA1LTA1ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRG9uJ3QgdXNl IERpc2tDYWNoZSBmb3IgbWVkaWEgcmVzb3VyY2UgbG9hZHMKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1NzQwNQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGh0dHAvdGVzdHMvc2VjdXJpdHkvdmlkZW8tY3Jv c3Mtb3JpZ2luLWNhY2hpbmcuaHRtbCB3YXMgbG9hZGluZyBmcm9tIHRoZSBkaXNrIGNhY2hlLgor ICAgICAgICBUaGlzIHBhdGNoIGFkZHMgYW4gYXNzZXJ0aW9uIHRoYXQgZmlyZXMgaW4gdGhhdCB0 ZXN0IHdpdGhvdXQgdGhpcyBmaXguCisKKyAgICAgICAgKiBsb2FkZXIvTWVkaWFSZXNvdXJjZUxv YWRlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpNZWRpYVJlc291cmNlTG9hZGVyOjpyZXF1ZXN0 UmVzb3VyY2UpOgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL1BsYXRmb3JtTWVkaWFSZXNv dXJjZUxvYWRlci5oOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXF1ZXN0 QmFzZS5oOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0QmFzZTo6aGlkZGVuRnJv bUluc3BlY3Rvcik6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3RCYXNlOjpzZXRI aWRkZW5Gcm9tSW5zcGVjdG9yKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdEJh c2U6OnJlcXVlc3Rlcik6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3RCYXNlOjpz ZXRSZXF1ZXN0ZXIpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY29jb2EvV2ViQ29yZU5T VVJMU2Vzc2lvbi5tbToKKyAgICAgICAgKC1bV2ViQ29yZU5TVVJMU2Vzc2lvbkRhdGFUYXNrIF9y ZXN0YXJ0XSk6CisgICAgICAgICgtW1dlYkNvcmVOU1VSTFNlc3Npb25EYXRhVGFzayByZXNvdXJj ZTpyZWNlaXZlZFJlc3BvbnNlOl0pOgorCiAyMDE2LTA1LTA0ICBBbGV4IENocmlzdGVuc2VuICA8 YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQmxvY2tlZCByZWRpcmVjdGVkIG1h aW4gcmVzb3VyY2UgcmVxdWVzdHMgbmVlZCBkZXNjcmlwdGl2ZSBlcnJvcnMKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2xvYWRlci9NZWRpYVJlc291cmNlTG9hZGVyLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9sb2FkZXIvTWVkaWFSZXNvdXJjZUxvYWRlci5jcHAJKHJldmlzaW9uIDIw MDQ5OCkKKysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9NZWRpYVJlc291cmNlTG9hZGVyLmNwcAko d29ya2luZyBjb3B5KQpAQCAtNjQsOSArNjQsMTEgQEAgUmVmUHRyPFBsYXRmb3JtTWVkaWFSZXNv dXJjZT4gTWVkaWFSZXNvdQogCiAgICAgRGF0YUJ1ZmZlcmluZ1BvbGljeSBidWZmZXJpbmdQb2xp Y3kgPSBvcHRpb25zICYgTG9hZE9wdGlvbjo6QnVmZmVyRGF0YSA/IFdlYkNvcmU6OkJ1ZmZlckRh dGEgOiBXZWJDb3JlOjpEb05vdEJ1ZmZlckRhdGE7CiAgICAgUmVxdWVzdE9yaWdpblBvbGljeSBj b3JzUG9saWN5ID0gIW1fY3Jvc3NPcmlnaW5Nb2RlLmlzTnVsbCgpID8gUG90ZW50aWFsbHlDcm9z c09yaWdpbkVuYWJsZWQgOiBVc2VEZWZhdWx0T3JpZ2luUmVzdHJpY3Rpb25zRm9yVHlwZTsKKyAg ICBhdXRvIGNhY2hpbmdQb2xpY3kgPSBvcHRpb25zICYgTG9hZE9wdGlvbjo6RGlzYWxsb3dDYWNo aW5nID8gQ2FjaGluZ1BvbGljeTo6RGlzYWxsb3dDYWNoaW5nIDogQ2FjaGluZ1BvbGljeTo6QWxs b3dDYWNoaW5nOwogICAgIFN0b3JlZENyZWRlbnRpYWxzIGFsbG93Q3JlZGVudGlhbHMgPSBtX2Ny b3NzT3JpZ2luTW9kZS5pc051bGwoKSB8fCBlcXVhbExldHRlcnNJZ25vcmluZ0FTQ0lJQ2FzZSht X2Nyb3NzT3JpZ2luTW9kZSwgInVzZS1jcmVkZW50aWFscyIpID8gQWxsb3dTdG9yZWRDcmVkZW50 aWFscyA6IERvTm90QWxsb3dTdG9yZWRDcmVkZW50aWFsczsKIAogICAgIGF1dG8gdXBkYXRlZFJl cXVlc3QgPSByZXF1ZXN0OworICAgIHVwZGF0ZWRSZXF1ZXN0LnNldFJlcXVlc3RlcihSZXNvdXJj ZVJlcXVlc3Q6OlJlcXVlc3Rlcjo6TWVkaWEpOwogI2lmIEhBVkUoQVZGT1VOREFUSU9OX0xPQURF Ul9ERUxFR0FURSkgJiYgUExBVEZPUk0oTUFDKQogICAgIC8vIEZJWE1FOiBXb3JrYXJvdW5kIGZv ciA8cmRhcjovL3Byb2JsZW0vMjYwNzE2MDc+LiBXZSBhcmUgbm90IGFibGUgdG8gZG8gQ09SUyBj aGVja2luZyBvbiAzMDQgcmVzcG9uc2VzIGJlY2F1c2UgdGhleQogICAgIC8vIGFyZSB1c3VhbGx5 IG1pc3NpbmcgdGhlIGhlYWRlcnMgd2UgbmVlZC4KQEAgLTc2LDcgKzc4LDcgQEAgUmVmUHRyPFBs YXRmb3JtTWVkaWFSZXNvdXJjZT4gTWVkaWFSZXNvdQogCiAgICAgLy8gRklYTUU6IFNraXAgQ29u dGVudCBTZWN1cml0eSBQb2xpY3kgY2hlY2sgaWYgdGhlIGVsZW1lbnQgdGhhdCBpbml0aXRhdGVk IHRoaXMgcmVxdWVzdAogICAgIC8vIGlzIGluIGEgdXNlci1hZ2VudCBzaGFkb3cgdHJlZS4gU2Vl IDxodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTU1NTA1Pi4KLSAgICBD YWNoZWRSZXNvdXJjZVJlcXVlc3QgY2FjaGVSZXF1ZXN0KHVwZGF0ZWRSZXF1ZXN0LCBSZXNvdXJj ZUxvYWRlck9wdGlvbnMoU2VuZENhbGxiYWNrcywgRG9Ob3RTbmlmZkNvbnRlbnQsIGJ1ZmZlcmlu Z1BvbGljeSwgYWxsb3dDcmVkZW50aWFscywgRG9Ob3RBc2tDbGllbnRGb3JDcm9zc09yaWdpbkNy ZWRlbnRpYWxzLCBDbGllbnREaWROb3RSZXF1ZXN0Q3JlZGVudGlhbHMsIERvU2VjdXJpdHlDaGVj aywgY29yc1BvbGljeSwgRG9Ob3RJbmNsdWRlQ2VydGlmaWNhdGVJbmZvLCBDb250ZW50U2VjdXJp dHlQb2xpY3lJbXBvc2l0aW9uOjpEb1BvbGljeUNoZWNrLCBEZWZlcnNMb2FkaW5nUG9saWN5OjpB bGxvd0RlZmVyc0xvYWRpbmcsIENhY2hpbmdQb2xpY3k6OkFsbG93Q2FjaGluZykpOworICAgIENh Y2hlZFJlc291cmNlUmVxdWVzdCBjYWNoZVJlcXVlc3QodXBkYXRlZFJlcXVlc3QsIFJlc291cmNl TG9hZGVyT3B0aW9ucyhTZW5kQ2FsbGJhY2tzLCBEb05vdFNuaWZmQ29udGVudCwgYnVmZmVyaW5n UG9saWN5LCBhbGxvd0NyZWRlbnRpYWxzLCBEb05vdEFza0NsaWVudEZvckNyb3NzT3JpZ2luQ3Jl ZGVudGlhbHMsIENsaWVudERpZE5vdFJlcXVlc3RDcmVkZW50aWFscywgRG9TZWN1cml0eUNoZWNr LCBjb3JzUG9saWN5LCBEb05vdEluY2x1ZGVDZXJ0aWZpY2F0ZUluZm8sIENvbnRlbnRTZWN1cml0 eVBvbGljeUltcG9zaXRpb246OkRvUG9saWN5Q2hlY2ssIERlZmVyc0xvYWRpbmdQb2xpY3k6OkFs bG93RGVmZXJzTG9hZGluZywgY2FjaGluZ1BvbGljeSkpOwogCiAgICAgaWYgKCFtX2Nyb3NzT3Jp Z2luTW9kZS5pc051bGwoKSkKICAgICAgICAgdXBkYXRlUmVxdWVzdEZvckFjY2Vzc0NvbnRyb2wo Y2FjaGVSZXF1ZXN0Lm11dGFibGVSZXNvdXJjZVJlcXVlc3QoKSwgbV9kb2N1bWVudC0+c2VjdXJp dHlPcmlnaW4oKSwgYWxsb3dDcmVkZW50aWFscyk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9QbGF0Zm9ybU1lZGlhUmVzb3VyY2VMb2FkZXIuaAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9QbGF0Zm9ybU1lZGlhUmVzb3VyY2VM b2FkZXIuaAkocmV2aXNpb24gMjAwMzkyKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvUGxhdGZvcm1NZWRpYVJlc291cmNlTG9hZGVyLmgJKHdvcmtpbmcgY29weSkKQEAgLTYx LDYgKzYxLDcgQEAgY2xhc3MgUGxhdGZvcm1NZWRpYVJlc291cmNlTG9hZGVyIDogcHVibAogcHVi bGljOgogICAgIGVudW0gTG9hZE9wdGlvbiB7CiAgICAgICAgIEJ1ZmZlckRhdGEgPSAxIDw8IDAs CisgICAgICAgIERpc2FsbG93Q2FjaGluZyA9IDEgPDwgMSwKICAgICB9OwogICAgIHR5cGVkZWYg dW5zaWduZWQgTG9hZE9wdGlvbnM7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25l dHdvcmsvUmVzb3VyY2VSZXF1ZXN0QmFzZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXF1ZXN0QmFzZS5oCShyZXZpc2lvbiAyMDAzOTIp CisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jlc291cmNlUmVxdWVzdEJhc2Uu aAkod29ya2luZyBjb3B5KQpAQCAtMTUwLDcgKzE1MCw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsK ICAgICAgICAgYm9vbCBoaWRkZW5Gcm9tSW5zcGVjdG9yKCkgY29uc3QgeyByZXR1cm4gbV9oaWRk ZW5Gcm9tSW5zcGVjdG9yOyB9CiAgICAgICAgIHZvaWQgc2V0SGlkZGVuRnJvbUluc3BlY3Rvcihi b29sIGhpZGRlbkZyb21JbnNwZWN0b3IpIHsgbV9oaWRkZW5Gcm9tSW5zcGVjdG9yID0gaGlkZGVu RnJvbUluc3BlY3RvcjsgfQogCi0gICAgICAgIGVudW0gY2xhc3MgUmVxdWVzdGVyIHsgVW5zcGVj aWZpZWQsIE1haW4sIFhIUiB9OworICAgICAgICBlbnVtIGNsYXNzIFJlcXVlc3RlciB7IFVuc3Bl Y2lmaWVkLCBNYWluLCBYSFIsIE1lZGlhIH07CiAgICAgICAgIFJlcXVlc3RlciByZXF1ZXN0ZXIo KSBjb25zdCB7IHJldHVybiBtX3JlcXVlc3RlcjsgfQogICAgICAgICB2b2lkIHNldFJlcXVlc3Rl cihSZXF1ZXN0ZXIgcmVxdWVzdGVyKSB7IG1fcmVxdWVzdGVyID0gcmVxdWVzdGVyOyB9CiAKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvV2ViQ29yZU5TVVJMU2Vz c2lvbi5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2Nv Y29hL1dlYkNvcmVOU1VSTFNlc3Npb24ubW0JKHJldmlzaW9uIDIwMDM5MikKKysrIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY29jb2EvV2ViQ29yZU5TVVJMU2Vzc2lvbi5tbQkod29y a2luZyBjb3B5KQpAQCAtNDE1LDcgKzQxNSw3IEBAIC0gKHZvaWQpX3Jlc3RhcnQKICAgICBBU1NF UlQoaXNNYWluVGhyZWFkKCkpOwogICAgIFtzZWxmIF9jYW5jZWxdOwogCi0gICAgX3Jlc291cmNl ID0gc2VsZi5zZXNzaW9uLmxvYWRlci5yZXF1ZXN0UmVzb3VyY2Uoc2VsZi5vcmlnaW5hbFJlcXVl c3QsIDApOworICAgIF9yZXNvdXJjZSA9IHNlbGYuc2Vzc2lvbi5sb2FkZXIucmVxdWVzdFJlc291 cmNlKHNlbGYub3JpZ2luYWxSZXF1ZXN0LCBQbGF0Zm9ybU1lZGlhUmVzb3VyY2VMb2FkZXI6Okxv YWRPcHRpb246OkRpc2FsbG93Q2FjaGluZyk7CiAgICAgaWYgKF9yZXNvdXJjZSkKICAgICAgICAg X3Jlc291cmNlLT5zZXRDbGllbnQoc3RkOjptYWtlX3VuaXF1ZTxXZWJDb3JlTlNVUkxTZXNzaW9u RGF0YVRhc2tDbGllbnQ+KHNlbGYpKTsKIH0KQEAgLTUyNiw2ICs1MjYsNyBAQCAtICh2b2lkKXJl c291cmNlOihQbGF0Zm9ybU1lZGlhUmVzb3VyY2UmCiAKIC0gKHZvaWQpcmVzb3VyY2U6KFBsYXRm b3JtTWVkaWFSZXNvdXJjZSYpcmVzb3VyY2UgcmVjZWl2ZWRSZXNwb25zZTooY29uc3QgUmVzb3Vy Y2VSZXNwb25zZSYpcmVzcG9uc2UKIHsKKyAgICBBU1NFUlQocmVzcG9uc2Uuc291cmNlKCkgPT0g UmVzb3VyY2VSZXNwb25zZTo6U291cmNlOjpOZXR3b3JrKTsKICAgICBBU1NFUlRfVU5VU0VEKHJl c291cmNlLCAmcmVzb3VyY2UgPT0gX3Jlc291cmNlKTsKICAgICBBU1NFUlQoaXNNYWluVGhyZWFk KCkpOwogICAgIFtzZWxmLnNlc3Npb24gdGFzazpzZWxmIGRpZFJlY2VpdmVDT1JTQWNjZXNzQ2hl Y2tSZXN1bHQ6cmVzb3VyY2UuZGlkUGFzc0FjY2Vzc0NvbnRyb2xDaGVjaygpXTsKSW5kZXg6IFNv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cJKHJldmlzaW9uIDIwMDUwMSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwkod29y a2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE2LTA1LTA1ICBBbGV4IENocmlzdGVuc2Vu ICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRG9uJ3QgdXNlIERpc2tDYWNo ZSBmb3IgbWVkaWEgcmVzb3VyY2UgbG9hZHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE1NzQwNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0NhY2hlLmNw cDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlOjptYWtlUmV0cmlldmVEZWNpc2lvbik6 CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZTo6bWFrZVN0b3JlRGVjaXNpb24pOgorICAg ICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5oOgorICAgICAgICAqIE5l dHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0YXRpc3RpY3MuY3BwOgorICAgICAgICAo V2ViS2l0OjpOZXR3b3JrQ2FjaGU6OnJldHJpZXZlRGVjaXNpb25Ub0RpYWdub3N0aWNLZXkpOgor CiAyMDE2LTA1LTA1ICBNYW51ZWwgUmVnbyBDYXNhc25vdmFzICA8cmVnb0BpZ2FsaWEuY29tPgog CiAgICAgICAgIFtHVEtdIFJlbW92ZSAicmVnaW9uIGJhc2VkIGNvbHVtbnMiIHJ1bnRpbWUgZmVh dHVyZSByZW1haW5pbmdzCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNo ZS9OZXR3b3JrQ2FjaGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQ cm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5jcHAJKHJldmlzaW9uIDIwMDM5MikKKysrIFNvdXJj ZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5jcHAJKHdvcmtpbmcg Y29weSkKQEAgLTI0Miw2ICsyNDIsOCBAQCBzdGF0aWMgUmV0cmlldmVEZWNpc2lvbiBtYWtlUmV0 cmlldmVEZWNpCiAgICAgLy8gRklYTUU6IFN1cHBvcnQgSEVBRCByZXF1ZXN0cy4KICAgICBpZiAo cmVxdWVzdC5odHRwTWV0aG9kKCkgIT0gIkdFVCIpCiAgICAgICAgIHJldHVybiBSZXRyaWV2ZURl Y2lzaW9uOjpOb0R1ZVRvSFRUUE1ldGhvZDsKKyAgICBpZiAocmVxdWVzdC5yZXF1ZXN0ZXIoKSA9 PSBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q6OlJlcXVlc3Rlcjo6TWVkaWEpCisgICAgICAgIHJl dHVybiBSZXRyaWV2ZURlY2lzaW9uOjpOb0R1ZVRvU3RyZWFtaW5nTWVkaWE7CiAgICAgaWYgKHJl cXVlc3QuY2FjaGVQb2xpY3koKSA9PSBXZWJDb3JlOjpSZWxvYWRJZ25vcmluZ0NhY2hlRGF0YSAm JiAhcmVxdWVzdC5pc0NvbmRpdGlvbmFsKCkpCiAgICAgICAgIHJldHVybiBSZXRyaWV2ZURlY2lz aW9uOjpOb0R1ZVRvUmVsb2FkSWdub3JpbmdDYWNoZTsKIApAQCAtMzM0LDggKzMzNiwxMCBAQCBz dGF0aWMgU3RvcmVEZWNpc2lvbiBtYWtlU3RvcmVEZWNpc2lvbihjCiAgICAgLy8gU3RyZWFtaW5n IG1lZGlhIGZpbGxzIHRoZSBjYWNoZSBxdWlja2x5IGFuZCBpcyB1bmxpa2VseSB0byBiZSByZXVz ZWQuCiAgICAgLy8gRklYTUU6IFdlIHNob3VsZCBpbnRyb2R1Y2UgYSBzZXBhcmF0ZSBtZWRpYSBj YWNoZSBwYXJ0aXRpb24gdGhhdCBkb2Vzbid0IGFmZmVjdCBvdGhlciByZXNvdXJjZXMuCiAgICAg Ly8gRklYTUU6IFdlIHNob3VsZCBhbHNvIG1ha2Ugc3VyZSBtYWtlIHRoZSBNU0UgcGF0aHMgYXJl IGNvcHktZnJlZSBzbyB3ZSBjYW4gdXNlIG1hcHBlZCBidWZmZXJzIGZyb20gZGlzayBlZmZlY3Rp dmVseS4KLSAgICBib29sIGlzTGlrZWx5U3RyZWFtaW5nTWVkaWEgPSBvcmlnaW5hbFJlcXVlc3Qu cmVxdWVzdGVyKCkgPT0gV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0OjpSZXF1ZXN0ZXI6OlhIUiAm JiBpc01lZGlhTUlNRVR5cGUocmVzcG9uc2UubWltZVR5cGUoKSk7Ci0gICAgaWYgKGlzTGlrZWx5 U3RyZWFtaW5nTWVkaWEpCisgICAgYXV0byByZXF1ZXN0ZXIgPSBvcmlnaW5hbFJlcXVlc3QucmVx dWVzdGVyKCk7CisgICAgYm9vbCBpc0RlZmluaXRlbHlTdHJlYW1pbmdNZWRpYSA9IHJlcXVlc3Rl ciA9PSBXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q6OlJlcXVlc3Rlcjo6TWVkaWE7CisgICAgYm9v bCBpc0xpa2VseVN0cmVhbWluZ01lZGlhID0gcmVxdWVzdGVyID09IFdlYkNvcmU6OlJlc291cmNl UmVxdWVzdDo6UmVxdWVzdGVyOjpYSFIgJiYgaXNNZWRpYU1JTUVUeXBlKHJlc3BvbnNlLm1pbWVU eXBlKCkpOworICAgIGlmIChpc0xpa2VseVN0cmVhbWluZ01lZGlhIHx8IGlzRGVmaW5pdGVseVN0 cmVhbWluZ01lZGlhKQogICAgICAgICByZXR1cm4gU3RvcmVEZWNpc2lvbjo6Tm9EdWVUb1N0cmVh bWluZ01lZGlhOwogCiAgICAgcmV0dXJuIFN0b3JlRGVjaXNpb246OlllczsKSW5kZXg6IFNvdXJj ZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZS5oCShy ZXZpc2lvbiAyMDAzOTIpCisrKyBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9O ZXR3b3JrQ2FjaGUuaAkod29ya2luZyBjb3B5KQpAQCAtNjAsNyArNjAsOCBAQCBlbnVtIGNsYXNz IFJldHJpZXZlRGVjaXNpb24gewogICAgIFllcywKICAgICBOb0R1ZVRvSFRUUE1ldGhvZCwKICAg ICBOb0R1ZVRvQ29uZGl0aW9uYWxSZXF1ZXN0LAotICAgIE5vRHVlVG9SZWxvYWRJZ25vcmluZ0Nh Y2hlCisgICAgTm9EdWVUb1JlbG9hZElnbm9yaW5nQ2FjaGUsCisgICAgTm9EdWVUb1N0cmVhbWlu Z01lZGlhLAogfTsKIAogLy8gRklYTUU6IFRoaXMgZW51bSBpcyB1c2VkIGluIHRoZSBTdGF0aXN0 aWNzIGNvZGUgaW4gYSB3YXkgdGhhdCBwcmV2ZW50cyByZW1vdmluZyBvciByZW9yZGVyaW5nIGFu eXRoaW5nLgpAQCAtNzMsNyArNzQsNyBAQCBlbnVtIGNsYXNzIFN0b3JlRGVjaXNpb24gewogICAg IE5vRHVlVG9IVFRQU3RhdHVzQ29kZSwKICAgICBOb0R1ZVRvTm9TdG9yZVJlcXVlc3QsCiAgICAg Tm9EdWVUb1VubGlrZWx5VG9SZXVzZSwKLSAgICBOb0R1ZVRvU3RyZWFtaW5nTWVkaWEKKyAgICBO b0R1ZVRvU3RyZWFtaW5nTWVkaWEsCiB9OwogCiBlbnVtIGNsYXNzIFVzZURlY2lzaW9uIHsKSW5k ZXg6IFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0YXRp c3RpY3MuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL2Nh Y2hlL05ldHdvcmtDYWNoZVN0YXRpc3RpY3MuY3BwCShyZXZpc2lvbiAyMDAzOTIpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdGF0aXN0aWNzLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMjA2LDYgKzIwNiw4IEBAIHN0YXRpYyBTdHJpbmcgcmV0cmll dmVEZWNpc2lvblRvRGlhZ25vc3QKICAgICAgICAgcmV0dXJuIFdlYkNvcmU6OkRpYWdub3N0aWNM b2dnaW5nS2V5czo6aXNDb25kaXRpb25hbFJlcXVlc3RLZXkoKTsKICAgICBjYXNlIFJldHJpZXZl RGVjaXNpb246Ok5vRHVlVG9SZWxvYWRJZ25vcmluZ0NhY2hlOgogICAgICAgICByZXR1cm4gV2Vi Q29yZTo6RGlhZ25vc3RpY0xvZ2dpbmdLZXlzOjppc1JlbG9hZElnbm9yaW5nQ2FjaGVEYXRhS2V5 KCk7CisgICAgY2FzZSBSZXRyaWV2ZURlY2lzaW9uOjpOb0R1ZVRvU3RyZWFtaW5nTWVkaWE6Cisg ICAgICAgIHJldHVybiBXZWJDb3JlOjpEaWFnbm9zdGljTG9nZ2luZ0tleXM6OnN0cmVhbWluZ01l ZGlhKCk7CiAgICAgY2FzZSBSZXRyaWV2ZURlY2lzaW9uOjpZZXM6CiAgICAgICAgIEFTU0VSVF9O T1RfUkVBQ0hFRCgpOwogICAgICAgICBicmVhazsK