79031 2012-02-20 06:43:30 -0800 [EFL] Make a pair between evas_object_image_data_set/get. 2012-02-27 07:07:43 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 jungjik.lee webkit-unassigned commit-queue glima gyuyoung.kim hyuki.kim hyunki.baik lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 560216 0 jungjik.lee 2012-02-20 06:43:30 -0800 Following the guide of EFL(http://docs.enlightenment.org/auto/evas/group__Evas__Object__Image.html), we should make a pair between evas_object_image_data_get and set. Because when calling evas_object_image_data_get, the function increases the reference count. If the ref count is not null, the pixel data is kept inside evas object. So to return pixel resource, evas_object_image_data_set should be called. 562994 1 128445 jungjik.lee 2012-02-23 02:35:34 -0800 Created attachment 128445 proposal patch 563038 2 hyuki.kim 2012-02-23 05:00:42 -0800 > Source/WebKit/efl/ChangeLog:8 > + - We get the pixel data when we create the cairo surface. We ? > Source/WebKit/efl/ChangeLog:10 > + We should make a pair between evas_object_image_data_set/get to return evas resource. I suggest you to specify the reason of evas_object_image_data_set too. So, it can be a complete sentence. > Source/WebKit/efl/ewk/ewk_view_tiled.cpp:52 > + uint8_t* pixels = static_cast<uint8_t*>(evas_object_image_data_get(tile->image, EINA_TRUE)); EINA_TRUE should be replaced. > Source/WebKit/efl/ewk/ewk_view_tiled.cpp:76 > + cairo_identity_matrix(cairo.get()); I don't think that cairo_identity_matrix() would be required. would you double check ? 563080 3 hyuki.kim 2012-02-23 06:25:05 -0800 > Source/WebKit/efl/ewk/ewk_view_tiled.cpp:71 > + cairo_scale(cairo.get(), tile->zoom, tile->zoom); In addition to my previous idea, this doesn't look necessary. 564336 4 jungjik.lee 2012-02-24 08:23:23 -0800 (In reply to comment #2) > > Source/WebKit/efl/ChangeLog:8 > > + - We get the pixel data when we create the cairo surface. > > We ? > I've changed the word. > > Source/WebKit/efl/ChangeLog:10 > > + We should make a pair between evas_object_image_data_set/get to return evas resource. > > I suggest you to specify the reason of evas_object_image_data_set too. > So, it can be a complete sentence. > I append more description. > > Source/WebKit/efl/ewk/ewk_view_tiled.cpp:52 > > + uint8_t* pixels = static_cast<uint8_t*>(evas_object_image_data_get(tile->image, EINA_TRUE)); > > EINA_TRUE should be replaced. Done. > > > Source/WebKit/efl/ewk/ewk_view_tiled.cpp:76 > > + cairo_identity_matrix(cairo.get()); > > I don't think that cairo_identity_matrix() would be required. would you double check ? It's removed. 564345 5 128740 jungjik.lee 2012-02-24 08:41:19 -0800 Created attachment 128740 revised patch 1 564774 6 hyuki.kim 2012-02-24 17:12:12 -0800 LGTM. 565587 7 128740 zherczeg 2012-02-27 05:13:59 -0800 Comment on attachment 128740 revised patch 1 LGTM 565631 8 128740 webkit.review.bot 2012-02-27 07:07:38 -0800 Comment on attachment 128740 revised patch 1 Clearing flags on attachment: 128740 Committed r108991: <http://trac.webkit.org/changeset/108991> 565632 9 webkit.review.bot 2012-02-27 07:07:43 -0800 All reviewed patches have been landed. Closing bug. 128445 2012-02-23 02:35:34 -0800 2012-02-24 08:41:19 -0800 proposal patch proposal.patch text/plain 3816 jungjik.lee ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCA5MmMwMWZlLi4zNTk4NzJmIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTItMDItMjMgIEp1bmdKaWsgTGVlICA8anVuZ2ppay5sZWVAc2Ft c3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gUGFpcmluZyB1cCBiZXR3ZWVuIGV2YXNfb2JqZWN0 X2ltYWdlX2RhdGFfZ2V0IGFuZCBldmFzX29iamVjdF9pbWFnZV9kYXRhX3NldC4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc5MDMxCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgLSBXZSBnZXQgdGhlIHBpeGVs IGRhdGEgd2hlbiB3ZSBjcmVhdGUgdGhlIGNhaXJvIHN1cmZhY2UuCisgICAgICAgIC0gZXZhc19v YmplY3RfaW1hZ2VfZGF0YV9nZXQgaW5jcmVhc2VzIHRoZSByZWZlcmVuY2UgY291bnQgYW5kIHJl dHVybnMgdGhlIGltYWdlIGJ1ZmZlciBwb2ludGVyLgorICAgICAgICBXZSBzaG91bGQgbWFrZSBh IHBhaXIgYmV0d2VlbiBldmFzX29iamVjdF9pbWFnZV9kYXRhX3NldC9nZXQgdG8gcmV0dXJuIGV2 YXMgcmVzb3VyY2UuCisKKyAgICAgICAgKiBld2svZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmUuaDoK KyAgICAgICAgKF9Fd2tfVGlsZSk6CisgICAgICAgICogZXdrL2V3a190aWxlZF9tb2RlbC5jcHA6 CisgICAgICAgICh0aWxlX2FjY291bnQpOgorICAgICAgICAoZXdrX3RpbGVfbmV3KToKKyAgICAg ICAgKiBld2svZXdrX3ZpZXdfdGlsZWQuY3BwOgorICAgICAgICAoX2V3a192aWV3X3RpbGVkX3Jl bmRlcl9jYik6CisKIDIwMTItMDItMjEgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+ CiAKICAgICAgICAgUmVtb3ZlIHRoZSByZW1haW5pbmcgdXNlcyBvZiBDU1NTdHlsZURlY2xhcmF0 aW9uIGluIEVkaXRvcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a190aWxl ZF9iYWNraW5nX3N0b3JlLmggYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3RpbGVkX2JhY2tp bmdfc3RvcmUuaAppbmRleCA3YjhjZTBkLi45ZTVhMDQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2VmbC9ld2svZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0 L2VmbC9ld2svZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmUuaApAQCAtNzcsNyArNzcsNiBAQCBzdHJ1 Y3QgX0V3a19UaWxlIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKi8KICAg ICBpbnQgdmlzaWJsZTsgICAgICAgICAgICAgICAgICAvKio8IHZpc2liaWxpdHkgY291bnRlciBv ZiB0aGlzIHRpbGUgKi8KICAgICBFdmFzX09iamVjdCAqaW1hZ2U7ICAgICAgICAgICAvKio8IEV2 YXMgSW1hZ2UsIHRoZSB0aWxlIHRvIGJlIHJlbmRlcmVkICovCi0gICAgdWludDhfdCAqcGl4ZWxz OwogfTsKIAogI2luY2x1ZGUgImV3a190aWxlZF9tYXRyaXguaCIKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvZWZsL2V3ay9ld2tfdGlsZWRfbW9kZWwuY3BwIGIvU291cmNlL1dlYktpdC9lZmwv ZXdrL2V3a190aWxlZF9tb2RlbC5jcHAKaW5kZXggODdmYTgzYy4uZWRlMWI0YiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a190aWxlZF9tb2RlbC5jcHAKKysrIGIvU291cmNl L1dlYktpdC9lZmwvZXdrL2V3a190aWxlZF9tb2RlbC5jcHAKQEAgLTIyMSw3ICsyMjEsNiBAQCBF d2tfVGlsZSogZXdrX3RpbGVfbmV3KEV2YXMqIGV2YXMsIEV2YXNfQ29vcmQgd2lkdGgsIEV2YXNf Q29vcmQgaGVpZ2h0LCBmbG9hdCB6bwogCiAgICAgZXZhc19vYmplY3RfaW1hZ2Vfc2l6ZV9zZXQo dGlsZS0+aW1hZ2UsIHRpbGUtPndpZHRoLCB0aWxlLT5oZWlnaHQpOwogICAgIGV2YXNfb2JqZWN0 X2ltYWdlX2NvbG9yc3BhY2Vfc2V0KHRpbGUtPmltYWdlLCB0aWxlLT5jc3BhY2UpOwotICAgIHRp bGUtPnBpeGVscyA9IHN0YXRpY19jYXN0PHVpbnQ4X3QqPihldmFzX29iamVjdF9pbWFnZV9kYXRh X2dldCh0aWxlLT5pbWFnZSwgdHJ1ZSkpOwogICAgIF9ld2tfdGlsZV9hY2NvdW50X2FsbG9jYXRl ZCh0aWxlKTsKIAogICAgIHJldHVybiB0aWxlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9l ZmwvZXdrL2V3a192aWV3X3RpbGVkLmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmll d190aWxlZC5jcHAKaW5kZXggYmZiMmQ5NS4uYzZiMjg1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9lZmwvZXdrL2V3a192aWV3X3RpbGVkLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9l d2svZXdrX3ZpZXdfdGlsZWQuY3BwCkBAIC00OSw3ICs0OSwxMiBAQCBzdGF0aWMgRWluYV9Cb29s IF9ld2tfdmlld190aWxlZF9yZW5kZXJfY2Iodm9pZCogZGF0YSwgRXdrX1RpbGUqIHRpbGUsIGNv bnN0IEVpbgogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCi0gICAgUmVmUHRyPGNhaXJv X3N1cmZhY2VfdD4gc3VyZmFjZSA9IGFkb3B0UmVmKGNhaXJvX2ltYWdlX3N1cmZhY2VfY3JlYXRl X2Zvcl9kYXRhKHRpbGUtPnBpeGVscywgZm9ybWF0LCB0aWxlLT53aWR0aCwgdGlsZS0+aGVpZ2h0 LCBzdHJpZGUpKTsKKyAgICB1aW50OF90KiBwaXhlbHMgPSBzdGF0aWNfY2FzdDx1aW50OF90Kj4o ZXZhc19vYmplY3RfaW1hZ2VfZGF0YV9nZXQodGlsZS0+aW1hZ2UsIEVJTkFfVFJVRSkpOworICAg IGlmICghcGl4ZWxzKSB7CisgICAgICAgIEVSUigiZmFpbCB0byBnZXQgdGhlIHBpeGVsIGRhdGEg ZnJvbSB0aGUgaW1hZ2Ugb2JqZWN0Iik7CisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9Cisg ICAgUmVmUHRyPGNhaXJvX3N1cmZhY2VfdD4gc3VyZmFjZSA9IGFkb3B0UmVmKGNhaXJvX2ltYWdl X3N1cmZhY2VfY3JlYXRlX2Zvcl9kYXRhKHBpeGVscywgZm9ybWF0LCB0aWxlLT53aWR0aCwgdGls ZS0+aGVpZ2h0LCBzdHJpZGUpKTsKICAgICBjYWlyb19zdGF0dXNfdCBzdGF0dXMgPSBjYWlyb19z dXJmYWNlX3N0YXR1cyhzdXJmYWNlLmdldCgpKTsKICAgICBpZiAoc3RhdHVzICE9IENBSVJPX1NU QVRVU19TVUNDRVNTKSB7CiAgICAgICAgIEVSUigiZmFpbGVkIHRvIGNyZWF0ZSBjYWlybyBzdXJm YWNlOiAlcyIsIGNhaXJvX3N0YXR1c190b19zdHJpbmcoc3RhdHVzKSk7CkBAIC02Myw5ICs2OCwx MyBAQCBzdGF0aWMgRWluYV9Cb29sIF9ld2tfdmlld190aWxlZF9yZW5kZXJfY2Iodm9pZCogZGF0 YSwgRXdrX1RpbGUqIHRpbGUsIGNvbnN0IEVpbgogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAg fQogCisgICAgY2Fpcm9fc2NhbGUoY2Fpcm8uZ2V0KCksIHRpbGUtPnpvb20sIHRpbGUtPnpvb20p OwogICAgIGNhaXJvX3RyYW5zbGF0ZShjYWlyby5nZXQoKSwgLXRpbGUtPngsIC10aWxlLT55KTsK IAotICAgIHJldHVybiBld2tfdmlld19wYWludF9jb250ZW50cyhwcml2LCBjYWlyby5nZXQoKSwg JnJlY3QpOworICAgIGJvb2wgcmVzdWx0ID0gZXdrX3ZpZXdfcGFpbnRfY29udGVudHMocHJpdiwg Y2Fpcm8uZ2V0KCksICZyZWN0KTsKKyAgICBldmFzX29iamVjdF9pbWFnZV9kYXRhX3NldCh0aWxl LT5pbWFnZSwgcGl4ZWxzKTsKKyAgICBjYWlyb19pZGVudGl0eV9tYXRyaXgoY2Fpcm8uZ2V0KCkp OworICAgIHJldHVybiByZXN1bHQ7CiB9CiAKIHN0YXRpYyB2b2lkKiBfZXdrX3ZpZXdfdGlsZWRf dXBkYXRlc19wcm9jZXNzX3ByZSh2b2lkKiBkYXRhLCBFdmFzX09iamVjdCogZXdrVmlldykK 128740 2012-02-24 08:41:19 -0800 2012-02-27 07:07:38 -0800 revised patch 1 revised_1.patch text/plain 3875 jungjik.lee ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCBkYjIyZDQ0Li43N2IzMTQyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjQgQEAKKzIwMTItMDItMjQgIEp1bmdKaWsgTGVlICA8anVuZ2ppay5sZWVAc2Ft c3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gUGFpcmluZyB1cCBiZXR3ZWVuIGV2YXNfb2JqZWN0 X2ltYWdlX2RhdGFfZ2V0IGFuZCBldmFzX29iamVjdF9pbWFnZV9kYXRhX3NldC4KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc5MDMxCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgLSBHZXQgdGhlIHBpeGVsIGRh dGEgd2hlbiB0aGUgY2Fpcm8gc3VyZmFjZSBpcyBjcmVhdGVkLgorICAgICAgICAtIGV2YXNfb2Jq ZWN0X2ltYWdlX2RhdGFfZ2V0IGluY3JlYXNlcyB0aGUgcmVmZXJlbmNlIGNvdW50IGFuZCByZXR1 cm5zIHRoZSBpbWFnZSBidWZmZXIgcG9pbnRlci4KKyAgICAgICAgZXZhc19vYmplY3RfaW1hZ2Vf ZGF0YV9zZXQgZGVjcmVhc2VzIHRoZSByZWZlcmVuY2UgY291bnQgYW5kIHdoZW4gdGhlIHJlZiBj b3VudCBiZWNvbWUgemVybywKKyAgICAgICAgdGhlIGZ1bmN0aW9uIHJlbGVhc2VzIHRoZSBjYWNo ZWQgaW1hZ2UgaW5zaWRlIGV2YXMgZW5naW5lLgorICAgICAgICBXZSBzaG91bGQgbWFrZSBhIHBh aXIgYmV0d2VlbiBldmFzX29iamVjdF9pbWFnZV9kYXRhX3NldC9nZXQgdG8gcmV0dXJuIGV2YXMg cmVzb3VyY2UuCisKKyAgICAgICAgKiBld2svZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmUuaDoKKyAg ICAgICAgKF9Fd2tfVGlsZSk6CisgICAgICAgICogZXdrL2V3a190aWxlZF9tb2RlbC5jcHA6Cisg ICAgICAgICh0aWxlX2FjY291bnQpOgorICAgICAgICAoZXdrX3RpbGVfbmV3KToKKyAgICAgICAg KiBld2svZXdrX3ZpZXdfdGlsZWQuY3BwOgorICAgICAgICAoX2V3a192aWV3X3RpbGVkX3JlbmRl cl9jYik6CisKIDIwMTItMDItMjQgIFNoaW55YSBLYXdhbmFrYSAgPHNoaW55YWtAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFNwZWxsQ2hlY2tSZXF1ZXN0IG5lZWRzIHRvIGtub3cgdGhlIGNvbnRl eHQgd2hlcmUgdGhlIHNwZWxsY2hlY2sgaGFwcGVuZWQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2VmbC9ld2svZXdrX3RpbGVkX2JhY2tpbmdfc3RvcmUuaCBiL1NvdXJjZS9XZWJLaXQvZWZs L2V3ay9ld2tfdGlsZWRfYmFja2luZ19zdG9yZS5oCmluZGV4IDdiOGNlMGQuLjllNWEwNDggMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdGlsZWRfYmFja2luZ19zdG9yZS5o CisrKyBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdGlsZWRfYmFja2luZ19zdG9yZS5oCkBA IC03Nyw3ICs3Nyw2IEBAIHN0cnVjdCBfRXdrX1RpbGUgewogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAqLwogICAgIGludCB2aXNpYmxlOyAgICAgICAgICAgICAgICAgIC8qKjwg dmlzaWJpbGl0eSBjb3VudGVyIG9mIHRoaXMgdGlsZSAqLwogICAgIEV2YXNfT2JqZWN0ICppbWFn ZTsgICAgICAgICAgIC8qKjwgRXZhcyBJbWFnZSwgdGhlIHRpbGUgdG8gYmUgcmVuZGVyZWQgKi8K LSAgICB1aW50OF90ICpwaXhlbHM7CiB9OwogCiAjaW5jbHVkZSAiZXdrX3RpbGVkX21hdHJpeC5o IgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9lZmwvZXdrL2V3a190aWxlZF9tb2RlbC5jcHAg Yi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3RpbGVkX21vZGVsLmNwcAppbmRleCA4N2ZhODNj Li5lZGUxYjRiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3RpbGVkX21v ZGVsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3RpbGVkX21vZGVsLmNwcApA QCAtMjIxLDcgKzIyMSw2IEBAIEV3a19UaWxlKiBld2tfdGlsZV9uZXcoRXZhcyogZXZhcywgRXZh c19Db29yZCB3aWR0aCwgRXZhc19Db29yZCBoZWlnaHQsIGZsb2F0IHpvCiAKICAgICBldmFzX29i amVjdF9pbWFnZV9zaXplX3NldCh0aWxlLT5pbWFnZSwgdGlsZS0+d2lkdGgsIHRpbGUtPmhlaWdo dCk7CiAgICAgZXZhc19vYmplY3RfaW1hZ2VfY29sb3JzcGFjZV9zZXQodGlsZS0+aW1hZ2UsIHRp bGUtPmNzcGFjZSk7Ci0gICAgdGlsZS0+cGl4ZWxzID0gc3RhdGljX2Nhc3Q8dWludDhfdCo+KGV2 YXNfb2JqZWN0X2ltYWdlX2RhdGFfZ2V0KHRpbGUtPmltYWdlLCB0cnVlKSk7CiAgICAgX2V3a190 aWxlX2FjY291bnRfYWxsb2NhdGVkKHRpbGUpOwogCiAgICAgcmV0dXJuIHRpbGU7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXdfdGlsZWQuY3BwIGIvU291cmNlL1dl YktpdC9lZmwvZXdrL2V3a192aWV3X3RpbGVkLmNwcAppbmRleCBiZmIyZDk1Li4zNDJjYzRlIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXdfdGlsZWQuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQvZWZsL2V3ay9ld2tfdmlld190aWxlZC5jcHAKQEAgLTQ5LDcgKzQ5LDEy IEBAIHN0YXRpYyBFaW5hX0Jvb2wgX2V3a192aWV3X3RpbGVkX3JlbmRlcl9jYih2b2lkKiBkYXRh LCBFd2tfVGlsZSogdGlsZSwgY29uc3QgRWluCiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9 CiAKLSAgICBSZWZQdHI8Y2Fpcm9fc3VyZmFjZV90PiBzdXJmYWNlID0gYWRvcHRSZWYoY2Fpcm9f aW1hZ2Vfc3VyZmFjZV9jcmVhdGVfZm9yX2RhdGEodGlsZS0+cGl4ZWxzLCBmb3JtYXQsIHRpbGUt PndpZHRoLCB0aWxlLT5oZWlnaHQsIHN0cmlkZSkpOworICAgIHVpbnQ4X3QqIHBpeGVscyA9IHN0 YXRpY19jYXN0PHVpbnQ4X3QqPihldmFzX29iamVjdF9pbWFnZV9kYXRhX2dldCh0aWxlLT5pbWFn ZSwgdHJ1ZSkpOworICAgIGlmICghcGl4ZWxzKSB7CisgICAgICAgIEVSUigiZmFpbCB0byBnZXQg dGhlIHBpeGVsIGRhdGEgZnJvbSB0aGUgaW1hZ2Ugb2JqZWN0Iik7CisgICAgICAgIHJldHVybiBm YWxzZTsKKyAgICB9CisgICAgUmVmUHRyPGNhaXJvX3N1cmZhY2VfdD4gc3VyZmFjZSA9IGFkb3B0 UmVmKGNhaXJvX2ltYWdlX3N1cmZhY2VfY3JlYXRlX2Zvcl9kYXRhKHBpeGVscywgZm9ybWF0LCB0 aWxlLT53aWR0aCwgdGlsZS0+aGVpZ2h0LCBzdHJpZGUpKTsKICAgICBjYWlyb19zdGF0dXNfdCBz dGF0dXMgPSBjYWlyb19zdXJmYWNlX3N0YXR1cyhzdXJmYWNlLmdldCgpKTsKICAgICBpZiAoc3Rh dHVzICE9IENBSVJPX1NUQVRVU19TVUNDRVNTKSB7CiAgICAgICAgIEVSUigiZmFpbGVkIHRvIGNy ZWF0ZSBjYWlybyBzdXJmYWNlOiAlcyIsIGNhaXJvX3N0YXR1c190b19zdHJpbmcoc3RhdHVzKSk7 CkBAIC02NSw3ICs3MCw5IEBAIHN0YXRpYyBFaW5hX0Jvb2wgX2V3a192aWV3X3RpbGVkX3JlbmRl cl9jYih2b2lkKiBkYXRhLCBFd2tfVGlsZSogdGlsZSwgY29uc3QgRWluCiAKICAgICBjYWlyb190 cmFuc2xhdGUoY2Fpcm8uZ2V0KCksIC10aWxlLT54LCAtdGlsZS0+eSk7CiAKLSAgICByZXR1cm4g ZXdrX3ZpZXdfcGFpbnRfY29udGVudHMocHJpdiwgY2Fpcm8uZ2V0KCksICZyZWN0KTsKKyAgICBi b29sIHJlc3VsdCA9IGV3a192aWV3X3BhaW50X2NvbnRlbnRzKHByaXYsIGNhaXJvLmdldCgpLCAm cmVjdCk7CisgICAgZXZhc19vYmplY3RfaW1hZ2VfZGF0YV9zZXQodGlsZS0+aW1hZ2UsIHBpeGVs cyk7CisgICAgcmV0dXJuIHJlc3VsdDsKIH0KIAogc3RhdGljIHZvaWQqIF9ld2tfdmlld190aWxl ZF91cGRhdGVzX3Byb2Nlc3NfcHJlKHZvaWQqIGRhdGEsIEV2YXNfT2JqZWN0KiBld2tWaWV3KQo=