128575 2014-02-10 20:06:42 -0800 [WK2] Rename screenToWindow to screenToRootView and windowToScreen to rootViewToScreen 2014-02-11 13:51:20 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 benjamin benjamin andersca berto bunhere cgarcia cmarcelo commit-queue gustavo luiz mrobinson noam sam sergio zeno oldest_to_newest 979225 0 benjamin 2014-02-10 20:06:42 -0800 [WK2] Rename screenToWindow to screenToRootView and windowToScreen to rootViewToScreen 979226 1 223799 benjamin 2014-02-10 20:08:15 -0800 Created attachment 223799 Patch 979228 2 commit-queue 2014-02-10 20:10:00 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 979589 3 223799 benjamin 2014-02-11 13:51:18 -0800 Comment on attachment 223799 Patch Clearing flags on attachment: 223799 Committed r163908: <http://trac.webkit.org/changeset/163908> 979590 4 benjamin 2014-02-11 13:51:20 -0800 All reviewed patches have been landed. Closing bug. 223799 2014-02-10 20:08:15 -0800 2014-02-11 13:51:17 -0800 Patch bug-128575-20140210200814.patch text/plain 18997 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTYzODM5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjEyY2M4YWIyOWUyY2Jk OTU2Yzc5YTI0N2MzMDU2M2QwNzFjZmE4Yi4uYWY0ZTRjYjI3NjNjZDFmNDdjNzNmYzE3ZGFjNWUz ZDdlZTA5ZDI1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDUwIEBACiAyMDE0LTAyLTEwICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgogCisgICAgICAgIFtXSzJdIFJlbmFt ZSBzY3JlZW5Ub1dpbmRvdyB0byBzY3JlZW5Ub1Jvb3RWaWV3IGFuZCB3aW5kb3dUb1NjcmVlbiB0 byByb290Vmlld1RvU2NyZWVuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xMjg1NzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBJbiBXZWJLaXQyLCBzY3JlZW5Ub1Jvb3RWaWV3IGFuZCByb290Vmlld1RvU2Ny ZWVuIHdlcmUgbmFtZWQgc2NyZWVuVG9XaW5kb3cgYW5kIHdpbmRvd1RvU2NyZWVuLgorICAgICAg ICBUaG9zZSBuYW1lcyB3ZXJlIGZpbmUgb24gcG9ydHMgd2VyZSBGcmFtZVZpZXcgY29ycmVzcG9u ZCB0byB0aGUgc2Nyb2xsdmlldywgYnV0IHRoZXkgZG8gbm90IGFwcGx5IG9uIGlPUy4KKworICAg ICAgICBUaGlzIHBhdGNoIHJlbmFtZXMgc2NyZWVuVG9XaW5kb3cgYW5kIHdpbmRvd1RvU2NyZWVu IHRvIHRoZWlyIG1vcmUgZ2VuZXJpYyBXZWJDb3JlIGNvdW50ZXJwYXJ0LgorCisgICAgICAgICog VUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpQ YWdlQ2xpZW50SW1wbDo6c2NyZWVuVG9Sb290Vmlldyk6CisgICAgICAgIChXZWJLaXQ6OlBhZ2VD bGllbnRJbXBsOjpyb290Vmlld1RvU2NyZWVuKToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0 ay9QYWdlQ2xpZW50SW1wbC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvaW9zL1BhZ2VDbGll bnRJbXBsSU9TLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9pb3MvUGFnZUNsaWVudEltcGxJ T1MubW06CisgICAgICAgIChXZWJLaXQ6OlBhZ2VDbGllbnRJbXBsOjpzY3JlZW5Ub1Jvb3RWaWV3 KToKKyAgICAgICAgKFdlYktpdDo6UGFnZUNsaWVudEltcGw6OnJvb3RWaWV3VG9TY3JlZW4pOgor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvbWFjL1BhZ2VDbGllbnRJbXBsLmg6CisgICAgICAgICog VUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwubW06CisgICAgICAgIChXZWJLaXQ6OlBh Z2VDbGllbnRJbXBsOjpzY3JlZW5Ub1Jvb3RWaWV3KToKKyAgICAgICAgKFdlYktpdDo6UGFnZUNs aWVudEltcGw6OnJvb3RWaWV3VG9TY3JlZW4pOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db29yZGlu YXRlZEdyYXBoaWNzL1dlYlZpZXcuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3OjpzY3Jl ZW5Ub1Jvb3RWaWV3KToKKyAgICAgICAgKFdlYktpdDo6V2ViVmlldzo6cm9vdFZpZXdUb1NjcmVl bik6CisgICAgICAgICogVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV2ViVmlldy5oOgor ICAgICAgICAqIFVJUHJvY2Vzcy9QYWdlQ2xpZW50Lmg6CisgICAgICAgICogVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c2NyZWVuVG9S b290Vmlldyk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cm9vdFZpZXdUb1NjcmVl bik6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAqIFVJUHJv Y2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW46CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJD b3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDaHJv bWVDbGllbnQ6OnNjcmVlblRvUm9vdFZpZXcpOgorICAgICAgICAoV2ViS2l0OjpXZWJDaHJvbWVD bGllbnQ6OnJvb3RWaWV3VG9TY3JlZW4pOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9X ZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6c2NyZWVuVG9Sb290Vmlldyk6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnJvb3RWaWV3VG9TY3JlZW4pOgorICAgICAgICAq IFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmg6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQ YWdlL21hYy9XS0FjY2Vzc2liaWxpdHlXZWJQYWdlT2JqZWN0Lm1tOgorICAgICAgICAoLVtXS0Fj Y2Vzc2liaWxpdHlXZWJQYWdlT2JqZWN0IF9jb252ZXJ0U2NyZWVuUG9pbnRUb1Jvb3RWaWV3Ol0p OgorICAgICAgICAoLVtXS0FjY2Vzc2liaWxpdHlXZWJQYWdlT2JqZWN0IGFjY2Vzc2liaWxpdHlB dHRyaWJ1dGVWYWx1ZTpmb3JQYXJhbWV0ZXI6XSk6CisKKzIwMTQtMDItMTAgIEJlbmphbWluIFBv dWxhaW4gIDxicG91bGFpbkBhcHBsZS5jb20+CisKICAgICAgICAgW1dLMl0gQWRkIHN1cHBvcnQg Zm9yIGltYWdlIGRvY3VtZW50IHZpZXdwb3J0IGNvbmZpZ3VyYXRpb24KICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyODU2NQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5jcHAKaW5kZXggM2Qw N2Q4ZDhhNzU0NWU3YWRjZDViODE2MjQzN2ZkMzY0MWVjM2RmYi4uYTAwOGQ5YTVjZTgxZDc5ZjY3 MmQ3ZWY3OTc0OTBlMzFhMTJmMGQ5MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmNwcApAQCAtMTg5LDcgKzE4OSw3IEBAIEZsb2F0 UmVjdCBQYWdlQ2xpZW50SW1wbDo6Y29udmVydFRvVXNlclNwYWNlKGNvbnN0IEZsb2F0UmVjdCYg dmlld1JlY3QpCiAgICAgcmV0dXJuIHZpZXdSZWN0OwogfQogCi1JbnRQb2ludCBQYWdlQ2xpZW50 SW1wbDo6c2NyZWVuVG9XaW5kb3coY29uc3QgSW50UG9pbnQmIHBvaW50KQorSW50UG9pbnQgUGFn ZUNsaWVudEltcGw6OnNjcmVlblRvUm9vdFZpZXcoY29uc3QgSW50UG9pbnQmIHBvaW50KQogewog ICAgIEludFBvaW50IHdpZGdldFBvc2l0aW9uT25TY3JlZW4gPSBjb252ZXJ0V2lkZ2V0UG9pbnRU b1NjcmVlblBvaW50KG1fdmlld1dpZGdldCwgSW50UG9pbnQoKSk7CiAgICAgSW50UG9pbnQgcmVz dWx0KHBvaW50KTsKQEAgLTE5Nyw3ICsxOTcsNyBAQCBJbnRQb2ludCBQYWdlQ2xpZW50SW1wbDo6 c2NyZWVuVG9XaW5kb3coY29uc3QgSW50UG9pbnQmIHBvaW50KQogICAgIHJldHVybiByZXN1bHQ7 CiB9CiAKLUludFJlY3QgUGFnZUNsaWVudEltcGw6OndpbmRvd1RvU2NyZWVuKGNvbnN0IEludFJl Y3QmIHJlY3QpCitJbnRSZWN0IFBhZ2VDbGllbnRJbXBsOjpyb290Vmlld1RvU2NyZWVuKGNvbnN0 IEludFJlY3QmIHJlY3QpCiB7CiAgICAgcmV0dXJuIEludFJlY3QoY29udmVydFdpZGdldFBvaW50 VG9TY3JlZW5Qb2ludChtX3ZpZXdXaWRnZXQsIHJlY3QubG9jYXRpb24oKSksIHJlY3Quc2l6ZSgp KTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VD bGllbnRJbXBsLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50 SW1wbC5oCmluZGV4IDBkNjNlM2IxNzc5OTcxYmE2ZGEyZTViODk5MjE3MTIxOWM4NmU4MGYuLjBl MWJjMzRjMGYyMmI2NjExNmQ0ZjBlMjY2ZTQzN2M1M2NjYzVkODAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1BhZ2VDbGllbnRJbXBsLmgKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuaApAQCAtODQsOCArODQs OCBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBleGVjdXRlVW5kb1JlZG8oV2ViUGFnZVBy b3h5OjpVbmRvT3JSZWRvKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIFdlYkNvcmU6OkZsb2F0UmVj dCBjb252ZXJ0VG9EZXZpY2VTcGFjZShjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmKSBvdmVycmlk ZTsKICAgICB2aXJ0dWFsIFdlYkNvcmU6OkZsb2F0UmVjdCBjb252ZXJ0VG9Vc2VyU3BhY2UoY29u c3QgV2ViQ29yZTo6RmxvYXRSZWN0Jikgb3ZlcnJpZGU7Ci0gICAgdmlydHVhbCBXZWJDb3JlOjpJ bnRQb2ludCBzY3JlZW5Ub1dpbmRvdyhjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYpIG92ZXJyaWRl OwotICAgIHZpcnR1YWwgV2ViQ29yZTo6SW50UmVjdCB3aW5kb3dUb1NjcmVlbihjb25zdCBXZWJD b3JlOjpJbnRSZWN0Jikgb3ZlcnJpZGU7CisgICAgdmlydHVhbCBXZWJDb3JlOjpJbnRQb2ludCBz Y3JlZW5Ub1Jvb3RWaWV3KGNvbnN0IFdlYkNvcmU6OkludFBvaW50Jikgb3ZlcnJpZGU7CisgICAg dmlydHVhbCBXZWJDb3JlOjpJbnRSZWN0IHJvb3RWaWV3VG9TY3JlZW4oY29uc3QgV2ViQ29yZTo6 SW50UmVjdCYpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBkb25lV2l0aEtleUV2ZW50KGNv bnN0IE5hdGl2ZVdlYktleWJvYXJkRXZlbnQmLCBib29sIHdhc0V2ZW50SGFuZGxlZCkgb3ZlcnJp ZGU7CiAgICAgdmlydHVhbCBQYXNzUmVmUHRyPFdlYlBvcHVwTWVudVByb3h5PiBjcmVhdGVQb3B1 cE1lbnVQcm94eShXZWJQYWdlUHJveHkqKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIFBhc3NSZWZQ dHI8V2ViQ29udGV4dE1lbnVQcm94eT4gY3JlYXRlQ29udGV4dE1lbnVQcm94eShXZWJQYWdlUHJv eHkqKSBvdmVycmlkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv aW9zL1BhZ2VDbGllbnRJbXBsSU9TLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2lv cy9QYWdlQ2xpZW50SW1wbElPUy5oCmluZGV4IDIyNTVmZGNkMTUwYTFmMjI5OTFlMTU0MGI2NDgw NmY4ZDE3ZWU0YmQuLjdhNTIzYTM4YzA1ZTg1MmIwYTA1NjQ4MGM2MmFhNGU2ZDZhOWY3MDkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvaW9zL1BhZ2VDbGllbnRJbXBs SU9TLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9pb3MvUGFnZUNsaWVudElt cGxJT1MuaApAQCAtNzksOCArNzksOCBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBtYWtl Rmlyc3RSZXNwb25kZXIoKSBvdmVycmlkZTsKICAgICB2aXJ0dWFsIFdlYkNvcmU6OkZsb2F0UmVj dCBjb252ZXJ0VG9EZXZpY2VTcGFjZShjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmKSBvdmVycmlk ZTsKICAgICB2aXJ0dWFsIFdlYkNvcmU6OkZsb2F0UmVjdCBjb252ZXJ0VG9Vc2VyU3BhY2UoY29u c3QgV2ViQ29yZTo6RmxvYXRSZWN0Jikgb3ZlcnJpZGU7Ci0gICAgdmlydHVhbCBXZWJDb3JlOjpJ bnRQb2ludCBzY3JlZW5Ub1dpbmRvdyhjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYpIG92ZXJyaWRl OwotICAgIHZpcnR1YWwgV2ViQ29yZTo6SW50UmVjdCB3aW5kb3dUb1NjcmVlbihjb25zdCBXZWJD b3JlOjpJbnRSZWN0Jikgb3ZlcnJpZGU7CisgICAgdmlydHVhbCBXZWJDb3JlOjpJbnRQb2ludCBz Y3JlZW5Ub1Jvb3RWaWV3KGNvbnN0IFdlYkNvcmU6OkludFBvaW50Jikgb3ZlcnJpZGU7CisgICAg dmlydHVhbCBXZWJDb3JlOjpJbnRSZWN0IHJvb3RWaWV3VG9TY3JlZW4oY29uc3QgV2ViQ29yZTo6 SW50UmVjdCYpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgdm9pZCBkb25lV2l0aEtleUV2ZW50KGNv bnN0IE5hdGl2ZVdlYktleWJvYXJkRXZlbnQmLCBib29sIHdhc0V2ZW50SGFuZGxlZCkgb3ZlcnJp ZGU7CiAjaWYgRU5BQkxFKFRPVUNIX0VWRU5UUykKICAgICB2aXJ0dWFsIHZvaWQgZG9uZVdpdGhU b3VjaEV2ZW50KGNvbnN0IE5hdGl2ZVdlYlRvdWNoRXZlbnQmLCBib29sIHdhc0V2ZW50SGFuZGxl ZCkgb3ZlcnJpZGU7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2lv cy9QYWdlQ2xpZW50SW1wbElPUy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvaW9z L1BhZ2VDbGllbnRJbXBsSU9TLm1tCmluZGV4IDdhOGNiNDM3MzI1NTU5YjY2M2Y5YTdmYzQzZDYw ZTA1YTViMjQ4MTQuLmFkNTIyOWIxNzYzNDQ1MjM3NzE5NDdjOWM3NTlhZGQ0ZDMwZWFjNjkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvaW9zL1BhZ2VDbGllbnRJbXBs SU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvaW9zL1BhZ2VDbGllbnRJ bXBsSU9TLm1tCkBAIC0yNTgsMTIgKzI1OCwxMiBAQCBGbG9hdFJlY3QgUGFnZUNsaWVudEltcGw6 OmNvbnZlcnRUb1VzZXJTcGFjZShjb25zdCBGbG9hdFJlY3QmIHJlY3QpCiAgICAgcmV0dXJuIEZs b2F0UmVjdCgpOwogfQogCi1JbnRQb2ludCBQYWdlQ2xpZW50SW1wbDo6c2NyZWVuVG9XaW5kb3co Y29uc3QgSW50UG9pbnQmIHBvaW50KQorSW50UG9pbnQgUGFnZUNsaWVudEltcGw6OnNjcmVlblRv Um9vdFZpZXcoY29uc3QgSW50UG9pbnQmIHBvaW50KQogewogICAgIHJldHVybiBJbnRQb2ludChb bV92aWV3IGNvbnZlcnRQb2ludDpwb2ludCBmcm9tVmlldzpuaWxdKTsKIH0KIAotSW50UmVjdCBQ YWdlQ2xpZW50SW1wbDo6d2luZG93VG9TY3JlZW4oY29uc3QgSW50UmVjdCYgcmVjdCkKK0ludFJl Y3QgUGFnZUNsaWVudEltcGw6OnJvb3RWaWV3VG9TY3JlZW4oY29uc3QgSW50UmVjdCYgcmVjdCkK IHsKICAgICByZXR1cm4gZW5jbG9zaW5nSW50UmVjdChbbV92aWV3IGNvbnZlcnRSZWN0OnJlY3Qg dG9WaWV3Om5pbF0pOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9tYWMvUGFnZUNsaWVudEltcGwuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvbWFj L1BhZ2VDbGllbnRJbXBsLmgKaW5kZXggZGNlYzFiMzFiNDg5M2YzN2M2MDE3NjE2NmRmY2NhM2Fl ZTQ2ZTI4NC4uMTIxYzA3YzNlY2QxOGNmNDk4OWI5MGI4NTgzZmU1MGZjMTRkNTRlYyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVudEltcGwuaAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5oCkBA IC05Nyw4ICs5Nyw4IEBAIHByaXZhdGU6CiAKICAgICB2aXJ0dWFsIFdlYkNvcmU6OkZsb2F0UmVj dCBjb252ZXJ0VG9EZXZpY2VTcGFjZShjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmKTsKICAgICB2 aXJ0dWFsIFdlYkNvcmU6OkZsb2F0UmVjdCBjb252ZXJ0VG9Vc2VyU3BhY2UoY29uc3QgV2ViQ29y ZTo6RmxvYXRSZWN0Jik7Ci0gICAgdmlydHVhbCBXZWJDb3JlOjpJbnRQb2ludCBzY3JlZW5Ub1dp bmRvdyhjb25zdCBXZWJDb3JlOjpJbnRQb2ludCYpOwotICAgIHZpcnR1YWwgV2ViQ29yZTo6SW50 UmVjdCB3aW5kb3dUb1NjcmVlbihjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7CisgICAgdmlydHVh bCBXZWJDb3JlOjpJbnRQb2ludCBzY3JlZW5Ub1Jvb3RWaWV3KGNvbnN0IFdlYkNvcmU6OkludFBv aW50Jik7CisgICAgdmlydHVhbCBXZWJDb3JlOjpJbnRSZWN0IHJvb3RWaWV3VG9TY3JlZW4oY29u c3QgV2ViQ29yZTo6SW50UmVjdCYpOwogCiAgICAgdmlydHVhbCB2b2lkIGRvbmVXaXRoS2V5RXZl bnQoY29uc3QgTmF0aXZlV2ViS2V5Ym9hcmRFdmVudCYsIGJvb2wgd2FzRXZlbnRIYW5kbGVkKTsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9tYWMvUGFnZUNsaWVu dEltcGwubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1w bC5tbQppbmRleCBkMzIwM2ZmYzZhNTE4MTUzZjk3MWQ2YTk3ZWM4NzJkOTU0NGQ5MDYyLi43MGVj ZGI0OTQxYzRkNmE1YWIzOWVlOWJmYWU3ZjRjZjc4NTA3MGFhIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5tbQorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL21hYy9QYWdlQ2xpZW50SW1wbC5tbQpAQCAtMzYxLDcgKzM2 MSw3IEBAIEZsb2F0UmVjdCBQYWdlQ2xpZW50SW1wbDo6Y29udmVydFRvVXNlclNwYWNlKGNvbnN0 IEZsb2F0UmVjdCYgcmVjdCkKICAgICByZXR1cm4gW21fd2tWaWV3IF9jb252ZXJ0VG9Vc2VyU3Bh Y2U6cmVjdF07CiB9CiAgICAKLUludFBvaW50IFBhZ2VDbGllbnRJbXBsOjpzY3JlZW5Ub1dpbmRv dyhjb25zdCBJbnRQb2ludCYgcG9pbnQpCitJbnRQb2ludCBQYWdlQ2xpZW50SW1wbDo6c2NyZWVu VG9Sb290Vmlldyhjb25zdCBJbnRQb2ludCYgcG9pbnQpCiB7CiAjcHJhZ21hIGNsYW5nIGRpYWdu b3N0aWMgcHVzaAogI3ByYWdtYSBjbGFuZyBkaWFnbm9zdGljIGlnbm9yZWQgIi1XZGVwcmVjYXRl ZC1kZWNsYXJhdGlvbnMiCkBAIC0zNzAsNyArMzcwLDcgQEAgSW50UG9pbnQgUGFnZUNsaWVudElt cGw6OnNjcmVlblRvV2luZG93KGNvbnN0IEludFBvaW50JiBwb2ludCkKICAgICByZXR1cm4gSW50 UG9pbnQoW21fd2tWaWV3IGNvbnZlcnRQb2ludDp3aW5kb3dDb29yZCBmcm9tVmlldzpuaWxdKTsK IH0KICAgICAKLUludFJlY3QgUGFnZUNsaWVudEltcGw6OndpbmRvd1RvU2NyZWVuKGNvbnN0IElu dFJlY3QmIHJlY3QpCitJbnRSZWN0IFBhZ2VDbGllbnRJbXBsOjpyb290Vmlld1RvU2NyZWVuKGNv bnN0IEludFJlY3QmIHJlY3QpCiB7CiAgICAgTlNSZWN0IHRlbXBSZWN0ID0gcmVjdDsKICAgICB0 ZW1wUmVjdCA9IFttX3drVmlldyBjb252ZXJ0UmVjdDp0ZW1wUmVjdCB0b1ZpZXc6bmlsXTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNzL1dl YlZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3Mv V2ViVmlldy5jcHAKaW5kZXggM2NkNGNhOTgyMWE5NzlhZTViOTM5NjU2YjE3MDQ0NzlkODEyZTcz My4uNWQxNmU5NzE1ODFhZTU0NjcwMjA1ZDFlYmVkNjAwNmRmNGUyNDY3YyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV2ViVmlldy5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV2ViVmll dy5jcHAKQEAgLTQwNywxMyArNDA3LDEzIEBAIHZvaWQgV2ViVmlldzo6ZXhlY3V0ZVVuZG9SZWRv KFdlYlBhZ2VQcm94eTo6VW5kb09yUmVkbyB1bmRvT3JSZWRvKQogICAgIG1fdW5kb0NvbnRyb2xs ZXIuZXhlY3V0ZVVuZG9SZWRvKHVuZG9PclJlZG8pOwogfQogCi1JbnRQb2ludCBXZWJWaWV3Ojpz Y3JlZW5Ub1dpbmRvdyhjb25zdCBJbnRQb2ludCYgcG9pbnQpCitJbnRQb2ludCBXZWJWaWV3Ojpz Y3JlZW5Ub1Jvb3RWaWV3KGNvbnN0IEludFBvaW50JiBwb2ludCkKIHsKICAgICBub3RJbXBsZW1l bnRlZCgpOwogICAgIHJldHVybiBwb2ludDsKIH0KIAotSW50UmVjdCBXZWJWaWV3Ojp3aW5kb3dU b1NjcmVlbihjb25zdCBJbnRSZWN0JikKK0ludFJlY3QgV2ViVmlldzo6cm9vdFZpZXdUb1NjcmVl bihjb25zdCBJbnRSZWN0JikKIHsKICAgICBub3RJbXBsZW1lbnRlZCgpOwogICAgIHJldHVybiBJ bnRSZWN0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29vcmRpbmF0 ZWRHcmFwaGljcy9XZWJWaWV3LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQ29vcmRpbmF0 ZWRHcmFwaGljcy9XZWJWaWV3LmgKaW5kZXggNjNjNDI4YWY1NjFmOTExN2MwZWMwMGNjODI4OGE2 MTAxZmRmMTI3OC4uNzVmMDE5ZWYyYjg0M2RjMGRmMzQwMWQ3ZTdiMThmZDFkZWE0YWQ3NSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvV2Vi Vmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNz L1dlYlZpZXcuaApAQCAtMTY4LDggKzE2OCw4IEBAIHByb3RlY3RlZDoKIAogICAgIHZpcnR1YWwg V2ViQ29yZTo6RmxvYXRSZWN0IGNvbnZlcnRUb0RldmljZVNwYWNlKGNvbnN0IFdlYkNvcmU6OkZs b2F0UmVjdCYpIG92ZXJyaWRlOwogICAgIHZpcnR1YWwgV2ViQ29yZTo6RmxvYXRSZWN0IGNvbnZl cnRUb1VzZXJTcGFjZShjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmKSBvdmVycmlkZTsKLSAgICB2 aXJ0dWFsIFdlYkNvcmU6OkludFBvaW50IHNjcmVlblRvV2luZG93KGNvbnN0IFdlYkNvcmU6Oklu dFBvaW50Jikgb3ZlcnJpZGU7Ci0gICAgdmlydHVhbCBXZWJDb3JlOjpJbnRSZWN0IHdpbmRvd1Rv U2NyZWVuKGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIFdl YkNvcmU6OkludFBvaW50IHNjcmVlblRvUm9vdFZpZXcoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQm KSBvdmVycmlkZTsKKyAgICB2aXJ0dWFsIFdlYkNvcmU6OkludFJlY3Qgcm9vdFZpZXdUb1NjcmVl bihjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jikgb3ZlcnJpZGU7CiAKICAgICB2aXJ0dWFsIHZvaWQg dXBkYXRlVGV4dElucHV0U3RhdGUoKSBvdmVycmlkZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Q YWdlQ2xpZW50LmgKaW5kZXggZWM3MmFjMzZiM2JhNTQ1MzE5OTFjMDJlODhhOTczN2I2NTIwMTg4 ZS4uOGNkM2Q5MDJjNGE4M2YyNjUxMGQwNGE4YTg5NGVhZTMxYTgzMzMyMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BhZ2VDbGllbnQuaAorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvUGFnZUNsaWVudC5oCkBAIC0xOTIsOCArMTkyLDggQEAgcHVibGljOgogI2Vu ZGlmCiAgICAgdmlydHVhbCBXZWJDb3JlOjpGbG9hdFJlY3QgY29udmVydFRvRGV2aWNlU3BhY2Uo Y29uc3QgV2ViQ29yZTo6RmxvYXRSZWN0JikgPSAwOwogICAgIHZpcnR1YWwgV2ViQ29yZTo6Rmxv YXRSZWN0IGNvbnZlcnRUb1VzZXJTcGFjZShjb25zdCBXZWJDb3JlOjpGbG9hdFJlY3QmKSA9IDA7 Ci0gICAgdmlydHVhbCBXZWJDb3JlOjpJbnRQb2ludCBzY3JlZW5Ub1dpbmRvdyhjb25zdCBXZWJD b3JlOjpJbnRQb2ludCYpID0gMDsKLSAgICB2aXJ0dWFsIFdlYkNvcmU6OkludFJlY3Qgd2luZG93 VG9TY3JlZW4oY29uc3QgV2ViQ29yZTo6SW50UmVjdCYpID0gMDsKKyAgICB2aXJ0dWFsIFdlYkNv cmU6OkludFBvaW50IHNjcmVlblRvUm9vdFZpZXcoY29uc3QgV2ViQ29yZTo6SW50UG9pbnQmKSA9 IDA7CisgICAgdmlydHVhbCBXZWJDb3JlOjpJbnRSZWN0IHJvb3RWaWV3VG9TY3JlZW4oY29uc3Qg V2ViQ29yZTo6SW50UmVjdCYpID0gMDsKICAgICAKICAgICB2aXJ0dWFsIHZvaWQgZG9uZVdpdGhL ZXlFdmVudChjb25zdCBOYXRpdmVXZWJLZXlib2FyZEV2ZW50JiwgYm9vbCB3YXNFdmVudEhhbmRs ZWQpID0gMDsKICNpZiBFTkFCTEUoVE9VQ0hfRVZFTlRTKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUGFnZVByb3h5LmNwcAppbmRleCBjM2I2ZjlmM2ExYmIzZDk1ZDlmZTU5ZjBkZTFiYjgw YzgyNWNlMDRhLi45YWRkZjlhZmViY2I0NWZjYzVkYWU0NmM4ZTI5MDU1Y2U4NmY4ODVhIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtMjc5MCwxNCArMjc5 MCwxNCBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6Z2V0V2luZG93RnJhbWUoRmxvYXRSZWN0JiBuZXdX aW5kb3dGcmFtZSkKICAgICBuZXdXaW5kb3dGcmFtZSA9IG1fcGFnZUNsaWVudC5jb252ZXJ0VG9V c2VyU3BhY2UobV91aUNsaWVudC0+d2luZG93RnJhbWUodGhpcykpOwogfQogICAgIAotdm9pZCBX ZWJQYWdlUHJveHk6OnNjcmVlblRvV2luZG93KGNvbnN0IEludFBvaW50JiBzY3JlZW5Qb2ludCwg SW50UG9pbnQmIHdpbmRvd1BvaW50KQordm9pZCBXZWJQYWdlUHJveHk6OnNjcmVlblRvUm9vdFZp ZXcoY29uc3QgSW50UG9pbnQmIHNjcmVlblBvaW50LCBJbnRQb2ludCYgd2luZG93UG9pbnQpCiB7 Ci0gICAgd2luZG93UG9pbnQgPSBtX3BhZ2VDbGllbnQuc2NyZWVuVG9XaW5kb3coc2NyZWVuUG9p bnQpOworICAgIHdpbmRvd1BvaW50ID0gbV9wYWdlQ2xpZW50LnNjcmVlblRvUm9vdFZpZXcoc2Ny ZWVuUG9pbnQpOwogfQogICAgIAotdm9pZCBXZWJQYWdlUHJveHk6OndpbmRvd1RvU2NyZWVuKGNv bnN0IEludFJlY3QmIHZpZXdSZWN0LCBJbnRSZWN0JiByZXN1bHQpCit2b2lkIFdlYlBhZ2VQcm94 eTo6cm9vdFZpZXdUb1NjcmVlbihjb25zdCBJbnRSZWN0JiB2aWV3UmVjdCwgSW50UmVjdCYgcmVz dWx0KQogewotICAgIHJlc3VsdCA9IG1fcGFnZUNsaWVudC53aW5kb3dUb1NjcmVlbih2aWV3UmVj dCk7CisgICAgcmVzdWx0ID0gbV9wYWdlQ2xpZW50LnJvb3RWaWV3VG9TY3JlZW4odmlld1JlY3Qp OwogfQogICAgIAogdm9pZCBXZWJQYWdlUHJveHk6OnJ1bkJlZm9yZVVubG9hZENvbmZpcm1QYW5l bChjb25zdCBTdHJpbmcmIG1lc3NhZ2UsIHVpbnQ2NF90IGZyYW1lSUQsIGJvb2wmIHNob3VsZENs b3NlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmluZGV4IDY5MjBlOTI2 MzMwZGM1YzI3YjgwZWM1ZWQ0MjgwNDZmNGY5Y2VlY2YuLjIwMjU2OGMyNzQwZjAxMTFmM2VmZWIw MmIxM2RiZGFkNzA2YWM3YzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5 LmgKQEAgLTk3Niw4ICs5NzYsOCBAQCBwcml2YXRlOgogICAgIHZvaWQgZ2V0SXNSZXNpemFibGUo Ym9vbCYgaXNSZXNpemFibGUpOwogICAgIHZvaWQgc2V0V2luZG93RnJhbWUoY29uc3QgV2ViQ29y ZTo6RmxvYXRSZWN0Jik7CiAgICAgdm9pZCBnZXRXaW5kb3dGcmFtZShXZWJDb3JlOjpGbG9hdFJl Y3QmKTsKLSAgICB2b2lkIHNjcmVlblRvV2luZG93KGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBz Y3JlZW5Qb2ludCwgV2ViQ29yZTo6SW50UG9pbnQmIHdpbmRvd1BvaW50KTsKLSAgICB2b2lkIHdp bmRvd1RvU2NyZWVuKGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHZpZXdSZWN0LCBXZWJDb3JlOjpJ bnRSZWN0JiByZXN1bHQpOworICAgIHZvaWQgc2NyZWVuVG9Sb290Vmlldyhjb25zdCBXZWJDb3Jl OjpJbnRQb2ludCYgc2NyZWVuUG9pbnQsIFdlYkNvcmU6OkludFBvaW50JiB3aW5kb3dQb2ludCk7 CisgICAgdm9pZCByb290Vmlld1RvU2NyZWVuKGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIHZpZXdS ZWN0LCBXZWJDb3JlOjpJbnRSZWN0JiByZXN1bHQpOwogICAgIHZvaWQgcnVuQmVmb3JlVW5sb2Fk Q29uZmlybVBhbmVsKGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgdWludDY0X3QgZnJhbWVJRCwgYm9v bCYgc2hvdWxkQ2xvc2UpOwogICAgIHZvaWQgZGlkQ2hhbmdlVmlld3BvcnRQcm9wZXJ0aWVzKGNv bnN0IFdlYkNvcmU6OlZpZXdwb3J0QXR0cmlidXRlcyYpOwogICAgIHZvaWQgcGFnZURpZFNjcm9s bCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5t ZXNzYWdlcy5pbiBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2Fn ZXMuaW4KaW5kZXggOTIwMTAxNTYxZmYzMDFjYjFjMzI0OGViNmYyMTcwMzdhMzZkYjJkOS4uMmRi ODk1ZjQwYzhlODIzZWJmNzVjZmJiN2IxZjcwOTA3ZGQwNzM2MiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgorKysgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCkBAIC02MCw4ICs2MCw4 IEBAIG1lc3NhZ2VzIC0+IFdlYlBhZ2VQcm94eSB7CiAgICAgR2V0SXNSZXNpemFibGUoKSAtPiAo Ym9vbCBpc1Jlc2l6YWJsZSkKICAgICBTZXRXaW5kb3dGcmFtZShXZWJDb3JlOjpGbG9hdFJlY3Qg d2luZG93RnJhbWUpCiAgICAgR2V0V2luZG93RnJhbWUoKSAtPiAoV2ViQ29yZTo6RmxvYXRSZWN0 IHdpbmRvd0ZyYW1lKQotICAgIFNjcmVlblRvV2luZG93KFdlYkNvcmU6OkludFBvaW50IHNjcmVl blBvaW50KSAtPiAoV2ViQ29yZTo6SW50UG9pbnQgd2luZG93UG9pbnQpCi0gICAgV2luZG93VG9T Y3JlZW4oV2ViQ29yZTo6SW50UmVjdCByZWN0KSAtPiAoV2ViQ29yZTo6SW50UmVjdCBzY3JlZW5G cmFtZSkKKyAgICBTY3JlZW5Ub1Jvb3RWaWV3KFdlYkNvcmU6OkludFBvaW50IHNjcmVlblBvaW50 KSAtPiAoV2ViQ29yZTo6SW50UG9pbnQgd2luZG93UG9pbnQpCisgICAgUm9vdFZpZXdUb1NjcmVl bihXZWJDb3JlOjpJbnRSZWN0IHJlY3QpIC0+IChXZWJDb3JlOjpJbnRSZWN0IHNjcmVlbkZyYW1l KQogICAgIFJ1bkJlZm9yZVVubG9hZENvbmZpcm1QYW5lbChTdHJpbmcgbWVzc2FnZSwgdWludDY0 X3QgZnJhbWVJRCkgLT4gKGJvb2wgc2hvdWxkQ2xvc2UpCiAgICAgUGFnZURpZFNjcm9sbCgpCiAg ICAgUnVuT3BlblBhbmVsKHVpbnQ2NF90IGZyYW1lSUQsIFdlYkNvcmU6OkZpbGVDaG9vc2VyU2V0 dGluZ3MgcGFyYW1ldGVycykKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAppbmRleCAzN2IzYzVkZWM0 NGJiNTljZWUwOWJjOGYwMmRjOGVhMjllYzg2ZWNlLi5lNDQ5MGM5OTQxZmE4OWM0NjQ4MTc4MmRl NjU2ODE5ZjI3MTQxZWRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dl YkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCkBAIC00NzIsMTIgKzQ3 MiwxMiBAQCB2b2lkIFdlYkNocm9tZUNsaWVudDo6ZGVsZWdhdGVkU2Nyb2xsUmVxdWVzdGVkKGNv bnN0IEludFBvaW50JiBzY3JvbGxPZmZzZXQpCiAKIEludFBvaW50IFdlYkNocm9tZUNsaWVudDo6 c2NyZWVuVG9Sb290Vmlldyhjb25zdCBJbnRQb2ludCYgcG9pbnQpIGNvbnN0CiB7Ci0gICAgcmV0 dXJuIG1fcGFnZS0+c2NyZWVuVG9XaW5kb3cocG9pbnQpOworICAgIHJldHVybiBtX3BhZ2UtPnNj cmVlblRvUm9vdFZpZXcocG9pbnQpOwogfQogCiBJbnRSZWN0IFdlYkNocm9tZUNsaWVudDo6cm9v dFZpZXdUb1NjcmVlbihjb25zdCBJbnRSZWN0JiByZWN0KSBjb25zdAogewotICAgIHJldHVybiBt X3BhZ2UtPndpbmRvd1RvU2NyZWVuKHJlY3QpOworICAgIHJldHVybiBtX3BhZ2UtPnJvb3RWaWV3 VG9TY3JlZW4ocmVjdCk7CiB9CiAKIFBsYXRmb3JtUGFnZUNsaWVudCBXZWJDaHJvbWVDbGllbnQ6 OnBsYXRmb3JtUGFnZUNsaWVudCgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggNjljNWE4ZTk1MTczNGVmMmJjZTQ3MmRiNjBjZjVj ZTg2MTQ5OTBkMy4uZDJhOTZhMDRjZWNmZjczYmNkZGE2Njc2YjEzYzRkMTA4ZmI4NDFiOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtMjE2 MywxNyArMjE2MywxNyBAQCB2b2lkIFdlYlBhZ2U6OnJlc3VtZUFjdGl2ZURPTU9iamVjdHNBbmRB bmltYXRpb25zKCkKICAgICBtX3BhZ2UtPnJlc3VtZUFjdGl2ZURPTU9iamVjdHNBbmRBbmltYXRp b25zKCk7CiB9CiAKLUludFBvaW50IFdlYlBhZ2U6OnNjcmVlblRvV2luZG93KGNvbnN0IEludFBv aW50JiBwb2ludCkKK0ludFBvaW50IFdlYlBhZ2U6OnNjcmVlblRvUm9vdFZpZXcoY29uc3QgSW50 UG9pbnQmIHBvaW50KQogewogICAgIEludFBvaW50IHdpbmRvd1BvaW50OwotICAgIHNlbmRTeW5j KE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlNjcmVlblRvV2luZG93KHBvaW50KSwgTWVzc2FnZXM6 OldlYlBhZ2VQcm94eTo6U2NyZWVuVG9XaW5kb3c6OlJlcGx5KHdpbmRvd1BvaW50KSk7CisgICAg c2VuZFN5bmMoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6U2NyZWVuVG9Sb290Vmlldyhwb2ludCks IE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlNjcmVlblRvUm9vdFZpZXc6OlJlcGx5KHdpbmRvd1Bv aW50KSk7CiAgICAgcmV0dXJuIHdpbmRvd1BvaW50OwogfQogICAgIAotSW50UmVjdCBXZWJQYWdl Ojp3aW5kb3dUb1NjcmVlbihjb25zdCBJbnRSZWN0JiByZWN0KQorSW50UmVjdCBXZWJQYWdlOjpy b290Vmlld1RvU2NyZWVuKGNvbnN0IEludFJlY3QmIHJlY3QpCiB7CiAgICAgSW50UmVjdCBzY3Jl ZW5SZWN0OwotICAgIHNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OldpbmRvd1RvU2Ny ZWVuKHJlY3QpLCBNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpXaW5kb3dUb1NjcmVlbjo6UmVwbHko c2NyZWVuUmVjdCkpOworICAgIHNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlJvb3RW aWV3VG9TY3JlZW4ocmVjdCksIE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OlJvb3RWaWV3VG9TY3Jl ZW46OlJlcGx5KHNjcmVlblJlY3QpKTsKICAgICByZXR1cm4gc2NyZWVuUmVjdDsKIH0KIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKaW5kZXggMDljNzE4MTlm MzMyMGIwNjUxNmQ3M2JiY2NjYWIwMWE5NDcxMjI5ZS4uNDdhMTMwNWE3Nzk4YzQzMDcxNmZmODA5 YTg4YzczMzM4ZTIzNWQ0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9X ZWJQYWdlL1dlYlBhZ2UuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5oCkBAIC00MDQsOCArNDA0LDggQEAgcHVibGljOgogICAgIHZvaWQgc2hvd1BhZ2VC YW5uZXJzKCk7CiAjZW5kaWYgLy8gIVBMQVRGT1JNKElPUykKIAotICAgIFdlYkNvcmU6OkludFBv aW50IHNjcmVlblRvV2luZG93KGNvbnN0IFdlYkNvcmU6OkludFBvaW50Jik7Ci0gICAgV2ViQ29y ZTo6SW50UmVjdCB3aW5kb3dUb1NjcmVlbihjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7CisgICAg V2ViQ29yZTo6SW50UG9pbnQgc2NyZWVuVG9Sb290Vmlldyhjb25zdCBXZWJDb3JlOjpJbnRQb2lu dCYpOworICAgIFdlYkNvcmU6OkludFJlY3Qgcm9vdFZpZXdUb1NjcmVlbihjb25zdCBXZWJDb3Jl OjpJbnRSZWN0Jik7CiAKICAgICBQYXNzUmVmUHRyPFdlYkltYWdlPiBzY2FsZWRTbmFwc2hvdFdp dGhPcHRpb25zKGNvbnN0IFdlYkNvcmU6OkludFJlY3QmLCBkb3VibGUgc2NhbGVGYWN0b3IsIFNu YXBzaG90T3B0aW9ucyk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv V2ViUGFnZS9tYWMvV0tBY2Nlc3NpYmlsaXR5V2ViUGFnZU9iamVjdC5tbSBiL1NvdXJjZS9XZWJL aXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV0tBY2Nlc3NpYmlsaXR5V2ViUGFnZU9iamVjdC5t bQppbmRleCA4NjE2ZTY5MmU2NTliOTc2NTcwMTNhYzExODJiNWU4MTg0NDE1ZmYxLi4xYjYwYzdl ZGFlMjk4ZTI4MjE1YWFjN2Y1ZjBkMzM5ZDhjZDdjMzg5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1dLQWNjZXNzaWJpbGl0eVdlYlBhZ2VPYmplY3Qu bW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9XS0FjY2Vzc2li aWxpdHlXZWJQYWdlT2JqZWN0Lm1tCkBAIC0xODgsOSArMTg4LDkgQEAgdXNpbmcgbmFtZXNwYWNl IFdlYktpdDsKICAgICByZXR1cm4gbmlsOwogfQogCi0tIChOU1BvaW50KV9jb252ZXJ0U2NyZWVu UG9pbnRUb1dpbmRvdzooTlNQb2ludClwb2ludAorLSAoTlNQb2ludClfY29udmVydFNjcmVlblBv aW50VG9Sb290VmlldzooTlNQb2ludClwb2ludAogewotICAgIHJldHVybiBtX3BhZ2UtPnNjcmVl blRvV2luZG93KEludFBvaW50KHBvaW50LngsIHBvaW50LnkpKTsKKyAgICByZXR1cm4gbV9wYWdl LT5zY3JlZW5Ub1Jvb3RWaWV3KEludFBvaW50KHBvaW50LngsIHBvaW50LnkpKTsKIH0KIAogLSAo aWQpYWNjZXNzaWJpbGl0eUF0dHJpYnV0ZVZhbHVlOihOU1N0cmluZyAqKWF0dHJpYnV0ZSBmb3JQ YXJhbWV0ZXI6KGlkKXBhcmFtZXRlcgpAQCAtMTk4LDcgKzE5OCw3IEBAIHVzaW5nIG5hbWVzcGFj ZSBXZWJLaXQ7CiAgICAgV0tSZXRhaW5QdHI8V0tUeXBlUmVmPiBwYWdlT3ZlcmxheVBhcmFtZXRl ciA9IDA7CiAgICAgCiAgICAgaWYgKFtwYXJhbWV0ZXIgaXNLaW5kT2ZDbGFzczpbTlNWYWx1ZSBj bGFzc11dICYmIHN0cmNtcChbKE5TVmFsdWUqKXBhcmFtZXRlciBvYmpDVHlwZV0sIEBlbmNvZGUo TlNQb2ludCkpID09IDApIHsKLSAgICAgICAgTlNQb2ludCBwb2ludCA9IFtzZWxmIF9jb252ZXJ0 U2NyZWVuUG9pbnRUb1dpbmRvdzpbKE5TVmFsdWUgKilwYXJhbWV0ZXIgcG9pbnRWYWx1ZV1dOwor ICAgICAgICBOU1BvaW50IHBvaW50ID0gW3NlbGYgX2NvbnZlcnRTY3JlZW5Qb2ludFRvUm9vdFZp ZXc6WyhOU1ZhbHVlICopcGFyYW1ldGVyIHBvaW50VmFsdWVdXTsKICAgICAgICAgcGFnZU92ZXJs YXlQYXJhbWV0ZXIgPSBXS1BvaW50Q3JlYXRlKFdLUG9pbnRNYWtlKHBvaW50LngsIHBvaW50Lnkp KTsKICAgICB9CiAgICAgCg==