95408 2012-08-29 17:32:21 -0700 [EFL][WK2] Replace PageClientImpl with ewk view in constructor of EflViewportHandler. 2012-08-29 22:45:17 -0700 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Other Linux RESOLVED FIXED P2 Normal --- 95342 1 kangil.han webkit-unassigned gyuyoung.kim lucas.de.marchi rakuco webkit.review.bot oldest_to_newest 708098 0 kangil.han 2012-08-29 17:32:21 -0700 It could be replaced by ewk view. 708146 1 161380 kangil.han 2012-08-29 18:12:26 -0700 Created attachment 161380 patch 708234 2 161380 ryuan.choi 2012-08-29 19:52:38 -0700 Comment on attachment 161380 patch View in context: https://bugs.webkit.org/attachment.cgi?id=161380&action=review > Source/WebKit2/UIProcess/API/efl/EflViewportHandler.cpp:-43 > - ASSERT(m_pageClientImpl); Good to me. As a nit, we can check m_viewWidget instead of m_pageClientImpl. 708273 3 161394 kangil.han 2012-08-29 21:10:36 -0700 Created attachment 161394 patch Done! 708277 4 161394 gyuyoung.kim 2012-08-29 21:21:13 -0700 Comment on attachment 161394 patch LGTM. 708318 5 161394 webkit.review.bot 2012-08-29 22:45:13 -0700 Comment on attachment 161394 patch Clearing flags on attachment: 161394 Committed r127102: <http://trac.webkit.org/changeset/127102> 708319 6 webkit.review.bot 2012-08-29 22:45:17 -0700 All reviewed patches have been landed. Closing bug. 161380 2012-08-29 18:12:26 -0700 2012-08-29 21:10:36 -0700 patch efl_viewport_handler.txt text/plain 4724 kangil.han ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzNmQwM2U5Li43MTEyMmM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTItMDgtMjkgIEthbmdpbCBIYW4gIDxrYW5naWwuaGFuQHNhbXN1bmcuY29tPgorCisg ICAgICAgIFtFRkxdW1dLMl0gUmVwbGFjZSBQYWdlQ2xpZW50SW1wbCB3aXRoIGV3ayB2aWV3IGlu IGNvbnN0cnVjdG9yIG9mIEVmbFZpZXdwb3J0SGFuZGxlci4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1NDA4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVG8ga2VlcCBjb25zaXN0ZW5jeSBvZiBpbXBsZW1l bnRhdGlvbiwgZGVyaXZlZCBjbGFzc2VzKGZyb20gZXdrIHZpZXcpIHNob3VsZCBoYXZlIHZpZXcg cmVmZXJlbmNlLgorICAgICAgICBGcm9tIHRoaXMsIGRlcml2ZWQgY2xhc3NlcyB3b3VsZCBoYXZl IGxlc3MgaW50ZXJmZXJlbmNlIGZyb20gY2hhbmdlcyB0aGF0IHdvdWxkIGhhcHBlbiBpbiBwb3J0 IHNwZWNpZmljIGNsYXNzZXMsIGkuZS4gUGFnZUNsaWVudEltcGwuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL2VmbC9FZmxWaWV3cG9ydEhhbmRsZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpF ZmxWaWV3cG9ydEhhbmRsZXI6OkVmbFZpZXdwb3J0SGFuZGxlcik6CisgICAgICAgIChXZWJLaXQ6 OkVmbFZpZXdwb3J0SGFuZGxlcjo6ZHJhd2luZ0FyZWEpOgorICAgICAgICAoV2ViS2l0KToKKyAg ICAgICAgKFdlYktpdDo6RWZsVmlld3BvcnRIYW5kbGVyOjp1cGRhdGVWaWV3cG9ydFNpemUpOgor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL0VmbFZpZXdwb3J0SGFuZGxlci5oOgorICAgICAg ICAoV2ViS2l0OjpFZmxWaWV3cG9ydEhhbmRsZXI6OmNyZWF0ZSk6CisgICAgICAgIChFZmxWaWV3 cG9ydEhhbmRsZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcDoK KyAgICAgICAgKF9ld2tfdmlld19pbml0aWFsaXplKToKKwogMjAxMi0wOC0yOCAgTWFydGluIFJv Ymluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gRW5hYmxlIHRo ZSBlZGdlIGRpc3RhbmNlIGFudGktYWxpYXNpbmcgZm9yIGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5n IGxheWVycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRWZs Vmlld3BvcnRIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0Vm bFZpZXdwb3J0SGFuZGxlci5jcHAKaW5kZXggZjU3NDA4Mi4uN2JmZWQwYSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRWZsVmlld3BvcnRIYW5kbGVyLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9FZmxWaWV3cG9ydEhhbmRsZXIu Y3BwCkBAIC0zMSwyMiArMzEsMjcgQEAKICNpbmNsdWRlICJMYXllclRyZWVDb29yZGluYXRvclBy b3h5LmgiCiAjaW5jbHVkZSAiTGF5ZXJUcmVlUmVuZGVyZXIuaCIKICNpbmNsdWRlICJUcmFuc2Zv cm1hdGlvbk1hdHJpeC5oIgorI2luY2x1ZGUgImV3a192aWV3X3ByaXZhdGUuaCIKIAogdXNpbmcg bmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1FZmxWaWV3cG9ydEhh bmRsZXI6OkVmbFZpZXdwb3J0SGFuZGxlcihQYWdlQ2xpZW50SW1wbCogcGFnZUNsaWVudEltcGwp Ci0gICAgOiBtX3BhZ2VDbGllbnRJbXBsKHBhZ2VDbGllbnRJbXBsKQorRWZsVmlld3BvcnRIYW5k bGVyOjpFZmxWaWV3cG9ydEhhbmRsZXIoRXZhc19PYmplY3QqIHZpZXdXaWRnZXQpCisgICAgOiBt X3ZpZXdXaWRnZXQodmlld1dpZGdldCkKICAgICAsIG1fc2NhbGVGYWN0b3IoMSkKIHsKLSAgICBB U1NFUlQobV9wYWdlQ2xpZW50SW1wbCk7CiB9CiAKIEVmbFZpZXdwb3J0SGFuZGxlcjo6fkVmbFZp ZXdwb3J0SGFuZGxlcigpCiB7CiB9CiAKK0RyYXdpbmdBcmVhUHJveHkqIEVmbFZpZXdwb3J0SGFu ZGxlcjo6ZHJhd2luZ0FyZWEoKSBjb25zdAoreworICAgIHJldHVybiBld2tfdmlld19wYWdlX2dl dChtX3ZpZXdXaWRnZXQpLT5kcmF3aW5nQXJlYSgpOworfQorCiB2b2lkIEVmbFZpZXdwb3J0SGFu ZGxlcjo6ZGlzcGxheShjb25zdCBJbnRSZWN0JiByZWN0KQogewogICAgIFdlYkNvcmU6OlRyYW5z Zm9ybWF0aW9uTWF0cml4IG1hdHJpeDsKQEAgLTYxLDcgKzY2LDcgQEAgdm9pZCBFZmxWaWV3cG9y dEhhbmRsZXI6OmRpc3BsYXkoY29uc3QgSW50UmVjdCYgcmVjdCkKIHZvaWQgRWZsVmlld3BvcnRI YW5kbGVyOjp1cGRhdGVWaWV3cG9ydFNpemUoY29uc3QgSW50U2l6ZSYgdmlld3BvcnRTaXplKQog ewogICAgIG1fdmlld3BvcnRTaXplID0gdmlld3BvcnRTaXplOwotICAgIG1fcGFnZUNsaWVudElt cGwtPnBhZ2UoKS0+c2V0Vmlld3BvcnRTaXplKHZpZXdwb3J0U2l6ZSk7CisgICAgZXdrX3ZpZXdf cGFnZV9nZXQobV92aWV3V2lkZ2V0KS0+c2V0Vmlld3BvcnRTaXplKHZpZXdwb3J0U2l6ZSk7CiAg ICAgc2V0VmlzaWJsZUNvbnRlbnRzUmVjdChtX3Zpc2libGVDb250ZW50UmVjdC5sb2NhdGlvbigp LCBtX3NjYWxlRmFjdG9yLCBGbG9hdFBvaW50KCkpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9FZmxWaWV3cG9ydEhhbmRsZXIuaCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0VmbFZpZXdwb3J0SGFuZGxlci5oCmluZGV4IGNjNmIz ZDkuLmEyM2Y0ZTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZs L0VmbFZpZXdwb3J0SGFuZGxlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv ZWZsL0VmbFZpZXdwb3J0SGFuZGxlci5oCkBAIC0zNSwxMyArMzUsMTMgQEAgbmFtZXNwYWNlIFdl YktpdCB7CiAKIGNsYXNzIEVmbFZpZXdwb3J0SGFuZGxlciB7CiBwdWJsaWM6Ci0gICAgc3RhdGlj IFBhc3NPd25QdHI8RWZsVmlld3BvcnRIYW5kbGVyPiBjcmVhdGUoUGFnZUNsaWVudEltcGwqIHBh Z2VDbGllbnRJbXBsKQorICAgIHN0YXRpYyBQYXNzT3duUHRyPEVmbFZpZXdwb3J0SGFuZGxlcj4g Y3JlYXRlKEV2YXNfT2JqZWN0KiB2aWV3V2lkZ2V0KQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFk b3B0UHRyKG5ldyBFZmxWaWV3cG9ydEhhbmRsZXIocGFnZUNsaWVudEltcGwpKTsKKyAgICAgICAg cmV0dXJuIGFkb3B0UHRyKG5ldyBFZmxWaWV3cG9ydEhhbmRsZXIodmlld1dpZGdldCkpOwogICAg IH0KICAgICB+RWZsVmlld3BvcnRIYW5kbGVyKCk7CiAKLSAgICBEcmF3aW5nQXJlYVByb3h5KiBk cmF3aW5nQXJlYSgpIGNvbnN0IHsgcmV0dXJuIG1fcGFnZUNsaWVudEltcGwtPnBhZ2UoKS0+ZHJh d2luZ0FyZWEoKTsgfQorICAgIERyYXdpbmdBcmVhUHJveHkqIGRyYXdpbmdBcmVhKCkgY29uc3Q7 CiAgICAgV2ViQ29yZTo6SW50U2l6ZSB2aWV3U2l6ZSgpIHsgcmV0dXJuIG1fdmlld3BvcnRTaXpl OyB9CiAKICAgICB2b2lkIGRpc3BsYXkoY29uc3QgV2ViQ29yZTo6SW50UmVjdCYgcmVjdCk7CkBA IC01MCw5ICs1MCw5IEBAIHB1YmxpYzoKICAgICB2b2lkIGRpZENoYW5nZUNvbnRlbnRzU2l6ZShj b25zdCBXZWJDb3JlOjpJbnRTaXplJiBzaXplKTsKIAogcHJpdmF0ZToKLSAgICBleHBsaWNpdCBF ZmxWaWV3cG9ydEhhbmRsZXIoUGFnZUNsaWVudEltcGwqKTsKKyAgICBleHBsaWNpdCBFZmxWaWV3 cG9ydEhhbmRsZXIoRXZhc19PYmplY3QqKTsKIAotICAgIFBhZ2VDbGllbnRJbXBsKiBtX3BhZ2VD bGllbnRJbXBsOworICAgIEV2YXNfT2JqZWN0KiBtX3ZpZXdXaWRnZXQ7CiAgICAgV2ViQ29yZTo6 SW50UmVjdCBtX3Zpc2libGVDb250ZW50UmVjdDsKICAgICBXZWJDb3JlOjpJbnRTaXplIG1fY29u dGVudHNTaXplOwogICAgIFdlYkNvcmU6OkludFNpemUgbV92aWV3cG9ydFNpemU7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9ld2tfdmlldy5jcHAKaW5kZXggOTgyNThhZi4u YzI4YWU2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdr X3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3 LmNwcApAQCAtNjkyLDcgKzY5Miw3IEBAIHN0YXRpYyB2b2lkIF9ld2tfdmlld19pbml0aWFsaXpl KEV2YXNfT2JqZWN0KiBld2tWaWV3LCBFd2tfQ29udGV4dCogY29udGV4dCwgV0tQCiAgICAgcHJp di0+YmFja0ZvcndhcmRMaXN0ID0gZXdrX2JhY2tfZm9yd2FyZF9saXN0X25ldyh0b0FQSShwcml2 LT5wYWdlUHJveHktPmJhY2tGb3J3YXJkTGlzdCgpKSk7CiAKICNpZiBVU0UoQ09PUkRJTkFURURf R1JBUEhJQ1MpCi0gICAgcHJpdi0+dmlld3BvcnRIYW5kbGVyID0gRWZsVmlld3BvcnRIYW5kbGVy OjpjcmVhdGUocHJpdi0+cGFnZUNsaWVudC5nZXQoKSk7CisgICAgcHJpdi0+dmlld3BvcnRIYW5k bGVyID0gRWZsVmlld3BvcnRIYW5kbGVyOjpjcmVhdGUoZXdrVmlldyk7CiAjZW5kaWYKIAogICAg IFdLUGFnZVJlZiB3a1BhZ2UgPSB0b0FQSShwcml2LT5wYWdlUHJveHkuZ2V0KCkpOwo= 161394 2012-08-29 21:10:36 -0700 2012-08-29 22:45:13 -0700 patch efl_viewport_handler_2.txt text/plain 4751 kangil.han ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCAzNmQwM2U5Li43MTEyMmM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTItMDgtMjkgIEthbmdpbCBIYW4gIDxrYW5naWwuaGFuQHNhbXN1bmcuY29tPgorCisg ICAgICAgIFtFRkxdW1dLMl0gUmVwbGFjZSBQYWdlQ2xpZW50SW1wbCB3aXRoIGV3ayB2aWV3IGlu IGNvbnN0cnVjdG9yIG9mIEVmbFZpZXdwb3J0SGFuZGxlci4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1NDA4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVG8ga2VlcCBjb25zaXN0ZW5jeSBvZiBpbXBsZW1l bnRhdGlvbiwgZGVyaXZlZCBjbGFzc2VzKGZyb20gZXdrIHZpZXcpIHNob3VsZCBoYXZlIHZpZXcg cmVmZXJlbmNlLgorICAgICAgICBGcm9tIHRoaXMsIGRlcml2ZWQgY2xhc3NlcyB3b3VsZCBoYXZl IGxlc3MgaW50ZXJmZXJlbmNlIGZyb20gY2hhbmdlcyB0aGF0IHdvdWxkIGhhcHBlbiBpbiBwb3J0 IHNwZWNpZmljIGNsYXNzZXMsIGkuZS4gUGFnZUNsaWVudEltcGwuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL2VmbC9FZmxWaWV3cG9ydEhhbmRsZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpF ZmxWaWV3cG9ydEhhbmRsZXI6OkVmbFZpZXdwb3J0SGFuZGxlcik6CisgICAgICAgIChXZWJLaXQ6 OkVmbFZpZXdwb3J0SGFuZGxlcjo6ZHJhd2luZ0FyZWEpOgorICAgICAgICAoV2ViS2l0KToKKyAg ICAgICAgKFdlYktpdDo6RWZsVmlld3BvcnRIYW5kbGVyOjp1cGRhdGVWaWV3cG9ydFNpemUpOgor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL0VmbFZpZXdwb3J0SGFuZGxlci5oOgorICAgICAg ICAoV2ViS2l0OjpFZmxWaWV3cG9ydEhhbmRsZXI6OmNyZWF0ZSk6CisgICAgICAgIChFZmxWaWV3 cG9ydEhhbmRsZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcDoK KyAgICAgICAgKF9ld2tfdmlld19pbml0aWFsaXplKToKKwogMjAxMi0wOC0yOCAgTWFydGluIFJv Ymluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gRW5hYmxlIHRo ZSBlZGdlIGRpc3RhbmNlIGFudGktYWxpYXNpbmcgZm9yIGFjY2VsZXJhdGVkIGNvbXBvc2l0aW5n IGxheWVycwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRWZs Vmlld3BvcnRIYW5kbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0Vm bFZpZXdwb3J0SGFuZGxlci5jcHAKaW5kZXggZjU3NDA4Mi4uZWIzZDAwNyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRWZsVmlld3BvcnRIYW5kbGVyLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9FZmxWaWV3cG9ydEhhbmRsZXIu Y3BwCkBAIC0zMSwyMiArMzEsMjggQEAKICNpbmNsdWRlICJMYXllclRyZWVDb29yZGluYXRvclBy b3h5LmgiCiAjaW5jbHVkZSAiTGF5ZXJUcmVlUmVuZGVyZXIuaCIKICNpbmNsdWRlICJUcmFuc2Zv cm1hdGlvbk1hdHJpeC5oIgorI2luY2x1ZGUgImV3a192aWV3X3ByaXZhdGUuaCIKIAogdXNpbmcg bmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCi1FZmxWaWV3cG9ydEhh bmRsZXI6OkVmbFZpZXdwb3J0SGFuZGxlcihQYWdlQ2xpZW50SW1wbCogcGFnZUNsaWVudEltcGwp Ci0gICAgOiBtX3BhZ2VDbGllbnRJbXBsKHBhZ2VDbGllbnRJbXBsKQorRWZsVmlld3BvcnRIYW5k bGVyOjpFZmxWaWV3cG9ydEhhbmRsZXIoRXZhc19PYmplY3QqIHZpZXdXaWRnZXQpCisgICAgOiBt X3ZpZXdXaWRnZXQodmlld1dpZGdldCkKICAgICAsIG1fc2NhbGVGYWN0b3IoMSkKIHsKLSAgICBB U1NFUlQobV9wYWdlQ2xpZW50SW1wbCk7CisgICAgQVNTRVJUKG1fdmlld1dpZGdldCk7CiB9CiAK IEVmbFZpZXdwb3J0SGFuZGxlcjo6fkVmbFZpZXdwb3J0SGFuZGxlcigpCiB7CiB9CiAKK0RyYXdp bmdBcmVhUHJveHkqIEVmbFZpZXdwb3J0SGFuZGxlcjo6ZHJhd2luZ0FyZWEoKSBjb25zdAorewor ICAgIHJldHVybiBld2tfdmlld19wYWdlX2dldChtX3ZpZXdXaWRnZXQpLT5kcmF3aW5nQXJlYSgp OworfQorCiB2b2lkIEVmbFZpZXdwb3J0SGFuZGxlcjo6ZGlzcGxheShjb25zdCBJbnRSZWN0JiBy ZWN0KQogewogICAgIFdlYkNvcmU6OlRyYW5zZm9ybWF0aW9uTWF0cml4IG1hdHJpeDsKQEAgLTYx LDcgKzY3LDcgQEAgdm9pZCBFZmxWaWV3cG9ydEhhbmRsZXI6OmRpc3BsYXkoY29uc3QgSW50UmVj dCYgcmVjdCkKIHZvaWQgRWZsVmlld3BvcnRIYW5kbGVyOjp1cGRhdGVWaWV3cG9ydFNpemUoY29u c3QgSW50U2l6ZSYgdmlld3BvcnRTaXplKQogewogICAgIG1fdmlld3BvcnRTaXplID0gdmlld3Bv cnRTaXplOwotICAgIG1fcGFnZUNsaWVudEltcGwtPnBhZ2UoKS0+c2V0Vmlld3BvcnRTaXplKHZp ZXdwb3J0U2l6ZSk7CisgICAgZXdrX3ZpZXdfcGFnZV9nZXQobV92aWV3V2lkZ2V0KS0+c2V0Vmll d3BvcnRTaXplKHZpZXdwb3J0U2l6ZSk7CiAgICAgc2V0VmlzaWJsZUNvbnRlbnRzUmVjdChtX3Zp c2libGVDb250ZW50UmVjdC5sb2NhdGlvbigpLCBtX3NjYWxlRmFjdG9yLCBGbG9hdFBvaW50KCkp OwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9FZmxW aWV3cG9ydEhhbmRsZXIuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0VmbFZp ZXdwb3J0SGFuZGxlci5oCmluZGV4IGNjNmIzZDkuLmEyM2Y0ZTEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0VmbFZpZXdwb3J0SGFuZGxlci5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0VmbFZpZXdwb3J0SGFuZGxlci5oCkBAIC0z NSwxMyArMzUsMTMgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiAKIGNsYXNzIEVmbFZpZXdwb3J0SGFu ZGxlciB7CiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NPd25QdHI8RWZsVmlld3BvcnRIYW5kbGVy PiBjcmVhdGUoUGFnZUNsaWVudEltcGwqIHBhZ2VDbGllbnRJbXBsKQorICAgIHN0YXRpYyBQYXNz T3duUHRyPEVmbFZpZXdwb3J0SGFuZGxlcj4gY3JlYXRlKEV2YXNfT2JqZWN0KiB2aWV3V2lkZ2V0 KQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBFZmxWaWV3cG9ydEhhbmRsZXIo cGFnZUNsaWVudEltcGwpKTsKKyAgICAgICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBFZmxWaWV3cG9y dEhhbmRsZXIodmlld1dpZGdldCkpOwogICAgIH0KICAgICB+RWZsVmlld3BvcnRIYW5kbGVyKCk7 CiAKLSAgICBEcmF3aW5nQXJlYVByb3h5KiBkcmF3aW5nQXJlYSgpIGNvbnN0IHsgcmV0dXJuIG1f cGFnZUNsaWVudEltcGwtPnBhZ2UoKS0+ZHJhd2luZ0FyZWEoKTsgfQorICAgIERyYXdpbmdBcmVh UHJveHkqIGRyYXdpbmdBcmVhKCkgY29uc3Q7CiAgICAgV2ViQ29yZTo6SW50U2l6ZSB2aWV3U2l6 ZSgpIHsgcmV0dXJuIG1fdmlld3BvcnRTaXplOyB9CiAKICAgICB2b2lkIGRpc3BsYXkoY29uc3Qg V2ViQ29yZTo6SW50UmVjdCYgcmVjdCk7CkBAIC01MCw5ICs1MCw5IEBAIHB1YmxpYzoKICAgICB2 b2lkIGRpZENoYW5nZUNvbnRlbnRzU2l6ZShjb25zdCBXZWJDb3JlOjpJbnRTaXplJiBzaXplKTsK IAogcHJpdmF0ZToKLSAgICBleHBsaWNpdCBFZmxWaWV3cG9ydEhhbmRsZXIoUGFnZUNsaWVudElt cGwqKTsKKyAgICBleHBsaWNpdCBFZmxWaWV3cG9ydEhhbmRsZXIoRXZhc19PYmplY3QqKTsKIAot ICAgIFBhZ2VDbGllbnRJbXBsKiBtX3BhZ2VDbGllbnRJbXBsOworICAgIEV2YXNfT2JqZWN0KiBt X3ZpZXdXaWRnZXQ7CiAgICAgV2ViQ29yZTo6SW50UmVjdCBtX3Zpc2libGVDb250ZW50UmVjdDsK ICAgICBXZWJDb3JlOjpJbnRTaXplIG1fY29udGVudHNTaXplOwogICAgIFdlYkNvcmU6OkludFNp emUgbV92aWV3cG9ydFNpemU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL2VmbC9ld2tfdmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9l d2tfdmlldy5jcHAKaW5kZXggOTgyNThhZi4uYzI4YWU2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvZXdrX3ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL2V3a192aWV3LmNwcApAQCAtNjkyLDcgKzY5Miw3IEBAIHN0YXRp YyB2b2lkIF9ld2tfdmlld19pbml0aWFsaXplKEV2YXNfT2JqZWN0KiBld2tWaWV3LCBFd2tfQ29u dGV4dCogY29udGV4dCwgV0tQCiAgICAgcHJpdi0+YmFja0ZvcndhcmRMaXN0ID0gZXdrX2JhY2tf Zm9yd2FyZF9saXN0X25ldyh0b0FQSShwcml2LT5wYWdlUHJveHktPmJhY2tGb3J3YXJkTGlzdCgp KSk7CiAKICNpZiBVU0UoQ09PUkRJTkFURURfR1JBUEhJQ1MpCi0gICAgcHJpdi0+dmlld3BvcnRI YW5kbGVyID0gRWZsVmlld3BvcnRIYW5kbGVyOjpjcmVhdGUocHJpdi0+cGFnZUNsaWVudC5nZXQo KSk7CisgICAgcHJpdi0+dmlld3BvcnRIYW5kbGVyID0gRWZsVmlld3BvcnRIYW5kbGVyOjpjcmVh dGUoZXdrVmlldyk7CiAjZW5kaWYKIAogICAgIFdLUGFnZVJlZiB3a1BhZ2UgPSB0b0FQSShwcml2 LT5wYWdlUHJveHkuZ2V0KCkpOwo=