129875 2014-03-07 03:15:45 -0800 [EFL] Modify accelerated compositing related functions in ewk_view. 2014-03-11 01:44:24 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Linux RESOLVED FIXED P2 Normal --- 129676 79766 1 hw1008.kim hw1008.kim bunhere cdumez commit-queue gyuyoung.kim lucas.de.marchi ryuan.choi sergio oldest_to_newest 988099 0 hw1008.kim 2014-03-07 03:15:45 -0800 The compositing object will be created when root layer is attached. So we don't need to expose the create function. And show(), hide() and resize() for compositing object are needed. 988702 1 226249 hw1008.kim 2014-03-08 22:03:30 -0800 Created attachment 226249 Patch 988758 2 226249 gyuyoung.kim 2014-03-09 16:54:00 -0700 Comment on attachment 226249 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=226249&action=review rs=me. However, someone else might wanna have a final look before landing. > Source/WebKit/efl/ewk/ewk_view.cpp:989 > + evas_object_image_size_set(priv->compositingObject.get(), w, h); It would be good if we use "width, height" instead of "w, h". 988809 3 226249 ryuan.choi 2014-03-09 23:16:43 -0700 Comment on attachment 226249 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=226249&action=review > Source/WebKit/efl/ewk/ewk_view.cpp:987 > + if (priv->compositingObject) { Should we still use extra compositingObject ? 989186 4 hw1008.kim 2014-03-10 19:42:04 -0700 (In reply to comment #3) > (From update of attachment 226249 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=226249&action=review > > > Source/WebKit/efl/ewk/ewk_view.cpp:987 > > + if (priv->compositingObject) { > > Should we still use extra compositingObject ? We can integrate accelerated compositing on compositingObject into smartData->backing_store in the next step. 989217 5 ryuan.choi 2014-03-10 21:24:10 -0700 Landed at http://trac.webkit.org/changeset/165428 226249 2014-03-08 22:03:30 -0800 2014-03-10 21:24:31 -0700 Patch bug-129875-20140309150328.patch text/plain 9523 hw1008.kim U3VidmVyc2lvbiBSZXZpc2lvbjogMTY1MzQ2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Vm bC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2VmbC9DaGFuZ2VMb2cKaW5kZXggNTg4ZDg2OWMw MTU2MDZiODRkMDIzZDk4MDBiNGQ4NWVjNzc1YjIxMS4uYzFlNzVjMzBlMjJmZDAzZWE0MjBjNTc3 MWJlNWRiZTc1MzA2MWM2ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9n CisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE0 LTAzLTA4ICBIeW93b24gS2ltICA8aHcxMDA4LmtpbUBzYW1zdW5nLmNvbT4KKworICAgICAgICBb RUZMXSBNb2RpZnkgYWNjZWxlcmF0ZWQgY29tcG9zaXRpbmcgcmVsYXRlZCBmdW5jdGlvbnMgaW4g ZXdrX3ZpZXcuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0xMjk4NzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBUaGUgY29tcG9zaXRpbmcgb2JqZWN0IHdpbGwgYmUgY3JlYXRlZCB3aGVuIHJvb3QgbGF5ZXIg aXMgYXR0YWNoZWQuCisgICAgICAgIFNvIHdlIGRvbid0IG5lZWQgdG8gZXhwb3NlIHRoZSBjcmVh dGUgZnVuY3Rpb24uCisgICAgICAgIEFuZCB0aGlzIHBhdGNoIGFkZHMgc2hvdygpLCBoaWRlKCkg YW5kIHJlc2l6ZSgpIGZvciBjb21wb3NpdGluZyBvYmplY3QuCisKKyAgICAgICAgKiBXZWJDb3Jl U3VwcG9ydC9BY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dEVmbC5oOiBtb3ZlIHJlc2l6ZSgp IHRvIHB1YmxpYy4KKyAgICAgICAgKiBld2svZXdrX3ZpZXcuY3BwOgorICAgICAgICAoX2V3a192 aWV3X3NtYXJ0X3Jlc2l6ZSk6IGFkZCB0byByZXNpemUgdGhlIGNvbXBvc2l0aW5nIG9iamVjdC4K KyAgICAgICAgKF9ld2tfdmlld19zbWFydF9zaG93KTogYWRkIHRvIHNob3cgdGhlIGNvbXBvc2l0 aW5nIG9iamVjdC4KKyAgICAgICAgKF9ld2tfdmlld19zbWFydF9oaWRlKTogYWRkIHRvIGhpZGUg dGhlIGNvbXBvc2l0aW5nIG9iamVjdC4KKyAgICAgICAgKF9ld2tfdmlld19hY2NlbGVyYXRlZF9j b21wb3NpdGluZ19jb250ZXh0X2NyZWF0ZV9pZl9uZWVkZWQpOiAKKyAgICAgICAgbW9kaWZ5IHRo ZSBjcmVhdGlvbiBmb3IgdGhlIGNvbXBvc2l0aW5nIG9iamVjdC4KKyAgICAgICAgKF9ld2tfdmll d19hY2NlbGVyYXRlZF9jb21wb3NpdGluZ19vYmplY3RfY3JlYXRlX2lmX25lZWRlZCk6CisgICAg ICAgIGFkZCBhIHJldHVybiB2YWx1ZS4KKyAgICAgICAgKGV3a192aWV3X3Jvb3RfZ3JhcGhpY3Nf bGF5ZXJfc2V0KToKKyAgICAgICAgSWYgcm9vdCBsYXllciBpcyBub3QgMCwgd2UgY3JlYXRlIHRo ZSBjb21wb3NpdGluZyBvYmplY3QgYW5kIEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0Lgor ICAgICAgICAqIGV3ay9ld2tfdmlld19wcml2YXRlLmg6IHJlbW92ZSB0byBleHBvc2UgdGhlIGNv bXBvc2l0aW5nIG9iamVjdCBjcmVhdGlvbiBBUEkuCisKIDIwMTQtMDMtMDcgIEh5b3dvbiBLaW0g IDxodzEwMDgua2ltQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFtFRkxdIFJlcGxhY2UgR3JhcGhp Y3NDb250ZXh0M0Qgd2l0aCBFdmFzX0dMIGluIEFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0 LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBvcnQvQWNjZWxlcmF0 ZWRDb21wb3NpdGluZ0NvbnRleHRFZmwuaCBiL1NvdXJjZS9XZWJLaXQvZWZsL1dlYkNvcmVTdXBw b3J0L0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0RWZsLmgKaW5kZXggN2VkNDg4MGQwZWQ0 NTI1M2I1MjgwOTU2YjU2NDNhZDVhNGNhOGQ1Ny4uNzUwN2M5MTdkNjE1OGMyZmRlMjQzMjVhYzQ1 ZDM3Yjc5MTJlYTFmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9lZmwvV2ViQ29yZVN1cHBv cnQvQWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRleHRFZmwuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L2VmbC9XZWJDb3JlU3VwcG9ydC9BY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dEVmbC5oCkBA IC00MCw2ICs0MCw4IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgUGFzc093blB0cjxBY2NlbGVyYXRl ZENvbXBvc2l0aW5nQ29udGV4dD4gY3JlYXRlKEhvc3RXaW5kb3cqKTsKICAgICB2aXJ0dWFsIH5B Y2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dCgpOwogCisgICAgYm9vbCByZXNpemUoY29uc3Qg SW50U2l6ZSYpOworCiAgICAgdmlydHVhbCB2b2lkIHN5bmNMYXllcnNOb3coKTsKICAgICB2aXJ0 dWFsIHZvaWQgcmVuZGVyTGF5ZXJzKCk7CiAgICAgdmlydHVhbCB2b2lkIGF0dGFjaFJvb3RHcmFw aGljc0xheWVyKEdyYXBoaWNzTGF5ZXIqIHJvb3RMYXllcik7CkBAIC00OSw4ICs1MSw2IEBAIHBy aXZhdGU6CiAKICAgICB2aXJ0dWFsIGJvb2wgaW5pdGlhbGl6ZShIb3N0V2luZG93Kik7CiAKLSAg ICBib29sIHJlc2l6ZShjb25zdCBJbnRTaXplJik7Ci0KICAgICBFdmFzX09iamVjdCogbV92aWV3 OwogCiAgICAgT3duUHRyPFRleHR1cmVNYXBwZXI+IG1fdGV4dHVyZU1hcHBlcjsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0L2Vm bC9ld2svZXdrX3ZpZXcuY3BwCmluZGV4IGVhM2IwY2VlODdmNGFjMWY1MDU4NWY2YmFlZjc5MTVl Yzk4ODliNjkuLmM0YmYyZDE4Zjk2ZWQ2OTAxN2Y3OWMwZWRjZTlkNmRkNzE4ODFlZGEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlldy5jcHAKKysrIGIvU291cmNlL1dl YktpdC9lZmwvZXdrL2V3a192aWV3LmNwcApAQCAtOTc4LDExICs5NzgsMjEgQEAgc3RhdGljIHZv aWQgX2V3a192aWV3X3NtYXJ0X2RlbChFdmFzX09iamVjdCogZXdrVmlldykKIHN0YXRpYyB2b2lk IF9ld2tfdmlld19zbWFydF9yZXNpemUoRXZhc19PYmplY3QqIGV3a1ZpZXcsIEV2YXNfQ29vcmQg dywgRXZhc19Db29yZCBoKQogewogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4oZXdrVmll dywgc21hcnREYXRhKTsKKyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21hcnREYXRh LCBwcml2KTsKIAogICAgIC8vIHRoZXNlIHNob3VsZCBiZSBxdWV1ZWQgYW5kIHByb2Nlc3NlZCBp biBjYWxjdWxhdGUgYXMgd2VsbCEKICAgICBldmFzX29iamVjdF9yZXNpemUoc21hcnREYXRhLT5i YWNraW5nX3N0b3JlLCB3LCBoKTsKICAgICBldmFzX29iamVjdF9pbWFnZV9zaXplX3NldChzbWFy dERhdGEtPmJhY2tpbmdfc3RvcmUsIHcsIGgpOwogCisgICAgaWYgKHByaXYtPmNvbXBvc2l0aW5n T2JqZWN0KSB7CisgICAgICAgIGV2YXNfb2JqZWN0X3Jlc2l6ZShwcml2LT5jb21wb3NpdGluZ09i amVjdC5nZXQoKSwgdywgaCk7CisgICAgICAgIGV2YXNfb2JqZWN0X2ltYWdlX3NpemVfc2V0KHBy aXYtPmNvbXBvc2l0aW5nT2JqZWN0LmdldCgpLCB3LCBoKTsKKyAgICAgICAgZXZhc19vYmplY3Rf aW1hZ2VfZmlsbF9zZXQocHJpdi0+Y29tcG9zaXRpbmdPYmplY3QuZ2V0KCksIDAsIDAsIHcsIGgp OworCisgICAgICAgIGlmIChwcml2LT5hY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dCkKKyAg ICAgICAgICAgIHByaXYtPmFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0LT5yZXNpemUoV2Vi Q29yZTo6SW50U2l6ZSh3LCBoKSk7CisgICAgfQorCiAgICAgc21hcnREYXRhLT5jaGFuZ2VkLnNp emUgPSB0cnVlOwogICAgIF9ld2tfdmlld19zbWFydF9jaGFuZ2VkKHNtYXJ0RGF0YSk7CiAKQEAg LTEyNzEsMTggKzEyODEsMjYgQEAgc3RhdGljIHZvaWQgX2V3a192aWV3X3NtYXJ0X2NhbGN1bGF0 ZShFdmFzX09iamVjdCogZXdrVmlldykKIHN0YXRpYyB2b2lkIF9ld2tfdmlld19zbWFydF9zaG93 KEV2YXNfT2JqZWN0KiBld2tWaWV3KQogewogICAgIEVXS19WSUVXX1NEX0dFVF9PUl9SRVRVUk4o ZXdrVmlldywgc21hcnREYXRhKTsKKyAgICBFV0tfVklFV19QUklWX0dFVF9PUl9SRVRVUk4oc21h cnREYXRhLCBwcml2KTsKIAogICAgIGlmIChldmFzX29iamVjdF9jbGlwZWVzX2dldChzbWFydERh dGEtPmJhc2UuY2xpcHBlcikpCiAgICAgICAgIGV2YXNfb2JqZWN0X3Nob3coc21hcnREYXRhLT5i YXNlLmNsaXBwZXIpOwogICAgIGV2YXNfb2JqZWN0X3Nob3coc21hcnREYXRhLT5iYWNraW5nX3N0 b3JlKTsKKworICAgIGlmIChwcml2LT5pc0NvbXBvc2l0aW5nQWN0aXZlKQorICAgICAgICBldmFz X29iamVjdF9zaG93KHByaXYtPmNvbXBvc2l0aW5nT2JqZWN0LmdldCgpKTsKIH0KIAogc3RhdGlj IHZvaWQgX2V3a192aWV3X3NtYXJ0X2hpZGUoRXZhc19PYmplY3QqIGV3a1ZpZXcpCiB7CiAgICAg RVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEpOworICAgIEVXS19W SUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYpOwogCiAgICAgZXZhc19vYmpl Y3RfaGlkZShzbWFydERhdGEtPmJhc2UuY2xpcHBlcik7CiAgICAgZXZhc19vYmplY3RfaGlkZShz bWFydERhdGEtPmJhY2tpbmdfc3RvcmUpOworCisgICAgaWYgKHByaXYtPmlzQ29tcG9zaXRpbmdB Y3RpdmUpCisgICAgICAgIGV2YXNfb2JqZWN0X2hpZGUocHJpdi0+Y29tcG9zaXRpbmdPYmplY3Qu Z2V0KCkpOwogfQogCiBzdGF0aWMgRWluYV9Cb29sIF9ld2tfdmlld19zbWFydF9jb250ZW50c19y ZXNpemUoRXdrX1ZpZXdfU21hcnRfRGF0YSosIGludCAvKndpZHRoKi8sIGludCAvKmhlaWdodCov KQpAQCAtNDYxOCwyMiArNDYzNiwyNiBAQCB2b2lkIF9ld2tfdmlld19hY2NlbGVyYXRlZF9jb21w b3NpdGluZ19jYih2b2lkKiBkYXRhLCBFdmFzX09iamVjdCopCiAgICAgfQogfQogCi12b2lkIF9l d2tfdmlld19hY2NlbGVyYXRlZF9jb21wb3NpdGluZ19jb250ZXh0X2NyZWF0ZV9pZl9uZWVkZWQo RXZhc19PYmplY3QqIGV3a1ZpZXcpCitib29sIF9ld2tfdmlld19hY2NlbGVyYXRlZF9jb21wb3Np dGluZ19jb250ZXh0X2NyZWF0ZV9pZl9uZWVkZWQoRXZhc19PYmplY3QqIGV3a1ZpZXcpCiB7Ci0g ICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEpOwotICAgIEVX S19WSUVXX1BSSVZfR0VUX09SX1JFVFVSTihzbWFydERhdGEsIHByaXYpOworICAgIEVXS19WSUVX X1NEX0dFVF9PUl9SRVRVUk4oZXdrVmlldywgc21hcnREYXRhLCBmYWxzZSk7CisgICAgRVdLX1ZJ RVdfUFJJVl9HRVRfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgcHJpdiwgZmFsc2UpOwogCi0gICAgaWYg KCFwcml2LT5hY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dCkKKyAgICBpZiAoIXByaXYtPmFj Y2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0KSB7CiAgICAgICAgIHByaXYtPmFjY2VsZXJhdGVk Q29tcG9zaXRpbmdDb250ZXh0ID0gV2ViQ29yZTo6QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRl eHQ6OmNyZWF0ZSgmcHJpdi0+cGFnZS0+Y2hyb21lKCkpOworICAgICAgICBpZiAoIXByaXYtPmFj Y2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0KQorICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwor ICAgIH0KKyAgICByZXR1cm4gdHJ1ZTsKIH0KIAotYm9vbCBld2tfdmlld19hY2NlbGVyYXRlZF9j b21wb3NpdGluZ19vYmplY3RfY3JlYXRlKEV2YXNfT2JqZWN0KiBld2tWaWV3LCBFdmFzX05hdGl2 ZV9TdXJmYWNlKiBuYXRpdmVTdXJmYWNlLCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiByZWN0KQor dm9pZCBfZXdrX3ZpZXdfYWNjZWxlcmF0ZWRfY29tcG9zaXRpbmdfb2JqZWN0X2NyZWF0ZV9pZl9u ZWVkZWQoRXZhc19PYmplY3QqIGV3a1ZpZXcpCiB7Ci0gICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JF VFVSTihld2tWaWV3LCBzbWFydERhdGEsIGZhbHNlKTsKLSAgICBFV0tfVklFV19QUklWX0dFVF9P Ul9SRVRVUk4oc21hcnREYXRhLCBwcml2LCBmYWxzZSk7CisgICAgRVdLX1ZJRVdfU0RfR0VUX09S X1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEpOworICAgIEVXS19WSUVXX1BSSVZfR0VUX09SX1JF VFVSTihzbWFydERhdGEsIHByaXYpOwogCiAgICAgaWYgKCFwcml2LT5jb21wb3NpdGluZ09iamVj dCkgewotICAgICAgICBwcml2LT5jb21wb3NpdGluZ09iamVjdCA9IGV2YXNfb2JqZWN0X2ltYWdl X2FkZChzbWFydERhdGEtPmJhc2UuZXZhcyk7CisgICAgICAgIHByaXYtPmNvbXBvc2l0aW5nT2Jq ZWN0ID0gYWRvcHRSZWYoZXZhc19vYmplY3RfaW1hZ2VfYWRkKHNtYXJ0RGF0YS0+YmFzZS5ldmFz KSk7CiAKICAgICAgICAgZXZhc19vYmplY3RfcGFzc19ldmVudHNfc2V0KHByaXYtPmNvbXBvc2l0 aW5nT2JqZWN0LmdldCgpLCB0cnVlKTsgLy8gSnVzdCBmb3IgcmVuZGVyaW5nLCBpZ25vcmUgZXZl bnRzLgogICAgICAgICBldmFzX29iamVjdF9pbWFnZV9hbHBoYV9zZXQocHJpdi0+Y29tcG9zaXRp bmdPYmplY3QuZ2V0KCksIHRydWUpOwpAQCAtNDY0NSwxNiArNDY2NywxMiBAQCBib29sIGV3a192 aWV3X2FjY2VsZXJhdGVkX2NvbXBvc2l0aW5nX29iamVjdF9jcmVhdGUoRXZhc19PYmplY3QqIGV3 a1ZpZXcsIEV2YXNfTgogICAgICAgICBldmFzX29iamVjdF9zbWFydF9tZW1iZXJfYWRkKHByaXYt PmNvbXBvc2l0aW5nT2JqZWN0LmdldCgpLCBld2tWaWV3KTsKICAgICB9CiAKLSAgICBldmFzX29i amVjdF9pbWFnZV9zaXplX3NldChwcml2LT5jb21wb3NpdGluZ09iamVjdC5nZXQoKSwgcmVjdC53 aWR0aCgpLCByZWN0LmhlaWdodCgpKTsKLSAgICBldmFzX29iamVjdF9pbWFnZV9maWxsX3NldChw cml2LT5jb21wb3NpdGluZ09iamVjdC5nZXQoKSwgMCwgMCwgcmVjdC53aWR0aCgpLCByZWN0Lmhl aWdodCgpKTsKKyAgICBldmFzX29iamVjdF9pbWFnZV9zaXplX3NldChwcml2LT5jb21wb3NpdGlu Z09iamVjdC5nZXQoKSwgc21hcnREYXRhLT52aWV3LncsIHNtYXJ0RGF0YS0+dmlldy5oKTsKKyAg ICBldmFzX29iamVjdF9pbWFnZV9maWxsX3NldChwcml2LT5jb21wb3NpdGluZ09iamVjdC5nZXQo KSwgMCwgMCwgc21hcnREYXRhLT52aWV3LncsIHNtYXJ0RGF0YS0+dmlldy5oKTsKIAotICAgIGV2 YXNfb2JqZWN0X21vdmUocHJpdi0+Y29tcG9zaXRpbmdPYmplY3QuZ2V0KCksIHJlY3QueCgpLCBy ZWN0LnkoKSk7Ci0gICAgZXZhc19vYmplY3RfcmVzaXplKHByaXYtPmNvbXBvc2l0aW5nT2JqZWN0 LmdldCgpLCByZWN0LndpZHRoKCksIHJlY3QuaGVpZ2h0KCkpOworICAgIGV2YXNfb2JqZWN0X21v dmUocHJpdi0+Y29tcG9zaXRpbmdPYmplY3QuZ2V0KCksIHNtYXJ0RGF0YS0+dmlldy54LCBzbWFy dERhdGEtPnZpZXcueSk7CisgICAgZXZhc19vYmplY3RfcmVzaXplKHByaXYtPmNvbXBvc2l0aW5n T2JqZWN0LmdldCgpLCBzbWFydERhdGEtPnZpZXcudywgc21hcnREYXRhLT52aWV3LmgpOwogICAg IGV2YXNfb2JqZWN0X2hpZGUocHJpdi0+Y29tcG9zaXRpbmdPYmplY3QuZ2V0KCkpOwotCi0gICAg Ly8gU2V0IHVwIHRoZSBuYXRpdmUgc3VyZmFjZSBpbmZvIHRvIHVzZSB0aGUgY29udGV4dCBhbmQg c3VyZmFjZSBjcmVhdGVkIGluIEdDM0RQcml2YXRlLgotICAgIGV2YXNfb2JqZWN0X2ltYWdlX25h dGl2ZV9zdXJmYWNlX3NldChwcml2LT5jb21wb3NpdGluZ09iamVjdC5nZXQoKSwgbmF0aXZlU3Vy ZmFjZSk7Ci0gICAgcmV0dXJuIHRydWU7CiB9CiAKIHZvaWQgZXdrX3ZpZXdfcm9vdF9ncmFwaGlj c19sYXllcl9zZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIq IHJvb3RMYXllcikKQEAgLTQ2NjksMTIgKzQ2ODcsMTggQEAgdm9pZCBld2tfdmlld19yb290X2dy YXBoaWNzX2xheWVyX3NldChFdmFzX09iamVjdCogZXdrVmlldywgV2ViQ29yZTo6R3JhcGhpY3NM YXkKICAgICBwcml2LT5pc0NvbXBvc2l0aW5nQWN0aXZlID0gYWN0aXZlOwogCiAgICAgaWYgKHBy aXYtPmlzQ29tcG9zaXRpbmdBY3RpdmUpIHsKLSAgICAgICAgX2V3a192aWV3X2FjY2VsZXJhdGVk X2NvbXBvc2l0aW5nX2NvbnRleHRfY3JlYXRlX2lmX25lZWRlZChld2tWaWV3KTsKLSAgICAgICAg ZXZhc19vYmplY3Rfc2hvdyhwcml2LT5jb21wb3NpdGluZ09iamVjdC5nZXQoKSk7Ci0gICAgfSBl bHNlCisgICAgICAgIF9ld2tfdmlld19hY2NlbGVyYXRlZF9jb21wb3NpdGluZ19vYmplY3RfY3Jl YXRlX2lmX25lZWRlZChld2tWaWV3KTsKKyAgICAgICAgaWYgKF9ld2tfdmlld19hY2NlbGVyYXRl ZF9jb21wb3NpdGluZ19jb250ZXh0X2NyZWF0ZV9pZl9uZWVkZWQoZXdrVmlldykpCisgICAgICAg ICAgICBldmFzX29iamVjdF9zaG93KHByaXYtPmNvbXBvc2l0aW5nT2JqZWN0LmdldCgpKTsKKyAg ICAgICAgZWxzZQorICAgICAgICAgICAgcHJpdi0+aXNDb21wb3NpdGluZ0FjdGl2ZSA9IGZhbHNl OworICAgIH0KKworICAgIGlmICghcHJpdi0+aXNDb21wb3NpdGluZ0FjdGl2ZSkKICAgICAgICAg ZXZhc19vYmplY3RfaGlkZShwcml2LT5jb21wb3NpdGluZ09iamVjdC5nZXQoKSk7CiAKLSAgICBw cml2LT5hY2NlbGVyYXRlZENvbXBvc2l0aW5nQ29udGV4dC0+YXR0YWNoUm9vdEdyYXBoaWNzTGF5 ZXIocm9vdExheWVyKTsKKyAgICBpZiAocHJpdi0+YWNjZWxlcmF0ZWRDb21wb3NpdGluZ0NvbnRl eHQpCisgICAgICAgIHByaXYtPmFjY2VsZXJhdGVkQ29tcG9zaXRpbmdDb250ZXh0LT5hdHRhY2hS b290R3JhcGhpY3NMYXllcihyb290TGF5ZXIpOwogfQogCiB2b2lkIGV3a192aWV3X21hcmtfZm9y X3N5bmMoRXZhc19PYmplY3QqIGV3a1ZpZXcpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Vm bC9ld2svZXdrX3ZpZXdfcHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3 X3ByaXZhdGUuaAppbmRleCA2MjY3NmM5MWI0YjYzNzQzM2QxNDY4ZGFhZmI3NjBjNGZmZWJiNmUz Li40ODdlMjkyMjlhMzRhZDIwZjhkN2JiMmFkNDk3ZDMwZWE0M2JkYTk1IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXdfcHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJL aXQvZWZsL2V3ay9ld2tfdmlld19wcml2YXRlLmgKQEAgLTE0OSw3ICsxNDksNiBAQCBXZWJDb3Jl OjpGbG9hdFJlY3QgZXdrX3ZpZXdfcGFnZV9yZWN0X2dldChjb25zdCBFdmFzX09iamVjdCogZXdr Vmlldyk7CiB2b2lkIGV3a192aWV3X21peGVkX2NvbnRlbnRfZGlzcGxheWVkX3NldChFdmFzX09i amVjdCogZXdrVmlldywgYm9vbCBoYXNEaXNwbGF5ZWQpOwogdm9pZCBld2tfdmlld19taXhlZF9j b250ZW50X3J1bl9zZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIGJvb2wgaGFzUnVuKTsKIAotYm9v bCBld2tfdmlld19hY2NlbGVyYXRlZF9jb21wb3NpdGluZ19vYmplY3RfY3JlYXRlKEV2YXNfT2Jq ZWN0KiBld2tWaWV3LCBFdmFzX05hdGl2ZV9TdXJmYWNlKiBuYXRpdmVTdXJmYWNlLCBjb25zdCBX ZWJDb3JlOjpJbnRSZWN0JiByZWN0KTsKIHZvaWQgZXdrX3ZpZXdfcm9vdF9ncmFwaGljc19sYXll cl9zZXQoRXZhc19PYmplY3QqIGV3a1ZpZXcsIFdlYkNvcmU6OkdyYXBoaWNzTGF5ZXIqIHJvb3RM YXllcik7CiB2b2lkIGV3a192aWV3X21hcmtfZm9yX3N5bmMoRXZhc19PYmplY3QqIGV3a1ZpZXcp OwogCg==