124993 2013-11-28 17:59:22 -0800 [EFL] PageViewportController does not need to be unique_ptr instance 2013-11-28 19:39:36 -0800 1 1 1 Unclassified WebKit WebKit EFL 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ryuan.choi ryuan.choi cdumez commit-queue gyuyoung.kim lucas.de.marchi rakuco oldest_to_newest 954856 0 ryuan.choi 2013-11-28 17:59:22 -0800 PageViewportController and PageViewportControllerEfl have same life cycle with EwkView. So, we don't need to make them as unique_ptr instance. 954860 1 218030 ryuan.choi 2013-11-28 18:53:49 -0800 Created attachment 218030 Patch 954862 2 218031 ryuan.choi 2013-11-28 19:26:48 -0800 Created attachment 218031 Patch 954863 3 218031 gyuyoung.kim 2013-11-28 19:34:13 -0800 Comment on attachment 218031 Patch Looks fine. 954864 4 218031 ryuan.choi 2013-11-28 19:39:29 -0800 Comment on attachment 218031 Patch Clearing flags on attachment: 218031 Committed r159863: <http://trac.webkit.org/changeset/159863> 954865 5 ryuan.choi 2013-11-28 19:39:36 -0800 All reviewed patches have been landed. Closing bug. 218030 2013-11-28 18:53:49 -0800 2013-11-28 19:26:43 -0800 Patch bug-124993-20131129115348.patch text/plain 8985 ryuan.choi U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5ODYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTRhNWNmMDU2NzU5OGQx NjUyZGRjNjdiZjIzZjBkYWNjNWVmNGI3Mi4uM2RiZWZjNDhmNDkzMTU2OTk5ZDNmM2RhMTkxM2Jk MzViNjU4NmM2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEzLTExLTI4ICBSeXVh biBDaG9pICA8cnl1YW4uY2hvaUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXSBQYWdlVmll d3BvcnRDb250cm9sbGVyIGRvZXMgbm90IG5lZWQgdG8gYmUgdW5pcXVlX3B0ciBpbnN0YW5jZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI0OTkzCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUGFnZVZpZXdw b3J0Q29udHJvbGxlciBhbmQgUGFnZVZpZXdwb3J0Q29udHJvbGxlckVmbCBoYXZlIHNhbWUgbGlm ZSBjeWNsZQorICAgICAgICB3aXRoIEV3a1ZpZXcuIFNvLCB3ZSBkb24ndCBuZWVkIHRvIG1ha2Ug dGhlbSBhcyB1bmlxdWVfcHRyIGluc3RhbmNlLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9l ZmwvRXdrVmlldy5jcHA6CisgICAgICAgIChFd2tWaWV3OjpFd2tWaWV3KToKKyAgICAgICAgKEV3 a1ZpZXc6OmhhbmRsZUV2YXNPYmplY3RDYWxjdWxhdGUpOgorICAgICAgICAoRXdrVmlldzo6c2Ny b2xsQnkpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuaDoKKyAgICAgICAg KEV3a1ZpZXc6OnBhZ2VWaWV3cG9ydENvbnRyb2xsZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9l ZmwvUGFnZUxvYWRDbGllbnRFZmwuY3BwOgorICAgICAgICAoV2ViS2l0OjpQYWdlTG9hZENsaWVu dEVmbDo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKToKKyAgICAgICAgKiBVSVByb2Nlc3MvZWZsL1Zp ZXdDbGllbnRFZmwuY3BwOgorICAgICAgICAoV2ViS2l0OjpWaWV3Q2xpZW50RWZsOjpkaWRDaGFu Z2VDb250ZW50c1NpemUpOgorICAgICAgICAoV2ViS2l0OjpWaWV3Q2xpZW50RWZsOjpkaWRDaGFu Z2VDb250ZW50c1Bvc2l0aW9uKToKKyAgICAgICAgKFdlYktpdDo6Vmlld0NsaWVudEVmbDo6ZGlk UmVuZGVyRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpWaWV3Q2xpZW50RWZsOjpkaWRDb21wbGV0 ZVBhZ2VUcmFuc2l0aW9uKToKKyAgICAgICAgKFdlYktpdDo6Vmlld0NsaWVudEVmbDo6ZGlkQ2hh bmdlVmlld3BvcnRBdHRyaWJ1dGVzKToKKwogMjAxMy0xMS0yOCAgTmljayBEaWVnbyBZYW1hbmUg IDxuaWNrLnlhbWFuZUBvcGVuYm9zc2Eub3JnPgogCiAgICAgICAgIFtHVEtdIEJ1aWxkIGZpeCBh ZnRlciByMTU5ODU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9Fd2tWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcu Y3BwCmluZGV4IDYwY2Y5MDRjMTZmYWQwNmM5NjIzNTliNGVhZjdhN2YxMmJiOWU0YTcuLjgyMWM0 NTVkOTJiMTllYjU1YzEzYWVmZjI2NmIwODE3YjFlMDA0ZmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuY3BwCkBAIC0yODIsOCArMjgyLDggQEAgRXdrVmll dzo6RXdrVmlldyhXS1ZpZXdSZWYgdmlldywgRXZhc19PYmplY3QqIGV2YXNPYmplY3QpCiAgICAg LCBtX2Rpc3BsYXlUaW1lcih0aGlzLCAmRXdrVmlldzo6ZGlzcGxheVRpbWVyRmlyZWQpCiAgICAg LCBtX2lucHV0TWV0aG9kQ29udGV4dChJbnB1dE1ldGhvZENvbnRleHRFZmw6OmNyZWF0ZSh0aGlz LCBzbWFydERhdGEoKS0+YmFzZS5ldmFzKSkKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJ TkcpCi0gICAgLCBtX3BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnQoc3RkOjptYWtlX3VuaXF1 ZTxQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50RWZsPih0aGlzKSkKLSAgICAsIG1fcGFnZVZp ZXdwb3J0Q29udHJvbGxlcihzdGQ6Om1ha2VfdW5pcXVlPFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI+ KHBhZ2UoKSwgbV9wYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50LmdldCgpKSkKKyAgICAsIG1f cGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudCh0aGlzKQorICAgICwgbV9wYWdlVmlld3BvcnRD b250cm9sbGVyKHBhZ2UoKSwgJm1fcGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudCkKICNlbmRp ZgogICAgICwgbV9pc0FjY2VsZXJhdGVkKHRydWUpCiB7CkBAIC0xMjA3LDcgKzEyMDcsNyBAQCB2 b2lkIEV3a1ZpZXc6OmhhbmRsZUV2YXNPYmplY3RDYWxjdWxhdGUoRXZhc19PYmplY3QqIGV2YXNP YmplY3QpCiAgICAgICAgIFdLVmlld1NldFNpemUoc2VsZi0+d2tWaWV3KCksIFdLU2l6ZU1ha2Uo d2lkdGgsIGhlaWdodCkpOwogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKICAgICAg ICAgaWYgKFdLUGFnZVVzZUZpeGVkTGF5b3V0KHNlbGYtPndrUGFnZSgpKSkKLSAgICAgICAgICAg IHNlbGYtPnBhZ2VWaWV3cG9ydENvbnRyb2xsZXIoKS0+ZGlkQ2hhbmdlVmlld3BvcnRTaXplKHNl bGYtPnNpemUoKSk7CisgICAgICAgICAgICBzZWxmLT5wYWdlVmlld3BvcnRDb250cm9sbGVyKCku ZGlkQ2hhbmdlVmlld3BvcnRTaXplKHNlbGYtPnNpemUoKSk7CiAKICAgICAgICAgc2VsZi0+c2V0 TmVlZHNTdXJmYWNlUmVzaXplKCk7CiAjZW5kaWYKQEAgLTE0MDMsOCArMTQwMyw4IEBAIGJvb2wg RXdrVmlldzo6c2Nyb2xsQnkoY29uc3QgSW50U2l6ZSYgb2Zmc2V0KQogICAgIC8vIFVwZGF0ZSBu ZXcgcG9zaXRpb24gdG8gdGhlIFBhZ2VWaWV3cG9ydENvbnRyb2xsZXIuCiAgICAgZmxvYXQgY29u dGVudFNjYWxlID0gV0tWaWV3R2V0Q29udGVudFNjYWxlRmFjdG9yKHdrVmlldygpKTsKICAgICBu ZXdQb3NpdGlvbi5zY2FsZSgxIC8gY29udGVudFNjYWxlLCAxIC8gY29udGVudFNjYWxlKTsKLSAg ICBuZXdQb3NpdGlvbiA9IG1fcGFnZVZpZXdwb3J0Q29udHJvbGxlci0+Ym91bmRDb250ZW50c1Bv c2l0aW9uQXRTY2FsZShuZXdQb3NpdGlvbiwgY29udGVudFNjYWxlKTsKLSAgICBtX3BhZ2VWaWV3 cG9ydENvbnRyb2xsZXItPmRpZENoYW5nZUNvbnRlbnRzVmlzaWJpbGl0eShuZXdQb3NpdGlvbiwg Y29udGVudFNjYWxlKTsKKyAgICBuZXdQb3NpdGlvbiA9IG1fcGFnZVZpZXdwb3J0Q29udHJvbGxl ci5ib3VuZENvbnRlbnRzUG9zaXRpb25BdFNjYWxlKG5ld1Bvc2l0aW9uLCBjb250ZW50U2NhbGUp OworICAgIG1fcGFnZVZpZXdwb3J0Q29udHJvbGxlci5kaWRDaGFuZ2VDb250ZW50c1Zpc2liaWxp dHkobmV3UG9zaXRpb24sIGNvbnRlbnRTY2FsZSk7CiAKICAgICAvLyBVcGRhdGUgbmV3IHBvc2l0 aW9uIHRvIHRoZSBXS1ZpZXcuCiAgICAgV0tQb2ludCBwb3NpdGlvbiA9IFdLUG9pbnRNYWtlKG5l d1Bvc2l0aW9uLngoKSAqIGNvbnRlbnRTY2FsZSwgbmV3UG9zaXRpb24ueSgpICogY29udGVudFNj YWxlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1Zp ZXcuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuaAppbmRleCA1 NGUyNWI3ZTViNjhkMjc0M2FmOTJkNWEwMzcyOGQ0YTQ1ZWNkODQwLi44NTM5NzliNzU5M2EyYTMy MTc4NWMwMGNjZGY3MWNkNzJiNmQ4ZDYwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvRXdrVmlldy5oCkBAIC0yOCw2ICsyOCw5IEBACiAjaW5jbHVkZSAiUmVmUHRyRWZsLmgi CiAjaW5jbHVkZSAiV0tFaW5hU2hhcmVkU3RyaW5nLmgiCiAjaW5jbHVkZSAiV0tSZXRhaW5QdHIu aCIKKyNpbmNsdWRlICJXZWJDb250ZXh0LmgiCisjaW5jbHVkZSAiV2ViUGFnZUdyb3VwLmgiCisj aW5jbHVkZSAiV2ViUHJlZmVyZW5jZXMuaCIKICNpbmNsdWRlICJXZWJWaWV3RWZsLmgiCiAjaW5j bHVkZSAiZXdrX3VybF9yZXF1ZXN0X3ByaXZhdGUuaCIKICNpbmNsdWRlIDxFdmFzLmg+CkBAIC00 Nyw5ICs1MCwxMCBAQAogI2luY2x1ZGUgImV3a190b3VjaC5oIgogI2VuZGlmCiAKLSNpbmNsdWRl ICJXZWJDb250ZXh0LmgiCi0jaW5jbHVkZSAiV2ViUGFnZUdyb3VwLmgiCi0jaW5jbHVkZSAiV2Vi UHJlZmVyZW5jZXMuaCIKKyNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCisjaW5jbHVk ZSAiUGFnZVZpZXdwb3J0Q29udHJvbGxlci5oIgorI2luY2x1ZGUgIlBhZ2VWaWV3cG9ydENvbnRy b2xsZXJDbGllbnRFZmwuaCIKKyNlbmRpZgogCiB0eXBlZGVmIHN0cnVjdCBfY2Fpcm9fc3VyZmFj ZSBjYWlyb19zdXJmYWNlX3Q7CiAKQEAgLTYyLDEwICs2Niw2IEBAIGNsYXNzIFBhZ2VMb2FkQ2xp ZW50RWZsOwogY2xhc3MgUGFnZVBvbGljeUNsaWVudEVmbDsKIGNsYXNzIFBhZ2VVSUNsaWVudEVm bDsKIGNsYXNzIFZpZXdDbGllbnRFZmw7Ci0jaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5H KQotY2xhc3MgUGFnZVZpZXdwb3J0Q29udHJvbGxlcjsKLWNsYXNzIFBhZ2VWaWV3cG9ydENvbnRy b2xsZXJDbGllbnRFZmw7Ci0jZW5kaWYKIGNsYXNzIFdlYlBhZ2VHcm91cDsKIGNsYXNzIFdlYlBh Z2VQcm94eTsKIApAQCAtMTIxLDcgKzEyMSw3IEBAIHB1YmxpYzoKICAgICBFd2tXaW5kb3dGZWF0 dXJlcyogd2luZG93RmVhdHVyZXMoKTsKIAogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElO RykKLSAgICBXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXIqIHBhZ2VWaWV3cG9ydENvbnRy b2xsZXIoKSB7IHJldHVybiBtX3BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuZ2V0KCk7IH0KKyAgICBX ZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXImIHBhZ2VWaWV3cG9ydENvbnRyb2xsZXIoKSB7 IHJldHVybiBtX3BhZ2VWaWV3cG9ydENvbnRyb2xsZXI7IH0KICNlbmRpZgogCiAgICAgdm9pZCBz ZXREZXZpY2VTY2FsZUZhY3RvcihmbG9hdCBzY2FsZSk7CkBAIC0yOTEsOCArMjkxLDggQEAgcHJp dmF0ZToKICAgICBzdGQ6OnVuaXF1ZV9wdHI8RXdrQ29sb3JQaWNrZXI+IG1fY29sb3JQaWNrZXI7 CiAjZW5kaWYKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCi0gICAgc3RkOjp1bmlx dWVfcHRyPFdlYktpdDo6UGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbD4gbV9wYWdlVmll d3BvcnRDb250cm9sbGVyQ2xpZW50OwotICAgIHN0ZDo6dW5pcXVlX3B0cjxXZWJLaXQ6OlBhZ2VW aWV3cG9ydENvbnRyb2xsZXI+IG1fcGFnZVZpZXdwb3J0Q29udHJvbGxlcjsKKyAgICBXZWJLaXQ6 OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmwgbV9wYWdlVmlld3BvcnRDb250cm9sbGVy Q2xpZW50OworICAgIFdlYktpdDo6UGFnZVZpZXdwb3J0Q29udHJvbGxlciBtX3BhZ2VWaWV3cG9y dENvbnRyb2xsZXI7CiAjZW5kaWYKICAgICBib29sIG1faXNBY2NlbGVyYXRlZDsKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlTG9hZENsaWVudEVmbC5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1BhZ2VMb2FkQ2xpZW50RWZsLmNwcAppbmRl eCA4Yjk2MWZiOWMzOTg3YjAxYjkzM2JlNjRlOTU1YmU0N2U0N2I5M2UyLi5mNWJlYzNjZDIyMzdj ZjJkZDM2ZmFlOTk5ZDFmYmUxZDhkNjI2OWI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvZWZsL1BhZ2VMb2FkQ2xpZW50RWZsLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvZWZsL1BhZ2VMb2FkQ2xpZW50RWZsLmNwcApAQCAtMTE5LDcgKzExOSw3IEBAIHZv aWQgUGFnZUxvYWRDbGllbnRFZmw6OmRpZENvbW1pdExvYWRGb3JGcmFtZShXS1BhZ2VSZWYsIFdL RnJhbWVSZWYgZnJhbWUsIFdLVHlwCiAgICAgRXdrVmlldyogdmlldyA9IHRvUGFnZUxvYWRDbGll bnRFZmwoY2xpZW50SW5mbyktPnZpZXcoKTsKICAgICBpZiAoV0tQYWdlVXNlRml4ZWRMYXlvdXQo dmlldy0+d2tQYWdlKCkpKSB7CiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQotICAg ICAgICB2aWV3LT5wYWdlVmlld3BvcnRDb250cm9sbGVyKCktPmRpZENvbW1pdExvYWQoKTsKKyAg ICAgICAgdmlldy0+cGFnZVZpZXdwb3J0Q29udHJvbGxlcigpLmRpZENvbW1pdExvYWQoKTsKICNl bmRpZgogICAgICAgICByZXR1cm47CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL2VmbC9WaWV3Q2xpZW50RWZsLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9lZmwvVmlld0NsaWVudEVmbC5jcHAKaW5kZXggOTAwODI5OGUxZWViZGZmNDFlODYyNzkwZGQ0 NGZmZjZhMTFhODYzZS4uOWI0ZjJlNWJkZGJmZWJiZWM3ZmY0NTBlZjRkZjFkOTUwZGIzZDk1OCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9WaWV3Q2xpZW50RWZsLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1ZpZXdDbGllbnRFZmwuY3BwCkBA IC01Myw3ICs1Myw3IEBAIHZvaWQgVmlld0NsaWVudEVmbDo6ZGlkQ2hhbmdlQ29udGVudHNTaXpl KFdLVmlld1JlZiwgV0tTaXplIHNpemUsIGNvbnN0IHZvaWQqIGNsCiAgICAgRXdrVmlldyogZXdr VmlldyA9IHRvRXdrVmlldyhjbGllbnRJbmZvKTsKICAgICBpZiAoV0tQYWdlVXNlRml4ZWRMYXlv dXQoZXdrVmlldy0+d2tQYWdlKCkpKQogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykK LSAgICAgICAgZXdrVmlldy0+cGFnZVZpZXdwb3J0Q29udHJvbGxlcigpLT5kaWRDaGFuZ2VDb250 ZW50c1NpemUodG9JbnRTaXplKHNpemUpKTsKKyAgICAgICAgZXdrVmlldy0+cGFnZVZpZXdwb3J0 Q29udHJvbGxlcigpLmRpZENoYW5nZUNvbnRlbnRzU2l6ZSh0b0ludFNpemUoc2l6ZSkpOwogI2Vs c2UKICAgICAgICAgeyB9CiAjZW5kaWYKQEAgLTEwMyw3ICsxMDMsNyBAQCB2b2lkIFZpZXdDbGll bnRFZmw6OmRpZENoYW5nZUNvbnRlbnRzUG9zaXRpb24oV0tWaWV3UmVmLCBXS1BvaW50IHBvc2l0 aW9uLCBjb25zdAogICAgIEV3a1ZpZXcqIGV3a1ZpZXcgPSB0b0V3a1ZpZXcoY2xpZW50SW5mbyk7 CiAgICAgaWYgKFdLUGFnZVVzZUZpeGVkTGF5b3V0KGV3a1ZpZXctPndrUGFnZSgpKSkgewogI2lm IFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKLSAgICAgICAgZXdrVmlldy0+cGFnZVZpZXdw b3J0Q29udHJvbGxlcigpLT5wYWdlRGlkUmVxdWVzdFNjcm9sbCh0b0ludFBvaW50KHBvc2l0aW9u KSk7CisgICAgICAgIGV3a1ZpZXctPnBhZ2VWaWV3cG9ydENvbnRyb2xsZXIoKS5wYWdlRGlkUmVx dWVzdFNjcm9sbCh0b0ludFBvaW50KHBvc2l0aW9uKSk7CiAjZWxzZQogICAgICAgICBVTlVTRURf UEFSQU0ocG9zaXRpb24pOwogI2VuZGlmCkBAIC0xMTgsNyArMTE4LDcgQEAgdm9pZCBWaWV3Q2xp ZW50RWZsOjpkaWRSZW5kZXJGcmFtZShXS1ZpZXdSZWYsIFdLU2l6ZSBjb250ZW50c1NpemUsIFdL UmVjdCBjb3ZlcmUKICAgICBFd2tWaWV3KiBld2tWaWV3ID0gdG9Fd2tWaWV3KGNsaWVudEluZm8p OwogICAgIGlmIChXS1BhZ2VVc2VGaXhlZExheW91dChld2tWaWV3LT53a1BhZ2UoKSkpIHsKICNp ZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCi0gICAgICAgIGV3a1ZpZXctPnBhZ2VWaWV3 cG9ydENvbnRyb2xsZXIoKS0+ZGlkUmVuZGVyRnJhbWUodG9JbnRTaXplKGNvbnRlbnRzU2l6ZSks IHRvSW50UmVjdChjb3ZlcmVkUmVjdCkpOworICAgICAgICBld2tWaWV3LT5wYWdlVmlld3BvcnRD b250cm9sbGVyKCkuZGlkUmVuZGVyRnJhbWUodG9JbnRTaXplKGNvbnRlbnRzU2l6ZSksIHRvSW50 UmVjdChjb3ZlcmVkUmVjdCkpOwogI2Vsc2UKICAgICAgICAgVU5VU0VEX1BBUkFNKGNvbnRlbnRz U2l6ZSk7CiAgICAgICAgIFVOVVNFRF9QQVJBTShjb3ZlcmVkUmVjdCk7CkBAIC0xMzQsNyArMTM0 LDcgQEAgdm9pZCBWaWV3Q2xpZW50RWZsOjpkaWRDb21wbGV0ZVBhZ2VUcmFuc2l0aW9uKFdLVmll d1JlZiwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKICAgICBFd2tWaWV3KiBld2tWaWV3ID0gdG9F d2tWaWV3KGNsaWVudEluZm8pOwogICAgIGlmIChXS1BhZ2VVc2VGaXhlZExheW91dChld2tWaWV3 LT53a1BhZ2UoKSkpIHsKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCi0gICAgICAg IGV3a1ZpZXctPnBhZ2VWaWV3cG9ydENvbnRyb2xsZXIoKS0+cGFnZVRyYW5zaXRpb25WaWV3cG9y dFJlYWR5KCk7CisgICAgICAgIGV3a1ZpZXctPnBhZ2VWaWV3cG9ydENvbnRyb2xsZXIoKS5wYWdl VHJhbnNpdGlvblZpZXdwb3J0UmVhZHkoKTsKICNlbmRpZgogICAgICAgICByZXR1cm47CiAgICAg fQpAQCAtMTQ4LDcgKzE0OCw3IEBAIHZvaWQgVmlld0NsaWVudEVmbDo6ZGlkQ2hhbmdlVmlld3Bv cnRBdHRyaWJ1dGVzKFdLVmlld1JlZiwgV0tWaWV3cG9ydEF0dHJpYnV0ZXNSCiAgICAgaWYgKFdL UGFnZVVzZUZpeGVkTGF5b3V0KGV3a1ZpZXctPndrUGFnZSgpKSkgewogI2lmIFVTRShBQ0NFTEVS QVRFRF9DT01QT1NJVElORykKICAgICAgICAgLy8gRklYTUU6IHBhZ2VWaWV3cG9ydENvbnRyb2xs ZXIgc2hvdWxkIGFjY2VwdCBXS1ZpZXdwb3J0QXR0cmlidXRlc1JlZi4KLSAgICAgICAgZXdrVmll dy0+cGFnZVZpZXdwb3J0Q29udHJvbGxlcigpLT5kaWRDaGFuZ2VWaWV3cG9ydEF0dHJpYnV0ZXMo dG9JbXBsKGF0dHJpYnV0ZXMpLT5vcmlnaW5hbEF0dHJpYnV0ZXMoKSk7CisgICAgICAgIGV3a1Zp ZXctPnBhZ2VWaWV3cG9ydENvbnRyb2xsZXIoKS5kaWRDaGFuZ2VWaWV3cG9ydEF0dHJpYnV0ZXMo dG9JbXBsKGF0dHJpYnV0ZXMpLT5vcmlnaW5hbEF0dHJpYnV0ZXMoKSk7CiAjZWxzZQogICAgICAg ICBVTlVTRURfUEFSQU0oYXR0cmlidXRlcyk7CiAjZW5kaWYK 218031 2013-11-28 19:26:48 -0800 2013-11-28 19:39:29 -0800 Patch bug-124993-20131129122647.patch text/plain 9262 ryuan.choi U3VidmVyc2lvbiBSZXZpc2lvbjogMTU5ODYyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTRhNWNmMDU2NzU5OGQx NjUyZGRjNjdiZjIzZjBkYWNjNWVmNGI3Mi4uM2RiZWZjNDhmNDkzMTU2OTk5ZDNmM2RhMTkxM2Jk MzViNjU4NmM2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDEzLTExLTI4ICBSeXVh biBDaG9pICA8cnl1YW4uY2hvaUBzYW1zdW5nLmNvbT4KKworICAgICAgICBbRUZMXSBQYWdlVmll d3BvcnRDb250cm9sbGVyIGRvZXMgbm90IG5lZWQgdG8gYmUgdW5pcXVlX3B0ciBpbnN0YW5jZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI0OTkzCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUGFnZVZpZXdw b3J0Q29udHJvbGxlciBhbmQgUGFnZVZpZXdwb3J0Q29udHJvbGxlckVmbCBoYXZlIHNhbWUgbGlm ZSBjeWNsZQorICAgICAgICB3aXRoIEV3a1ZpZXcuIFNvLCB3ZSBkb24ndCBuZWVkIHRvIG1ha2Ug dGhlbSBhcyB1bmlxdWVfcHRyIGluc3RhbmNlLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9l ZmwvRXdrVmlldy5jcHA6CisgICAgICAgIChFd2tWaWV3OjpFd2tWaWV3KToKKyAgICAgICAgKEV3 a1ZpZXc6OmhhbmRsZUV2YXNPYmplY3RDYWxjdWxhdGUpOgorICAgICAgICAoRXdrVmlldzo6c2Ny b2xsQnkpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuaDoKKyAgICAgICAg KEV3a1ZpZXc6OnBhZ2VWaWV3cG9ydENvbnRyb2xsZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9l ZmwvUGFnZUxvYWRDbGllbnRFZmwuY3BwOgorICAgICAgICAoV2ViS2l0OjpQYWdlTG9hZENsaWVu dEVmbDo6ZGlkQ29tbWl0TG9hZEZvckZyYW1lKToKKyAgICAgICAgKiBVSVByb2Nlc3MvZWZsL1Zp ZXdDbGllbnRFZmwuY3BwOgorICAgICAgICAoV2ViS2l0OjpWaWV3Q2xpZW50RWZsOjpkaWRDaGFu Z2VDb250ZW50c1NpemUpOgorICAgICAgICAoV2ViS2l0OjpWaWV3Q2xpZW50RWZsOjpkaWRDaGFu Z2VDb250ZW50c1Bvc2l0aW9uKToKKyAgICAgICAgKFdlYktpdDo6Vmlld0NsaWVudEVmbDo6ZGlk UmVuZGVyRnJhbWUpOgorICAgICAgICAoV2ViS2l0OjpWaWV3Q2xpZW50RWZsOjpkaWRDb21wbGV0 ZVBhZ2VUcmFuc2l0aW9uKToKKyAgICAgICAgKFdlYktpdDo6Vmlld0NsaWVudEVmbDo6ZGlkQ2hh bmdlVmlld3BvcnRBdHRyaWJ1dGVzKToKKwogMjAxMy0xMS0yOCAgTmljayBEaWVnbyBZYW1hbmUg IDxuaWNrLnlhbWFuZUBvcGVuYm9zc2Eub3JnPgogCiAgICAgICAgIFtHVEtdIEJ1aWxkIGZpeCBh ZnRlciByMTU5ODU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2Vm bC9Fd2tWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcu Y3BwCmluZGV4IDYwY2Y5MDRjMTZmYWQwNmM5NjIzNTliNGVhZjdhN2YxMmJiOWU0YTcuLmMzNGJk NTdhZTI5MTkwNmVlOThlMjZiNzk1ZTA3MGQxOWEyZjRhNWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZWZsL0V3a1ZpZXcuY3BwCkBAIC0zMyw4ICszMyw2IEBACiAjaW5jbHVk ZSAiUGFnZUxvYWRDbGllbnRFZmwuaCIKICNpbmNsdWRlICJQYWdlUG9saWN5Q2xpZW50RWZsLmgi CiAjaW5jbHVkZSAiUGFnZVVJQ2xpZW50RWZsLmgiCi0jaW5jbHVkZSAiUGFnZVZpZXdwb3J0Q29u dHJvbGxlci5oIgotI2luY2x1ZGUgIlBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmwuaCIK ICNpbmNsdWRlICJTbmFwc2hvdEltYWdlR0wuaCIKICNpbmNsdWRlICJWaWV3Q2xpZW50RWZsLmgi CiAjaW5jbHVkZSAiV0tBcnJheS5oIgpAQCAtMjgyLDggKzI4MCw4IEBAIEV3a1ZpZXc6OkV3a1Zp ZXcoV0tWaWV3UmVmIHZpZXcsIEV2YXNfT2JqZWN0KiBldmFzT2JqZWN0KQogICAgICwgbV9kaXNw bGF5VGltZXIodGhpcywgJkV3a1ZpZXc6OmRpc3BsYXlUaW1lckZpcmVkKQogICAgICwgbV9pbnB1 dE1ldGhvZENvbnRleHQoSW5wdXRNZXRob2RDb250ZXh0RWZsOjpjcmVhdGUodGhpcywgc21hcnRE YXRhKCktPmJhc2UuZXZhcykpCiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQotICAg ICwgbV9wYWdlVmlld3BvcnRDb250cm9sbGVyQ2xpZW50KHN0ZDo6bWFrZV91bmlxdWU8UGFnZVZp ZXdwb3J0Q29udHJvbGxlckNsaWVudEVmbD4odGhpcykpCi0gICAgLCBtX3BhZ2VWaWV3cG9ydENv bnRyb2xsZXIoc3RkOjptYWtlX3VuaXF1ZTxQYWdlVmlld3BvcnRDb250cm9sbGVyPihwYWdlKCks IG1fcGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudC5nZXQoKSkpCisgICAgLCBtX3BhZ2VWaWV3 cG9ydENvbnRyb2xsZXJDbGllbnQodGhpcykKKyAgICAsIG1fcGFnZVZpZXdwb3J0Q29udHJvbGxl cihwYWdlKCksICZtX3BhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnQpCiAjZW5kaWYKICAgICAs IG1faXNBY2NlbGVyYXRlZCh0cnVlKQogewpAQCAtMTIwNyw3ICsxMjA1LDcgQEAgdm9pZCBFd2tW aWV3OjpoYW5kbGVFdmFzT2JqZWN0Q2FsY3VsYXRlKEV2YXNfT2JqZWN0KiBldmFzT2JqZWN0KQog ICAgICAgICBXS1ZpZXdTZXRTaXplKHNlbGYtPndrVmlldygpLCBXS1NpemVNYWtlKHdpZHRoLCBo ZWlnaHQpKTsKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCiAgICAgICAgIGlmIChX S1BhZ2VVc2VGaXhlZExheW91dChzZWxmLT53a1BhZ2UoKSkpCi0gICAgICAgICAgICBzZWxmLT5w YWdlVmlld3BvcnRDb250cm9sbGVyKCktPmRpZENoYW5nZVZpZXdwb3J0U2l6ZShzZWxmLT5zaXpl KCkpOworICAgICAgICAgICAgc2VsZi0+cGFnZVZpZXdwb3J0Q29udHJvbGxlcigpLmRpZENoYW5n ZVZpZXdwb3J0U2l6ZShzZWxmLT5zaXplKCkpOwogCiAgICAgICAgIHNlbGYtPnNldE5lZWRzU3Vy ZmFjZVJlc2l6ZSgpOwogI2VuZGlmCkBAIC0xNDAzLDggKzE0MDEsOCBAQCBib29sIEV3a1ZpZXc6 OnNjcm9sbEJ5KGNvbnN0IEludFNpemUmIG9mZnNldCkKICAgICAvLyBVcGRhdGUgbmV3IHBvc2l0 aW9uIHRvIHRoZSBQYWdlVmlld3BvcnRDb250cm9sbGVyLgogICAgIGZsb2F0IGNvbnRlbnRTY2Fs ZSA9IFdLVmlld0dldENvbnRlbnRTY2FsZUZhY3Rvcih3a1ZpZXcoKSk7CiAgICAgbmV3UG9zaXRp b24uc2NhbGUoMSAvIGNvbnRlbnRTY2FsZSwgMSAvIGNvbnRlbnRTY2FsZSk7Ci0gICAgbmV3UG9z aXRpb24gPSBtX3BhZ2VWaWV3cG9ydENvbnRyb2xsZXItPmJvdW5kQ29udGVudHNQb3NpdGlvbkF0 U2NhbGUobmV3UG9zaXRpb24sIGNvbnRlbnRTY2FsZSk7Ci0gICAgbV9wYWdlVmlld3BvcnRDb250 cm9sbGVyLT5kaWRDaGFuZ2VDb250ZW50c1Zpc2liaWxpdHkobmV3UG9zaXRpb24sIGNvbnRlbnRT Y2FsZSk7CisgICAgbmV3UG9zaXRpb24gPSBtX3BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuYm91bmRD b250ZW50c1Bvc2l0aW9uQXRTY2FsZShuZXdQb3NpdGlvbiwgY29udGVudFNjYWxlKTsKKyAgICBt X3BhZ2VWaWV3cG9ydENvbnRyb2xsZXIuZGlkQ2hhbmdlQ29udGVudHNWaXNpYmlsaXR5KG5ld1Bv c2l0aW9uLCBjb250ZW50U2NhbGUpOwogCiAgICAgLy8gVXBkYXRlIG5ldyBwb3NpdGlvbiB0byB0 aGUgV0tWaWV3LgogICAgIFdLUG9pbnQgcG9zaXRpb24gPSBXS1BvaW50TWFrZShuZXdQb3NpdGlv bi54KCkgKiBjb250ZW50U2NhbGUsIG5ld1Bvc2l0aW9uLnkoKSAqIGNvbnRlbnRTY2FsZSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmggYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2VmbC9Fd2tWaWV3LmgKaW5kZXggNTRlMjViN2U1 YjY4ZDI3NDNhZjkyZDVhMDM3MjhkNGE0NWVjZDg0MC4uODUzOTc5Yjc1OTNhMmEzMjE3ODVjMDBj Y2RmNzFjZDcyYjZkOGQ2MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9lZmwvRXdrVmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZWZsL0V3 a1ZpZXcuaApAQCAtMjgsNiArMjgsOSBAQAogI2luY2x1ZGUgIlJlZlB0ckVmbC5oIgogI2luY2x1 ZGUgIldLRWluYVNoYXJlZFN0cmluZy5oIgogI2luY2x1ZGUgIldLUmV0YWluUHRyLmgiCisjaW5j bHVkZSAiV2ViQ29udGV4dC5oIgorI2luY2x1ZGUgIldlYlBhZ2VHcm91cC5oIgorI2luY2x1ZGUg IldlYlByZWZlcmVuY2VzLmgiCiAjaW5jbHVkZSAiV2ViVmlld0VmbC5oIgogI2luY2x1ZGUgImV3 a191cmxfcmVxdWVzdF9wcml2YXRlLmgiCiAjaW5jbHVkZSA8RXZhcy5oPgpAQCAtNDcsOSArNTAs MTAgQEAKICNpbmNsdWRlICJld2tfdG91Y2guaCIKICNlbmRpZgogCi0jaW5jbHVkZSAiV2ViQ29u dGV4dC5oIgotI2luY2x1ZGUgIldlYlBhZ2VHcm91cC5oIgotI2luY2x1ZGUgIldlYlByZWZlcmVu Y2VzLmgiCisjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQorI2luY2x1ZGUgIlBhZ2VW aWV3cG9ydENvbnRyb2xsZXIuaCIKKyNpbmNsdWRlICJQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xp ZW50RWZsLmgiCisjZW5kaWYKIAogdHlwZWRlZiBzdHJ1Y3QgX2NhaXJvX3N1cmZhY2UgY2Fpcm9f c3VyZmFjZV90OwogCkBAIC02MiwxMCArNjYsNiBAQCBjbGFzcyBQYWdlTG9hZENsaWVudEVmbDsK IGNsYXNzIFBhZ2VQb2xpY3lDbGllbnRFZmw7CiBjbGFzcyBQYWdlVUlDbGllbnRFZmw7CiBjbGFz cyBWaWV3Q2xpZW50RWZsOwotI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKLWNsYXNz IFBhZ2VWaWV3cG9ydENvbnRyb2xsZXI7Ci1jbGFzcyBQYWdlVmlld3BvcnRDb250cm9sbGVyQ2xp ZW50RWZsOwotI2VuZGlmCiBjbGFzcyBXZWJQYWdlR3JvdXA7CiBjbGFzcyBXZWJQYWdlUHJveHk7 CiAKQEAgLTEyMSw3ICsxMjEsNyBAQCBwdWJsaWM6CiAgICAgRXdrV2luZG93RmVhdHVyZXMqIHdp bmRvd0ZlYXR1cmVzKCk7CiAKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCi0gICAg V2ViS2l0OjpQYWdlVmlld3BvcnRDb250cm9sbGVyKiBwYWdlVmlld3BvcnRDb250cm9sbGVyKCkg eyByZXR1cm4gbV9wYWdlVmlld3BvcnRDb250cm9sbGVyLmdldCgpOyB9CisgICAgV2ViS2l0OjpQ YWdlVmlld3BvcnRDb250cm9sbGVyJiBwYWdlVmlld3BvcnRDb250cm9sbGVyKCkgeyByZXR1cm4g bV9wYWdlVmlld3BvcnRDb250cm9sbGVyOyB9CiAjZW5kaWYKIAogICAgIHZvaWQgc2V0RGV2aWNl U2NhbGVGYWN0b3IoZmxvYXQgc2NhbGUpOwpAQCAtMjkxLDggKzI5MSw4IEBAIHByaXZhdGU6CiAg ICAgc3RkOjp1bmlxdWVfcHRyPEV3a0NvbG9yUGlja2VyPiBtX2NvbG9yUGlja2VyOwogI2VuZGlm CiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQotICAgIHN0ZDo6dW5pcXVlX3B0cjxX ZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXJDbGllbnRFZmw+IG1fcGFnZVZpZXdwb3J0Q29u dHJvbGxlckNsaWVudDsKLSAgICBzdGQ6OnVuaXF1ZV9wdHI8V2ViS2l0OjpQYWdlVmlld3BvcnRD b250cm9sbGVyPiBtX3BhZ2VWaWV3cG9ydENvbnRyb2xsZXI7CisgICAgV2ViS2l0OjpQYWdlVmll d3BvcnRDb250cm9sbGVyQ2xpZW50RWZsIG1fcGFnZVZpZXdwb3J0Q29udHJvbGxlckNsaWVudDsK KyAgICBXZWJLaXQ6OlBhZ2VWaWV3cG9ydENvbnRyb2xsZXIgbV9wYWdlVmlld3BvcnRDb250cm9s bGVyOwogI2VuZGlmCiAgICAgYm9vbCBtX2lzQWNjZWxlcmF0ZWQ7CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvUGFnZUxvYWRDbGllbnRFZmwuY3BwIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL2VmbC9QYWdlTG9hZENsaWVudEVmbC5jcHAKaW5kZXggOGI5NjFm YjljMzk4N2IwMWI5MzNiZTY0ZTk1NWJlNDdlNDdiOTNlMi4uZjViZWMzY2QyMjM3Y2YyZGQzNmZh ZTk5OWQxZmJlMWQ4ZDYyNjliNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L2VmbC9QYWdlTG9hZENsaWVudEVmbC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L2VmbC9QYWdlTG9hZENsaWVudEVmbC5jcHAKQEAgLTExOSw3ICsxMTksNyBAQCB2b2lkIFBhZ2VM b2FkQ2xpZW50RWZsOjpkaWRDb21taXRMb2FkRm9yRnJhbWUoV0tQYWdlUmVmLCBXS0ZyYW1lUmVm IGZyYW1lLCBXS1R5cAogICAgIEV3a1ZpZXcqIHZpZXcgPSB0b1BhZ2VMb2FkQ2xpZW50RWZsKGNs aWVudEluZm8pLT52aWV3KCk7CiAgICAgaWYgKFdLUGFnZVVzZUZpeGVkTGF5b3V0KHZpZXctPndr UGFnZSgpKSkgewogI2lmIFVTRShBQ0NFTEVSQVRFRF9DT01QT1NJVElORykKLSAgICAgICAgdmll dy0+cGFnZVZpZXdwb3J0Q29udHJvbGxlcigpLT5kaWRDb21taXRMb2FkKCk7CisgICAgICAgIHZp ZXctPnBhZ2VWaWV3cG9ydENvbnRyb2xsZXIoKS5kaWRDb21taXRMb2FkKCk7CiAjZW5kaWYKICAg ICAgICAgcmV0dXJuOwogICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9lZmwvVmlld0NsaWVudEVmbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvZWZsL1Zp ZXdDbGllbnRFZmwuY3BwCmluZGV4IDkwMDgyOThlMWVlYmRmZjQxZTg2Mjc5MGRkNDRmZmY2YTEx YTg2M2UuLjliNGYyZTViZGRiZmViYmVjN2ZmNDUwZWY0ZGYxZDk1MGRiM2Q5NTggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9lZmwvVmlld0NsaWVudEVmbC5jcHAKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL2VmbC9WaWV3Q2xpZW50RWZsLmNwcApAQCAtNTMsNyAr NTMsNyBAQCB2b2lkIFZpZXdDbGllbnRFZmw6OmRpZENoYW5nZUNvbnRlbnRzU2l6ZShXS1ZpZXdS ZWYsIFdLU2l6ZSBzaXplLCBjb25zdCB2b2lkKiBjbAogICAgIEV3a1ZpZXcqIGV3a1ZpZXcgPSB0 b0V3a1ZpZXcoY2xpZW50SW5mbyk7CiAgICAgaWYgKFdLUGFnZVVzZUZpeGVkTGF5b3V0KGV3a1Zp ZXctPndrUGFnZSgpKSkKICNpZiBVU0UoQUNDRUxFUkFURURfQ09NUE9TSVRJTkcpCi0gICAgICAg IGV3a1ZpZXctPnBhZ2VWaWV3cG9ydENvbnRyb2xsZXIoKS0+ZGlkQ2hhbmdlQ29udGVudHNTaXpl KHRvSW50U2l6ZShzaXplKSk7CisgICAgICAgIGV3a1ZpZXctPnBhZ2VWaWV3cG9ydENvbnRyb2xs ZXIoKS5kaWRDaGFuZ2VDb250ZW50c1NpemUodG9JbnRTaXplKHNpemUpKTsKICNlbHNlCiAgICAg ICAgIHsgfQogI2VuZGlmCkBAIC0xMDMsNyArMTAzLDcgQEAgdm9pZCBWaWV3Q2xpZW50RWZsOjpk aWRDaGFuZ2VDb250ZW50c1Bvc2l0aW9uKFdLVmlld1JlZiwgV0tQb2ludCBwb3NpdGlvbiwgY29u c3QKICAgICBFd2tWaWV3KiBld2tWaWV3ID0gdG9Fd2tWaWV3KGNsaWVudEluZm8pOwogICAgIGlm IChXS1BhZ2VVc2VGaXhlZExheW91dChld2tWaWV3LT53a1BhZ2UoKSkpIHsKICNpZiBVU0UoQUND RUxFUkFURURfQ09NUE9TSVRJTkcpCi0gICAgICAgIGV3a1ZpZXctPnBhZ2VWaWV3cG9ydENvbnRy b2xsZXIoKS0+cGFnZURpZFJlcXVlc3RTY3JvbGwodG9JbnRQb2ludChwb3NpdGlvbikpOworICAg ICAgICBld2tWaWV3LT5wYWdlVmlld3BvcnRDb250cm9sbGVyKCkucGFnZURpZFJlcXVlc3RTY3Jv bGwodG9JbnRQb2ludChwb3NpdGlvbikpOwogI2Vsc2UKICAgICAgICAgVU5VU0VEX1BBUkFNKHBv c2l0aW9uKTsKICNlbmRpZgpAQCAtMTE4LDcgKzExOCw3IEBAIHZvaWQgVmlld0NsaWVudEVmbDo6 ZGlkUmVuZGVyRnJhbWUoV0tWaWV3UmVmLCBXS1NpemUgY29udGVudHNTaXplLCBXS1JlY3QgY292 ZXJlCiAgICAgRXdrVmlldyogZXdrVmlldyA9IHRvRXdrVmlldyhjbGllbnRJbmZvKTsKICAgICBp ZiAoV0tQYWdlVXNlRml4ZWRMYXlvdXQoZXdrVmlldy0+d2tQYWdlKCkpKSB7CiAjaWYgVVNFKEFD Q0VMRVJBVEVEX0NPTVBPU0lUSU5HKQotICAgICAgICBld2tWaWV3LT5wYWdlVmlld3BvcnRDb250 cm9sbGVyKCktPmRpZFJlbmRlckZyYW1lKHRvSW50U2l6ZShjb250ZW50c1NpemUpLCB0b0ludFJl Y3QoY292ZXJlZFJlY3QpKTsKKyAgICAgICAgZXdrVmlldy0+cGFnZVZpZXdwb3J0Q29udHJvbGxl cigpLmRpZFJlbmRlckZyYW1lKHRvSW50U2l6ZShjb250ZW50c1NpemUpLCB0b0ludFJlY3QoY292 ZXJlZFJlY3QpKTsKICNlbHNlCiAgICAgICAgIFVOVVNFRF9QQVJBTShjb250ZW50c1NpemUpOwog ICAgICAgICBVTlVTRURfUEFSQU0oY292ZXJlZFJlY3QpOwpAQCAtMTM0LDcgKzEzNCw3IEBAIHZv aWQgVmlld0NsaWVudEVmbDo6ZGlkQ29tcGxldGVQYWdlVHJhbnNpdGlvbihXS1ZpZXdSZWYsIGNv bnN0IHZvaWQqIGNsaWVudEluZm8pCiAgICAgRXdrVmlldyogZXdrVmlldyA9IHRvRXdrVmlldyhj bGllbnRJbmZvKTsKICAgICBpZiAoV0tQYWdlVXNlRml4ZWRMYXlvdXQoZXdrVmlldy0+d2tQYWdl KCkpKSB7CiAjaWYgVVNFKEFDQ0VMRVJBVEVEX0NPTVBPU0lUSU5HKQotICAgICAgICBld2tWaWV3 LT5wYWdlVmlld3BvcnRDb250cm9sbGVyKCktPnBhZ2VUcmFuc2l0aW9uVmlld3BvcnRSZWFkeSgp OworICAgICAgICBld2tWaWV3LT5wYWdlVmlld3BvcnRDb250cm9sbGVyKCkucGFnZVRyYW5zaXRp b25WaWV3cG9ydFJlYWR5KCk7CiAjZW5kaWYKICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTE0 OCw3ICsxNDgsNyBAQCB2b2lkIFZpZXdDbGllbnRFZmw6OmRpZENoYW5nZVZpZXdwb3J0QXR0cmli dXRlcyhXS1ZpZXdSZWYsIFdLVmlld3BvcnRBdHRyaWJ1dGVzUgogICAgIGlmIChXS1BhZ2VVc2VG aXhlZExheW91dChld2tWaWV3LT53a1BhZ2UoKSkpIHsKICNpZiBVU0UoQUNDRUxFUkFURURfQ09N UE9TSVRJTkcpCiAgICAgICAgIC8vIEZJWE1FOiBwYWdlVmlld3BvcnRDb250cm9sbGVyIHNob3Vs ZCBhY2NlcHQgV0tWaWV3cG9ydEF0dHJpYnV0ZXNSZWYuCi0gICAgICAgIGV3a1ZpZXctPnBhZ2VW aWV3cG9ydENvbnRyb2xsZXIoKS0+ZGlkQ2hhbmdlVmlld3BvcnRBdHRyaWJ1dGVzKHRvSW1wbChh dHRyaWJ1dGVzKS0+b3JpZ2luYWxBdHRyaWJ1dGVzKCkpOworICAgICAgICBld2tWaWV3LT5wYWdl Vmlld3BvcnRDb250cm9sbGVyKCkuZGlkQ2hhbmdlVmlld3BvcnRBdHRyaWJ1dGVzKHRvSW1wbChh dHRyaWJ1dGVzKS0+b3JpZ2luYWxBdHRyaWJ1dGVzKCkpOwogI2Vsc2UKICAgICAgICAgVU5VU0VE X1BBUkFNKGF0dHJpYnV0ZXMpOwogI2VuZGlmCg==