79868 2012-02-28 21:51:58 -0800 Overlay scrollbars should respond to AppKit's NSEventPhaseMayBegin 2012-02-29 11:52:44 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified OS X 10.7 RESOLVED FIXED InRadar P2 Normal --- 1 bdakin bdakin bdakin oldest_to_newest 567361 0 bdakin 2012-02-28 21:51:58 -0800 Overlay scrollbars should respond to AppKit's NSEventPhaseMayBegin. <rdar://problem/10688637> 567362 1 129385 bdakin 2012-02-28 21:56:41 -0800 Created attachment 129385 Patch 567659 2 129385 andersca 2012-02-29 08:59:37 -0800 Comment on attachment 129385 Patch I think you should change all handleWheelEventPhase functions to just take the phase enum, that way you'll avoid copying the event object when all you want is the phase. Looks great otherwise! 567664 3 129385 andersca 2012-02-29 09:02:47 -0800 Comment on attachment 129385 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=129385&action=review > Source/WebCore/platform/mac/ScrollAnimatorMac.h:89 > + virtual void handleWheelEventPhase(const PlatformWheelEvent&); This could be marked OVERRIDE. 567799 4 bdakin 2012-02-29 11:52:44 -0800 Thanks Anders! Committed change with http://trac.webkit.org/changeset/109237 129385 2012-02-28 21:56:41 -0800 2012-02-29 09:02:47 -0800 Patch for-review.txt text/plain 8686 bdakin SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwOTE4OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM5IEBACisyMDEyLTAyLTI4ICBCZXRoIERh a2luICA8YmRha2luQGFwcGxlLmNvbT4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9Nzk4NjgKKyAgICAgICAgT3ZlcmxheSBzY3JvbGxiYXJzIHNob3Vs ZCByZXNwb25kIHRvIEFwcEtpdCdzIE5TRXZlbnRQaGFzZU1heUJlZ2luCisgICAgICAgIC1hbmQg Y29ycmVzcG9uZGluZy0KKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEwNjg4NjM3PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNjcm9sbGJhcnMgYXJl IGN1cnJlbnRseSBkcmF3biBvbiB0aGUgbWFpbiB0aHJlYWQgZXZlbiB3aGVuIHNjcm9sbGluZyBo YXBwZW5zIG9uIAorICAgICAgICB0aGUgc2Nyb2xsaW5nIHRocmVhZCwgc28gd2UgaGF2ZSB0byBj YWxsIGJhY2sgdG8gdGhlIG1haW4gdGhyZWFkIGZvciB0aGUgdGltZSAKKyAgICAgICAgYmVpbmcg dG8gbWFrZSB0aGUgcmlnaHQgZHJhd2luZyBjYWxscyBmb3IgTlNFdmVudFBoYXNlTWF5QmVnaW4u CisgICAgICAgICogcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6U2Nyb2xsaW5nQ29vcmRpbmF0b3I6OmhhbmRsZVdoZWVsRXZlbnRQaGFz ZSk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBwYWdlL3Njcm9sbGluZy9TY3JvbGxp bmdDb29yZGluYXRvci5oOgorICAgICAgICAoU2Nyb2xsaW5nQ29vcmRpbmF0b3IpOgorICAgICAg ICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U2Nyb2xsaW5nVHJlZTo6aGFuZGxlV2hlZWxFdmVudFBoYXNlKToKKyAgICAgICAgKFdlYkNvcmUp OgorICAgICAgICAqIHBhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ1RyZWUuaDoKKyAgICAgICAgKiBw YWdlL3Njcm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZU5vZGVNYWMubW06CisgICAgICAgIChXZWJD b3JlOjpTY3JvbGxpbmdUcmVlTm9kZU1hYzo6aGFuZGxlV2hlZWxFdmVudCk6CisgICAgICAgICog cGxhdGZvcm0vU2Nyb2xsQW5pbWF0b3IuaDoKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFuaW1h dG9yOjpoYW5kbGVXaGVlbEV2ZW50UGhhc2UpOgorICAgICAgICAoU2Nyb2xsQW5pbWF0b3IpOgor CisgICAgICAgIENhbGwgaW50byBBcHBLaXQgb24gTlNFdmVudFBoYXNlTWF5QmVnaW4uCisgICAg ICAgICogcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLmg6CisgICAgICAgIChTY3JvbGxB bmltYXRvck1hYyk6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1Njcm9sbEFuaW1hdG9yTWFjLm1t OgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xsQW5pbWF0b3JNYWM6Om1heUJlZ2luU2Nyb2xsR2Vz dHVyZSk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6OlNjcm9sbEFuaW1h dG9yTWFjOjpoYW5kbGVXaGVlbEV2ZW50UGhhc2UpOgorICAgICAgICAoV2ViQ29yZTo6U2Nyb2xs QW5pbWF0b3JNYWM6OmhhbmRsZVdoZWVsRXZlbnQpOgorCiAyMDEyLTAyLTI4ICBTaW1vbiBGcmFz ZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIE9wdGltaXplIHRoZSByZWN0 cyBiZWluZyBkcmF3biBpbnRvIGNvbXBvc2l0aW5nIGxheWVycwpJbmRleDogU291cmNlL1dlYkNv cmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuY3BwCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGluZ0Nvb3JkaW5hdG9yLmNwcAko cmV2aXNpb24gMTA5MDEwKQorKysgU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxpbmcvU2Nyb2xs aW5nQ29vcmRpbmF0b3IuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNzksNiArMjc5LDIwIEBAIHZv aWQgU2Nyb2xsaW5nQ29vcmRpbmF0b3I6OnVwZGF0ZU1haW5GcmEKICNlbmRpZgogfQogCit2b2lk IFNjcm9sbGluZ0Nvb3JkaW5hdG9yOjpoYW5kbGVXaGVlbEV2ZW50UGhhc2UoY29uc3QgUGxhdGZv cm1XaGVlbEV2ZW50JiBldmVudCkKK3sKKyAgICBBU1NFUlQoaXNNYWluVGhyZWFkKCkpOworCisg ICAgaWYgKCFtX3BhZ2UpCisgICAgICAgIHJldHVybjsKKworICAgIEZyYW1lVmlldyogZnJhbWVW aWV3ID0gbV9wYWdlLT5tYWluRnJhbWUoKS0+dmlldygpOworICAgIGlmICghZnJhbWVWaWV3KQor ICAgICAgICByZXR1cm47CisKKyAgICBmcmFtZVZpZXctPnNjcm9sbEFuaW1hdG9yKCktPmhhbmRs ZVdoZWVsRXZlbnRQaGFzZShldmVudCk7Cit9CisKIHZvaWQgU2Nyb2xsaW5nQ29vcmRpbmF0b3I6 OnJlY29tcHV0ZVdoZWVsRXZlbnRIYW5kbGVyQ291bnQoKQogewogICAgIHVuc2lnbmVkIHdoZWVs RXZlbnRIYW5kbGVyQ291bnQgPSAwOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxp bmcvU2Nyb2xsaW5nQ29vcmRpbmF0b3IuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5oCShyZXZpc2lvbiAxMDkwMTApCisr KyBTb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9TY3JvbGxpbmdDb29yZGluYXRvci5oCSh3 b3JraW5nIGNvcHkpCkBAIC0xMDcsNiArMTA3LDkgQEAgcHVibGljOgogICAgIC8vIERpc3BhdGNo ZWQgYnkgdGhlIHNjcm9sbGluZyB0cmVlIHdoZW5ldmVyIHRoZSBtYWluIGZyYW1lIHNjcm9sbCBw b3NpdGlvbiBjaGFuZ2VzIGFuZCB0aGUgc2Nyb2xsIGxheWVyIHBvc2l0aW9uIG5lZWRzIHRvIGJl IHVwZGF0ZWQgYXMgd2VsbC4KICAgICB2b2lkIHVwZGF0ZU1haW5GcmFtZVNjcm9sbFBvc2l0aW9u QW5kU2Nyb2xsTGF5ZXJQb3NpdGlvbihjb25zdCBJbnRQb2ludCYpOwogCisgICAgLy8gRGlzcGF0 Y2hlZCBieSB0aGUgc2Nyb2xsaW5nIHRyZWUgZHVyaW5nIGhhbmRsZVdoZWVsRXZlbnQuIFRoaXMg aXMgcmVxdWlyZWQgYXMgbG9uZyBhcyBzY3JvbGxiYXJzIGFyZSBwYWludGVkIG9uIHRoZSBtYWlu IHRocmVhZC4KKyAgICB2b2lkIGhhbmRsZVdoZWVsRXZlbnRQaGFzZShjb25zdCBQbGF0Zm9ybVdo ZWVsRXZlbnQmKTsKKwogcHJpdmF0ZToKICAgICBleHBsaWNpdCBTY3JvbGxpbmdDb29yZGluYXRv cihQYWdlKik7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Njcm9sbGlu Z1RyZWUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL1Nj cm9sbGluZ1RyZWUuY3BwCShyZXZpc2lvbiAxMDkwMTApCisrKyBTb3VyY2UvV2ViQ29yZS9wYWdl L3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTc0LDYgKzE3 NCwxNCBAQCB2b2lkIFNjcm9sbGluZ1RyZWU6OnVwZGF0ZU1haW5GcmFtZVNjcm9sCiAgICAgY2Fs bE9uTWFpblRocmVhZChiaW5kKCZTY3JvbGxpbmdDb29yZGluYXRvcjo6dXBkYXRlTWFpbkZyYW1l U2Nyb2xsUG9zaXRpb25BbmRTY3JvbGxMYXllclBvc2l0aW9uLCBtX3Njcm9sbGluZ0Nvb3JkaW5h dG9yLmdldCgpLCBzY3JvbGxQb3NpdGlvbikpOwogfQogCit2b2lkIFNjcm9sbGluZ1RyZWU6Omhh bmRsZVdoZWVsRXZlbnRQaGFzZShjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmIGV2ZW50KQorewor ICAgIGlmICghbV9zY3JvbGxpbmdDb29yZGluYXRvcikKKyAgICAgICAgcmV0dXJuOworCisgICAg Y2FsbE9uTWFpblRocmVhZChiaW5kKCZTY3JvbGxpbmdDb29yZGluYXRvcjo6aGFuZGxlV2hlZWxF dmVudFBoYXNlLCBtX3Njcm9sbGluZ0Nvb3JkaW5hdG9yLmdldCgpLCBldmVudCkpOworfQorCiBi b29sIFNjcm9sbGluZ1RyZWU6OmNhbkdvQmFjaygpCiB7CiAgICAgTXV0ZXhMb2NrZXIgbG9jayht X3N3aXBlU3RhdGVNdXRleCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wYWdlL3Njcm9sbGluZy9T Y3JvbGxpbmdUcmVlLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGFnZS9zY3JvbGxp bmcvU2Nyb2xsaW5nVHJlZS5oCShyZXZpc2lvbiAxMDkwMTApCisrKyBTb3VyY2UvV2ViQ29yZS9w YWdlL3Njcm9sbGluZy9TY3JvbGxpbmdUcmVlLmgJKHdvcmtpbmcgY29weSkKQEAgLTgwLDYgKzgw LDggQEAgcHVibGljOgogICAgIHZvaWQgdXBkYXRlTWFpbkZyYW1lU2Nyb2xsUG9zaXRpb24oY29u c3QgSW50UG9pbnQmIHNjcm9sbFBvc2l0aW9uKTsKICAgICB2b2lkIHVwZGF0ZU1haW5GcmFtZVNj cm9sbFBvc2l0aW9uQW5kU2Nyb2xsTGF5ZXJQb3NpdGlvbihjb25zdCBJbnRQb2ludCYgc2Nyb2xs UG9zaXRpb24pOwogCisgICAgdm9pZCBoYW5kbGVXaGVlbEV2ZW50UGhhc2UoY29uc3QgUGxhdGZv cm1XaGVlbEV2ZW50Jik7CisKICAgICBib29sIGNhbkdvQmFjaygpOwogICAgIGJvb2wgY2FuR29G b3J3YXJkKCk7CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3Jv bGxpbmdUcmVlTm9kZU1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wYWdlL3Nj cm9sbGluZy9tYWMvU2Nyb2xsaW5nVHJlZU5vZGVNYWMubW0JKHJldmlzaW9uIDEwOTAxMCkKKysr IFNvdXJjZS9XZWJDb3JlL3BhZ2Uvc2Nyb2xsaW5nL21hYy9TY3JvbGxpbmdUcmVlTm9kZU1hYy5t bQkod29ya2luZyBjb3B5KQpAQCAtNjUsNiArNjUsNyBAQCB2b2lkIFNjcm9sbGluZ1RyZWVOb2Rl TWFjOjp1cGRhdGUoU2Nyb2xsCiB2b2lkIFNjcm9sbGluZ1RyZWVOb2RlTWFjOjpoYW5kbGVXaGVl bEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYgd2hlZWxFdmVudCkKIHsKICAgICBtX3Nj cm9sbEVsYXN0aWNpdHlDb250cm9sbGVyLmhhbmRsZVdoZWVsRXZlbnQod2hlZWxFdmVudCk7Cisg ICAgc2Nyb2xsaW5nVHJlZSgpLT5oYW5kbGVXaGVlbEV2ZW50UGhhc2Uod2hlZWxFdmVudCk7CiB9 CiAKIHZvaWQgU2Nyb2xsaW5nVHJlZU5vZGVNYWM6OnNldFNjcm9sbFBvc2l0aW9uKGNvbnN0IElu dFBvaW50JiBzY3JvbGxQb3NpdGlvbikKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1Nj cm9sbEFuaW1hdG9yLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vU2Ny b2xsQW5pbWF0b3IuaAkocmV2aXNpb24gMTA5MDEwKQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vU2Nyb2xsQW5pbWF0b3IuaAkod29ya2luZyBjb3B5KQpAQCAtNjUsNiArNjUsOCBAQCBwdWJs aWM6CiAKICAgICB2aXJ0dWFsIGJvb2wgaGFuZGxlV2hlZWxFdmVudChjb25zdCBQbGF0Zm9ybVdo ZWVsRXZlbnQmKTsKIAorICAgIHZpcnR1YWwgdm9pZCBoYW5kbGVXaGVlbEV2ZW50UGhhc2UoY29u c3QgUGxhdGZvcm1XaGVlbEV2ZW50JikgeyB9CisKICAgICBGbG9hdFBvaW50IGN1cnJlbnRQb3Np dGlvbigpIGNvbnN0OwogCiAgICAgdmlydHVhbCB2b2lkIGNhbmNlbEFuaW1hdGlvbnMoKSB7IH0K SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1h Yy5oCShyZXZpc2lvbiAxMDkwMTApCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvU2Ny b2xsQW5pbWF0b3JNYWMuaAkod29ya2luZyBjb3B5KQpAQCAtODYsNiArODYsOCBAQCBwcml2YXRl OgogICAgIHZpcnR1YWwgYm9vbCBoYW5kbGVXaGVlbEV2ZW50KGNvbnN0IFBsYXRmb3JtV2hlZWxF dmVudCYpIE9WRVJSSURFOwogI2VuZGlmCiAKKyAgICB2aXJ0dWFsIHZvaWQgaGFuZGxlV2hlZWxF dmVudFBoYXNlKGNvbnN0IFBsYXRmb3JtV2hlZWxFdmVudCYpOworCiAgICAgdmlydHVhbCB2b2lk IGNhbmNlbEFuaW1hdGlvbnMoKTsKICAgICB2aXJ0dWFsIHZvaWQgc2V0SXNBY3RpdmUoKTsKICAg ICAKQEAgLTEwMyw2ICsxMDUsNyBAQCBwcml2YXRlOgogICAgIHZpcnR1YWwgdm9pZCBjb250ZW50 QXJlYURpZEhpZGUoKSBjb25zdDsKICAgICB2b2lkIGRpZEJlZ2luU2Nyb2xsR2VzdHVyZSgpIGNv bnN0OwogICAgIHZvaWQgZGlkRW5kU2Nyb2xsR2VzdHVyZSgpIGNvbnN0OworICAgIHZvaWQgbWF5 QmVnaW5TY3JvbGxHZXN0dXJlKCkgY29uc3Q7CiAKICAgICB2aXJ0dWFsIHZvaWQgZGlkQWRkVmVy dGljYWxTY3JvbGxiYXIoU2Nyb2xsYmFyKik7CiAgICAgdmlydHVhbCB2b2lkIHdpbGxSZW1vdmVW ZXJ0aWNhbFNjcm9sbGJhcihTY3JvbGxiYXIqKTsKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tYWMvU2Nyb2xsQW5pbWF0b3JNYWMubW0JKHJldmlzaW9uIDEwOTAxMCkKKysr IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9TY3JvbGxBbmltYXRvck1hYy5tbQkod29ya2lu ZyBjb3B5KQpAQCAtNzc5LDYgKzc3OSwxNyBAQCB2b2lkIFNjcm9sbEFuaW1hdG9yTWFjOjpkaWRF bmRTY3JvbGxHZXN0CiAgICAgICAgIFttX3Njcm9sbGJhclBhaW50ZXJDb250cm9sbGVyLmdldCgp IGVuZFNjcm9sbEdlc3R1cmVdOwogfQogCit2b2lkIFNjcm9sbEFuaW1hdG9yTWFjOjptYXlCZWdp blNjcm9sbEdlc3R1cmUoKSBjb25zdAoreworICAgIGlmICghc2Nyb2xsYWJsZUFyZWEoKS0+aXNP bkFjdGl2ZVBhZ2UoKSkKKyAgICAgICAgcmV0dXJuOworICAgIGlmICghaXNTY3JvbGxiYXJPdmVy bGF5QVBJQXZhaWxhYmxlKCkpCisgICAgICAgIHJldHVybjsKKworICAgIFttX3Njcm9sbGJhclBh aW50ZXJDb250cm9sbGVyLmdldCgpIGJlZ2luU2Nyb2xsR2VzdHVyZV07CisgICAgW21fc2Nyb2xs YmFyUGFpbnRlckNvbnRyb2xsZXIuZ2V0KCkgY29udGVudEFyZWFTY3JvbGxlZF07Cit9CisKIHZv aWQgU2Nyb2xsQW5pbWF0b3JNYWM6OmRpZEFkZFZlcnRpY2FsU2Nyb2xsYmFyKFNjcm9sbGJhciog c2Nyb2xsYmFyKQogewogICAgIGlmICghaXNTY3JvbGxiYXJPdmVybGF5QVBJQXZhaWxhYmxlKCkp CkBAIC04ODksNiArOTAwLDE2IEBAIHZvaWQgU2Nyb2xsQW5pbWF0b3JNYWM6OmNhbmNlbEFuaW1h dGlvbnMKICAgICB9CiB9CiAKK3ZvaWQgU2Nyb2xsQW5pbWF0b3JNYWM6OmhhbmRsZVdoZWVsRXZl bnRQaGFzZShjb25zdCBQbGF0Zm9ybVdoZWVsRXZlbnQmIGV2ZW50KQoreworICAgIGlmIChldmVu dC5waGFzZSgpID09IFBsYXRmb3JtV2hlZWxFdmVudFBoYXNlQmVnYW4pCisgICAgICAgIGRpZEJl Z2luU2Nyb2xsR2VzdHVyZSgpOworICAgIGVsc2UgaWYgKGV2ZW50LnBoYXNlKCkgPT0gUGxhdGZv cm1XaGVlbEV2ZW50UGhhc2VFbmRlZCB8fCBldmVudC5waGFzZSgpID09IFBsYXRmb3JtV2hlZWxF dmVudFBoYXNlQ2FuY2VsbGVkKQorICAgICAgICBkaWRFbmRTY3JvbGxHZXN0dXJlKCk7CisgICAg ZWxzZSBpZiAoZXZlbnQucGhhc2UoKSA9PSBQbGF0Zm9ybVdoZWVsRXZlbnRQaGFzZU1heUJlZ2lu KQorICAgICAgICBtYXlCZWdpblNjcm9sbEdlc3R1cmUoKTsKK30KKwogI2lmIEVOQUJMRShSVUJC RVJfQkFORElORykKIGJvb2wgU2Nyb2xsQW5pbWF0b3JNYWM6OmhhbmRsZVdoZWVsRXZlbnQoY29u c3QgUGxhdGZvcm1XaGVlbEV2ZW50JiB3aGVlbEV2ZW50KQogewpAQCAtOTExLDEyICs5MzIsOCBA QCBib29sIFNjcm9sbEFuaW1hdG9yTWFjOjpoYW5kbGVXaGVlbEV2ZW50CiAKICAgICBib29sIGRp ZEhhbmRsZUV2ZW50ID0gbV9zY3JvbGxFbGFzdGljaXR5Q29udHJvbGxlci5oYW5kbGVXaGVlbEV2 ZW50KHdoZWVsRXZlbnQpOwogCi0gICAgaWYgKGRpZEhhbmRsZUV2ZW50KSB7Ci0gICAgICAgIGlm ICh3aGVlbEV2ZW50LnBoYXNlKCkgPT0gUGxhdGZvcm1XaGVlbEV2ZW50UGhhc2VCZWdhbikKLSAg ICAgICAgICAgIGRpZEJlZ2luU2Nyb2xsR2VzdHVyZSgpOwotICAgICAgICBlbHNlIGlmICh3aGVl bEV2ZW50LnBoYXNlKCkgPT0gUGxhdGZvcm1XaGVlbEV2ZW50UGhhc2VFbmRlZCkKLSAgICAgICAg ICAgIGRpZEVuZFNjcm9sbEdlc3R1cmUoKTsKLSAgICB9CisgICAgaWYgKGRpZEhhbmRsZUV2ZW50 KQorICAgICAgICBoYW5kbGVXaGVlbEV2ZW50UGhhc2Uod2hlZWxFdmVudCk7CiAKICAgICByZXR1 cm4gZGlkSGFuZGxlRXZlbnQ7CiB9Cg==