52337 2011-01-12 17:04:43 -0800 PlatformWheelEvent should know about the scroll phase on the mac 2011-01-12 17:40:01 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 sam webkit-unassigned abarth buildbot eric webkit-ews webkit.review.bot oldest_to_newest 333434 0 sam 2011-01-12 17:04:43 -0800 It would be helpful for latched scrolling, if PlatformWheelEvent knew the momentum scroll phase of the event it was created from on the mac. 333439 1 78762 sam 2011-01-12 17:09:35 -0800 Created attachment 78762 Patch 333449 2 sam 2011-01-12 17:26:19 -0800 Landed in r75661. 333451 3 webkit-ews 2011-01-12 17:28:29 -0800 Attachment 78762 did not build on qt: Build output: http://queues.webkit.org/results/7583003 333457 4 buildbot 2011-01-12 17:35:46 -0800 Attachment 78762 did not build on win: Build output: http://queues.webkit.org/results/7490006 333459 5 webkit.review.bot 2011-01-12 17:40:01 -0800 http://trac.webkit.org/changeset/75661 might have broken Leopard Intel Debug (Build) and SnowLeopard Intel Release (Build) 78762 2011-01-12 17:09:35 -0800 2011-01-12 17:21:15 -0800 Patch patch.diff text/plain 12395 sam SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc1NjU5KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTEtMDEtMTIgIFNhbSBXZWlu aWcgIDxzYW1Ad2Via2l0Lm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTIz MzcKKyAgICAgICAgUGxhdGZvcm1XaGVlbEV2ZW50IHNob3VsZCBrbm93IGFib3V0IHRoZSBzY3Jv bGwgcGhhc2Ugb24gdGhlIE1hYworCisgICAgICAgIEFkZCBhIHBoYXNlIHBhcmFtZXRlciBvbiBN YWMgUGxhdGZvcm1XaGVlbEV2ZW50cy4KKworICAgICAgICAqIHBsYXRmb3JtL1BsYXRmb3JtV2hl ZWxFdmVudC5oOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1XaGVlbEV2ZW50OjpQbGF0Zm9y bVdoZWVsRXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1XaGVlbEV2ZW50OjpwaGFz ZSk6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1doZWVsRXZlbnRNYWMubW06CisgICAgICAgIChX ZWJDb3JlOjpwaGFzZUZvckV2ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtV2hlZWxF dmVudDo6UGxhdGZvcm1XaGVlbEV2ZW50KToKKwogMjAxMS0wMS0xMiAgQ2hyaXMgTWFycmluICA8 Y21hcnJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4KSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL1BsYXRmb3JtV2hlZWxFdmVudC5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL1BsYXRmb3JtV2hlZWxFdmVudC5oCShyZXZpc2lvbiA3NTYzNikK KysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1BsYXRmb3JtV2hlZWxFdmVudC5oCSh3b3JraW5n IGNvcHkpCkBAIC02OCw4ICs2OCwyMiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAgLy8gYW5k IHN5bnRoZXNpemVkIGluIG90aGVyIGNhc2VzIHdoZXJlIHBsYXRmb3JtcyBnZW5lcmF0ZSBsaW5l LWJ5LWxpbmUgc2Nyb2xsaW5nIGV2ZW50cy4KICAgICAvLyBUaGUgU2Nyb2xsQnlQYWdlV2hlZWxF dmVudCBpbmRpY2F0ZXMgdGhhdCB0aGUgd2hlZWwgZXZlbnQgc2hvdWxkIHNjcm9sbCBhbiBlbnRp cmUgcGFnZS4gIEluIHRoaXMgY2FzZSBXZWJDb3JlJ3MgYnVpbHQgaW4gcGFnaW5nIGJlaGF2aW9y IGlzIHVzZWQgdG8gcGFnZQogICAgIC8vIHVwIGFuZCBkb3duICh5b3UgZ2V0IHRoZSBzYW1lIGJl aGF2aW9yIGFzIGlmIHRoZSB1c2VyIHdhcyBjbGlja2luZyBpbiBhIHNjcm9sbGJhciB0cmFjayB0 byBwYWdlIHVwIG9yIHBhZ2UgZG93bikuICBQYWdlIHNjcm9sbGluZyBvbmx5IHdvcmtzIGluIHRo ZSB2ZXJ0aWNhbCBkaXJlY3Rpb24uCi0gICAgZW51bSBQbGF0Zm9ybVdoZWVsRXZlbnRHcmFudWxh cml0eSB7IFNjcm9sbEJ5UGFnZVdoZWVsRXZlbnQsIFNjcm9sbEJ5UGl4ZWxXaGVlbEV2ZW50IH07 Ci0gICAgCisgICAgZW51bSBQbGF0Zm9ybVdoZWVsRXZlbnRHcmFudWxhcml0eSB7CisgICAgICAg IFNjcm9sbEJ5UGFnZVdoZWVsRXZlbnQsCisgICAgICAgIFNjcm9sbEJ5UGl4ZWxXaGVlbEV2ZW50 CisgICAgfTsKKworI2lmIFBMQVRGT1JNKE1BQykKKyAgICBlbnVtIFBsYXRmb3JtV2hlZWxFdmVu dFBoYXNlIHsKKyAgICAgICAgUGxhdGZvcm1XaGVlbEV2ZW50UGhhc2VOb25lICAgICAgICA9IDAs CisgICAgICAgIFBsYXRmb3JtV2hlZWxFdmVudFBoYXNlQmVnYW4gICAgICAgPSAxIDw8IDEsCisg ICAgICAgIFBsYXRmb3JtV2hlZWxFdmVudFBoYXNlU3RhdGlvbmFyeSAgPSAxIDw8IDIsCisgICAg ICAgIFBsYXRmb3JtV2hlZWxFdmVudFBoYXNlQ2hhbmdlZCAgICAgPSAxIDw8IDMsCisgICAgICAg IFBsYXRmb3JtV2hlZWxFdmVudFBoYXNlRW5kZWQgICAgICAgPSAxIDw8IDQsCisgICAgICAgIFBs YXRmb3JtV2hlZWxFdmVudFBoYXNlQ2FuY2VsbGVkICAgPSAxIDw8IDUsCisgICAgfTsKKyNlbmRp ZgorCiAgICAgY2xhc3MgUGxhdGZvcm1XaGVlbEV2ZW50IHsKICAgICBwdWJsaWM6CiAgICAgICAg IFBsYXRmb3JtV2hlZWxFdmVudCgpCkBAIC04Myw2ICs5Nyw5IEBAIG5hbWVzcGFjZSBXZWJDb3Jl IHsKICAgICAgICAgICAgICwgbV9jdHJsS2V5KGZhbHNlKQogICAgICAgICAgICAgLCBtX2FsdEtl eShmYWxzZSkKICAgICAgICAgICAgICwgbV9tZXRhS2V5KGZhbHNlKQorI2lmIFBMQVRGT1JNKE1B QykKKyAgICAgICAgICAgICwgbV9waGFzZShQbGF0Zm9ybVdoZWVsRXZlbnRQaGFzZU5vbmUpCisj ZW5kaWYKICAgICAgICAgewogICAgICAgICB9CiAKQEAgLTEyOCwxMCArMTQ1LDE0IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKICAgICAgICAgUGxhdGZvcm1XaGVlbEV2ZW50KGNvbnN0IEV2YXNfRXZl bnRfTW91c2VfV2hlZWwqKTsKICNlbmRpZgogCi0jaWYgUExBVEZPUk0oTUFDKSAmJiBkZWZpbmVk KF9fT0JKQ19fKQorI2lmIFBMQVRGT1JNKE1BQykKKyNpZiBkZWZpbmVkKF9fT0JKQ19fKQogICAg ICAgICBQbGF0Zm9ybVdoZWVsRXZlbnQoTlNFdmVudCAqLCBOU1ZpZXcgKndpbmRvd1ZpZXcpOwog I2VuZGlmCiAKKyAgICAgICAgUGxhdGZvcm1XaGVlbEV2ZW50UGhhc2UgcGhhc2UoKSBjb25zdCB7 IHJldHVybiBtX3BoYXNlOyB9CisjZW5kaWYKKwogI2lmIFBMQVRGT1JNKFFUKQogICAgICAgICBQ bGF0Zm9ybVdoZWVsRXZlbnQoUVdoZWVsRXZlbnQqKTsKICAgICAgICAgUGxhdGZvcm1XaGVlbEV2 ZW50KFFHcmFwaGljc1NjZW5lV2hlZWxFdmVudCopOwpAQCAtMTY0LDYgKzE4NSw5IEBAIG5hbWVz cGFjZSBXZWJDb3JlIHsKICAgICAgICAgYm9vbCBtX2N0cmxLZXk7CiAgICAgICAgIGJvb2wgbV9h bHRLZXk7CiAgICAgICAgIGJvb2wgbV9tZXRhS2V5OworI2lmIFBMQVRGT1JNKE1BQykKKyAgICAg ICAgUGxhdGZvcm1XaGVlbEV2ZW50UGhhc2UgbV9waGFzZTsKKyNlbmRpZgogICAgIH07CiAKIH0g Ly8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9X aGVlbEV2ZW50TWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21h Yy9XaGVlbEV2ZW50TWFjLm1tCShyZXZpc2lvbiA3NTYzNikKKysrIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL21hYy9XaGVlbEV2ZW50TWFjLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0zMiw2ICszMiwy NiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKK3N0YXRpYyBQbGF0Zm9ybVdoZWVsRXZlbnRQ aGFzZSBwaGFzZUZvckV2ZW50KE5TRXZlbnQgKmV2ZW50KQoreworI2lmICFkZWZpbmVkKEJVSUxE SU5HX09OX1NOT1dfTEVPUEFSRCkKKyAgICB1aW50MzJfdCBwaGFzZSA9IFBsYXRmb3JtV2hlZWxF dmVudFBoYXNlTm9uZTsgCisgICAgaWYgKFtldmVudCBtb21lbnR1bVBoYXNlXSAmIE5TRXZlbnRQ aGFzZUJlZ2FuKQorICAgICAgICBwaGFzZSB8PSBQbGF0Zm9ybVdoZWVsRXZlbnRQaGFzZUJlZ2Fu OworICAgIGlmIChbZXZlbnQgbW9tZW50dW1QaGFzZV0gJiBOU0V2ZW50UGhhc2VTdGF0aW9uYXJ5 KQorICAgICAgICBwaGFzZSB8PSBQbGF0Zm9ybVdoZWVsRXZlbnRQaGFzZVN0YXRpb25hcnk7Cisg ICAgaWYgKFtldmVudCBtb21lbnR1bVBoYXNlXSAmIE5TRXZlbnRQaGFzZUNoYW5nZWQpCisgICAg ICAgIHBoYXNlIHw9IFBsYXRmb3JtV2hlZWxFdmVudFBoYXNlQ2hhbmdlZDsKKyAgICBpZiAoW2V2 ZW50IG1vbWVudHVtUGhhc2VdICYgTlNFdmVudFBoYXNlRW5kZWQpCisgICAgICAgIHBoYXNlIHw9 IFBsYXRmb3JtV2hlZWxFdmVudFBoYXNlRW5kZWQ7CisgICAgaWYgKFtldmVudCBtb21lbnR1bVBo YXNlXSAmIE5TRXZlbnRQaGFzZUNhbmNlbGxlZCkKKyAgICAgICAgcGhhc2UgfD0gUGxhdGZvcm1X aGVlbEV2ZW50UGhhc2VDYW5jZWxsZWQ7CisgICAgcmV0dXJuIHN0YXRpY19jYXN0PFBsYXRmb3Jt V2hlZWxFdmVudFBoYXNlPihwaGFzZSk7CisjZWxzZQorICAgIHJldHVybiBQbGF0Zm9ybVdoZWVs RXZlbnRQaGFzZU5vbmU7CisjZW5kaWYKK30KKwogUGxhdGZvcm1XaGVlbEV2ZW50OjpQbGF0Zm9y bVdoZWVsRXZlbnQoTlNFdmVudCogZXZlbnQsIE5TVmlldyAqd2luZG93VmlldykKICAgICA6IG1f cG9zaXRpb24ocG9pbnRGb3JFdmVudChldmVudCwgd2luZG93VmlldykpCiAgICAgLCBtX2dsb2Jh bFBvc2l0aW9uKGdsb2JhbFBvaW50Rm9yRXZlbnQoZXZlbnQpKQpAQCAtNDEsOSArNjEsMTAgQEAg UGxhdGZvcm1XaGVlbEV2ZW50OjpQbGF0Zm9ybVdoZWVsRXZlbnQoTgogICAgICwgbV9jdHJsS2V5 KFtldmVudCBtb2RpZmllckZsYWdzXSAmIE5TQ29udHJvbEtleU1hc2spCiAgICAgLCBtX2FsdEtl eShbZXZlbnQgbW9kaWZpZXJGbGFnc10gJiBOU0FsdGVybmF0ZUtleU1hc2spCiAgICAgLCBtX21l dGFLZXkoW2V2ZW50IG1vZGlmaWVyRmxhZ3NdICYgTlNDb21tYW5kS2V5TWFzaykKKyAgICAsIG1f cGhhc2UocGhhc2VGb3JFdmVudChldmVudCkpCiB7CiAgICAgQk9PTCBjb250aW51b3VzOwotICAg IAorCiAgICAgd2tHZXRXaGVlbEV2ZW50RGVsdGFzKGV2ZW50LCAmbV9kZWx0YVgsICZtX2RlbHRh WSwgJmNvbnRpbnVvdXMpOwogICAgIGlmIChjb250aW51b3VzKSB7CiAgICAgICAgIG1fd2hlZWxU aWNrc1ggPSBtX2RlbHRhWCAvIHN0YXRpY19jYXN0PGZsb2F0PihTY3JvbGxiYXI6OnBpeGVsc1Bl ckxpbmVTdGVwKCkpOwpJbmRleDogV2ViS2l0Mi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDc1NjU5KQorKysgV2ViS2l0Mi9DaGFuZ2VMb2cJKHdv cmtpbmcgY29weSkKQEAgLTEsMyArMSwyNCBAQAorMjAxMS0wMS0xMiAgU2FtIFdlaW5pZyAgPHNh bUB3ZWJraXQub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MjMzNworICAg ICAgICBQbGF0Zm9ybVdoZWVsRXZlbnQgc2hvdWxkIGtub3cgYWJvdXQgdGhlIHNjcm9sbCBwaGFz ZSBvbiB0aGUgTWFjCisKKyAgICAgICAgQWRkIGEgcGhhc2UgcGFyYW1ldGVyIG9uIE1hYyBXZWJX aGVlbEV2ZW50IGFuZCBwaXBlIGl0IGRvd24gdG8gUGxhdGZvcm1XaGVlbEV2ZW50LgorCisgICAg ICAgICogU2hhcmVkL1dlYkV2ZW50Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYldoZWVsRXZlbnQ6 OnBoYXNlKToKKyAgICAgICAgKiBTaGFyZWQvV2ViRXZlbnRDb252ZXJzaW9uLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6V2ViS2l0MlBsYXRmb3JtV2hlZWxFdmVudDo6V2ViS2l0MlBsYXRmb3JtV2hl ZWxFdmVudCk6CisgICAgICAgICogU2hhcmVkL1dlYldoZWVsRXZlbnQuY3BwOgorICAgICAgICAo V2ViS2l0OjpXZWJXaGVlbEV2ZW50OjpXZWJXaGVlbEV2ZW50KToKKyAgICAgICAgKFdlYktpdDo6 V2ViV2hlZWxFdmVudDo6ZW5jb2RlKToKKyAgICAgICAgKFdlYktpdDo6V2ViV2hlZWxFdmVudDo6 ZGVjb2RlKToKKyAgICAgICAgKiBTaGFyZWQvbWFjL1dlYkV2ZW50RmFjdG9yeS5tbToKKyAgICAg ICAgKFdlYktpdDo6cGhhc2VGb3JFdmVudCk6CisgICAgICAgIChXZWJLaXQ6OldlYkV2ZW50RmFj dG9yeTo6Y3JlYXRlV2ViV2hlZWxFdmVudCk6CisKIDIwMTEtMDEtMTIgIEFuZGVycyBDYXJsc3Nv biAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2Vpbmln LgpJbmRleDogV2ViS2l0Mi9TaGFyZWQvV2ViRXZlbnQuaAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQy L1NoYXJlZC9XZWJFdmVudC5oCShyZXZpc2lvbiA3NTYzNikKKysrIFdlYktpdDIvU2hhcmVkL1dl YkV2ZW50LmgJKHdvcmtpbmcgY29weSkKQEAgLTE1MSwxNSArMTUxLDMwIEBAIHB1YmxpYzoKICAg ICAgICAgU2Nyb2xsQnlQaXhlbFdoZWVsRXZlbnQKICAgICB9OwogCisjaWYgUExBVEZPUk0oTUFD KQorICAgIGVudW0gUGhhc2UgeworICAgICAgICBQaGFzZU5vbmUgICAgICAgID0gMCwKKyAgICAg ICAgUGhhc2VCZWdhbiAgICAgICA9IDEgPDwgMSwKKyAgICAgICAgUGhhc2VTdGF0aW9uYXJ5ICA9 IDEgPDwgMiwKKyAgICAgICAgUGhhc2VDaGFuZ2VkICAgICA9IDEgPDwgMywKKyAgICAgICAgUGhh c2VFbmRlZCAgICAgICA9IDEgPDwgNCwKKyAgICAgICAgUGhhc2VDYW5jZWxsZWQgICA9IDEgPDwg NSwKKyAgICB9OworI2VuZGlmCisKICAgICBXZWJXaGVlbEV2ZW50KCkgeyB9CiAKICAgICBXZWJX aGVlbEV2ZW50KFR5cGUsIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBwb3NpdGlvbiwgY29uc3Qg V2ViQ29yZTo6SW50UG9pbnQmIGdsb2JhbFBvc2l0aW9uLCBjb25zdCBXZWJDb3JlOjpGbG9hdFNp emUmIGRlbHRhLCBjb25zdCBXZWJDb3JlOjpGbG9hdFNpemUmIHdoZWVsVGlja3MsIEdyYW51bGFy aXR5LCBNb2RpZmllcnMsIGRvdWJsZSB0aW1lc3RhbXApOworI2lmIFBMQVRGT1JNKE1BQykKKyAg ICBXZWJXaGVlbEV2ZW50KFR5cGUsIGNvbnN0IFdlYkNvcmU6OkludFBvaW50JiBwb3NpdGlvbiwg Y29uc3QgV2ViQ29yZTo6SW50UG9pbnQmIGdsb2JhbFBvc2l0aW9uLCBjb25zdCBXZWJDb3JlOjpG bG9hdFNpemUmIGRlbHRhLCBjb25zdCBXZWJDb3JlOjpGbG9hdFNpemUmIHdoZWVsVGlja3MsIEdy YW51bGFyaXR5LCBQaGFzZSwgTW9kaWZpZXJzLCBkb3VibGUgdGltZXN0YW1wKTsKKyNlbmRpZgog CiAgICAgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQgcG9zaXRpb24oKSBjb25zdCB7IHJldHVybiBt X3Bvc2l0aW9uOyB9CiAgICAgY29uc3QgV2ViQ29yZTo6SW50UG9pbnQgZ2xvYmFsUG9zaXRpb24o KSBjb25zdCB7IHJldHVybiBtX2dsb2JhbFBvc2l0aW9uOyB9CiAgICAgY29uc3QgV2ViQ29yZTo6 RmxvYXRTaXplIGRlbHRhKCkgY29uc3QgeyByZXR1cm4gbV9kZWx0YTsgfQogICAgIGNvbnN0IFdl YkNvcmU6OkZsb2F0U2l6ZSB3aGVlbFRpY2tzKCkgY29uc3QgeyByZXR1cm4gbV93aGVlbFRpY2tz OyB9CiAgICAgR3JhbnVsYXJpdHkgZ3JhbnVsYXJpdHkoKSBjb25zdCB7IHJldHVybiBzdGF0aWNf Y2FzdDxHcmFudWxhcml0eT4obV9ncmFudWxhcml0eSk7IH0KKyAgICBQaGFzZSBwaGFzZSgpIGNv bnN0IHsgcmV0dXJuIHN0YXRpY19jYXN0PFBoYXNlPihtX3BoYXNlKTsgfQogCiAgICAgdm9pZCBl bmNvZGUoQ29yZUlQQzo6QXJndW1lbnRFbmNvZGVyKikgY29uc3Q7CiAgICAgc3RhdGljIGJvb2wg ZGVjb2RlKENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciosIFdlYldoZWVsRXZlbnQmKTsKQEAgLTE3 Miw2ICsxODcsOSBAQCBwcml2YXRlOgogICAgIFdlYkNvcmU6OkZsb2F0U2l6ZSBtX2RlbHRhOwog ICAgIFdlYkNvcmU6OkZsb2F0U2l6ZSBtX3doZWVsVGlja3M7CiAgICAgdWludDMyX3QgbV9ncmFu dWxhcml0eTsgLy8gR3JhbnVsYXJpdHkKKyNpZiBQTEFURk9STShNQUMpCisgICAgdWludDMyX3Qg bV9waGFzZTsgLy8gUGhhc2UKKyNlbmRpZgogfTsKIAogLy8gRklYTUU6IE1vdmUgdGhpcyBjbGFz cyB0byBpdHMgb3duIGhlYWRlciBmaWxlLgpJbmRleDogV2ViS2l0Mi9TaGFyZWQvV2ViRXZlbnRD b252ZXJzaW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1NoYXJlZC9XZWJFdmVudENvbnZl cnNpb24uY3BwCShyZXZpc2lvbiA3NTYzNikKKysrIFdlYktpdDIvU2hhcmVkL1dlYkV2ZW50Q29u dmVyc2lvbi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTExMCw2ICsxMTAsOSBAQCBwdWJsaWM6CiAg ICAgICAgIG1fY3RybEtleSA9IHdlYkV2ZW50LmNvbnRyb2xLZXkoKTsKICAgICAgICAgbV9hbHRL ZXkgPSB3ZWJFdmVudC5hbHRLZXkoKTsKICAgICAgICAgbV9tZXRhS2V5ID0gd2ViRXZlbnQubWV0 YUtleSgpOworI2lmIFBMQVRGT1JNKE1BQykKKyAgICAgICAgbV9waGFzZSA9IHN0YXRpY19jYXN0 PFdlYkNvcmU6OlBsYXRmb3JtV2hlZWxFdmVudFBoYXNlPih3ZWJFdmVudC5waGFzZSgpKTsKKyNl bmRpZgogICAgIH0KIH07CiAKSW5kZXg6IFdlYktpdDIvU2hhcmVkL1dlYldoZWVsRXZlbnQuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYktpdDIvU2hhcmVkL1dlYldoZWVsRXZlbnQuY3BwCShyZXZpc2lv biA3NTYzNikKKysrIFdlYktpdDIvU2hhcmVkL1dlYldoZWVsRXZlbnQuY3BwCSh3b3JraW5nIGNv cHkpCkBAIC00MywxOSArNDMsNTMgQEAgV2ViV2hlZWxFdmVudDo6V2ViV2hlZWxFdmVudChUeXBl IHR5cGUsIAogICAgIEFTU0VSVChpc1doZWVsRXZlbnRUeXBlKHR5cGUpKTsKIH0KIAorI2lmIFBM QVRGT1JNKE1BQykKK1dlYldoZWVsRXZlbnQ6OldlYldoZWVsRXZlbnQoVHlwZSB0eXBlLCBjb25z dCBJbnRQb2ludCYgcG9zaXRpb24sIGNvbnN0IEludFBvaW50JiBnbG9iYWxQb3NpdGlvbiwgY29u c3QgRmxvYXRTaXplJiBkZWx0YSwgY29uc3QgRmxvYXRTaXplJiB3aGVlbFRpY2tzLCBHcmFudWxh cml0eSBncmFudWxhcml0eSwgUGhhc2UgcGhhc2UsIE1vZGlmaWVycyBtb2RpZmllcnMsIGRvdWJs ZSB0aW1lc3RhbXApCisgICAgOiBXZWJFdmVudCh0eXBlLCBtb2RpZmllcnMsIHRpbWVzdGFtcCkK KyAgICAsIG1fcG9zaXRpb24ocG9zaXRpb24pCisgICAgLCBtX2dsb2JhbFBvc2l0aW9uKGdsb2Jh bFBvc2l0aW9uKQorICAgICwgbV9kZWx0YShkZWx0YSkKKyAgICAsIG1fd2hlZWxUaWNrcyh3aGVl bFRpY2tzKQorICAgICwgbV9ncmFudWxhcml0eShncmFudWxhcml0eSkKKyAgICAsIG1fcGhhc2Uo cGhhc2UpCit7CisgICAgQVNTRVJUKGlzV2hlZWxFdmVudFR5cGUodHlwZSkpOworfQorI2VuZGlm CisKIHZvaWQgV2ViV2hlZWxFdmVudDo6ZW5jb2RlKENvcmVJUEM6OkFyZ3VtZW50RW5jb2Rlciog ZW5jb2RlcikgY29uc3QKIHsKICAgICBXZWJFdmVudDo6ZW5jb2RlKGVuY29kZXIpOwogCi0gICAg ZW5jb2Rlci0+ZW5jb2RlKENvcmVJUEM6OkluKG1fcG9zaXRpb24sIG1fZ2xvYmFsUG9zaXRpb24s IG1fZGVsdGEsIG1fd2hlZWxUaWNrcywgbV9ncmFudWxhcml0eSkpOworICAgIGVuY29kZXItPmVu Y29kZShtX3Bvc2l0aW9uKTsKKyAgICBlbmNvZGVyLT5lbmNvZGUobV9nbG9iYWxQb3NpdGlvbik7 CisgICAgZW5jb2Rlci0+ZW5jb2RlKG1fZGVsdGEpOworICAgIGVuY29kZXItPmVuY29kZShtX3do ZWVsVGlja3MpOworICAgIGVuY29kZXItPmVuY29kZShtX2dyYW51bGFyaXR5KTsKKyNpZiBQTEFU Rk9STShNQUMpCisgICAgZW5jb2Rlci0+ZW5jb2RlKG1fcGhhc2UpOworI2VuZGlmCiB9CiAKIGJv b2wgV2ViV2hlZWxFdmVudDo6ZGVjb2RlKENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciogZGVjb2Rl ciwgV2ViV2hlZWxFdmVudCYgdCkKIHsKICAgICBpZiAoIVdlYkV2ZW50OjpkZWNvZGUoZGVjb2Rl ciwgdCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLQotICAgIHJldHVybiBkZWNvZGVyLT5kZWNv ZGUoQ29yZUlQQzo6T3V0KHQubV9wb3NpdGlvbiwgdC5tX2dsb2JhbFBvc2l0aW9uLCB0Lm1fZGVs dGEsIHQubV93aGVlbFRpY2tzLCB0Lm1fZ3JhbnVsYXJpdHkpKTsKKyAgICBpZiAoIWRlY29kZXIt PmRlY29kZSh0Lm1fcG9zaXRpb24pKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKCFk ZWNvZGVyLT5kZWNvZGUodC5tX2dsb2JhbFBvc2l0aW9uKSkKKyAgICAgICAgcmV0dXJuIGZhbHNl OworICAgIGlmICghZGVjb2Rlci0+ZGVjb2RlKHQubV9kZWx0YSkpCisgICAgICAgIHJldHVybiBm YWxzZTsKKyAgICBpZiAoIWRlY29kZXItPmRlY29kZSh0Lm1fd2hlZWxUaWNrcykpCisgICAgICAg IHJldHVybiBmYWxzZTsKKyAgICBpZiAoIWRlY29kZXItPmRlY29kZSh0Lm1fZ3JhbnVsYXJpdHkp KQorICAgICAgICByZXR1cm4gZmFsc2U7CisjaWYgUExBVEZPUk0oTUFDKQorICAgIGlmICghZGVj b2Rlci0+ZGVjb2RlKHQubV9waGFzZSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyNlbmRpZgor ICAgIHJldHVybiB0cnVlOwogfQogCiBib29sIFdlYldoZWVsRXZlbnQ6OmlzV2hlZWxFdmVudFR5 cGUoVHlwZSB0eXBlKQpJbmRleDogV2ViS2l0Mi9TaGFyZWQvbWFjL1dlYkV2ZW50RmFjdG9yeS5t bQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBXZWJLaXQyL1NoYXJlZC9tYWMvV2ViRXZlbnRGYWN0b3J5Lm1tCShy ZXZpc2lvbiA3NTYzNikKKysrIFdlYktpdDIvU2hhcmVkL21hYy9XZWJFdmVudEZhY3RvcnkubW0J KHdvcmtpbmcgY29weSkKQEAgLTE2OSw2ICsxNjksMjYgQEAgc3RhdGljIE5TUG9pbnQgcG9pbnRG b3JFdmVudChOU0V2ZW50ICpldgogICAgIH0KIH0KIAorc3RhdGljIFdlYldoZWVsRXZlbnQ6OlBo YXNlIHBoYXNlRm9yRXZlbnQoTlNFdmVudCAqZXZlbnQpCit7CisjaWYgIWRlZmluZWQoQlVJTERJ TkdfT05fU05PV19MRU9QQVJEKQorICAgIHVpbnQzMl90IHBoYXNlID0gV2ViV2hlZWxFdmVudDo6 UGhhc2VOb25lOyAKKyAgICBpZiAoW2V2ZW50IG1vbWVudHVtUGhhc2VdICYgTlNFdmVudFBoYXNl QmVnYW4pCisgICAgICAgIHBoYXNlIHw9IFdlYldoZWVsRXZlbnQ6OlBoYXNlQmVnYW47CisgICAg aWYgKFtldmVudCBtb21lbnR1bVBoYXNlXSAmIE5TRXZlbnRQaGFzZVN0YXRpb25hcnkpCisgICAg ICAgIHBoYXNlIHw9IFdlYldoZWVsRXZlbnQ6OlBoYXNlU3RhdGlvbmFyeTsKKyAgICBpZiAoW2V2 ZW50IG1vbWVudHVtUGhhc2VdICYgTlNFdmVudFBoYXNlQ2hhbmdlZCkKKyAgICAgICAgcGhhc2Ug fD0gV2ViV2hlZWxFdmVudDo6UGhhc2VDaGFuZ2VkOworICAgIGlmIChbZXZlbnQgbW9tZW50dW1Q aGFzZV0gJiBOU0V2ZW50UGhhc2VFbmRlZCkKKyAgICAgICAgcGhhc2UgfD0gV2ViV2hlZWxFdmVu dDo6UGhhc2VFbmRlZDsKKyAgICBpZiAoW2V2ZW50IG1vbWVudHVtUGhhc2VdICYgTlNFdmVudFBo YXNlQ2FuY2VsbGVkKQorICAgICAgICBwaGFzZSB8PSBXZWJXaGVlbEV2ZW50OjpQaGFzZUNhbmNl bGxlZDsKKyAgICByZXR1cm4gc3RhdGljX2Nhc3Q8V2ViV2hlZWxFdmVudDo6UGhhc2U+KHBoYXNl KTsKKyNlbHNlCisgICAgcmV0dXJuIFdlYldoZWVsRXZlbnQ6OlBoYXNlTm9uZTsKKyNlbmRpZgor fQorICAgIAogc3RhdGljIGlubGluZSBTdHJpbmcgdGV4dEZyb21FdmVudChOU0V2ZW50KiBldmVu dCkKIHsKICAgICBpZiAoW2V2ZW50IHR5cGVdID09IE5TRmxhZ3NDaGFuZ2VkKQpAQCAtOTk5LDEw ICsxMDE5LDExIEBAIFdlYldoZWVsRXZlbnQgV2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWIKICAg ICAgICAgZGVsdGFZICo9IHN0YXRpY19jYXN0PGZsb2F0PihTY3JvbGxiYXI6OnBpeGVsc1Blckxp bmVTdGVwKCkpOwogICAgIH0KIAorICAgIFdlYldoZWVsRXZlbnQ6OlBoYXNlIHBoYXNlICAgICAg ICAgICAgICA9IHBoYXNlRm9yRXZlbnQoZXZlbnQpOwogICAgIFdlYkV2ZW50OjpNb2RpZmllcnMg bW9kaWZpZXJzICAgICAgICAgICA9IG1vZGlmaWVyc0ZvckV2ZW50KGV2ZW50KTsKICAgICBkb3Vi bGUgdGltZXN0YW1wICAgICAgICAgICAgICAgICAgICAgICAgPSBbZXZlbnQgdGltZXN0YW1wXTsK LQotICAgIHJldHVybiBXZWJXaGVlbEV2ZW50KFdlYkV2ZW50OjpXaGVlbCwgSW50UG9pbnQocG9z aXRpb24pLCBJbnRQb2ludChnbG9iYWxQb3NpdGlvbiksIEZsb2F0U2l6ZShkZWx0YVgsIGRlbHRh WSksIEZsb2F0U2l6ZSh3aGVlbFRpY2tzWCwgd2hlZWxUaWNrc1kpLCBncmFudWxhcml0eSwgbW9k aWZpZXJzLCB0aW1lc3RhbXApOworICAgIAorICAgIHJldHVybiBXZWJXaGVlbEV2ZW50KFdlYkV2 ZW50OjpXaGVlbCwgSW50UG9pbnQocG9zaXRpb24pLCBJbnRQb2ludChnbG9iYWxQb3NpdGlvbiks IEZsb2F0U2l6ZShkZWx0YVgsIGRlbHRhWSksIEZsb2F0U2l6ZSh3aGVlbFRpY2tzWCwgd2hlZWxU aWNrc1kpLCBncmFudWxhcml0eSwgcGhhc2UsIG1vZGlmaWVycywgdGltZXN0YW1wKTsKIH0KIAog V2ViS2V5Ym9hcmRFdmVudCBXZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdlYktleWJvYXJkRXZlbnQo TlNFdmVudCAqZXZlbnQsIE5TVmlldyAqKQo=