45073 2010-09-01 17:19:03 -0700 Implement [continuous]MouseScrollBy() in Chromium/GTK DRT 2010-09-06 06:57:03 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 pkasting pkasting commit-queue gustavo oldest_to_newest 273119 0 pkasting 2010-09-01 17:19:03 -0700 http://trac.webkit.org/changeset/55739 added mouseScrollBy() and continuousMouseScrollBy() support for DRT on Mac, and it is now used in at least three layout tests. http://trac.webkit.org/changeset/48735 added a very similar function called mouseWheelTo() to DRT on GTK and used it in one test. "mouseWheelTo" is not a particularly great name as it implies a destination coordinate when in fact it merely takes a wheel tick value. The actual functionality is identical except for having reversed signs (mouseScrollBy() matches the WebCore directionality for wheel events with positive and negative deltas; mouseWheelTo() is reversed). Therefore, I intend to implement xxxMouseScrollBy() in Chromium in order to be able to pass the tests that use it, and remove mouseWheelTo() support since it's redundant. I'll also change the GTK test to call mouseScrollBy() and modify the GTK DRT to convert mouseWheelTo() to mouseScrollBy(). (I'm not planning on implementing continuousMouseScrollBy() on GTK as more than a stub, since the GTK event layer doesn't seem to support continuous scroll events.) 273121 1 66303 pkasting 2010-09-01 17:21:14 -0700 Created attachment 66303 patch v1.0 273191 2 66303 dglazkov 2010-09-01 20:37:22 -0700 Comment on attachment 66303 patch v1.0 Looks sane. 273363 3 66303 commit-queue 2010-09-02 06:14:48 -0700 Comment on attachment 66303 patch v1.0 Clearing flags on attachment: 66303 Committed r66666: <http://trac.webkit.org/changeset/66666> 273364 4 commit-queue 2010-09-02 06:14:52 -0700 All reviewed patches have been landed. Closing bug. 274596 5 gustavo 2010-09-06 06:57:03 -0700 (In reply to comment #3) > Committed r66666: <http://trac.webkit.org/changeset/66666> That's an awesome commit id, btw =D 66303 2010-09-01 17:21:14 -0700 2010-09-02 06:14:48 -0700 patch v1.0 patch2 text/plain 14137 pkasting SW5kZXg6IFdlYktpdFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXRUb29scy9D aGFuZ2VMb2cJKHJldmlzaW9uIDY2NjI1KQorKysgV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTAtMDktMDEgIFBldGVyIEthc3RpbmcgIDxw a2FzdGluZ0Bnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIEltcGxlbWVudCBbY29udGludW91c11Nb3VzZVNjcm9sbEJ5KCkgb24gQ2hy b21pdW0sIGFuZCBwYXJ0bHkgb24gR1RLLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDUwNzMKKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL2Nocm9t aXVtL0V2ZW50U2VuZGVyLmNwcDoKKyAgICAgICAgKEV2ZW50U2VuZGVyOjpFdmVudFNlbmRlcik6 CisgICAgICAgIChFdmVudFNlbmRlcjo6bW91c2VTY3JvbGxCeSk6CisgICAgICAgIChFdmVudFNl bmRlcjo6Y29udGludW91c01vdXNlU2Nyb2xsQnkpOgorICAgICAgICAoRXZlbnRTZW5kZXI6OnNl bmRDdXJyZW50VG91Y2hFdmVudCk6CisgICAgICAgIChFdmVudFNlbmRlcjo6aGFuZGxlTW91c2VX aGVlbCk6CisgICAgICAgICogRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vRXZlbnRTZW5kZXIuaDoK KyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9ndGsvRXZlbnRTZW5kZXIuY3BwOgorICAgICAgICAo bW91c2VTY3JvbGxCeUNhbGxiYWNrKToKKyAgICAgICAgKGNvbnRpbnVvdXNNb3VzZVNjcm9sbEJ5 Q2FsbGJhY2spOgorCiAyMDEwLTA5LTAxICBHYWJvciBSYXBjc2FueWkgIDxyZ2Fib3JAaW5mLnUt c3plZ2VkLmh1PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFudG9uaW8gR29tZXMuCkluZGV4OiBX ZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9jaHJvbWl1bS9FdmVudFNlbmRlci5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21pdW0vRXZlbnRTZW5kZXIu Y3BwCShyZXZpc2lvbiA2NjYxMSkKKysrIFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9t aXVtL0V2ZW50U2VuZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjU1LDcgKzI1NSw2IEBAIEV2 ZW50U2VuZGVyOjpFdmVudFNlbmRlcihUZXN0U2hlbGwqIHNoZWwKICAgICBiaW5kTWV0aG9kKCJt b3VzZVVwIiwgJkV2ZW50U2VuZGVyOjptb3VzZVVwKTsKICAgICBiaW5kTWV0aG9kKCJjb250ZXh0 Q2xpY2siLCAmRXZlbnRTZW5kZXI6OmNvbnRleHRDbGljayk7CiAgICAgYmluZE1ldGhvZCgibW91 c2VNb3ZlVG8iLCAmRXZlbnRTZW5kZXI6Om1vdXNlTW92ZVRvKTsKLSAgICBiaW5kTWV0aG9kKCJt b3VzZVdoZWVsVG8iLCAmRXZlbnRTZW5kZXI6Om1vdXNlV2hlZWxUbyk7CiAgICAgYmluZE1ldGhv ZCgibGVhcEZvcndhcmQiLCAmRXZlbnRTZW5kZXI6OmxlYXBGb3J3YXJkKTsKICAgICBiaW5kTWV0 aG9kKCJrZXlEb3duIiwgJkV2ZW50U2VuZGVyOjprZXlEb3duKTsKICAgICBiaW5kTWV0aG9kKCJk aXNwYXRjaE1lc3NhZ2UiLCAmRXZlbnRTZW5kZXI6OmRpc3BhdGNoTWVzc2FnZSk7CkBAIC0yNjYs NiArMjY1LDggQEAgRXZlbnRTZW5kZXI6OkV2ZW50U2VuZGVyKFRlc3RTaGVsbCogc2hlbAogICAg IGJpbmRNZXRob2QoInRleHRab29tT3V0IiwgJkV2ZW50U2VuZGVyOjp0ZXh0Wm9vbU91dCk7CiAg ICAgYmluZE1ldGhvZCgiem9vbVBhZ2VJbiIsICZFdmVudFNlbmRlcjo6em9vbVBhZ2VJbik7CiAg ICAgYmluZE1ldGhvZCgiem9vbVBhZ2VPdXQiLCAmRXZlbnRTZW5kZXI6Onpvb21QYWdlT3V0KTsK KyAgICBiaW5kTWV0aG9kKCJtb3VzZVNjcm9sbEJ5IiwgJkV2ZW50U2VuZGVyOjptb3VzZVNjcm9s bEJ5KTsKKyAgICBiaW5kTWV0aG9kKCJjb250aW51b3VzTW91c2VTY3JvbGxCeSIsICZFdmVudFNl bmRlcjo6Y29udGludW91c01vdXNlU2Nyb2xsQnkpOwogICAgIGJpbmRNZXRob2QoInNjaGVkdWxl QXN5bmNocm9ub3VzQ2xpY2siLCAmRXZlbnRTZW5kZXI6OnNjaGVkdWxlQXN5bmNocm9ub3VzQ2xp Y2spOwogICAgIGJpbmRNZXRob2QoImJlZ2luRHJhZ1dpdGhGaWxlcyIsICZFdmVudFNlbmRlcjo6 YmVnaW5EcmFnV2l0aEZpbGVzKTsKICAgICBiaW5kTWV0aG9kKCJhZGRUb3VjaFBvaW50IiwgJkV2 ZW50U2VuZGVyOjphZGRUb3VjaFBvaW50KTsKQEAgLTQ3MiwzMiArNDczLDYgQEAgdm9pZCBFdmVu dFNlbmRlcjo6bW91c2VNb3ZlVG8oY29uc3QgQ3BwQQogICAgIH0KIH0KIAotdm9pZCBFdmVudFNl bmRlcjo6bW91c2VXaGVlbFRvKGNvbnN0IENwcEFyZ3VtZW50TGlzdCYgYXJndW1lbnRzLCBDcHBW YXJpYW50KiByZXN1bHQpCi17Ci0gICAgcmVzdWx0LT5zZXROdWxsKCk7Ci0KLSAgICBpZiAoYXJn dW1lbnRzLnNpemUoKSA8IDIgfHwgIWFyZ3VtZW50c1swXS5pc051bWJlcigpIHx8ICFhcmd1bWVu dHNbMV0uaXNOdW1iZXIoKSkKLSAgICAgICAgcmV0dXJuOwotCi0gICAgLy8gRm9yY2UgYSBsYXlv dXQgaGVyZSBqdXN0IHRvIG1ha2Ugc3VyZSBldmVyeSBwb3NpdGlvbiBoYXMgYmVlbgotICAgIC8v IGRldGVybWluZWQgYmVmb3JlIHdlIHNlbmQgZXZlbnRzIChhcyB3ZWxsIGFzIGFsbCB0aGUgb3Ro ZXIgbWV0aG9kcwotICAgIC8vIHRoYXQgc2VuZCBhbiBldmVudCBkbykuIFRoZSBsYXlvdXQgdGVz dCBjYWxsaW5nIHRoaXMKLSAgICAvLyAoc2Nyb2xsYmFycy9vdmVyZmxvdy1zY3JvbGxiYXItaG9y aXpvbnRhbC13aGVlbC1zY3JvbGwuaHRtbCwgb25seSBvbmUKLSAgICAvLyBmb3Igbm93KSBkb2Vz IG5vdCByZWx5IG9uIHRoaXMgdGhvdWdoLgotICAgIHdlYnZpZXcoKS0+bGF5b3V0KCk7Ci0KLSAg ICBpbnQgaG9yaXpvbnRhbCA9IGFyZ3VtZW50c1swXS50b0ludDMyKCk7Ci0gICAgaW50IHZlcnRp Y2FsID0gYXJndW1lbnRzWzFdLnRvSW50MzIoKTsKLQotICAgIFdlYk1vdXNlV2hlZWxFdmVudCBl dmVudDsKLSAgICBpbml0TW91c2VFdmVudChXZWJJbnB1dEV2ZW50OjpNb3VzZVdoZWVsLCBwcmVz c2VkQnV0dG9uLCBsYXN0TW91c2VQb3MsICZldmVudCk7Ci0gICAgZXZlbnQud2hlZWxUaWNrc1gg PSBzdGF0aWNfY2FzdDxmbG9hdD4oaG9yaXpvbnRhbCk7Ci0gICAgZXZlbnQud2hlZWxUaWNrc1kg PSBzdGF0aWNfY2FzdDxmbG9hdD4odmVydGljYWwpOwotICAgIGV2ZW50LmRlbHRhWCA9IC1ob3Jp em9udGFsICogc2Nyb2xsYmFyUGl4ZWxzUGVyVGljazsKLSAgICBldmVudC5kZWx0YVkgPSAtdmVy dGljYWwgKiBzY3JvbGxiYXJQaXhlbHNQZXJUaWNrOwotICAgIHdlYnZpZXcoKS0+aGFuZGxlSW5w dXRFdmVudChldmVudCk7Ci19Ci0KIHZvaWQgRXZlbnRTZW5kZXI6OmRvTW91c2VNb3ZlKGNvbnN0 IFdlYk1vdXNlRXZlbnQmIGUpCiB7CiAgICAgbGFzdE1vdXNlUG9zID0gV2ViUG9pbnQoZS54LCBl LnkpOwpAQCAtNzE0LDYgKzY4OSwxNiBAQCB2b2lkIEV2ZW50U2VuZGVyOjp6b29tUGFnZU91dChj b25zdCBDcHBBCiAgICAgcmVzdWx0LT5zZXROdWxsKCk7CiB9CiAKK3ZvaWQgRXZlbnRTZW5kZXI6 Om1vdXNlU2Nyb2xsQnkoY29uc3QgQ3BwQXJndW1lbnRMaXN0JiBhcmd1bWVudHMsIENwcFZhcmlh bnQqIHJlc3VsdCkKK3sKKyAgICBoYW5kbGVNb3VzZVdoZWVsKGFyZ3VtZW50cywgcmVzdWx0LCBm YWxzZSk7Cit9CisKK3ZvaWQgRXZlbnRTZW5kZXI6OmNvbnRpbnVvdXNNb3VzZVNjcm9sbEJ5KGNv bnN0IENwcEFyZ3VtZW50TGlzdCYgYXJndW1lbnRzLCBDcHBWYXJpYW50KiByZXN1bHQpCit7Cisg ICAgaGFuZGxlTW91c2VXaGVlbChhcmd1bWVudHMsIHJlc3VsdCwgdHJ1ZSk7Cit9CisKIHZvaWQg RXZlbnRTZW5kZXI6OnJlcGxheVNhdmVkRXZlbnRzKCkKIHsKICAgICByZXBsYXlpbmdTYXZlZEV2 ZW50cyA9IHRydWU7CkBAIC04ODksNiArODc0LDM0IEBAIHZvaWQgRXZlbnRTZW5kZXI6OnNlbmRD dXJyZW50VG91Y2hFdmVudCgKICAgICB9CiB9CiAKK3ZvaWQgRXZlbnRTZW5kZXI6OmhhbmRsZU1v dXNlV2hlZWwoY29uc3QgQ3BwQXJndW1lbnRMaXN0JiBhcmd1bWVudHMsIENwcFZhcmlhbnQqIHJl c3VsdCwgYm9vbCBjb250aW51b3VzKQoreworICAgIHJlc3VsdC0+c2V0TnVsbCgpOworCisgICAg aWYgKGFyZ3VtZW50cy5zaXplKCkgPCAyIHx8ICFhcmd1bWVudHNbMF0uaXNOdW1iZXIoKSB8fCAh YXJndW1lbnRzWzFdLmlzTnVtYmVyKCkpCisgICAgICAgIHJldHVybjsKKworICAgIC8vIEZvcmNl IGEgbGF5b3V0IGhlcmUganVzdCB0byBtYWtlIHN1cmUgZXZlcnkgcG9zaXRpb24gaGFzIGJlZW4K KyAgICAvLyBkZXRlcm1pbmVkIGJlZm9yZSB3ZSBzZW5kIGV2ZW50cyAoYXMgd2VsbCBhcyBhbGwg dGhlIG90aGVyIG1ldGhvZHMKKyAgICAvLyB0aGF0IHNlbmQgYW4gZXZlbnQgZG8pLgorICAgIHdl YnZpZXcoKS0+bGF5b3V0KCk7CisKKyAgICBpbnQgaG9yaXpvbnRhbCA9IGFyZ3VtZW50c1swXS50 b0ludDMyKCk7CisgICAgaW50IHZlcnRpY2FsID0gYXJndW1lbnRzWzFdLnRvSW50MzIoKTsKKwor ICAgIFdlYk1vdXNlV2hlZWxFdmVudCBldmVudDsKKyAgICBpbml0TW91c2VFdmVudChXZWJJbnB1 dEV2ZW50OjpNb3VzZVdoZWVsLCBwcmVzc2VkQnV0dG9uLCBsYXN0TW91c2VQb3MsICZldmVudCk7 CisgICAgZXZlbnQud2hlZWxUaWNrc1ggPSBzdGF0aWNfY2FzdDxmbG9hdD4oaG9yaXpvbnRhbCk7 CisgICAgZXZlbnQud2hlZWxUaWNrc1kgPSBzdGF0aWNfY2FzdDxmbG9hdD4odmVydGljYWwpOwor ICAgIGV2ZW50LmRlbHRhWCA9IGV2ZW50LndoZWVsVGlja3NYOworICAgIGV2ZW50LmRlbHRhWSA9 IGV2ZW50LndoZWVsVGlja3NZOworICAgIGlmICghY29udGludW91cykgeworICAgICAgICBldmVu dC5kZWx0YVggKj0gc2Nyb2xsYmFyUGl4ZWxzUGVyVGljazsKKyAgICAgICAgZXZlbnQuZGVsdGFZ ICo9IHNjcm9sbGJhclBpeGVsc1BlclRpY2s7CisgICAgfQorICAgIHdlYnZpZXcoKS0+aGFuZGxl SW5wdXRFdmVudChldmVudCk7Cit9CisKIHZvaWQgRXZlbnRTZW5kZXI6OnRvdWNoRW5kKGNvbnN0 IENwcEFyZ3VtZW50TGlzdCYsIENwcFZhcmlhbnQqIHJlc3VsdCkKIHsKICAgICByZXN1bHQtPnNl dE51bGwoKTsKSW5kZXg6IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2Nocm9taXVtL0V2ZW50 U2VuZGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvY2hyb21p dW0vRXZlbnRTZW5kZXIuaAkocmV2aXNpb24gNjY2MTEpCisrKyBXZWJLaXRUb29scy9EdW1wUmVu ZGVyVHJlZS9jaHJvbWl1bS9FdmVudFNlbmRlci5oCSh3b3JraW5nIGNvcHkpCkBAIC02Niw3ICs2 Niw2IEBAIHB1YmxpYzoKICAgICB2b2lkIG1vdXNlRG93bihjb25zdCBDcHBBcmd1bWVudExpc3Qm LCBDcHBWYXJpYW50Kik7CiAgICAgdm9pZCBtb3VzZVVwKGNvbnN0IENwcEFyZ3VtZW50TGlzdCYs IENwcFZhcmlhbnQqKTsKICAgICB2b2lkIG1vdXNlTW92ZVRvKGNvbnN0IENwcEFyZ3VtZW50TGlz dCYsIENwcFZhcmlhbnQqKTsKLSAgICB2b2lkIG1vdXNlV2hlZWxUbyhjb25zdCBDcHBBcmd1bWVu dExpc3QmLCBDcHBWYXJpYW50Kik7CiAgICAgdm9pZCBsZWFwRm9yd2FyZChjb25zdCBDcHBBcmd1 bWVudExpc3QmLCBDcHBWYXJpYW50Kik7CiAgICAgdm9pZCBrZXlEb3duKGNvbnN0IENwcEFyZ3Vt ZW50TGlzdCYsIENwcFZhcmlhbnQqKTsKICAgICB2b2lkIGRpc3BhdGNoTWVzc2FnZShjb25zdCBD cHBBcmd1bWVudExpc3QmLCBDcHBWYXJpYW50Kik7CkBAIC03NCw2ICs3Myw4IEBAIHB1YmxpYzoK ICAgICB2b2lkIHRleHRab29tT3V0KGNvbnN0IENwcEFyZ3VtZW50TGlzdCYsIENwcFZhcmlhbnQq KTsKICAgICB2b2lkIHpvb21QYWdlSW4oY29uc3QgQ3BwQXJndW1lbnRMaXN0JiwgQ3BwVmFyaWFu dCopOwogICAgIHZvaWQgem9vbVBhZ2VPdXQoY29uc3QgQ3BwQXJndW1lbnRMaXN0JiwgQ3BwVmFy aWFudCopOworICAgIHZvaWQgbW91c2VTY3JvbGxCeShjb25zdCBDcHBBcmd1bWVudExpc3QmLCBD cHBWYXJpYW50Kik7CisgICAgdm9pZCBjb250aW51b3VzTW91c2VTY3JvbGxCeShjb25zdCBDcHBB cmd1bWVudExpc3QmLCBDcHBWYXJpYW50Kik7CiAgICAgdm9pZCBzY2hlZHVsZUFzeW5jaHJvbm91 c0NsaWNrKGNvbnN0IENwcEFyZ3VtZW50TGlzdCYsIENwcFZhcmlhbnQqKTsKICAgICB2b2lkIGJl Z2luRHJhZ1dpdGhGaWxlcyhjb25zdCBDcHBBcmd1bWVudExpc3QmLCBDcHBWYXJpYW50Kik7CiAg ICAgQ3BwVmFyaWFudCBkcmFnTW9kZTsKQEAgLTEzNyw2ICsxMzgsOSBAQCBwcml2YXRlOgogICAg IC8vIENvbXBvc2UgYSB0b3VjaCBldmVudCBmcm9tIHRoZSBjdXJyZW50IHRvdWNoIHBvaW50cyBh bmQgc2VuZCBpdC4KICAgICB2b2lkIHNlbmRDdXJyZW50VG91Y2hFdmVudChjb25zdCBXZWJLaXQ6 OldlYklucHV0RXZlbnQ6OlR5cGUpOwogCisgICAgLy8gSGFuZGxlIGEgcmVxdWVzdCB0byBzZW5k IGEgd2hlZWwgZXZlbnQuCisgICAgdm9pZCBoYW5kbGVNb3VzZVdoZWVsKGNvbnN0IENwcEFyZ3Vt ZW50TGlzdCYsIENwcFZhcmlhbnQqLCBib29sIGNvbnRpbnVvdXMpOworCiAgICAgU2NvcGVkUnVu bmFibGVNZXRob2RGYWN0b3J5PEV2ZW50U2VuZGVyPiBtX21ldGhvZEZhY3Rvcnk7CiAKICAgICAv LyBOb24tb3duaW5nIHBvaW50ZXIuICBUaGUgRXZlbnRTZW5kZXIgaXMgb3duZWQgYnkgdGhlIFRl c3RTaGVsbC4KSW5kZXg6IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9FdmVudFNlbmRl ci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0V2ZW50 U2VuZGVyLmNwcAkocmV2aXNpb24gNjY2MTEpCisrKyBXZWJLaXRUb29scy9EdW1wUmVuZGVyVHJl ZS9ndGsvRXZlbnRTZW5kZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yNjksNyArMjY5LDcgQEAg c3RhdGljIEpTVmFsdWVSZWYgbW91c2VNb3ZlVG9DYWxsYmFjayhKUwogICAgIHJldHVybiBKU1Zh bHVlTWFrZVVuZGVmaW5lZChjb250ZXh0KTsKIH0KIAotc3RhdGljIEpTVmFsdWVSZWYgbW91c2VX aGVlbFRvQ2FsbGJhY2soSlNDb250ZXh0UmVmIGNvbnRleHQsIEpTT2JqZWN0UmVmIGZ1bmN0aW9u LCBKU09iamVjdFJlZiB0aGlzT2JqZWN0LCBzaXplX3QgYXJndW1lbnRDb3VudCwgY29uc3QgSlNW YWx1ZVJlZiBhcmd1bWVudHNbXSwgSlNWYWx1ZVJlZiogZXhjZXB0aW9uKQorc3RhdGljIEpTVmFs dWVSZWYgbW91c2VTY3JvbGxCeUNhbGxiYWNrKEpTQ29udGV4dFJlZiBjb250ZXh0LCBKU09iamVj dFJlZiBmdW5jdGlvbiwgSlNPYmplY3RSZWYgdGhpc09iamVjdCwgc2l6ZV90IGFyZ3VtZW50Q291 bnQsIGNvbnN0IEpTVmFsdWVSZWYgYXJndW1lbnRzW10sIEpTVmFsdWVSZWYqIGV4Y2VwdGlvbikK IHsKICAgICBXZWJLaXRXZWJWaWV3KiB2aWV3ID0gd2Via2l0X3dlYl9mcmFtZV9nZXRfd2ViX3Zp ZXcobWFpbkZyYW1lKTsKICAgICBpZiAoIXZpZXcpCkBAIC0yOTQsMTMgKzI5NCwxMyBAQCBzdGF0 aWMgSlNWYWx1ZVJlZiBtb3VzZVdoZWVsVG9DYWxsYmFjayhKCiAgICAgZ19vYmplY3RfcmVmKGV2 ZW50LT5zY3JvbGwud2luZG93KTsKIAogICAgIGlmIChob3Jpem9udGFsIDwgMCkKLSAgICAgICAg ZXZlbnQtPnNjcm9sbC5kaXJlY3Rpb24gPSBHREtfU0NST0xMX0xFRlQ7Ci0gICAgZWxzZSBpZiAo aG9yaXpvbnRhbCA+IDApCiAgICAgICAgIGV2ZW50LT5zY3JvbGwuZGlyZWN0aW9uID0gR0RLX1ND Uk9MTF9SSUdIVDsKKyAgICBlbHNlIGlmIChob3Jpem9udGFsID4gMCkKKyAgICAgICAgZXZlbnQt PnNjcm9sbC5kaXJlY3Rpb24gPSBHREtfU0NST0xMX0xFRlQ7CiAgICAgZWxzZSBpZiAodmVydGlj YWwgPCAwKQotICAgICAgICBldmVudC0+c2Nyb2xsLmRpcmVjdGlvbiA9IEdES19TQ1JPTExfVVA7 Ci0gICAgZWxzZSBpZiAodmVydGljYWwgPiAwKQogICAgICAgICBldmVudC0+c2Nyb2xsLmRpcmVj dGlvbiA9IEdES19TQ1JPTExfRE9XTjsKKyAgICBlbHNlIGlmICh2ZXJ0aWNhbCA+IDApCisgICAg ICAgIGV2ZW50LT5zY3JvbGwuZGlyZWN0aW9uID0gR0RLX1NDUk9MTF9VUDsKICAgICBlbHNlCiAg ICAgICAgIGdfYXNzZXJ0X25vdF9yZWFjaGVkKCk7CiAKQEAgLTMwOCw2ICszMDgsMTIgQEAgc3Rh dGljIEpTVmFsdWVSZWYgbW91c2VXaGVlbFRvQ2FsbGJhY2soSgogICAgIHJldHVybiBKU1ZhbHVl TWFrZVVuZGVmaW5lZChjb250ZXh0KTsKIH0KIAorc3RhdGljIEpTVmFsdWVSZWYgY29udGludW91 c01vdXNlU2Nyb2xsQnlDYWxsYmFjayhKU0NvbnRleHRSZWYgY29udGV4dCwgSlNPYmplY3RSZWYg ZnVuY3Rpb24sIEpTT2JqZWN0UmVmIHRoaXNPYmplY3QsIHNpemVfdCBhcmd1bWVudENvdW50LCBj b25zdCBKU1ZhbHVlUmVmIGFyZ3VtZW50c1tdLCBKU1ZhbHVlUmVmKiBleGNlcHRpb24pCit7Cisg ICAgLy8gR1RLIGRvZXNuJ3Qgc3VwcG9ydCBjb250aW51b3VzIHNjcm9sbCBldmVudHMuCisgICAg cmV0dXJuIEpTVmFsdWVNYWtlVW5kZWZpbmVkKGNvbnRleHQpOworfQorCiBzdGF0aWMgSlNWYWx1 ZVJlZiBiZWdpbkRyYWdXaXRoRmlsZXNDYWxsYmFjayhKU0NvbnRleHRSZWYgY29udGV4dCwgSlNP YmplY3RSZWYgZnVuY3Rpb24sIEpTT2JqZWN0UmVmIHRoaXNPYmplY3QsIHNpemVfdCBhcmd1bWVu dENvdW50LCBjb25zdCBKU1ZhbHVlUmVmIGFyZ3VtZW50c1tdLCBKU1ZhbHVlUmVmKiBleGNlcHRp b24pCiB7CiAgICAgaWYgKGFyZ3VtZW50Q291bnQgPCAxKQpAQCAtNTk2LDcgKzYwMiw4IEBAIHN0 YXRpYyBKU1ZhbHVlUmVmIHpvb21QYWdlT3V0Q2FsbGJhY2soSlMKIH0KIAogc3RhdGljIEpTU3Rh dGljRnVuY3Rpb24gc3RhdGljRnVuY3Rpb25zW10gPSB7Ci0gICAgeyAibW91c2VXaGVlbFRvIiwg bW91c2VXaGVlbFRvQ2FsbGJhY2ssIGtKU1Byb3BlcnR5QXR0cmlidXRlUmVhZE9ubHkgfCBrSlNQ cm9wZXJ0eUF0dHJpYnV0ZURvbnREZWxldGUgfSwKKyAgICB7ICJtb3VzZVNjcm9sbEJ5IiwgbW91 c2VTY3JvbGxCeUNhbGxiYWNrLCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5IHwga0pTUHJv cGVydHlBdHRyaWJ1dGVEb250RGVsZXRlIH0sCisgICAgeyAiY29udGludW91c01vdXNlU2Nyb2xs QnkiLCBjb250aW51b3VzTW91c2VTY3JvbGxCeUNhbGxiYWNrLCBrSlNQcm9wZXJ0eUF0dHJpYnV0 ZVJlYWRPbmx5IHwga0pTUHJvcGVydHlBdHRyaWJ1dGVEb250RGVsZXRlIH0sCiAgICAgeyAiY29u dGV4dENsaWNrIiwgY29udGV4dENsaWNrQ2FsbGJhY2ssIGtKU1Byb3BlcnR5QXR0cmlidXRlUmVh ZE9ubHkgfCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZURvbnREZWxldGUgfSwKICAgICB7ICJtb3VzZURv d24iLCBtb3VzZURvd25DYWxsYmFjaywga0pTUHJvcGVydHlBdHRyaWJ1dGVSZWFkT25seSB8IGtK U1Byb3BlcnR5QXR0cmlidXRlRG9udERlbGV0ZSB9LAogICAgIHsgIm1vdXNlVXAiLCBtb3VzZVVw Q2FsbGJhY2ssIGtKU1Byb3BlcnR5QXR0cmlidXRlUmVhZE9ubHkgfCBrSlNQcm9wZXJ0eUF0dHJp YnV0ZURvbnREZWxldGUgfSwKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDY2NjI1KQorKysgTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTAtMDktMDEg IFBldGVyIEthc3RpbmcgIDxwa2FzdGluZ0Bnb29nbGUuY29tPgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCBbY29udGludW91c11Nb3Vz ZVNjcm9sbEJ5KCkgb24gQ2hyb21pdW0sIGFuZCBwYXJ0bHkgb24gR1RLLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDUwNzMKKworICAgICAgICAqIHBs YXRmb3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dDogVW5za2lwIHRlc3RzIHRoYXQg c2hvdWxkIG5vdyBwYXNzLgorICAgICAgICAqIHBsYXRmb3JtL2d0ay9zY3JvbGxiYXJzL292ZXJm bG93LXNjcm9sbGJhci1ob3Jpem9udGFsLXdoZWVsLXNjcm9sbC5odG1sOiBDb252ZXJ0IG1vdXNl V2hlZWxUbygpIHRvIG1vdXNlU2Nyb2xsQnkoKS4KKwogMjAxMC0wOS0wMSAgTWF0dGhldyBXaWxs aXMgIDxsaWxtYXR0QGZsb2NrLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBKb3NlcGggUGVj b3Jhcm8uCkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9jaHJvbWl1bS90ZXN0X2V4cGVjdGF0 aW9ucy50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vY2hyb21pdW0vdGVz dF9leHBlY3RhdGlvbnMudHh0CShyZXZpc2lvbiA2NjYxMSkKKysrIExheW91dFRlc3RzL3BsYXRm b3JtL2Nocm9taXVtL3Rlc3RfZXhwZWN0YXRpb25zLnR4dAkod29ya2luZyBjb3B5KQpAQCAtMjQ3 NywxMCArMjQ3Nyw2IEBAIEJVR19KSUFOTEkgTUFDIDogZmFzdC9mb3Jtcy9zZWxlY3Qtc3R5bGUK IEJVRzM4Mzc1IDogcGx1Z2lucy9ucHJ1bnRpbWUvcm91bmQtdHJpcC1ucG9iamVjdC5odG1sID0g VEVYVAogQlVHMzgzNzYgV0lOIDogZWRpdGluZy9kZWxldGluZy81MzkwNjgxLTIuaHRtbCA9IElN QUdFK1RFWFQKIAotLy8gV2ViS2l0IHJvbGwgNTYwMDQgLT4gNTYwMjYKLUJVRzM4Mjc4IDogZmFz dC9ldmVudHMvY29udGludW91cy1wbGF0Zm9ybS13aGVlbGV2ZW50LWluLXNjcm9sbGluZy1kaXYu aHRtbCA9IFRJTUVPVVQKLUJVRzM4Mjc4IDogZmFzdC9ldmVudHMvcGxhdGZvcm0td2hlZWxldmVu dC1pbi1zY3JvbGxpbmctZGl2Lmh0bWwgPSBUSU1FT1VUCi0KIC8vIFRoZSB0b3VjaCB0YXJnZXRp bmcgbG9naWMgd2FzIHJlY2VudGx5IGNoYW5nZWQuCiBCVUczNjQxNSA6IGZhc3QvZXZlbnRzL3Rv dWNoL3RvdWNoLXRhcmdldC5odG1sID0gVEVYVAogCkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9y bS9ndGsvc2Nyb2xsYmFycy9vdmVyZmxvdy1zY3JvbGxiYXItaG9yaXpvbnRhbC13aGVlbC1zY3Jv bGwuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvc2Nyb2xsYmFy cy9vdmVyZmxvdy1zY3JvbGxiYXItaG9yaXpvbnRhbC13aGVlbC1zY3JvbGwuaHRtbAkocmV2aXNp b24gNjY2MTEpCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvc2Nyb2xsYmFycy9vdmVyZmxv dy1zY3JvbGxiYXItaG9yaXpvbnRhbC13aGVlbC1zY3JvbGwuaHRtbAkod29ya2luZyBjb3B5KQpA QCAtODgsNyArODgsNyBAQCBpZiAod2luZG93LmV2ZW50U2VuZGVyKSB7CiAgICAgdmFyIHggPSBv dmVyZmxvdy5vZmZzZXRMZWZ0ICsgb3ZlcmZsb3cub2Zmc2V0V2lkdGggLSA1MDsKICAgICB2YXIg eSA9IG92ZXJmbG93Lm9mZnNldFRvcCArIG92ZXJmbG93Lm9mZnNldEhlaWdodCAtIDUwOwogICAg IGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHgsIHkpOwotICAgIGV2ZW50U2VuZGVyLm1vdXNlV2hl ZWxUbygwLCAxKTsKKyAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5KDAsIC0xKTsKIAogICAg IGlmIChvdmVyZmxvdy5zY3JvbGxUb3AgIT0gNDAgfHwgb3ZlcmZsb3cuc2Nyb2xsTGVmdCAhPSAw KQogICAgICAgICBmYWlsZWQoKTsKQEAgLTk2LDggKzk2LDggQEAgaWYgKHdpbmRvdy5ldmVudFNl bmRlcikgewogICAgIC8vIFNjcm9sbCBvbiB0b3Agb2YgdGhlIGhvcml6b250YWwgc2Nyb2xsYmFy CiAgICAgdmFyIHggPSBvdmVyZmxvdy5vZmZzZXRMZWZ0ICsgb3ZlcmZsb3cub2Zmc2V0V2lkdGgg LSA1MDsKICAgICB2YXIgeSA9IG92ZXJmbG93Lm9mZnNldFRvcCArIG92ZXJmbG93Lm9mZnNldEhl aWdodCAtIDY7Ci0gICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8oeCwgeSk7Ci0gICAgZXZlbnRT ZW5kZXIubW91c2VXaGVlbFRvKDAsIDEpOworICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHgs IHkpOw0KKyAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5KDAsIC0xKTsKIAogICAgIGlmIChv dmVyZmxvdy5zY3JvbGxUb3AgIT0gNDAgfHwgb3ZlcmZsb3cuc2Nyb2xsTGVmdCAhPSA0MCkKICAg ICAgICAgZmFpbGVkKCk7CkBAIC0xMDUsOCArMTA1LDggQEAgaWYgKHdpbmRvdy5ldmVudFNlbmRl cikgewogICAgIC8vIFNjcm9sbCBvbiB0b3Agb2YgdGhlIHZlcnRpY2FsIHNjcm9sbGJhcgogICAg IHZhciB4ID0gb3ZlcmZsb3cub2Zmc2V0TGVmdCArIG92ZXJmbG93Lm9mZnNldFdpZHRoIC0gNjsK ICAgICB2YXIgeSA9IG92ZXJmbG93Lm9mZnNldFRvcCArIG92ZXJmbG93Lm9mZnNldEhlaWdodCAt IDUwOwotICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHgsIHkpOwotICAgIGV2ZW50U2VuZGVy Lm1vdXNlV2hlZWxUbygwLCAxKTsKKyAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyh4LCB5KTsN CisgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeSgwLCAtMSk7CiAKICAgICBpZiAob3ZlcmZs b3cuc2Nyb2xsVG9wICE9IDgwIHx8IG92ZXJmbG93LnNjcm9sbExlZnQgIT0gNDApCiAgICAgICAg IGZhaWxlZCgpOwpAQCAtMTE2LDggKzExNiw4IEBAIGlmICh3aW5kb3cuZXZlbnRTZW5kZXIpIHsK ICAgICAvLyBTY3JvbGwgaW5zaWRlIHRoZSBkaXYKICAgICB2YXIgeCA9IHN0eWxlZC5vZmZzZXRM ZWZ0ICsgc3R5bGVkLm9mZnNldFdpZHRoIC0gNTA7CiAgICAgdmFyIHkgPSBzdHlsZWQub2Zmc2V0 VG9wICsgc3R5bGVkLm9mZnNldEhlaWdodCAtIDUwOwotICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92 ZVRvKHgsIHkpOwotICAgIGV2ZW50U2VuZGVyLm1vdXNlV2hlZWxUbygwLCAxKTsKKyAgICBldmVu dFNlbmRlci5tb3VzZU1vdmVUbyh4LCB5KTsNCisgICAgZXZlbnRTZW5kZXIubW91c2VTY3JvbGxC eSgwLCAtMSk7CiAKICAgICBpZiAoc3R5bGVkLnNjcm9sbFRvcCAhPSA0MCB8fCBzdHlsZWQuc2Ny b2xsTGVmdCAhPSAwKQogICAgICAgICBmYWlsZWQoKTsKQEAgLTEyNSw4ICsxMjUsOCBAQCBpZiAo d2luZG93LmV2ZW50U2VuZGVyKSB7CiAgICAgLy8gU2Nyb2xsIG9uIHRvcCBvZiB0aGUgaG9yaXpv bnRhbCBzY3JvbGxiYXIKICAgICB2YXIgeCA9IHN0eWxlZC5vZmZzZXRMZWZ0ICsgc3R5bGVkLm9m ZnNldFdpZHRoIC0gNTA7CiAgICAgdmFyIHkgPSBzdHlsZWQub2Zmc2V0VG9wICsgc3R5bGVkLm9m ZnNldEhlaWdodCAtIDY7Ci0gICAgZXZlbnRTZW5kZXIubW91c2VNb3ZlVG8oeCwgeSk7Ci0gICAg ZXZlbnRTZW5kZXIubW91c2VXaGVlbFRvKDAsIDEpOworICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92 ZVRvKHgsIHkpOw0KKyAgICBldmVudFNlbmRlci5tb3VzZVNjcm9sbEJ5KDAsIC0xKTsKIAogICAg IGlmIChzdHlsZWQuc2Nyb2xsVG9wICE9IDQwIHx8IHN0eWxlZC5zY3JvbGxMZWZ0ICE9IDQwKQog ICAgICAgICBmYWlsZWQoKTsKQEAgLTEzNCw4ICsxMzQsOCBAQCBpZiAod2luZG93LmV2ZW50U2Vu ZGVyKSB7CiAgICAgLy8gU2Nyb2xsIG9uIHRvcCBvZiB0aGUgdmVydGljYWwgc2Nyb2xsYmFyCiAg ICAgdmFyIHggPSBzdHlsZWQub2Zmc2V0TGVmdCArIHN0eWxlZC5vZmZzZXRXaWR0aCAtIDY7CiAg ICAgdmFyIHkgPSBzdHlsZWQub2Zmc2V0VG9wICsgc3R5bGVkLm9mZnNldEhlaWdodCAtIDUwOwot ICAgIGV2ZW50U2VuZGVyLm1vdXNlTW92ZVRvKHgsIHkpOwotICAgIGV2ZW50U2VuZGVyLm1vdXNl V2hlZWxUbygwLCAxKTsKKyAgICBldmVudFNlbmRlci5tb3VzZU1vdmVUbyh4LCB5KTsNCisgICAg ZXZlbnRTZW5kZXIubW91c2VTY3JvbGxCeSgwLCAtMSk7CiAKICAgICBpZiAoc3R5bGVkLnNjcm9s bFRvcCAhPSA4MCB8fCBzdHlsZWQuc2Nyb2xsTGVmdCAhPSA0MCkKICAgICAgICAgZmFpbGVkKCk7 Cg==