152646 2016-01-01 21:00:38 -0800 Fix naming in HistoryItem to refer to scrollPositions 2016-01-03 12:29:13 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser ap cdumez commit-queue japhet simon.fraser thorton zalan oldest_to_newest 1151892 0 simon.fraser 2016-01-01 21:00:38 -0800 Fix naming in HistoryItem to refer to scrollPositions 1151893 1 268081 simon.fraser 2016-01-01 21:01:48 -0800 Created attachment 268081 Patch 1151912 2 268081 commit-queue 2016-01-01 21:56:48 -0800 Comment on attachment 268081 Patch Clearing flags on attachment: 268081 Committed r194492: <http://trac.webkit.org/changeset/194492> 1151913 3 commit-queue 2016-01-01 21:56:52 -0800 All reviewed patches have been landed. Closing bug. 1151923 4 simon.fraser 2016-01-01 22:47:51 -0800 Commitbot, what u doin. 1151924 5 simon.fraser 2016-01-01 22:52:42 -0800 Alexey, why did commit queue commit this? 1151985 6 thorton 2016-01-02 09:57:24 -0800 (In reply to comment #5) > Alexey, why did commit queue commit this? Why wouldn't it? Zalan cq+'d it, and Mac was fine. 1152120 7 simon.fraser 2016-01-03 09:54:59 -0800 commit-queue only looks at mac?? 1152154 8 thorton 2016-01-03 12:29:13 -0800 (In reply to comment #7) > commit-queue only looks at mac?? Yes! There was a Contributors Meeting talk about making it wait on all platforms (and enforcing use of it), but also a fear that that might make it too slow. 268081 2016-01-01 21:01:48 -0800 2016-01-01 21:56:48 -0800 Patch bug-152646-20160101210114.patch text/plain 12976 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTk0NDg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODU3YTkwYWNkM2U1ODVm NTE4OWY5NmU3NWEwZDNjN2Q5MzQ4NDAwYS4uZDBmN2NlYWI5MjBkMmJjMmU1MDBjMWU4NmRiMjYx NDg0ZmZlYmEwNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDE2LTAxLTAxICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIEZpeCBuYW1pbmcg aW4gSGlzdG9yeUl0ZW0gdG8gcmVmZXIgdG8gc2Nyb2xsUG9zaXRpb25zCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTI2NDYKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBIaXN0b3J5SXRlbSBzdG9yZXMgYSBz Y3JvbGxQb3NpdGlvbiwgc28gY2FsbCBpdCB0aGF0LgorCisgICAgICAgIE5vIGJlaGF2aW9yIGNo YW5nZS4KKworICAgICAgICAqIGhpc3RvcnkvSGlzdG9yeUl0ZW0uY3BwOgorICAgICAgICAoV2Vi Q29yZTo6SGlzdG9yeUl0ZW06Okhpc3RvcnlJdGVtKToKKyAgICAgICAgKFdlYkNvcmU6Okhpc3Rv cnlJdGVtOjpzY3JvbGxQb3NpdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5SXRlbTo6 c2V0U2Nyb2xsUG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6SGlzdG9yeUl0ZW06OmNsZWFy U2Nyb2xsUG9zaXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6SGlzdG9yeUl0ZW06OnNjcm9sbFBv aW50KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6Okhpc3RvcnlJdGVtOjpzZXRTY3JvbGxQ b2ludCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5SXRlbTo6Y2xlYXJTY3Jv bGxQb2ludCk6IERlbGV0ZWQuCisgICAgICAgICogaGlzdG9yeS9IaXN0b3J5SXRlbS5oOgorICAg ICAgICAqIGxvYWRlci9IaXN0b3J5Q29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpI aXN0b3J5Q29udHJvbGxlcjo6c2F2ZVNjcm9sbFBvc2l0aW9uQW5kVmlld1N0YXRlVG9JdGVtKToK KyAgICAgICAgKFdlYkNvcmU6Okhpc3RvcnlDb250cm9sbGVyOjpjbGVhclNjcm9sbFBvc2l0aW9u QW5kVmlld1N0YXRlKToKKyAgICAgICAgKFdlYkNvcmU6Okhpc3RvcnlDb250cm9sbGVyOjpyZXN0 b3JlU2Nyb2xsUG9zaXRpb25BbmRWaWV3U3RhdGUpOgorICAgICAgICAoV2ViQ29yZTo6SGlzdG9y eUNvbnRyb2xsZXI6OnVwZGF0ZUZvckNsaWVudFJlZGlyZWN0KToKKworMjAxNi0wMS0wMSAgU2lt b24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKwogICAgICAgICBGaXggcmVsb2Fk IGFuZCBwcm9ncmFtbWF0aWMgc2Nyb2xsaW5nIGluIFJUTCBkb2N1bWVudHMKICAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjYzOQogCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VM b2cKaW5kZXggY2FiNDU4NjkzYzllNDJmOTIxY2EyYzEzZjM1NTdkNjg5MDU5ZDA4MC4uYzI3OTNi YWU5NDI2OGI2MDIwZjdjMGQ0MmNmYTNjNWNlOTg2ZGRkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9tYWMvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwpAQCAt MSwzICsxLDE1IEBACisyMDE2LTAxLTAxICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBw bGUuY29tPgorCisgICAgICAgIEZpeCBuYW1pbmcgaW4gSGlzdG9yeUl0ZW0gdG8gcmVmZXIgdG8g c2Nyb2xsUG9zaXRpb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNTI2NDYKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBIaXN0b3J5SXRlbSBzdG9yZXMgYSBzY3JvbGxQb3NpdGlvbiwgc28gY2FsbCBpdCB0 aGF0LgorCisgICAgICAgICogSGlzdG9yeS9XZWJIaXN0b3J5SXRlbS5tbToKKyAgICAgICAgKC1b V2ViSGlzdG9yeUl0ZW0gc2Nyb2xsUG9pbnRdKToKKwogMjAxNi0wMS0wMSAgSmVmZiBNaWxsZXIg IDxqZWZmbUBhcHBsZS5jb20+CiAKICAgICAgICAgVXBkYXRlIHVzZXItdmlzaWJsZSBjb3B5cmln aHQgc3RyaW5ncyB0byBpbmNsdWRlIDIwMTYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCAwYjY2YjE0ZGFiNWNjNzA2 NGZlOTliOGNlZGVhODJhZWIxZDlhYTY3Li40YzRjOGUwZjljYzBiOWQxM2E0NGE3MzllMDY0YjEy NDUxNWI1NGU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjcgQEAKIDIwMTYtMDEtMDEgIFNpbW9u IEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAKKyAgICAgICAgRml4IG5hbWluZyBp biBIaXN0b3J5SXRlbSB0byByZWZlciB0byBzY3JvbGxQb3NpdGlvbnMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjY0NgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAgICAKKyAgICAgICAgSGlzdG9yeUl0ZW0gc3Rv cmVzIGEgc2Nyb2xsUG9zaXRpb24sIHNvIGNhbGwgaXQgdGhhdC4KKyAgICAgICAgCisgICAgICAg IE5vIGJlaGF2aW9yIGNoYW5nZS4KKworICAgICAgICAqIFNoYXJlZC9TZXNzaW9uU3RhdGUuY3Bw OgorICAgICAgICAoV2ViS2l0OjpGcmFtZVN0YXRlOjplbmNvZGUpOgorICAgICAgICAoV2ViS2l0 OjpGcmFtZVN0YXRlOjpkZWNvZGUpOgorICAgICAgICAqIFNoYXJlZC9TZXNzaW9uU3RhdGUuaDoK KyAgICAgICAgKiBVSVByb2Nlc3MvbWFjL0xlZ2FjeVNlc3Npb25TdGF0ZUNvZGluZy5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OmVuY29kZUZyYW1lU3RhdGVOb2RlKToKKyAgICAgICAgKFdlYktpdDo6 ZGVjb2RlQmFja0ZvcndhcmRUcmVlTm9kZSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3Jl U3VwcG9ydC9TZXNzaW9uU3RhdGVDb252ZXJzaW9uLmNwcDoKKyAgICAgICAgKFdlYktpdDo6dG9G cmFtZVN0YXRlKToKKyAgICAgICAgKFdlYktpdDo6YXBwbHlGcmFtZVN0YXRlKToKKworMjAxNi0w MS0wMSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KKwogICAgICAgICBG aXggcmVsb2FkIGFuZCBwcm9ncmFtbWF0aWMgc2Nyb2xsaW5nIGluIFJUTCBkb2N1bWVudHMKICAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MjYzOQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0hpc3RvcnlJdGVtLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0uY3BwCmluZGV4IDJmMzAxY2MwMzQxNDlhYzM5 N2EwNGY3ZDk4NTNlNGFhYTY0OTU3ZTQuLjU1MjI5MjRiMmZhYzA4OTgzNTk5YjlmNzNkYTQ0ODYx NWZhZTU2NjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0u Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0uY3BwCkBAIC0xMjMs NyArMTIzLDcgQEAgaW5saW5lIEhpc3RvcnlJdGVtOjpIaXN0b3J5SXRlbShjb25zdCBIaXN0b3J5 SXRlbSYgaXRlbSkKICAgICAsIG1fdGFyZ2V0KGl0ZW0ubV90YXJnZXQpCiAgICAgLCBtX3RpdGxl KGl0ZW0ubV90aXRsZSkKICAgICAsIG1fZGlzcGxheVRpdGxlKGl0ZW0ubV9kaXNwbGF5VGl0bGUp Ci0gICAgLCBtX3Njcm9sbFBvaW50KGl0ZW0ubV9zY3JvbGxQb2ludCkKKyAgICAsIG1fc2Nyb2xs UG9zaXRpb24oaXRlbS5tX3Njcm9sbFBvc2l0aW9uKQogICAgICwgbV9wYWdlU2NhbGVGYWN0b3Io aXRlbS5tX3BhZ2VTY2FsZUZhY3RvcikKICAgICAsIG1fbGFzdFZpc2l0V2FzRmFpbHVyZShpdGVt Lm1fbGFzdFZpc2l0V2FzRmFpbHVyZSkKICAgICAsIG1faXNUYXJnZXRJdGVtKGl0ZW0ubV9pc1Rh cmdldEl0ZW0pCkBAIC0yNzcsMjAgKzI3NywxOSBAQCB2b2lkIEhpc3RvcnlJdGVtOjpzZXRUYXJn ZXQoY29uc3QgU3RyaW5nJiB0YXJnZXQpCiAgICAgbm90aWZ5SGlzdG9yeUl0ZW1DaGFuZ2VkKHRo aXMpOwogfQogCi1jb25zdCBJbnRQb2ludCYgSGlzdG9yeUl0ZW06OnNjcm9sbFBvaW50KCkgY29u c3QKK2NvbnN0IEludFBvaW50JiBIaXN0b3J5SXRlbTo6c2Nyb2xsUG9zaXRpb24oKSBjb25zdAog ewotICAgIHJldHVybiBtX3Njcm9sbFBvaW50OworICAgIHJldHVybiBtX3Njcm9sbFBvc2l0aW9u OwogfQogCi12b2lkIEhpc3RvcnlJdGVtOjpzZXRTY3JvbGxQb2ludChjb25zdCBJbnRQb2ludCYg cG9pbnQpCit2b2lkIEhpc3RvcnlJdGVtOjpzZXRTY3JvbGxQb3NpdGlvbihjb25zdCBJbnRQb2lu dCYgcG9zaXRpb24pCiB7Ci0gICAgbV9zY3JvbGxQb2ludCA9IHBvaW50OworICAgIG1fc2Nyb2xs UG9zaXRpb24gPSBwb3NpdGlvbjsKIH0KIAotdm9pZCBIaXN0b3J5SXRlbTo6Y2xlYXJTY3JvbGxQ b2ludCgpCit2b2lkIEhpc3RvcnlJdGVtOjpjbGVhclNjcm9sbFBvc2l0aW9uKCkKIHsKLSAgICBt X3Njcm9sbFBvaW50LnNldFgoMCk7Ci0gICAgbV9zY3JvbGxQb2ludC5zZXRZKDApOworICAgIG1f c2Nyb2xsUG9zaXRpb24gPSBJbnRQb2ludCgpOwogfQogCiBmbG9hdCBIaXN0b3J5SXRlbTo6cGFn ZVNjYWxlRmFjdG9yKCkgY29uc3QKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2hpc3Rvcnkv SGlzdG9yeUl0ZW0uaCBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0uaAppbmRl eCA0MWNhYTU2OTMyODlhMmU0MGM5NDA5OGE3N2Q0YTlhOWUzNWMxNWE2Li5iNzc3MmZkYjQxMjFi ZDY1OTNiNDZkMWI0MTAyYjAzNTI2Y2UxOTMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9o aXN0b3J5L0hpc3RvcnlJdGVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9IaXN0b3J5 SXRlbS5oCkBAIC0xMDIsOSArMTAyLDkgQEAgcHVibGljOgogICAgIAogICAgIGJvb2wgbGFzdFZp c2l0V2FzRmFpbHVyZSgpIGNvbnN0IHsgcmV0dXJuIG1fbGFzdFZpc2l0V2FzRmFpbHVyZTsgfQog Ci0gICAgV0VCQ09SRV9FWFBPUlQgY29uc3QgSW50UG9pbnQmIHNjcm9sbFBvaW50KCkgY29uc3Q7 Ci0gICAgV0VCQ09SRV9FWFBPUlQgdm9pZCBzZXRTY3JvbGxQb2ludChjb25zdCBJbnRQb2ludCYp OwotICAgIHZvaWQgY2xlYXJTY3JvbGxQb2ludCgpOworICAgIFdFQkNPUkVfRVhQT1JUIGNvbnN0 IEludFBvaW50JiBzY3JvbGxQb3NpdGlvbigpIGNvbnN0OworICAgIFdFQkNPUkVfRVhQT1JUIHZv aWQgc2V0U2Nyb2xsUG9zaXRpb24oY29uc3QgSW50UG9pbnQmKTsKKyAgICB2b2lkIGNsZWFyU2Ny b2xsUG9zaXRpb24oKTsKICAgICAKICAgICBXRUJDT1JFX0VYUE9SVCBmbG9hdCBwYWdlU2NhbGVG YWN0b3IoKSBjb25zdDsKICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIHNldFBhZ2VTY2FsZUZhY3Rv cihmbG9hdCk7CkBAIC0yMjEsNyArMjIxLDcgQEAgcHJpdmF0ZToKICAgICBTdHJpbmcgbV90aXRs ZTsKICAgICBTdHJpbmcgbV9kaXNwbGF5VGl0bGU7CiAgICAgCi0gICAgSW50UG9pbnQgbV9zY3Jv bGxQb2ludDsKKyAgICBJbnRQb2ludCBtX3Njcm9sbFBvc2l0aW9uOwogICAgIGZsb2F0IG1fcGFn ZVNjYWxlRmFjdG9yOwogICAgIFZlY3RvcjxTdHJpbmc+IG1fZG9jdW1lbnRTdGF0ZTsKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0hpc3RvcnlDb250cm9sbGVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9IaXN0b3J5Q29udHJvbGxlci5jcHAKaW5kZXggOTY2ZWZjZjMy ZmQxZjA5M2JjMDkyOWVlNzg5ODM5Nzc1ZDIyYjM0My4uYzQ4NDE3NThkM2VjODAyYzAwMWY1MjZm OWM3NTI2ZmFlOWRkYzdmYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL0hpc3Rv cnlDb250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvSGlzdG9yeUNvbnRy b2xsZXIuY3BwCkBAIC03Niw5ICs3Niw5IEBAIHZvaWQgSGlzdG9yeUNvbnRyb2xsZXI6OnNhdmVT Y3JvbGxQb3NpdGlvbkFuZFZpZXdTdGF0ZVRvSXRlbShIaXN0b3J5SXRlbSogaXRlbSkKICAgICAg ICAgcmV0dXJuOwogCiAgICAgaWYgKG1fZnJhbWUuZG9jdW1lbnQoKS0+aW5QYWdlQ2FjaGUoKSkK LSAgICAgICAgaXRlbS0+c2V0U2Nyb2xsUG9pbnQoZnJhbWVWaWV3LT5jYWNoZWRTY3JvbGxQb3Np dGlvbigpKTsKKyAgICAgICAgaXRlbS0+c2V0U2Nyb2xsUG9zaXRpb24oZnJhbWVWaWV3LT5jYWNo ZWRTY3JvbGxQb3NpdGlvbigpKTsKICAgICBlbHNlCi0gICAgICAgIGl0ZW0tPnNldFNjcm9sbFBv aW50KGZyYW1lVmlldy0+c2Nyb2xsUG9zaXRpb24oKSk7CisgICAgICAgIGl0ZW0tPnNldFNjcm9s bFBvc2l0aW9uKGZyYW1lVmlldy0+c2Nyb2xsUG9zaXRpb24oKSk7CiAjaWYgUExBVEZPUk0oSU9T KQogICAgIGl0ZW0tPnNldEV4cG9zZWRDb250ZW50UmVjdChmcmFtZVZpZXctPmV4cG9zZWRDb250 ZW50UmVjdCgpKTsKICAgICBpdGVtLT5zZXRVbm9ic2N1cmVkQ29udGVudFJlY3QoZnJhbWVWaWV3 LT51bm9ic2N1cmVkQ29udGVudFJlY3QoKSk7CkBAIC0xMDAsNyArMTAwLDcgQEAgdm9pZCBIaXN0 b3J5Q29udHJvbGxlcjo6Y2xlYXJTY3JvbGxQb3NpdGlvbkFuZFZpZXdTdGF0ZSgpCiAgICAgaWYg KCFtX2N1cnJlbnRJdGVtKQogICAgICAgICByZXR1cm47CiAKLSAgICBtX2N1cnJlbnRJdGVtLT5j bGVhclNjcm9sbFBvaW50KCk7CisgICAgbV9jdXJyZW50SXRlbS0+Y2xlYXJTY3JvbGxQb3NpdGlv bigpOwogICAgIG1fY3VycmVudEl0ZW0tPnNldFBhZ2VTY2FsZUZhY3RvcigwKTsKIH0KIApAQCAt MTUzLDcgKzE1Myw3IEBAIHZvaWQgSGlzdG9yeUNvbnRyb2xsZXI6OnJlc3RvcmVTY3JvbGxQb3Np dGlvbkFuZFZpZXdTdGF0ZSgpCiAgICAgLy8gRG9uJ3QgcmVzdG9yZSBzY3JvbGwgcG9pbnQgb24g aU9TIGFzIEZyYW1lTG9hZGVyQ2xpZW50OjpyZXN0b3JlVmlld1N0YXRlKCkgZG9lcyB0aGF0Lgog ICAgIGlmICh2aWV3ICYmICF2aWV3LT53YXNTY3JvbGxlZEJ5VXNlcigpKSB7CiAgICAgICAgIFBh Z2UqIHBhZ2UgPSBtX2ZyYW1lLnBhZ2UoKTsKLSAgICAgICAgYXV0byBkZXNpcmVkU2Nyb2xsUG9z aXRpb24gPSBtX2N1cnJlbnRJdGVtLT5zY3JvbGxQb2ludCgpOworICAgICAgICBhdXRvIGRlc2ly ZWRTY3JvbGxQb3NpdGlvbiA9IG1fY3VycmVudEl0ZW0tPnNjcm9sbFBvc2l0aW9uKCk7CiAKICAg ICAgICAgaWYgKHBhZ2UgJiYgbV9mcmFtZS5pc01haW5GcmFtZSgpICYmIG1fY3VycmVudEl0ZW0t PnBhZ2VTY2FsZUZhY3RvcigpKQogICAgICAgICAgICAgcGFnZS0+c2V0UGFnZVNjYWxlRmFjdG9y KG1fY3VycmVudEl0ZW0tPnBhZ2VTY2FsZUZhY3RvcigpICogcGFnZS0+dmlld1NjYWxlRmFjdG9y KCksIGRlc2lyZWRTY3JvbGxQb3NpdGlvbik7CkBAIC00NDksNyArNDQ5LDcgQEAgdm9pZCBIaXN0 b3J5Q29udHJvbGxlcjo6dXBkYXRlRm9yQ2xpZW50UmVkaXJlY3QoKQogICAgIC8vIHdlYmNvcmUg aGFzIGNsb3NlZCB0aGUgVVJMIGFuZCBzYXZlZCBhd2F5IHRoZSBmb3JtIHN0YXRlLgogICAgIGlm IChtX2N1cnJlbnRJdGVtKSB7CiAgICAgICAgIG1fY3VycmVudEl0ZW0tPmNsZWFyRG9jdW1lbnRT dGF0ZSgpOwotICAgICAgICBtX2N1cnJlbnRJdGVtLT5jbGVhclNjcm9sbFBvaW50KCk7CisgICAg ICAgIG1fY3VycmVudEl0ZW0tPmNsZWFyU2Nyb2xsUG9zaXRpb24oKTsKICAgICB9CiAKICAgICBi b29sIG5lZWRQcml2YWN5ID0gbV9mcmFtZS5wYWdlKCktPnVzZXNFcGhlbWVyYWxTZXNzaW9uKCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9IaXN0b3J5L1dlYkhpc3RvcnlJdGVtLm1t IGIvU291cmNlL1dlYktpdC9tYWMvSGlzdG9yeS9XZWJIaXN0b3J5SXRlbS5tbQppbmRleCAzZjU3 ZTM2ZmUwOGUxYjNiZTU5MDljMmU3NTgxNWQwOTJmYzJlZTc4Li43NTMxZDU5YTBjMDRiMzQ1ZTE3 OTQ5ZTExY2I2NzUxMGRhZmYyNmE4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9IaXN0 b3J5L1dlYkhpc3RvcnlJdGVtLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0hpc3RvcnkvV2Vi SGlzdG9yeUl0ZW0ubW0KQEAgLTM5Myw3ICszOTMsNyBAQCBXZWJIaXN0b3J5SXRlbSAqa2l0KEhp c3RvcnlJdGVtKiBpdGVtKQogCiAtIChOU1BvaW50KXNjcm9sbFBvaW50CiB7Ci0gICAgcmV0dXJu IGNvcmUoX3ByaXZhdGUpLT5zY3JvbGxQb2ludCgpOworICAgIHJldHVybiBjb3JlKF9wcml2YXRl KS0+c2Nyb2xsUG9zaXRpb24oKTsKIH0KIAogLSAodm9pZClfdmlzaXRlZFdpdGhUaXRsZTooTlNT dHJpbmcgKil0aXRsZQpAQCAtNjEwLDEyICs2MTAsMTIgQEAgV2ViSGlzdG9yeUl0ZW0gKmtpdChI aXN0b3J5SXRlbSogaXRlbSkKIAogLSAoQ0dQb2ludClfc2Nyb2xsUG9pbnQKIHsKLSAgICByZXR1 cm4gY29yZShfcHJpdmF0ZSktPnNjcm9sbFBvaW50KCk7CisgICAgcmV0dXJuIGNvcmUoX3ByaXZh dGUpLT5zY3JvbGxQb3NpdGlvbigpOwogfQogCiAtICh2b2lkKV9zZXRTY3JvbGxQb2ludDooQ0dQ b2ludClzY3JvbGxQb2ludAogewotICAgIGNvcmUoX3ByaXZhdGUpLT5zZXRTY3JvbGxQb2ludChJ bnRQb2ludChzY3JvbGxQb2ludCkpOworICAgIGNvcmUoX3ByaXZhdGUpLT5zZXRTY3JvbGxQb3Np dGlvbihJbnRQb2ludChzY3JvbGxQb2ludCkpOwogfQogCiAtICh1aW50MzJfdClfYm9va21hcmtJ RApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1Nlc3Npb25TdGF0ZS5jcHAgYi9T b3VyY2UvV2ViS2l0Mi9TaGFyZWQvU2Vzc2lvblN0YXRlLmNwcAppbmRleCAxY2QyZDliZmY1YWIw YmI4NDVhMGE1NDlhODFhYjFmMTU2M2U1NzYwLi40ZTE2OWZlZGU4YWZjMzFkMTVkMzJmNzk5YjU2 ZmEyNWM1MzEyMDgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvU2Vzc2lvblN0 YXRlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvU2Vzc2lvblN0YXRlLmNwcApAQCAt MTEzLDcgKzExMyw3IEBAIHZvaWQgRnJhbWVTdGF0ZTo6ZW5jb2RlKElQQzo6QXJndW1lbnRFbmNv ZGVyJiBlbmNvZGVyKSBjb25zdAogICAgIGVuY29kZXIgPDwgZG9jdW1lbnRTZXF1ZW5jZU51bWJl cjsKICAgICBlbmNvZGVyIDw8IGl0ZW1TZXF1ZW5jZU51bWJlcjsKIAotICAgIGVuY29kZXIgPDwg c2Nyb2xsUG9pbnQ7CisgICAgZW5jb2RlciA8PCBzY3JvbGxQb3NpdGlvbjsKICAgICBlbmNvZGVy IDw8IHBhZ2VTY2FsZUZhY3RvcjsKIAogICAgIGVuY29kZXIgPDwgaHR0cEJvZHk7CkBAIC0xNTAs NyArMTUwLDcgQEAgYm9vbCBGcmFtZVN0YXRlOjpkZWNvZGUoSVBDOjpBcmd1bWVudERlY29kZXIm IGRlY29kZXIsIEZyYW1lU3RhdGUmIHJlc3VsdCkKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJl c3VsdC5pdGVtU2VxdWVuY2VOdW1iZXIpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKLSAgICBp ZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5zY3JvbGxQb2ludCkpCisgICAgaWYgKCFkZWNvZGVy LmRlY29kZShyZXN1bHQuc2Nyb2xsUG9zaXRpb24pKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAg ICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQucGFnZVNjYWxlRmFjdG9yKSkKICAgICAgICAg cmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL1Nlc3Npb25T dGF0ZS5oIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL1Nlc3Npb25TdGF0ZS5oCmluZGV4IDczNWE5 YzMyZWZkZWI2NTFjZjRjYWY5MzA4Mzk0NjgwZWFiMzI5MDUuLjQ4YWQ2ZmQ5NWEyZTUyZjcwMmEz ODY5MjE3MGY3MjNhZjAwZjc0ZjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9T ZXNzaW9uU3RhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvU2Vzc2lvblN0YXRlLmgK QEAgLTk1LDcgKzk1LDcgQEAgc3RydWN0IEZyYW1lU3RhdGUgewogICAgIGludDY0X3QgZG9jdW1l bnRTZXF1ZW5jZU51bWJlcjsKICAgICBpbnQ2NF90IGl0ZW1TZXF1ZW5jZU51bWJlcjsKIAotICAg IFdlYkNvcmU6OkludFBvaW50IHNjcm9sbFBvaW50OworICAgIFdlYkNvcmU6OkludFBvaW50IHNj cm9sbFBvc2l0aW9uOwogICAgIGZsb2F0IHBhZ2VTY2FsZUZhY3RvcjsKIAogICAgIE9wdGlvbmFs PEhUVFBCb2R5PiBodHRwQm9keTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9tYWMvTGVnYWN5U2Vzc2lvblN0YXRlQ29kaW5nLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9tYWMvTGVnYWN5U2Vzc2lvblN0YXRlQ29kaW5nLmNwcAppbmRleCBkY2Q2MzNhMDkxZjI2 YWMwMjUxMWM0NzI5NDc1YmJhODAwYTg3NTExLi45Y2I4MzA4MzlhMTkyNjk5Zjg3NDIzMzAwNTEy OGRkMmYwYTM2ZmI0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL0xl Z2FjeVNlc3Npb25TdGF0ZUNvZGluZy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L21hYy9MZWdhY3lTZXNzaW9uU3RhdGVDb2RpbmcuY3BwCkBAIC0zMzYsOCArMzM2LDggQEAgc3Rh dGljIHZvaWQgZW5jb2RlRnJhbWVTdGF0ZU5vZGUoSGlzdG9yeUVudHJ5RGF0YUVuY29kZXImIGVu Y29kZXIsIGNvbnN0IEZyYW1lU3QKIAogICAgIGVuY29kZXIgPDwgZnJhbWVTdGF0ZS5yZWZlcnJl cjsKIAotICAgIGVuY29kZXIgPDwgZnJhbWVTdGF0ZS5zY3JvbGxQb2ludC54KCk7Ci0gICAgZW5j b2RlciA8PCBmcmFtZVN0YXRlLnNjcm9sbFBvaW50LnkoKTsKKyAgICBlbmNvZGVyIDw8IGZyYW1l U3RhdGUuc2Nyb2xsUG9zaXRpb24ueCgpOworICAgIGVuY29kZXIgPDwgZnJhbWVTdGF0ZS5zY3Jv bGxQb3NpdGlvbi55KCk7CiAKICAgICBlbmNvZGVyIDw8IGZyYW1lU3RhdGUucGFnZVNjYWxlRmFj dG9yOwogCkBAIC04OTksMTMgKzg5OSwxMyBAQCBzdGF0aWMgdm9pZCBkZWNvZGVCYWNrRm9yd2Fy ZFRyZWVOb2RlKEhpc3RvcnlFbnRyeURhdGFEZWNvZGVyJiBkZWNvZGVyLCBGcmFtZVN0YQogCiAg ICAgZGVjb2RlciA+PiBmcmFtZVN0YXRlLnJlZmVycmVyOwogCi0gICAgaW50MzJfdCBzY3JvbGxQ b2ludFg7Ci0gICAgZGVjb2RlciA+PiBzY3JvbGxQb2ludFg7CisgICAgaW50MzJfdCBzY3JvbGxQ b3NpdGlvblg7CisgICAgZGVjb2RlciA+PiBzY3JvbGxQb3NpdGlvblg7CiAKLSAgICBpbnQzMl90 IHNjcm9sbFBvaW50WTsKLSAgICBkZWNvZGVyID4+IHNjcm9sbFBvaW50WTsKKyAgICBpbnQzMl90 IHNjcm9sbFBvc2l0aW9uWTsKKyAgICBkZWNvZGVyID4+IHNjcm9sbFBvc2l0aW9uWTsKIAotICAg IGZyYW1lU3RhdGUuc2Nyb2xsUG9pbnQgPSBXZWJDb3JlOjpJbnRQb2ludChzY3JvbGxQb2ludFgs IHNjcm9sbFBvaW50WSk7CisgICAgZnJhbWVTdGF0ZS5zY3JvbGxQb3NpdGlvbiA9IFdlYkNvcmU6 OkludFBvaW50KHNjcm9sbFBvc2l0aW9uWCwgc2Nyb2xsUG9zaXRpb25ZKTsKIAogICAgIGRlY29k ZXIgPj4gZnJhbWVTdGF0ZS5wYWdlU2NhbGVGYWN0b3I7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvU2Vzc2lvblN0YXRlQ29udmVyc2lvbi5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1Nlc3Npb25TdGF0 ZUNvbnZlcnNpb24uY3BwCmluZGV4IGQ3ZmUxOWM0MTkyMTUxMTBhZWYwODhmNzhiZjgwYzQ3MjUw NTQ1YzYuLjg1M2M0ODVjZDMyODA0MmRjNjRmNmJjZGZlNDllNjU1ZDgxZjllYjQgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvU2Vzc2lvblN0YXRl Q29udmVyc2lvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw cG9ydC9TZXNzaW9uU3RhdGVDb252ZXJzaW9uLmNwcApAQCAtODQsNyArODQsNyBAQCBzdGF0aWMg RnJhbWVTdGF0ZSB0b0ZyYW1lU3RhdGUoY29uc3QgSGlzdG9yeUl0ZW0mIGhpc3RvcnlJdGVtKQog ICAgIGZyYW1lU3RhdGUuZG9jdW1lbnRTZXF1ZW5jZU51bWJlciA9IGhpc3RvcnlJdGVtLmRvY3Vt ZW50U2VxdWVuY2VOdW1iZXIoKTsKICAgICBmcmFtZVN0YXRlLml0ZW1TZXF1ZW5jZU51bWJlciA9 IGhpc3RvcnlJdGVtLml0ZW1TZXF1ZW5jZU51bWJlcigpOwogCi0gICAgZnJhbWVTdGF0ZS5zY3Jv bGxQb2ludCA9IGhpc3RvcnlJdGVtLnNjcm9sbFBvaW50KCk7CisgICAgZnJhbWVTdGF0ZS5zY3Jv bGxQb3NpdGlvbiA9IGhpc3RvcnlJdGVtLnNjcm9sbFBvc2l0aW9uKCk7CiAgICAgZnJhbWVTdGF0 ZS5wYWdlU2NhbGVGYWN0b3IgPSBoaXN0b3J5SXRlbS5wYWdlU2NhbGVGYWN0b3IoKTsKIAogICAg IGlmIChGb3JtRGF0YSogZm9ybURhdGEgPSBjb25zdF9jYXN0PEhpc3RvcnlJdGVtJj4oaGlzdG9y eUl0ZW0pLmZvcm1EYXRhKCkpIHsKQEAgLTE2MCw3ICsxNjAsNyBAQCBzdGF0aWMgdm9pZCBhcHBs eUZyYW1lU3RhdGUoSGlzdG9yeUl0ZW0mIGhpc3RvcnlJdGVtLCBjb25zdCBGcmFtZVN0YXRlJiBm cmFtZVN0YQogICAgIGhpc3RvcnlJdGVtLnNldERvY3VtZW50U2VxdWVuY2VOdW1iZXIoZnJhbWVT dGF0ZS5kb2N1bWVudFNlcXVlbmNlTnVtYmVyKTsKICAgICBoaXN0b3J5SXRlbS5zZXRJdGVtU2Vx dWVuY2VOdW1iZXIoZnJhbWVTdGF0ZS5pdGVtU2VxdWVuY2VOdW1iZXIpOwogCi0gICAgaGlzdG9y eUl0ZW0uc2V0U2Nyb2xsUG9pbnQoZnJhbWVTdGF0ZS5zY3JvbGxQb2ludCk7CisgICAgaGlzdG9y eUl0ZW0uc2V0U2Nyb2xsUG9zaXRpb24oZnJhbWVTdGF0ZS5zY3JvbGxQb3NpdGlvbik7CiAgICAg aGlzdG9yeUl0ZW0uc2V0UGFnZVNjYWxlRmFjdG9yKGZyYW1lU3RhdGUucGFnZVNjYWxlRmFjdG9y KTsKIAogICAgIGlmIChmcmFtZVN0YXRlLmh0dHBCb2R5KSB7Cg==