101051 2012-11-02 07:15:45 -0700 [EFL] Unify transforms in WK2 2012-11-04 08:03:58 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kenneth kenneth gyuyoung.kim lucas.de.marchi menard rakuco webkit.review.bot oldest_to_newest 757170 0 kenneth 2012-11-02 07:15:45 -0700 SSIA 757171 1 172055 kenneth 2012-11-02 07:18:22 -0700 Created attachment 172055 Patch 757176 2 172055 mikhail.pozdnyakov 2012-11-02 07:22:30 -0700 Comment on attachment 172055 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=172055&action=review LGTM > Source/WebKit2/UIProcess/API/efl/EwkViewImpl.h:196 > + inline Ewk_View_Smart_Data* smartData() const; well, I don't like this. However it's common problem in EFL WK2 and probably should be fixed in all the places 757178 3 172055 yael 2012-11-02 07:25:24 -0700 Comment on attachment 172055 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=172055&action=review > Source/WebKit2/UIProcess/API/efl/EwkViewImpl.h:183 > - WebKit::PageViewportControllerClientEfl* pageViewportControllerClient() { return m_pageViewportControllerClient.get(); } > - WebKit::PageViewportController* pageViewportController() { return m_pageViewportController.get(); } > + WebKit::PageViewportControllerClientEfl* pageViewportControllerClient() const { return m_pageViewportControllerClient.get(); } > + WebKit::PageViewportController* pageViewportController() const { return m_pageViewportController.get(); } This is against the new rule in webkit that const methods should return const pointers. 757184 4 kenneth 2012-11-02 07:27:34 -0700 > This is against the new rule in webkit that const methods should return const pointers. Mikhail will go over all the const work soon, but separately from this. 757296 5 172055 webkit.review.bot 2012-11-02 10:08:53 -0700 Comment on attachment 172055 Patch Rejecting attachment 172055 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: Kit2/UIProcess/API/efl/ewk_view.cpp Hunk #2 FAILED at 168. Hunk #3 succeeded at 222 (offset -1 lines). Hunk #4 succeeded at 230 (offset -1 lines). Hunk #5 succeeded at 243 (offset -1 lines). Hunk #6 succeeded at 864 (offset -1 lines). 1 out of 6 hunks FAILED -- saving rejects to file Source/WebKit2/UIProcess/API/efl/ewk_view.cpp.rej Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force', u'--reviewer', u'Simon Haus..." exit_code: 1 cwd: /mnt/git/webkit-commit-queue Full output: http://queues.webkit.org/results/14678906 758128 6 kenneth 2012-11-04 08:03:58 -0800 Landed in 133423 172055 2012-11-02 07:18:22 -0700 2012-11-02 10:08:53 -0700 Patch bug-101051-20121102151639.patch text/plain 11430 kenneth U3VidmVyc2lvbiBSZXZpc2lvbjogMTMzMjg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNjcwZmU2OTI3YmVmNzI0 NjM3YTIxMjg5YTE4NzJmNDgyYzdiNjUyYy4uZmZiZDhiY2QxMGM1OGU3YzkyMThmZTg0MDE1NTE5 ZGE5ZWUxZTYxZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEyLTExLTAyICBLZW5u ZXRoIFJvaGRlIENocmlzdGlhbnNlbiAgPGtlbm5ldGhAd2Via2l0Lm9yZz4KKworICAgICAgICBb RUZMXSBVbmlmeSB0cmFuc2Zvcm1zIGluIFdLMgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAxMDUxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTW92ZSBvdXIgdHJhbnNmb3JtcyBpbnRvIEV3a1ZpZXdJbXBs IGFuZCB1c2UgdGhlbQorICAgICAgICBldmVyeXdoZXJlIG5lZWRlZC4KKworICAgICAgICAqIFVJ UHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmNwcDoKKyAgICAgICAgKEV3a1ZpZXdJbXBsOjpz bWFydERhdGEpOgorICAgICAgICAoRXdrVmlld0ltcGw6OnRyYW5zZm9ybUZyb21TY2VuZSk6Cisg ICAgICAgIChFd2tWaWV3SW1wbDo6dHJhbnNmb3JtVG9TY2VuZSk6CisgICAgICAgIChFd2tWaWV3 SW1wbDo6dHJhbnNmb3JtVG9TY3JlZW4pOgorICAgICAgICAoRXdrVmlld0ltcGw6OmRpc3BsYXlU aW1lckZpcmVkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5oOgor ICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChFd2tWaWV3SW1wbCk6CisgICAgICAgIChFd2tW aWV3SW1wbDo6cGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudCk6CisgICAgICAgIChFd2tWaWV3 SW1wbDo6cGFnZVZpZXdwb3J0Q29udHJvbGxlcik6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9l ZmwvZXdrX3ZpZXcuY3BwOgorICAgICAgICAoX2V3a192aWV3X3NtYXJ0X21vdXNlX3doZWVsKToK KyAgICAgICAgKF9ld2tfdmlld19zbWFydF9tb3VzZV9kb3duKToKKyAgICAgICAgKF9ld2tfdmll d19zbWFydF9tb3VzZV91cCk6CisgICAgICAgIChfZXdrX3ZpZXdfc21hcnRfbW91c2VfbW92ZSk6 CisgICAgICAgIChld2tfdmlld19mZWVkX3RvdWNoX2V2ZW50KToKKwogMjAxMi0xMS0wMiAgTWlr aGFpbCBQb3pkbnlha292ICA8bWlraGFpbC5wb3pkbnlha292QGludGVsLmNvbT4KIAogICAgICAg ICBbRUZMXVtXSzJdIENvbW1vbiByZWYgYW5kIHVucmVmIGZ1bmN0aW9ucyBmb3IgRUZMIFdLMiBv YmplY3RzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tW aWV3SW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1w bC5jcHAKaW5kZXggY2IxYWZmMjVkOGM5M2FlNmE0MzBkM2ZiZDVhMzhkZmE5MWQ2Y2MyOC4uNjUz MDI1MmFkNGQ2NmRjMTVkY2NiYTg4OGNlNmNlMzgwMzVhNWU3MCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlld0ltcGwuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmNwcApAQCAtNTEsNiArNTEsNyBA QAogI2luY2x1ZGUgImV3a192aWV3LmgiCiAjaW5jbHVkZSAiZXdrX3ZpZXdfcHJpdmF0ZS5oIgog I2luY2x1ZGUgPEVjb3JlX0V2YXMuaD4KKyNpbmNsdWRlIDxFY29yZV9YLmg+CiAjaW5jbHVkZSA8 RWRqZS5oPgogI2luY2x1ZGUgPFdlYkNvcmUvQ3Vyc29yLmg+CiAKQEAgLTE2Nyw3ICsxNjgsNyBA QCBFd2tWaWV3SW1wbDo6fkV3a1ZpZXdJbXBsKCkKICAgICBFd2tWaWV3SW1wbDo6cmVtb3ZlRnJv bVBhZ2VWaWV3TWFwKHRoaXMpOwogfQogCi1Fd2tfVmlld19TbWFydF9EYXRhKiBFd2tWaWV3SW1w bDo6c21hcnREYXRhKCkKK0V3a19WaWV3X1NtYXJ0X0RhdGEqIEV3a1ZpZXdJbXBsOjpzbWFydERh dGEoKSBjb25zdAogewogICAgIHJldHVybiBzdGF0aWNfY2FzdDxFd2tfVmlld19TbWFydF9EYXRh Kj4oZXZhc19vYmplY3Rfc21hcnRfZGF0YV9nZXQobV92aWV3KSk7CiB9CkBAIC0yMzcsNiArMjM4 LDU1IEBAIHZvaWQgRXdrVmlld0ltcGw6OnNldEN1cnNvcihjb25zdCBDdXJzb3ImIGN1cnNvcikK ICAgICBlY29yZV9ldmFzX29iamVjdF9jdXJzb3Jfc2V0KGVjb3JlRXZhcywgY3Vyc29yT2JqZWN0 LnJlbGVhc2UoKS5sZWFrUmVmKCksIEVWQVNfTEFZRVJfTUFYLCBob3RzcG90WCwgaG90c3BvdFkp OwogfQogCitBZmZpbmVUcmFuc2Zvcm0gRXdrVmlld0ltcGw6OnRyYW5zZm9ybUZyb21TY2VuZSgp IGNvbnN0Cit7CisgICAgQWZmaW5lVHJhbnNmb3JtIHRyYW5zZm9ybTsKKworI2lmIFVTRShUSUxF RF9CQUNLSU5HX1NUT1JFKQorICAgIEludFBvaW50IHNjcm9sbFBvcyA9IHBhZ2VWaWV3cG9ydENv bnRyb2xsZXJDbGllbnQoKS0+c2Nyb2xsUG9zaXRpb24oKTsKKyAgICB0cmFuc2Zvcm0udHJhbnNs YXRlKHNjcm9sbFBvcy54KCksIHNjcm9sbFBvcy55KCkpOworICAgIHRyYW5zZm9ybS5zY2FsZSgx IC8gcGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudCgpLT5zY2FsZUZhY3RvcigpKTsKKyNlbmRp ZgorCisgICAgRXdrX1ZpZXdfU21hcnRfRGF0YSogc2QgPSBzbWFydERhdGEoKTsKKyAgICB0cmFu c2Zvcm0udHJhbnNsYXRlKC1zZC0+dmlldy54LCAtc2QtPnZpZXcueSk7CisKKyAgICByZXR1cm4g dHJhbnNmb3JtOworfQorCitBZmZpbmVUcmFuc2Zvcm0gRXdrVmlld0ltcGw6OnRyYW5zZm9ybVRv U2NlbmUoKSBjb25zdAoreworICAgIHJldHVybiB0cmFuc2Zvcm1Gcm9tU2NlbmUoKS5pbnZlcnNl KCk7Cit9CisKK0FmZmluZVRyYW5zZm9ybSBFd2tWaWV3SW1wbDo6dHJhbnNmb3JtVG9TY3JlZW4o KSBjb25zdAoreworICAgIEFmZmluZVRyYW5zZm9ybSB0cmFuc2Zvcm07CisKKyAgICBpbnQgd2lu ZG93R2xvYmFsWCA9IDA7CisgICAgaW50IHdpbmRvd0dsb2JhbFkgPSAwOworCisgICAgRXdrX1Zp ZXdfU21hcnRfRGF0YSogc2QgPSBzbWFydERhdGEoKTsKKworI2lmZGVmIEhBVkVfRUNPUkVfWAor ICAgIEVjb3JlX0V2YXMqIGVjb3JlRXZhcyA9IGVjb3JlX2V2YXNfZWNvcmVfZXZhc19nZXQoc2Qt PmJhc2UuZXZhcyk7CisgICAgRWNvcmVfWF9XaW5kb3cgd2luZG93ID0gZWNvcmVfZXZhc19zb2Z0 d2FyZV94MTFfd2luZG93X2dldChlY29yZUV2YXMpOyAvLyBSZXR1cm5zIDAgaWYgbm9uZS4KKwor ICAgIGludCB4LCB5OyAvLyB4LCB5IGFyZSByZWxhdGl2ZSB0byBwYXJlbnQgKGluIGEgcmVwYXJl bnRpbmcgd2luZG93IG1hbmFnZXIpLgorICAgIHdoaWxlICh3aW5kb3cpIHsKKyAgICAgICAgZWNv cmVfeF93aW5kb3dfZ2VvbWV0cnlfZ2V0KHdpbmRvdywgJngsICZ5LCAwLCAwKTsKKyAgICAgICAg d2luZG93R2xvYmFsWCArPSB4OworICAgICAgICB3aW5kb3dHbG9iYWxZICs9IHk7CisgICAgICAg IHdpbmRvdyA9IGVjb3JlX3hfd2luZG93X3BhcmVudF9nZXQod2luZG93KTsKKyAgICB9CisjZW5k aWYKKworICAgIHRyYW5zZm9ybS50cmFuc2xhdGUoLXNkLT52aWV3LngsIC1zZC0+dmlldy55KTsK KyAgICB0cmFuc2Zvcm0udHJhbnNsYXRlKHdpbmRvd0dsb2JhbFgsIHdpbmRvd0dsb2JhbFkpOwor CisgICAgcmV0dXJuIHRyYW5zZm9ybTsKK30KKwogdm9pZCBFd2tWaWV3SW1wbDo6ZGlzcGxheVRp bWVyRmlyZWQoVGltZXI8RXdrVmlld0ltcGw+KikKIHsKICNpZiBVU0UoQ09PUkRJTkFURURfR1JB UEhJQ1MpCkBAIC0yNDcsMTkgKzI5NywxMSBAQCB2b2lkIEV3a1ZpZXdJbXBsOjpkaXNwbGF5VGlt ZXJGaXJlZChUaW1lcjxFd2tWaWV3SW1wbD4qKQogICAgIC8vIFdlIGFyZSBzdXBwb3NlZCB0byBj bGlwIHRvIHRoZSBhY3R1YWwgdmlld3BvcnQsIG5vdGhpbmcgbGVzcy4KICAgICBJbnRSZWN0IHZp ZXdwb3J0KHNkLT52aWV3LngsIHNkLT52aWV3LnksIHNkLT52aWV3LncsIHNkLT52aWV3LmgpOwog Ci0gICAgSW50UG9pbnQgc2Nyb2xsUG9zaXRpb24gPSBtX3BhZ2VWaWV3cG9ydENvbnRyb2xsZXJD bGllbnQtPnNjcm9sbFBvc2l0aW9uKCk7Ci0gICAgZmxvYXQgc2NhbGVGYWN0b3IgPSBtX3BhZ2VW aWV3cG9ydENvbnRyb2xsZXJDbGllbnQtPnNjYWxlRmFjdG9yKCk7Ci0KLSAgICBXZWJDb3JlOjpU cmFuc2Zvcm1hdGlvbk1hdHJpeCBtYXRyaXg7Ci0gICAgbWF0cml4LnRyYW5zbGF0ZSh2aWV3cG9y dC54KCksIHZpZXdwb3J0LnkoKSk7Ci0gICAgbWF0cml4LnNjYWxlKHNjYWxlRmFjdG9yKTsKLSAg ICBtYXRyaXgudHJhbnNsYXRlKC1zY3JvbGxQb3NpdGlvbi54KCksIC1zY3JvbGxQb3NpdGlvbi55 KCkpOwotCiAgICAgTGF5ZXJUcmVlUmVuZGVyZXIqIHJlbmRlcmVyID0gcGFnZSgpLT5kcmF3aW5n QXJlYSgpLT5sYXllclRyZWVDb29yZGluYXRvclByb3h5KCktPmxheWVyVHJlZVJlbmRlcmVyKCk7 CiAgICAgcmVuZGVyZXItPnNldEFjdGl2ZSh0cnVlKTsKICAgICByZW5kZXJlci0+c3luY1JlbW90 ZUNvbnRlbnQoKTsKIAotICAgIHJlbmRlcmVyLT5wYWludFRvQ3VycmVudEdMQ29udGV4dChtYXRy aXgsIC8qIG9wYWNpdHkgKi8gMSwgdmlld3BvcnQpOworICAgIHJlbmRlcmVyLT5wYWludFRvQ3Vy cmVudEdMQ29udGV4dCh0cmFuc2Zvcm1Ub1NjZW5lKCkudG9UcmFuc2Zvcm1hdGlvbk1hdHJpeCgp LCAvKiBvcGFjaXR5ICovIDEsIHZpZXdwb3J0KTsKIAogICAgIGV2YXNfb2JqZWN0X2ltYWdlX2Rh dGFfdXBkYXRlX2FkZChzZC0+aW1hZ2UsIHZpZXdwb3J0LngoKSwgdmlld3BvcnQueSgpLCB2aWV3 cG9ydC53aWR0aCgpLCB2aWV3cG9ydC5oZWlnaHQoKSk7CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXdJbXBsLmggYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3SW1wbC5oCmluZGV4IDQzNjZlNGEyYmM5YTM3 ODZjZmIwMjYwMWE3OTdkZDRkNmQyOGZjMzUuLmVkNTk5MjZmZDEyODYyMGIwOTMxOThlZTgyYTYy N2IxYzQzMzE2M2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L0V3a1ZpZXdJbXBsLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdr Vmlld0ltcGwuaApAQCAtNjIsNiArNjIsNyBAQCBjbGFzcyBXZWJQb3B1cE1lbnVQcm94eUVmbDsK IH0KIAogbmFtZXNwYWNlIFdlYkNvcmUgeworY2xhc3MgQWZmaW5lVHJhbnNmb3JtOwogY2xhc3Mg Q29sb3I7CiBjbGFzcyBDdXJzb3I7CiBjbGFzcyBJbnRTaXplOwpAQCAtMTA3LDYgKzEwOCwxMCBA QCBwdWJsaWM6CiAgICAgYm9vbCBpc0ZvY3VzZWQoKSBjb25zdDsKICAgICBib29sIGlzVmlzaWJs ZSgpIGNvbnN0OwogCisgICAgV2ViQ29yZTo6QWZmaW5lVHJhbnNmb3JtIHRyYW5zZm9ybVRvU2Nl bmUoKSBjb25zdDsKKyAgICBXZWJDb3JlOjpBZmZpbmVUcmFuc2Zvcm0gdHJhbnNmb3JtRnJvbVNj ZW5lKCkgY29uc3Q7CisgICAgV2ViQ29yZTo6QWZmaW5lVHJhbnNmb3JtIHRyYW5zZm9ybVRvU2Ny ZWVuKCkgY29uc3Q7CisKICAgICBjb25zdCBjaGFyKiB1cmwoKSBjb25zdCB7IHJldHVybiBtX3Vy bDsgfQogICAgIGNvbnN0IGNoYXIqIGZhdmljb25VUkwoKSBjb25zdCB7IHJldHVybiBtX2Zhdmlj b25VUkw7IH0KICAgICBjb25zdCBjaGFyKiB0aXRsZSgpIGNvbnN0OwpAQCAtMTc0LDggKzE3OSw4 IEBAIHB1YmxpYzoKICAgICB1bnNpZ25lZCBsb25nIGxvbmcgaW5mb3JtRGF0YWJhc2VRdW90YVJl YWNoZWQoY29uc3QgU3RyaW5nJiBkYXRhYmFzZU5hbWUsIGNvbnN0IFN0cmluZyYgZGlzcGxheU5h bWUsIHVuc2lnbmVkIGxvbmcgbG9uZyBjdXJyZW50UXVvdGEsIHVuc2lnbmVkIGxvbmcgbG9uZyBj dXJyZW50T3JpZ2luVXNhZ2UsIHVuc2lnbmVkIGxvbmcgbG9uZyBjdXJyZW50RGF0YWJhc2VVc2Fn ZSwgdW5zaWduZWQgbG9uZyBsb25nIGV4cGVjdGVkVXNhZ2UpOwogCiAjaWYgVVNFKFRJTEVEX0JB Q0tJTkdfU1RPUkUpCi0gICAgV2ViS2l0OjpQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZs KiBwYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50KCkgeyByZXR1cm4gbV9wYWdlVmlld3BvcnRD b250cm9sbGVyQ2xpZW50LmdldCgpOyB9Ci0gICAgV2ViS2l0OjpQYWdlVmlld3BvcnRDb250cm9s bGVyKiBwYWdlVmlld3BvcnRDb250cm9sbGVyKCkgeyByZXR1cm4gbV9wYWdlVmlld3BvcnRDb250 cm9sbGVyLmdldCgpOyB9CisgICAgV2ViS2l0OjpQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50 RWZsKiBwYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50KCkgY29uc3QgeyByZXR1cm4gbV9wYWdl Vmlld3BvcnRDb250cm9sbGVyQ2xpZW50LmdldCgpOyB9CisgICAgV2ViS2l0OjpQYWdlVmlld3Bv cnRDb250cm9sbGVyKiBwYWdlVmlld3BvcnRDb250cm9sbGVyKCkgY29uc3QgeyByZXR1cm4gbV9w YWdlVmlld3BvcnRDb250cm9sbGVyLmdldCgpOyB9CiAjZW5kaWYKICNpZiBVU0UoQUNDRUxFUkFU RURfQ09NUE9TSVRJTkcpCiAgICAgRXZhc19HTCogZXZhc0dMKCkgeyByZXR1cm4gbV9ldmFzR0wu Z2V0KCk7IH0KQEAgLTE4OCw3ICsxOTMsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBpbmZvcm1VUkxD aGFuZ2UoKTsKIAogcHJpdmF0ZToKLSAgICBpbmxpbmUgRXdrX1ZpZXdfU21hcnRfRGF0YSogc21h cnREYXRhKCk7CisgICAgaW5saW5lIEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSgpIGNv bnN0OwogICAgIHZvaWQgZGlzcGxheVRpbWVyRmlyZWQoV2ViQ29yZTo6VGltZXI8RXdrVmlld0lt cGw+Kik7CiAKICAgICB2b2lkIGluZm9ybUljb25DaGFuZ2UoKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcAppbmRleCAwMGViYzdkNjUwNDM0MTU2Y2Nk YjA3ZjVhYTc5NmNmZTE0OGIzYjdjLi42ZGExOGI3ZTM4ZTUwNjNiZDdmNzRmOGU3Mzk1N2I1NjI5 MjMwM2MxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tf dmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcu Y3BwCkBAIC01MCw3ICs1MCw2IEBACiAjaW5jbHVkZSAiZXdrX3NldHRpbmdzX3ByaXZhdGUuaCIK ICNpbmNsdWRlICJld2tfdmlld19wcml2YXRlLmgiCiAjaW5jbHVkZSA8RWNvcmVfRXZhcy5oPgot I2luY2x1ZGUgPEVjb3JlX1guaD4KICNpbmNsdWRlIDxXZWJLaXQyL1dLUGFnZUdyb3VwLmg+CiAj aW5jbHVkZSA8d3RmL3RleHQvQ1N0cmluZy5oPgogCkBAIC0xNjksNTQgKzE2OCwxMSBAQCBzdGF0 aWMgRWluYV9Cb29sIF9ld2tfdmlld19zbWFydF9mb2N1c19vdXQoRXdrX1ZpZXdfU21hcnRfRGF0 YSogc21hcnREYXRhKQogICAgIHJldHVybiB0cnVlOwogfQogCi1zdGF0aWMgQWZmaW5lVHJhbnNm b3JtIHRvRGV2aWNlU2NyZWVuVHJhbnNmb3JtKEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0 YSkKLXsKLSAgICBBZmZpbmVUcmFuc2Zvcm0gdHJhbnNmb3JtOwotICAgIEVXS19WSUVXX0lNUExf R0VUX0JZX1NEX09SX1JFVFVSTihzbWFydERhdGEsIGltcGwsIHRyYW5zZm9ybSk7Ci0KLSAgICBp bnQgd2luZG93R2xvYmFsWCA9IDA7Ci0gICAgaW50IHdpbmRvd0dsb2JhbFkgPSAwOwotCi0jaWZk ZWYgSEFWRV9FQ09SRV9YCi0gICAgRWNvcmVfRXZhcyogZWNvcmVFdmFzID0gZWNvcmVfZXZhc19l Y29yZV9ldmFzX2dldChzbWFydERhdGEtPmJhc2UuZXZhcyk7Ci0gICAgRWNvcmVfWF9XaW5kb3cg d2luZG93ID0gZWNvcmVfZXZhc19zb2Z0d2FyZV94MTFfd2luZG93X2dldChlY29yZUV2YXMpOyAv LyBSZXR1cm5zIDAgaWYgbm9uZS4KLQotICAgIGludCB4LCB5OyAvLyB4LCB5IGFyZSByZWxhdGl2 ZSB0byBwYXJlbnQgKGluIGEgcmVwYXJlbnRpbmcgd2luZG93IG1hbmFnZXIpLgotICAgIHdoaWxl ICh3aW5kb3cpIHsKLSAgICAgICAgZWNvcmVfeF93aW5kb3dfZ2VvbWV0cnlfZ2V0KHdpbmRvdywg JngsICZ5LCAwLCAwKTsKLSAgICAgICAgd2luZG93R2xvYmFsWCArPSB4OwotICAgICAgICB3aW5k b3dHbG9iYWxZICs9IHk7Ci0gICAgICAgIHdpbmRvdyA9IGVjb3JlX3hfd2luZG93X3BhcmVudF9n ZXQod2luZG93KTsKLSAgICB9Ci0jZW5kaWYKLQotICAgIHRyYW5zZm9ybS50cmFuc2xhdGUoLXNt YXJ0RGF0YS0+dmlldy54LCAtc21hcnREYXRhLT52aWV3LnkpOwotICAgIHRyYW5zZm9ybS50cmFu c2xhdGUod2luZG93R2xvYmFsWCwgd2luZG93R2xvYmFsWSk7Ci0KLSAgICByZXR1cm4gdHJhbnNm b3JtOwotfQotCi1zdGF0aWMgQWZmaW5lVHJhbnNmb3JtIHRvV2ViQ29udGVudFRyYW5zZm9ybShF d2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEpCi17Ci0gICAgQWZmaW5lVHJhbnNmb3JtIHRy YW5zZm9ybTsKLSAgICBFV0tfVklFV19JTVBMX0dFVF9CWV9TRF9PUl9SRVRVUk4oc21hcnREYXRh LCBpbXBsLCB0cmFuc2Zvcm0pOwotCi0gICAgdHJhbnNmb3JtLnRyYW5zbGF0ZSgtc21hcnREYXRh LT52aWV3LngsIC1zbWFydERhdGEtPnZpZXcueSk7Ci0KLSNpZiBVU0UoVElMRURfQkFDS0lOR19T VE9SRSkKLSAgICBJbnRQb2ludCBzY3JvbGxQb3MgPSBpbXBsLT5wYWdlVmlld3BvcnRDb250cm9s bGVyQ2xpZW50KCktPnNjcm9sbFBvc2l0aW9uKCk7Ci0gICAgdHJhbnNmb3JtLnRyYW5zbGF0ZShz Y3JvbGxQb3MueCgpLCBzY3JvbGxQb3MueSgpKTsKLSAgICB0cmFuc2Zvcm0uc2NhbGUoMSAvIGlt cGwtPnBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnQoKS0+c2NhbGVGYWN0b3IoKSk7Ci0jZW5k aWYKLQotICAgIHJldHVybiB0cmFuc2Zvcm07Ci19Ci0KIHN0YXRpYyBFaW5hX0Jvb2wgX2V3a192 aWV3X3NtYXJ0X21vdXNlX3doZWVsKEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgY29u c3QgRXZhc19FdmVudF9Nb3VzZV9XaGVlbCogd2hlZWxFdmVudCkKIHsKICAgICBFV0tfVklFV19J TVBMX0dFVF9CWV9TRF9PUl9SRVRVUk4oc21hcnREYXRhLCBpbXBsLCBmYWxzZSk7CiAKLSAgICBp bXBsLT5wYWdlKCktPmhhbmRsZVdoZWVsRXZlbnQoTmF0aXZlV2ViV2hlZWxFdmVudCh3aGVlbEV2 ZW50LCB0b1dlYkNvbnRlbnRUcmFuc2Zvcm0oc21hcnREYXRhKSwgdG9EZXZpY2VTY3JlZW5UcmFu c2Zvcm0oc21hcnREYXRhKSkpOworICAgIGltcGwtPnBhZ2UoKS0+aGFuZGxlV2hlZWxFdmVudChO YXRpdmVXZWJXaGVlbEV2ZW50KHdoZWVsRXZlbnQsIGltcGwtPnRyYW5zZm9ybUZyb21TY2VuZSgp LCBpbXBsLT50cmFuc2Zvcm1Ub1NjcmVlbigpKSk7CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKQEAg LTIyNCw3ICsxODAsNyBAQCBzdGF0aWMgRWluYV9Cb29sIF9ld2tfdmlld19zbWFydF9tb3VzZV9k b3duKEV3a19WaWV3X1NtYXJ0X0RhdGEqIHNtYXJ0RGF0YSwgY29ucwogewogICAgIEVXS19WSUVX X0lNUExfR0VUX0JZX1NEX09SX1JFVFVSTihzbWFydERhdGEsIGltcGwsIGZhbHNlKTsKIAotICAg IGltcGwtPnBhZ2UoKS0+aGFuZGxlTW91c2VFdmVudChOYXRpdmVXZWJNb3VzZUV2ZW50KGRvd25F dmVudCwgdG9XZWJDb250ZW50VHJhbnNmb3JtKHNtYXJ0RGF0YSksIHRvRGV2aWNlU2NyZWVuVHJh bnNmb3JtKHNtYXJ0RGF0YSkpKTsKKyAgICBpbXBsLT5wYWdlKCktPmhhbmRsZU1vdXNlRXZlbnQo TmF0aXZlV2ViTW91c2VFdmVudChkb3duRXZlbnQsIGltcGwtPnRyYW5zZm9ybUZyb21TY2VuZSgp LCBpbXBsLT50cmFuc2Zvcm1Ub1NjcmVlbigpKSk7CiAgICAgcmV0dXJuIHRydWU7CiB9CiAKQEAg LTIzMiw3ICsxODgsNyBAQCBzdGF0aWMgRWluYV9Cb29sIF9ld2tfdmlld19zbWFydF9tb3VzZV91 cChFd2tfVmlld19TbWFydF9EYXRhKiBzbWFydERhdGEsIGNvbnN0CiB7CiAgICAgRVdLX1ZJRVdf SU1QTF9HRVRfQllfU0RfT1JfUkVUVVJOKHNtYXJ0RGF0YSwgaW1wbCwgZmFsc2UpOwogCi0gICAg aW1wbC0+cGFnZSgpLT5oYW5kbGVNb3VzZUV2ZW50KE5hdGl2ZVdlYk1vdXNlRXZlbnQodXBFdmVu dCwgdG9XZWJDb250ZW50VHJhbnNmb3JtKHNtYXJ0RGF0YSksIHRvRGV2aWNlU2NyZWVuVHJhbnNm b3JtKHNtYXJ0RGF0YSkpKTsKKyAgICBpbXBsLT5wYWdlKCktPmhhbmRsZU1vdXNlRXZlbnQoTmF0 aXZlV2ViTW91c2VFdmVudCh1cEV2ZW50LCBpbXBsLT50cmFuc2Zvcm1Gcm9tU2NlbmUoKSwgaW1w bC0+dHJhbnNmb3JtVG9TY3JlZW4oKSkpOwogCiAgICAgSW5wdXRNZXRob2RDb250ZXh0RWZsKiBp bnB1dE1ldGhvZENvbnRleHQgPSBpbXBsLT5pbnB1dE1ldGhvZENvbnRleHQoKTsKICAgICBpZiAo aW5wdXRNZXRob2RDb250ZXh0KQpAQCAtMjQ1LDcgKzIwMSw3IEBAIHN0YXRpYyBFaW5hX0Jvb2wg X2V3a192aWV3X3NtYXJ0X21vdXNlX21vdmUoRXdrX1ZpZXdfU21hcnRfRGF0YSogc21hcnREYXRh LCBjb25zCiB7CiAgICAgRVdLX1ZJRVdfSU1QTF9HRVRfQllfU0RfT1JfUkVUVVJOKHNtYXJ0RGF0 YSwgaW1wbCwgZmFsc2UpOwogCi0gICAgaW1wbC0+cGFnZSgpLT5oYW5kbGVNb3VzZUV2ZW50KE5h dGl2ZVdlYk1vdXNlRXZlbnQobW92ZUV2ZW50LCB0b1dlYkNvbnRlbnRUcmFuc2Zvcm0oc21hcnRE YXRhKSwgdG9EZXZpY2VTY3JlZW5UcmFuc2Zvcm0oc21hcnREYXRhKSkpOworICAgIGltcGwtPnBh Z2UoKS0+aGFuZGxlTW91c2VFdmVudChOYXRpdmVXZWJNb3VzZUV2ZW50KG1vdmVFdmVudCwgaW1w bC0+dHJhbnNmb3JtRnJvbVNjZW5lKCksIGltcGwtPnRyYW5zZm9ybVRvU2NyZWVuKCkpKTsKICAg ICByZXR1cm4gdHJ1ZTsKIH0KIApAQCAtODY2LDcgKzgyMiw3IEBAIEVpbmFfQm9vbCBld2tfdmll d19mZWVkX3RvdWNoX2V2ZW50KEV2YXNfT2JqZWN0KiBld2tWaWV3LCBFd2tfVG91Y2hfRXZlbnRf VHlwZSB0CiAgICAgRVdLX1ZJRVdfU0RfR0VUX09SX1JFVFVSTihld2tWaWV3LCBzbWFydERhdGEs IGZhbHNlKTsKICAgICBFV0tfVklFV19JTVBMX0dFVF9CWV9TRF9PUl9SRVRVUk4oc21hcnREYXRh LCBpbXBsLCBmYWxzZSk7CiAKLSAgICBpbXBsLT5wYWdlKCktPmhhbmRsZVRvdWNoRXZlbnQoTmF0 aXZlV2ViVG91Y2hFdmVudCh0eXBlLCBwb2ludHMsIG1vZGlmaWVycywgdG9XZWJDb250ZW50VHJh bnNmb3JtKHNtYXJ0RGF0YSksIHRvRGV2aWNlU2NyZWVuVHJhbnNmb3JtKHNtYXJ0RGF0YSksIGVj b3JlX3RpbWVfZ2V0KCkpKTsKKyAgICBpbXBsLT5wYWdlKCktPmhhbmRsZVRvdWNoRXZlbnQoTmF0 aXZlV2ViVG91Y2hFdmVudCh0eXBlLCBwb2ludHMsIG1vZGlmaWVycywgaW1wbC0+dHJhbnNmb3Jt RnJvbVNjZW5lKCksIGltcGwtPnRyYW5zZm9ybVRvU2NyZWVuKCksIGVjb3JlX3RpbWVfZ2V0KCkp KTsKIAogICAgIHJldHVybiB0cnVlOwogI2Vsc2UK