107920 2013-01-24 23:22:21 -0800 [EFL][WK2] Use C API inside ewk_database_manager and ewk_storage_manager 2013-01-26 00:01:11 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 107657 1 cdumez cdumez ap benjamin gyuyoung.kim kenneth lucas.de.marchi mikhail.pozdnyakov naginenis rakuco webkit.review.bot oldest_to_newest 816294 0 cdumez 2013-01-24 23:22:21 -0800 As per Bug 107657, we should start using the C API internally to avoid violating layering. 816314 1 184682 cdumez 2013-01-24 23:48:43 -0800 Created attachment 184682 Patch 817134 2 184682 gyuyoung.kim 2013-01-25 22:48:48 -0800 Comment on attachment 184682 Patch LGTM, 817138 3 184682 benjamin 2013-01-25 23:09:56 -0800 Comment on attachment 184682 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=184682&action=review This looks correct to me too. Just one question: > Source/WebKit2/UIProcess/API/efl/ewk_context.cpp:70 > EwkContext::EwkContext(PassRefPtr<WebContext> context) > : m_context(context) > - , m_databaseManager(EwkDatabaseManager::create(m_context)) > - , m_storageManager(EwkStorageManager::create(m_context)) > + , m_databaseManager(EwkDatabaseManager::create(WKContextGetDatabaseManager(toAPI(m_context.get())))) > + , m_storageManager(EwkStorageManager::create(WKContextGetKeyValueStorageManager(toAPI(m_context.get())))) It is disturbing the constructor takes a WebContext. Can you give some ... context :) ... why is it done this way? 817143 4 184682 cdumez 2013-01-25 23:49:24 -0800 Comment on attachment 184682 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=184682&action=review >> Source/WebKit2/UIProcess/API/efl/ewk_context.cpp:70 >> + , m_storageManager(EwkStorageManager::create(WKContextGetKeyValueStorageManager(toAPI(m_context.get())))) > > It is disturbing the constructor takes a WebContext. Can you give some ... context :) ... why is it done this way? Yes, this is temporary until EwkContext is ported to the C API. This will be addressed in Bug 107666. We are going incrementally. 817145 5 184682 benjamin 2013-01-25 23:55:38 -0800 Comment on attachment 184682 Patch > Yes, this is temporary until EwkContext is ported to the C API. This will be addressed in Bug 107666. We are going incrementally. Okay. The patch looks great otherwise, let's land this. 817146 6 184682 webkit.review.bot 2013-01-26 00:01:05 -0800 Comment on attachment 184682 Patch Clearing flags on attachment: 184682 Committed r140905: <http://trac.webkit.org/changeset/140905> 817147 7 webkit.review.bot 2013-01-26 00:01:11 -0800 All reviewed patches have been landed. Closing bug. 184682 2013-01-24 23:48:43 -0800 2013-01-26 00:01:05 -0800 Patch 107920_ewk_database_capi.patch text/plain 8197 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzNTM4MzI1Li44NWNkNGRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkg QEAKKzIwMTMtMDEtMjQgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIFVzZSBDIEFQSSBpbnNpZGUgZXdrX2RhdGFiYXNl X21hbmFnZXIgYW5kIGV3a19zdG9yYWdlX21hbmFnZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwNzkyMAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzZSBDIEFQSSBpbnNpZGUgZXdrX2RhdGFiYXNlX21h bmFnZXIgYW5kIGV3a19zdG9yYWdlX21hbmFnZXIgaW5zdGVhZAorICAgICAgICBvZiBhY2Nlc3Np bmcgaW50ZXJuYWwgQysrIGNsYXNzZXMgZGlyZWN0bHksIHRvIGF2b2lkIHZpb2xhdGluZyBBUEkK KyAgICAgICAgbGF5ZXJpbmcuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29u dGV4dC5jcHA6CisgICAgICAgIChFd2tDb250ZXh0OjpFd2tDb250ZXh0KToKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL2VmbC9ld2tfZGF0YWJhc2VfbWFuYWdlci5jcHA6CisgICAgICAgIChFd2tE YXRhYmFzZU1hbmFnZXI6OkV3a0RhdGFiYXNlTWFuYWdlcik6CisgICAgICAgIChFd2tEYXRhYmFz ZU1hbmFnZXI6OmdldERhdGFiYXNlT3JpZ2lucyk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX2RhdGFiYXNlX21hbmFnZXJfcHJpdmF0ZS5oOgorICAgICAgICAoRXdrRGF0YWJhc2VN YW5hZ2VyOjpjcmVhdGUpOgorICAgICAgICAoRXdrRGF0YWJhc2VNYW5hZ2VyKToKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfc3RvcmFnZV9tYW5hZ2VyLmNwcDoKKyAgICAgICAgKEV3 a1N0b3JhZ2VNYW5hZ2VyOjpFd2tTdG9yYWdlTWFuYWdlcik6CisgICAgICAgIChFd2tTdG9yYWdl TWFuYWdlcjo6Z2V0U3RvcmFnZU9yaWdpbnMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZs L2V3a19zdG9yYWdlX21hbmFnZXJfcHJpdmF0ZS5oOgorICAgICAgICAoRXdrU3RvcmFnZU1hbmFn ZXI6OmNyZWF0ZSk6CisgICAgICAgIChFd2tTdG9yYWdlTWFuYWdlcik6CisKIDIwMTMtMDEtMjQg IFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgW3drMl0g UGFnZSBvdmVybGF5cyBzaG91bGQgZG8gdGhlaXIgb3duIGFuaW1hdGlvbiwgaW5zdGVhZCBvZiBy ZWx5aW5nIG9uIGltcGxpY2l0IGFuaW1hdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwCmluZGV4IGZlZWQ5N2YuLjc5YzdiODIzIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfY29udGV4dC5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2NvbnRleHQuY3BwCkBA IC0yNiw2ICsyNiw3IEBACiAjaW5jbHVkZSAiTmV0d29ya0luZm9Qcm92aWRlci5oIgogI2luY2x1 ZGUgIlJlcXVlc3RNYW5hZ2VyQ2xpZW50RWZsLmgiCiAjaW5jbHVkZSAiV0tBUElDYXN0LmgiCisj aW5jbHVkZSAiV0tDb250ZXh0LmgiCiAjaW5jbHVkZSAiV0tDb250ZXh0U291cC5oIgogI2luY2x1 ZGUgIldLTnVtYmVyLmgiCiAjaW5jbHVkZSAiV0tSZXRhaW5QdHIuaCIKQEAgLTY1LDggKzY2LDgg QEAgc3RhdGljIGlubGluZSBDb250ZXh0TWFwJiBjb250ZXh0TWFwKCkKIAogRXdrQ29udGV4dDo6 RXdrQ29udGV4dChQYXNzUmVmUHRyPFdlYkNvbnRleHQ+IGNvbnRleHQpCiAgICAgOiBtX2NvbnRl eHQoY29udGV4dCkKLSAgICAsIG1fZGF0YWJhc2VNYW5hZ2VyKEV3a0RhdGFiYXNlTWFuYWdlcjo6 Y3JlYXRlKG1fY29udGV4dCkpCi0gICAgLCBtX3N0b3JhZ2VNYW5hZ2VyKEV3a1N0b3JhZ2VNYW5h Z2VyOjpjcmVhdGUobV9jb250ZXh0KSkKKyAgICAsIG1fZGF0YWJhc2VNYW5hZ2VyKEV3a0RhdGFi YXNlTWFuYWdlcjo6Y3JlYXRlKFdLQ29udGV4dEdldERhdGFiYXNlTWFuYWdlcih0b0FQSShtX2Nv bnRleHQuZ2V0KCkpKSkpCisgICAgLCBtX3N0b3JhZ2VNYW5hZ2VyKEV3a1N0b3JhZ2VNYW5hZ2Vy OjpjcmVhdGUoV0tDb250ZXh0R2V0S2V5VmFsdWVTdG9yYWdlTWFuYWdlcih0b0FQSShtX2NvbnRl eHQuZ2V0KCkpKSkpCiAjaWYgRU5BQkxFKEJBVFRFUllfU1RBVFVTKQogICAgICwgbV9iYXR0ZXJ5 UHJvdmlkZXIoQmF0dGVyeVByb3ZpZGVyOjpjcmVhdGUobV9jb250ZXh0KSkKICNlbmRpZgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2RhdGFiYXNlX21h bmFnZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2RhdGFiYXNl X21hbmFnZXIuY3BwCmluZGV4IDg0YjY0YzMuLjIwMTU1NDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19kYXRhYmFzZV9tYW5hZ2VyLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfZGF0YWJhc2VfbWFuYWdlci5jcHAK QEAgLTI4LDIxICsyOCwyMSBAQAogCiAjaW5jbHVkZSAiV0tBUElDYXN0LmgiCiAjaW5jbHVkZSAi V0tBcnJheS5oIgotI2luY2x1ZGUgIldLRGF0YWJhc2VNYW5hZ2VyLmgiCi0jaW5jbHVkZSAiV2Vi RGF0YWJhc2VNYW5hZ2VyUHJveHkuaCIKICNpbmNsdWRlICJld2tfZGF0YWJhc2VfbWFuYWdlcl9w cml2YXRlLmgiCiAjaW5jbHVkZSAiZXdrX2Vycm9yX3ByaXZhdGUuaCIKICNpbmNsdWRlICJld2tf c2VjdXJpdHlfb3JpZ2luX3ByaXZhdGUuaCIKIAogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAot RXdrRGF0YWJhc2VNYW5hZ2VyOjpFd2tEYXRhYmFzZU1hbmFnZXIoV2ViRGF0YWJhc2VNYW5hZ2Vy UHJveHkqIGRhdGFiYXNlTWFuYWdlcikKK0V3a0RhdGFiYXNlTWFuYWdlcjo6RXdrRGF0YWJhc2VN YW5hZ2VyKFdLRGF0YWJhc2VNYW5hZ2VyUmVmIGRhdGFiYXNlTWFuYWdlcikKICAgICA6IG1fZGF0 YWJhc2VNYW5hZ2VyKGRhdGFiYXNlTWFuYWdlcikKLXsgfQoreworICAgIEFTU0VSVChkYXRhYmFz ZU1hbmFnZXIpOworfQogCiB2b2lkIEV3a0RhdGFiYXNlTWFuYWdlcjo6Z2V0RGF0YWJhc2VPcmln aW5zKFdLRGF0YWJhc2VNYW5hZ2VyR2V0RGF0YWJhc2VPcmlnaW5zRnVuY3Rpb24gY2FsbGJhY2ss IHZvaWQqIGNvbnRleHQpIGNvbnN0CiB7Ci0gICAgV0tEYXRhYmFzZU1hbmFnZXJHZXREYXRhYmFz ZU9yaWdpbnModG9BUEkobV9kYXRhYmFzZU1hbmFnZXIuZ2V0KCkpLCBjb250ZXh0LCBjYWxsYmFj ayk7CisgICAgV0tEYXRhYmFzZU1hbmFnZXJHZXREYXRhYmFzZU9yaWdpbnMobV9kYXRhYmFzZU1h bmFnZXIuZ2V0KCksIGNvbnRleHQsIGNhbGxiYWNrKTsKIH0KIAogRWluYV9MaXN0KiBFd2tEYXRh YmFzZU1hbmFnZXI6OmNyZWF0ZU9yaWdpbkxpc3QoV0tBcnJheVJlZiBvcmlnaW5zKSBjb25zdApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX2RhdGFiYXNl X21hbmFnZXJfcHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdr X2RhdGFiYXNlX21hbmFnZXJfcHJpdmF0ZS5oCmluZGV4IGRhOGEyYTAuLmI3NjkxODUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19kYXRhYmFzZV9tYW5h Z2VyX3ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tf ZGF0YWJhc2VfbWFuYWdlcl9wcml2YXRlLmgKQEAgLTI3LDggKzI3LDcgQEAKICNkZWZpbmUgZXdr X2RhdGFiYXNlX21hbmFnZXJfcHJpdmF0ZV9oCiAKICNpbmNsdWRlICJXS0RhdGFiYXNlTWFuYWdl ci5oIgotI2luY2x1ZGUgIldlYkNvbnRleHQuaCIKLSNpbmNsdWRlICJXZWJEYXRhYmFzZU1hbmFn ZXJQcm94eS5oIgorI2luY2x1ZGUgIldLUmV0YWluUHRyLmgiCiAjaW5jbHVkZSAiZXdrX3NlY3Vy aXR5X29yaWdpbl9wcml2YXRlLmgiCiAjaW5jbHVkZSA8V2ViS2l0Mi9XS0Jhc2UuaD4KICNpbmNs dWRlIDx3dGYvUGFzc093blB0ci5oPgpAQCAtMzcsMTkgKzM2LDE5IEBAIHVzaW5nIG5hbWVzcGFj ZSBXZWJLaXQ7CiAKIGNsYXNzIEV3a0RhdGFiYXNlTWFuYWdlciB7CiBwdWJsaWM6Ci0gICAgc3Rh dGljIFBhc3NPd25QdHI8RXdrRGF0YWJhc2VNYW5hZ2VyPiBjcmVhdGUoUGFzc1JlZlB0cjxXZWJD b250ZXh0PiBjb250ZXh0KQorICAgIHN0YXRpYyBQYXNzT3duUHRyPEV3a0RhdGFiYXNlTWFuYWdl cj4gY3JlYXRlKFdLRGF0YWJhc2VNYW5hZ2VyUmVmIGRhdGFiYXNlTWFuYWdlcikKICAgICB7Ci0g ICAgICAgIEFTU0VSVChjb250ZXh0KTsKLSAgICAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBFd2tE YXRhYmFzZU1hbmFnZXIoY29udGV4dC0+c3VwcGxlbWVudDxXZWJEYXRhYmFzZU1hbmFnZXJQcm94 eT4oKSkpOworICAgICAgICBBU1NFUlQoZGF0YWJhc2VNYW5hZ2VyKTsKKyAgICAgICAgcmV0dXJu IGFkb3B0UHRyKG5ldyBFd2tEYXRhYmFzZU1hbmFnZXIoZGF0YWJhc2VNYW5hZ2VyKSk7CiAgICAg fQogCiAgICAgRWluYV9MaXN0KiBjcmVhdGVPcmlnaW5MaXN0KFdLQXJyYXlSZWYgd2tMaXN0KSBj b25zdDsKICAgICB2b2lkIGdldERhdGFiYXNlT3JpZ2lucyhXS0RhdGFiYXNlTWFuYWdlckdldERh dGFiYXNlT3JpZ2luc0Z1bmN0aW9uIGNhbGxiYWNrLCB2b2lkKiBjb250ZXh0KSBjb25zdDsKIAog cHJpdmF0ZToKLSAgICBleHBsaWNpdCBFd2tEYXRhYmFzZU1hbmFnZXIoV2ViRGF0YWJhc2VNYW5h Z2VyUHJveHkqKTsKKyAgICBleHBsaWNpdCBFd2tEYXRhYmFzZU1hbmFnZXIoV0tEYXRhYmFzZU1h bmFnZXJSZWYpOwogCi0gICAgUmVmUHRyPFdlYkRhdGFiYXNlTWFuYWdlclByb3h5PiBtX2RhdGFi YXNlTWFuYWdlcjsKKyAgICBXS1JldGFpblB0cjxXS0RhdGFiYXNlTWFuYWdlclJlZj4gbV9kYXRh YmFzZU1hbmFnZXI7CiAgICAgbXV0YWJsZSBIYXNoTWFwPFdLU2VjdXJpdHlPcmlnaW5SZWYsIFJl ZlB0cjxFd2tTZWN1cml0eU9yaWdpbj4gPiBtX3dyYXBwZXJDYWNoZTsKIH07CiAjZW5kaWYgLy8g ZXdrX2RhdGFiYXNlX21hbmFnZXJfcHJpdmF0ZV9oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfc3RvcmFnZV9tYW5hZ2VyLmNwcCBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19zdG9yYWdlX21hbmFnZXIuY3BwCmluZGV4IDlhOTBk YTAuLmZkMGVhZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L2V3a19zdG9yYWdlX21hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL2V3a19zdG9yYWdlX21hbmFnZXIuY3BwCkBAIC0yOCwyMCArMjgsMjEgQEAKIAogI2lu Y2x1ZGUgIldLQVBJQ2FzdC5oIgogI2luY2x1ZGUgIldLQXJyYXkuaCIKLSNpbmNsdWRlICJXZWJL ZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyUHJveHkuaCIKICNpbmNsdWRlICJld2tfZXJyb3JfcHJpdmF0 ZS5oIgogI2luY2x1ZGUgImV3a19zZWN1cml0eV9vcmlnaW5fcHJpdmF0ZS5oIgogI2luY2x1ZGUg ImV3a19zdG9yYWdlX21hbmFnZXJfcHJpdmF0ZS5oIgogCiB1c2luZyBuYW1lc3BhY2UgV2ViS2l0 OwogCi1Fd2tTdG9yYWdlTWFuYWdlcjo6RXdrU3RvcmFnZU1hbmFnZXIoV2ViS2V5VmFsdWVTdG9y YWdlTWFuYWdlclByb3h5KiBzdG9yYWdlTWFuYWdlclByb3h5KQotICAgIDogbV9zdG9yYWdlTWFu YWdlcihzdG9yYWdlTWFuYWdlclByb3h5KQoteyB9CitFd2tTdG9yYWdlTWFuYWdlcjo6RXdrU3Rv cmFnZU1hbmFnZXIoV0tLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyUmVmIHN0b3JhZ2VNYW5hZ2VyKQor ICAgIDogbV9zdG9yYWdlTWFuYWdlcihzdG9yYWdlTWFuYWdlcikKK3sKKyAgICBBU1NFUlQoc3Rv cmFnZU1hbmFnZXIpOworfQogCiB2b2lkIEV3a1N0b3JhZ2VNYW5hZ2VyOjpnZXRTdG9yYWdlT3Jp Z2lucyh2b2lkKiBjb250ZXh0LCBXS0tleVZhbHVlU3RvcmFnZU1hbmFnZXJHZXRLZXlWYWx1ZVN0 b3JhZ2VPcmlnaW5zRnVuY3Rpb24gY2FsbGJhY2spIGNvbnN0CiB7Ci0gICAgV0tLZXlWYWx1ZVN0 b3JhZ2VNYW5hZ2VyR2V0S2V5VmFsdWVTdG9yYWdlT3JpZ2lucyh0b0FQSShtX3N0b3JhZ2VNYW5h Z2VyLmdldCgpKSwgY29udGV4dCwgY2FsbGJhY2spOworICAgIFdLS2V5VmFsdWVTdG9yYWdlTWFu YWdlckdldEtleVZhbHVlU3RvcmFnZU9yaWdpbnMobV9zdG9yYWdlTWFuYWdlci5nZXQoKSwgY29u dGV4dCwgY2FsbGJhY2spOwogfQogCiBFaW5hX0xpc3QqIEV3a1N0b3JhZ2VNYW5hZ2VyOjpjcmVh dGVPcmlnaW5MaXN0KFdLQXJyYXlSZWYgb3JpZ2lucykgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19zdG9yYWdlX21hbmFnZXJfcHJpdmF0ZS5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3N0b3JhZ2VfbWFuYWdlcl9w cml2YXRlLmgKaW5kZXggNzFhODhjNi4uNTUwY2ZmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3N0b3JhZ2VfbWFuYWdlcl9wcml2YXRlLmgKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3N0b3JhZ2VfbWFuYWdlcl9wcml2 YXRlLmgKQEAgLTI3LDggKzI3LDcgQEAKICNkZWZpbmUgZXdrX3N0b3JhZ2VfbWFuYWdlcl9wcml2 YXRlX2gKIAogI2luY2x1ZGUgIldLS2V5VmFsdWVTdG9yYWdlTWFuYWdlci5oIgotI2luY2x1ZGUg IldlYkNvbnRleHQuaCIKLSNpbmNsdWRlICJXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyUHJveHku aCIKKyNpbmNsdWRlICJXS1JldGFpblB0ci5oIgogI2luY2x1ZGUgImV3a19zZWN1cml0eV9vcmln aW5fcHJpdmF0ZS5oIgogI2luY2x1ZGUgPFdlYktpdDIvV0tCYXNlLmg+CiAjaW5jbHVkZSA8d3Rm L1Bhc3NPd25QdHIuaD4KQEAgLTM3LDE5ICszNiwxOSBAQCB1c2luZyBuYW1lc3BhY2UgV2ViS2l0 OwogCiBjbGFzcyBFd2tTdG9yYWdlTWFuYWdlciB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NP d25QdHI8RXdrU3RvcmFnZU1hbmFnZXI+IGNyZWF0ZShQYXNzUmVmUHRyPFdlYkNvbnRleHQ+IGNv bnRleHQpCisgICAgc3RhdGljIFBhc3NPd25QdHI8RXdrU3RvcmFnZU1hbmFnZXI+IGNyZWF0ZShX S0tleVZhbHVlU3RvcmFnZU1hbmFnZXJSZWYgc3RvcmFnZU1hbmFnZXIpCiAgICAgewotICAgICAg ICBBU1NFUlQoY29udGV4dCk7Ci0gICAgICAgIHJldHVybiBhZG9wdFB0cihuZXcgRXdrU3RvcmFn ZU1hbmFnZXIoY29udGV4dC0+c3VwcGxlbWVudDxXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyUHJv eHk+KCkpKTsKKyAgICAgICAgQVNTRVJUKHN0b3JhZ2VNYW5hZ2VyKTsKKyAgICAgICAgcmV0dXJu IGFkb3B0UHRyKG5ldyBFd2tTdG9yYWdlTWFuYWdlcihzdG9yYWdlTWFuYWdlcikpOwogICAgIH0K IAogICAgIEVpbmFfTGlzdCogY3JlYXRlT3JpZ2luTGlzdChXS0FycmF5UmVmIHdrTGlzdCkgY29u c3Q7CiAgICAgdm9pZCBnZXRTdG9yYWdlT3JpZ2lucyh2b2lkKiBjb250ZXh0LCBXS0tleVZhbHVl U3RvcmFnZU1hbmFnZXJHZXRLZXlWYWx1ZVN0b3JhZ2VPcmlnaW5zRnVuY3Rpb24gY2FsbGJhY2sp IGNvbnN0OwogCiBwcml2YXRlOgotICAgIGV4cGxpY2l0IEV3a1N0b3JhZ2VNYW5hZ2VyKFdlYktl eVZhbHVlU3RvcmFnZU1hbmFnZXJQcm94eSogc3RvcmFnZU1hbmFnZXJQcm94eSk7CisgICAgZXhw bGljaXQgRXdrU3RvcmFnZU1hbmFnZXIoV0tLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyUmVmKTsKIAot ICAgIFJlZlB0cjxXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyUHJveHk+IG1fc3RvcmFnZU1hbmFn ZXI7CisgICAgV0tSZXRhaW5QdHI8V0tLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyUmVmPiBtX3N0b3Jh Z2VNYW5hZ2VyOwogICAgIG11dGFibGUgSGFzaE1hcDxXS1NlY3VyaXR5T3JpZ2luUmVmLCBSZWZQ dHI8RXdrU2VjdXJpdHlPcmlnaW4+ID4gbV93cmFwcGVyQ2FjaGU7CiB9OwogCg==