101615 2012-11-08 08:55:03 -0800 [EFL][WK2] Add proper support for fullscreen API to MiniBrowser 2012-11-08 15:35:26 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 cdumez cdumez alexander.shalamov gyuyoung.kim kenneth laszlo.gombos lucas.de.marchi rakuco tonikitoo webkit.review.bot oldest_to_newest 761848 0 cdumez 2012-11-08 08:55:03 -0800 There are several issues with fullscreen support in MiniBrowser: - Fullscreen smart functions should be overridden to interact with elm_win - There is no way of exiting fullscreen - User permission is not requested 761859 1 cdumez 2012-11-08 09:06:18 -0800 Demo: http://robnyman.github.com/fullscreen/ 762059 2 173094 cdumez 2012-11-08 12:30:22 -0800 Created attachment 173094 Patch 762249 3 173094 webkit.review.bot 2012-11-08 15:35:21 -0800 Comment on attachment 173094 Patch Clearing flags on attachment: 173094 Committed r133961: <http://trac.webkit.org/changeset/133961> 762250 4 webkit.review.bot 2012-11-08 15:35:26 -0800 All reviewed patches have been landed. Closing bug. 173094 2012-11-08 12:30:22 -0800 2012-11-08 15:35:21 -0800 Patch 101615_minibrowser_fullscreen.patch text/plain 15506 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzZGM2ZmJjLi5jMzU4YTViIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkg QEAKKzIwMTItMTEtMDggIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbRUZMXVtXSzJdIEFkZCBwcm9wZXIgc3VwcG9ydCBmb3IgZnVsbHNj cmVlbiBBUEkgdG8gTWluaUJyb3dzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEwMTYxNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlld0ltcGwuY3BwOgorICAg ICAgICAoRXdrVmlld0ltcGw6OmVudGVyRnVsbFNjcmVlbik6CisgICAgICAgICogVUlQcm9jZXNz L0FQSS9lZmwvZXdrX3NlY3VyaXR5X29yaWdpbi5jcHA6CisgICAgICAgIChFd2tTZWN1cml0eU9y aWdpbjo6RXdrU2VjdXJpdHlPcmlnaW4pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3 a19zZWN1cml0eV9vcmlnaW5fcHJpdmF0ZS5oOgorICAgICAgICAoRXdrU2VjdXJpdHlPcmlnaW46 OmNyZWF0ZSk6IEFkZCBmYWN0b3J5IG1ldGhvZCB0byBjb25zdHJ1Y3QgYQorICAgICAgICBFd2tT ZWN1cml0eU9yaWdpbiBmcm9tIGEgS1VSTC4KKyAgICAgICAgKEV3a1NlY3VyaXR5T3JpZ2luKToK KyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHA6CisgICAgICAgIChld2tf dmlld19mdWxsc2NyZWVuX2V4aXQpOiBBZGQgcHVibGljIEFQSSBmdW5jdGlvbiB0byBleGl0Cisg ICAgICAgIGZ1bGxzY3JlZW4gbW9kZS4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9ld2tf dmlldy5oOiBBZGQgc2VjdXJpdHkgb3JpZ2luIHBhcmFtZXRlcgorICAgICAgICB0byBmdWxsc2Ny ZWVuX2VudGVyIHNtYXJ0IGZ1bmN0aW9uIHNpbmNlIHRoaXMgaW5mb3JtYXRpb24gaXMKKyAgICAg ICAgdXNlZnVsIHRvIHRoZSB1c2VyIGFnZW50LgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZs L3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcDoKKyAgICAgICAgKGZ1bGxTY3JlZW5DYWxsYmFjayk6 CisgICAgICAgIChmdWxsU2NyZWVuRXhpdENhbGxiYWNrKToKKyAgICAgICAgKFRFU1RfRik6CisK IDIwMTItMTEtMDggIFNpbW9uIEhhdXNtYW5uICA8c2ltb24uaGF1c21hbm5AZGlnaWEuY29tPgog CiAgICAgICAgIFtRdF0gRml4IGJ1aWxkIHdpdGhvdXQgV2ViS2l0MQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlld0ltcGwuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlld0ltcGwuY3BwCmluZGV4IDEzODEyYTYuLjlk ODczMmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1Zp ZXdJbXBsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3 SW1wbC5jcHAKQEAgLTQ3LDYgKzQ3LDcgQEAKICNpbmNsdWRlICJld2tfcG9wdXBfbWVudV9pdGVt X3ByaXZhdGUuaCIKICNpbmNsdWRlICJld2tfcG9wdXBfbWVudV9wcml2YXRlLmgiCiAjaW5jbHVk ZSAiZXdrX3ByaXZhdGUuaCIKKyNpbmNsdWRlICJld2tfc2VjdXJpdHlfb3JpZ2luX3ByaXZhdGUu aCIKICNpbmNsdWRlICJld2tfc2V0dGluZ3NfcHJpdmF0ZS5oIgogI2luY2x1ZGUgImV3a192aWV3 LmgiCiAjaW5jbHVkZSAiZXdrX3ZpZXdfcHJpdmF0ZS5oIgpAQCAtMzM3LDcgKzMzOCw5IEBAIHZv aWQgRXdrVmlld0ltcGw6OmVudGVyRnVsbFNjcmVlbigpCiB7CiAgICAgRXdrX1ZpZXdfU21hcnRf RGF0YSogc2QgPSBzbWFydERhdGEoKTsKIAotICAgIGlmICghc2QtPmFwaS0+ZnVsbHNjcmVlbl9l bnRlciB8fCAhc2QtPmFwaS0+ZnVsbHNjcmVlbl9lbnRlcihzZCkpIHsKKyAgICBSZWZQdHI8RXdr U2VjdXJpdHlPcmlnaW4+IG9yaWdpbiA9IEV3a1NlY3VyaXR5T3JpZ2luOjpjcmVhdGUoS1VSTChQ YXJzZWRVUkxTdHJpbmcsIFN0cmluZzo6ZnJvbVVURjgobV91cmwpKSk7CisKKyAgICBpZiAoIXNk LT5hcGktPmZ1bGxzY3JlZW5fZW50ZXIgfHwgIXNkLT5hcGktPmZ1bGxzY3JlZW5fZW50ZXIoc2Qs IG9yaWdpbi5nZXQoKSkpIHsKICAgICAgICAgRWNvcmVfRXZhcyogZWNvcmVFdmFzID0gZWNvcmVf ZXZhc19lY29yZV9ldmFzX2dldChzZC0+YmFzZS5ldmFzKTsKICAgICAgICAgZWNvcmVfZXZhc19m dWxsc2NyZWVuX3NldChlY29yZUV2YXMsIHRydWUpOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a19zZWN1cml0eV9vcmlnaW4uY3BwIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3NlY3VyaXR5X29yaWdpbi5jcHAKaW5k ZXggMzUwNjEyNi4uNjBkOGUzOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9lZmwvZXdrX3NlY3VyaXR5X29yaWdpbi5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9lZmwvZXdrX3NlY3VyaXR5X29yaWdpbi5jcHAKQEAgLTI4LDggKzI4LDExIEBA CiAKICNpbmNsdWRlICJXS0FQSUNhc3QuaCIKICNpbmNsdWRlICJXS1NlY3VyaXR5T3JpZ2luLmgi CisjaW5jbHVkZSAiV2ViU2VjdXJpdHlPcmlnaW4uaCIKICNpbmNsdWRlICJld2tfc2VjdXJpdHlf b3JpZ2luX3ByaXZhdGUuaCIKKyNpbmNsdWRlIDxXZWJDb3JlL1NlY3VyaXR5T3JpZ2luLmg+CiAK K3VzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAogRXdr U2VjdXJpdHlPcmlnaW46OkV3a1NlY3VyaXR5T3JpZ2luKFdLU2VjdXJpdHlPcmlnaW5SZWYgb3Jp Z2luUmVmKQpAQCAtMzgsNiArNDEsMTIgQEAgRXdrU2VjdXJpdHlPcmlnaW46OkV3a1NlY3VyaXR5 T3JpZ2luKFdLU2VjdXJpdHlPcmlnaW5SZWYgb3JpZ2luUmVmKQogICAgICwgbV9wcm90b2NvbChB ZG9wdFdLLCBXS1NlY3VyaXR5T3JpZ2luQ29weVByb3RvY29sKG9yaWdpblJlZikpCiB7IH0KIAor RXdrU2VjdXJpdHlPcmlnaW46OkV3a1NlY3VyaXR5T3JpZ2luKGNvbnN0IEtVUkwmIHVybCkKKyAg ICA6IG1fd2tPcmlnaW4oQWRvcHRXSywgdG9BUEkoV2ViU2VjdXJpdHlPcmlnaW46OmNyZWF0ZShT ZWN1cml0eU9yaWdpbjo6Y3JlYXRlKHVybCkpLmxlYWtSZWYoKSkpCisgICAgLCBtX2hvc3QoQWRv cHRXSywgV0tTZWN1cml0eU9yaWdpbkNvcHlIb3N0KG1fd2tPcmlnaW4uZ2V0KCkpKQorICAgICwg bV9wcm90b2NvbChBZG9wdFdLLCBXS1NlY3VyaXR5T3JpZ2luQ29weVByb3RvY29sKG1fd2tPcmln aW4uZ2V0KCkpKQoreyB9CisKIGNvbnN0IGNoYXIqIEV3a1NlY3VyaXR5T3JpZ2luOjpob3N0KCkg Y29uc3QKIHsKICAgICByZXR1cm4gbV9ob3N0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9lZmwvZXdrX3NlY3VyaXR5X29yaWdpbl9wcml2YXRlLmggYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfc2VjdXJpdHlfb3JpZ2luX3ByaXZhdGUuaApp bmRleCBhOGEzOWE0Li42MDA5YzZlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL2VmbC9ld2tfc2VjdXJpdHlfb3JpZ2luX3ByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfc2VjdXJpdHlfb3JpZ2luX3ByaXZhdGUuaApAQCAt MjksNiArMjksNyBAQAogI2luY2x1ZGUgIldLRWluYVNoYXJlZFN0cmluZy5oIgogI2luY2x1ZGUg IldLU2VjdXJpdHlPcmlnaW4uaCIKICNpbmNsdWRlICJld2tfb2JqZWN0X3ByaXZhdGUuaCIKKyNp bmNsdWRlIDxXZWJDb3JlL0tVUkwuaD4KICNpbmNsdWRlIDxXZWJLaXQyL1dLQmFzZS5oPgogI2lu Y2x1ZGUgPHd0Zi9QYXNzUmVmUHRyLmg+CiAKQEAgLTQxLDEyICs0MiwxOCBAQCBwdWJsaWM6CiAg ICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcgRXdrU2VjdXJpdHlPcmlnaW4ob3JpZ2luUmVmKSk7 CiAgICAgfQogCisgICAgc3RhdGljIFBhc3NSZWZQdHI8RXdrU2VjdXJpdHlPcmlnaW4+IGNyZWF0 ZShjb25zdCBXZWJDb3JlOjpLVVJMJiB1cmwpCisgICAgeworICAgICAgICByZXR1cm4gYWRvcHRS ZWYobmV3IEV3a1NlY3VyaXR5T3JpZ2luKHVybCkpOworICAgIH0KKwogICAgIGNvbnN0IGNoYXIq IGhvc3QoKSBjb25zdDsKICAgICBjb25zdCBjaGFyKiBwcm90b2NvbCgpIGNvbnN0OwogICAgIHVp bnQzMl90IHBvcnQoKSBjb25zdDsKIAogcHJpdmF0ZToKICAgICBleHBsaWNpdCBFd2tTZWN1cml0 eU9yaWdpbihXS1NlY3VyaXR5T3JpZ2luUmVmIG9yaWdpblJlZik7CisgICAgZXhwbGljaXQgRXdr U2VjdXJpdHlPcmlnaW4oY29uc3QgV2ViQ29yZTo6S1VSTCYgdXJsKTsKIAogICAgIFdLUmV0YWlu UHRyPFdLU2VjdXJpdHlPcmlnaW5SZWY+IG1fd2tPcmlnaW47CiAgICAgV0tFaW5hU2hhcmVkU3Ry aW5nIG1faG9zdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L2V3a192aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3 LmNwcAppbmRleCBkMjE0ZWQ2Li45MDU2ZTFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCkBAIC0zOSw2ICszOSw3IEBACiAjaW5jbHVkZSAiV0tS ZXRhaW5QdHIuaCIKICNpbmNsdWRlICJXS1N0cmluZy5oIgogI2luY2x1ZGUgIldlYkNvbnRleHQu aCIKKyNpbmNsdWRlICJXZWJGdWxsU2NyZWVuTWFuYWdlclByb3h5LmgiCiAjaW5jbHVkZSAiV2Vi UGFnZUdyb3VwLmgiCiAjaW5jbHVkZSAiV2ViUHJlZmVyZW5jZXMuaCIKICNpbmNsdWRlICJld2tf YmFja19mb3J3YXJkX2xpc3RfcHJpdmF0ZS5oIgpAQCAtOTA3LDMgKzkwOCwxNiBAQCBFd2tfUGFn aW5hdGlvbl9Nb2RlIGV3a192aWV3X3BhZ2luYXRpb25fbW9kZV9nZXQoY29uc3QgRXZhc19PYmpl Y3QqIGV3a1ZpZXcpCiAKICAgICByZXR1cm4gc3RhdGljX2Nhc3Q8RXdrX1BhZ2luYXRpb25fTW9k ZT4oaW1wbC0+cGFnZSgpLT5wYWdpbmF0aW9uTW9kZSgpKTsKIH0KKworRWluYV9Cb29sIGV3a192 aWV3X2Z1bGxzY3JlZW5fZXhpdChFdmFzX09iamVjdCogZXdrVmlldykKK3sKKyNpZiBFTkFCTEUo RlVMTFNDUkVFTl9BUEkpCisgICAgRVdLX1ZJRVdfSU1QTF9HRVRfT1JfUkVUVVJOKGV3a1ZpZXcs IGltcGwsIGZhbHNlKTsKKworICAgIGltcGwtPnBhZ2UoKS0+ZnVsbFNjcmVlbk1hbmFnZXIoKS0+ cmVxdWVzdEV4aXRGdWxsU2NyZWVuKCk7CisKKyAgICByZXR1cm4gdHJ1ZTsKKyNlbHNlCisgICAg cmV0dXJuIGZhbHNlOworI2VuZGlmCit9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX3ZpZXcuaAppbmRleCA4N2YzNmMxLi44NWI5NzYyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmgKQEAgLTg5LDYgKzg5LDcgQEAKICNpbmNsdWRl ICJld2tfaW50ZW50LmgiCiAjaW5jbHVkZSAiZXdrX3BvcHVwX21lbnUuaCIKICNpbmNsdWRlICJl d2tfcmVzb3VyY2UuaCIKKyNpbmNsdWRlICJld2tfc2VjdXJpdHlfb3JpZ2luLmgiCiAjaW5jbHVk ZSAiZXdrX3NldHRpbmdzLmgiCiAjaW5jbHVkZSAiZXdrX3RvdWNoLmgiCiAjaW5jbHVkZSAiZXdr X3VybF9yZXF1ZXN0LmgiCkBAIC0xMjEsNyArMTIyLDcgQEAgc3RydWN0IEV3a19WaWV3X1NtYXJ0 X0NsYXNzIHsKICAgICAvLyAgLSBpZiBvdmVycmlkZGVuLCBoYXZlIHRvIGNhbGwgcGFyZW50IG1l dGhvZCBpZiBkZXNpcmVkCiAgICAgRWluYV9Cb29sICgqZm9jdXNfaW4pKEV3a19WaWV3X1NtYXJ0 X0RhdGEgKnNkKTsKICAgICBFaW5hX0Jvb2wgKCpmb2N1c19vdXQpKEV3a19WaWV3X1NtYXJ0X0Rh dGEgKnNkKTsKLSAgICBFaW5hX0Jvb2wgKCpmdWxsc2NyZWVuX2VudGVyKShFd2tfVmlld19TbWFy dF9EYXRhICpzZCk7CisgICAgRWluYV9Cb29sICgqZnVsbHNjcmVlbl9lbnRlcikoRXdrX1ZpZXdf U21hcnRfRGF0YSAqc2QsIEV3a19TZWN1cml0eV9PcmlnaW4gKm9yaWdpbik7CiAgICAgRWluYV9C b29sICgqZnVsbHNjcmVlbl9leGl0KShFd2tfVmlld19TbWFydF9EYXRhICpzZCk7CiAgICAgRWlu YV9Cb29sICgqbW91c2Vfd2hlZWwpKEV3a19WaWV3X1NtYXJ0X0RhdGEgKnNkLCBjb25zdCBFdmFz X0V2ZW50X01vdXNlX1doZWVsICpldik7CiAgICAgRWluYV9Cb29sICgqbW91c2VfZG93bikoRXdr X1ZpZXdfU21hcnRfRGF0YSAqc2QsIGNvbnN0IEV2YXNfRXZlbnRfTW91c2VfRG93biAqZXYpOwpA QCAtODAwLDYgKzgwMSwxNSBAQCBFQVBJIEVpbmFfQm9vbCBld2tfdmlld19wYWdpbmF0aW9uX21v ZGVfc2V0KEV2YXNfT2JqZWN0ICpvLCBFd2tfUGFnaW5hdGlvbl9Nb2RlCiAgKi8KIEVBUEkgRXdr X1BhZ2luYXRpb25fTW9kZSBld2tfdmlld19wYWdpbmF0aW9uX21vZGVfZ2V0KGNvbnN0IEV2YXNf T2JqZWN0ICpvKTsKIAorLyoqCisgKiBFeGl0IGZ1bGxzY3JlZW4gbW9kZS4KKyAqCisgKiBAcGFy YW0gbyB2aWV3IG9iamVjdCB3aGVyZSB0byBleGl0IGZ1bGxzY3JlZW4KKyAqCisgKiBAcmV0dXJu IEBjIEVJTkFfVFJVRSBpZiBzdWNjZXNzZnVsLCBAYyBFSU5BX0ZBTFNFIG90aGVyd2lzZQorICov CitFQVBJIEVpbmFfQm9vbCBld2tfdmlld19mdWxsc2NyZWVuX2V4aXQoRXZhc19PYmplY3QgKm8p OworCiAjaWZkZWYgX19jcGx1c3BsdXMKIH0KICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvdGVzdHMvdGVzdF9ld2syX3ZpZXcuY3BwCmluZGV4 IDE5OTk3MGQuLmVkNWJiYjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvZWZsL3Rlc3RzL3Rlc3RfZXdrMl92aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC90ZXN0cy90ZXN0X2V3azJfdmlldy5jcHAKQEAgLTI0Miw3ICsyNDIsMTMg QEAgVEVTVF9GKEVXSzJVbml0VGVzdEJhc2UsIGV3a192aWV3X21vdXNlX2V2ZW50c19lbmFibGVk KQogICAgIEFTU0VSVF9GQUxTRShld2tfdmlld19tb3VzZV9ldmVudHNfZW5hYmxlZF9nZXQod2Vi VmlldygpKSk7CiB9CiAKLXN0YXRpYyBFaW5hX0Jvb2wgZnVsbFNjcmVlbkNhbGxiYWNrKEV3a19W aWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSkKK3N0YXRpYyBFaW5hX0Jvb2wgZnVsbFNjcmVlbkNh bGxiYWNrKEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgRXdrX1NlY3VyaXR5X09yaWdp biopCit7CisgICAgZnVsbFNjcmVlbkNhbGxiYWNrQ2FsbGVkID0gdHJ1ZTsKKyAgICByZXR1cm4g ZmFsc2U7Cit9CisKK3N0YXRpYyBFaW5hX0Jvb2wgZnVsbFNjcmVlbkV4aXRDYWxsYmFjayhFd2tf Vmlld19TbWFydF9EYXRhKiBzbWFydERhdGEpCiB7CiAgICAgZnVsbFNjcmVlbkNhbGxiYWNrQ2Fs bGVkID0gdHJ1ZTsKICAgICByZXR1cm4gZmFsc2U7CkBAIC0yNzgsNyArMjg0LDcgQEAgVEVTVF9G KEVXSzJVbml0VGVzdEJhc2UsIGV3a192aWV3X2Z1bGxfc2NyZWVuX2V4aXQpCiAgICAgICAgICJ9 PC9zY3JpcHQ+PC9oZWFkPiIKICAgICAgICAgIjxib2R5PjxkaXYgaWQ9XCJmdWxsc2NyZWVuXCIg c3R5bGU9XCJ3aWR0aDoxMDBweDsgaGVpZ2h0OjEwMHB4XCIgb25jbGljaz1cIm1ha2VGdWxsU2Ny ZWVuQW5kRXhpdCgpXCI+PC9kaXY+PC9ib2R5PiI7CiAKLSAgICBld2tWaWV3Q2xhc3MoKS0+ZnVs bHNjcmVlbl9leGl0ID0gZnVsbFNjcmVlbkNhbGxiYWNrOworICAgIGV3a1ZpZXdDbGFzcygpLT5m dWxsc2NyZWVuX2V4aXQgPSBmdWxsU2NyZWVuRXhpdENhbGxiYWNrOwogCiAgICAgZXdrX3ZpZXdf aHRtbF9zdHJpbmdfbG9hZCh3ZWJWaWV3KCksIGZ1bGxzY3JlZW5IVE1MLCAiZmlsZTovLy8iLCAw KTsKICAgICBBU1NFUlRfVFJVRSh3YWl0VW50aWxMb2FkRmluaXNoZWQoKSk7CmRpZmYgLS1naXQg YS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggN2EzMDQyYS4uMjZiOTlh ZCAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAt MSwzICsxLDI0IEBACisyMDEyLTExLTA4ICBDaHJpc3RvcGhlIER1bWV6ICA8Y2hyaXN0b3BoZS5k dW1lekBpbnRlbC5jb20+CisKKyAgICAgICAgW0VGTF1bV0syXSBBZGQgcHJvcGVyIHN1cHBvcnQg Zm9yIGZ1bGxzY3JlZW4gQVBJIHRvIE1pbmlCcm93c2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDE2MTUKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbXBsZW1lbnQgZnVsbHNjcmVlbiBBUEkgc3VwcG9y dCBpbiBNaW5pQnJvd3Nlci4gV2hlbiBlbnRlcmluZworICAgICAgICBmdWxsc2NyZWVuIGEgcG9w dXAgaXMgc2hvd24gdG8gbm90aWZ5IHRoZSB1c2VyIHRoYXQgc29tZXRoaW5nCisgICAgICAgIGlz IGRpc3BsYXllZCBpbiBmdWxsc2NyZWVuIGFuZCB0byBhZHZlcnRpc2UgdGhhdCB0aGUgRXNjYXBl CisgICAgICAgIGtleSBjYW4gYmUgdXNlZCB0byBleGl0IGZ1bGxzY3JlZW4uIFRoaXMgYmVoYXZp b3IgaXMgYWNjb3JkaW5nCisgICAgICAgIHRvIHNwZWNpZmljYXRpb24uCisKKyAgICAgICAgKiBN aW5pQnJvd3Nlci9lZmwvbWFpbi5jOgorICAgICAgICAob25fa2V5X2Rvd24pOgorICAgICAgICAo b25fZnVsbHNjcmVlbl9hY2NlcHQpOgorICAgICAgICAob25fZnVsbHNjcmVlbl9kZW55KToKKyAg ICAgICAgKG9uX2Z1bGxzY3JlZW5fZW50ZXIpOgorICAgICAgICAob25fZnVsbHNjcmVlbl9leGl0 KToKKyAgICAgICAgKHdpbmRvd19jcmVhdGUpOgorCiAyMDEyLTExLTA4ICBKYWtvYiBQZXRzb3Zp dHMgIDxqcGV0c292aXRzQHJpbS5jb20+CiAKICAgICAgICAgW0JsYWNrQmVycnldIFJld29yayB0 aGUgQVBJIHRvIHVzZSBkb2N1bWVudCBjb29yZGluYXRlcwpkaWZmIC0tZ2l0IGEvVG9vbHMvTWlu aUJyb3dzZXIvZWZsL21haW4uYyBiL1Rvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMKaW5kZXgg ZTAyOTkzNi4uZTk4MmE3MSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4u YworKysgYi9Ub29scy9NaW5pQnJvd3Nlci9lZmwvbWFpbi5jCkBAIC0xMzksOSArMTM5LDExIEBA IHN0YXRpYyB2b2lkIHdpbmRvd19jbG9zZShCcm93c2VyX1dpbmRvdyAqd2luZG93KQogfQogCiBz dGF0aWMgdm9pZAotb25fa2V5X2Rvd24odm9pZCAqZGF0YSwgRXZhcyAqZSwgRXZhc19PYmplY3Qg Km9iaiwgdm9pZCAqZXZlbnRfaW5mbykKK29uX2tleV9kb3duKHZvaWQgKnVzZXJfZGF0YSwgRXZh cyAqZSwgRXZhc19PYmplY3QgKndlYnZpZXcsIHZvaWQgKmV2ZW50X2luZm8pCiB7CisgICAgQnJv d3Nlcl9XaW5kb3cgKndpbmRvdyA9IChCcm93c2VyX1dpbmRvdyAqKXVzZXJfZGF0YTsKICAgICBF dmFzX0V2ZW50X0tleV9Eb3duICpldiA9IChFdmFzX0V2ZW50X0tleV9Eb3duKikgZXZlbnRfaW5m bzsKKwogICAgIHN0YXRpYyBjb25zdCBjaGFyICplbmNvZGluZ3NbXSA9IHsKICAgICAgICAgIklT Ty04ODU5LTEiLAogICAgICAgICAiVVRGLTgiLApAQCAtMTUyLDI2ICsxNTQsMjYgQEAgb25fa2V5 X2Rvd24odm9pZCAqZGF0YSwgRXZhcyAqZSwgRXZhc19PYmplY3QgKm9iaiwgdm9pZCAqZXZlbnRf aW5mbykKIAogICAgIGlmICghc3RyY21wKGV2LT5rZXksICJGMSIpKSB7CiAgICAgICAgIGluZm8o IkJhY2sgKEYxKSB3YXMgcHJlc3NlZFxuIik7Ci0gICAgICAgIGlmICghZXdrX3ZpZXdfYmFjayhv YmopKQorICAgICAgICBpZiAoIWV3a192aWV3X2JhY2sod2VidmlldykpCiAgICAgICAgICAgICBp bmZvKCJCYWNrIGlnbm9yZWQ6IE5vIGJhY2sgaGlzdG9yeVxuIik7CiAgICAgfSBlbHNlIGlmICgh c3RyY21wKGV2LT5rZXksICJGMiIpKSB7CiAgICAgICAgIGluZm8oIkZvcndhcmQgKEYyKSB3YXMg cHJlc3NlZFxuIik7Ci0gICAgICAgIGlmICghZXdrX3ZpZXdfZm9yd2FyZChvYmopKQorICAgICAg ICBpZiAoIWV3a192aWV3X2ZvcndhcmQod2VidmlldykpCiAgICAgICAgICAgICBpbmZvKCJGb3J3 YXJkIGlnbm9yZWQ6IE5vIGZvcndhcmQgaGlzdG9yeVxuIik7CiAgICAgfSBlbHNlIGlmICghc3Ry Y21wKGV2LT5rZXksICJGMyIpKSB7CiAgICAgICAgIGN1cnJlbnRFbmNvZGluZyA9IChjdXJyZW50 RW5jb2RpbmcgKyAxKSAlIChzaXplb2YoZW5jb2RpbmdzKSAvIHNpemVvZihlbmNvZGluZ3NbMF0p KTsKICAgICAgICAgaW5mbygiU2V0IGVuY29kaW5nIChGMykgcHJlc3NlZC4gTmV3IGVuY29kaW5n IHRvICVzIiwgZW5jb2RpbmdzW2N1cnJlbnRFbmNvZGluZ10pOwotICAgICAgICBld2tfdmlld19z ZXR0aW5nX2VuY29kaW5nX2N1c3RvbV9zZXQob2JqLCBlbmNvZGluZ3NbY3VycmVudEVuY29kaW5n XSk7CisgICAgICAgIGV3a192aWV3X3NldHRpbmdfZW5jb2RpbmdfY3VzdG9tX3NldCh3ZWJ2aWV3 LCBlbmNvZGluZ3NbY3VycmVudEVuY29kaW5nXSk7CiAgICAgfSBlbHNlIGlmICghc3RyY21wKGV2 LT5rZXksICJGNSIpKSB7CiAgICAgICAgIGluZm8oIlJlbG9hZCAoRjUpIHdhcyBwcmVzc2VkLCBy ZWxvYWRpbmcuXG4iKTsKLSAgICAgICAgZXdrX3ZpZXdfcmVsb2FkKG9iaik7CisgICAgICAgIGV3 a192aWV3X3JlbG9hZCh3ZWJ2aWV3KTsKICAgICB9IGVsc2UgaWYgKCFzdHJjbXAoZXYtPmtleSwg IkY2IikpIHsKICAgICAgICAgaW5mbygiU3RvcCAoRjYpIHdhcyBwcmVzc2VkLCBzdG9wIGxvYWRp bmcuXG4iKTsKLSAgICAgICAgZXdrX3ZpZXdfc3RvcChvYmopOworICAgICAgICBld2tfdmlld19z dG9wKHdlYnZpZXcpOwogICAgIH0gZWxzZSBpZiAgKCFzdHJjbXAoZXYtPmtleSwgIkY3IikpIHsK LSAgICAgICAgRXdrX1BhZ2luYXRpb25fTW9kZSBtb2RlID0gIGV3a192aWV3X3BhZ2luYXRpb25f bW9kZV9nZXQob2JqKTsKKyAgICAgICAgRXdrX1BhZ2luYXRpb25fTW9kZSBtb2RlID0gIGV3a192 aWV3X3BhZ2luYXRpb25fbW9kZV9nZXQod2Vidmlldyk7CiAgICAgICAgIG1vZGUgPSAoKyttb2Rl KSAlIChFV0tfUEFHSU5BVElPTl9NT0RFX0JPVFRPTV9UT19UT1AgKyAxKTsKLSAgICAgICAgaWYg KGV3a192aWV3X3BhZ2luYXRpb25fbW9kZV9zZXQob2JqLCBtb2RlKSkKKyAgICAgICAgaWYgKGV3 a192aWV3X3BhZ2luYXRpb25fbW9kZV9zZXQod2VidmlldywgbW9kZSkpCiAgICAgICAgICAgICBp bmZvKCJDaGFuZ2UgUGFnaW5hdGlvbiBNb2RlIChGNykgd2FzIHByZXNzZWQsIGNoYW5nZWQgdG86 ICVkXG4iLCBtb2RlKTsKICAgICAgICAgZWxzZQogICAgICAgICAgICAgaW5mbygiQ2hhbmdlIFBh Z2luYXRpb24gTW9kZSAoRjcpIHdhcyBwcmVzc2VkLCBidXQgTk9UIGNoYW5nZWQhIik7CkBAIC0x ODEsNyArMTgzLDEwIEBAIG9uX2tleV9kb3duKHZvaWQgKmRhdGEsIEV2YXMgKmUsIEV2YXNfT2Jq ZWN0ICpvYmosIHZvaWQgKmV2ZW50X2luZm8pCiAgICAgICAgIHdpbmRvd3MgPSBlaW5hX2xpc3Rf YXBwZW5kKHdpbmRvd3MsIHdpbmRvdyk7CiAgICAgfSBlbHNlIGlmICghc3RyY21wKGV2LT5rZXks ICJpIikgJiYgY3RybFByZXNzZWQpIHsKICAgICAgICAgaW5mbygiU2hvdyBJbnNwZWN0b3IgKEN0 cmwraSkgd2FzIHByZXNzZWQuXG4iKTsKLSAgICAgICAgZXdrX3ZpZXdfaW5zcGVjdG9yX3Nob3co b2JqKTsKKyAgICAgICAgZXdrX3ZpZXdfaW5zcGVjdG9yX3Nob3cod2Vidmlldyk7CisgICAgfSBl bHNlIGlmICghc3RyY21wKGV2LT5rZXksICJFc2NhcGUiKSkgeworICAgICAgICBpZiAoZWxtX3dp bl9mdWxsc2NyZWVuX2dldCh3aW5kb3ctPndpbmRvdykpCisgICAgICAgICAgICBld2tfdmlld19m dWxsc2NyZWVuX2V4aXQod2Vidmlldyk7CiAgICAgfQogfQogCkBAIC02NzgsNiArNjgzLDc1IEBA IHN0YXRpYyBFaW5hX0Jvb2wgb25fd2luZG93X2dlb21ldHJ5X3NldChFd2tfVmlld19TbWFydF9E YXRhICpzZCwgRXZhc19Db29yZCB4LCBFCiB9CiAKIHR5cGVkZWYgc3RydWN0IHsKKyAgICBFdmFz X09iamVjdCAqd2VidmlldzsKKyAgICBFdmFzX09iamVjdCAqcGVybWlzc2lvbl9wb3B1cDsKK30g UGVybWlzc2lvbkRhdGE7CisKK3N0YXRpYyB2b2lkCitvbl9mdWxsc2NyZWVuX2FjY2VwdCh2b2lk ICp1c2VyX2RhdGEsIEV2YXNfT2JqZWN0ICpvYmosIHZvaWQgKmV2ZW50X2luZm8pCit7CisgICAg UGVybWlzc2lvbkRhdGEgKnBlcm1pc3Npb25fZGF0YSA9IChQZXJtaXNzaW9uRGF0YSAqKXVzZXJf ZGF0YTsKKworICAgIGV2YXNfb2JqZWN0X2RlbChwZXJtaXNzaW9uX2RhdGEtPnBlcm1pc3Npb25f cG9wdXApOworICAgIGZyZWUocGVybWlzc2lvbl9kYXRhKTsKK30KKworc3RhdGljIHZvaWQKK29u X2Z1bGxzY3JlZW5fZGVueSh2b2lkICp1c2VyX2RhdGEsIEV2YXNfT2JqZWN0ICpvYmosIHZvaWQg KmV2ZW50X2luZm8pCit7CisgICAgUGVybWlzc2lvbkRhdGEgKnBlcm1pc3Npb25fZGF0YSA9IChQ ZXJtaXNzaW9uRGF0YSAqKXVzZXJfZGF0YTsKKworICAgIGV3a192aWV3X2Z1bGxzY3JlZW5fZXhp dChwZXJtaXNzaW9uX2RhdGEtPndlYnZpZXcpOworICAgIGV2YXNfb2JqZWN0X2RlbChwZXJtaXNz aW9uX2RhdGEtPnBlcm1pc3Npb25fcG9wdXApOworICAgIGZyZWUocGVybWlzc2lvbl9kYXRhKTsK K30KKworc3RhdGljIEVpbmFfQm9vbCBvbl9mdWxsc2NyZWVuX2VudGVyKEV3a19WaWV3X1NtYXJ0 X0RhdGEgKnNkLCBFd2tfU2VjdXJpdHlfT3JpZ2luICpvcmlnaW4pCit7CisgICAgQnJvd3Nlcl9X aW5kb3cgKndpbmRvdyA9IGJyb3dzZXJfdmlld19maW5kKHNkLT5zZWxmKTsKKworICAgIC8qIEdv IGZ1bGxzY3JlZW4gKi8KKyAgICBlbG1fd2luX2Z1bGxzY3JlZW5fc2V0KHdpbmRvdy0+d2luZG93 LCBFSU5BX1RSVUUpOworCisgICAgLyogU2hvdyB1c2VyIHBvcHVwICovCisgICAgRXZhc19PYmpl Y3QgKnBlcm1pc3Npb25fcG9wdXAgPSBlbG1fcG9wdXBfYWRkKHdpbmRvdy0+d2luZG93KTsKKyAg ICBldmFzX29iamVjdF9zaXplX2hpbnRfd2VpZ2h0X3NldChwZXJtaXNzaW9uX3BvcHVwLCBFVkFT X0hJTlRfRVhQQU5ELCBFVkFTX0hJTlRfRVhQQU5EKTsKKworICAgIEVpbmFfU3RyYnVmICptZXNz YWdlID0gZWluYV9zdHJidWZfbmV3KCk7CisgICAgZWluYV9zdHJidWZfYXBwZW5kX3ByaW50Ziht ZXNzYWdlLCAiJXMgaXMgbm93IGZ1bGxzY3JlZW4uPGJyPlByZXNzIEVTQyBhdCBhbnkgdGltZSB0 byBleGl0IGZ1bGxzY3JlZW4uPGJyPkFsbG93IGZ1bGxzY3JlZW4/IiwgZXdrX3NlY3VyaXR5X29y aWdpbl9ob3N0X2dldChvcmlnaW4pKTsKKyAgICBlbG1fb2JqZWN0X3RleHRfc2V0KHBlcm1pc3Np b25fcG9wdXAsIGVpbmFfc3RyYnVmX3N0cmluZ19nZXQobWVzc2FnZSkpOworICAgIGVpbmFfc3Ry YnVmX2ZyZWUobWVzc2FnZSk7CisgICAgZWxtX29iamVjdF9wYXJ0X3RleHRfc2V0KHBlcm1pc3Np b25fcG9wdXAsICJ0aXRsZSx0ZXh0IiwgIkZ1bGxzY3JlZW4gUGVybWlzc2lvbiIpOworCisgICAg LyogUG9wdXAgYnV0dG9ucyAqLworICAgIFBlcm1pc3Npb25EYXRhICpwZXJtaXNzaW9uX2RhdGEg PSAoUGVybWlzc2lvbkRhdGEgKiltYWxsb2Moc2l6ZW9mKFBlcm1pc3Npb25EYXRhKSk7CisgICAg cGVybWlzc2lvbl9kYXRhLT53ZWJ2aWV3ID0gd2luZG93LT53ZWJ2aWV3OworICAgIHBlcm1pc3Np b25fZGF0YS0+cGVybWlzc2lvbl9wb3B1cCA9IHBlcm1pc3Npb25fcG9wdXA7CisgICAgRXZhc19P YmplY3QgKmFjY2VwdF9idXR0b24gPSBlbG1fYnV0dG9uX2FkZChwZXJtaXNzaW9uX3BvcHVwKTsK KyAgICBlbG1fb2JqZWN0X3RleHRfc2V0KGFjY2VwdF9idXR0b24sICJBY2NlcHQiKTsKKyAgICBl bG1fb2JqZWN0X3BhcnRfY29udGVudF9zZXQocGVybWlzc2lvbl9wb3B1cCwgImJ1dHRvbjEiLCBh Y2NlcHRfYnV0dG9uKTsKKyAgICBldmFzX29iamVjdF9zbWFydF9jYWxsYmFja19hZGQoYWNjZXB0 X2J1dHRvbiwgImNsaWNrZWQiLCBvbl9mdWxsc2NyZWVuX2FjY2VwdCwgcGVybWlzc2lvbl9kYXRh KTsKKworICAgIEV2YXNfT2JqZWN0ICpkZW55X2J1dHRvbiA9IGVsbV9idXR0b25fYWRkKHBlcm1p c3Npb25fcG9wdXApOworICAgIGVsbV9vYmplY3RfdGV4dF9zZXQoZGVueV9idXR0b24sICJEZW55 Iik7CisgICAgZWxtX29iamVjdF9wYXJ0X2NvbnRlbnRfc2V0KHBlcm1pc3Npb25fcG9wdXAsICJi dXR0b24yIiwgZGVueV9idXR0b24pOworICAgIGV2YXNfb2JqZWN0X3NtYXJ0X2NhbGxiYWNrX2Fk ZChkZW55X2J1dHRvbiwgImNsaWNrZWQiLCBvbl9mdWxsc2NyZWVuX2RlbnksIHBlcm1pc3Npb25f ZGF0YSk7CisKKyAgICBldmFzX29iamVjdF9zaG93KHBlcm1pc3Npb25fcG9wdXApOworCisgICAg cmV0dXJuIEVJTkFfVFJVRTsKK30KKworc3RhdGljIEVpbmFfQm9vbCBvbl9mdWxsc2NyZWVuX2V4 aXQoRXdrX1ZpZXdfU21hcnRfRGF0YSAqc2QpCit7CisgICAgQnJvd3Nlcl9XaW5kb3cgKndpbmRv dyA9IGJyb3dzZXJfdmlld19maW5kKHNkLT5zZWxmKTsKKworICAgIGVsbV93aW5fZnVsbHNjcmVl bl9zZXQod2luZG93LT53aW5kb3csIEVJTkFfRkFMU0UpOworCisgICAgcmV0dXJuIEVJTkFfVFJV RTsKK30KKwordHlwZWRlZiBzdHJ1Y3QgewogICAgIEV2YXNfT2JqZWN0ICpwb3B1cDsKICAgICBF d2tfQXV0aF9SZXF1ZXN0ICpyZXF1ZXN0OwogICAgIEV2YXNfT2JqZWN0ICp1c2VybmFtZV9lbnRy eTsKQEAgLTk0OSw2ICsxMDIzLDggQEAgc3RhdGljIEJyb3dzZXJfV2luZG93ICp3aW5kb3dfY3Jl YXRlKGNvbnN0IGNoYXIgKnVybCkKICAgICBld2tWaWV3Q2xhc3MtPnJ1bl9qYXZhc2NyaXB0X3By b21wdCA9IG9uX2phdmFzY3JpcHRfcHJvbXB0OwogICAgIGV3a1ZpZXdDbGFzcy0+d2luZG93X2dl b21ldHJ5X2dldCA9IG9uX3dpbmRvd19nZW9tZXRyeV9nZXQ7CiAgICAgZXdrVmlld0NsYXNzLT53 aW5kb3dfZ2VvbWV0cnlfc2V0ID0gb25fd2luZG93X2dlb21ldHJ5X3NldDsKKyAgICBld2tWaWV3 Q2xhc3MtPmZ1bGxzY3JlZW5fZW50ZXIgPSBvbl9mdWxsc2NyZWVuX2VudGVyOworICAgIGV3a1Zp ZXdDbGFzcy0+ZnVsbHNjcmVlbl9leGl0ID0gb25fZnVsbHNjcmVlbl9leGl0OwogCiAgICAgRXZh cyAqZXZhcyA9IGV2YXNfb2JqZWN0X2V2YXNfZ2V0KGFwcF9kYXRhLT53aW5kb3cpOwogICAgIEV2 YXNfU21hcnQgKnNtYXJ0ID0gZXZhc19zbWFydF9jbGFzc19uZXcoJmV3a1ZpZXdDbGFzcy0+c2Mp Owo=