75837 2012-01-09 02:04:25 -0800 [EFL] Added smart pointers to Ewk_View_Paint_Context class and done minor refactorization. 2012-01-10 07:18:10 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 t.morawski webkit-unassigned gyuyoung.kim lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 532048 0 t.morawski 2012-01-09 02:04:25 -0800 Changes: - Changed graphicContext raw pointer to OwnPtr smart pointer. - Changed cr variable name to cairo and making it as RefPtr. 532049 1 121633 t.morawski 2012-01-09 02:05:45 -0800 Created attachment 121633 Added smart pointers to Ewk_View_Paint_Context class and done minor refactorization 532108 2 rakuco 2012-01-09 05:10:20 -0800 Looks OK. 532109 3 121633 gyuyoung.kim 2012-01-09 05:14:19 -0800 Comment on attachment 121633 Added smart pointers to Ewk_View_Paint_Context class and done minor refactorization LGTM too. 532864 4 121633 rniwa 2012-01-10 00:37:33 -0800 Comment on attachment 121633 Added smart pointers to Ewk_View_Paint_Context class and done minor refactorization View in context: https://bugs.webkit.org/attachment.cgi?id=121633&action=review > Source/WebKit/efl/ChangeLog:3 > + [EFL] Added smart pointers to Ewk_View_Paint_Context class and done minor refactorization. Nit: minor "refactoring" > Source/WebKit/efl/ChangeLog:9 > + Changed cr variable name to cairo and making it as RefPtr. Nit: Renamed cr to cairo and made it a RefPtr. 533008 5 121837 t.morawski 2012-01-10 05:54:04 -0800 Created attachment 121837 Fixed ChangeLog 533046 6 121837 webkit.review.bot 2012-01-10 07:18:05 -0800 Comment on attachment 121837 Fixed ChangeLog Clearing flags on attachment: 121837 Committed r104568: <http://trac.webkit.org/changeset/104568> 533047 7 webkit.review.bot 2012-01-10 07:18:10 -0800 All reviewed patches have been landed. Closing bug. 121633 2012-01-09 02:05:45 -0800 2012-01-10 05:54:04 -0800 Added smart pointers to Ewk_View_Paint_Context class and done minor refactorization patch01.patch text/plain 4717 t.morawski ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCBmZmU3YTEwLi5mMmY0MDNiIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTItMDEtMDkgIFRvbWFzeiBNb3Jhd3NraSAgPHQubW9yYXdza2lA c2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gQWRkZWQgc21hcnQgcG9pbnRlcnMgdG8gRXdr X1ZpZXdfUGFpbnRfQ29udGV4dCBjbGFzcyBhbmQgZG9uZSBtaW5vciByZWZhY3Rvcml6YXRpb24u CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NTgzNwor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENoYW5nZWQg Z3JhcGhpY0NvbnRleHQgcmF3IHBvaW50ZXIgdG8gT3duUHRyIHNtYXJ0IHBvaW50ZXIuCisgICAg ICAgIENoYW5nZWQgY3IgdmFyaWFibGUgbmFtZSB0byBjYWlybyBhbmQgbWFraW5nIGl0IGFzIFJl ZlB0ci4KKworICAgICAgICAqIGV3ay9ld2tfdmlldy5jcHA6CisgICAgICAgIChld2tfdmlld19w YWludF9jb250ZXh0X25ldyk6IEFkanVzdCB0byBhdXRvIHBvaW50ZXJzIHVzZS4gTWlub3IgcmVm YWN0b3JpemF0aW9uLgorICAgICAgICAoZXdrX3ZpZXdfcGFpbnRfY29udGV4dF9mcmVlKTogUmVt b3ZlZCBleHBsaWNpdCByYXcgcG9pbnRlcnMgZGVsZXRlLgorICAgICAgICBBZGp1c3QgdG8gYXV0 byBwb2ludGVycyB1c2U6CisgICAgICAgIChld2tfdmlld19wYWludF9jb250ZXh0X3NhdmUpOgor ICAgICAgICAoZXdrX3ZpZXdfcGFpbnRfY29udGV4dF9yZXN0b3JlKToKKyAgICAgICAgKGV3a192 aWV3X3BhaW50X2NvbnRleHRfY2xpcCk6CisgICAgICAgIChld2tfdmlld19wYWludF9jb250ZXh0 X3BhaW50KToKKyAgICAgICAgKGV3a192aWV3X3BhaW50X2NvbnRleHRfcGFpbnRfY29udGVudHMp OgorCiAyMDEyLTAxLTA2ICBKdW5nSmlrIExlZSAgPGp1bmdqaWsubGVlQHNhbXN1bmcuY29tPgog CiAgICAgICAgIFtFRkxdIEFkZCBuZXcgcHJlLXJlbmRlcmluZyBjb2RlLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQvZWZsL2V3 ay9ld2tfdmlldy5jcHAKaW5kZXggNTNhMmQwYS4uOGUwODllMSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2VmbC9ld2sv ZXdrX3ZpZXcuY3BwCkBAIC0yNTYyLDU3ICsyNTYyLDU0IEBAIHZvaWQgZXdrX3ZpZXdfc2Nyb2xs c19wcm9jZXNzKEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSkKICAqICAgICAgIHRvIGRl ZmluZSB0aGVpciBvd24gYmFja2luZyBzdG9yZS4KICAqLwogc3RydWN0IF9Fd2tfVmlld19QYWlu dF9Db250ZXh0IHsKLSAgICBXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQqIGdyYXBoaWNDb250ZXh0 OwogICAgIFdlYkNvcmU6OkZyYW1lVmlldyogdmlldzsKLSAgICBjYWlyb190KiBjcjsKKyAgICBP d25QdHI8V2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0PiBncmFwaGljQ29udGV4dDsKKyAgICBSZWZQ dHI8Y2Fpcm9fdD4gY2Fpcm87CiB9OwogCi1Fd2tfVmlld19QYWludF9Db250ZXh0KiBld2tfdmll d19wYWludF9jb250ZXh0X25ldyhFd2tfVmlld19Qcml2YXRlX0RhdGEqIHByaXYsIGNhaXJvX3Qq IGNyKQorRXdrX1ZpZXdfUGFpbnRfQ29udGV4dCogZXdrX3ZpZXdfcGFpbnRfY29udGV4dF9uZXco RXdrX1ZpZXdfUHJpdmF0ZV9EYXRhKiBwcml2LCBjYWlyb190KiBjYWlybykKIHsKICAgICBFSU5B X1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwocHJpdiwgMCk7Ci0gICAgRUlOQV9TQUZFVFlfT05f TlVMTF9SRVRVUk5fVkFMKGNyLCAwKTsKKyAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9W QUwoY2Fpcm8sIDApOwogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChwcml2LT5t YWluRnJhbWUsIDApOwotICAgIFdlYkNvcmU6OkZyYW1lVmlldyogdmlldyA9IHByaXYtPm1haW5G cmFtZS0+dmlldygpOwotICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTCh2aWV3LCAw KTsKLSAgICBFd2tfVmlld19QYWludF9Db250ZXh0KiBjb250ZXh0ID0gc3RhdGljX2Nhc3Q8RXdr X1ZpZXdfUGFpbnRfQ29udGV4dCo+KG1hbGxvYyhzaXplb2YoKmNvbnRleHQpKSk7Ci0gICAgRUlO QV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKGNvbnRleHQsIDApOworICAgIEVJTkFfU0FGRVRZ X09OX05VTExfUkVUVVJOX1ZBTChwcml2LT5tYWluRnJhbWUtPnZpZXcoKSwgMCk7CisKKyAgICBF d2tfVmlld19QYWludF9Db250ZXh0KiBjb250ZXh0ID0gbmV3IEV3a19WaWV3X1BhaW50X0NvbnRl eHQ7CisgICAgY29udGV4dC0+dmlldyA9IHByaXYtPm1haW5GcmFtZS0+dmlldygpOworICAgIGNv bnRleHQtPmdyYXBoaWNDb250ZXh0ID0gYWRvcHRQdHIobmV3IFdlYkNvcmU6OkdyYXBoaWNzQ29u dGV4dChjYWlybykpOworICAgIGNvbnRleHQtPmNhaXJvID0gYWRvcHRSZWYoY2Fpcm9fcmVmZXJl bmNlKGNhaXJvKSk7CiAKLSAgICBjb250ZXh0LT5ncmFwaGljQ29udGV4dCA9IG5ldyBXZWJDb3Jl OjpHcmFwaGljc0NvbnRleHQoY3IpOwotICAgIGlmICghY29udGV4dC0+Z3JhcGhpY0NvbnRleHQp IHsKLSAgICAgICAgZnJlZShjb250ZXh0KTsKLSAgICAgICAgcmV0dXJuIDA7Ci0gICAgfQotICAg IGNvbnRleHQtPnZpZXcgPSB2aWV3OwotICAgIGNvbnRleHQtPmNyID0gY2Fpcm9fcmVmZXJlbmNl KGNyKTsKICAgICByZXR1cm4gY29udGV4dDsKIH0KIAogdm9pZCBld2tfdmlld19wYWludF9jb250 ZXh0X2ZyZWUoRXdrX1ZpZXdfUGFpbnRfQ29udGV4dCogY29udGV4dCkKIHsKICAgICBFSU5BX1NB RkVUWV9PTl9OVUxMX1JFVFVSTihjb250ZXh0KTsKLSAgICBkZWxldGUgY29udGV4dC0+Z3JhcGhp Y0NvbnRleHQ7Ci0gICAgY2Fpcm9fZGVzdHJveShjb250ZXh0LT5jcik7Ci0gICAgZnJlZShjb250 ZXh0KTsKKworICAgIGRlbGV0ZSBjb250ZXh0OwogfQogCiB2b2lkIGV3a192aWV3X3BhaW50X2Nv bnRleHRfc2F2ZShFd2tfVmlld19QYWludF9Db250ZXh0KiBjb250ZXh0KQogewogICAgIEVJTkFf U0FGRVRZX09OX05VTExfUkVUVVJOKGNvbnRleHQpOwotICAgIGNhaXJvX3NhdmUoY29udGV4dC0+ Y3IpOworCisgICAgY2Fpcm9fc2F2ZShjb250ZXh0LT5jYWlyby5nZXQoKSk7CiAgICAgY29udGV4 dC0+Z3JhcGhpY0NvbnRleHQtPnNhdmUoKTsKIH0KIAogdm9pZCBld2tfdmlld19wYWludF9jb250 ZXh0X3Jlc3RvcmUoRXdrX1ZpZXdfUGFpbnRfQ29udGV4dCogY29udGV4dCkKIHsKICAgICBFSU5B X1NBRkVUWV9PTl9OVUxMX1JFVFVSTihjb250ZXh0KTsKKwogICAgIGNvbnRleHQtPmdyYXBoaWND b250ZXh0LT5yZXN0b3JlKCk7Ci0gICAgY2Fpcm9fcmVzdG9yZShjb250ZXh0LT5jcik7CisgICAg Y2Fpcm9fcmVzdG9yZShjb250ZXh0LT5jYWlyby5nZXQoKSk7CiB9CiAKIHZvaWQgZXdrX3ZpZXdf cGFpbnRfY29udGV4dF9jbGlwKEV3a19WaWV3X1BhaW50X0NvbnRleHQqIGNvbnRleHQsIGNvbnN0 IEVpbmFfUmVjdGFuZ2xlKiBhcmVhKQogewogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJO KGNvbnRleHQpOwogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOKGFyZWEpOworCiAgICAg Y29udGV4dC0+Z3JhcGhpY0NvbnRleHQtPmNsaXAoV2ViQ29yZTo6SW50UmVjdChhcmVhLT54LCBh cmVhLT55LCBhcmVhLT53LCBhcmVhLT5oKSk7CiB9CiAKQEAgLTI2MjUsNyArMjYyMiw3IEBAIHZv aWQgZXdrX3ZpZXdfcGFpbnRfY29udGV4dF9wYWludChFd2tfVmlld19QYWludF9Db250ZXh0KiBj b250ZXh0LCBjb25zdCBFaW5hX1JlCiAKICAgICBpZiAoY29udGV4dC0+dmlldy0+aXNUcmFuc3Bh cmVudCgpKQogICAgICAgICBjb250ZXh0LT5ncmFwaGljQ29udGV4dC0+Y2xlYXJSZWN0KHJlY3Qp OwotICAgIGNvbnRleHQtPnZpZXctPnBhaW50KGNvbnRleHQtPmdyYXBoaWNDb250ZXh0LCByZWN0 KTsKKyAgICBjb250ZXh0LT52aWV3LT5wYWludChjb250ZXh0LT5ncmFwaGljQ29udGV4dC5nZXQo KSwgcmVjdCk7CiB9CiAKIHZvaWQgZXdrX3ZpZXdfcGFpbnRfY29udGV4dF9wYWludF9jb250ZW50 cyhFd2tfVmlld19QYWludF9Db250ZXh0KiBjb250ZXh0LCBjb25zdCBFaW5hX1JlY3RhbmdsZSog YXJlYSkKQEAgLTI2MzgsNyArMjYzNSw3IEBAIHZvaWQgZXdrX3ZpZXdfcGFpbnRfY29udGV4dF9w YWludF9jb250ZW50cyhFd2tfVmlld19QYWludF9Db250ZXh0KiBjb250ZXh0LCBjb25zCiAgICAg aWYgKGNvbnRleHQtPnZpZXctPmlzVHJhbnNwYXJlbnQoKSkKICAgICAgICAgY29udGV4dC0+Z3Jh cGhpY0NvbnRleHQtPmNsZWFyUmVjdChyZWN0KTsKIAotICAgIGNvbnRleHQtPnZpZXctPnBhaW50 Q29udGVudHMoY29udGV4dC0+Z3JhcGhpY0NvbnRleHQsIHJlY3QpOworICAgIGNvbnRleHQtPnZp ZXctPnBhaW50Q29udGVudHMoY29udGV4dC0+Z3JhcGhpY0NvbnRleHQuZ2V0KCksIHJlY3QpOwog fQogCiB2b2lkIGV3a192aWV3X3BhaW50X2NvbnRleHRfc2NhbGUoRXdrX1ZpZXdfUGFpbnRfQ29u dGV4dCogY29udGV4dCwgZmxvYXQgc2NhbGVYLCBmbG9hdCBzY2FsZVkpCg== 121837 2012-01-10 05:54:04 -0800 2012-01-10 07:18:05 -0800 Fixed ChangeLog patch02.patch text/plain 4671 t.morawski ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZWZsL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv ZWZsL0NoYW5nZUxvZwppbmRleCBmZmU3YTEwLi43YmIzNDE5IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2VmbC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9lZmwvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTItMDEtMDkgIFRvbWFzeiBNb3Jhd3NraSAgPHQubW9yYXdza2lA c2Ftc3VuZy5jb20+CisKKyAgICAgICAgW0VGTF0gQWRkZWQgc21hcnQgcG9pbnRlcnMgdG8gRXdr X1ZpZXdfUGFpbnRfQ29udGV4dCBjbGFzcyBhbmQgZG9uZSBtaW5vciByZWZhY3RvcmluZy4KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1ODM3CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgUnlvc3VrZSBOaXdhLgorCisgICAgICAgIENoYW5nZWQgZ3JhcGhp Y0NvbnRleHQgcmF3IHBvaW50ZXIgdG8gT3duUHRyIHNtYXJ0IHBvaW50ZXIuCisgICAgICAgIFJl bmFtZWQgY3IgdG8gY2Fpcm8gYW5kIG1hZGUgaXQgYSBSZWZQdHIuCisKKyAgICAgICAgKiBld2sv ZXdrX3ZpZXcuY3BwOgorICAgICAgICAoZXdrX3ZpZXdfcGFpbnRfY29udGV4dF9uZXcpOiBBZGp1 c3QgdG8gYXV0byBwb2ludGVycyB1c2UuCisgICAgICAgIChld2tfdmlld19wYWludF9jb250ZXh0 X2ZyZWUpOiBSZW1vdmVkIGV4cGxpY2l0IHJhdyBwb2ludGVycyBkZWxldGUuCisgICAgICAgIEFk anVzdCB0byBhdXRvIHBvaW50ZXJzIHVzZToKKyAgICAgICAgKGV3a192aWV3X3BhaW50X2NvbnRl eHRfc2F2ZSk6CisgICAgICAgIChld2tfdmlld19wYWludF9jb250ZXh0X3Jlc3RvcmUpOgorICAg ICAgICAoZXdrX3ZpZXdfcGFpbnRfY29udGV4dF9jbGlwKToKKyAgICAgICAgKGV3a192aWV3X3Bh aW50X2NvbnRleHRfcGFpbnQpOgorICAgICAgICAoZXdrX3ZpZXdfcGFpbnRfY29udGV4dF9wYWlu dF9jb250ZW50cyk6CisKIDIwMTItMDEtMDYgIEp1bmdKaWsgTGVlICA8anVuZ2ppay5sZWVAc2Ft c3VuZy5jb20+CiAKICAgICAgICAgW0VGTF0gQWRkIG5ldyBwcmUtcmVuZGVyaW5nIGNvZGUuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwIGIvU291cmNlL1dl YktpdC9lZmwvZXdrL2V3a192aWV3LmNwcAppbmRleCA1M2EyZDBhLi44ZTA4OWUxIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2VmbC9ld2svZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQvZWZsL2V3ay9ld2tfdmlldy5jcHAKQEAgLTI1NjIsNTcgKzI1NjIsNTQgQEAgdm9pZCBld2tf dmlld19zY3JvbGxzX3Byb2Nlc3MoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRhKQogICog ICAgICAgdG8gZGVmaW5lIHRoZWlyIG93biBiYWNraW5nIHN0b3JlLgogICovCiBzdHJ1Y3QgX0V3 a19WaWV3X1BhaW50X0NvbnRleHQgewotICAgIFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dCogZ3Jh cGhpY0NvbnRleHQ7CiAgICAgV2ViQ29yZTo6RnJhbWVWaWV3KiB2aWV3OwotICAgIGNhaXJvX3Qq IGNyOworICAgIE93blB0cjxXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ+IGdyYXBoaWNDb250ZXh0 OworICAgIFJlZlB0cjxjYWlyb190PiBjYWlybzsKIH07CiAKLUV3a19WaWV3X1BhaW50X0NvbnRl eHQqIGV3a192aWV3X3BhaW50X2NvbnRleHRfbmV3KEV3a19WaWV3X1ByaXZhdGVfRGF0YSogcHJp diwgY2Fpcm9fdCogY3IpCitFd2tfVmlld19QYWludF9Db250ZXh0KiBld2tfdmlld19wYWludF9j b250ZXh0X25ldyhFd2tfVmlld19Qcml2YXRlX0RhdGEqIHByaXYsIGNhaXJvX3QqIGNhaXJvKQog ewogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOX1ZBTChwcml2LCAwKTsKLSAgICBFSU5B X1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoY3IsIDApOworICAgIEVJTkFfU0FGRVRZX09OX05V TExfUkVUVVJOX1ZBTChjYWlybywgMCk7CiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5f VkFMKHByaXYtPm1haW5GcmFtZSwgMCk7Ci0gICAgV2ViQ29yZTo6RnJhbWVWaWV3KiB2aWV3ID0g cHJpdi0+bWFpbkZyYW1lLT52aWV3KCk7Ci0gICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5f VkFMKHZpZXcsIDApOwotICAgIEV3a19WaWV3X1BhaW50X0NvbnRleHQqIGNvbnRleHQgPSBzdGF0 aWNfY2FzdDxFd2tfVmlld19QYWludF9Db250ZXh0Kj4obWFsbG9jKHNpemVvZigqY29udGV4dCkp KTsKLSAgICBFSU5BX1NBRkVUWV9PTl9OVUxMX1JFVFVSTl9WQUwoY29udGV4dCwgMCk7CisgICAg RUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk5fVkFMKHByaXYtPm1haW5GcmFtZS0+dmlldygpLCAw KTsKKworICAgIEV3a19WaWV3X1BhaW50X0NvbnRleHQqIGNvbnRleHQgPSBuZXcgRXdrX1ZpZXdf UGFpbnRfQ29udGV4dDsKKyAgICBjb250ZXh0LT52aWV3ID0gcHJpdi0+bWFpbkZyYW1lLT52aWV3 KCk7CisgICAgY29udGV4dC0+Z3JhcGhpY0NvbnRleHQgPSBhZG9wdFB0cihuZXcgV2ViQ29yZTo6 R3JhcGhpY3NDb250ZXh0KGNhaXJvKSk7CisgICAgY29udGV4dC0+Y2Fpcm8gPSBhZG9wdFJlZihj YWlyb19yZWZlcmVuY2UoY2Fpcm8pKTsKIAotICAgIGNvbnRleHQtPmdyYXBoaWNDb250ZXh0ID0g bmV3IFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dChjcik7Ci0gICAgaWYgKCFjb250ZXh0LT5ncmFw aGljQ29udGV4dCkgewotICAgICAgICBmcmVlKGNvbnRleHQpOwotICAgICAgICByZXR1cm4gMDsK LSAgICB9Ci0gICAgY29udGV4dC0+dmlldyA9IHZpZXc7Ci0gICAgY29udGV4dC0+Y3IgPSBjYWly b19yZWZlcmVuY2UoY3IpOwogICAgIHJldHVybiBjb250ZXh0OwogfQogCiB2b2lkIGV3a192aWV3 X3BhaW50X2NvbnRleHRfZnJlZShFd2tfVmlld19QYWludF9Db250ZXh0KiBjb250ZXh0KQogewog ICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOKGNvbnRleHQpOwotICAgIGRlbGV0ZSBjb250 ZXh0LT5ncmFwaGljQ29udGV4dDsKLSAgICBjYWlyb19kZXN0cm95KGNvbnRleHQtPmNyKTsKLSAg ICBmcmVlKGNvbnRleHQpOworCisgICAgZGVsZXRlIGNvbnRleHQ7CiB9CiAKIHZvaWQgZXdrX3Zp ZXdfcGFpbnRfY29udGV4dF9zYXZlKEV3a19WaWV3X1BhaW50X0NvbnRleHQqIGNvbnRleHQpCiB7 CiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk4oY29udGV4dCk7Ci0gICAgY2Fpcm9fc2F2 ZShjb250ZXh0LT5jcik7CisKKyAgICBjYWlyb19zYXZlKGNvbnRleHQtPmNhaXJvLmdldCgpKTsK ICAgICBjb250ZXh0LT5ncmFwaGljQ29udGV4dC0+c2F2ZSgpOwogfQogCiB2b2lkIGV3a192aWV3 X3BhaW50X2NvbnRleHRfcmVzdG9yZShFd2tfVmlld19QYWludF9Db250ZXh0KiBjb250ZXh0KQog ewogICAgIEVJTkFfU0FGRVRZX09OX05VTExfUkVUVVJOKGNvbnRleHQpOworCiAgICAgY29udGV4 dC0+Z3JhcGhpY0NvbnRleHQtPnJlc3RvcmUoKTsKLSAgICBjYWlyb19yZXN0b3JlKGNvbnRleHQt PmNyKTsKKyAgICBjYWlyb19yZXN0b3JlKGNvbnRleHQtPmNhaXJvLmdldCgpKTsKIH0KIAogdm9p ZCBld2tfdmlld19wYWludF9jb250ZXh0X2NsaXAoRXdrX1ZpZXdfUGFpbnRfQ29udGV4dCogY29u dGV4dCwgY29uc3QgRWluYV9SZWN0YW5nbGUqIGFyZWEpCiB7CiAgICAgRUlOQV9TQUZFVFlfT05f TlVMTF9SRVRVUk4oY29udGV4dCk7CiAgICAgRUlOQV9TQUZFVFlfT05fTlVMTF9SRVRVUk4oYXJl YSk7CisKICAgICBjb250ZXh0LT5ncmFwaGljQ29udGV4dC0+Y2xpcChXZWJDb3JlOjpJbnRSZWN0 KGFyZWEtPngsIGFyZWEtPnksIGFyZWEtPncsIGFyZWEtPmgpKTsKIH0KIApAQCAtMjYyNSw3ICsy NjIyLDcgQEAgdm9pZCBld2tfdmlld19wYWludF9jb250ZXh0X3BhaW50KEV3a19WaWV3X1BhaW50 X0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEVpbmFfUmUKIAogICAgIGlmIChjb250ZXh0LT52aWV3 LT5pc1RyYW5zcGFyZW50KCkpCiAgICAgICAgIGNvbnRleHQtPmdyYXBoaWNDb250ZXh0LT5jbGVh clJlY3QocmVjdCk7Ci0gICAgY29udGV4dC0+dmlldy0+cGFpbnQoY29udGV4dC0+Z3JhcGhpY0Nv bnRleHQsIHJlY3QpOworICAgIGNvbnRleHQtPnZpZXctPnBhaW50KGNvbnRleHQtPmdyYXBoaWND b250ZXh0LmdldCgpLCByZWN0KTsKIH0KIAogdm9pZCBld2tfdmlld19wYWludF9jb250ZXh0X3Bh aW50X2NvbnRlbnRzKEV3a19WaWV3X1BhaW50X0NvbnRleHQqIGNvbnRleHQsIGNvbnN0IEVpbmFf UmVjdGFuZ2xlKiBhcmVhKQpAQCAtMjYzOCw3ICsyNjM1LDcgQEAgdm9pZCBld2tfdmlld19wYWlu dF9jb250ZXh0X3BhaW50X2NvbnRlbnRzKEV3a19WaWV3X1BhaW50X0NvbnRleHQqIGNvbnRleHQs IGNvbnMKICAgICBpZiAoY29udGV4dC0+dmlldy0+aXNUcmFuc3BhcmVudCgpKQogICAgICAgICBj b250ZXh0LT5ncmFwaGljQ29udGV4dC0+Y2xlYXJSZWN0KHJlY3QpOwogCi0gICAgY29udGV4dC0+ dmlldy0+cGFpbnRDb250ZW50cyhjb250ZXh0LT5ncmFwaGljQ29udGV4dCwgcmVjdCk7CisgICAg Y29udGV4dC0+dmlldy0+cGFpbnRDb250ZW50cyhjb250ZXh0LT5ncmFwaGljQ29udGV4dC5nZXQo KSwgcmVjdCk7CiB9CiAKIHZvaWQgZXdrX3ZpZXdfcGFpbnRfY29udGV4dF9zY2FsZShFd2tfVmll d19QYWludF9Db250ZXh0KiBjb250ZXh0LCBmbG9hdCBzY2FsZVgsIGZsb2F0IHNjYWxlWSkK