80539 2012-03-07 14:10:22 -0800 Change remaining scroll methods to integers 2012-03-07 16:00:31 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 60318 1 eae eae eric jamesr jchaffraix leviw simon.fraser tkent webkit.review.bot oldest_to_newest 573227 0 eae 2012-03-07 14:10:22 -0800 Scroll offsets are already represented as integers to align with device pixels. Change the renaming scroll methods back to ints to be consistent and to ensure that the appropriate pixel snapped values are always used. 573257 1 130697 eae 2012-03-07 14:42:42 -0800 Created attachment 130697 Patch 573260 2 130697 eric 2012-03-07 14:46:45 -0800 Comment on attachment 130697 Patch OK 573264 3 130697 eae 2012-03-07 14:47:53 -0800 Comment on attachment 130697 Patch Thanks Eric! 573333 4 130697 webkit.review.bot 2012-03-07 16:00:27 -0800 Comment on attachment 130697 Patch Clearing flags on attachment: 130697 Committed r110120: <http://trac.webkit.org/changeset/110120> 573334 5 webkit.review.bot 2012-03-07 16:00:31 -0800 All reviewed patches have been landed. Closing bug. 130697 2012-03-07 14:42:42 -0800 2012-03-07 16:00:27 -0800 Patch bug-80539-20120307144241.patch text/plain 14038 eae SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDExMDEwMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM5IEBACisyMDEyLTAzLTA3ICBFbWlsIEEg RWtsdW5kICA8ZWFlQGNocm9taXVtLm9yZz4KKworICAgICAgICBDaGFuZ2UgcmVtYWluaW5nIHNj cm9sbCBtZXRob2RzIHRvIGludGVnZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04MDUzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgbm8gbmV3IGZ1bmN0aW9uYWxpdHkuCisKKyAg ICAgICAgKiByZW5kZXJpbmcvUmVuZGVyTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVu ZGVyTGF5ZXI6OnNjcm9sbEJ5UmVjdXJzaXZlbHkpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy TGF5ZXI6OnNjcm9sbFRvT2Zmc2V0KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpz Y3JvbGxSZWN0VG9WaXNpYmxlKToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpzY3Jv bGxUb1hPZmZzZXQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnNjcm9sbFRvWU9m ZnNldCk6CisgICAgICAgIENoYW5nZSBzY3JvbGxUbyBtZXRob2RzIHRvIHRha2UgaW50ZWdlciB4 IGFuZCB5IHZhbHVlcyBhcyB0aGUgYWN0dWFsCisgICAgICAgIHNjcm9sbGluZyBpcyBkb25lIGlu IGluY3JlbWVudHMgb2YgZnVsbCBwaXhlbHMuCisgICAgICAgIAorICAgICAgICAoV2ViQ29yZTo6 Y29ybmVyU3RhcnQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyTGF5ZXI6OnNjcm9sbFdpZHRo KToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxheWVyOjpzY3JvbGxIZWlnaHQpOgorICAgICAg ICBDaGFuZ2Ugc2Nyb2xsV2lkdGgvSGVpZ2h0IHRvIHJldHVybiBwaXhlbCBzbmFwcGVkIHZhbHVl cyBhbmQgcmVtb3ZlCisgICAgICAgIHBpeGVsU25hcHBlZCB2ZXJzaW9ucyBvZiBzYW1lIGFzIGFs bCBjYWxsZXJzIGVpdGhlciB1c2VkIHNuYXBwZWQgdGhlCisgICAgICAgIHZhbHVlcyBvciB1c2Vk IHRoZSBwaXhlbFNuYXBwZWQgdmVyc2lvbnMgb2YgdGhlc2UgbWV0aG9kcy4KKworICAgICAgICAq IHJlbmRlcmluZy9SZW5kZXJMaXN0Qm94LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckxp c3RCb3g6OnNjcm9sbFdpZHRoKToKKyAgICAgICAgQ2hhbmdlIHNjcm9sbFdpZHRoIHRvIHJldHVy biBzbmFwcGVkIGNsaWVudCB3aWR0aC4KKyAgICAgICAgCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckxpc3RCb3guaDoKKyAgICAgICAgQ2hhbmdlIHNjcm9sbFNpemUsIHNjcm9sbFBvc2l0aW9u IGFuZCBzZXRTY3JvbGxPZmZzZXQgbWV0aG9kcyB0byB1c2UKKyAgICAgICAgaW50ZWdlcnMgaW4g YWNjb3JkYW5jZSB3aXRoIHRoZSBpbnRlcmZhY2UgZGVmaW5lZCBieSBTY3JvbGxhYmxlQXJlYS4K KyAgICAgICAgCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlclRyZWVBc1RleHQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6d3JpdGUpOgorCiAyMDEyLTAzLTA3ICBOYXQgRHVjYSAgPG5kdWNhQGNo cm9taXVtLm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIFJlbW92ZSB1bnVzZWQgd2FzUmVjcmVh dGUgdmFyaWFibGUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmNw cAkocmV2aXNpb24gMTA5OTg1KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxh eWVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTM4Nyw3ICsxMzg3LDcgQEAgdm9pZCBSZW5kZXJM YXllcjo6cGFuU2Nyb2xsRnJvbVBvaW50KGNvbgogICAgIHNjcm9sbEJ5UmVjdXJzaXZlbHkoYWRq dXN0ZWRTY3JvbGxEZWx0YSh4RGVsdGEpLCBhZGp1c3RlZFNjcm9sbERlbHRhKHlEZWx0YSksIFNj cm9sbE9mZnNldENsYW1wZWQpOwogfQogCi12b2lkIFJlbmRlckxheWVyOjpzY3JvbGxCeVJlY3Vy c2l2ZWx5KExheW91dFVuaXQgeERlbHRhLCBMYXlvdXRVbml0IHlEZWx0YSwgU2Nyb2xsT2Zmc2V0 Q2xhbXBpbmcgY2xhbXApCit2b2lkIFJlbmRlckxheWVyOjpzY3JvbGxCeVJlY3Vyc2l2ZWx5KGlu dCB4RGVsdGEsIGludCB5RGVsdGEsIFNjcm9sbE9mZnNldENsYW1waW5nIGNsYW1wKQogewogICAg IGlmICgheERlbHRhICYmICF5RGVsdGEpCiAgICAgICAgIHJldHVybjsKQEAgLTEzOTcsMTMgKzEz OTcsMTMgQEAgdm9pZCBSZW5kZXJMYXllcjo6c2Nyb2xsQnlSZWN1cnNpdmVseShMYQogICAgICAg ICByZXN0cmljdGVkQnlMaW5lQ2xhbXAgPSAhcmVuZGVyZXIoKS0+cGFyZW50KCktPnN0eWxlKCkt PmxpbmVDbGFtcCgpLmlzTm9uZSgpOwogCiAgICAgaWYgKHJlbmRlcmVyKCktPmhhc092ZXJmbG93 Q2xpcCgpICYmICFyZXN0cmljdGVkQnlMaW5lQ2xhbXApIHsKLSAgICAgICAgTGF5b3V0VW5pdCBu ZXdPZmZzZXRYID0gc2Nyb2xsWE9mZnNldCgpICsgeERlbHRhOwotICAgICAgICBMYXlvdXRVbml0 IG5ld09mZnNldFkgPSBzY3JvbGxZT2Zmc2V0KCkgKyB5RGVsdGE7CisgICAgICAgIGludCBuZXdP ZmZzZXRYID0gc2Nyb2xsWE9mZnNldCgpICsgeERlbHRhOworICAgICAgICBpbnQgbmV3T2Zmc2V0 WSA9IHNjcm9sbFlPZmZzZXQoKSArIHlEZWx0YTsKICAgICAgICAgc2Nyb2xsVG9PZmZzZXQobmV3 T2Zmc2V0WCwgbmV3T2Zmc2V0WSwgY2xhbXApOwogCiAgICAgICAgIC8vIElmIHRoaXMgbGF5ZXIg Y2FuJ3QgZG8gdGhlIHNjcm9sbCB3ZSBhc2sgdGhlIG5leHQgbGF5ZXIgdXAgdGhhdCBjYW4gc2Ny b2xsIHRvIHRyeQotICAgICAgICBMYXlvdXRVbml0IGxlZnRUb1Njcm9sbFggPSBuZXdPZmZzZXRY IC0gc2Nyb2xsWE9mZnNldCgpOwotICAgICAgICBMYXlvdXRVbml0IGxlZnRUb1Njcm9sbFkgPSBu ZXdPZmZzZXRZIC0gc2Nyb2xsWU9mZnNldCgpOworICAgICAgICBpbnQgbGVmdFRvU2Nyb2xsWCA9 IG5ld09mZnNldFggLSBzY3JvbGxYT2Zmc2V0KCk7CisgICAgICAgIGludCBsZWZ0VG9TY3JvbGxZ ID0gbmV3T2Zmc2V0WSAtIHNjcm9sbFlPZmZzZXQoKTsKICAgICAgICAgaWYgKChsZWZ0VG9TY3Jv bGxYIHx8IGxlZnRUb1Njcm9sbFkpICYmIHJlbmRlcmVyKCktPnBhcmVudCgpKSB7CiAgICAgICAg ICAgICBpZiAoUmVuZGVyTGF5ZXIqIHNjcm9sbGFibGVMYXllciA9IGVuY2xvc2luZ1Njcm9sbGFi bGVMYXllcigpKQogICAgICAgICAgICAgICAgIHNjcm9sbGFibGVMYXllci0+c2Nyb2xsQnlSZWN1 cnNpdmVseShsZWZ0VG9TY3JvbGxYLCBsZWZ0VG9TY3JvbGxZKTsKQEAgLTE0MjEsMjEgKzE0MjEs MjEgQEAgdm9pZCBSZW5kZXJMYXllcjo6c2Nyb2xsQnlSZWN1cnNpdmVseShMYQogICAgIH0KIH0K IAotdm9pZCBSZW5kZXJMYXllcjo6c2Nyb2xsVG9PZmZzZXQoTGF5b3V0VW5pdCB4LCBMYXlvdXRV bml0IHksIFNjcm9sbE9mZnNldENsYW1waW5nIGNsYW1wKQordm9pZCBSZW5kZXJMYXllcjo6c2Ny b2xsVG9PZmZzZXQoaW50IHgsIGludCB5LCBTY3JvbGxPZmZzZXRDbGFtcGluZyBjbGFtcCkKIHsK ICAgICBpZiAoY2xhbXAgPT0gU2Nyb2xsT2Zmc2V0Q2xhbXBlZCkgewogICAgICAgICBSZW5kZXJC b3gqIGJveCA9IHJlbmRlckJveCgpOwogICAgICAgICBpZiAoIWJveCkKICAgICAgICAgICAgIHJl dHVybjsKIAotICAgICAgICBMYXlvdXRVbml0IG1heFggPSBzY3JvbGxXaWR0aCgpIC0gYm94LT5j bGllbnRXaWR0aCgpOwotICAgICAgICBMYXlvdXRVbml0IG1heFkgPSBzY3JvbGxIZWlnaHQoKSAt IGJveC0+Y2xpZW50SGVpZ2h0KCk7CisgICAgICAgIGludCBtYXhYID0gc2Nyb2xsV2lkdGgoKSAt IGJveC0+Y2xpZW50V2lkdGgoKTsKKyAgICAgICAgaW50IG1heFkgPSBzY3JvbGxIZWlnaHQoKSAt IGJveC0+Y2xpZW50SGVpZ2h0KCk7CiAKLSAgICAgICAgeCA9IG1pbihtYXg8TGF5b3V0VW5pdD4o eCwgMCksIG1heFgpOwotICAgICAgICB5ID0gbWluKG1heDxMYXlvdXRVbml0Pih5LCAwKSwgbWF4 WSk7CisgICAgICAgIHggPSBtaW4obWF4KHgsIDApLCBtYXhYKTsKKyAgICAgICAgeSA9IG1pbiht YXgoeSwgMCksIG1heFkpOwogICAgIH0KIAotICAgIExheW91dFBvaW50IG5ld1Njcm9sbE9mZnNl dCh4LCB5KTsKKyAgICBJbnRQb2ludCBuZXdTY3JvbGxPZmZzZXQoeCwgeSk7CiAgICAgaWYgKG5l d1Njcm9sbE9mZnNldCAhPSBMYXlvdXRQb2ludChzY3JvbGxYT2Zmc2V0KCksIHNjcm9sbFlPZmZz ZXQoKSkpCiAgICAgICAgIHNjcm9sbFRvT2Zmc2V0V2l0aG91dEFuaW1hdGlvbihuZXdTY3JvbGxP ZmZzZXQpOwogfQpAQCAtMTU1Niw4ICsxNTU2LDggQEAgdm9pZCBSZW5kZXJMYXllcjo6c2Nyb2xs UmVjdFRvVmlzaWJsZShjbwogICAgICAgICBpbnQgeU9mZnNldCA9IHJvdW5kVG9JbnQoYWRqdXN0 ZWRZKTsKICAgICAgICAgCiAgICAgICAgIGlmICh4T2Zmc2V0ICE9IHNjcm9sbFhPZmZzZXQoKSB8 fCB5T2Zmc2V0ICE9IHNjcm9sbFlPZmZzZXQoKSkgewotICAgICAgICAgICAgTGF5b3V0VW5pdCBk aWZmWCA9IHNjcm9sbFhPZmZzZXQoKTsKLSAgICAgICAgICAgIExheW91dFVuaXQgZGlmZlkgPSBz Y3JvbGxZT2Zmc2V0KCk7CisgICAgICAgICAgICBpbnQgZGlmZlggPSBzY3JvbGxYT2Zmc2V0KCk7 CisgICAgICAgICAgICBpbnQgZGlmZlkgPSBzY3JvbGxZT2Zmc2V0KCk7CiAgICAgICAgICAgICBz Y3JvbGxUb09mZnNldCh4T2Zmc2V0LCB5T2Zmc2V0KTsKICAgICAgICAgICAgIGRpZmZYID0gc2Ny b2xsWE9mZnNldCgpIC0gZGlmZlg7CiAgICAgICAgICAgICBkaWZmWSA9IHNjcm9sbFlPZmZzZXQo KSAtIGRpZmZZOwpAQCAtMTU4Myw4ICsxNTgzLDggQEAgdm9pZCBSZW5kZXJMYXllcjo6c2Nyb2xs UmVjdFRvVmlzaWJsZShjbwogICAgICAgICAgICAgICAgICAgICBpbnQgeE9mZnNldCA9IHJvdW5k VG9JbnQoZXhwb3NlUmVjdC54KCkpOwogICAgICAgICAgICAgICAgICAgICBpbnQgeU9mZnNldCA9 IHJvdW5kVG9JbnQoZXhwb3NlUmVjdC55KCkpOwogICAgICAgICAgICAgICAgICAgICAvLyBBZGp1 c3Qgb2Zmc2V0cyBpZiB0aGV5J3JlIG91dHNpZGUgb2YgdGhlIGFsbG93YWJsZSByYW5nZS4KLSAg ICAgICAgICAgICAgICAgICAgeE9mZnNldCA9IG1heDxMYXlvdXRVbml0PigwLCBtaW4oZnJhbWVW aWV3LT5jb250ZW50c1dpZHRoKCksIHhPZmZzZXQpKTsKLSAgICAgICAgICAgICAgICAgICAgeU9m ZnNldCA9IG1heDxMYXlvdXRVbml0PigwLCBtaW4oZnJhbWVWaWV3LT5jb250ZW50c0hlaWdodCgp LCB5T2Zmc2V0KSk7CisgICAgICAgICAgICAgICAgICAgIHhPZmZzZXQgPSBtYXgoMCwgbWluKGZy YW1lVmlldy0+Y29udGVudHNXaWR0aCgpLCB4T2Zmc2V0KSk7CisgICAgICAgICAgICAgICAgICAg IHlPZmZzZXQgPSBtYXgoMCwgbWluKGZyYW1lVmlldy0+Y29udGVudHNIZWlnaHQoKSwgeU9mZnNl dCkpOwogCiAgICAgICAgICAgICAgICAgICAgIGZyYW1lVmlldy0+c2V0U2Nyb2xsUG9zaXRpb24o SW50UG9pbnQoeE9mZnNldCwgeU9mZnNldCkpOwogICAgICAgICAgICAgICAgICAgICBwYXJlbnRM YXllciA9IG93bmVyRWxlbWVudC0+cmVuZGVyZXIoKS0+ZW5jbG9zaW5nTGF5ZXIoKTsKQEAgLTE4 MzMsNyArMTgzMyw3IEBAIGJvb2wgUmVuZGVyTGF5ZXI6OmlzQWN0aXZlKCkgY29uc3QKICAgICBy ZXR1cm4gcGFnZSAmJiBwYWdlLT5mb2N1c0NvbnRyb2xsZXIoKS0+aXNBY3RpdmUoKTsKIH0KIAot c3RhdGljIExheW91dFVuaXQgY29ybmVyU3RhcnQoY29uc3QgUmVuZGVyTGF5ZXIqIGxheWVyLCBp bnQgbWluWCwgaW50IG1heFgsIGludCB0aGlja25lc3MpCitzdGF0aWMgaW50IGNvcm5lclN0YXJ0 KGNvbnN0IFJlbmRlckxheWVyKiBsYXllciwgaW50IG1pblgsIGludCBtYXhYLCBpbnQgdGhpY2tu ZXNzKQogewogICAgIGlmIChsYXllci0+cmVuZGVyZXIoKS0+c3R5bGUoKS0+c2hvdWxkUGxhY2VC bG9ja0RpcmVjdGlvblNjcm9sbGJhck9uTG9naWNhbExlZnQoKSkKICAgICAgICAgcmV0dXJuIG1p blggKyBsYXllci0+cmVuZGVyZXIoKS0+c3R5bGUoKS0+Ym9yZGVyTGVmdFdpZHRoKCk7CkBAIC0y MjQwLDMwICsyMjQwLDIwIEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnBvc2l0aW9uT3ZlcmZsb3dDb250 cm8KICAgICAgICAgbV9yZXNpemVyLT5zZXRGcmFtZVJlY3QocmVzaXplckNvcm5lclJlY3QodGhp cywgYm9yZGVyQm94KSk7CiB9CiAKLUxheW91dFVuaXQgUmVuZGVyTGF5ZXI6OnNjcm9sbFdpZHRo KCkKK2ludCBSZW5kZXJMYXllcjo6c2Nyb2xsV2lkdGgoKQogewogICAgIGlmIChtX3Njcm9sbERp bWVuc2lvbnNEaXJ0eSkKICAgICAgICAgY29tcHV0ZVNjcm9sbERpbWVuc2lvbnMoKTsKICAgICBy ZXR1cm4gbV9zY3JvbGxTaXplLndpZHRoKCk7CiB9CiAKLUxheW91dFVuaXQgUmVuZGVyTGF5ZXI6 OnNjcm9sbEhlaWdodCgpCitpbnQgUmVuZGVyTGF5ZXI6OnNjcm9sbEhlaWdodCgpCiB7CiAgICAg aWYgKG1fc2Nyb2xsRGltZW5zaW9uc0RpcnR5KQogICAgICAgICBjb21wdXRlU2Nyb2xsRGltZW5z aW9ucygpOwogICAgIHJldHVybiBtX3Njcm9sbFNpemUuaGVpZ2h0KCk7CiB9CiAKLWludCBSZW5k ZXJMYXllcjo6cGl4ZWxTbmFwcGVkU2Nyb2xsV2lkdGgoKQotewotICAgIHJldHVybiBzY3JvbGxX aWR0aCgpOwotfQotCi1pbnQgUmVuZGVyTGF5ZXI6OnBpeGVsU25hcHBlZFNjcm9sbEhlaWdodCgp Ci17Ci0gICAgcmV0dXJuIHNjcm9sbEhlaWdodCgpOwotfQotCiBMYXlvdXRVbml0IFJlbmRlckxh eWVyOjpvdmVyZmxvd1RvcCgpIGNvbnN0CiB7CiAgICAgUmVuZGVyQm94KiBib3ggPSByZW5kZXJC b3goKTsKQEAgLTIzMTIsOSArMjMwMiw5IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OmNvbXB1dGVTY3Jv bGxEaW1lbnNpb24KICAgICBzZXRTY3JvbGxPcmlnaW4oSW50UG9pbnQoLW1fc2Nyb2xsT3ZlcmZs b3cud2lkdGgoKSwgLW1fc2Nyb2xsT3ZlcmZsb3cuaGVpZ2h0KCkpKTsKIAogICAgIGlmIChuZWVk SEJhcikKLSAgICAgICAgKm5lZWRIQmFyID0gcGl4ZWxTbmFwcGVkU2Nyb2xsV2lkdGgoKSA+IGJv eC0+cGl4ZWxTbmFwcGVkQ2xpZW50V2lkdGgoKTsKKyAgICAgICAgKm5lZWRIQmFyID0gc2Nyb2xs V2lkdGgoKSA+IGJveC0+cGl4ZWxTbmFwcGVkQ2xpZW50V2lkdGgoKTsKICAgICBpZiAobmVlZFZC YXIpCi0gICAgICAgICpuZWVkVkJhciA9IHBpeGVsU25hcHBlZFNjcm9sbEhlaWdodCgpID4gYm94 LT5waXhlbFNuYXBwZWRDbGllbnRIZWlnaHQoKTsKKyAgICAgICAgKm5lZWRWQmFyID0gc2Nyb2xs SGVpZ2h0KCkgPiBib3gtPnBpeGVsU25hcHBlZENsaWVudEhlaWdodCgpOwogfQogCiB2b2lkIFJl bmRlckxheWVyOjp1cGRhdGVTY3JvbGxJbmZvQWZ0ZXJMYXlvdXQoKQpAQCAtMjMzMiw4ICsyMzIy LDggQEAgdm9pZCBSZW5kZXJMYXllcjo6dXBkYXRlU2Nyb2xsSW5mb0FmdGVyTAogICAgIGlmIChi b3gtPnN0eWxlKCktPm92ZXJmbG93WCgpICE9IE9NQVJRVUVFKSB7CiAgICAgICAgIC8vIExheW91 dCBtYXkgY2F1c2UgdXMgdG8gYmUgaW4gYW4gaW52YWxpZCBzY3JvbGwgcG9zaXRpb24uICBJbiB0 aGlzIGNhc2Ugd2UgbmVlZAogICAgICAgICAvLyB0byBwdWxsIG91ciBzY3JvbGwgb2Zmc2V0cyBi YWNrIHRvIHRoZSBtYXggKG9yIHB1c2ggdGhlbSB1cCB0byB0aGUgbWluKS4KLSAgICAgICAgaW50 IG5ld1ggPSBtYXgoMCwgbWluKHNjcm9sbFhPZmZzZXQoKSwgc2Nyb2xsV2lkdGgoKSAtIGJveC0+ Y2xpZW50V2lkdGgoKSkpOwotICAgICAgICBpbnQgbmV3WSA9IG1heCgwLCBtaW4oc2Nyb2xsWU9m ZnNldCgpLCBzY3JvbGxIZWlnaHQoKSAtIGJveC0+Y2xpZW50SGVpZ2h0KCkpKTsKKyAgICAgICAg aW50IG5ld1ggPSBtYXgoMCwgbWluPGludD4oc2Nyb2xsWE9mZnNldCgpLCBzY3JvbGxXaWR0aCgp IC0gYm94LT5jbGllbnRXaWR0aCgpKSk7CisgICAgICAgIGludCBuZXdZID0gbWF4KDAsIG1pbjxp bnQ+KHNjcm9sbFlPZmZzZXQoKSwgc2Nyb2xsSGVpZ2h0KCkgLSBib3gtPmNsaWVudEhlaWdodCgp KSk7CiAgICAgICAgIGlmIChuZXdYICE9IHNjcm9sbFhPZmZzZXQoKSB8fCBuZXdZICE9IHNjcm9s bFlPZmZzZXQoKSkKICAgICAgICAgICAgIHNjcm9sbFRvT2Zmc2V0KG5ld1gsIG5ld1kpOwogICAg IH0KQEAgLTI0MDksNyArMjM5OSw3IEBAIHZvaWQgUmVuZGVyTGF5ZXI6OnVwZGF0ZVNjcm9sbElu Zm9BZnRlckwKICAgICB9CiAKICAgICBpZiAoc2Nyb2xsT2Zmc2V0T3JpZ2luYWwgIT0gc2Nyb2xs T2Zmc2V0KCkpCi0gICAgICAgIHNjcm9sbFRvT2Zmc2V0V2l0aG91dEFuaW1hdGlvbihMYXlvdXRQ b2ludChzY3JvbGxYT2Zmc2V0KCksIHNjcm9sbFlPZmZzZXQoKSkpOworICAgICAgICBzY3JvbGxU b09mZnNldFdpdGhvdXRBbmltYXRpb24oSW50UG9pbnQoc2Nyb2xsWE9mZnNldCgpLCBzY3JvbGxZ T2Zmc2V0KCkpKTsKIH0KIAogdm9pZCBSZW5kZXJMYXllcjo6cGFpbnRPdmVyZmxvd0NvbnRyb2xz KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50UG9pbnQmIHBhaW50T2Zmc2V0LCBj b25zdCBJbnRSZWN0JiBkYW1hZ2VSZWN0LCBib29sIHBhaW50aW5nT3ZlcmxheUNvbnRyb2xzKQpJ bmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyLmgJKHJldmlzaW9uIDEwOTk4 NSkKKysrIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllci5oCSh3b3JraW5nIGNv cHkpCkBAIC0yODAsMTAgKzI4MCw4IEBAIHB1YmxpYzoKIAogICAgIExheW91dFJlY3QgcmVjdCgp IGNvbnN0IHsgcmV0dXJuIExheW91dFJlY3QobG9jYXRpb24oKSwgc2l6ZSgpKTsgfQogCi0gICAg TGF5b3V0VW5pdCBzY3JvbGxXaWR0aCgpOwotICAgIExheW91dFVuaXQgc2Nyb2xsSGVpZ2h0KCk7 Ci0gICAgaW50IHBpeGVsU25hcHBlZFNjcm9sbFdpZHRoKCk7Ci0gICAgaW50IHBpeGVsU25hcHBl ZFNjcm9sbEhlaWdodCgpOworICAgIGludCBzY3JvbGxXaWR0aCgpOworICAgIGludCBzY3JvbGxI ZWlnaHQoKTsKIAogICAgIHZvaWQgcGFuU2Nyb2xsRnJvbVBvaW50KGNvbnN0IExheW91dFBvaW50 Jik7CiAKQEAgLTI5MywxNSArMjkxLDE1IEBAIHB1YmxpYzoKICAgICB9OwogCiAgICAgLy8gU2Ny b2xsaW5nIG1ldGhvZHMgZm9yIGxheWVycyB0aGF0IGNhbiBzY3JvbGwgdGhlaXIgb3ZlcmZsb3cu Ci0gICAgdm9pZCBzY3JvbGxCeVJlY3Vyc2l2ZWx5KExheW91dFVuaXQgeERlbHRhLCBMYXlvdXRV bml0IHlEZWx0YSwgU2Nyb2xsT2Zmc2V0Q2xhbXBpbmcgPSBTY3JvbGxPZmZzZXRVbmNsYW1wZWQp OworICAgIHZvaWQgc2Nyb2xsQnlSZWN1cnNpdmVseShpbnQgeERlbHRhLCBpbnQgeURlbHRhLCBT Y3JvbGxPZmZzZXRDbGFtcGluZyA9IFNjcm9sbE9mZnNldFVuY2xhbXBlZCk7CiAKICAgICBpbnQg c2Nyb2xsWE9mZnNldCgpIGNvbnN0IHsgcmV0dXJuIG1fc2Nyb2xsT2Zmc2V0LndpZHRoKCkgKyBz Y3JvbGxPcmlnaW4oKS54KCk7IH0KICAgICBpbnQgc2Nyb2xsWU9mZnNldCgpIGNvbnN0IHsgcmV0 dXJuIG1fc2Nyb2xsT2Zmc2V0LmhlaWdodCgpICsgc2Nyb2xsT3JpZ2luKCkueSgpOyB9CiAgICAg SW50U2l6ZSBzY3JvbGxPZmZzZXQoKSBjb25zdCB7IHJldHVybiBJbnRTaXplKHNjcm9sbFhPZmZz ZXQoKSwgc2Nyb2xsWU9mZnNldCgpKTsgfQogCi0gICAgdm9pZCBzY3JvbGxUb09mZnNldChMYXlv dXRVbml0LCBMYXlvdXRVbml0LCBTY3JvbGxPZmZzZXRDbGFtcGluZyA9IFNjcm9sbE9mZnNldFVu Y2xhbXBlZCk7Ci0gICAgdm9pZCBzY3JvbGxUb1hPZmZzZXQoTGF5b3V0VW5pdCB4LCBTY3JvbGxP ZmZzZXRDbGFtcGluZyBjbGFtcCA9IFNjcm9sbE9mZnNldFVuY2xhbXBlZCkgeyBzY3JvbGxUb09m ZnNldCh4LCBzY3JvbGxZT2Zmc2V0KCksIGNsYW1wKTsgfQotICAgIHZvaWQgc2Nyb2xsVG9ZT2Zm c2V0KExheW91dFVuaXQgeSwgU2Nyb2xsT2Zmc2V0Q2xhbXBpbmcgY2xhbXAgPSBTY3JvbGxPZmZz ZXRVbmNsYW1wZWQpIHsgc2Nyb2xsVG9PZmZzZXQoc2Nyb2xsWE9mZnNldCgpLCB5LCBjbGFtcCk7 IH0KKyAgICB2b2lkIHNjcm9sbFRvT2Zmc2V0KGludCwgaW50LCBTY3JvbGxPZmZzZXRDbGFtcGlu ZyA9IFNjcm9sbE9mZnNldFVuY2xhbXBlZCk7CisgICAgdm9pZCBzY3JvbGxUb1hPZmZzZXQoaW50 IHgsIFNjcm9sbE9mZnNldENsYW1waW5nIGNsYW1wID0gU2Nyb2xsT2Zmc2V0VW5jbGFtcGVkKSB7 IHNjcm9sbFRvT2Zmc2V0KHgsIHNjcm9sbFlPZmZzZXQoKSwgY2xhbXApOyB9CisgICAgdm9pZCBz Y3JvbGxUb1lPZmZzZXQoaW50IHksIFNjcm9sbE9mZnNldENsYW1waW5nIGNsYW1wID0gU2Nyb2xs T2Zmc2V0VW5jbGFtcGVkKSB7IHNjcm9sbFRvT2Zmc2V0KHNjcm9sbFhPZmZzZXQoKSwgeSwgY2xh bXApOyB9CiAKICAgICB2b2lkIHNjcm9sbFJlY3RUb1Zpc2libGUoY29uc3QgTGF5b3V0UmVjdCYs IGNvbnN0IFNjcm9sbEFsaWdubWVudCYgYWxpZ25YID0gU2Nyb2xsQWxpZ25tZW50OjphbGlnbkNl bnRlcklmTmVlZGVkLCBjb25zdCBTY3JvbGxBbGlnbm1lbnQmIGFsaWduWSA9IFNjcm9sbEFsaWdu bWVudDo6YWxpZ25DZW50ZXJJZk5lZWRlZCk7CiAKQEAgLTgxOSw3ICs4MTcsNyBAQCBwcm90ZWN0 ZWQ6CiAgICAgLy8gT3VyIHNjcm9sbCBvZmZzZXRzIGlmIHRoZSB2aWV3IGlzIHNjcm9sbGVkLgog ICAgIEludFNpemUgbV9zY3JvbGxPZmZzZXQ7CiAKLSAgICBMYXlvdXRTaXplIG1fc2Nyb2xsT3Zl cmZsb3c7CisgICAgSW50U2l6ZSBtX3Njcm9sbE92ZXJmbG93OwogICAgIAogICAgIC8vIFRoZSB3 aWR0aC9oZWlnaHQgb2Ygb3VyIHNjcm9sbGVkIGFyZWEuCiAgICAgTGF5b3V0U2l6ZSBtX3Njcm9s bFNpemU7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxpc3RCb3guY3Bw CShyZXZpc2lvbiAxMDk5ODUpCisrKyBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGlz dEJveC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY0MywxMCArNjQzLDEwIEBAIGludCBSZW5kZXJM aXN0Qm94Ojp2ZXJ0aWNhbFNjcm9sbGJhcldpZHQKIAogLy8gRklYTUU6IFdlIGlnbm9yZSBwYWRk aW5nIGluIHRoZSB2ZXJ0aWNhbCBkaXJlY3Rpb24gYXMgZmFyIGFzIHRoZXNlIHZhbHVlcyBhcmUg Y29uY2VybmVkLCBzaW5jZSB0aGF0J3MKIC8vIGhvdyB0aGUgY29udHJvbCBjdXJyZW50bHkgcGFp bnRzLgotTGF5b3V0VW5pdCBSZW5kZXJMaXN0Qm94OjpzY3JvbGxXaWR0aCgpIGNvbnN0CitpbnQg UmVuZGVyTGlzdEJveDo6c2Nyb2xsV2lkdGgoKSBjb25zdAogewogICAgIC8vIFRoZXJlIGlzIG5v IGhvcml6b250YWwgc2Nyb2xsaW5nIGFsbG93ZWQuCi0gICAgcmV0dXJuIGNsaWVudFdpZHRoKCk7 CisgICAgcmV0dXJuIHBpeGVsU25hcHBlZENsaWVudFdpZHRoKCk7CiB9CiAKIGludCBSZW5kZXJM aXN0Qm94OjpzY3JvbGxIZWlnaHQoKSBjb25zdApJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxpc3RCb3guaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvUmVuZGVyTGlzdEJveC5oCShyZXZpc2lvbiAxMDk5ODUpCisrKyBTb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyTGlzdEJveC5oCSh3b3JraW5nIGNvcHkpCkBAIC05Nyw5ICs5Nyw5IEBA IHByaXZhdGU6CiAgICAgdmlydHVhbCBib29sIG5vZGVBdFBvaW50KGNvbnN0IEhpdFRlc3RSZXF1 ZXN0JiwgSGl0VGVzdFJlc3VsdCYsIGNvbnN0IExheW91dFBvaW50JiBwb2ludEluQ29udGFpbmVy LCBjb25zdCBMYXlvdXRQb2ludCYgYWNjdW11bGF0ZWRPZmZzZXQsIEhpdFRlc3RBY3Rpb24pOwog CiAgICAgLy8gU2Nyb2xsYWJsZUFyZWEgaW50ZXJmYWNlLgotICAgIHZpcnR1YWwgTGF5b3V0VW5p dCBzY3JvbGxTaXplKFNjcm9sbGJhck9yaWVudGF0aW9uKSBjb25zdDsKLSAgICB2aXJ0dWFsIExh eW91dFVuaXQgc2Nyb2xsUG9zaXRpb24oU2Nyb2xsYmFyKikgY29uc3Q7Ci0gICAgdmlydHVhbCB2 b2lkIHNldFNjcm9sbE9mZnNldChjb25zdCBMYXlvdXRQb2ludCYpOworICAgIHZpcnR1YWwgaW50 IHNjcm9sbFNpemUoU2Nyb2xsYmFyT3JpZW50YXRpb24pIGNvbnN0OworICAgIHZpcnR1YWwgaW50 IHNjcm9sbFBvc2l0aW9uKFNjcm9sbGJhciopIGNvbnN0OworICAgIHZpcnR1YWwgdm9pZCBzZXRT Y3JvbGxPZmZzZXQoY29uc3QgSW50UG9pbnQmKTsKICAgICB2aXJ0dWFsIHZvaWQgaW52YWxpZGF0 ZVNjcm9sbGJhclJlY3QoU2Nyb2xsYmFyKiwgY29uc3QgSW50UmVjdCYpOwogICAgIHZpcnR1YWwg Ym9vbCBpc0FjdGl2ZSgpIGNvbnN0OwogICAgIHZpcnR1YWwgYm9vbCBpc1Njcm9sbENvcm5lclZp c2libGUoKSBjb25zdCB7IHJldHVybiBmYWxzZTsgfSAvLyBXZSBkb24ndCBzdXBwb3J0IHJlc2l6 ZSBvbiBsaXN0IGJveGVzIHlldC4gSWYgd2UgZGlkIHRoZXNlIHdvdWxkIGhhdmUgdG8gY2hhbmdl LgpJbmRleDogU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRyZWVBc1RleHQuY3BwCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUcmVlQXNUZXh0LmNw cAkocmV2aXNpb24gMTA5OTg1KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRy ZWVBc1RleHQuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC02MTYsMTAgKzYxNiwxMCBAQCBzdGF0aWMg dm9pZCB3cml0ZShUZXh0U3RyZWFtJiB0cywgUmVuZGVyCiAgICAgICAgICAgICB0cyA8PCAiIHNj cm9sbFggIiA8PCBsLnNjcm9sbFhPZmZzZXQoKTsKICAgICAgICAgaWYgKGwuc2Nyb2xsWU9mZnNl dCgpKQogICAgICAgICAgICAgdHMgPDwgIiBzY3JvbGxZICIgPDwgbC5zY3JvbGxZT2Zmc2V0KCk7 Ci0gICAgICAgIGlmIChsLnJlbmRlckJveCgpICYmIGwucmVuZGVyQm94KCktPnBpeGVsU25hcHBl ZENsaWVudFdpZHRoKCkgIT0gbC5waXhlbFNuYXBwZWRTY3JvbGxXaWR0aCgpKQotICAgICAgICAg ICAgdHMgPDwgIiBzY3JvbGxXaWR0aCAiIDw8IGwucGl4ZWxTbmFwcGVkU2Nyb2xsV2lkdGgoKTsK LSAgICAgICAgaWYgKGwucmVuZGVyQm94KCkgJiYgbC5yZW5kZXJCb3goKS0+cGl4ZWxTbmFwcGVk Q2xpZW50SGVpZ2h0KCkgIT0gbC5waXhlbFNuYXBwZWRTY3JvbGxIZWlnaHQoKSkKLSAgICAgICAg ICAgIHRzIDw8ICIgc2Nyb2xsSGVpZ2h0ICIgPDwgbC5waXhlbFNuYXBwZWRTY3JvbGxIZWlnaHQo KTsKKyAgICAgICAgaWYgKGwucmVuZGVyQm94KCkgJiYgbC5yZW5kZXJCb3goKS0+cGl4ZWxTbmFw cGVkQ2xpZW50V2lkdGgoKSAhPSBsLnNjcm9sbFdpZHRoKCkpCisgICAgICAgICAgICB0cyA8PCAi IHNjcm9sbFdpZHRoICIgPDwgbC5zY3JvbGxXaWR0aCgpOworICAgICAgICBpZiAobC5yZW5kZXJC b3goKSAmJiBsLnJlbmRlckJveCgpLT5waXhlbFNuYXBwZWRDbGllbnRIZWlnaHQoKSAhPSBsLnNj cm9sbEhlaWdodCgpKQorICAgICAgICAgICAgdHMgPDwgIiBzY3JvbGxIZWlnaHQgIiA8PCBsLnNj cm9sbEhlaWdodCgpOwogICAgIH0KIAogICAgIGlmIChwYWludFBoYXNlID09IExheWVyUGFpbnRQ aGFzZUJhY2tncm91bmQpCg==