142713 2015-03-15 15:01:22 -0700 Clean up related to wheelEvent names 2015-03-15 15:48:12 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 simon.fraser simon.fraser simon.fraser oldest_to_newest 1077267 0 simon.fraser 2015-03-15 15:01:22 -0700 Clean up related to wheelEvent names 1077268 1 248689 simon.fraser 2015-03-15 15:03:15 -0700 Created attachment 248689 Patch 1077269 2 248689 andersca 2015-03-15 15:04:24 -0700 Comment on attachment 248689 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=248689&action=review > Source/WebCore/dom/Document.cpp:5998 > +void Document::didAddWheelEventHandler(Node*) Can Node be a reference? > Source/WebCore/dom/Document.cpp:6004 > +void Document::didRemoveWheelEventHandler(Node*) Same question here. 1077272 3 simon.fraser 2015-03-15 15:48:12 -0700 https://trac.webkit.org/r181514 248689 2015-03-15 15:03:15 -0700 2015-03-15 15:04:24 -0700 Patch bug-142713-20150315150246.patch text/plain 12796 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMTgxNTEzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNzZiMzVlYWFhNWQzOTc0 ZWFmNjVjOTYxMTRlZWEzZjYyMTE3ZjkwMi4uYjFmZTc3YmRjYjEwNmFmODcyNmM4NDhlODM5NThh YWY5NDVmOGMxYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM1IEBACiAyMDE1LTAzLTE1ICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCisgICAgICAgIENsZWFuIHVwIHJl bGF0ZWQgdG8gd2hlZWxFdmVudCBuYW1lcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTQyNzEzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgQWRkIEV2ZW50TmFtZXM6OmlzV2hlZWxFdmVudFR5cGUoKSBhbmQg dXNlIGl0IGluIHBsYWNlcyB0aGF0IHRlc3QgZm9yIHRoZQorICAgICAgICB0d28gd2hlZWwgZXZl bnQgbmFtZXMuCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RG9jdW1lbnQ6OmRpZEFkZFdoZWVsRXZlbnRIYW5kbGVyKToKKyAgICAgICAgKFdlYkNvcmU6 OkRvY3VtZW50OjpkaWRSZW1vdmVXaGVlbEV2ZW50SGFuZGxlcik6CisgICAgICAgICogZG9tL0Rv Y3VtZW50Lmg6IE5vIG5lZWQgZm9yIGV4cG9ydHMgKEkgZ3JlcHBlZCkuIFBhc3MgdGhlIE5vZGUq LCB3aGljaAorICAgICAgICB3aWxsIGJlIHVzZWQgaW4gYSBsYXRlciBwYXRjaC4KKyAgICAgICAg KiBkb20vRXZlbnROYW1lcy5oOgorICAgICAgICAoV2ViQ29yZTo6RXZlbnROYW1lczo6aXNXaGVl bEV2ZW50VHlwZSk6CisgICAgICAgICogZG9tL05vZGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 Tm9kZTo6ZGlkTW92ZVRvTmV3RG9jdW1lbnQpOgorICAgICAgICAoV2ViQ29yZTo6dHJ5QWRkRXZl bnRMaXN0ZW5lcik6CisgICAgICAgIChXZWJDb3JlOjp0cnlSZW1vdmVFdmVudExpc3RlbmVyKToK KyAgICAgICAgKFdlYkNvcmU6Ok5vZGU6OmRlZmF1bHRFdmVudEhhbmRsZXIpOgorICAgICAgICAq IGh0bWwvc2hhZG93L01lZGlhQ29udHJvbHNBcHBsZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpN ZWRpYUNvbnRyb2xzQXBwbGVFdmVudExpc3RlbmVyOjpoYW5kbGVFdmVudCk6CisgICAgICAgICog cGFnZS9ET01XaW5kb3cuY3BwOgorICAgICAgICAoV2ViQ29yZTo6RE9NV2luZG93OjphZGRFdmVu dExpc3RlbmVyKToKKyAgICAgICAgKFdlYkNvcmU6OkRPTVdpbmRvdzo6cmVtb3ZlRXZlbnRMaXN0 ZW5lcik6CisgICAgICAgICogcGFnZS9pb3MvRnJhbWVJT1MubW06CisgICAgICAgIChXZWJDb3Jl OjphbmNlc3RvclJlc3BvbmRpbmdUb1Njcm9sbFdoZWVsRXZlbnRzKTogUmVtb3ZlIGRlYWQgY29k ZS4KKworMjAxNS0wMy0xNSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4K KwogICAgICAgICBSZW1vdmUgYSByZWR1bmRhbnQgcmVwYWludCB3aGVuIGEgbGF5ZXIgYmVjb21l cyBjb21wb3NpdGVkCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xNDI3MTEKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IGVhY2JiOWQ0MjZkMjQ4ZGIyNDM0N2YxYTIxZmUz MjUzOGFjN2Q3ZTQuLjQ3ODg3M2Y2ZjM2YzA3ZTZhNjA4YTc2ZTM3MmE5YmYzMTc1Yzk4ZmIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxNS0wMy0xNSAgU2ltb24gRnJhc2VyICA8c2lt b24uZnJhc2VyQGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbiB1cCByZWxhdGVkIHRvIHdoZWVs RXZlbnQgbmFtZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE0MjcxMworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEFkZCBFdmVudE5hbWVzOjppc1doZWVsRXZlbnRUeXBlKCkgYW5kIHVzZSBpdCBpbiBwbGFj ZXMgdGhhdCB0ZXN0IGZvciB0aGUKKyAgICAgICAgdHdvIHdoZWVsIGV2ZW50IG5hbWVzLgorCisg ICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwOgorICAgICAgICAoV2Vi S2l0OjpQbHVnaW5WaWV3OjpoYW5kbGVFdmVudCk6CisKIDIwMTUtMDMtMTUgIERhbiBCZXJuc3Rl aW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBbaU9TXSBQcmVzZW50aW5nIGEgbW9kYWwg c2hlZXQgb24gdG9wIG9mIGEgV0tXZWJWaWV3IGNhdXNlcyBpdCB0byBsb3NlIGZvY3VzZWQsIGFj dGl2ZSBzdGF0ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKaW5kZXggOTMzYTQ5MzI3NTFhMzVkMmNi MDM4YTIzYzFjZDFhYmFmOWM2NGM0ZC4uMjdkNDg5ZTExMjlkOWM2OTA3OWMxYzgwMTk1NWQyOTcw YTEwY2M3YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBAIC01OTk1LDEzICs1OTk1LDEzIEBA IHN0YXRpYyB2b2lkIHdoZWVsRXZlbnRIYW5kbGVyQ291bnRDaGFuZ2VkKERvY3VtZW50KiBkb2N1 bWVudCkKICAgICBzY3JvbGxpbmdDb29yZGluYXRvci0+ZnJhbWVWaWV3V2hlZWxFdmVudEhhbmRs ZXJDb3VudENoYW5nZWQoZnJhbWVWaWV3KTsKIH0KIAotdm9pZCBEb2N1bWVudDo6ZGlkQWRkV2hl ZWxFdmVudEhhbmRsZXIoKQordm9pZCBEb2N1bWVudDo6ZGlkQWRkV2hlZWxFdmVudEhhbmRsZXIo Tm9kZSopCiB7CiAgICAgKyttX3doZWVsRXZlbnRIYW5kbGVyQ291bnQ7CiAgICAgd2hlZWxFdmVu dEhhbmRsZXJDb3VudENoYW5nZWQodGhpcyk7CiB9CiAKLXZvaWQgRG9jdW1lbnQ6OmRpZFJlbW92 ZVdoZWVsRXZlbnRIYW5kbGVyKCkKK3ZvaWQgRG9jdW1lbnQ6OmRpZFJlbW92ZVdoZWVsRXZlbnRI YW5kbGVyKE5vZGUqKQogewogICAgIEFTU0VSVChtX3doZWVsRXZlbnRIYW5kbGVyQ291bnQgPiAw KTsKICAgICAtLW1fd2hlZWxFdmVudEhhbmRsZXJDb3VudDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2RvbS9Eb2N1bWVudC5oIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgKaW5k ZXggMDQwNjUwYjhhNTNiYmQ2ZGZhMTY0ODkyYmM5NDYyNGZmYmQ4NmNmOS4uZTk4ZGRiMWM5YzM3 ZjVlZTNlOWU2N2ZlYzQ4NWQxYzI1NWYzNmZmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv ZG9tL0RvY3VtZW50LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmgKQEAgLTEx MjIsOCArMTEyMiw4IEBAIHB1YmxpYzoKICAgICB2b2lkIGluaXRETlNQcmVmZXRjaCgpOwogCiAg ICAgdW5zaWduZWQgd2hlZWxFdmVudEhhbmRsZXJDb3VudCgpIGNvbnN0IHsgcmV0dXJuIG1fd2hl ZWxFdmVudEhhbmRsZXJDb3VudDsgfQotICAgIFdFQkNPUkVfRVhQT1JUIHZvaWQgZGlkQWRkV2hl ZWxFdmVudEhhbmRsZXIoKTsKLSAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGRpZFJlbW92ZVdoZWVs RXZlbnRIYW5kbGVyKCk7CisgICAgdm9pZCBkaWRBZGRXaGVlbEV2ZW50SGFuZGxlcihOb2RlKik7 CisgICAgdm9pZCBkaWRSZW1vdmVXaGVlbEV2ZW50SGFuZGxlcihOb2RlKik7CiAKICAgICBkb3Vi bGUgbGFzdEhhbmRsZWRVc2VyR2VzdHVyZVRpbWVzdGFtcCgpIGNvbnN0IHsgcmV0dXJuIG1fbGFz dEhhbmRsZWRVc2VyR2VzdHVyZVRpbWVzdGFtcDsgfQogICAgIHZvaWQgdXBkYXRlTGFzdEhhbmRs ZWRVc2VyR2VzdHVyZVRpbWVzdGFtcCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9t L0V2ZW50TmFtZXMuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9FdmVudE5hbWVzLmgKaW5kZXggNzYw ZTdkNTM2YjRiYTRiNTVhMzk2ZDJjMGRiNWQ3NWYyNjk1MzQ5YS4uN2IyMGJiOGM3NTU0MjZiOWYx M2MzMDg5MTNkNmNjZjBjZDdkN2I1OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL0V2 ZW50TmFtZXMuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRXZlbnROYW1lcy5oCkBAIC0yNjQs NiArMjY0LDcgQEAgcHVibGljOgogCiAgICAgLy8gRklYTUU6IEluZWxlZ2FudCB0byBjYWxsIHRo ZXNlIGJvdGggZXZlbnQgbmFtZXMgYW5kIGV2ZW50IHR5cGVzLgogICAgIC8vIFdlIHNob3VsZCBj aG9vc2Ugb25lIHRlcm0gYW5kIHN0aWNrIHRvIGl0LgorICAgIGJvb2wgaXNXaGVlbEV2ZW50VHlw ZShjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50VHlwZSkgY29uc3Q7CiAgICAgYm9vbCBpc0dlc3R1 cmVFdmVudFR5cGUoY29uc3QgQXRvbWljU3RyaW5nJiBldmVudFR5cGUpIGNvbnN0OwogICAgIGJv b2wgaXNUb3VjaEV2ZW50VHlwZShjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50VHlwZSkgY29uc3Q7 CiAjaWYgRU5BQkxFKEdBTUVQQUQpCkBAIC0yOTksNiArMzAwLDEyIEBAIGlubGluZSBib29sIEV2 ZW50TmFtZXM6OmlzVG91Y2hFdmVudFR5cGUoY29uc3QgQXRvbWljU3RyaW5nJiBldmVudFR5cGUp IGNvbnN0CiAgICAgICAgIHx8IGV2ZW50VHlwZSA9PSB0b3VjaGNhbmNlbEV2ZW50OwogfQogCitp bmxpbmUgYm9vbCBFdmVudE5hbWVzOjppc1doZWVsRXZlbnRUeXBlKGNvbnN0IEF0b21pY1N0cmlu ZyYgZXZlbnRUeXBlKSBjb25zdAoreworICAgIHJldHVybiBldmVudFR5cGUgPT0gd2hlZWxFdmVu dAorICAgICAgICB8fCBldmVudFR5cGUgPT0gbW91c2V3aGVlbEV2ZW50OworfQorCiBpbmxpbmUg c3RkOjphcnJheTxzdGQ6OnJlZmVyZW5jZV93cmFwcGVyPGNvbnN0IEF0b21pY1N0cmluZz4sIDQ+ IEV2ZW50TmFtZXM6OnRvdWNoRXZlbnROYW1lcygpIGNvbnN0CiB7CiAgICAgcmV0dXJuIHsgeyB0 b3VjaHN0YXJ0RXZlbnQsIHRvdWNobW92ZUV2ZW50LCB0b3VjaGVuZEV2ZW50LCB0b3VjaGNhbmNl bEV2ZW50IH0gfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2RvbS9Ob2RlLmNwcAppbmRleCAxMjZkYjIxNmRiZWE0ZDE3Yjk2YmEyZTI0 ZWVmODFhYTljNmE0OGU4Li41ZGQwYzY4ZTAzMTQ2ZThhMTIyNDU1MTA3ODZmNzFhZGFlNzQ3OGE0 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vTm9kZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvZG9tL05vZGUuY3BwCkBAIC0xNzEyLDE2ICsxNzEyLDE2IEBAIHZvaWQgTm9kZTo6ZGlk TW92ZVRvTmV3RG9jdW1lbnQoRG9jdW1lbnQqIG9sZERvY3VtZW50KQogICAgICAgICAgICAgY2Fj aGUtPnJlbW92ZSh0aGlzKTsKICAgICB9CiAKLSAgICB1bnNpZ25lZCBudW1XaGVlbEV2ZW50SGFu ZGxlcnMgPSBnZXRFdmVudExpc3RlbmVycyhldmVudE5hbWVzKCkubW91c2V3aGVlbEV2ZW50KS5z aXplKCkKLSAgICAgICAgKyBnZXRFdmVudExpc3RlbmVycyhldmVudE5hbWVzKCkud2hlZWxFdmVu dCkuc2l6ZSgpOworICAgIHVuc2lnbmVkIG51bVdoZWVsRXZlbnRIYW5kbGVycyA9IGdldEV2ZW50 TGlzdGVuZXJzKGV2ZW50TmFtZXMoKS5tb3VzZXdoZWVsRXZlbnQpLnNpemUoKSArIGdldEV2ZW50 TGlzdGVuZXJzKGV2ZW50TmFtZXMoKS53aGVlbEV2ZW50KS5zaXplKCk7CiAgICAgZm9yICh1bnNp Z25lZCBpID0gMDsgaSA8IG51bVdoZWVsRXZlbnRIYW5kbGVyczsgKytpKSB7Ci0gICAgICAgIG9s ZERvY3VtZW50LT5kaWRSZW1vdmVXaGVlbEV2ZW50SGFuZGxlcigpOwotICAgICAgICBkb2N1bWVu dCgpLmRpZEFkZFdoZWVsRXZlbnRIYW5kbGVyKCk7CisgICAgICAgIG9sZERvY3VtZW50LT5kaWRS ZW1vdmVXaGVlbEV2ZW50SGFuZGxlcih0aGlzKTsKKyAgICAgICAgZG9jdW1lbnQoKS5kaWRBZGRX aGVlbEV2ZW50SGFuZGxlcih0aGlzKTsKICAgICB9CiAKICAgICB1bnNpZ25lZCBudW1Ub3VjaEV2 ZW50SGFuZGxlcnMgPSAwOwogICAgIGZvciAoYXV0byYgbmFtZSA6IGV2ZW50TmFtZXMoKS50b3Vj aEV2ZW50TmFtZXMoKSkKICAgICAgICAgbnVtVG91Y2hFdmVudEhhbmRsZXJzICs9IGdldEV2ZW50 TGlzdGVuZXJzKG5hbWUpLnNpemUoKTsKKwogICAgIGZvciAodW5zaWduZWQgaSA9IDA7IGkgPCBu dW1Ub3VjaEV2ZW50SGFuZGxlcnM7ICsraSkgewogICAgICAgICBvbGREb2N1bWVudC0+ZGlkUmVt b3ZlVG91Y2hFdmVudEhhbmRsZXIodGhpcyk7CiAgICAgICAgIGRvY3VtZW50KCkuZGlkQWRkVG91 Y2hFdmVudEhhbmRsZXIodGhpcyk7CkBAIC0xNzQ2LDggKzE3NDYsOCBAQCBzdGF0aWMgaW5saW5l IGJvb2wgdHJ5QWRkRXZlbnRMaXN0ZW5lcihOb2RlKiB0YXJnZXROb2RlLCBjb25zdCBBdG9taWNT dHJpbmcmIGV2ZQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICB0YXJnZXROb2RlLT5kb2N1 bWVudCgpLmFkZExpc3RlbmVyVHlwZUlmTmVlZGVkKGV2ZW50VHlwZSk7Ci0gICAgaWYgKGV2ZW50 VHlwZSA9PSBldmVudE5hbWVzKCkud2hlZWxFdmVudCB8fCBldmVudFR5cGUgPT0gZXZlbnROYW1l cygpLm1vdXNld2hlZWxFdmVudCkKLSAgICAgICAgdGFyZ2V0Tm9kZS0+ZG9jdW1lbnQoKS5kaWRB ZGRXaGVlbEV2ZW50SGFuZGxlcigpOworICAgIGlmIChldmVudE5hbWVzKCkuaXNXaGVlbEV2ZW50 VHlwZShldmVudFR5cGUpKQorICAgICAgICB0YXJnZXROb2RlLT5kb2N1bWVudCgpLmRpZEFkZFdo ZWVsRXZlbnRIYW5kbGVyKHRhcmdldE5vZGUpOwogICAgIGVsc2UgaWYgKGV2ZW50TmFtZXMoKS5p c1RvdWNoRXZlbnRUeXBlKGV2ZW50VHlwZSkpCiAgICAgICAgIHRhcmdldE5vZGUtPmRvY3VtZW50 KCkuZGlkQWRkVG91Y2hFdmVudEhhbmRsZXIodGFyZ2V0Tm9kZSk7CiAKQEAgLTE3ODgsOCArMTc4 OCw4IEBAIHN0YXRpYyBpbmxpbmUgYm9vbCB0cnlSZW1vdmVFdmVudExpc3RlbmVyKE5vZGUqIHRh cmdldE5vZGUsIGNvbnN0IEF0b21pY1N0cmluZyYKIAogICAgIC8vIEZJWE1FOiBOb3RpZnkgRG9j dW1lbnQgdGhhdCB0aGUgbGlzdGVuZXIgaGFzIHZhbmlzaGVkLiBXZSBuZWVkIHRvIGtlZXAgdHJh Y2sgb2YgYSBudW1iZXIgb2YKICAgICAvLyBsaXN0ZW5lcnMgZm9yIGVhY2ggdHlwZSwgbm90IGp1 c3QgYSBib29sIC0gc2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0z Mzg2MQotICAgIGlmIChldmVudFR5cGUgPT0gZXZlbnROYW1lcygpLndoZWVsRXZlbnQgfHwgZXZl bnRUeXBlID09IGV2ZW50TmFtZXMoKS5tb3VzZXdoZWVsRXZlbnQpCi0gICAgICAgIHRhcmdldE5v ZGUtPmRvY3VtZW50KCkuZGlkUmVtb3ZlV2hlZWxFdmVudEhhbmRsZXIoKTsKKyAgICBpZiAoZXZl bnROYW1lcygpLmlzV2hlZWxFdmVudFR5cGUoZXZlbnRUeXBlKSkKKyAgICAgICAgdGFyZ2V0Tm9k ZS0+ZG9jdW1lbnQoKS5kaWRSZW1vdmVXaGVlbEV2ZW50SGFuZGxlcih0YXJnZXROb2RlKTsKICAg ICBlbHNlIGlmIChldmVudE5hbWVzKCkuaXNUb3VjaEV2ZW50VHlwZShldmVudFR5cGUpKQogICAg ICAgICB0YXJnZXROb2RlLT5kb2N1bWVudCgpLmRpZFJlbW92ZVRvdWNoRXZlbnRIYW5kbGVyKHRh cmdldE5vZGUpOwogCkBAIC0yMDg2LDggKzIwODYsNyBAQCB2b2lkIE5vZGU6OmRlZmF1bHRFdmVu dEhhbmRsZXIoRXZlbnQqIGV2ZW50KQogICAgICAgICAgICAgfQogICAgICAgICB9CiAjZW5kaWYK LSAgICB9IGVsc2UgaWYgKChldmVudFR5cGUgPT0gZXZlbnROYW1lcygpLndoZWVsRXZlbnQgfHwg ZXZlbnRUeXBlID09IGV2ZW50TmFtZXMoKS5tb3VzZXdoZWVsRXZlbnQpICYmIGlzPFdoZWVsRXZl bnQ+KCpldmVudCkpIHsKLQorICAgIH0gZWxzZSBpZiAoZXZlbnROYW1lcygpLmlzV2hlZWxFdmVu dFR5cGUoZXZlbnRUeXBlKSAmJiBpczxXaGVlbEV2ZW50PigqZXZlbnQpKSB7CiAgICAgICAgIC8v IElmIHdlIGRvbid0IGhhdmUgYSByZW5kZXJlciwgc2VuZCB0aGUgd2hlZWwgZXZlbnQgdG8gdGhl IGZpcnN0IG5vZGUgd2UgZmluZCB3aXRoIGEgcmVuZGVyZXIuCiAgICAgICAgIC8vIFRoaXMgaXMg bmVlZGVkIGZvciA8b3B0aW9uPiBhbmQgPG9wdGdyb3VwPiBlbGVtZW50cyBzbyB0aGF0IDxzZWxl Y3Q+cyBnZXQgYSB3aGVlbCBzY3JvbGwuCiAgICAgICAgIE5vZGUqIHN0YXJ0Tm9kZSA9IHRoaXM7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xzQXBw bGUuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9zaGFkb3cvTWVkaWFDb250cm9sc0FwcGxlLmNw cAppbmRleCAwMWUzZjZmYmY0YzI0ZjE4YmRjNGE0Y2Y4YjcyNGQzN2Y5MDJmOTVjLi44ZmRiYTBk MDM0ODUwM2EyYTZlOGUwZDBlODY0N2U5M2Y5NjY0ZjgzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL3NoYWRvdy9NZWRpYUNvbnRyb2xzQXBwbGUuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL2h0bWwvc2hhZG93L01lZGlhQ29udHJvbHNBcHBsZS5jcHAKQEAgLTU4OCw3ICs1ODgsNyBA QCB2b2lkIE1lZGlhQ29udHJvbHNBcHBsZUV2ZW50TGlzdGVuZXI6OmhhbmRsZUV2ZW50KFNjcmlw dEV4ZWN1dGlvbkNvbnRleHQqLCBFdmVudAogewogICAgIGlmIChldmVudC0+dHlwZSgpID09IGV2 ZW50TmFtZXMoKS5jbGlja0V2ZW50KQogICAgICAgICBtX21lZGlhQ29udHJvbHMtPmhhbmRsZUNs aWNrRXZlbnQoZXZlbnQpOwotICAgIGVsc2UgaWYgKChldmVudC0+dHlwZSgpID09IGV2ZW50TmFt ZXMoKS53aGVlbEV2ZW50IHx8IGV2ZW50LT50eXBlKCkgPT0gZXZlbnROYW1lcygpLm1vdXNld2hl ZWxFdmVudCkgJiYgaXM8V2hlZWxFdmVudD4oKmV2ZW50KSkgeworICAgIGVsc2UgaWYgKGV2ZW50 TmFtZXMoKS5pc1doZWVsRXZlbnRUeXBlKGV2ZW50LT50eXBlKCkpICYmIGlzPFdoZWVsRXZlbnQ+ KCpldmVudCkpIHsKICAgICAgICAgV2hlZWxFdmVudCYgd2hlZWxFdmVudCA9IGRvd25jYXN0PFdo ZWVsRXZlbnQ+KCpldmVudCk7CiAgICAgICAgIGlmIChtX21lZGlhQ29udHJvbHMtPnNob3VsZENs b3NlZENhcHRpb25zQ29udGFpbmVyUHJldmVudFBhZ2VTY3JvbGxpbmcod2hlZWxFdmVudC53aGVl bERlbHRhWSgpKSkKICAgICAgICAgICAgIHdoZWVsRXZlbnQucHJldmVudERlZmF1bHQoKTsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRE9NV2luZG93LmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BhZ2UvRE9NV2luZG93LmNwcAppbmRleCBkOTk2M2IyN2M3OGIzN2Q4NmQyZjk2ZGIwYjdj OWZmYmU3MWQ2MzkyLi5hMmRhNmY1NTM1MTUyZmEyNDM3ZTBlMDBiOWY0OWIxNzgyOWY2ZDI1IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGFnZS9ET01XaW5kb3cuY3BwCkBAIC0xNjk3LDggKzE2OTcsOCBAQCBib29sIERP TVdpbmRvdzo6YWRkRXZlbnRMaXN0ZW5lcihjb25zdCBBdG9taWNTdHJpbmcmIGV2ZW50VHlwZSwg UGFzc1JlZlB0cjxFdmVudAogCiAgICAgaWYgKERvY3VtZW50KiBkb2N1bWVudCA9IHRoaXMtPmRv Y3VtZW50KCkpIHsKICAgICAgICAgZG9jdW1lbnQtPmFkZExpc3RlbmVyVHlwZUlmTmVlZGVkKGV2 ZW50VHlwZSk7Ci0gICAgICAgIGlmIChldmVudFR5cGUgPT0gZXZlbnROYW1lcygpLndoZWVsRXZl bnQgfHwgZXZlbnRUeXBlID09IGV2ZW50TmFtZXMoKS5tb3VzZXdoZWVsRXZlbnQpCi0gICAgICAg ICAgICBkb2N1bWVudC0+ZGlkQWRkV2hlZWxFdmVudEhhbmRsZXIoKTsKKyAgICAgICAgaWYgKGV2 ZW50TmFtZXMoKS5pc1doZWVsRXZlbnRUeXBlKGV2ZW50VHlwZSkpCisgICAgICAgICAgICBkb2N1 bWVudC0+ZGlkQWRkV2hlZWxFdmVudEhhbmRsZXIoZG9jdW1lbnQpOwogICAgICAgICBlbHNlIGlm IChldmVudE5hbWVzKCkuaXNUb3VjaEV2ZW50VHlwZShldmVudFR5cGUpKQogICAgICAgICAgICAg ZG9jdW1lbnQtPmRpZEFkZFRvdWNoRXZlbnRIYW5kbGVyKGRvY3VtZW50KTsKICAgICAgICAgZWxz ZSBpZiAoZXZlbnRUeXBlID09IGV2ZW50TmFtZXMoKS5zdG9yYWdlRXZlbnQpCkBAIC0xNzg4LDgg KzE3ODgsOCBAQCBib29sIERPTVdpbmRvdzo6cmVtb3ZlRXZlbnRMaXN0ZW5lcihjb25zdCBBdG9t aWNTdHJpbmcmIGV2ZW50VHlwZSwgRXZlbnRMaXN0ZW5lcgogICAgICAgICByZXR1cm4gZmFsc2U7 CiAKICAgICBpZiAoRG9jdW1lbnQqIGRvY3VtZW50ID0gdGhpcy0+ZG9jdW1lbnQoKSkgewotICAg ICAgICBpZiAoZXZlbnRUeXBlID09IGV2ZW50TmFtZXMoKS53aGVlbEV2ZW50IHx8IGV2ZW50VHlw ZSA9PSBldmVudE5hbWVzKCkubW91c2V3aGVlbEV2ZW50KQotICAgICAgICAgICAgZG9jdW1lbnQt PmRpZFJlbW92ZVdoZWVsRXZlbnRIYW5kbGVyKCk7CisgICAgICAgIGlmIChldmVudE5hbWVzKCku aXNXaGVlbEV2ZW50VHlwZShldmVudFR5cGUpKQorICAgICAgICAgICAgZG9jdW1lbnQtPmRpZFJl bW92ZVdoZWVsRXZlbnRIYW5kbGVyKGRvY3VtZW50KTsKICAgICAgICAgZWxzZSBpZiAoZXZlbnRO YW1lcygpLmlzVG91Y2hFdmVudFR5cGUoZXZlbnRUeXBlKSkKICAgICAgICAgICAgIGRvY3VtZW50 LT5kaWRSZW1vdmVUb3VjaEV2ZW50SGFuZGxlcihkb2N1bWVudCk7CiAgICAgfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9pb3MvRnJhbWVJT1MubW0gYi9Tb3VyY2UvV2ViQ29yZS9w YWdlL2lvcy9GcmFtZUlPUy5tbQppbmRleCAwZDkzY2JkNDg5MTZlYzBlY2JlOWVjYjE3OGZjNmU2 OTA2NDA5M2QyLi5mZWE4OWQ5ZTI4M2Q4YzhiYTY4YzI1YWMzNjUxOGUwMDE2ZjNjNWI0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL2lvcy9GcmFtZUlPUy5tbQorKysgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL2lvcy9GcmFtZUlPUy5tbQpAQCAtMjczLDggKzI3Myw2IEBAIENHUmVjdCBG cmFtZTo6cmVuZGVyUmVjdEZvclBvaW50KENHUG9pbnQgcG9pbnQsIGJvb2wqIGlzUmVwbGFjZWQs IGZsb2F0KiBmb250U2l6CiAgICAgcmV0dXJuIENHUmVjdFplcm87CiB9CiAKLSNkZWZpbmUgQUxM T1dfU0NST0xMX0xJU1RFTkVSUyAwCi0KIHN0YXRpYyBOb2RlKiBhbmNlc3RvclJlc3BvbmRpbmdU b1Njcm9sbFdoZWVsRXZlbnRzKGNvbnN0IEhpdFRlc3RSZXN1bHQmIGhpdFRlc3RSZXN1bHQsIE5v ZGUqIHRlcm1pbmF0aW9uTm9kZSwgSW50UmVjdCogbm9kZUJvdW5kcykKIHsKICAgICBpZiAobm9k ZUJvdW5kcykKQEAgLTI4MiwxMyArMjgwLDYgQEAgc3RhdGljIE5vZGUqIGFuY2VzdG9yUmVzcG9u ZGluZ1RvU2Nyb2xsV2hlZWxFdmVudHMoY29uc3QgSGl0VGVzdFJlc3VsdCYgaGl0VGVzdFIKIAog ICAgIE5vZGUqIHNjcm9sbGluZ0FuY2VzdG9yID0gbnVsbHB0cjsKICAgICBmb3IgKE5vZGUqIG5v ZGUgPSBoaXRUZXN0UmVzdWx0LmlubmVyTm9kZSgpOyBub2RlICYmIG5vZGUgIT0gdGVybWluYXRp b25Ob2RlICYmICFub2RlLT5oYXNUYWdOYW1lKEhUTUxOYW1lczo6Ym9keVRhZyk7IG5vZGUgPSBu b2RlLT5wYXJlbnROb2RlKCkpIHsKLSNpZiBBTExPV19TQ1JPTExfTElTVEVORVJTCi0gICAgICAg IGlmIChub2RlLT53aWxsUmVzcG9uZFRvTW91c2VXaGVlbEV2ZW50cygpKSB7Ci0gICAgICAgICAg ICBzY3JvbGxpbmdBbmNlc3RvciA9IG5vZGU7Ci0gICAgICAgICAgICBjb250aW51ZTsKLSAgICAg ICAgfQotI2VuZGlmCi0KICAgICAgICAgUmVuZGVyT2JqZWN0KiByZW5kZXJlciA9IG5vZGUtPnJl bmRlcmVyKCk7CiAgICAgICAgIGlmICghcmVuZGVyZXIpCiAgICAgICAgICAgICBjb250aW51ZTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3 LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcApp bmRleCA1OTM5N2NiOTA5ZWQ5MjBkZDNlMDdlMmY2MGFkNDAzODQ2YTc5NmE3Li5kMmUyYTUzMWI5 Yzg0MWY5MTA4ZGYyYzcxOTljMjE0NmE3YjBhMzE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIv V2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblZpZXcuY3BwCkBAIC05MTksNyArOTE5LDcgQEAgdm9p ZCBQbHVnaW5WaWV3OjpoYW5kbGVFdmVudChFdmVudCogZXZlbnQpCiAgICAgICAgIGRpZEhhbmRs ZUV2ZW50ID0gbV9wbHVnaW4tPmhhbmRsZU1vdXNlRXZlbnQoc3RhdGljX2Nhc3Q8Y29uc3QgV2Vi TW91c2VFdmVudCY+KCpjdXJyZW50RXZlbnQpKTsKICAgICAgICAgaWYgKGV2ZW50LT50eXBlKCkg IT0gZXZlbnROYW1lcygpLm1vdXNlbW92ZUV2ZW50KQogICAgICAgICAgICAgcGx1Z2luRGlkUmVj ZWl2ZVVzZXJJbnRlcmFjdGlvbigpOwotICAgIH0gZWxzZSBpZiAoKGV2ZW50LT50eXBlKCkgPT0g ZXZlbnROYW1lcygpLndoZWVsRXZlbnQgfHwgZXZlbnQtPnR5cGUoKSA9PSBldmVudE5hbWVzKCku bW91c2V3aGVlbEV2ZW50KQorICAgIH0gZWxzZSBpZiAoZXZlbnROYW1lcygpLmlzV2hlZWxFdmVu dFR5cGUoZXZlbnQtPnR5cGUoKSkKICAgICAgICAgJiYgY3VycmVudEV2ZW50LT50eXBlKCkgPT0g V2ViRXZlbnQ6OldoZWVsICYmIG1fcGx1Z2luLT53YW50c1doZWVsRXZlbnRzKCkpIHsKICAgICAg ICAgZGlkSGFuZGxlRXZlbnQgPSBtX3BsdWdpbi0+aGFuZGxlV2hlZWxFdmVudChzdGF0aWNfY2Fz dDxjb25zdCBXZWJXaGVlbEV2ZW50Jj4oKmN1cnJlbnRFdmVudCkpOwogICAgICAgICBwbHVnaW5E aWRSZWNlaXZlVXNlckludGVyYWN0aW9uKCk7Cg==