84243 2012-04-18 08:04:22 -0700 Clean-up WheelEvent Conversion 2012-04-18 12:48:56 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 75006 1 allan.jensen allan.jensen menard webkit.review.bot zoltan oldest_to_newest 604738 0 allan.jensen 2012-04-18 08:04:22 -0700 WheelEvent conversion is currently doesnt treat full ticks and partial ticks the same way. This appears to have been done to support wheel-events emitted by DRT. This should be cleaned up so all wheel-events are treated the same, and DRT emits correct events. The problem is in particular to distinguish better between wheel-delta and pixel-delta which are often confused, and happens to be identical on some other platforms. 604747 1 137692 allan.jensen 2012-04-18 08:14:41 -0700 Created attachment 137692 Patch 604951 2 137692 hausmann 2012-04-18 11:45:16 -0700 Comment on attachment 137692 Patch r=me. Nice cleanup! There have been some cleanups in QWheelEvent lately, too, FWIW: http://qt.gitorious.org/qt/qtbase/commit/5a2efb490bc3549ef42420a0dafcf22072785e0d 604997 3 137692 webkit.review.bot 2012-04-18 12:48:51 -0700 Comment on attachment 137692 Patch Clearing flags on attachment: 137692 Committed r114546: <http://trac.webkit.org/changeset/114546> 604998 4 webkit.review.bot 2012-04-18 12:48:56 -0700 All reviewed patches have been landed. Closing bug. 137692 2012-04-18 08:14:41 -0700 2012-04-18 12:48:51 -0700 Patch bug-84243-20120418171448.patch text/plain 13179 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0Mzc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L3F0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCmluZGV4IGMwMTQ0NzQ5YWFk ODZmZTc0MTRkNjgyOGEyNDQ0YmMyMTlmMmE1NzYuLmY4NmU3YWM5YTg4ZWEzZDQ2OWE1ZjY1YzYy YmNiNzIyZTQ5OTc2YzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCisr KyBiL1NvdXJjZS9XZWJLaXQvcXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTItMDQt MTggIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAgPGFsbGFuLmplbnNlbkBub2tpYS5jb20+CisKKyAg ICAgICAgQ2xlYW4tdXAgV2hlZWxFdmVudCBDb252ZXJzaW9uLgorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODQyNDMKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmVTdXBwb3J0L1dlYkV2ZW50Q29u dmVyc2lvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpXZWJLaXRQbGF0Zm9ybVdoZWVsRXZlbnQ6 OmFwcGx5RGVsdGEpOgorCiAyMDEyLTA0LTEzICBUb3IgQXJuZSBWZXN0YsO4ICA8dG9yLmFybmUu dmVzdGJvQG5va2lhLmNvbT4KIAogICAgICAgICBbUXRdIEJ1aWxkIGZpeCB3aXRoIFFUX05PX0JF QVJFUk1BTkFHRU1FTlQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA4NTkyYzFkNTNlZDM5N2FhYWM1M2MxYzcwZTRi MzVmN2UzZmM2NjY5Li44YTc4Mzc0NWMzMjE4ZTMxZjI0YzM3ZWI2ODg5ZjA5MWI4MGE2YmIzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTItMDQtMTggIEFsbGFuIFNhbmRmZWxkIEpl bnNlbiAgPGFsbGFuLmplbnNlbkBub2tpYS5jb20+CisKKyAgICAgICAgQ2xlYW4tdXAgV2hlZWxF dmVudCBDb252ZXJzaW9uLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9ODQyNDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIFNoYXJlZC9xdC9XZWJFdmVudEZhY3RvcnlRdC5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViV2hlZWxFdmVudCk6CisgICAgICAgICogVUlQ cm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHA6CisgICAgICAgIChXZWJL aXQ6OlF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6d2hlZWxFdmVudCk6CisKIDIwMTItMDQt MTcgIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAgPGFsbGFuLmplbnNlbkBub2tpYS5jb20+CiAKICAg ICAgICAgUkVHUkVTU0lPTihyMTEzMTcyKSBXaGVlbCBldmVudHMgYXJlIHNjcm9sbGluZyBpbnZl cnNlZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvV2ViRXZl bnRDb252ZXJzaW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQvcXQvV2ViQ29yZVN1cHBvcnQvV2ViRXZl bnRDb252ZXJzaW9uLmNwcAppbmRleCBiZTVmNTI5OGU4OWIzODhiOWIyM2JiYjA1NDIyNDVkZWY5 ZmU3ODc2Li4zZjNlOWQ2Njc4NjVkMjE5OTRkNzFkYjNmMzFkMDJjZWZmNTRkNjk3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L3F0L1dlYkNvcmVTdXBwb3J0L1dlYkV2ZW50Q29udmVyc2lvbi5j cHAKKysrIGIvU291cmNlL1dlYktpdC9xdC9XZWJDb3JlU3VwcG9ydC9XZWJFdmVudENvbnZlcnNp b24uY3BwCkBAIC0xNzgsMjcgKzE3OCwyMSBAQCBwcml2YXRlOgogCiB2b2lkIFdlYktpdFBsYXRm b3JtV2hlZWxFdmVudDo6YXBwbHlEZWx0YShpbnQgZGVsdGEsIFF0OjpPcmllbnRhdGlvbiBvcmll bnRhdGlvbikKIHsKLSAgICAvLyBBIGRlbHRhIHRoYXQgaXMgbm90IG1vZCAxMjAgaW5kaWNhdGVz IGEgZGV2aWNlIHRoYXQgaXMgc2VuZGluZwotICAgIC8vIGZpbmUtcmVzb2x1dGlvbiBzY3JvbGwg ZXZlbnRzLCBzbyB1c2UgdGhlIGRlbHRhIGFzIG51bWJlciBvZiB3aGVlbCB0aWNrcwotICAgIC8v IGFuZCBudW1iZXIgb2YgcGl4ZWxzIHRvIHNjcm9sbC5TZWUgYWxzbyB3ZWJraXQub3JnL2IvMjk2 MDEKLSAgICBib29sIGZ1bGxUaWNrID0gIShkZWx0YSAlIDEyMCk7Ci0KICAgICBpZiAob3JpZW50 YXRpb24gPT0gUXQ6Okhvcml6b250YWwpIHsKLSAgICAgICAgbV9kZWx0YVggPSAoZnVsbFRpY2sp ID8gZGVsdGEgLyAxMjAuMGYgOiBkZWx0YTsKKyAgICAgICAgbV9kZWx0YVggPSBkZWx0YTsKICAg ICAgICAgbV9kZWx0YVkgPSAwOwogICAgIH0gZWxzZSB7CiAgICAgICAgIG1fZGVsdGFYID0gMDsK LSAgICAgICAgbV9kZWx0YVkgPSAoZnVsbFRpY2spID8gZGVsdGEgLyAxMjAuMGYgOiBkZWx0YTsK KyAgICAgICAgbV9kZWx0YVkgPSBkZWx0YTsKICAgICB9CisgICAgbV93aGVlbFRpY2tzWCA9IG1f ZGVsdGFYIC8gMTIwLjBmOworICAgIG1fd2hlZWxUaWNrc1kgPSBtX2RlbHRhWSAvIDEyMC4wZjsK IAotICAgIG1fd2hlZWxUaWNrc1ggPSBtX2RlbHRhWDsKLSAgICBtX3doZWVsVGlja3NZID0gbV9k ZWx0YVk7Ci0KLSAgICAvLyBVc2UgdGhlIHNhbWUgc2luZ2xlIHNjcm9sbCBzdGVwIGFzIFFUZXh0 RWRpdAotICAgIC8vIChpbiBRVGV4dEVkaXRQcml2YXRlOjppbml0IFtoLHZdYmFyLT5zZXRTaW5n bGVTdGVwKQorICAgIC8vIFNpbmNlIHdlIHJlcXVlc3QgdGhlIHNjcm9sbCBkZWx0YSBieSB0aGUg cGl4ZWwsIGNvbnZlcnQgdGhlIHdoZWVsIGRlbHRhIHRvIHBpeGVsIGRlbHRhIHVzaW5nIHRoZSBz dGFuZGFyZCBzY3JvbGwgc3RlcC4KKyAgICAvLyBVc2UgdGhlIHNhbWUgc2luZ2xlIHNjcm9sbCBz dGVwIGFzIFFUZXh0RWRpdCAoaW4gUVRleHRFZGl0UHJpdmF0ZTo6aW5pdCBbaCx2XWJhci0+c2V0 U2luZ2xlU3RlcCkKICAgICBzdGF0aWMgY29uc3QgZmxvYXQgY0RlZmF1bHRRdFNjcm9sbFN0ZXAg PSAyMC5mOwotICAgIG1fZGVsdGFYICo9IChmdWxsVGljaykgPyBRQXBwbGljYXRpb246OndoZWVs U2Nyb2xsTGluZXMoKSAqIGNEZWZhdWx0UXRTY3JvbGxTdGVwIDogMTsKLSAgICBtX2RlbHRhWSAq PSAoZnVsbFRpY2spID8gUUFwcGxpY2F0aW9uOjp3aGVlbFNjcm9sbExpbmVzKCkgKiBjRGVmYXVs dFF0U2Nyb2xsU3RlcCA6IDE7CisgICAgbV9kZWx0YVggPSBtX3doZWVsVGlja3NYICogUUFwcGxp Y2F0aW9uOjp3aGVlbFNjcm9sbExpbmVzKCkgKiBjRGVmYXVsdFF0U2Nyb2xsU3RlcDsKKyAgICBt X2RlbHRhWSA9IG1fd2hlZWxUaWNrc1kgKiBRQXBwbGljYXRpb246OndoZWVsU2Nyb2xsTGluZXMo KSAqIGNEZWZhdWx0UXRTY3JvbGxTdGVwOwogfQogCiBXZWJLaXRQbGF0Zm9ybVdoZWVsRXZlbnQ6 OldlYktpdFBsYXRmb3JtV2hlZWxFdmVudChRR3JhcGhpY3NTY2VuZVdoZWVsRXZlbnQqIGUpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvcXQvV2ViRXZlbnRGYWN0b3J5UXQuY3Bw IGIvU291cmNlL1dlYktpdDIvU2hhcmVkL3F0L1dlYkV2ZW50RmFjdG9yeVF0LmNwcAppbmRleCA4 NThkMTMxN2RkZjFhMWJlNDk4MzgyMmY0YjVhZmMzYWYxYjg1NGQ1Li5lOTMwYzQ2MWMzYWFmZmJj ODY0MjdmODg5NGIyZGEzZDk1ZjRlOTI2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFy ZWQvcXQvV2ViRXZlbnRGYWN0b3J5UXQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9x dC9XZWJFdmVudEZhY3RvcnlRdC5jcHAKQEAgLTEzMywyNiArMTMzLDIxIEBAIFdlYldoZWVsRXZl bnQgV2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJXaGVlbEV2ZW50KFFXaGVlbEV2ZW50KiBlLCBj b25zdCBRVHJhbnNmCiAgICAgV2ViRXZlbnQ6Ok1vZGlmaWVycyBtb2RpZmllcnMgICAgICAgICAg ID0gbW9kaWZpZXJzRm9yRXZlbnQoZS0+bW9kaWZpZXJzKCkpOwogICAgIGRvdWJsZSB0aW1lc3Rh bXAgICAgICAgICAgICAgICAgICAgICAgICA9IGN1cnJlbnRUaW1lRm9yRXZlbnQoZSk7CiAKLSAg ICAvLyBBIGRlbHRhIHRoYXQgaXMgbm90IG1vZCAxMjAgaW5kaWNhdGVzIGEgZGV2aWNlIHRoYXQg aXMgc2VuZGluZwotICAgIC8vIGZpbmUtcmVzb2x1dGlvbiBzY3JvbGwgZXZlbnRzLCBzbyB1c2Ug dGhlIGRlbHRhIGFzIG51bWJlciBvZiB3aGVlbCB0aWNrcwotICAgIC8vIGFuZCBudW1iZXIgb2Yg cGl4ZWxzIHRvIHNjcm9sbC5TZWUgYWxzbyB3ZWJraXQub3JnL2IvMjk2MDEKLSAgICBib29sIGZ1 bGxUaWNrID0gIShlLT5kZWx0YSgpICUgMTIwKTsKLQogICAgIGlmIChlLT5vcmllbnRhdGlvbigp ID09IFF0OjpIb3Jpem9udGFsKSB7Ci0gICAgICAgIGRlbHRhWCA9IChmdWxsVGljaykgPyBlLT5k ZWx0YSgpIC8gMTIwLjBmIDogZS0+ZGVsdGEoKTsKLSAgICAgICAgd2hlZWxUaWNrc1ggPSBkZWx0 YVg7CisgICAgICAgIGRlbHRhWCA9IGUtPmRlbHRhKCk7CisgICAgICAgIHdoZWVsVGlja3NYID0g ZGVsdGFYIC8gMTIwLjBmOwogICAgIH0gZWxzZSB7Ci0gICAgICAgIGRlbHRhWSA9IChmdWxsVGlj aykgPyBlLT5kZWx0YSgpIC8gMTIwLjBmIDogZS0+ZGVsdGEoKTsKLSAgICAgICAgd2hlZWxUaWNr c1kgPSBkZWx0YVk7CisgICAgICAgIGRlbHRhWSA9IGUtPmRlbHRhKCk7CisgICAgICAgIHdoZWVs VGlja3NZID0gZGVsdGFZIC8gMTIwLjBmOwogICAgIH0KIAotICAgIC8vIFVzZSB0aGUgc2FtZSBz aW5nbGUgc2Nyb2xsIHN0ZXAgYXMgUVRleHRFZGl0Ci0gICAgLy8gKGluIFFUZXh0RWRpdFByaXZh dGU6OmluaXQgW2gsdl1iYXItPnNldFNpbmdsZVN0ZXApCisgICAgLy8gU2luY2Ugd2UgcmVwb3J0 IHRoZSBzY3JvbGwgYnkgdGhlIHBpeGVsLCBjb252ZXJ0IHRoZSBkZWx0YSB0byBwaXhlbCBkaXN0 YW5jZSB1c2luZyBzdGFuZGFyZCBzY3JvbGwgc3RlcC4KKyAgICAvLyBVc2UgdGhlIHNhbWUgc2lu Z2xlIHNjcm9sbCBzdGVwIGFzIFFUZXh0RWRpdCAoaW4gUVRleHRFZGl0UHJpdmF0ZTo6aW5pdCBb aCx2XWJhci0+c2V0U2luZ2xlU3RlcCkKICAgICBzdGF0aWMgY29uc3QgZmxvYXQgY0RlZmF1bHRR dFNjcm9sbFN0ZXAgPSAyMC5mOwogICAgIC8vICMjIyBGSVhNRTogRGVmYXVsdCBmcm9tIFF0R3Vp LiBTaG91bGQgdXNlIFF0IHBsYXRmb3JtIHRoZW1lIEFQSSBvbmNlIGNvbmZpZ3VyYWJsZS4KICAg ICBjb25zdCBpbnQgd2hlZWxTY3JvbGxMaW5lcyA9IDM7Ci0gICAgZGVsdGFYICo9IChmdWxsVGlj aykgPyB3aGVlbFNjcm9sbExpbmVzICogY0RlZmF1bHRRdFNjcm9sbFN0ZXAgOiAxOwotICAgIGRl bHRhWSAqPSAoZnVsbFRpY2spID8gd2hlZWxTY3JvbGxMaW5lcyAqIGNEZWZhdWx0UXRTY3JvbGxT dGVwIDogMTsKKyAgICBkZWx0YVggPSB3aGVlbFRpY2tzWCAqIHdoZWVsU2Nyb2xsTGluZXMgKiBj RGVmYXVsdFF0U2Nyb2xsU3RlcDsKKyAgICBkZWx0YVkgPSB3aGVlbFRpY2tzWSAqIHdoZWVsU2Ny b2xsTGluZXMgKiBjRGVmYXVsdFF0U2Nyb2xsU3RlcDsKIAogICAgIHJldHVybiBXZWJXaGVlbEV2 ZW50KFdlYkV2ZW50OjpXaGVlbCwgZnJvbUl0ZW1UcmFuc2Zvcm0ubWFwKGUtPnBvc0YoKSkudG9Q b2ludCgpLCBlLT5nbG9iYWxQb3NGKCkudG9Qb2ludCgpLCBGbG9hdFNpemUoZGVsdGFYLCBkZWx0 YVkpLCBGbG9hdFNpemUod2hlZWxUaWNrc1gsIHdoZWVsVGlja3NZKSwgZ3JhbnVsYXJpdHksIG1v ZGlmaWVycywgdGltZXN0YW1wKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAKaW5kZXggYWNlMDJh OTljMzVlM2ZiMTM3NjgxZjFjNzA0ZTdmZmY3NTVlMmM3Yy4uNjVmOTg0N2U5YWVkMDM2MjJmMWI1 OTQ1NTUxMzgyNzhjMDU4ZWE4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAKQEAgLTI1MywyNiAr MjUzLDIxIEBAIHZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjp3aGVlbEV2ZW50KFFX aGVlbEV2ZW50KiBldikKICAgICBpZiAoc2Nyb2xsQW5pbWF0aW9uQWN0aXZlKCkgfHwgc2NhbGVB bmltYXRpb25BY3RpdmUoKSB8fCBwaW5jaEdlc3R1cmVBY3RpdmUoKSkKICAgICAgICAgcmV0dXJu OyAvLyBJZ25vcmUuCiAKLSAgICBpbnQgZGVsdGEgPSBldi0+ZGVsdGEoKTsKLQotICAgIC8vIEEg ZGVsdGEgdGhhdCBpcyBub3QgbW9kIDEyMCBpbmRpY2F0ZXMgYSBkZXZpY2UgdGhhdCBpcyBzZW5k aW5nCi0gICAgLy8gZmluZS1yZXNvbHV0aW9uIHNjcm9sbCBldmVudHMsIHNvIHVzZSB0aGUgZGVs dGEgYXMgbnVtYmVyIG9mIHdoZWVsIHRpY2tzCi0gICAgLy8gYW5kIG51bWJlciBvZiBwaXhlbHMg dG8gc2Nyb2xsLiBTZWUgYWxzbyB3ZWJraXQub3JnL2IvMjk2MDEKLSAgICBib29sIGZ1bGxUaWNr ID0gIShkZWx0YSAlIDEyMCk7CiAKKyAgICAvLyBBIG5vcm1hbCBzY3JvbGwtdGljayBzaG91bGQg aGF2ZSBhIGRlbHRhIG9mIDEyMCAoMS84KSBkZWdyZWVzLiBDb252ZXJ0IHRoaXMgdG8KKyAgICAv LyBsb2NhbCBzdGFuZGFyZCBzY3JvbGwgc3RlcCBvZiAzIGxpbmVzIG9mIDIwIHBpeGVscy4KICAg ICBzdGF0aWMgY29uc3QgaW50IGNEZWZhdWx0UXRTY3JvbGxTdGVwID0gMjA7CiAgICAgc3RhdGlj IGNvbnN0IGludCB3aGVlbFNjcm9sbExpbmVzID0gMzsKLSAgICBpbnQgc2Nyb2xsTGluZXMgPSAo ZnVsbFRpY2spID8gd2hlZWxTY3JvbGxMaW5lcyAqIGNEZWZhdWx0UXRTY3JvbGxTdGVwIDogMTsK KyAgICBjb25zdCBpbnQgd2hlZWxUaWNrID0gd2hlZWxTY3JvbGxMaW5lcyAqIGNEZWZhdWx0UXRT Y3JvbGxTdGVwOwogCi0gICAgZGVsdGEgPSAoZnVsbFRpY2spID8gZGVsdGEgLyAxMjAuMGYgOiBk ZWx0YTsKLSAgICBkZWx0YSAqPSBzY3JvbGxMaW5lczsKKyAgICBpbnQgcGl4ZWxEZWx0YSA9IGV2 LT5kZWx0YSgpICogKHdoZWVsVGljayAvIDEyMC5mKTsKIAogICAgIFFQb2ludEYgbmV3UG9zaXRp b24gPSBtX3ZpZXdwb3J0LT5jb250ZW50UG9zKCk7CiAKICAgICBpZiAoZXYtPm9yaWVudGF0aW9u KCkgPT0gUXQ6Okhvcml6b250YWwpCi0gICAgICAgIG5ld1Bvc2l0aW9uLnJ4KCkgLT0gZGVsdGE7 CisgICAgICAgIG5ld1Bvc2l0aW9uLnJ4KCkgLT0gcGl4ZWxEZWx0YTsKICAgICBlbHNlCi0gICAg ICAgIG5ld1Bvc2l0aW9uLnJ5KCkgLT0gZGVsdGE7CisgICAgICAgIG5ld1Bvc2l0aW9uLnJ5KCkg LT0gcGl4ZWxEZWx0YTsKIAogICAgIFFSZWN0RiBlbmRQb3NSYW5nZSA9IGNvbXB1dGVQb3NSYW5n ZUZvckl0ZW1BdFNjYWxlKG1fY29udGVudC0+Y29udGVudHNTY2FsZSgpKTsKIApkaWZmIC0tZ2l0 IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDFhYzQxYWUzZTljZTI4 MWYyZmI2MGU0YTRhZWRlOGRiZTRhYzAzYTQuLmI0ZWMzNzU4MjZiYzYzNTM1YzkwZjkxOWM0Mzc0 ZTA4ZjdhNDYxODAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMi0wNC0xOCAgQWxsYW4gU2FuZGZlbGQgSmVuc2Vu ICA8YWxsYW4uamVuc2VuQG5va2lhLmNvbT4KKworICAgICAgICBDbGVhbi11cCBXaGVlbEV2ZW50 IENvbnZlcnNpb24uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD04NDI0MworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorICAgICAg ICAKKyAgICAgICAgQ2FsY3VsYXRlIHByb3BlciB3aGVlbC1kZWx0YSBmcm9tIHBpeGVsLWRlbHRh IGdpdmVuLgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvcXQvRXZlbnRTZW5kZXJRdC5jcHA6 CisgICAgICAgIChFdmVudFNlbmRlcjo6RXZlbnRTZW5kZXIpOgorICAgICAgICAoRXZlbnRTZW5k ZXI6Om1vdXNlU2Nyb2xsQnkpOgorICAgICAgICAoRXZlbnRTZW5kZXI6OmNvbnRpbnVvdXNNb3Vz ZVNjcm9sbEJ5KToKKwogMjAxMi0wNC0xNyAgQ2hyaXN0b3BoZSBEdW1leiAgPGNocmlzdG9waGUu ZHVtZXpAaW50ZWwuY29tPgogCiAgICAgICAgIFtFRkxdIERSVCBzaG91bGQgc3VwcG9ydCBMYXlv dXRUZXN0Q29udHJvbGxlcidzIGR1bXBGcmFtZUxvYWRDYWxsYmFja3MoKQpkaWZmIC0tZ2l0IGEv VG9vbHMvRHVtcFJlbmRlclRyZWUvcXQvRXZlbnRTZW5kZXJRdC5jcHAgYi9Ub29scy9EdW1wUmVu ZGVyVHJlZS9xdC9FdmVudFNlbmRlclF0LmNwcAppbmRleCAzZGE2NzhjMTkxYjhhYjYwZGE5ODhk MjA2OGY0ZjFkODJjY2U5Mjk1Li4wMjA5MDQ5YjZmYmM2YjQ4ZDZiNjQ4MjM5M2MwNDc2MDNkNTY2 NTJjIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9FdmVudFNlbmRlclF0LmNw cAorKysgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9xdC9FdmVudFNlbmRlclF0LmNwcApAQCAtNjks OCArNjksOCBAQCBFdmVudFNlbmRlcjo6RXZlbnRTZW5kZXIoUVdlYlBhZ2UqIHBhcmVudCkKICAg ICBtX2N1cnJlbnRCdXR0b24gPSAwOwogICAgIHJlc2V0Q2xpY2tDb3VudCgpOwogICAgIG1fcGFn ZS0+dmlldygpLT5pbnN0YWxsRXZlbnRGaWx0ZXIodGhpcyk7Ci0gICAgLy8gU28gdGhhdCB3ZSBj YW4gbWF0Y2ggU2Nyb2xsYmFyOjpwaXhlbHNQZXJMaW5lU3RlcCgpIGluIFdoZWVsRXZlbnRRdC5j cHAgYW5kCi0gICAgLy8gcGFzcyBmYXN0L2V2ZW50cy9wbGF0Zm9ybS13aGVlbGV2ZW50LWluLXNj cm9sbGluZy1kaXYuaHRtbAorICAgIC8vIFRoaXMgaXMgYSBoYWNrIHRoYXQgd29ya3MgYmVjYXVz ZSB3ZSBub3JtYWxseSBzY3JvbGwgNjAgcGl4ZWxzICgzKjIwKSBwZXIgdGljaywgYnV0IEFwcGxl IHNjcm9sbHMgMTIwLgorICAgIC8vIEJ1dCBBcHBsZSBhbHNvIGhhcyBhIGJ1ZyB3aGVyZSB0aGV5 IHJlcG9ydCBsaW5lcyBpbnN0ZWFkIG9mIHRpY2tzIGluIFBsYXRmb3JtV2hlZWxFdmVudCwgbWFr aW5nIDIgbGluZXMgPSA0MCBwaXhlbHMgbWF0Y2guCiAgICAgUUFwcGxpY2F0aW9uOjpzZXRXaGVl bFNjcm9sbExpbmVzKDIpOwogfQogCkBAIC0xOTksMjIgKzE5OSwyNiBAQCB2b2lkIEV2ZW50U2Vu ZGVyOjptb3VzZU1vdmVUbyhpbnQgeCwgaW50IHkpCiB9CiAKICNpZm5kZWYgUVRfTk9fV0hFRUxF VkVOVAotdm9pZCBFdmVudFNlbmRlcjo6bW91c2VTY3JvbGxCeShpbnQgeCwgaW50IHkpCit2b2lk IEV2ZW50U2VuZGVyOjptb3VzZVNjcm9sbEJ5KGludCB0aWNrc1gsIGludCB0aWNrc1kpCiB7Ci0g ICAgY29udGludW91c01vdXNlU2Nyb2xsQnkoKHgqMTIwKSwgKHkqMTIwKSk7CisgICAgY29uc3Qg aW50IHRpY2tTdGVwID0gUUFwcGxpY2F0aW9uOjp3aGVlbFNjcm9sbExpbmVzKCkgKiAyMDsKKyAg ICBjb250aW51b3VzTW91c2VTY3JvbGxCeSgodGlja3NYICogdGlja1N0ZXApLCAodGlja3NZICog dGlja1N0ZXApKTsKIH0KIAogdm9pZCBFdmVudFNlbmRlcjo6Y29udGludW91c01vdXNlU2Nyb2xs QnkoaW50IHgsIGludCB5KQogewogICAgIC8vIGNvbnRpbnVvdXNNb3VzZVNjcm9sbEJ5KCkgbWlt aWNzIGRldmljZXMgdGhhdCBzZW5kIGZpbmUtZ3JhaW5lZCBzY3JvbGwgZXZlbnRzIHdoZXJlIHRo ZSAnZGVsdGEnIHNwZWNpZmllZCBpcyBub3QgdGhlIHVzdWFsCiAgICAgLy8gbXVsdGlwbGUgb2Yg MTIwLiBTZWUgaHR0cDovL2RvYy5xdC5ub2tpYS5jb20vNC42L3F3aGVlbGV2ZW50Lmh0bWwjZGVs dGEgZm9yIGEgZ29vZCBleHBsYW5hdGlvbiBvZiB0aGlzLgorCisgICAgLy8gQSB3aGVlbCBkZWx0 YSBvZiAxMjAgKGluIDEvOCBkZWdyZWVzKSBjb3JyZXNwb25kcyB0byBvbmUgd2hlZWwgdGljaywg YW5kIHdlIHNjcm9sbCB0aWNrU3RlcCBwaXhlbHMgcGVyIHdoZWVsIHRpY2suCisgICAgY29uc3Qg aW50IHRpY2tTdGVwID0gUUFwcGxpY2F0aW9uOjp3aGVlbFNjcm9sbExpbmVzKCkgKiAyMDsKICAg ICBpZiAoeCkgewogICAgICAgICBRRXZlbnQqIGV2ZW50OwogICAgICAgICBpZiAoaXNHcmFwaGlj c0Jhc2VkKCkpIHsKICAgICAgICAgICAgIGV2ZW50ID0gY3JlYXRlR3JhcGhpY3NTY2VuZVdoZWVs RXZlbnQoUUV2ZW50OjpHcmFwaGljc1NjZW5lV2hlZWwsCi0gICAgICAgICAgICAgICAgICAgICAg ICBtX21vdXNlUG9zLCBtX21vdXNlUG9zLCB4LCBRdDo6Tm9Nb2RpZmllciwgUXQ6Okhvcml6b250 YWwpOworICAgICAgICAgICAgICAgICAgICAgICAgbV9tb3VzZVBvcywgbV9tb3VzZVBvcywgKHgg KiAxMjApIC8gdGlja1N0ZXAsIFF0OjpOb01vZGlmaWVyLCBRdDo6SG9yaXpvbnRhbCk7CiAgICAg ICAgIH0gZWxzZQotICAgICAgICAgICAgZXZlbnQgPSBuZXcgUVdoZWVsRXZlbnQobV9tb3VzZVBv cywgbV9tb3VzZVBvcywgeCwgbV9tb3VzZUJ1dHRvbnMsIFF0OjpOb01vZGlmaWVyLCBRdDo6SG9y aXpvbnRhbCk7CisgICAgICAgICAgICBldmVudCA9IG5ldyBRV2hlZWxFdmVudChtX21vdXNlUG9z LCBtX21vdXNlUG9zLCAoeCAqIDEyMCkgLyB0aWNrU3RlcCwgbV9tb3VzZUJ1dHRvbnMsIFF0OjpO b01vZGlmaWVyLCBRdDo6SG9yaXpvbnRhbCk7CiAKICAgICAgICAgc2VuZE9yUXVldWVFdmVudChl dmVudCk7CiAgICAgfQpAQCAtMjIyLDkgKzIyNiw5IEBAIHZvaWQgRXZlbnRTZW5kZXI6OmNvbnRp bnVvdXNNb3VzZVNjcm9sbEJ5KGludCB4LCBpbnQgeSkKICAgICAgICAgUUV2ZW50KiBldmVudDsK ICAgICAgICAgaWYgKGlzR3JhcGhpY3NCYXNlZCgpKSB7CiAgICAgICAgICAgICBldmVudCA9IGNy ZWF0ZUdyYXBoaWNzU2NlbmVXaGVlbEV2ZW50KFFFdmVudDo6R3JhcGhpY3NTY2VuZVdoZWVsLAot ICAgICAgICAgICAgICAgICAgICAgICAgbV9tb3VzZVBvcywgbV9tb3VzZVBvcywgeSwgUXQ6Ok5v TW9kaWZpZXIsIFF0OjpWZXJ0aWNhbCk7CisgICAgICAgICAgICAgICAgICAgICAgICBtX21vdXNl UG9zLCBtX21vdXNlUG9zLCAoeSAqIDEyMCkgLyB0aWNrU3RlcCwgUXQ6Ok5vTW9kaWZpZXIsIFF0 OjpWZXJ0aWNhbCk7CiAgICAgICAgIH0gZWxzZQotICAgICAgICAgICAgZXZlbnQgPSBuZXcgUVdo ZWVsRXZlbnQobV9tb3VzZVBvcywgbV9tb3VzZVBvcywgeSwgbV9tb3VzZUJ1dHRvbnMsIFF0OjpO b01vZGlmaWVyLCBRdDo6VmVydGljYWwpOworICAgICAgICAgICAgZXZlbnQgPSBuZXcgUVdoZWVs RXZlbnQobV9tb3VzZVBvcywgbV9tb3VzZVBvcywgKHkgKiAxMjApIC8gdGlja1N0ZXAsIG1fbW91 c2VCdXR0b25zLCBRdDo6Tm9Nb2RpZmllciwgUXQ6OlZlcnRpY2FsKTsKIAogICAgICAgICBzZW5k T3JRdWV1ZUV2ZW50KGV2ZW50KTsKICAgICB9CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZTVjMTQyNGI2MTc2ZjQwNzNjYjRl YTUyOGU2MjM4MjNjZGYyZGFlZi4uMTZkMmYwNDZjYTJmYjJiMjE4YTM1Y2MwMGRiZjQ4NzIwN2Vi YjQyNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDEyLTA0LTE4ICBBbGxhbiBTYW5kZmVsZCBK ZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgorCisgICAgICAgIENsZWFuLXVwIFdoZWVs RXZlbnQgQ29udmVyc2lvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTg0MjQzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBwbGF0Zm9ybS9xdC9mYXN0L2V2ZW50cy9jb250aW51b3VzLXBsYXRmb3JtLXdo ZWVsZXZlbnQtaW4tc2Nyb2xsaW5nLWRpdi1leHBlY3RlZC50eHQ6CisKIDIwMTItMDQtMTcgIFN0 ZXBoZW4gQ2hlbm5leSAgPHNjaGVubmV5QGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21p dW1dIFJlYmFzZWxpbmUgYWZ0ZXIgZml4L2ltcHJvdmUgYml0bWFwIHNhbXBsaW5nIChtYXRyaXhw cm9jKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvZmFzdC9ldmVudHMvY29u dGludW91cy1wbGF0Zm9ybS13aGVlbGV2ZW50LWluLXNjcm9sbGluZy1kaXYtZXhwZWN0ZWQudHh0 IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvZmFzdC9ldmVudHMvY29udGludW91cy1wbGF0Zm9y bS13aGVlbGV2ZW50LWluLXNjcm9sbGluZy1kaXYtZXhwZWN0ZWQudHh0CmluZGV4IGIzYWQ5ZGJi OTRiMTAwMTQ1ZWM2NDZlMWI2ZDZlYjEwZTMxMWY5NzkuLjdlOTg1ZmVjM2NlNjEwZDYzNGNjOGM1 YTYwODU1ZmQxNzFjYmRjMmQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L2Zh c3QvZXZlbnRzL2NvbnRpbnVvdXMtcGxhdGZvcm0td2hlZWxldmVudC1pbi1zY3JvbGxpbmctZGl2 LWV4cGVjdGVkLnR4dAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC9mYXN0L2V2ZW50cy9j b250aW51b3VzLXBsYXRmb3JtLXdoZWVsZXZlbnQtaW4tc2Nyb2xsaW5nLWRpdi1leHBlY3RlZC50 eHQKQEAgLTEsOSArMSw5IEBACiBGQUlMIGV2ZW50LndoZWVsRGVsdGFZIHNob3VsZCBiZSAtNjAw LiBXYXMgMC4KLUZBSUwgZXZlbnQud2hlZWxEZWx0YVggc2hvdWxkIGJlIC0zMDAuIFdhcyAtMTIw MDAuCi1GQUlMIGV2ZW50LndoZWVsRGVsdGEgc2hvdWxkIGJlIC0zMDAuIFdhcyAtMTIwMDAuCi1G QUlMIGV2ZW50LndoZWVsRGVsdGFZIHNob3VsZCBiZSAtNjAwLiBXYXMgLTI0MDAwLgorUEFTUyBl dmVudC53aGVlbERlbHRhWCBpcyB3aW5kb3cuZXhwZWN0ZWRTY3JvbGxMZWZ0Ki0zCitQQVNTIGV2 ZW50LndoZWVsRGVsdGEgaXMgd2luZG93LmV4cGVjdGVkU2Nyb2xsTGVmdCotMworUEFTUyBldmVu dC53aGVlbERlbHRhWSBpcyB3aW5kb3cuZXhwZWN0ZWRTY3JvbGxUb3AqLTMKIEZBSUwgZXZlbnQu d2hlZWxEZWx0YVggc2hvdWxkIGJlIC0zMDAuIFdhcyAwLgotRkFJTCBldmVudC53aGVlbERlbHRh IHNob3VsZCBiZSAtNjAwLiBXYXMgLTI0MDAwLgorUEFTUyBldmVudC53aGVlbERlbHRhIGlzIHdp bmRvdy5leHBlY3RlZFNjcm9sbFRvcCotMwogUEFTUyBkaXYuc2Nyb2xsVG9wIGlzIHdpbmRvdy5l eHBlY3RlZFNjcm9sbFRvcAogUEFTUyBkaXYuc2Nyb2xsTGVmdCBpcyB3aW5kb3cuZXhwZWN0ZWRT Y3JvbGxMZWZ0CiAK