78192 2012-02-08 18:42:22 -0800 Don't use the wheel event handler count to track if a page has horizontal scrollbars 2012-02-08 19:02:47 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 552737 0 andersca 2012-02-08 18:42:22 -0800 Don't use the wheel event handler count to track if a page has horizontal scrollbars 552745 1 126218 andersca 2012-02-08 18:52:31 -0800 Created attachment 126218 Patch 552756 2 andersca 2012-02-08 19:02:47 -0800 Committed r107168: <http://trac.webkit.org/changeset/107168> 126218 2012-02-08 18:52:31 -0800 2012-02-08 18:58:01 -0800 Patch bug-78192-20120208185305.patch text/plain 15512 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3MTE5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjNjNGNhNDM4NmNkMDY2 NDFmNzcyM2FjZTI3ODE5YjNmNTU1OTllNy4uZDk3M2QxOTg5NTEwYTkxYzJlNzBhNTliYWIxNGQz OGQyNmUyNWNhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIxIEBACiAyMDEyLTAyLTA4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgRG9uJ3QgdXNlIHRo ZSB3aGVlbCBldmVudCBoYW5kbGVyIGNvdW50IHRvIHRyYWNrIGlmIGEgcGFnZSBoYXMgaG9yaXpv bnRhbCBzY3JvbGxiYXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD03ODE5MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFN0b3AgY2FsbGluZyBEb2N1bWVudDo6ZGlkQWRkV2hlZWxFdmVudEhhbmRsZXIgYW5k IERvY3VtZW50OjpkaWRSZW1vdmVXaGVlbEV2ZW50SGFuZGxlciB3aGVuCisgICAgICAgIGFkZGlu ZyBhbmQgcmVtb3Zpbmcgc2Nyb2xsYmFycy4KKworICAgICAgICAqIHBhZ2UvRnJhbWVWaWV3LmNw cDoKKyAgICAgICAgKiBwYWdlL0ZyYW1lVmlldy5oOgorICAgICAgICAoRnJhbWVWaWV3KToKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJMYXllci5oOgorCisyMDEyLTAyLTA4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBh cHBsZS5jb20+CisKICAgICAgICAgQWRkIGEgY29udGVudCBzaGFkb3cgbGF5ZXIgdG8gdGhlIHJl bmRlciBsYXllciBjb21wb3NpdG9yCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD03ODEzMwogICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTA3OTc3NDI+CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFu Z2VMb2cKaW5kZXggM2QyNDU1MjRlOGE0ZWJhMzU1YjBmNjNiMWY1NTJmNDYwOWJiZDdlYS4uNGNl ODdlZmRlMWFiNDBmZGQxYzczNmYwMGY4MWM4NDU0ZDAzZmE4ZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDQ1IEBACisyMDEyLTAyLTA4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5j b20+CisKKyAgICAgICAgRG9uJ3QgdXNlIHRoZSB3aGVlbCBldmVudCBoYW5kbGVyIGNvdW50IHRv IHRyYWNrIGlmIGEgcGFnZSBoYXMgaG9yaXpvbnRhbCBzY3JvbGxiYXJzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03ODE5MgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByaW9yIHRvIHRoaXMgY2hhbmdlLCB3 ZSB3ZXJlIGluY3JlbWVudGluZyBhbmQgZGVjcmVtZW50aW5nIHRoZSB3aGVlbCBldmVudCBoYW5k bGVyIGNvdW50CisgICAgICAgIHdoZW5ldmVyIGEgc2Nyb2xsYWJsZSBhcmVhIGdhaW5lZCBvciBs b3N0IGEgaG9yaXpvbnRhbCBzY3JvbGxiYXIsIHNvIHdlIGNvdWxkIHVzZSB0aGUgY291bnQKKyAg ICAgICAgdG8gZGV0ZXJtaW5lIGlmIFNhZmFyaSBjYW4gaGFuZGxlIGhvcml6b250YWwgd2hlZWwg ZXZlbnRzIGRpcmVjdGx5IG9yIHdoZXRoZXIgdGhleSBoYXZlIHRvIGJlIHNlbnQKKyAgICAgICAg dG8gdGhlIHdlYiBwcm9jZXNzIGZpcnN0LgorCisgICAgICAgIFdoYXQgdGhpcyBtZWFudCB3YXMg dGhhdCB3aGVuZXZlciBhIHBhZ2UgaGFkIGhvcml6b250YWwgc2Nyb2xsYmFycyB3ZSdkIGhhdmUg dG8gc2VuZCBhbGwgc2Nyb2xsIHdoZWVsIGV2ZW50cworICAgICAgICB0byB0aGUgbWFpbiB0aHJl YWQgaW5zdGVhZCBvZiB0aGUgc2Nyb2xsaW5nIHRocmVhZCwgcmVnYXJkbGVzcyBvZiB3aGV0aGVy IHRoZXJlIHdlcmUgYW55IHdoZWVsIGV2ZW50IGhhbmRsZXJzLgorICAgICAgICAKKyAgICAgICAg QWZ0ZXIgdGhpcyBjaGFuZ2UsIHdlIHRyYXZlcnNlIHRoZSB0cmVlIG9mIHNjcm9sbGFibGUgYXJl YXMgYWZ0ZXIgZXZlcnkgbGF5b3V0IGFuZCBjaGVjayBpZiBhbnkgb2YgdGhlbQorICAgICAgICBo YXZlIGEgaG9yaXpvbnRhbCBzY3JvbGxiYXIuIChXZSBzdGlsbCBhbHNvIGNoZWNrIGlmIHRoZXJl IGFyZSB3aGVlbCBldmVudCBoYW5kbGVycykuCisKKyAgICAgICAgSWYgdHJhdmVyc2luZyB0aGUg dHJlZSBhZnRlciBldmVyeSBsYXlvdXQgaXMgZGVlbWVkIHRvIHNsb3cgd2UgY2FuIGdvIGJhY2sg dG8gY2FjaGluZyB0aGUgbnVtYmVyIG9mIGhvcml6b250YWwgc2Nyb2xsYmFycworICAgICAgICBp biBhIHBhZ2UsIGJ1dCB0aGUgbnVtYmVyIG9mIHN1YmZyYW1lcyBpbiBhIHBhZ2UgaXMgdXN1YWxs eSB2ZXJ5IHNtYWxsIGFuZCB0aGUgbnVtYmVyIG9mIG90aGVyIHNjcm9sbGFibGUgYXJlYXMgaXMg ZXZlbiBzbWFsbGVyLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6V2ViUGFnZVByb3h5KToKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZVByb3h5Ojp3aWxsSGFuZGxlSG9yaXpvbnRhbFNjcm9sbEV2ZW50cyk6Cisg ICAgICAgICogVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oOgorICAgICAgICAoV2ViS2l0OjpXZWJQ YWdlUHJveHk6OnNldENhblNob3J0Q2lyY3VpdEhvcml6b250YWxXaGVlbEV2ZW50cyk6CisgICAg ICAgIChXZWJQYWdlUHJveHkpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVz c2FnZXMuaW46CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVD bGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJDaHJvbWVDbGllbnQ6Om51bVdoZWVsRXZl bnRIYW5kbGVyc0NoYW5nZWQpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQv V2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJGcmFtZUxvYWRl ckNsaWVudDo6ZGlzcGF0Y2hEaWRMYXlvdXQpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6V2ViUGFnZSk6CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2U6Om51bVdoZWVsRXZlbnRIYW5kbGVyc0NoYW5nZWQpOgorICAg ICAgICAoV2ViS2l0KToKKyAgICAgICAgKFdlYktpdDo6aGFzRW5hYmxlZEhvcml6b250YWxTY3Jv bGxiYXIpOgorICAgICAgICAoV2ViS2l0OjpwYWdlQ29udGFpbnNBbnlIb3Jpem9udGFsU2Nyb2xs YmFycyk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnJlY29tcHV0ZVNob3J0Q2lyY3VpdEhv cml6b250YWxXaGVlbEV2ZW50c1N0YXRlKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5oOgorICAgICAgICAoV2ViUGFnZSk6CisKIDIwMTItMDItMDggIFNoZXJpZmYgQm90 ICA8d2Via2l0LnJldmlldy5ib3RAZ21haWwuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJv bGxpbmcgb3V0IHIxMDY5MjAsIHIxMDY5MjQsIHIxMDY5MzMsIHIxMDY5MzksCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L0ZyYW1lVmlldy5jcHAKaW5kZXggNDMzNWUyNmQxYTdkMTM3ZGZlMWFiY2M1YTU0YjhkYzBiMjY5 ZmVlYS4uYmFiYTA2OGU0M2M1OGUxODI3MWRkZmYxNjQxN2ZiMDYxMzY5YzhhZSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWVWaWV3LmNwcApAQCAtMzIxLDIxICszMjEsNiBAQCB2b2lkIEZyYW1lVmlldzo6 ZGV0YWNoQ3VzdG9tU2Nyb2xsYmFycygpCiAgICAgfQogfQogCi12b2lkIEZyYW1lVmlldzo6ZGlk QWRkSG9yaXpvbnRhbFNjcm9sbGJhcihTY3JvbGxiYXIqIHNjcm9sbGJhcikKLXsKLSAgICBpZiAo bV9mcmFtZSAmJiBtX2ZyYW1lLT5kb2N1bWVudCgpKQotICAgICAgICBtX2ZyYW1lLT5kb2N1bWVu dCgpLT5kaWRBZGRXaGVlbEV2ZW50SGFuZGxlcigpOwotICAgIFNjcm9sbFZpZXc6OmRpZEFkZEhv cml6b250YWxTY3JvbGxiYXIoc2Nyb2xsYmFyKTsKLX0KLQotdm9pZCBGcmFtZVZpZXc6OndpbGxS ZW1vdmVIb3Jpem9udGFsU2Nyb2xsYmFyKFNjcm9sbGJhciogc2Nyb2xsYmFyKQotewotICAgIFNj cm9sbFZpZXc6OndpbGxSZW1vdmVIb3Jpem9udGFsU2Nyb2xsYmFyKHNjcm9sbGJhcik7Ci0gICAg Ly8gRklYTUU6IG1heWJlIG5lZWQgYSBzZXBhcmF0ZSBTY3JvbGxhYmxlQXJlYTo6ZGlkUmVtb3Zl SG9yaXpvbnRhbFNjcm9sbGJhciBjYWxsYmFjaz8KLSAgICBpZiAobV9mcmFtZSAmJiBtX2ZyYW1l LT5kb2N1bWVudCgpKQotICAgICAgICBtX2ZyYW1lLT5kb2N1bWVudCgpLT5kaWRSZW1vdmVXaGVl bEV2ZW50SGFuZGxlcigpOwotfQotCiB2b2lkIEZyYW1lVmlldzo6cmVjYWxjdWxhdGVTY3JvbGxi YXJPdmVybGF5U3R5bGUoKQogewogICAgIFNjcm9sbGJhck92ZXJsYXlTdHlsZSBvbGRPdmVybGF5 U3R5bGUgPSBzY3JvbGxiYXJPdmVybGF5U3R5bGUoKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRnJhbWVWaWV3LmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0ZyYW1lVmlldy5oCmlu ZGV4IDcxMjQyYTI5ZmY3NjQzYTA5N2E0Yzk0ZWNkOGI4MTliMDJlNDg4ZWQuLjUxZmU3YzM3MDhh MDNiOTU1N2IyZDA2MjRlOGQwOWVmMmQ5NGRkNGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BhZ2UvRnJhbWVWaWV3LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9GcmFtZVZpZXcuaApA QCAtODYsOCArODYsNiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBQYXNzUmVmUHRyPFNjcm9sbGJh cj4gY3JlYXRlU2Nyb2xsYmFyKFNjcm9sbGJhck9yaWVudGF0aW9uKTsKIAogICAgIHZpcnR1YWwg Ym9vbCBhdm9pZFNjcm9sbGJhckNyZWF0aW9uKCkgY29uc3Q7Ci0gICAgdmlydHVhbCB2b2lkIGRp ZEFkZEhvcml6b250YWxTY3JvbGxiYXIoU2Nyb2xsYmFyKik7Ci0gICAgdmlydHVhbCB2b2lkIHdp bGxSZW1vdmVIb3Jpem9udGFsU2Nyb2xsYmFyKFNjcm9sbGJhciopOwogCiAgICAgdmlydHVhbCB2 b2lkIHNldENvbnRlbnRzU2l6ZShjb25zdCBJbnRTaXplJik7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyTGF5ZXIuY3BwCmluZGV4IDhiZmFkNDQzOWUwOTFjZTE0ZWM1MWU2ZWRmNzA0 Mzg3NGQ2YzI5YjguLmVlNmU4YmVlYTY1NWVmNTE0Yzc2NzM5OGRkNTA2ODAzNzY0MmFkYzcgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNwcApAQCAtMjA2MSwxOSArMjA2 MSw2IEBAIGJvb2wgUmVuZGVyTGF5ZXI6OmFsbG93c1Njcm9sbGluZygpIGNvbnN0CiAgICAgcmV0 dXJuIChtX2hCYXIgJiYgbV9oQmFyLT5lbmFibGVkKCkpIHx8IChtX3ZCYXIgJiYgbV92QmFyLT5l bmFibGVkKCkpOwogfQogCi12b2lkIFJlbmRlckxheWVyOjpkaWRBZGRIb3Jpem9udGFsU2Nyb2xs YmFyKFNjcm9sbGJhciogc2Nyb2xsYmFyKQotewotICAgIG1fcmVuZGVyZXItPmRvY3VtZW50KCkt PmRpZEFkZFdoZWVsRXZlbnRIYW5kbGVyKCk7Ci0gICAgU2Nyb2xsYWJsZUFyZWE6OmRpZEFkZEhv cml6b250YWxTY3JvbGxiYXIoc2Nyb2xsYmFyKTsKLX0KLQotdm9pZCBSZW5kZXJMYXllcjo6d2ls bFJlbW92ZUhvcml6b250YWxTY3JvbGxiYXIoU2Nyb2xsYmFyKiBzY3JvbGxiYXIpCi17Ci0gICAg U2Nyb2xsYWJsZUFyZWE6OndpbGxSZW1vdmVIb3Jpem9udGFsU2Nyb2xsYmFyKHNjcm9sbGJhcik7 Ci0gICAgLy8gRklYTUU6IG1heWJlIG5lZWQgYSBzZXBhcmF0ZSBTY3JvbGxhYmxlQXJlYTo6ZGlk UmVtb3ZlSG9yaXpvbnRhbFNjcm9sbGJhciBjYWxsYmFjaz8KLSAgICBtX3JlbmRlcmVyLT5kb2N1 bWVudCgpLT5kaWRSZW1vdmVXaGVlbEV2ZW50SGFuZGxlcigpOwotfQotCiB2b2lkIFJlbmRlckxh eWVyOjpzZXRIYXNIb3Jpem9udGFsU2Nyb2xsYmFyKGJvb2wgaGFzU2Nyb2xsYmFyKQogewogICAg IGlmIChoYXNTY3JvbGxiYXIgPT0gKG1faEJhciAhPSAwKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyLmgKaW5kZXggNzc2ZGExZWMxNWM0MGUyYTc5ZmI2NDhhZGUyNTdlZjRiZjNk MjZhOC4uYmI0Nzk3YmIyN2Y5YTJmMDQwYTE2ZWFhOGEyZGZiMjdmNjgyYWM2NiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKQEAgLTMxMiw4ICszMTIsNiBAQCBwdWJsaWM6 CiAgICAgYm9vbCBzY3JvbGxzT3ZlcmZsb3coKSBjb25zdDsKICAgICBib29sIGFsbG93c1Njcm9s bGluZygpIGNvbnN0OyAvLyBSZXR1cm5zIHRydWUgaWYgYXQgbGVhc3Qgb25lIHNjcm9sbGJhciBp cyB2aXNpYmxlIGFuZCBlbmFibGVkLgogICAgIGJvb2wgaGFzU2Nyb2xsYmFycygpIGNvbnN0IHsg cmV0dXJuIG1faEJhciB8fCBtX3ZCYXI7IH0KLSAgICB2aXJ0dWFsIHZvaWQgZGlkQWRkSG9yaXpv bnRhbFNjcm9sbGJhcihTY3JvbGxiYXIqKTsKLSAgICB2aXJ0dWFsIHZvaWQgd2lsbFJlbW92ZUhv cml6b250YWxTY3JvbGxiYXIoU2Nyb2xsYmFyKik7CiAgICAgdm9pZCBzZXRIYXNIb3Jpem9udGFs U2Nyb2xsYmFyKGJvb2wpOwogICAgIHZvaWQgc2V0SGFzVmVydGljYWxTY3JvbGxiYXIoYm9vbCk7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3Bw IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggNzJhMmMx YTYwMTg1YTc3ZjY4YTM0YmRjNDlhNDQxZGJhMzEzMTFjYS4uODViN2Q1NGNhMTg1ZGY0NTY1MWI1 Nzg3NTIyYzBhOTljNmMzYzdjMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHAKQEAgLTE5NSw2ICsxOTUsNyBAQCBXZWJQYWdlUHJveHk6OldlYlBhZ2VQcm94eShQ YWdlQ2xpZW50KiBwYWdlQ2xpZW50LCBQYXNzUmVmUHRyPFdlYlByb2Nlc3NQcm94eT4gcAogICAg ICwgbV9tYWluRnJhbWVIYXNDdXN0b21SZXByZXNlbnRhdGlvbihmYWxzZSkKICAgICAsIG1fbWFp bkZyYW1lSGFzSG9yaXpvbnRhbFNjcm9sbGJhcihmYWxzZSkKICAgICAsIG1fbWFpbkZyYW1lSGFz VmVydGljYWxTY3JvbGxiYXIoZmFsc2UpCisgICAgLCBtX2NhblNob3J0Q2lyY3VpdEhvcml6b250 YWxXaGVlbEV2ZW50cyh0cnVlKQogICAgICwgbV9tYWluRnJhbWVJc1Bpbm5lZFRvTGVmdFNpZGUo ZmFsc2UpCiAgICAgLCBtX21haW5GcmFtZUlzUGlubmVkVG9SaWdodFNpZGUoZmFsc2UpCiAgICAg LCBtX3BhZ2VDb3VudCgwKQpAQCAtMzQ1Niw3ICszNDU3LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6 OmRpZEZhaWxUb0luaXRpYWxpemVQbHVnaW4oY29uc3QgU3RyaW5nJiBtaW1lVHlwZSkKIAogYm9v bCBXZWJQYWdlUHJveHk6OndpbGxIYW5kbGVIb3Jpem9udGFsU2Nyb2xsRXZlbnRzKCkgY29uc3QK IHsKLSAgICByZXR1cm4gbV93aGVlbEV2ZW50SGFuZGxlckNvdW50ID4gMDsKKyAgICByZXR1cm4g IW1fY2FuU2hvcnRDaXJjdWl0SG9yaXpvbnRhbFdoZWVsRXZlbnRzOwogfQogCiB2b2lkIFdlYlBh Z2VQcm94eTo6ZGlkRmluaXNoTG9hZGluZ0RhdGFGb3JDdXN0b21SZXByZXNlbnRhdGlvbihjb25z dCBTdHJpbmcmIHN1Z2dlc3RlZEZpbGVuYW1lLCBjb25zdCBDb3JlSVBDOjpEYXRhUmVmZXJlbmNl JiBkYXRhUmVmZXJlbmNlKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oCmlu ZGV4IDhmYzY1NTUwZjk1MWE2MjE4ZmQ0MTZiZDJkNWUwYWI0MWQ5ZDYwZTEuLjJlNjRkMTZlYzZh ODc2YjkxYTBhMzJiMzcwYjk2NjJhNjQxMTFjOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmgKQEAgLTcxOSw3ICs3MTksNyBAQCBwcml2YXRlOgogICAgIHZvaWQgZGlk Q2hhbmdlU2Nyb2xsT2Zmc2V0UGlubmluZ0Zvck1haW5GcmFtZShib29sIHBpbm5lZFRvTGVmdFNp ZGUsIGJvb2wgcGlubmVkVG9SaWdodFNpZGUpOwogICAgIHZvaWQgZGlkQ2hhbmdlUGFnZUNvdW50 KHVuc2lnbmVkKTsKICAgICB2b2lkIGRpZEZhaWxUb0luaXRpYWxpemVQbHVnaW4oY29uc3QgU3Ry aW5nJiBtaW1lVHlwZSk7Ci0gICAgdm9pZCBudW1XaGVlbEV2ZW50SGFuZGxlcnNDaGFuZ2VkKHVu c2lnbmVkIGNvdW50KSB7IG1fd2hlZWxFdmVudEhhbmRsZXJDb3VudCA9IGNvdW50OyB9CisgICAg dm9pZCBzZXRDYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHMoYm9vbCBjYW5TaG9y dENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHMpIHsgbV9jYW5TaG9ydENpcmN1aXRIb3Jpem9u dGFsV2hlZWxFdmVudHMgPSBjYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHM7IH0K IAogICAgIHZvaWQgcmVhdHRhY2hUb1dlYlByb2Nlc3MoKTsKICAgICB2b2lkIHJlYXR0YWNoVG9X ZWJQcm9jZXNzV2l0aEl0ZW0oV2ViQmFja0ZvcndhcmRMaXN0SXRlbSopOwpAQCAtMTAwOSw3ICsx MDA5LDkgQEAgcHJpdmF0ZToKIAogICAgIGJvb2wgbV9tYWluRnJhbWVIYXNIb3Jpem9udGFsU2Ny b2xsYmFyOwogICAgIGJvb2wgbV9tYWluRnJhbWVIYXNWZXJ0aWNhbFNjcm9sbGJhcjsKLSAgICBp bnQgbV93aGVlbEV2ZW50SGFuZGxlckNvdW50OworCisgICAgLy8gV2hldGhlciBob3Jpem9udGFs IHdoZWVsIGV2ZW50cyBjYW4gYmUgaGFuZGxlZCBkaXJlY3RseSBmb3Igc3dpcGluZyBwdXJwb3Nl cy4KKyAgICBib29sIG1fY2FuU2hvcnRDaXJjdWl0SG9yaXpvbnRhbFdoZWVsRXZlbnRzOwogCiAg ICAgYm9vbCBtX21haW5GcmFtZUlzUGlubmVkVG9MZWZ0U2lkZTsKICAgICBib29sIG1fbWFpbkZy YW1lSXNQaW5uZWRUb1JpZ2h0U2lkZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCmluZGV4IDcxNzg1M2JmNzkzZjA5YzdkMzhiNmRkMTcz ZGRjNzA1YTRkOTRlNmEuLjliYTFkNTI1NGIzYTM3NGRlZWIyZjk0NTMyNWQ0YWIwMzY1MWI4YzYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkubWVzc2Fn ZXMuaW4KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdl cy5pbgpAQCAtNjYsNyArNjYsNyBAQCBtZXNzYWdlcyAtPiBXZWJQYWdlUHJveHkgewogICAgIERp ZENoYW5nZVNjcm9sbE9mZnNldFBpbm5pbmdGb3JNYWluRnJhbWUoYm9vbCBoYXNIb3Jpem9udGFs U2Nyb2xsYmFyLCBib29sIGhhc1ZlcnRpY2FsU2Nyb2xsYmFyKQogICAgIERpZENoYW5nZVBhZ2VD b3VudCh1bnNpZ25lZCBwYWdlQ291bnQpOwogICAgIERpZEZhaWxUb0luaXRpYWxpemVQbHVnaW4o V1RGOjpTdHJpbmcgbWltZVR5cGUpCi0gICAgTnVtV2hlZWxFdmVudEhhbmRsZXJzQ2hhbmdlZCh1 bnNpZ25lZCBjb3VudCkKKyAgICBTZXRDYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVu dHMoYm9vbCBjYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHMpCiAKICNpZiBVU0Uo VElMRURfQkFDS0lOR19TVE9SRSkKICAgICBQYWdlRGlkUmVxdWVzdFNjcm9sbChXZWJDb3JlOjpJ bnRQb2ludCBwb2ludCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2Vi Q29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nl c3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50LmNwcAppbmRleCA0NGMwYzAwMmQ0NWVm YWU4ZTVjNzhiZDM5NzVhMzQ4MzNmNmE5YmMyLi41YTQ4ZmZmODcxZjllZThkOTI5M2M4YmRmNWY5 MmU4M2UwYzk1NmI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNv cmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwCkBAIC03ODAsNyArNzgwLDcg QEAgYm9vbCBXZWJDaHJvbWVDbGllbnQ6OnNob3VsZFJ1YmJlckJhbmRJbkRpcmVjdGlvbihXZWJD b3JlOjpTY3JvbGxEaXJlY3Rpb24gZGlyZWMKIAogdm9pZCBXZWJDaHJvbWVDbGllbnQ6Om51bVdo ZWVsRXZlbnRIYW5kbGVyc0NoYW5nZWQodW5zaWduZWQgY291bnQpCiB7Ci0gICAgbV9wYWdlLT5z ZW5kKE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6Ok51bVdoZWVsRXZlbnRIYW5kbGVyc0NoYW5nZWQo Y291bnQpKTsKKyAgICBtX3BhZ2UtPm51bVdoZWVsRXZlbnRIYW5kbGVyc0NoYW5nZWQoY291bnQp OwogfQogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViRnJhbWVMb2FkZXJDbGllbnQuY3BwIGIvU291 cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVu dC5jcHAKaW5kZXggMzdlMjYxZmFkYjYwZDUxMmMzYzI0ZTkyOGM1OGIzMTY3ZTE2YmE2Yi4uYmUy NDY4NGRiNmVjMzZhOTZjZmIyYmViOTI3NDdiNTgzZDc4MmEwMCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFtZUxvYWRlckNsaWVudC5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJGcmFt ZUxvYWRlckNsaWVudC5jcHAKQEAgLTU3Nyw2ICs1NzcsOCBAQCB2b2lkIFdlYkZyYW1lTG9hZGVy Q2xpZW50OjpkaXNwYXRjaERpZExheW91dCgpCiAgICAgLy8gTm90aWZ5IHRoZSBidW5kbGUgY2xp ZW50LgogICAgIHdlYlBhZ2UtPmluamVjdGVkQnVuZGxlTG9hZGVyQ2xpZW50KCkuZGlkTGF5b3V0 Rm9yRnJhbWUod2ViUGFnZSwgbV9mcmFtZSk7CiAKKyAgICB3ZWJQYWdlLT5yZWNvbXB1dGVTaG9y dENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHNTdGF0ZSgpOworCiAgICAgLy8gTk9URTogVW5s aWtlIHRoZSBvdGhlciBsYXlvdXQgbm90aWZpY2F0aW9ucywgdGhpcyBkb2VzIG5vdCBub3RpZnkg dGhlCiAgICAgLy8gdGhlIFVJUHJvY2VzcyBmb3IgZXZlcnkgY2FsbC4KIApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IGY4YTg2YWU2NmE4ZjUw NTM4MWM0YTNmODZkMzQ4YjE3NTYwMmE5MmMuLjRhYTFlNDVlOGZmNGViZGI0YjQ0MGFiNmNmYTUw YzE4YjQwZmY0ODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2Vi UGFnZS5jcHAKQEAgLTIwNiw2ICsyMDYsOCBAQCBXZWJQYWdlOjpXZWJQYWdlKHVpbnQ2NF90IHBh Z2VJRCwgY29uc3QgV2ViUGFnZUNyZWF0aW9uUGFyYW1ldGVycyYgcGFyYW1ldGVycykKICAgICAs IG1faXNSdW5uaW5nTW9kYWwoZmFsc2UpCiAgICAgLCBtX2NhY2hlZE1haW5GcmFtZUlzUGlubmVk VG9MZWZ0U2lkZShmYWxzZSkKICAgICAsIG1fY2FjaGVkTWFpbkZyYW1lSXNQaW5uZWRUb1JpZ2h0 U2lkZShmYWxzZSkKKyAgICAsIG1fY2FuU2hvcnRDaXJjdWl0SG9yaXpvbnRhbFdoZWVsRXZlbnRz KGZhbHNlKQorICAgICwgbV9udW1XaGVlbEV2ZW50SGFuZGxlcnMoMCkKICAgICAsIG1fY2FjaGVk UGFnZUNvdW50KDApCiAgICAgLCBtX2lzU2hvd2luZ0NvbnRleHRNZW51KGZhbHNlKQogI2lmIFBM QVRGT1JNKFdJTikKQEAgLTMwMDAsNiArMzAwMiw2OCBAQCB2b2lkIFdlYlBhZ2U6OmNvbmZpcm1D b21wb3NpdGlvbkZvclRlc3RpbmcoY29uc3QgU3RyaW5nJiBjb21wb3NpdGlvblN0cmluZykKICAg ICBmcmFtZS0+ZWRpdG9yKCktPmNvbmZpcm1Db21wb3NpdGlvbihjb21wb3NpdGlvblN0cmluZyk7 CiB9CiAKK3ZvaWQgV2ViUGFnZTo6bnVtV2hlZWxFdmVudEhhbmRsZXJzQ2hhbmdlZCh1bnNpZ25l ZCBudW1XaGVlbEV2ZW50SGFuZGxlcnMpCit7CisgICAgaWYgKG1fbnVtV2hlZWxFdmVudEhhbmRs ZXJzID09IG51bVdoZWVsRXZlbnRIYW5kbGVycykKKyAgICAgICAgcmV0dXJuOworCisgICAgbV9u dW1XaGVlbEV2ZW50SGFuZGxlcnMgPSBudW1XaGVlbEV2ZW50SGFuZGxlcnM7CisgICAgcmVjb21w dXRlU2hvcnRDaXJjdWl0SG9yaXpvbnRhbFdoZWVsRXZlbnRzU3RhdGUoKTsKK30KKworc3RhdGlj IGJvb2wgaGFzRW5hYmxlZEhvcml6b250YWxTY3JvbGxiYXIoU2Nyb2xsYWJsZUFyZWEqIHNjcm9s bGFibGVBcmVhKQoreworICAgIGlmIChTY3JvbGxiYXIqIHNjcm9sbGJhciA9IHNjcm9sbGFibGVB cmVhLT5ob3Jpem9udGFsU2Nyb2xsYmFyKCkpCisgICAgICAgIHJldHVybiBzY3JvbGxiYXItPmVu YWJsZWQoKTsKKworICAgIHJldHVybiBmYWxzZTsKK30KKworc3RhdGljIGJvb2wgcGFnZUNvbnRh aW5zQW55SG9yaXpvbnRhbFNjcm9sbGJhcnMoRnJhbWUqIG1haW5GcmFtZSkKK3sKKyAgICBpZiAo RnJhbWVWaWV3KiBmcmFtZVZpZXcgPSBtYWluRnJhbWUtPnZpZXcoKSkgeworICAgICAgICBpZiAo aGFzRW5hYmxlZEhvcml6b250YWxTY3JvbGxiYXIoZnJhbWVWaWV3KSkKKyAgICAgICAgICAgIHJl dHVybiB0cnVlOworICAgIH0KKworICAgIGZvciAoRnJhbWUqIGZyYW1lID0gbWFpbkZyYW1lOyBm cmFtZTsgZnJhbWUgPSBmcmFtZS0+dHJlZSgpLT50cmF2ZXJzZU5leHQoKSkgeworICAgICAgICBG cmFtZVZpZXcqIGZyYW1lVmlldyA9IGZyYW1lLT52aWV3KCk7CisgICAgICAgIGlmICghZnJhbWVW aWV3KQorICAgICAgICAgICAgY29udGludWU7CisKKyAgICAgICAgY29uc3QgSGFzaFNldDxTY3Jv bGxhYmxlQXJlYSo+KiBzY3JvbGxhYmxlQXJlYXMgPSBmcmFtZVZpZXctPnNjcm9sbGFibGVBcmVh cygpOworICAgICAgICBpZiAoIXNjcm9sbGFibGVBcmVhcykKKyAgICAgICAgICAgIGNvbnRpbnVl OworCisgICAgICAgIGZvciAoSGFzaFNldDxTY3JvbGxhYmxlQXJlYSo+Ojpjb25zdF9pdGVyYXRv ciBpdCA9IHNjcm9sbGFibGVBcmVhcy0+YmVnaW4oKSwgZW5kID0gc2Nyb2xsYWJsZUFyZWFzLT5l bmQoKTsgaXQgIT0gZW5kOyArK2l0KSB7CisgICAgICAgICAgICBTY3JvbGxhYmxlQXJlYSogc2Ny b2xsYWJsZUFyZWEgPSAqaXQ7CisgICAgICAgICAgICBBU1NFUlQoc2Nyb2xsYWJsZUFyZWEtPmlz T25BY3RpdmVQYWdlKCkpOworCisgICAgICAgICAgICBpZiAoaGFzRW5hYmxlZEhvcml6b250YWxT Y3JvbGxiYXIoc2Nyb2xsYWJsZUFyZWEpKQorICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwor ICAgICAgICB9CisgICAgfQorCisgICAgcmV0dXJuIGZhbHNlOworfQorCit2b2lkIFdlYlBhZ2U6 OnJlY29tcHV0ZVNob3J0Q2lyY3VpdEhvcml6b250YWxXaGVlbEV2ZW50c1N0YXRlKCkKK3sKKyAg ICBib29sIGNhblNob3J0Q2lyY3VpdEhvcml6b250YWxXaGVlbEV2ZW50cyA9ICFtX251bVdoZWVs RXZlbnRIYW5kbGVyczsKKworICAgIGlmIChjYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxF dmVudHMpIHsKKyAgICAgICAgLy8gQ2hlY2sgaWYgd2UgaGF2ZSBhbnkgaG9yaXpvbnRhbCBzY3Jv bGwgYmFycyBvbiB0aGUgcGFnZS4KKyAgICAgICAgaWYgKHBhZ2VDb250YWluc0FueUhvcml6b250 YWxTY3JvbGxiYXJzKG1haW5GcmFtZSgpKSkKKyAgICAgICAgICAgIGNhblNob3J0Q2lyY3VpdEhv cml6b250YWxXaGVlbEV2ZW50cyA9IGZhbHNlOworICAgIH0KKworICAgIGlmIChtX2NhblNob3J0 Q2lyY3VpdEhvcml6b250YWxXaGVlbEV2ZW50cyA9PSBjYW5TaG9ydENpcmN1aXRIb3Jpem9udGFs V2hlZWxFdmVudHMpCisgICAgICAgIHJldHVybjsKKworICAgIG1fY2FuU2hvcnRDaXJjdWl0SG9y aXpvbnRhbFdoZWVsRXZlbnRzID0gY2FuU2hvcnRDaXJjdWl0SG9yaXpvbnRhbFdoZWVsRXZlbnRz OworICAgIHNlbmQoTWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6U2V0Q2FuU2hvcnRDaXJjdWl0SG9y aXpvbnRhbFdoZWVsRXZlbnRzKG1fY2FuU2hvcnRDaXJjdWl0SG9yaXpvbnRhbFdoZWVsRXZlbnRz KSk7Cit9CisKIEZyYW1lKiBXZWJQYWdlOjptYWluRnJhbWUoKSBjb25zdAogewogICAgIHJldHVy biBtX3BhZ2UgPyBtX3BhZ2UtPm1haW5GcmFtZSgpIDogMDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQ cm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCmluZGV4IGI1ZGQ1NjBhMDk1YTZmNWYwNTIwZTAzY2Y4 M2JlODU3NDdiNzRiOTAuLmFhMWU1N2YwODExNzA3MDhiOGNlZmM4MzNiYTNmMDJiMTZiYWE1MzEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmgK KysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaApAQCAtNTAw LDYgKzUwMCw5IEBAIHB1YmxpYzoKICAgICB2b2lkIGdlc3R1cmVFdmVudChjb25zdCBXZWJHZXN0 dXJlRXZlbnQmKTsKICNlbmRpZgogCisgICAgdm9pZCBudW1XaGVlbEV2ZW50SGFuZGxlcnNDaGFu Z2VkKHVuc2lnbmVkKTsKKyAgICB2b2lkIHJlY29tcHV0ZVNob3J0Q2lyY3VpdEhvcml6b250YWxX aGVlbEV2ZW50c1N0YXRlKCk7CisKIHByaXZhdGU6CiAgICAgV2ViUGFnZSh1aW50NjRfdCBwYWdl SUQsIGNvbnN0IFdlYlBhZ2VDcmVhdGlvblBhcmFtZXRlcnMmKTsKIApAQCAtNzU2LDYgKzc1OSw4 IEBAIHByaXZhdGU6CiAKICAgICBib29sIG1fY2FjaGVkTWFpbkZyYW1lSXNQaW5uZWRUb0xlZnRT aWRlOwogICAgIGJvb2wgbV9jYWNoZWRNYWluRnJhbWVJc1Bpbm5lZFRvUmlnaHRTaWRlOworICAg IGJvb2wgbV9jYW5TaG9ydENpcmN1aXRIb3Jpem9udGFsV2hlZWxFdmVudHM7CisgICAgdW5zaWdu ZWQgbV9udW1XaGVlbEV2ZW50SGFuZGxlcnM7CiAKICAgICB1bnNpZ25lZCBtX2NhY2hlZFBhZ2VD b3VudDsKIAo=