133490 2014-06-03 14:52:26 -0700 [iOS][WK2] Restore the visual scroll position instead of the dom scroll position when restoring states from the history 2014-06-04 16:41:48 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 benjamin benjamin commit-queue japhet oldest_to_newest 1013151 0 benjamin 2014-06-03 14:52:26 -0700 [iOS][WK2] Restore the visual scroll position instead of the dom scroll position when restoring states from the history 1013154 1 232441 benjamin 2014-06-03 15:00:55 -0700 Created attachment 232441 Patch 1013161 2 benjamin 2014-06-03 15:19:05 -0700 <rdar://problem/16877859> 1013402 3 232441 thorton 2014-06-04 15:47:55 -0700 Comment on attachment 232441 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=232441&action=review > Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm:156 > + // FIXME: ideally, we should sync this with the UIProcess. We should not try to change the position if the user is interaction s/interaction/interacting/ 1013408 4 benjamin 2014-06-04 16:41:48 -0700 Committed r169603: <http://trac.webkit.org/changeset/169603> 232441 2014-06-03 15:00:55 -0700 2014-06-04 15:47:55 -0700 Patch bug-133490-20140603145953.patch text/plain 11642 benjamin U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5NTQ5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGFiM2NkODI3NjJkNDhi NTI5NGJmNDY5NDc1MmRkZThmODhhZDdkYi4uNmIwZTNhZDI4M2Q5MTY5NWUwN2E3NmE2YzYwYTQ1 ODY5NDk3NzdhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDE0LTA2LTAzICBCZW5q YW1pbiBQb3VsYWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdW1dLMl0g UmVzdG9yZSB0aGUgdmlzdWFsIHNjcm9sbCBwb3NpdGlvbiBpbnN0ZWFkIG9mIHRoZSBkb20gc2Ny b2xsIHBvc2l0aW9uIHdoZW4gcmVzdG9yaW5nIHN0YXRlcyBmcm9tIHRoZSBoaXN0b3J5CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzM0OTAKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBFeHBvc2UgdGhlIFdl YktpdDEgcGFyYW1ldGVyICJTY2FsZUlzSW5pdGlhbCIuIEl0IGlzIHVzZWQgZm9yIGEgc2ltaWxh ciBjb25jZXB0IGluIFdlYktpdDIgKHVzZXJIYXNDaGFuZ2VkUGFnZVNjYWxlRmFjdG9yKS4KKwor ICAgICAgICBBZGQgImV4cG9zZWRDb250ZW50UG9zaXRpb24iLCB3aGljaCBpcyB0aGUgc2Nyb2xs IHBvc2l0aW9uIG9mIHRoZSBleHBvc2VkIHJlY3QuCisKKyAgICAgICAgKiBoaXN0b3J5L0hpc3Rv cnlJdGVtLmg6CisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5SXRlbTo6ZXhwb3NlZENvbnRlbnRQ b3NpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5SXRlbTo6c2V0RXhwb3NlZENvbnRl bnRQb3NpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5SXRlbTo6c2V0U2NhbGVJc0lu aXRpYWwpOgorICAgICAgICAqIGxvYWRlci9IaXN0b3J5Q29udHJvbGxlci5jcHA6CisgICAgICAg IChXZWJDb3JlOjpIaXN0b3J5Q29udHJvbGxlcjo6c2F2ZVNjcm9sbFBvc2l0aW9uQW5kVmlld1N0 YXRlVG9JdGVtKToKKwogMjAxNC0wNi0wMiAgQmVuamFtaW4gUG91bGFpbiAgPGJwb3VsYWluQGFw cGxlLmNvbT4KIAogICAgICAgICBbaU9TXVtXSzJdIEFsaWduIHRoZSBoaWdobGlnaHQgcmVjdHMg d2l0aCBkZXZpY2UgcGl4ZWxzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cg Yi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYjA1N2VmMjQ1YzMzZTYzNDg3MDUwOWRi ZDNlMGE5NDQyNzBhN2Y0Zi4uZjM1MmUwODlhMjdmMDljNDBmMThlZWMyMDlhMjk4NWRlNmE2Zjk4 YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJL aXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDE0LTA2LTAzICBCZW5qYW1pbiBQb3Vs YWluICA8YnBvdWxhaW5AYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdW1dLMl0gUmVzdG9yZSB0 aGUgdmlzdWFsIHNjcm9sbCBwb3NpdGlvbiBpbnN0ZWFkIG9mIHRoZSBkb20gc2Nyb2xsIHBvc2l0 aW9uIHdoZW4gcmVzdG9yaW5nIHN0YXRlcyBmcm9tIHRoZSBoaXN0b3J5CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMzM0OTAKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbnN0ZWFkIG9mIHJlc3RvcmluZyB0 aGUgc2Nyb2xsIHBvc2l0aW9uLCByZXN0b3JlIHRoZSB2aXN1YWwgcG9zaXRpb24uIFRoaXMgbWFr ZXMgcGFnZXMgYXBwZWFyIGF0IHRoZSBzYW1lIHBvc2l0aW9uCisgICAgICAgIG9uIHNjcmVlbiBp Z25vcmluZyBjaGFuZ2VzIGluIHRoZSBvYnNjdXJlZCB0b3AgaW5zZXQuCisKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcDoKKyAgICAg ICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L2lvcy9XZWJGcmFtZUxvYWRlckNsaWVudElP Uy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVMb2FkZXJDbGllbnQ6OnNhdmVWaWV3U3Rh dGVUb0l0ZW0pOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUxvYWRlckNsaWVudDo6cmVzdG9y ZVZpZXdTdGF0ZSk6CisgICAgICAgIFNhdmUgYW5kIHJlc3RvcmUgdXNlckhhc0NoYW5nZWRQYWdl U2NhbGVGYWN0b3IgdG8gaGFuZGxlIHJlc2NhbGluZyBjb3JyZWN0bHkuCisgICAgICAgIExpbWl0 IHRoZSBzY2FsZSBpbnRvIHZhbGlkIHZpZXdwb3J0IGxpbWl0cyBpbiBjYXNlIHRoZSB2aWV3cG9y dCBtZXRhIHRhZyBoYXMgY2hhbmdlZCBvciB0aGUgZGV2aWNlIGhhcyByb3RhdGVkLgorCisgICAg ICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlOjpXZWJQYWdlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5o OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjp1c2VySGFzQ2hhbmdlZFBhZ2VTY2FsZUZhY3Rv cik6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlOjpyZXN0b3JlUGFnZVN0YXRlKToKKyAgICAgICAgKFdlYktp dDo6V2ViUGFnZTo6dXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0cyk6CisgICAgICAgIEluIHVwZGF0 ZVZpc2libGVDb250ZW50UmVjdHMsIHdlIGtlZXAgdHJhY2sgb3IgdGhlIGN1cnJlbnQgZGlmZmVy ZW5jZSBiZXR3ZWVuIHRoZSBleHBvc2VkIHJlY3QgYW5kIHRoZSB1bm9ic2N1cmVkIHJlY3QuCisg ICAgICAgIFdoZW4gcmVzdG9yaW5nIHRoZSBwYWdlIHBvc2l0aW9uLCB3ZSB1c2UgdGhlIGN1cnJl bnQgdG9wIGluc2V0IGFuZCB0aGUgc2F2ZWQgZXhwb3NlZCByZWN0IHRvIHJlc3RvcmUgdGhlIHZp c3VhbAorICAgICAgICBzY3JvbGwgcG9zaXRpb24uCisKKyAgICAgICAgSXQgaXMgbm90IHZlcnkg cm9idXN0IGFzIGl0IGRvZXMgbm90IHJlc29sdmUgcmFjZXMgYmV0d2VlbiB0aGUgdHdvIHByb2Nl c3NlcywgYnV0IHRoYXQgaXMgbm90IHdvcnNlIHRoYW4gd2hhdCB3ZSBpcyB0aGVyZSBub3cuCisK IDIwMTQtMDYtMDIgIEJlbmphbWluIFBvdWxhaW4gIDxicG91bGFpbkBhcHBsZS5jb20+CiAKICAg ICAgICAgW2lPU11bV0syXSBBbGlnbiB0aGUgaGlnaGxpZ2h0IHJlY3RzIHdpdGggZGV2aWNlIHBp eGVscwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9IaXN0b3J5SXRlbS5oIGIv U291cmNlL1dlYkNvcmUvaGlzdG9yeS9IaXN0b3J5SXRlbS5oCmluZGV4IGY2NWJkN2M1NzJmMjBl NWU2ZDA0NGJkZGI5ZWMzNGFmNDk4Y2Y0NDcuLjk1YjBjMGVlZmMxOWFiZjE5ZWVkZDQwODNjNTcw MzM1ZmMzNTMzNTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0 ZW0uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0hpc3RvcnlJdGVtLmgKQEAgLTE4MCw4 ICsxODAsMTIgQEAgcHVibGljOgogI2VuZGlmCiAKICNpZiBQTEFURk9STShJT1MpCisgICAgSW50 UG9pbnQgZXhwb3NlZENvbnRlbnRQb3NpdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fZXhwb3NlZENv bnRlbnRQb3NpdGlvbjsgfQorICAgIHZvaWQgc2V0RXhwb3NlZENvbnRlbnRQb3NpdGlvbihJbnRQ b2ludCBleHBvc2VkQ29udGVudFBvc2l0aW9uKSB7IG1fZXhwb3NlZENvbnRlbnRQb3NpdGlvbiA9 IGV4cG9zZWRDb250ZW50UG9zaXRpb247IH0KKwogICAgIGZsb2F0IHNjYWxlKCkgY29uc3QgeyBy ZXR1cm4gbV9zY2FsZTsgfQogICAgIGJvb2wgc2NhbGVJc0luaXRpYWwoKSBjb25zdCB7IHJldHVy biBtX3NjYWxlSXNJbml0aWFsOyB9CisgICAgdm9pZCBzZXRTY2FsZUlzSW5pdGlhbChib29sIHNj YWxlSXNJbml0aWFsKSB7IG1fc2NhbGVJc0luaXRpYWwgPSBzY2FsZUlzSW5pdGlhbDsgfQogICAg IHZvaWQgc2V0U2NhbGUoZmxvYXQgbmV3U2NhbGUsIGJvb2wgaXNJbml0aWFsKQogICAgIHsKICAg ICAgICAgbV9zY2FsZSA9IG5ld1NjYWxlOwpAQCAtMjU1LDYgKzI1OSw3IEBAIHByaXZhdGU6CiAg ICAgc3RkOjp1bmlxdWVfcHRyPENhY2hlZFBhZ2U+IG1fY2FjaGVkUGFnZTsKIAogI2lmIFBMQVRG T1JNKElPUykKKyAgICBJbnRQb2ludCBtX2V4cG9zZWRDb250ZW50UG9zaXRpb247CiAgICAgZmxv YXQgbV9zY2FsZTsKICAgICBib29sIG1fc2NhbGVJc0luaXRpYWw7CiAgICAgVmlld3BvcnRBcmd1 bWVudHMgbV92aWV3cG9ydEFyZ3VtZW50czsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xv YWRlci9IaXN0b3J5Q29udHJvbGxlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSGlzdG9y eUNvbnRyb2xsZXIuY3BwCmluZGV4IDg0NjJjNWYwYWZlNGFmOWRiZWNlZDRmNDkzOGE2MWNkMzMz YzVjY2QuLmU4MmU3ZDFlZmNjNzZhNmY4OWFhYjRiOTM5M2MwNzU3N2I0MmM0MzcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9IaXN0b3J5Q29udHJvbGxlci5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvbG9hZGVyL0hpc3RvcnlDb250cm9sbGVyLmNwcApAQCAtNzgsNiArNzgsOSBA QCB2b2lkIEhpc3RvcnlDb250cm9sbGVyOjpzYXZlU2Nyb2xsUG9zaXRpb25BbmRWaWV3U3RhdGVU b0l0ZW0oSGlzdG9yeUl0ZW0qIGl0ZW0pCiAgICAgICAgIGl0ZW0tPnNldFNjcm9sbFBvaW50KG1f ZnJhbWUudmlldygpLT5jYWNoZWRTY3JvbGxQb3NpdGlvbigpKTsKICAgICBlbHNlCiAgICAgICAg IGl0ZW0tPnNldFNjcm9sbFBvaW50KG1fZnJhbWUudmlldygpLT5zY3JvbGxQb3NpdGlvbigpKTsK KyNpZiBQTEFURk9STShJT1MpCisgICAgaXRlbS0+c2V0RXhwb3NlZENvbnRlbnRQb3NpdGlvbiht X2ZyYW1lLnZpZXcoKS0+ZXhwb3NlZENvbnRlbnRSZWN0KCkubG9jYXRpb24oKSk7CisjZW5kaWYK IAogICAgIFBhZ2UqIHBhZ2UgPSBtX2ZyYW1lLnBhZ2UoKTsKICAgICBpZiAocGFnZSAmJiBtX2Zy YW1lLmlzTWFpbkZyYW1lKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYkNvcmVTdXBwb3J0L1dlYkZyYW1lTG9hZGVyQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCmluZGV4 IDMyNzRjMjA1YzRhYjFjNGIyNWZlOGI4MDMzNGEwYjUyMGVkM2IwNWYuLjBjMzZmOTU0YjI0NTYz MzBhNWU0OTc1N2M0NThlNGQyN2RhNGFlM2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGll bnQuY3BwCkBAIC0xMTE5LDEyICsxMTE5LDEyIEBAIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6 OmZyYW1lTG9hZENvbXBsZXRlZCgpCiAgICAgfQogfQogCisjaWYgIVBMQVRGT1JNKElPUykKIHZv aWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6OnNhdmVWaWV3U3RhdGVUb0l0ZW0oSGlzdG9yeUl0ZW0q KQogewogICAgIG5vdEltcGxlbWVudGVkKCk7CiB9CiAKLSNpZiAhUExBVEZPUk0oSU9TKQogdm9p ZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6cmVzdG9yZVZpZXdTdGF0ZSgpCiB7CiAgICAgLy8gSW5m b3JtIHRoZSBVSSBwcm9jZXNzIG9mIHRoZSBzY2FsZSBmYWN0b3IuCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L2lvcy9XZWJGcmFtZUxvYWRlckNs aWVudElPUy5tbSBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvaW9z L1dlYkZyYW1lTG9hZGVyQ2xpZW50SU9TLm1tCmluZGV4IDUwYzI3MDFmN2VkMDgwZjBmMTViMjdm NDhjODE5ZjAwMWUyYjA1ODEuLmZmM2Q5MTUzZmMyYWZjYTFhNDE1ZmM0NjY0ODJkYjkxZWUxZTlh NTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQv aW9zL1dlYkZyYW1lTG9hZGVyQ2xpZW50SU9TLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlBy b2Nlc3MvV2ViQ29yZVN1cHBvcnQvaW9zL1dlYkZyYW1lTG9hZGVyQ2xpZW50SU9TLm1tCkBAIC03 OSwxOCArNzksMjEgQEAgdm9pZCBXZWJGcmFtZUxvYWRlckNsaWVudDo6ZGlkQ3JlYXRlUXVpY2tM b29rSGFuZGxlKFdlYkNvcmU6OlF1aWNrTG9va0hhbmRsZSYgaGEKIH0KICNlbmRpZgogCit2b2lk IFdlYkZyYW1lTG9hZGVyQ2xpZW50OjpzYXZlVmlld1N0YXRlVG9JdGVtKEhpc3RvcnlJdGVtKiBo aXN0b3J5SXRlbSkKK3sKKyAgICBpZiAobV9mcmFtZS0+aXNNYWluRnJhbWUoKSkKKyAgICAgICAg aGlzdG9yeUl0ZW0tPnNldFNjYWxlSXNJbml0aWFsKG1fZnJhbWUtPnBhZ2UoKS0+dXNlckhhc0No YW5nZWRQYWdlU2NhbGVGYWN0b3IoKSk7Cit9CisKIHZvaWQgV2ViRnJhbWVMb2FkZXJDbGllbnQ6 OnJlc3RvcmVWaWV3U3RhdGUoKQogewogICAgIEZyYW1lJiBmcmFtZSA9ICptX2ZyYW1lLT5jb3Jl RnJhbWUoKTsKICAgICBIaXN0b3J5SXRlbSogY3VycmVudEl0ZW0gPSBmcmFtZS5sb2FkZXIoKS5o aXN0b3J5KCkuY3VycmVudEl0ZW0oKTsKICAgICBpZiAoRnJhbWVWaWV3KiB2aWV3ID0gZnJhbWUu dmlldygpKSB7Ci0gICAgICAgIFBhZ2UqIHBhZ2UgPSBmcmFtZS5wYWdlKCk7Ci0gICAgICAgIGlm ICghdmlldy0+d2FzU2Nyb2xsZWRCeVVzZXIoKSkgewotICAgICAgICAgICAgaWYgKHBhZ2UgJiYg bV9mcmFtZS0+aXNNYWluRnJhbWUoKSAmJiBjdXJyZW50SXRlbS0+cGFnZVNjYWxlRmFjdG9yKCkp Ci0gICAgICAgICAgICAgICAgbV9mcmFtZS0+cGFnZSgpLT5yZXN0b3JlUGFnZVN0YXRlKGN1cnJl bnRJdGVtLT5wYWdlU2NhbGVGYWN0b3IoKSwgY3VycmVudEl0ZW0tPnNjcm9sbFBvaW50KCkpOwot ICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgIHZpZXctPnNldFNjcm9sbFBvc2l0aW9u KGN1cnJlbnRJdGVtLT5zY3JvbGxQb2ludCgpKTsKLSAgICAgICAgfQorICAgICAgICBpZiAobV9m cmFtZS0+aXNNYWluRnJhbWUoKSAmJiBjdXJyZW50SXRlbS0+cGFnZVNjYWxlRmFjdG9yKCkpCisg ICAgICAgICAgICBtX2ZyYW1lLT5wYWdlKCktPnJlc3RvcmVQYWdlU3RhdGUoY3VycmVudEl0ZW0t PnBhZ2VTY2FsZUZhY3RvcigpLCBjdXJyZW50SXRlbS0+c2NhbGVJc0luaXRpYWwoKSwgY3VycmVu dEl0ZW0tPmV4cG9zZWRDb250ZW50UG9zaXRpb24oKSk7CisgICAgICAgIGVsc2UgaWYgKCF2aWV3 LT53YXNTY3JvbGxlZEJ5VXNlcigpKQorICAgICAgICAgICAgdmlldy0+c2V0U2Nyb2xsUG9zaXRp b24oY3VycmVudEl0ZW0tPnNjcm9sbFBvaW50KCkpOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IGIxOTAzMTVjODBmMWRi YTcxMTIzMDE4MWVjZTJjMmFkZTEzMGYxNzMuLmJmNDMwOTFhODRjNjE2NmRmMGI4MjE2Mzg3M2Yy ODQwYmFhZTQwYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5jcHAKQEAgLTI5Myw2ICsyOTMsNyBAQCBXZWJQYWdlOjpXZWJQYWdlKHVpbnQ2NF90IHBh Z2VJRCwgY29uc3QgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyYgcGFyYW1ldGVycykKICNlbmRp ZgogI2lmIFBMQVRGT1JNKElPUykKICAgICAsIG1fbGFzdFZpc2libGVDb250ZW50UmVjdFVwZGF0 ZUlEKDApCisgICAgLCBtX29ic2N1cmVkVG9wSW5zZXQoMCkKICAgICAsIG1faGFzUmVjZWl2ZWRW aXNpYmxlQ29udGVudFJlY3RzQWZ0ZXJEaWRDb21taXRMb2FkKGZhbHNlKQogICAgICwgbV9zY2Fs ZVdhc1NldEJ5VUlQcm9jZXNzKGZhbHNlKQogICAgICwgbV91c2VySGFzQ2hhbmdlZFBhZ2VTY2Fs ZUZhY3RvcihmYWxzZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5oCmluZGV4IDViOGY4YzMwYmJjNWY5MGE2NzUzNDNhYmU4NzNkZjU0NWRmMjMxOWUuLjc2ZmIz NjFlMWMwYjYzMGQ4OWVmNTgyZmEyMWZmN2Q5N2U5YTQxZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgKKysrIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaApAQCAtNDUzLDExICs0NTMsMTIgQEAgcHVibGlj OgogICAgIFdlYkNvcmU6OkZsb2F0U2l6ZSBhdmFpbGFibGVTY3JlZW5TaXplKCkgY29uc3Q7CiAg ICAgdm9pZCB2aWV3cG9ydFByb3BlcnRpZXNEaWRDaGFuZ2UoY29uc3QgV2ViQ29yZTo6Vmlld3Bv cnRBcmd1bWVudHMmKTsKICAgICB2b2lkIGRpZFJlY2VpdmVNb2JpbGVEb2NUeXBlKGJvb2wpOwot ICAgIHZvaWQgcmVzdG9yZVBhZ2VTdGF0ZShkb3VibGUgc2NhbGUsIGNvbnN0IFdlYkNvcmU6Oklu dFBvaW50JiBvcmlnaW4pOworICAgIHZvaWQgcmVzdG9yZVBhZ2VTdGF0ZShkb3VibGUgc2NhbGUs IGJvb2wgdXNlckhhc0NoYW5nZWRQYWdlU2NhbGVGYWN0b3IsIGNvbnN0IFdlYkNvcmU6OkludFBv aW50JiBleHBvc2VkT3JpZ2luKTsKIAogICAgIGRvdWJsZSBtaW5pbXVtUGFnZVNjYWxlRmFjdG9y KCkgY29uc3Q7CiAgICAgZG91YmxlIG1heGltdW1QYWdlU2NhbGVGYWN0b3IoKSBjb25zdDsKICAg ICBib29sIGFsbG93c1VzZXJTY2FsaW5nKCkgY29uc3Q7CisgICAgYm9vbCB1c2VySGFzQ2hhbmdl ZFBhZ2VTY2FsZUZhY3RvcigpIGNvbnN0IHsgcmV0dXJuIG1fdXNlckhhc0NoYW5nZWRQYWdlU2Nh bGVGYWN0b3I7IH0KIAogICAgIHZvaWQgaGFuZGxlVGFwKGNvbnN0IFdlYkNvcmU6OkludFBvaW50 Jik7CiAgICAgdm9pZCBwb3RlbnRpYWxUYXBBdFBvc2l0aW9uKHVpbnQ2NF90IHJlcXVlc3RJRCwg Y29uc3QgV2ViQ29yZTo6RmxvYXRQb2ludCYpOwpAQCAtMTIwNiw2ICsxMjA3LDcgQEAgcHJpdmF0 ZToKIAogICAgIFdlYkNvcmU6OlZpZXdwb3J0Q29uZmlndXJhdGlvbiBtX3ZpZXdwb3J0Q29uZmln dXJhdGlvbjsKICAgICB1aW50NjRfdCBtX2xhc3RWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJRDsK KyAgICBmbG9hdCBtX29ic2N1cmVkVG9wSW5zZXQ7CiAgICAgYm9vbCBtX2hhc1JlY2VpdmVkVmlz aWJsZUNvbnRlbnRSZWN0c0FmdGVyRGlkQ29tbWl0TG9hZDsKICAgICBib29sIG1fc2NhbGVXYXNT ZXRCeVVJUHJvY2VzczsKICAgICBib29sIG1fdXNlckhhc0NoYW5nZWRQYWdlU2NhbGVGYWN0b3I7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBh Z2VJT1MubW0gYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBhZ2VJ T1MubW0KaW5kZXggN2ZiMjBjYTViOWFjNzcwNGQ1NjVlMjJlYmQ2OTE3ZGY5ZDI3MzlkYS4uYzc4 MGNmYjRmMDNkZmIzZTQxYzRiZWJlMjA5YWQ3NDlhMzM2Nzg1OSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9pb3MvV2ViUGFnZUlPUy5tbQpAQCAtMTUxLDEz ICsxNTEsMTcgQEAgdm9pZCBXZWJQYWdlOjpkaWRSZWNlaXZlTW9iaWxlRG9jVHlwZShib29sIGlz TW9iaWxlRG9jdHlwZSkKICAgICAgICAgcmVzZXRWaWV3cG9ydERlZmF1bHRDb25maWd1cmF0aW9u KG1fbWFpbkZyYW1lLmdldCgpKTsKIH0KIAotdm9pZCBXZWJQYWdlOjpyZXN0b3JlUGFnZVN0YXRl KGRvdWJsZSBzY2FsZSwgY29uc3QgSW50UG9pbnQmIHNjcm9sbFBvc2l0aW9uKQordm9pZCBXZWJQ YWdlOjpyZXN0b3JlUGFnZVN0YXRlKGRvdWJsZSBzY2FsZSwgYm9vbCB1c2VySGFzQ2hhbmdlZFBh Z2VTY2FsZUZhY3RvciwgY29uc3QgSW50UG9pbnQmIGV4cG9zZWRPcmlnaW4pCiB7Ci0gICAgc2Nh bGVQYWdlKHNjYWxlLCBzY3JvbGxQb3NpdGlvbik7Ci0gICAgbV9wYWdlLT5tYWluRnJhbWUoKS52 aWV3KCktPnNldFNjcm9sbFBvc2l0aW9uKHNjcm9sbFBvc2l0aW9uKTsKKyAgICAvLyBGSVhNRTog aWRlYWxseSwgd2Ugc2hvdWxkIHN5bmMgdGhpcyB3aXRoIHRoZSBVSVByb2Nlc3MuIFdlIHNob3Vs ZCBub3QgdHJ5IHRvIGNoYW5nZSB0aGUgcG9zaXRpb24gaWYgdGhlIHVzZXIgaXMgaW50ZXJhY3Rp b24KKyAgICAvLyB3aXRoIHRoZSBwYWdlLCBhbmQgd2Ugc2hvdWxkIHNlbmQgdGhlIG5ldyBzY3Jv bGwgcG9zaXRpb24gYXMgc29vbiBhcyBwb3NzaWJsZSB0byB0aGUgVUlQcm9jZXNzLgogCi0gICAg Ly8gRklYTUU6IHdlIHNob3VsZCBnZXQgdGhlIHZhbHVlIG9mIHVzZXJIYXNDaGFuZ2VkUGFnZVNj YWxlRmFjdG9yIGZyb20gdGhlIGhpc3RvcnkuCi0gICAgbV91c2VySGFzQ2hhbmdlZFBhZ2VTY2Fs ZUZhY3RvciA9IHRydWU7CisgICAgZmxvYXQgYm91bmRlZFNjYWxlID0gc3RkOjptaW48ZmxvYXQ+ KG1fdmlld3BvcnRDb25maWd1cmF0aW9uLm1heGltdW1TY2FsZSgpLCBzdGQ6Om1heDxmbG9hdD4o bV92aWV3cG9ydENvbmZpZ3VyYXRpb24ubWluaW11bVNjYWxlKCksIHNjYWxlKSk7CisgICAgZmxv YXQgdG9wSW5zZXRJblBhZ2VDb29yZGluYXRlcyA9IG1fb2JzY3VyZWRUb3BJbnNldCAvIGJvdW5k ZWRTY2FsZTsKKyAgICBJbnRQb2ludCBzY3JvbGxQb3NpdGlvbihleHBvc2VkT3JpZ2luLngoKSwg ZXhwb3NlZE9yaWdpbi55KCkgKyB0b3BJbnNldEluUGFnZUNvb3JkaW5hdGVzKTsKKyAgICBzY2Fs ZVBhZ2UoYm91bmRlZFNjYWxlLCBzY3JvbGxQb3NpdGlvbik7CisgICAgbV9wYWdlLT5tYWluRnJh bWUoKS52aWV3KCktPnNldFNjcm9sbFBvc2l0aW9uKHNjcm9sbFBvc2l0aW9uKTsKKyAgICBtX3Vz ZXJIYXNDaGFuZ2VkUGFnZVNjYWxlRmFjdG9yID0gdXNlckhhc0NoYW5nZWRQYWdlU2NhbGVGYWN0 b3I7CiB9CiAKIGRvdWJsZSBXZWJQYWdlOjptaW5pbXVtUGFnZVNjYWxlRmFjdG9yKCkgY29uc3QK QEAgLTIyNjksNiArMjI3Myw3IEBAIHZvaWQgV2ViUGFnZTo6dXBkYXRlVmlzaWJsZUNvbnRlbnRS ZWN0cyhjb25zdCBWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVJbmZvJiB2aXNpCiB7CiAgICAgbV9o YXNSZWNlaXZlZFZpc2libGVDb250ZW50UmVjdHNBZnRlckRpZENvbW1pdExvYWQgPSB0cnVlOwog ICAgIG1fbGFzdFZpc2libGVDb250ZW50UmVjdFVwZGF0ZUlEID0gdmlzaWJsZUNvbnRlbnRSZWN0 VXBkYXRlSW5mby51cGRhdGVJRCgpOworICAgIG1fb2JzY3VyZWRUb3BJbnNldCA9ICh2aXNpYmxl Q29udGVudFJlY3RVcGRhdGVJbmZvLnVub2JzY3VyZWRSZWN0KCkueSgpIC0gdmlzaWJsZUNvbnRl bnRSZWN0VXBkYXRlSW5mby5leHBvc2VkUmVjdCgpLnkoKSkgKiB2aXNpYmxlQ29udGVudFJlY3RV cGRhdGVJbmZvLnNjYWxlKCk7CiAKICAgICBkb3VibGUgc2NhbGVOb2lzZVRocmVzaG9sZCA9IDAu MDA1OwogICAgIGRvdWJsZSBmaWx0ZXJlZFNjYWxlID0gdmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRl SW5mby5zY2FsZSgpOwo=