109455 2013-02-11 09:27:54 -0800 [WK2] Allow using the value of WebContext::platformDefaultIconDatabasePath from the C API 2013-03-05 07:20:35 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 1 jturcotte jturcotte allan.jensen beidson benjamin jturcotte oldest_to_newest 829785 0 jturcotte 2013-02-11 09:27:54 -0800 [WK2] Allow using the value of WebContext::platformDefaultIconDatabasePath from the C API 829801 1 187601 jturcotte 2013-02-11 09:43:36 -0800 Created attachment 187601 Patch 830862 2 allan.jensen 2013-02-12 06:12:26 -0800 What happens if you set an override path on an already open icon-database? 830872 3 jturcotte 2013-02-12 06:18:23 -0800 (In reply to comment #2) > What happens if you set an override path on an already open icon-database? It won't have any effect unless it's closed and re-opened. The same as when calling setLocalStorageDirectory, setCookieStorageDirectory, etc. after the web process was started. 836376 4 jturcotte 2013-02-19 07:27:13 -0800 Brady, could you please have a look at the patch? I think that this needs to go through you. 845315 5 187601 beidson 2013-03-01 11:03:36 -0800 Comment on attachment 187601 Patch I'm confused as to why this is important. It's increasing the API surface to accomplish something that is already possible today - opening the icondatabase at the platform default path. 845345 6 jturcotte 2013-03-01 11:21:24 -0800 (In reply to comment #5) If I'm not missing anything, it's only possible to open it from outside the current C API with: - WebIconDatabase::setDatabasePath(const String& path) - From WebContext::setIconDatabasePath(const String& path) - Finally from WKContextSetIconDatabasePath(WKContextRef contextRef, WKStringRef iconDatabasePath) This code path doesn't use the value returned by WebContext::platformDefaultIconDatabasePath() the same way it is possible with platformDefaultDatabaseDirectory(), platformDefaultLocalStorageDirectory() and platformDefaultCookieStorageDirectory(). Another way would be to set all of them through the C API client and not use the platformDefault* methods at all, if you think it would be cleaner. 845392 7 beidson 2013-03-01 12:16:35 -0800 (In reply to comment #6) > (In reply to comment #5) > > If I'm not missing anything, it's only possible to open it from outside the current C API with: > - WebIconDatabase::setDatabasePath(const String& path) > - From WebContext::setIconDatabasePath(const String& path) > - Finally from WKContextSetIconDatabasePath(WKContextRef contextRef, WKStringRef iconDatabasePath) > > This code path doesn't use the value returned by WebContext::platformDefaultIconDatabasePath() the same way it is possible with platformDefaultDatabaseDirectory(), platformDefaultLocalStorageDirectory() and platformDefaultCookieStorageDirectory(). > > Another way would be to set all of them through the C API client and not use the platformDefault* methods at all, if you think it would be cleaner. WKContextSetIconDatabasePath is the call in the current C API that opens the icon database. You can call it with the default path to open the database at the default path. The notion of a "default path" was a mistake. Clients should always have to explicitly provide a path. 847662 8 187601 jturcotte 2013-03-05 07:20:06 -0800 Comment on attachment 187601 Patch (In reply to comment #7) > WKContextSetIconDatabasePath is the call in the current C API that opens the icon database. > > You can call it with the default path to open the database at the default path. > > The notion of a "default path" was a mistake. Clients should always have to explicitly provide a path. Alright, that makes sense. I've gone that way with the patch for bug 111435, thanks for the input. 187601 2013-02-11 09:43:36 -0800 2013-03-05 07:20:05 -0800 Patch bug-109455-20130211184006.patch text/plain 8184 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogMTQyMjUwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNjk5YTI3NzVlZDU3NDU4 OTU1ODFjNjBmMzMzOThjYzA3M2NkMDBmMy4uNzEzNWFhMzk4NTI1ZjhmZGVhZmZmZmQ3YTBkZGI0 ODZiNjZkNjA4NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM3IEBACisyMDEzLTAyLTExICBKb2Nl bHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBkaWdpYS5jb20+CisKKyAgICAgICAgW1dL Ml0gQWxsb3cgdXNpbmcgdGhlIHZhbHVlIG9mIFdlYkNvbnRleHQ6OnBsYXRmb3JtRGVmYXVsdElj b25EYXRhYmFzZVBhdGggZnJvbSB0aGUgQyBBUEkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEwOTQ1NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIEN1cnJlbnRseSwgdGhlIG9ubHkgd2F5IHRvIG9wZW4gdGhl IGljb24gZGF0YWJhc2UgZnJvbSB0aGUgQyBBUEkgaXMKKyAgICAgICAgdGhyb3VnaCB0aGUgcHJp dmF0ZSBXS0NvbnRleHRTZXRJY29uRGF0YWJhc2VQYXRoIEFQSS4KKyAgICAgICAgVGhpcyBob3dl dmVyIGFsd2F5cyBieXBhc3NlcyB0aGUgcGxhdGZvcm0gZGVmYXVsdCB2YWx1ZSBhbmQgY3JlYXRl cworICAgICAgICBhIG5lZWQgZm9yIGJvdGggdGhlIFdlYktpdDIgYW5kIGNsaWVudCBjb2RlIHRv IGRlYWwgd2l0aCBkaWZmZXJlbnQKKyAgICAgICAgZGVmYXVsdCBzdG9yYWdlIHBhdGhzLgorCisg ICAgICAgIFRoaXMgcGF0Y2ggYWRkcyBhbiBleHBsaWNpdCBXS0ljb25EYXRhYmFzZU9wZW4gZnVu Y3Rpb24gdG8gb3BlbiB0aGUKKyAgICAgICAgZGF0YWJhc2UsIG9wdGlvbmFsbHkgdXNpbmcgdGhl IG92ZXJyaWRkZW4gdmFsdWUgc2V0IGJ5CisgICAgICAgIFdLQ29udGV4dFNldEljb25EYXRhYmFz ZVBhdGguCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0LmNwcDoKKyAgICAg ICAgKFdLQ29udGV4dFNldEljb25EYXRhYmFzZVBhdGgpOgorICAgICAgICAgIC0gRXhwbGljaXRs eSBjYWxsIFdlYkljb25EYXRhYmFzZTo6b3BlbiB0byBwcmVzZXJ2ZSB0aGUgYmVoYXZpb3Igb2Yg dGhpcyBwcml2YXRlIEFQSQorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS0ljb25EYXRhYmFz ZS5jcHA6CisgICAgICAgIChXS0ljb25EYXRhYmFzZU9wZW4pOgorICAgICAgICAgIC0gTmV3IEMg QVBJLCBzeW1tZXRyaWMgd2l0aCBXS0ljb25EYXRhYmFzZUNsb3NlCisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9DL1dLSWNvbkRhdGFiYXNlLmg6CisgICAgICAgICogVUlQcm9jZXNzL1dlYkNvbnRl eHQuY3BwOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJDb250ZXh0Lmg6CisgICAgICAgIChXZWJL aXQ6OldlYkNvbnRleHQ6OnNldEljb25EYXRhYmFzZVBhdGgpOgorICAgICAgICAqIFVJUHJvY2Vz cy9XZWJJY29uRGF0YWJhc2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJJY29uRGF0YWJhc2U6 Om9wZW4pOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJJY29uRGF0YWJhc2UuaDoKKyAgICAgICAg ICAtIFVwZGF0ZSB0aGUgaW1wbGVtZW50YXRpb24gdG8ga2VlcCB0aGUgQVBJIGxheWVyIGxlYW4K KyAgICAgICAgKFdlYkljb25EYXRhYmFzZSk6CisgICAgICAgICogbWFjL1dlYktpdDIub3JkZXI6 CisKIDIwMTMtMDItMDcgIFNoZXJpZmYgQm90ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29t PgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxNDIyMTIuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0LmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHQuY3BwCmluZGV4IDVjODM4ZmU4NzdiZWQ3 ZjQzMTQ5YTc3ZTc5ZDVhOTAyZTcwMGJmZDUuLjNhNTNjYjBlZGNkZTFiZGVjNTgxZjczNmNhNGY1 NTUyZGM4MjQxZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9X S0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0NvbnRl eHQuY3BwCkBAIC0yOSw2ICsyOSw3IEBACiAKICNpbmNsdWRlICJXS0FQSUNhc3QuaCIKICNpbmNs dWRlICJXZWJDb250ZXh0LmgiCisjaW5jbHVkZSAiV2ViSWNvbkRhdGFiYXNlLmgiCiAjaW5jbHVk ZSAiV2ViVVJMUmVxdWVzdC5oIgogI2luY2x1ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CiAjaW5jbHVk ZSA8d3RmL1JlZlB0ci5oPgpAQCAtMjgyLDYgKzI4Myw4IEBAIHZvaWQgV0tDb250ZXh0U3RvcE1l bW9yeVNhbXBsZXIoV0tDb250ZXh0UmVmIGNvbnRleHRSZWYpCiB2b2lkIFdLQ29udGV4dFNldElj b25EYXRhYmFzZVBhdGgoV0tDb250ZXh0UmVmIGNvbnRleHRSZWYsIFdLU3RyaW5nUmVmIGljb25E YXRhYmFzZVBhdGgpCiB7CiAgICAgdG9JbXBsKGNvbnRleHRSZWYpLT5zZXRJY29uRGF0YWJhc2VQ YXRoKHRvSW1wbChpY29uRGF0YWJhc2VQYXRoKS0+c3RyaW5nKCkpOworICAgIC8vIFJldGFpbiB0 aGUgb2xkIGJlaGF2aW9yIG9mIFdLQ29udGV4dFNldEljb25EYXRhYmFzZVBhdGg6IG9wZW4gdGhl IGRhdGFiYXNlIHdoZW4gc2V0dGluZyBpdHMgcGF0aC4KKyAgICB0b0ltcGwoY29udGV4dFJlZikt Pmljb25EYXRhYmFzZSgpLT5vcGVuKCk7CiB9CiAKIHZvaWQgV0tDb250ZXh0QWxsb3dTcGVjaWZp Y0hUVFBTQ2VydGlmaWNhdGVGb3JIb3N0KFdLQ29udGV4dFJlZiBjb250ZXh0UmVmLCBXS0NlcnRp ZmljYXRlSW5mb1JlZiBjZXJ0aWZpY2F0ZVJlZiwgV0tTdHJpbmdSZWYgaG9zdFJlZikKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS0ljb25EYXRhYmFzZS5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tJY29uRGF0YWJhc2UuY3BwCmluZGV4 IGQ2NjdiYjc1MjM0MWQyMzZmNzYzNWY0ZmI4MTIyNzhiY2M3YzVlMjEuLjc2ZmM0ZThiZjZiNDAx NmRmMTNjOTIwYWJhNWVhN2Y1ZGQ1ODlkNjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9BUEkvQy9XS0ljb25EYXRhYmFzZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9DL1dLSWNvbkRhdGFiYXNlLmNwcApAQCAtNjYsNiArNjYsMTEgQEAgdm9pZCBX S0ljb25EYXRhYmFzZUNoZWNrSW50ZWdyaXR5QmVmb3JlT3BlbmluZyhXS0ljb25EYXRhYmFzZVJl ZiBpY29uRGF0YWJhc2VSZWYKICAgICB0b0ltcGwoaWNvbkRhdGFiYXNlUmVmKS0+Y2hlY2tJbnRl Z3JpdHlCZWZvcmVPcGVuaW5nKCk7CiB9CiAKK3ZvaWQgV0tJY29uRGF0YWJhc2VPcGVuKFdLSWNv bkRhdGFiYXNlUmVmIGljb25EYXRhYmFzZVJlZikKK3sKKyAgICB0b0ltcGwoaWNvbkRhdGFiYXNl UmVmKS0+b3BlbigpOworfQorCiB2b2lkIFdLSWNvbkRhdGFiYXNlQ2xvc2UoV0tJY29uRGF0YWJh c2VSZWYgaWNvbkRhdGFiYXNlUmVmKQogewogICAgIHRvSW1wbChpY29uRGF0YWJhc2VSZWYpLT5j bG9zZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLSWNv bkRhdGFiYXNlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tJY29uRGF0YWJh c2UuaAppbmRleCBlZWM0YWIzYWZlYmFjNWRhYzY3ZDBmMjA3MTg3NjI2NzBhYWRlMDk5Li42MDdh ODg1NTJlZjI1N2U5NWYzMzllZGE0MjU3ZWM4NDZhZGUxNTFmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tJY29uRGF0YWJhc2UuaAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tJY29uRGF0YWJhc2UuaApAQCAtNjMsNiArNjMsNyBAQCBX S19FWFBPUlQgdm9pZCBXS0ljb25EYXRhYmFzZUVuYWJsZURhdGFiYXNlQ2xlYW51cChXS0ljb25E YXRhYmFzZVJlZiBpY29uRGF0YWJhcwogV0tfRVhQT1JUIHZvaWQgV0tJY29uRGF0YWJhc2VSZW1v dmVBbGxJY29ucyhXS0ljb25EYXRhYmFzZVJlZiBpY29uRGF0YWJhc2UpOwogV0tfRVhQT1JUIHZv aWQgV0tJY29uRGF0YWJhc2VDaGVja0ludGVncml0eUJlZm9yZU9wZW5pbmcoV0tJY29uRGF0YWJh c2VSZWYgaWNvbkRhdGFiYXNlKTsKIAorV0tfRVhQT1JUIHZvaWQgV0tJY29uRGF0YWJhc2VPcGVu KFdLSWNvbkRhdGFiYXNlUmVmIGljb25EYXRhYmFzZSk7CiBXS19FWFBPUlQgdm9pZCBXS0ljb25E YXRhYmFzZUNsb3NlKFdLSWNvbkRhdGFiYXNlUmVmIGljb25EYXRhYmFzZSk7CiAKICNpZmRlZiBf X2NwbHVzcGx1cwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRl eHQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwCmluZGV4IGI3 ZmYxMTVmZDNmYmI2MDM1ZDgzZTliNTQ0MjY3Zjg0NTFjMjcxNWEuLmYxYmFlZTk2Njk5YmI0N2Jl NDdjMTE5M2ZlZjdmODcyODYzOTg3MjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29u dGV4dC5jcHAKQEAgLTEwMDAsMTIgKzEwMDAsNiBAQCBTdHJpbmcgV2ViQ29udGV4dDo6ZGF0YWJh c2VEaXJlY3RvcnkoKSBjb25zdAogICAgIHJldHVybiBwbGF0Zm9ybURlZmF1bHREYXRhYmFzZURp cmVjdG9yeSgpOwogfQogCi12b2lkIFdlYkNvbnRleHQ6OnNldEljb25EYXRhYmFzZVBhdGgoY29u c3QgU3RyaW5nJiBwYXRoKQotewotICAgIG1fb3ZlcnJpZGVJY29uRGF0YWJhc2VQYXRoID0gcGF0 aDsKLSAgICBtX2ljb25EYXRhYmFzZS0+c2V0RGF0YWJhc2VQYXRoKHBhdGgpOwotfQotCiBTdHJp bmcgV2ViQ29udGV4dDo6aWNvbkRhdGFiYXNlUGF0aCgpIGNvbnN0CiB7CiAgICAgaWYgKCFtX292 ZXJyaWRlSWNvbkRhdGFiYXNlUGF0aC5pc0VtcHR5KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YkNvbnRleHQuaAppbmRleCAwZDgzZDUzYzVlNDIwMzhjNWIyNmFlNWI3ZjhlNDE1NTRhODZlYmFk Li41MTliYmVmMjU0OTk1Yjg5OTY3ZmY0NmZjYmNmYTZiODNmYzFhNjVmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJDb250ZXh0LmgKQEAgLTIyMiw3ICsyMjIsNyBAQCBwdWJsaWM6CiAgICAg c3RhdGljIFN0YXRpc3RpY3MmIHN0YXRpc3RpY3MoKTsgICAgCiAKICAgICB2b2lkIHNldERhdGFi YXNlRGlyZWN0b3J5KGNvbnN0IFN0cmluZyYgZGlyKSB7IG1fb3ZlcnJpZGVEYXRhYmFzZURpcmVj dG9yeSA9IGRpcjsgfQotICAgIHZvaWQgc2V0SWNvbkRhdGFiYXNlUGF0aChjb25zdCBTdHJpbmcm KTsKKyAgICB2b2lkIHNldEljb25EYXRhYmFzZVBhdGgoY29uc3QgU3RyaW5nJiBwYXRoKSB7IG1f b3ZlcnJpZGVJY29uRGF0YWJhc2VQYXRoID0gcGF0aDsgfQogICAgIFN0cmluZyBpY29uRGF0YWJh c2VQYXRoKCkgY29uc3Q7CiAgICAgdm9pZCBzZXRMb2NhbFN0b3JhZ2VEaXJlY3RvcnkoY29uc3Qg U3RyaW5nJiBkaXIpIHsgbV9vdmVycmlkZUxvY2FsU3RvcmFnZURpcmVjdG9yeSA9IGRpcjsgfQog ICAgIHZvaWQgc2V0RGlza0NhY2hlRGlyZWN0b3J5KGNvbnN0IFN0cmluZyYgZGlyKSB7IG1fb3Zl cnJpZGVEaXNrQ2FjaGVEaXJlY3RvcnkgPSBkaXI7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9XZWJJY29uRGF0YWJhc2UuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYkljb25EYXRhYmFzZS5jcHAKaW5kZXggNzEzZjYwNTQ1NzlkZTY0YjZiNmMwNDA3MzM4 NzRhZDlkZTY1NWZkNy4uYjBkMGYyNDY0Mjk3OTJkZGM2ODYyMTIyMDJlNzZkNDdiYjBhYjMxNyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkljb25EYXRhYmFzZS5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkljb25EYXRhYmFzZS5jcHAKQEAgLTYz LDEwICs2MywxMCBAQCB2b2lkIFdlYkljb25EYXRhYmFzZTo6aW52YWxpZGF0ZSgpCiAgICAgc2V0 R2xvYmFsSWNvbkRhdGFiYXNlKDApOwogfQogCi12b2lkIFdlYkljb25EYXRhYmFzZTo6c2V0RGF0 YWJhc2VQYXRoKGNvbnN0IFN0cmluZyYgcGF0aCkKK3ZvaWQgV2ViSWNvbkRhdGFiYXNlOjpvcGVu KCkKIHsKICAgICBpZiAoaXNPcGVuKCkpIHsKLSAgICAgICAgTE9HX0VSUk9SKCJJY29uIGRhdGFi YXNlIGFscmVhZHkgaGFzIGEgcGF0aCBhbmQgaXMgYWxyZWFkeSBvcGVuLiBXZSBkb24ndCBjdXJy ZW50bHkgc3VwcG9ydCBjaGFuZ2luZyBpdHMgcGF0aCBhbmQgcmVvcGVuaW5nLiIpOworICAgICAg ICBMT0dfRVJST1IoIkljb24gZGF0YWJhc2UgaXMgYWxyZWFkeSBvcGVuLiBXZSBkb24ndCBjdXJy ZW50bHkgc3VwcG9ydCBjaGFuZ2luZyBpdHMgcGF0aCBhbmQgcmVvcGVuaW5nLiIpOwogICAgICAg ICByZXR1cm47CiAgICAgfQogCkBAIC03NSw2ICs3NSw3IEBAIHZvaWQgV2ViSWNvbkRhdGFiYXNl OjpzZXREYXRhYmFzZVBhdGgoY29uc3QgU3RyaW5nJiBwYXRoKQogICAgIEljb25EYXRhYmFzZTo6 ZGVsYXlEYXRhYmFzZUNsZWFudXAoKTsKICAgICBtX2RhdGFiYXNlQ2xlYW51cERpc2FibGVkID0g dHJ1ZTsKICAgICBtX2ljb25EYXRhYmFzZUltcGwtPnNldEVuYWJsZWQodHJ1ZSk7CisgICAgU3Ry aW5nIHBhdGggPSBtX3dlYkNvbnRleHQtPmljb25EYXRhYmFzZVBhdGgoKTsKICAgICBpZiAoIW1f aWNvbkRhdGFiYXNlSW1wbC0+b3BlbihkaXJlY3RvcnlOYW1lKHBhdGgpLCBwYXRoR2V0RmlsZU5h bWUocGF0aCkpKSB7CiAgICAgICAgIExPR19FUlJPUigiVW5hYmxlIHRvIG9wZW4gV2ViS2l0MiBp Y29uIGRhdGFiYXNlIG9uIGRpc2siKTsKICAgICAgICAgbV9pY29uRGF0YWJhc2VJbXBsLmNsZWFy KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSWNvbkRhdGFiYXNl LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViSWNvbkRhdGFiYXNlLmgKaW5kZXggODQ0 ZTJkOTVkMjFjMDI1YzQyMDM4ZTEzYmRlMTFlNTJhYjBlMDc4NC4uZGUwZmE2ZGJkMDkzZGExNGM2 ZDlhMzExYjJkM2Q4YWQ2NmJmYmJlZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1dlYkljb25EYXRhYmFzZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJJ Y29uRGF0YWJhc2UuaApAQCAtNjIsNyArNjIsNyBAQCBwdWJsaWM6CiAKICAgICB2b2lkIGludmFs aWRhdGUoKTsKICAgICB2b2lkIGNsZWFyQ29udGV4dCgpIHsgbV93ZWJDb250ZXh0ID0gMDsgfQot ICAgIHZvaWQgc2V0RGF0YWJhc2VQYXRoKGNvbnN0IFN0cmluZyYpOworICAgIHZvaWQgb3Blbigp OwogICAgIHZvaWQgZW5hYmxlRGF0YWJhc2VDbGVhbnVwKCk7CiAKICAgICB2b2lkIHJldGFpbklj b25Gb3JQYWdlVVJMKGNvbnN0IFN0cmluZyYpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv bWFjL1dlYktpdDIub3JkZXIgYi9Tb3VyY2UvV2ViS2l0Mi9tYWMvV2ViS2l0Mi5vcmRlcgppbmRl eCAwYzJjNTM1ODJhN2E0MTY1OTI1OWUxZTEzZDc0NDM4YzQ0NzRlZjU3Li4xMDBiMzA2NDM0YTdh YmJmMjU5YTg4ODQ3YjVlYTc1MzcwMTM2MjNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9t YWMvV2ViS2l0Mi5vcmRlcgorKysgYi9Tb3VyY2UvV2ViS2l0Mi9tYWMvV2ViS2l0Mi5vcmRlcgpA QCAtNDAsOCArNDAsNyBAQCBfV0tSZXRhaW4KIF9XS1JlbGVhc2UKIF9fWk4zV1RGMTBSZWZDb3Vu dGVkSU42V2ViS2l0OUFQSU9iamVjdEVFNWRlcmVmRXYKIF9XS0NvbnRleHRTZXRJY29uRGF0YWJh c2VQYXRoCi1fX1pONldlYktpdDEwV2ViQ29udGV4dDE5c2V0SWNvbkRhdGFiYXNlUGF0aEVSS04z V1RGNlN0cmluZ0UKLV9fWk42V2ViS2l0MTVXZWJJY29uRGF0YWJhc2UxNXNldERhdGFiYXNlUGF0 aEVSS04zV1RGNlN0cmluZ0UKK19fWk42V2ViS2l0MTVXZWJJY29uRGF0YWJhc2U0b3BlbkV2CiBf X1pONldlYktpdDlXZWJTdHJpbmdEMEV2CiBfV0tDb250ZXh0R2V0SWNvbkRhdGFiYXNlCiBfV0tJ Y29uRGF0YWJhc2VTZXRJY29uRGF0YWJhc2VDbGllbnQK