138301 2014-11-03 00:14:43 -0800 [EFL] Remove dependency of PageViewportController from PageViewportControllerClient 2014-11-03 03:26:50 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ryuan.choi ryuan.choi commit-queue lucas.de.marchi oldest_to_newest 1045673 0 ryuan.choi 2014-11-03 00:14:43 -0800 PageViewportControllerClient does not need to keep the instance of PageViewportController. 1045675 1 240832 ryuan.choi 2014-11-03 00:20:29 -0800 Created attachment 240832 Patch 1045678 2 240832 gyuyoung.kim 2014-11-03 00:29:34 -0800 Comment on attachment 240832 Patch LGTM. PageViewportControllerClientEfl already had a member variable of EwkView which has a member variable of PageViewportController. r=me. BTW, I don't think EwkView doesn't need to has m_pageViewportControllerClient as member variable. Because it is only needed by PageViewportController. 1045694 3 ryuan.choi 2014-11-03 02:50:04 -0800 (In reply to comment #2) > Comment on attachment 240832 [details] > Patch > > LGTM. PageViewportControllerClientEfl already had a member variable of > EwkView which has a member variable of PageViewportController. r=me. > > BTW, I don't think EwkView doesn't need to has > m_pageViewportControllerClient as member variable. Because it is only needed > by PageViewportController. I think that PageViewportController takes the commond logic while PageViewportControllerClient takes port specific logic as callback style of PageViewportController. Anyway, I also agree that PageViewportControllerClientEfl can be merged into EwkView as not a member but also a interface. If you aree, I will make it in different bug. 1045699 4 240832 commit-queue 2014-11-03 03:26:45 -0800 Comment on attachment 240832 Patch Clearing flags on attachment: 240832 Committed r175468: <http://trac.webkit.org/changeset/175468> 1045700 5 commit-queue 2014-11-03 03:26:50 -0800 All reviewed patches have been landed. Closing bug. 240832 2014-11-03 00:20:29 -0800 2014-11-03 03:26:45 -0800 Patch bug-138301-20141103172036.patch text/plain 12366 ryuan.choi U3VidmVyc2lvbiBSZXZpc2lvbjogMTc1NDY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggN2U4YzhiYmQ2NWQyMjY5 OGZlYmEzN2ZkNTgzNDQ2ZTZkMzhjM2Y3My4uZTQyYzBhMjEwODcxNzdhYzNmZTg4NmI3ZTQ4N2I5 MzUzZDcyMzk0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE0LTExLTAzICBSeXVh biBDaG9pICA8cnl1YW4uY2hvaUBnbWFpbC5jb20+CisKKyAgICAgICAgW0VGTF0gUmVtb3ZlIGRl cGVuZGVuY3kgb2YgUGFnZVZpZXdwb3J0Q29udHJvbGxlciBmcm9tIFBhZ2VWaWV3cG9ydENvbnRy b2xsZXJDbGllbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTEzODMwMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFBhZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudCBkb2VzIG5vdCBuZWVkIHRvIGtlZXAgdGhl IGluc3RhbmNlIG9mIFBhZ2VWaWV3UG9ydENvbnRyb2xsZXIuCisgICAgICAgIFRoaXMgcGF0Y2gg cmVtb3ZlcyBpdCB0byBzaW1wbGlmeSByZWxhdGlvbiBiZXR3ZWVuIHRoZW0uCisgICAgICAgIElu IGFkZGl0aW9uLCB1c2VzIGEgcmVmZXJlbmNlIGZvciB0aGUgY2xpZW50IG9mIFBhZ2VWaWV3cG9y dENvbnRyb2xsZXIuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmNwcDoK KyAgICAgICAgKEV3a1ZpZXc6OkV3a1ZpZXcpOgorICAgICAgICAoRXdrVmlldzo6c2V0Vmlld3Bv cnRQb3NpdGlvbik6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5oOgorICAg ICAgICAqIFVJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNzL1BhZ2VWaWV3cG9ydENvbnRyb2xs ZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpQYWdlVmlld3BvcnRDb250cm9sbGVyOjpQYWdlVmll d3BvcnRDb250cm9sbGVyKToKKyAgICAgICAgKFdlYktpdDo6UGFnZVZpZXdwb3J0Q29udHJvbGxl cjo6ZGlkQ2hhbmdlQ29udGVudHNTaXplKToKKyAgICAgICAgKFdlYktpdDo6UGFnZVZpZXdwb3J0 Q29udHJvbGxlcjo6ZGlkUmVuZGVyRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpQYWdlVmlld3Bv cnRDb250cm9sbGVyOjpwYWdlRGlkUmVxdWVzdFNjcm9sbCk6CisgICAgICAgIChXZWJLaXQ6OlBh Z2VWaWV3cG9ydENvbnRyb2xsZXI6OnN5bmNWaXNpYmxlQ29udGVudHMpOgorICAgICAgICAoV2Vi S2l0OjpQYWdlVmlld3BvcnRDb250cm9sbGVyOjpkaWRDaGFuZ2VWaWV3cG9ydEF0dHJpYnV0ZXMp OgorICAgICAgICAqIFVJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNzL1BhZ2VWaWV3cG9ydENv bnRyb2xsZXIuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlckNs aWVudC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9lZmwvUGFnZVZpZXdwb3J0Q29udHJvbGxlckNs aWVudEVmbC5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGll bnRFZmw6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmwpOgorICAgICAgICAoV2ViS2l0 OjpQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsOjpzZXRWaWV3cG9ydFBvc2l0aW9uKToK KyAgICAgICAgKFdlYktpdDo6UGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbDo6c2V0Q29u dHJvbGxlcik6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL2VmbC9QYWdlVmlld3BvcnRD b250cm9sbGVyQ2xpZW50RWZsLmg6CisKIDIwMTQtMTEtMDEgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjE2MzY1Nik6IFJl bW90ZSBpbnNwZWN0b3IgZG9lc24ndCB3b3JrIHVubGVzcyBwcmVmZXJlbmNlcyBjaGFuZ2UgYWZ0 ZXIgcGFnZSBpbml0aWFsaXphdGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9lZmwvRXdrVmlldy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9Fd2tWaWV3LmNwcAppbmRleCA2ZjM2OTk1ZGYxZjUyOWIyY2U1ZDgxNGEyY2NjOThiNGY1MTVm OGFjLi45ZDQwMDBiMGI1MzUyNjk2YzViY2VhOGUzMmM2Y2Y5MjYxMGYwM2ZkIDEwMDc1NQotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmNwcApAQCAtMzA1LDcgKzMwNSw3 IEBAIEV3a1ZpZXc6OkV3a1ZpZXcoV0tWaWV3UmVmIHZpZXcsIEV2YXNfT2JqZWN0KiBldmFzT2Jq ZWN0KQogICAgICwgbV93ZWJBY2Nlc3NpYmlsaXR5KHN0ZDo6bWFrZV91bmlxdWU8V2ViQWNjZXNz aWJpbGl0eT4odGhpcykpCiAjZW5kaWYKICAgICAsIG1fcGFnZVZpZXdwb3J0Q29udHJvbGxlckNs aWVudCh0aGlzKQotICAgICwgbV9wYWdlVmlld3BvcnRDb250cm9sbGVyKHBhZ2UoKSwgJm1fcGFn ZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudCkKKyAgICAsIG1fcGFnZVZpZXdwb3J0Q29udHJvbGxl cihwYWdlKCksIG1fcGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudCkKICAgICAsIG1faXNBY2Nl bGVyYXRlZCh0cnVlKQogICAgICwgbV9pc1dhaXRpbmdGb3JOZXdQYWdlKGZhbHNlKQogewpAQCAt NTgwLDYgKzU4MCwxMiBAQCB2b2lkIEV3a1ZpZXc6OnNjaGVkdWxlVXBkYXRlRGlzcGxheSgpCiAg ICAgICAgIG1fZGlzcGxheVRpbWVyLnN0YXJ0T25lU2hvdCgwKTsKIH0KIAordm9pZCBFd2tWaWV3 OjpzZXRWaWV3cG9ydFBvc2l0aW9uKGNvbnN0IEZsb2F0UG9pbnQmIGNvbnRlbnRzUG9zaXRpb24p Cit7CisgICAgV0tWaWV3U2V0Q29udGVudFBvc2l0aW9uKHdrVmlldygpLCBXS1BvaW50TWFrZShj b250ZW50c1Bvc2l0aW9uLngoKSwgY29udGVudHNQb3NpdGlvbi55KCkpKTsKKyAgICBtX3BhZ2VW aWV3cG9ydENvbnRyb2xsZXIuZGlkQ2hhbmdlQ29udGVudHNWaXNpYmlsaXR5KGNvbnRlbnRzUG9z aXRpb24sIG1fcGFnZVZpZXdwb3J0Q29udHJvbGxlci5jdXJyZW50U2NhbGUoKSk7Cit9CisKICNp ZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkpCiAvKioKICAqIEBpbnRlcm5hbApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5oIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9lZmwvRXdrVmlldy5oCmluZGV4IGNiYzhmYzM2ODQ1NmE5YmNmNjAw MzU2ZjQ0ZWE2ZjkyMjYwYjZkNzEuLjU4ZjBlMjMwOWY0OGZhNGFkM2YxNDUzMTEzNWU3ZGM3N2U5 ZGIyYWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1Zp ZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmgKQEAg LTcwLDYgKzcwLDcgQEAgY2xhc3MgQWZmaW5lVHJhbnNmb3JtOwogY2xhc3MgQ29sb3I7CiBjbGFz cyBDb29yZGluYXRlZEdyYXBoaWNzU2NlbmU7CiBjbGFzcyBDdXJzb3I7CitjbGFzcyBGbG9hdFBv aW50OwogY2xhc3MgRXZhc0dMQ29udGV4dDsKIGNsYXNzIEV2YXNHTFN1cmZhY2U7CiBjbGFzcyBJ bWFnZTsKQEAgLTE0Myw2ICsxNDQsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXRDdXJzb3IoY29u c3QgV2ViQ29yZTo6Q3Vyc29yJiBjdXJzb3IpOwogCiAgICAgdm9pZCBzY2hlZHVsZVVwZGF0ZURp c3BsYXkoKTsKKyAgICB2b2lkIHNldFZpZXdwb3J0UG9zaXRpb24oY29uc3QgV2ViQ29yZTo6Rmxv YXRQb2ludCYgY29udGVudHNQb3NpdGlvbik7CiAKICNpZiBFTkFCTEUoRlVMTFNDUkVFTl9BUEkp CiAgICAgdm9pZCBlbnRlckZ1bGxTY3JlZW4oKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNzL1BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvUGFnZVZpZXdw b3J0Q29udHJvbGxlci5jcHAKaW5kZXggZmE0Mzg0ZWZkZDJkMTVmOWRlMzQ5ZGMwNjZjYTYyZjdl Yjc2OTdkNS4uNDNjOGVjYmVkMTFiMWM4OGRiZDRmZjlkZDBmOGVmMzdiYTAxMTZlOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvUGFnZVZp ZXdwb3J0Q29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Nvb3Jk aW5hdGVkR3JhcGhpY3MvUGFnZVZpZXdwb3J0Q29udHJvbGxlci5jcHAKQEAgLTM4LDcgKzM4LDcg QEAgYm9vbCBmdXp6eUNvbXBhcmUoZmxvYXQgYSwgZmxvYXQgYiwgZmxvYXQgZXBzaWxvbikKICAg ICByZXR1cm4gc3RkOjphYnMoYSAtIGIpIDwgZXBzaWxvbjsKIH0KIAotUGFnZVZpZXdwb3J0Q29u dHJvbGxlcjo6UGFnZVZpZXdwb3J0Q29udHJvbGxlcihXZWJLaXQ6OldlYlBhZ2VQcm94eSogcHJv eHksIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnQqIGNsaWVudCkKK1BhZ2VWaWV3cG9ydENv bnRyb2xsZXI6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXIoV2ViS2l0OjpXZWJQYWdlUHJveHkqIHBy b3h5LCBQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50JiBjbGllbnQpCiAgICAgOiBtX3dlYlBh Z2VQcm94eShwcm94eSkKICAgICAsIG1fY2xpZW50KGNsaWVudCkKICAgICAsIG1fYWxsb3dzVXNl clNjYWxpbmcoZmFsc2UpCkBAIC01OSw5ICs1OSw2IEBAIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6 OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXIoV2ViS2l0OjpXZWJQYWdlUHJveHkqIHByb3h5LCBQYWdl CiAgICAgLy8gdXNpbmcgdGhlIHZpZXdwb3J0IHNpemUgYW5kIHRoZSBmaW5hbCBsYXlvdXQgc2l6 ZS4KICAgICAvLyBUbyBiZSBhYmxlIHRvIGFzc2VydCBmb3IgdmFsaWQgc2NhbGUgd2UgaW5pdGlh bGl6ZSBpdCB0byAtMS4KICAgICBtX3Jhd0F0dHJpYnV0ZXMuaW5pdGlhbFNjYWxlID0gLTE7Ci0K LSAgICBBU1NFUlQobV9jbGllbnQpOwotICAgIG1fY2xpZW50LT5zZXRDb250cm9sbGVyKHRoaXMp OwogfQogCiBmbG9hdCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjppbm5lckJvdW5kZWRWaWV3cG9y dFNjYWxlKGZsb2F0IHZpZXdwb3J0U2NhbGUpIGNvbnN0CkBAIC0xNjAsNyArMTU3LDcgQEAgdm9p ZCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjpkaWRDaGFuZ2VDb250ZW50c1NpemUoY29uc3QgSW50 U2l6ZSYgbmV3U2l6ZSkKICAgICB9CiAKICAgICBpZiAobWluaW11bVNjYWxlVXBkYXRlZCkKLSAg ICAgICAgbV9jbGllbnQtPmRpZENoYW5nZVZpZXdwb3J0QXR0cmlidXRlcygpOworICAgICAgICBt X2NsaWVudC5kaWRDaGFuZ2VWaWV3cG9ydEF0dHJpYnV0ZXMoKTsKIAogICAgIC8vIFdlIG1pZ2h0 IGhhdmUgcGVuZGluZyBwb3NpdGlvbiBjaGFuZ2Ugd2hpY2ggaXMgbm93IHBvc3NpYmxlLgogICAg IHN5bmNWaXNpYmxlQ29udGVudHMoKTsKQEAgLTE3Myw3ICsxNzAsNyBAQCB2b2lkIFBhZ2VWaWV3 cG9ydENvbnRyb2xsZXI6OmRpZFJlbmRlckZyYW1lKGNvbnN0IEludFNpemUmIGNvbnRlbnRzU2l6 ZSwgY29uc3QgSQogICAgICAgICAvLyBPbmx5IHVwZGF0ZSB0aGUgdmlld3BvcnQncyBjb250ZW50 cyBkaW1lbnNpb25zIGFsb25nIHdpdGggaXRzIHJlbmRlciBpZiB0aGUKICAgICAgICAgLy8gc2l6 ZSBhY3R1YWxseSBjaGFuZ2VkIHNpbmNlIGFuaW1hdGlvbnMgb24gdGhlIHBhZ2UgdHJpZ2dlciBE aWRSZW5kZXJGcmFtZQogICAgICAgICAvLyBtZXNzYWdlcyB3aXRob3V0IGNhdXNpbmcgZGltZW5z aW9uIGNoYW5nZXMuCi0gICAgICAgIG1fY2xpZW50LT5kaWRDaGFuZ2VDb250ZW50c1NpemUoY29u dGVudHNTaXplKTsKKyAgICAgICAgbV9jbGllbnQuZGlkQ2hhbmdlQ29udGVudHNTaXplKGNvbnRl bnRzU2l6ZSk7CiAgICAgfQogCiAgICAgbV9sYXN0RnJhbWVDb3ZlcmVkUmVjdCA9IGNvdmVyZWRS ZWN0OwpAQCAtMTg3LDcgKzE4NCw3IEBAIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6ZGlk UmVuZGVyRnJhbWUoY29uc3QgSW50U2l6ZSYgY29udGVudHNTaXplLCBjb25zdCBJCiAKICAgICBp ZiAobV9wZW5kaW5nU2NhbGVDaGFuZ2UpIHsKICAgICAgICAgbV9wZW5kaW5nU2NhbGVDaGFuZ2Ug PSBmYWxzZTsKLSAgICAgICAgbV9jbGllbnQtPnNldFBhZ2VTY2FsZUZhY3RvcihtX3BhZ2VTY2Fs ZUZhY3Rvcik7CisgICAgICAgIG1fY2xpZW50LnNldFBhZ2VTY2FsZUZhY3RvcihtX3BhZ2VTY2Fs ZUZhY3Rvcik7CiAKICAgICAgICAgLy8gVGhlIHNjYWxlIGNoYW5nZWQsIHdlIGhhdmUgdG8gcmUt cGl4ZWwgYWxpZ24uCiAgICAgICAgIG1fcGVuZGluZ1Bvc2l0aW9uQ2hhbmdlID0gdHJ1ZTsKQEAg LTIwMSw3ICsxOTgsNyBAQCB2b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI6OmRpZFJlbmRlckZy YW1lKGNvbnN0IEludFNpemUmIGNvbnRlbnRzU2l6ZSwgY29uc3QgSQogICAgIC8vIFRoZXJlIG1p Z2h0IGJlIHJlbmRlcmVkIGZyYW1lcyBub3QgY292ZXJpbmcgb3VyIHJlcXVlc3RlZCBwb3NpdGlv biB5ZXQsIHdhaXQgZm9yIGl0LgogICAgIEZsb2F0UmVjdCBlbmRWaXNpYmxlQ29udGVudFJlY3Qo bV9jb250ZW50c1Bvc2l0aW9uLCB2aXNpYmxlQ29udGVudHNTaXplKCkpOwogICAgIGlmIChtX3Bl bmRpbmdQb3NpdGlvbkNoYW5nZSAmJiBlbmRWaXNpYmxlQ29udGVudFJlY3QuaW50ZXJzZWN0cyhj b3ZlcmVkUmVjdCkpIHsKLSAgICAgICAgbV9jbGllbnQtPnNldFZpZXdwb3J0UG9zaXRpb24obV9j b250ZW50c1Bvc2l0aW9uKTsKKyAgICAgICAgbV9jbGllbnQuc2V0Vmlld3BvcnRQb3NpdGlvbiht X2NvbnRlbnRzUG9zaXRpb24pOwogICAgICAgICBtX3BlbmRpbmdQb3NpdGlvbkNoYW5nZSA9IGZh bHNlOwogICAgIH0KIH0KQEAgLTIzMiw3ICsyMjksNyBAQCB2b2lkIFBhZ2VWaWV3cG9ydENvbnRy b2xsZXI6OnBhZ2VEaWRSZXF1ZXN0U2Nyb2xsKGNvbnN0IEludFBvaW50JiBjc3NQb3NpdGlvbikK ICAgICBGbG9hdFJlY3QgZW5kVmlzaWJsZUNvbnRlbnRSZWN0KGFsaWduZWRQb3NpdGlvbiwgdmlz aWJsZUNvbnRlbnRzU2l6ZSgpKTsKIAogICAgIGlmIChtX2xhc3RGcmFtZUNvdmVyZWRSZWN0Lmlu dGVyc2VjdHMoZW5kVmlzaWJsZUNvbnRlbnRSZWN0KSkKLSAgICAgICAgbV9jbGllbnQtPnNldFZp ZXdwb3J0UG9zaXRpb24oYWxpZ25lZFBvc2l0aW9uKTsKKyAgICAgICAgbV9jbGllbnQuc2V0Vmll d3BvcnRQb3NpdGlvbihhbGlnbmVkUG9zaXRpb24pOwogICAgIGVsc2UgewogICAgICAgICAvLyBL ZWVwIHRoZSB1bmJvdW5kIHBvc2l0aW9uIGluIGNhc2UgdGhlIGNvbnRlbnRzIHNpemUgaXMgY2hh bmdlZCBsYXRlciBvbi4KICAgICAgICAgRmxvYXRQb2ludCBwb3NpdGlvbiA9IHBpeGVsQWxpZ25l ZEZsb2F0UG9pbnQoRmxvYXRQb2ludChjc3NQb3NpdGlvbikpOwpAQCAtMjY4LDcgKzI2NSw3IEBA IHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6c3luY1Zpc2libGVDb250ZW50cyhjb25zdCBG bG9hdFBvaW50JiB0cmFqZWN0b3J5VmVjCiAgICAgdmlzaWJsZUNvbnRlbnRzUmVjdC5pbnRlcnNl Y3QoRmxvYXRSZWN0KEZsb2F0UG9pbnQ6Onplcm8oKSwgbV9jb250ZW50c1NpemUpKTsKICAgICBk cmF3aW5nQXJlYS0+c2V0VmlzaWJsZUNvbnRlbnRzUmVjdCh2aXNpYmxlQ29udGVudHNSZWN0LCB0 cmFqZWN0b3J5VmVjdG9yKTsKIAotICAgIG1fY2xpZW50LT5kaWRDaGFuZ2VWaXNpYmxlQ29udGVu dHMoKTsKKyAgICBtX2NsaWVudC5kaWRDaGFuZ2VWaXNpYmxlQ29udGVudHMoKTsKIH0KIAogdm9p ZCBQYWdlVmlld3BvcnRDb250cm9sbGVyOjpkaWRDaGFuZ2VWaWV3cG9ydEF0dHJpYnV0ZXMoY29u c3QgV2ViQ29yZTo6Vmlld3BvcnRBdHRyaWJ1dGVzJiBuZXdBdHRyaWJ1dGVzKQpAQCAtMjkxLDcg KzI4OCw3IEBAIHZvaWQgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjo6ZGlkQ2hhbmdlVmlld3BvcnRB dHRyaWJ1dGVzKGNvbnN0IFdlYkNvcmU6OlZpZXdwb3J0CiAgICAgbV9wZW5kaW5nUG9zaXRpb25D aGFuZ2UgPSB0cnVlOwogICAgIG1fcGVuZGluZ1NjYWxlQ2hhbmdlID0gdHJ1ZTsKIAotICAgIG1f Y2xpZW50LT5kaWRDaGFuZ2VWaWV3cG9ydEF0dHJpYnV0ZXMoKTsKKyAgICBtX2NsaWVudC5kaWRD aGFuZ2VWaWV3cG9ydEF0dHJpYnV0ZXMoKTsKIH0KIAogRmxvYXRTaXplIFBhZ2VWaWV3cG9ydENv bnRyb2xsZXI6OnZpc2libGVDb250ZW50c1NpemUoKSBjb25zdApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvUGFnZVZpZXdwb3J0Q29udHJv bGxlci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvUGFn ZVZpZXdwb3J0Q29udHJvbGxlci5oCmluZGV4IGZlMjkzMjdjN2U0NTgxMGQyMGQ0MmZiYjRhZTNh NzY5ZjlmZDNhYjguLjliY2VjMDdjNTZhMWExYTcyNDNkZTVhYzQ4Nzg1ZWRlNTVjYTFkNGEgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNzL1Bh Z2VWaWV3cG9ydENvbnRyb2xsZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29v cmRpbmF0ZWRHcmFwaGljcy9QYWdlVmlld3BvcnRDb250cm9sbGVyLmgKQEAgLTQzLDcgKzQzLDcg QEAgY2xhc3MgUGFnZVZpZXdwb3J0Q29udHJvbGxlciB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFC TEUoUGFnZVZpZXdwb3J0Q29udHJvbGxlcik7CiAKIHB1YmxpYzoKLSAgICBQYWdlVmlld3BvcnRD b250cm9sbGVyKFdlYktpdDo6V2ViUGFnZVByb3h5KiwgUGFnZVZpZXdwb3J0Q29udHJvbGxlckNs aWVudCopOworICAgIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXIoV2ViS2l0OjpXZWJQYWdlUHJveHkq LCBQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50Jik7CiAgICAgdmlydHVhbCB+UGFnZVZpZXdw b3J0Q29udHJvbGxlcigpIHsgfQogCiAgICAgZmxvYXQgaW5uZXJCb3VuZGVkVmlld3BvcnRTY2Fs ZShmbG9hdCkgY29uc3Q7CkBAIC04Niw3ICs4Niw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCB1cGRh dGVNaW5pbXVtU2NhbGVUb0ZpdChib29sIHVzZXJJbml0aWF0ZWRVcGRhdGUpOwogCiAgICAgV2Vi UGFnZVByb3h5KiBjb25zdCBtX3dlYlBhZ2VQcm94eTsKLSAgICBQYWdlVmlld3BvcnRDb250cm9s bGVyQ2xpZW50KiBtX2NsaWVudDsKKyAgICBQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50JiBt X2NsaWVudDsKIAogICAgIFdlYkNvcmU6OlZpZXdwb3J0QXR0cmlidXRlcyBtX3Jhd0F0dHJpYnV0 ZXM7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlVmlld3BvcnRD b250cm9sbGVyQ2xpZW50LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGFnZVZpZXdwb3J0 Q29udHJvbGxlckNsaWVudC5oCmluZGV4IGVkZGJkOTIzZGMwZGIwZmE3Y2NlMmI0ZDU0NTdlZTgx MGJkODRkZWYuLjRhZDdjZTUwNjZjNDJiOWU2NDg1MDQ3NjY3M2ExNjRiNzI0YWYwZDkgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QYWdlVmlld3BvcnRDb250cm9sbGVyQ2xp ZW50LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VWaWV3cG9ydENvbnRyb2xs ZXJDbGllbnQuaApAQCAtMzAsOCArMzAsNiBAQCBjbGFzcyBJbnRTaXplOwogCiBuYW1lc3BhY2Ug V2ViS2l0IHsKIAotY2xhc3MgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjsKLQogY2xhc3MgUGFnZVZp ZXdwb3J0Q29udHJvbGxlckNsaWVudCB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUoUGFnZVZp ZXdwb3J0Q29udHJvbGxlckNsaWVudCk7CiBwdWJsaWM6CkBAIC00NCw4ICs0Miw2IEBAIHB1Ymxp YzoKICAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hhbmdlQ29udGVudHNTaXplKGNvbnN0IFdlYkNvcmU6 OkludFNpemUmKSA9IDA7CiAgICAgdmlydHVhbCB2b2lkIGRpZENoYW5nZVZpc2libGVDb250ZW50 cygpID0gMDsKICAgICB2aXJ0dWFsIHZvaWQgZGlkQ2hhbmdlVmlld3BvcnRBdHRyaWJ1dGVzKCkg PSAwOwotCi0gICAgdmlydHVhbCB2b2lkIHNldENvbnRyb2xsZXIoUGFnZVZpZXdwb3J0Q29udHJv bGxlciopID0gMDsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZs LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZVZpZXdwb3J0Q29udHJvbGxl ckNsaWVudEVmbC5jcHAKaW5kZXggYTljMWY4MGMxN2JmYzVkMzQyMzNiYjQ3YTNiMGQ4ZWIwZWEy NjMyMS4uY2MxZTRkMjBhNjU5Y2FhNGRjZTA2ZGMyODc1ZTc5MDNkMDdjNDQ0MSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlVmlld3BvcnRDb250cm9sbGVyQ2xp ZW50RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VWaWV3cG9y dENvbnRyb2xsZXJDbGllbnRFZmwuY3BwCkBAIC0yOCw3ICsyOCw2IEBACiAjaW5jbHVkZSAiUGFn ZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbC5oIgogCiAjaW5jbHVkZSAiRXdrVmlldy5oIgot I2luY2x1ZGUgIlBhZ2VWaWV3cG9ydENvbnRyb2xsZXIuaCIKICNpbmNsdWRlIDxXZWJDb3JlL0Zs b2F0UG9pbnQuaD4KIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CkBAIC0zNyw3ICszNiw2IEBA IG5hbWVzcGFjZSBXZWJLaXQgewogCiBQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsOjpQ YWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsKEV3a1ZpZXcqIHZpZXcpCiAgICAgOiBtX3Zp ZXcodmlldykKLSAgICAsIG1fY29udHJvbGxlcigwKQogewogICAgIEFTU0VSVChtX3ZpZXcpOwog fQpAQCAtNDksOCArNDcsNyBAQCB2b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmw6 OmRpZENoYW5nZUNvbnRlbnRzU2l6ZShjb25zdCBXZWJDb3JlOjpJbnRTaQogCiB2b2lkIFBhZ2VW aWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmw6OnNldFZpZXdwb3J0UG9zaXRpb24oY29uc3QgV2Vi Q29yZTo6RmxvYXRQb2ludCYgY29udGVudHNQb3NpdGlvbikKIHsKLSAgICBXS1ZpZXdTZXRDb250 ZW50UG9zaXRpb24obV92aWV3LT53a1ZpZXcoKSwgV0tQb2ludE1ha2UoY29udGVudHNQb3NpdGlv bi54KCksIGNvbnRlbnRzUG9zaXRpb24ueSgpKSk7Ci0gICAgbV9jb250cm9sbGVyLT5kaWRDaGFu Z2VDb250ZW50c1Zpc2liaWxpdHkoY29udGVudHNQb3NpdGlvbiwgbV9jb250cm9sbGVyLT5jdXJy ZW50U2NhbGUoKSk7CisgICAgbV92aWV3LT5zZXRWaWV3cG9ydFBvc2l0aW9uKGNvbnRlbnRzUG9z aXRpb24pOwogfQogCiB2b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmw6OnNldFBh Z2VTY2FsZUZhY3RvcihmbG9hdCBuZXdTY2FsZSkKQEAgLTcwLDkgKzY3LDQgQEAgdm9pZCBQYWdl Vmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsOjpkaWRDaGFuZ2VWaWV3cG9ydEF0dHJpYnV0ZXMo KQogewogfQogCi12b2lkIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmw6OnNldENvbnRy b2xsZXIoUGFnZVZpZXdwb3J0Q29udHJvbGxlciogY29udHJvbGxlcikKLXsKLSAgICBtX2NvbnRy b2xsZXIgPSBjb250cm9sbGVyOwotfQotCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZVZpZXdwb3J0Q29udHJvbGxlckNs aWVudEVmbC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlVmlld3BvcnRDb250 cm9sbGVyQ2xpZW50RWZsLmgKaW5kZXggZjQ4YjM0MjBjM2IxMzkyOTI3NDdlOWE1ZmQ3NmQxYTJl MmI0MDk5Ny4uZDMzMjg3ZjgyODg4NDI4YjNhYWRmMjM1ZTUwNjIyMjkyNDQ2MmMxYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlVmlld3BvcnRDb250cm9sbGVy Q2xpZW50RWZsLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlVmlld3Bv cnRDb250cm9sbGVyQ2xpZW50RWZsLmgKQEAgLTQ1LDExICs0NSw4IEBAIHB1YmxpYzoKICAgICB2 aXJ0dWFsIHZvaWQgZGlkQ2hhbmdlVmlzaWJsZUNvbnRlbnRzKCkgb3ZlcnJpZGU7CiAgICAgdmly dHVhbCB2b2lkIGRpZENoYW5nZVZpZXdwb3J0QXR0cmlidXRlcygpIG92ZXJyaWRlOwogCi0gICAg dmlydHVhbCB2b2lkIHNldENvbnRyb2xsZXIoUGFnZVZpZXdwb3J0Q29udHJvbGxlciopIG92ZXJy aWRlOwotCiBwcml2YXRlOgogICAgIEV3a1ZpZXcqIG1fdmlldzsKLSAgICBQYWdlVmlld3BvcnRD b250cm9sbGVyKiBtX2NvbnRyb2xsZXI7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQK