193585 2019-01-18 12:18:50 -0800 Add API for setting MediaCacheDirectory in WK Context Config. 2019-01-24 07:22:10 -0800 1 1 1 Unclassified WebKit WebKit API WebKit Nightly Build Unspecified Unspecified NEW P2 Normal --- 1 gurdal_oruklu webkit-unassigned achristensen alex beidson bugs-noreply calvaris cgarcia eric.carlson ggaren jer.noble mcatanzaro tsaunier youennf oldest_to_newest 1495971 0 gurdal_oruklu 2019-01-18 12:18:50 -0800 Just like local storage or application cache directories, it should be possible to set the media cache directory in WKContextConfiguration 1495997 1 359528 gurdal_oruklu 2019-01-18 12:45:53 -0800 Created attachment 359528 Patch 1496581 2 cgarcia 2019-01-21 06:00:27 -0800 I don't think we are going to add new C API unless it's required by WTR. 1496638 3 359528 mcatanzaro 2019-01-21 12:33:33 -0800 Comment on attachment 359528 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=359528&action=review That's true, we don't want to add new C API unless it's needed by the test runner, because the C API is neither public nor stable. But this patch *does* use it in the test runner. So I actually think this patch is fine. It needs to be approved by an owner, though. > Source/WebKit/ChangeLog:3 > + Add API for setting MediaCacheDirectory in WK Context Config. I would name this something like: "TestController should set media cache directory properly". Adding the new C API is uninteresting, because the C API is not public and applications cannot use it. It's just an implementation detail of WebKit. (I know Comcast has patched WebKit to expose the C API, but that's a bad idea.) But fixing the TestController to set the media cache directory is interesting. > Source/WebKit/ChangeLog:10 > + > + Only one blank line here. > Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.cpp:131 > + > + Only one blank line here too. > Tools/ChangeLog:10 > + > + Juts one blank line here too. > Tools/WebKitTestRunner/TestController.cpp:462 > + WKContextConfigurationSetMediaCacheDirectory(configuration.get(), toWK(temporaryFolder + separator + "MediaCache").get()); Where is MediaCache being saved currently? Is this the only storage directory that TestController is missing here? 1496712 4 359528 calvaris 2019-01-21 23:02:28 -0800 Comment on attachment 359528 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=359528&action=review >> Tools/WebKitTestRunner/TestController.cpp:462 >> + WKContextConfigurationSetMediaCacheDirectory(configuration.get(), toWK(temporaryFolder + separator + "MediaCache").get()); > > Where is MediaCache being saved currently? > > Is this the only storage directory that TestController is missing here? That's managed, IIRC, in our media player private. 1496753 5 359732 gurdal_oruklu 2019-01-22 06:57:45 -0800 Created attachment 359732 Patch 1496755 6 gurdal_oruklu 2019-01-22 06:59:07 -0800 Updated the patch (removed extra lines and changed the description of the patch) 1496777 7 mcatanzaro 2019-01-22 08:48:27 -0800 (In reply to Xabier Rodríguez Calvar from comment #4) > That's managed, IIRC, in our media player private. I don't understand, there's no code in the MediaPlayerPrivateGStreamer files related to MediaCache. Do you see a problem with this patch? 1496985 8 359732 achristensen 2019-01-22 14:37:58 -0800 Comment on attachment 359732 Patch This belongs in WKWebsiteDataStoreRef.h 1496995 9 mcatanzaro 2019-01-22 14:49:06 -0800 Can you please explain why? Currently only service worker registration directory is exposed there; seems the other directories are all exposed in WKContextConfiguration. 1497749 10 calvaris 2019-01-23 23:37:38 -0800 (In reply to Michael Catanzaro from comment #7) > I don't understand, there's no code in the MediaPlayerPrivateGStreamer files > related to MediaCache. Do you see a problem with this patch? No, what I mean is that there is code there to select where GStreamer is placing the cached files but so far we're not honoring anything coming from the API. 1497750 11 calvaris 2019-01-23 23:38:47 -0800 (In reply to Michael Catanzaro from comment #7) > I don't understand, there's no code in the MediaPlayerPrivateGStreamer files > related to MediaCache. Do you see a problem with this patch? And no, I don't see any other problem with this patch other than GStreamer was and would be ignoring it. 1497801 12 youennf 2019-01-24 07:22:10 -0800 (In reply to Michael Catanzaro from comment #9) > Can you please explain why? Currently only service worker registration > directory is exposed there; seems the other directories are all exposed in > WKContextConfiguration. We are trying to move such APIs to WKWebsiteDataStoreRef. The principle is that a context might have pages that relate to different website data store through their session ids. 359528 2019-01-18 12:45:53 -0800 2019-01-22 06:57:41 -0800 Patch bug-193585-20190118124552.patch text/plain 5226 gurdal_oruklu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwMTU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDkyNzAzMmYzYjE3MGMyMDdl YjM4NWE5OGFhYjlkZTc0ZWFiZjI4NGEuLjllMzI5ZDA1N2RiNmQzMTg4MDI0YTFjYjBhOTY2Njk2 N2IzNmM1MzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTktMDEtMTggIE1hbmlnYW5k YW4gR29wYWxha2lyc2huYW4gIDxNYW5pZ2FuZGFuX0dvcGFsYWtpcnNobmFuQGNhYmxlLmNvbWNh c3QuY29tPgorCisgICAgICAgIEFkZCBBUEkgZm9yIHNldHRpbmcgTWVkaWFDYWNoZURpcmVjdG9y eSBpbiBXSyBDb250ZXh0IENvbmZpZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5MzU4NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIEFkZCBhbiBBUEkgdG8gY29uZmlndXJlIE1lZGlhQ2FjaGVEaXJlY3Rv cnkgaW4gV0sKKworCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dENvbmZpZ3Vy YXRpb25SZWYuY3BwOgorICAgICAgICAoV0tDb250ZXh0Q29uZmlndXJhdGlvbkNvcHlNZWRpYUNh Y2hlRGlyZWN0b3J5KToKKyAgICAgICAgKFdLQ29udGV4dENvbmZpZ3VyYXRpb25TZXRNZWRpYUNh Y2hlRGlyZWN0b3J5KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0Q29uZmln dXJhdGlvblJlZi5oOgorCiAyMDE5LTAxLTE4ICBQaGlsaXBwZSBOb3JtYW5kICA8cG5vcm1hbmRA aWdhbGlhLmNvbT4KIAogICAgICAgICBbV1BFXSBBZGQgUXQgZXh0ZW5zaW9uCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHRDb25maWd1cmF0aW9uUmVm LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dENvbmZpZ3VyYXRp b25SZWYuY3BwCmluZGV4IDg2ZDQxMjk5ZGZhYWIzZDY0ZTdjNDFlMDYwYzAyZjY2MWNkMWMzN2Uu LjEwMGQxNTUyOGJkMjVhM2Y4ZTA0YWQwY2FkYTc5OTI5YWEzNjBkMGQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dENvbmZpZ3VyYXRp b25SZWYuY3BwCkBAIC0xMTgsNiArMTE4LDE3IEBAIHZvaWQgV0tDb250ZXh0Q29uZmlndXJhdGlv blNldE1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkoV0tDb250ZXh0Q29uZmlndXJhdGlvblJlCiAg ICAgdG9JbXBsKGNvbmZpZ3VyYXRpb24pLT5zZXRNZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KHRv SW1wbChtZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KS0+c3RyaW5nKCkpOwogfQogCitXS1N0cmlu Z1JlZiBXS0NvbnRleHRDb25maWd1cmF0aW9uQ29weU1lZGlhQ2FjaGVEaXJlY3RvcnkoV0tDb250 ZXh0Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uKQoreworICAgIHJldHVybiB0b0NvcGll ZEFQSSh0b0ltcGwoY29uZmlndXJhdGlvbiktPm1lZGlhQ2FjaGVEaXJlY3RvcnkoKSk7Cit9CisK K3ZvaWQgV0tDb250ZXh0Q29uZmlndXJhdGlvblNldE1lZGlhQ2FjaGVEaXJlY3RvcnkoV0tDb250 ZXh0Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uLCBXS1N0cmluZ1JlZiBtZWRpYUNhY2hl RGlyZWN0b3J5KQoreworICAgIHRvSW1wbChjb25maWd1cmF0aW9uKS0+c2V0TWVkaWFDYWNoZURp cmVjdG9yeSh0b0ltcGwobWVkaWFDYWNoZURpcmVjdG9yeSktPnN0cmluZygpKTsKK30KKworCiBX S1N0cmluZ1JlZiBXS0NvbnRleHRDb25maWd1cmF0aW9uQ29weVJlc291cmNlTG9hZFN0YXRpc3Rp Y3NEaXJlY3RvcnkoV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uKQogewog ICAgIHJldHVybiB0b0NvcGllZEFQSSh0b0ltcGwoY29uZmlndXJhdGlvbiktPnJlc291cmNlTG9h ZFN0YXRpc3RpY3NEaXJlY3RvcnkoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQy9XS0NvbnRleHRDb25maWd1cmF0aW9uUmVmLmggYi9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQy9XS0NvbnRleHRDb25maWd1cmF0aW9uUmVmLmgKaW5kZXggMzI2OTQxNzJj NTc4NGQ5MzgwYTNkNGNhMDY5MjRhNWYxZmQ0ZWZhYS4uYmYzNzdjMDBlOTBiOGQwZjAwZDA2ZTAx ZGZhNzViZDYzZDQ0ZTUzZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L0MvV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZi5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9DL1dLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYuaApAQCAtNTcsNiArNTcsOSBAQCBX S19FWFBPUlQgdm9pZCBXS0NvbnRleHRDb25maWd1cmF0aW9uU2V0V2ViU1FMRGF0YWJhc2VEaXJl Y3RvcnkoV0tDb250ZXh0Q29uZmlndQogV0tfRVhQT1JUIFdLU3RyaW5nUmVmIFdLQ29udGV4dENv bmZpZ3VyYXRpb25Db3B5TWVkaWFLZXlzU3RvcmFnZURpcmVjdG9yeShXS0NvbnRleHRDb25maWd1 cmF0aW9uUmVmIGNvbmZpZ3VyYXRpb24pOwogV0tfRVhQT1JUIHZvaWQgV0tDb250ZXh0Q29uZmln dXJhdGlvblNldE1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkoV0tDb250ZXh0Q29uZmlndXJhdGlv blJlZiBjb25maWd1cmF0aW9uLCBXS1N0cmluZ1JlZiBtZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5 KTsKIAorV0tfRVhQT1JUIFdLU3RyaW5nUmVmIFdLQ29udGV4dENvbmZpZ3VyYXRpb25Db3B5TWVk aWFDYWNoZURpcmVjdG9yeShXS0NvbnRleHRDb25maWd1cmF0aW9uUmVmIGNvbmZpZ3VyYXRpb24p OworV0tfRVhQT1JUIHZvaWQgV0tDb250ZXh0Q29uZmlndXJhdGlvblNldE1lZGlhQ2FjaGVEaXJl Y3RvcnkoV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uLCBXS1N0cmluZ1Jl ZiBtZWRpYUNhY2hlRGlyZWN0b3J5KTsKKwogV0tfRVhQT1JUIFdLU3RyaW5nUmVmIFdLQ29udGV4 dENvbmZpZ3VyYXRpb25Db3B5UmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeShXS0NvbnRl eHRDb25maWd1cmF0aW9uUmVmIGNvbmZpZ3VyYXRpb24pOwogV0tfRVhQT1JUIHZvaWQgV0tDb250 ZXh0Q29uZmlndXJhdGlvblNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJlY3RvcnkoV0tDb250 ZXh0Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uLCBXS1N0cmluZ1JlZiByZXNvdXJjZUxv YWRTdGF0aXN0aWNzRGlyZWN0b3J5KTsKIApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIv VG9vbHMvQ2hhbmdlTG9nCmluZGV4IDIzNWRjZDE5OWY4NWVlZDFkZTBlYzIyODU0Y2YxZGM5N2M4 YzE0MzMuLmExNWJiODEyZTE3NDdhY2Y2ZjdkZjVlMmNmYzRhZTEwOTRiZGMzMWYgMTAwNjQ0Ci0t LSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBA QAorMjAxOS0wMS0xOCAgTWFuaWdhbmRhbiBHb3BhbGFraXJzaG5hbiAgPE1hbmlnYW5kYW5fR29w YWxha2lyc2huYW5AY2FibGUuY29tY2FzdC5jb20+CisKKyAgICAgICAgQWRkIEFQSSBmb3Igc2V0 dGluZyBNZWRpYUNhY2hlRGlyZWN0b3J5IGluIFdLIENvbnRleHQgQ29uZmlnLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTkzNTg1CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGFuIEFQSSB0byBjb25m aWd1cmUgTWVkaWFDYWNoZURpcmVjdG9yeSBpbiBXSworCisKKyAgICAgICAgKiBXZWJLaXRUZXN0 UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdUUjo6VGVzdENvbnRyb2xsZXI6 OmdlbmVyYXRlQ29udGV4dENvbmZpZ3VyYXRpb24gY29uc3QpOgorCiAyMDE5LTAxLTE4ICBBYWth c2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNvbT4KIAogICAgICAgICBbZXdzLWJ1aWxkXSBQ YXNzIG93bmVyIHRvIHRoZSB0cmlnZ2VyZWQgYnVpbGRzCmRpZmYgLS1naXQgYS9Ub29scy9XZWJL aXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcCBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIv VGVzdENvbnRyb2xsZXIuY3BwCmluZGV4IDkyNjE3N2VmMmM3NzI5YjQ4YTNiYzAzN2E0MWExYjZm MmM0MzgyZDMuLmUyMjI1YzAxYmZjZDkwZTZmNDVmNWU1ODdkZjdmMDRkNzM3YTMwZTUgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCisrKyBiL1Rv b2xzL1dlYktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwCkBAIC00NTksNiArNDU5LDcg QEAgV0tSZXRhaW5QdHI8V0tDb250ZXh0Q29uZmlndXJhdGlvblJlZj4gVGVzdENvbnRyb2xsZXI6 OmdlbmVyYXRlQ29udGV4dENvbmZpZ3VyYXQKICAgICAgICAgV0tDb250ZXh0Q29uZmlndXJhdGlv blNldExvY2FsU3RvcmFnZURpcmVjdG9yeShjb25maWd1cmF0aW9uLmdldCgpLCB0b1dLKHRlbXBv cmFyeUZvbGRlciArIHNlcGFyYXRvciArICJMb2NhbFN0b3JhZ2UiKS5nZXQoKSk7CiAgICAgICAg IFdLQ29udGV4dENvbmZpZ3VyYXRpb25TZXRXZWJTUUxEYXRhYmFzZURpcmVjdG9yeShjb25maWd1 cmF0aW9uLmdldCgpLCB0b1dLKHRlbXBvcmFyeUZvbGRlciArIHNlcGFyYXRvciArICJEYXRhYmFz ZXMiICsgc2VwYXJhdG9yICsgIldlYlNRTCIpLmdldCgpKTsKICAgICAgICAgV0tDb250ZXh0Q29u ZmlndXJhdGlvblNldE1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkoY29uZmlndXJhdGlvbi5nZXQo KSwgdG9XSyh0ZW1wb3JhcnlGb2xkZXIgKyBzZXBhcmF0b3IgKyAiTWVkaWFLZXlzIikuZ2V0KCkp OworICAgICAgICBXS0NvbnRleHRDb25maWd1cmF0aW9uU2V0TWVkaWFDYWNoZURpcmVjdG9yeShj b25maWd1cmF0aW9uLmdldCgpLCB0b1dLKHRlbXBvcmFyeUZvbGRlciArIHNlcGFyYXRvciArICJN ZWRpYUNhY2hlIikuZ2V0KCkpOwogICAgICAgICBXS0NvbnRleHRDb25maWd1cmF0aW9uU2V0UmVz b3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeShjb25maWd1cmF0aW9uLmdldCgpLCB0b1dLKHRl bXBvcmFyeUZvbGRlciArIHNlcGFyYXRvciArICJSZXNvdXJjZUxvYWRTdGF0aXN0aWNzIikuZ2V0 KCkpOwogICAgIH0KICAgICByZXR1cm4gY29uZmlndXJhdGlvbjsK 359732 2019-01-22 06:57:45 -0800 2019-01-22 14:37:58 -0800 Patch bug-193585-20190122065744.patch text/plain 5266 gurdal_oruklu U3VidmVyc2lvbiBSZXZpc2lvbjogMjQwMTU1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDkyNzAzMmYzYjE3MGMyMDdl YjM4NWE5OGFhYjlkZTc0ZWFiZjI4NGEuLmFhNzBmNGQ5ZjExNDU1OGIxMzAzZGU5Yjc0NTE0YmYz NWNlMjkzODkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTktMDEtMTggIE1hbmlnYW5k YW4gR29wYWxha2lyc2huYW4gIDxNYW5pZ2FuZGFuX0dvcGFsYWtpcnNobmFuQGNhYmxlLmNvbWNh c3QuY29tPgorCisgICAgICAgIFRlc3RDb250cm9sbGVyIHNob3VsZCBzZXQgbWVkaWEgY2FjaGUg ZGlyZWN0b3J5IHByb3Blcmx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xOTM1ODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBVc2UgV0tDb250ZXh0Q29uZmlndXJhdGlvbiBpbiBUZXN0Q29udHJvbGxlciB0 byBzZXQgdGhlIG1lZGlhIGNhY2hlIGRpcmVjdG9yeQorCisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9DL1dLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYuY3BwOgorICAgICAgICAoV0tDb250ZXh0Q29u ZmlndXJhdGlvbkNvcHlNZWRpYUNhY2hlRGlyZWN0b3J5KToKKyAgICAgICAgKFdLQ29udGV4dENv bmZpZ3VyYXRpb25TZXRNZWRpYUNhY2hlRGlyZWN0b3J5KToKKyAgICAgICAgKiBVSVByb2Nlc3Mv QVBJL0MvV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZi5oOgorCiAyMDE5LTAxLTE4ICBQaGlsaXBw ZSBOb3JtYW5kICA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KIAogICAgICAgICBbV1BFXSBBZGQgUXQg ZXh0ZW5zaW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS0Nv bnRleHRDb25maWd1cmF0aW9uUmVmLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D L1dLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYuY3BwCmluZGV4IDg2ZDQxMjk5ZGZhYWIzZDY0ZTdj NDFlMDYwYzAyZjY2MWNkMWMzN2UuLmZkZDU1ZGQyYmJjNDAzYWE2ZDgwY2I5MmVjMjEyMTRhN2Y1 NTQ2MWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4 dENvbmZpZ3VyYXRpb25SZWYuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D L1dLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYuY3BwCkBAIC0xMTgsNiArMTE4LDE2IEBAIHZvaWQg V0tDb250ZXh0Q29uZmlndXJhdGlvblNldE1lZGlhS2V5c1N0b3JhZ2VEaXJlY3RvcnkoV0tDb250 ZXh0Q29uZmlndXJhdGlvblJlCiAgICAgdG9JbXBsKGNvbmZpZ3VyYXRpb24pLT5zZXRNZWRpYUtl eXNTdG9yYWdlRGlyZWN0b3J5KHRvSW1wbChtZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KS0+c3Ry aW5nKCkpOwogfQogCitXS1N0cmluZ1JlZiBXS0NvbnRleHRDb25maWd1cmF0aW9uQ29weU1lZGlh Q2FjaGVEaXJlY3RvcnkoV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uKQor eworICAgIHJldHVybiB0b0NvcGllZEFQSSh0b0ltcGwoY29uZmlndXJhdGlvbiktPm1lZGlhQ2Fj aGVEaXJlY3RvcnkoKSk7Cit9CisKK3ZvaWQgV0tDb250ZXh0Q29uZmlndXJhdGlvblNldE1lZGlh Q2FjaGVEaXJlY3RvcnkoV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uLCBX S1N0cmluZ1JlZiBtZWRpYUNhY2hlRGlyZWN0b3J5KQoreworICAgIHRvSW1wbChjb25maWd1cmF0 aW9uKS0+c2V0TWVkaWFDYWNoZURpcmVjdG9yeSh0b0ltcGwobWVkaWFDYWNoZURpcmVjdG9yeSkt PnN0cmluZygpKTsKK30KKwogV0tTdHJpbmdSZWYgV0tDb250ZXh0Q29uZmlndXJhdGlvbkNvcHlS ZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5KFdLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYg Y29uZmlndXJhdGlvbikKIHsKICAgICByZXR1cm4gdG9Db3BpZWRBUEkodG9JbXBsKGNvbmZpZ3Vy YXRpb24pLT5yZXNvdXJjZUxvYWRTdGF0aXN0aWNzRGlyZWN0b3J5KCkpOwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZi5o IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0Q29uZmlndXJhdGlvblJl Zi5oCmluZGV4IDMyNjk0MTcyYzU3ODRkOTM4MGEzZDRjYTA2OTI0YTVmMWZkNGVmYWEuLmJmMzc3 YzAwZTkwYjhkMGYwMGQwNmUwMWRmYTc1YmQ2M2Q0NGU1M2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYuaAorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHRDb25maWd1cmF0aW9uUmVmLmgK QEAgLTU3LDYgKzU3LDkgQEAgV0tfRVhQT1JUIHZvaWQgV0tDb250ZXh0Q29uZmlndXJhdGlvblNl dFdlYlNRTERhdGFiYXNlRGlyZWN0b3J5KFdLQ29udGV4dENvbmZpZ3UKIFdLX0VYUE9SVCBXS1N0 cmluZ1JlZiBXS0NvbnRleHRDb25maWd1cmF0aW9uQ29weU1lZGlhS2V5c1N0b3JhZ2VEaXJlY3Rv cnkoV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uKTsKIFdLX0VYUE9SVCB2 b2lkIFdLQ29udGV4dENvbmZpZ3VyYXRpb25TZXRNZWRpYUtleXNTdG9yYWdlRGlyZWN0b3J5KFdL Q29udGV4dENvbmZpZ3VyYXRpb25SZWYgY29uZmlndXJhdGlvbiwgV0tTdHJpbmdSZWYgbWVkaWFL ZXlzU3RvcmFnZURpcmVjdG9yeSk7CiAKK1dLX0VYUE9SVCBXS1N0cmluZ1JlZiBXS0NvbnRleHRD b25maWd1cmF0aW9uQ29weU1lZGlhQ2FjaGVEaXJlY3RvcnkoV0tDb250ZXh0Q29uZmlndXJhdGlv blJlZiBjb25maWd1cmF0aW9uKTsKK1dLX0VYUE9SVCB2b2lkIFdLQ29udGV4dENvbmZpZ3VyYXRp b25TZXRNZWRpYUNhY2hlRGlyZWN0b3J5KFdLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYgY29uZmln dXJhdGlvbiwgV0tTdHJpbmdSZWYgbWVkaWFDYWNoZURpcmVjdG9yeSk7CisKIFdLX0VYUE9SVCBX S1N0cmluZ1JlZiBXS0NvbnRleHRDb25maWd1cmF0aW9uQ29weVJlc291cmNlTG9hZFN0YXRpc3Rp Y3NEaXJlY3RvcnkoV0tDb250ZXh0Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uKTsKIFdL X0VYUE9SVCB2b2lkIFdLQ29udGV4dENvbmZpZ3VyYXRpb25TZXRSZXNvdXJjZUxvYWRTdGF0aXN0 aWNzRGlyZWN0b3J5KFdLQ29udGV4dENvbmZpZ3VyYXRpb25SZWYgY29uZmlndXJhdGlvbiwgV0tT dHJpbmdSZWYgcmVzb3VyY2VMb2FkU3RhdGlzdGljc0RpcmVjdG9yeSk7CiAKZGlmZiAtLWdpdCBh L1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyMzVkY2QxOTlmODVlZWQx ZGUwZWMyMjg1NGNmMWRjOTdjOGMxNDMzLi43OGEzODNmMTRmZTA3OGUwNzUxNWFkMDRjYWYzYzVj NjRjZmQ4OWYwIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTktMDEtMTggIE1hbmlnYW5kYW4gR29wYWxha2lyc2hu YW4gIDxNYW5pZ2FuZGFuX0dvcGFsYWtpcnNobmFuQGNhYmxlLmNvbWNhc3QuY29tPgorCisgICAg ICAgIFRlc3RDb250cm9sbGVyIHNob3VsZCBzZXQgbWVkaWEgY2FjaGUgZGlyZWN0b3J5IHByb3Bl cmx5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTM1 ODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2Ug V0tDb250ZXh0Q29uZmlndXJhdGlvbiBpbiBUZXN0Q29udHJvbGxlciB0byBzZXQgdGhlIG1lZGlh IGNhY2hlIGRpcmVjdG9yeQorCisgICAgICAgICogV2ViS2l0VGVzdFJ1bm5lci9UZXN0Q29udHJv bGxlci5jcHA6CisgICAgICAgIChXVFI6OlRlc3RDb250cm9sbGVyOjpnZW5lcmF0ZUNvbnRleHRD b25maWd1cmF0aW9uIGNvbnN0KToKKwogMjAxOS0wMS0xOCAgQWFrYXNoIEphaW4gIDxhYWthc2hf amFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgW2V3cy1idWlsZF0gUGFzcyBvd25lciB0byB0aGUg dHJpZ2dlcmVkIGJ1aWxkcwpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0 Q29udHJvbGxlci5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNw cAppbmRleCA5MjYxNzdlZjJjNzcyOWI0OGEzYmMwMzdhNDFhMWI2ZjJjNDM4MmQzLi5lMjIyNWMw MWJmY2Q5MGU2ZjQ1ZjVlNTg3ZGY3ZjA0ZDczN2EzMGU1IDEwMDY0NAotLS0gYS9Ub29scy9XZWJL aXRUZXN0UnVubmVyL1Rlc3RDb250cm9sbGVyLmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0UnVu bmVyL1Rlc3RDb250cm9sbGVyLmNwcApAQCAtNDU5LDYgKzQ1OSw3IEBAIFdLUmV0YWluUHRyPFdL Q29udGV4dENvbmZpZ3VyYXRpb25SZWY+IFRlc3RDb250cm9sbGVyOjpnZW5lcmF0ZUNvbnRleHRD b25maWd1cmF0CiAgICAgICAgIFdLQ29udGV4dENvbmZpZ3VyYXRpb25TZXRMb2NhbFN0b3JhZ2VE aXJlY3RvcnkoY29uZmlndXJhdGlvbi5nZXQoKSwgdG9XSyh0ZW1wb3JhcnlGb2xkZXIgKyBzZXBh cmF0b3IgKyAiTG9jYWxTdG9yYWdlIikuZ2V0KCkpOwogICAgICAgICBXS0NvbnRleHRDb25maWd1 cmF0aW9uU2V0V2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkoY29uZmlndXJhdGlvbi5nZXQoKSwgdG9X Syh0ZW1wb3JhcnlGb2xkZXIgKyBzZXBhcmF0b3IgKyAiRGF0YWJhc2VzIiArIHNlcGFyYXRvciAr ICJXZWJTUUwiKS5nZXQoKSk7CiAgICAgICAgIFdLQ29udGV4dENvbmZpZ3VyYXRpb25TZXRNZWRp YUtleXNTdG9yYWdlRGlyZWN0b3J5KGNvbmZpZ3VyYXRpb24uZ2V0KCksIHRvV0sodGVtcG9yYXJ5 Rm9sZGVyICsgc2VwYXJhdG9yICsgIk1lZGlhS2V5cyIpLmdldCgpKTsKKyAgICAgICAgV0tDb250 ZXh0Q29uZmlndXJhdGlvblNldE1lZGlhQ2FjaGVEaXJlY3RvcnkoY29uZmlndXJhdGlvbi5nZXQo KSwgdG9XSyh0ZW1wb3JhcnlGb2xkZXIgKyBzZXBhcmF0b3IgKyAiTWVkaWFDYWNoZSIpLmdldCgp KTsKICAgICAgICAgV0tDb250ZXh0Q29uZmlndXJhdGlvblNldFJlc291cmNlTG9hZFN0YXRpc3Rp Y3NEaXJlY3RvcnkoY29uZmlndXJhdGlvbi5nZXQoKSwgdG9XSyh0ZW1wb3JhcnlGb2xkZXIgKyBz ZXBhcmF0b3IgKyAiUmVzb3VyY2VMb2FkU3RhdGlzdGljcyIpLmdldCgpKTsKICAgICB9CiAgICAg cmV0dXJuIGNvbmZpZ3VyYXRpb247Cg==