81144 2012-03-14 12:39:18 -0700 [Qt][WK2] Fix bounce-back behaviour for panning 2012-03-16 12:58:09 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All Linux RESOLVED FIXED Qt P3 Normal --- 1 abecsi abecsi dinu.jacob gustavo kenneth menard pnormand webkit.review.bot xan.lopez zoltan oldest_to_newest 578660 0 abecsi 2012-03-14 12:39:18 -0700 The pan gesture should be cancelled and the content should be moved to the end position immediately when tapping during the bounce-back animation. 578681 1 131904 abecsi 2012-03-14 13:03:27 -0700 Created attachment 131904 proposed patch 579234 2 131904 kenneth 2012-03-15 02:48:31 -0700 Comment on attachment 131904 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=131904&action=review > Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.cpp:70 > interactionEngine()->panGestureCancelled(); > + interactionEngine()->ensureContentWithinViewportBoundary(/*immediate*/ true); > return false; hmm, yes you move it back immediately, but isn't the other animation still running? 579337 3 abecsi 2012-03-15 06:59:42 -0700 (In reply to comment #2) > (From update of attachment 131904 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=131904&action=review > > > Source/WebKit2/UIProcess/qt/QtPanGestureRecognizer.cpp:70 > > interactionEngine()->panGestureCancelled(); > > + interactionEngine()->ensureContentWithinViewportBoundary(/*immediate*/ true); > > return false; > > hmm, yes you move it back immediately, but isn't the other animation still running? No, it is stopped by the interactionEngine()->panGestureCancelled() call. This results in a cancelFlick() call to the Flickable, which just stops the animation where it was without returning into valid boundaries. Since Flickable has no public API for immediate position correction, we need to use our own implementation here. 579419 4 131904 abecsi 2012-03-15 08:59:01 -0700 Comment on attachment 131904 proposed patch Clearing flags on attachment: 131904 Committed r110850: <http://trac.webkit.org/changeset/110850> 579420 5 abecsi 2012-03-15 08:59:12 -0700 All reviewed patches have been landed. Closing bug. 580502 6 abecsi 2012-03-16 07:41:26 -0700 This causes an assert in the interaction engine, reopening and preparing a new patch. 580511 7 132283 abecsi 2012-03-16 07:53:12 -0700 Created attachment 132283 proposed patch 580522 8 132283 kenneth 2012-03-16 08:11:37 -0700 Comment on attachment 132283 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=132283&action=review > Source/WebKit2/ChangeLog:10 > + ongoing kinetic scroll or bounce-back animation from a previous pan > + gesture the animation is stopped and the content is positioned back weird english > Source/WebKit2/ChangeLog:11 > + to valid boundaries immediately. I would use immediately earlier > Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp:498 > + // ongoing kinetic scroll or bounce-back animation from a previous pan > + // gesture the animation is stopped and the content is positioned back We only want that for kinetic scroll. Bounce back should be handled differently. ie. if there is a bounce back or other kind of scale animation (tap to zoom) then it should be completed before other events can be accepted 580544 9 132283 pnormand 2012-03-16 08:33:54 -0700 Comment on attachment 132283 proposed patch Attachment 132283 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/11962348 580585 10 abecsi 2012-03-16 09:37:12 -0700 (In reply to comment #9) > (From update of attachment 132283 [details]) > Attachment 132283 [details] did not pass gtk-ews (gtk): > Output: http://queues.webkit.org/results/11962348 This looks bogus to me, the ews seem busted. 580590 11 pnormand 2012-03-16 09:42:24 -0700 (In reply to comment #10) > (In reply to comment #9) > > (From update of attachment 132283 [details] [details]) > > Attachment 132283 [details] [details] did not pass gtk-ews (gtk): > > Output: http://queues.webkit.org/results/11962348 > > This looks bogus to me, the ews seem busted. It was indeed. I've fixed this since then! Sorry for the noise 580593 12 abecsi 2012-03-16 09:43:55 -0700 Committed r111015: <http://trac.webkit.org/changeset/111015> 580596 13 132283 abecsi 2012-03-16 09:44:46 -0700 Comment on attachment 132283 proposed patch Clearing flags from attachment. 580831 14 dinu.jacob 2012-03-16 12:58:09 -0700 *** Bug 81382 has been marked as a duplicate of this bug. *** 131904 2012-03-14 13:03:27 -0700 2012-03-16 07:53:12 -0700 proposed patch bounce-back.patch text/plain 2839 abecsi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA5MTIzNWNjLi42NmI4MWI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAg QEAKKzIwMTItMDMtMTQgIEFuZHJhcyBCZWNzaSAgPGFuZHJhcy5iZWNzaUBub2tpYS5jb20+CisK KyAgICAgICAgW1F0XVtXSzJdIEZpeCBib3VuY2UtYmFjayBiZWhhdmlvdXIgZm9yIHBhbm5pbmcK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxMTQ0CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTW92ZSB0aGUg Y29udGVudCBiYWNrIHRvIGJvdW5kYXJpZXMgaW1tZWRpYXRlbHkKKyAgICAgICAgaW4gcmVzcG9u c2UgdG8gYSB0YXAgZ2VzdHVyZSBkdXJpbmcgdGhlIGJvdW5jZS1iYWNrCisgICAgICAgIGFuaW1h dGlvbiBhZnRlciBwYW5uaW5nLgorCisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0UGFuR2VzdHVy ZVJlY29nbml6ZXIuY3BwOgorICAgICAgICAoV2ViS2l0OjpRdFBhbkdlc3R1cmVSZWNvZ25pemVy OjpyZWNvZ25pemUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rp b25FbmdpbmUuaDoKKyAgICAgICAgTWFrZSB0aGUgZW5zdXJlQ29udGVudFdpdGhpblZpZXdwb3J0 Qm91bmRhcnkgZnVuY3Rpb24gcHVibGljLgorICAgICAgICAoUXRWaWV3cG9ydEludGVyYWN0aW9u RW5naW5lKToKKwogMjAxMi0wMy0xMyAgSmVyIE5vYmxlICA8amVyLm5vYmxlQGFwcGxlLmNvbT4K IAogICAgICAgICBMaW9uIEludGVsIERlYnVnIFdlYktpdDIgVGVzdHMgY3Jhc2hpbmcgdW5kZXIg W1dLRnVsbFNjcmVlbldpbmRvd0NvbnRyb2xsZXIgX3N0YXJ0RW50ZXJGdWxsU2NyZWVuQW5pbWF0 aW9uV2l0aER1cmF0aW9uOl0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9x dC9RdFBhbkdlc3R1cmVSZWNvZ25pemVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9x dC9RdFBhbkdlc3R1cmVSZWNvZ25pemVyLmNwcAppbmRleCBiZTE3YWFjLi4yM2RhYzU0IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRQYW5HZXN0dXJlUmVjb2duaXpl ci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0UGFuR2VzdHVyZVJlY29n bml6ZXIuY3BwCkBAIC02Myw3ICs2MywxMCBAQCBib29sIFF0UGFuR2VzdHVyZVJlY29nbml6ZXI6 OnJlY29nbml6ZShjb25zdCBRVG91Y2hFdmVudCogZXZlbnQpCiAgICAgICAgIG1fc3RhdGUgPSBH ZXN0dXJlUmVjb2duaXRpb25TdGFydGVkOwogICAgICAgICBtX2ZpcnN0UG9zaXRpb24gPSB0b3Vj aFBvaW50LnNjcmVlblBvcygpOwogICAgICAgICBtX3RvdWNoQmVnaW4ucmVzZXQobmV3IFFUb3Vj aEV2ZW50KCpldmVudCkpOworCisgICAgICAgIC8vIFRvdWNoIGJlZ2luIHdoaWxlIGJvdW5jaW5n IGJhY2sgZnJvbSBwYW5uaW5nIHNob3VsZCBtb3ZlIHRoZSBjb250ZW50IHRvIHRoZSBlbmQgcG9z aXRpb24gaW1tZWRpYXRlbHkuCiAgICAgICAgIGludGVyYWN0aW9uRW5naW5lKCktPnBhbkdlc3R1 cmVDYW5jZWxsZWQoKTsKKyAgICAgICAgaW50ZXJhY3Rpb25FbmdpbmUoKS0+ZW5zdXJlQ29udGVu dFdpdGhpblZpZXdwb3J0Qm91bmRhcnkoLyppbW1lZGlhdGUqLyB0cnVlKTsKICAgICAgICAgcmV0 dXJuIGZhbHNlOwogICAgIGNhc2UgUUV2ZW50OjpUb3VjaFVwZGF0ZTogewogICAgICAgICBBU1NF UlQobV9zdGF0ZSAhPSBOb0dlc3R1cmUpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oCmluZGV4IDAxN2MzMDcu LjkxYmZhNzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdw b3J0SW50ZXJhY3Rpb25FbmdpbmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQv UXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmgKQEAgLTkzLDYgKzkzLDcgQEAgcHVibGljOgog ICAgIHZvaWQgcGluY2hHZXN0dXJlUmVxdWVzdFVwZGF0ZShjb25zdCBRUG9pbnRGJiBwaW5jaENl bnRlckluVmlld3BvcnRDb29yZGluYXRlcywgcXJlYWwgdG90YWxTY2FsZUZhY3Rvcik7CiAgICAg dm9pZCBwaW5jaEdlc3R1cmVFbmRlZCgpOwogCisgICAgYm9vbCBlbnN1cmVDb250ZW50V2l0aGlu Vmlld3BvcnRCb3VuZGFyeShib29sIGltbWVkaWF0ZSA9IGZhbHNlKTsKICAgICB2b2lkIHpvb21U b0FyZWFHZXN0dXJlRW5kZWQoY29uc3QgUVBvaW50RiYgdG91Y2hQb2ludCwgY29uc3QgUVJlY3RG JiB0YXJnZXRBcmVhKTsKICAgICB2b2lkIGZvY3VzRWRpdGFibGVBcmVhKGNvbnN0IFFSZWN0RiYg Y2FyZXRBcmVhLCBjb25zdCBRUmVjdEYmIHRhcmdldEFyZWEpOwogCkBAIC0xMzMsNyArMTM0LDYg QEAgcHJpdmF0ZToKICAgICBxcmVhbCBvdXRlckJvdW5kZWRDU1NTY2FsZShxcmVhbCk7CiAKICAg ICBRUmVjdEYgY29tcHV0ZVBvc1JhbmdlRm9ySXRlbUF0U2NhbGUocXJlYWwgaXRlbVNjYWxlKSBj b25zdDsKLSAgICBib29sIGVuc3VyZUNvbnRlbnRXaXRoaW5WaWV3cG9ydEJvdW5kYXJ5KGJvb2wg aW1tZWRpYXRlID0gZmFsc2UpOwogCiAgICAgdm9pZCBzY2FsZUNvbnRlbnQoY29uc3QgUVBvaW50 RiYgY2VudGVySW5DU1NDb29yZGluYXRlcywgcXJlYWwgY3NzU2NhbGUpOwogCg== 132283 2012-03-16 07:53:12 -0700 2012-03-16 09:44:46 -0700 proposed patch bounce-back.patch text/plain 4485 abecsi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA5YTdiNTA1Li4zOTc2MTliIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTItMDMtMTYgIEFuZHJhcyBCZWNzaSAgPGFuZHJhcy5iZWNzaUBub2tpYS5jb20+CisK KyAgICAgICAgW1F0XVtXSzJdIEZpeCBib3VuY2UtYmFjayBiZWhhdmlvdXIgZm9yIHBhbm5pbmcK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgxMTQ0CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSWYgdGhlIHBh biBnZXN0dXJlIHJlY29nbml6ZXIgcmVjZWl2ZXMgYSB0b3VjaCBiZWdpbiBldmVudCBkdXJpbmcg YW4KKyAgICAgICAgb25nb2luZyBraW5ldGljIHNjcm9sbCBvciBib3VuY2UtYmFjayBhbmltYXRp b24gZnJvbSBhIHByZXZpb3VzIHBhbgorICAgICAgICBnZXN0dXJlIHRoZSBhbmltYXRpb24gaXMg c3RvcHBlZCBhbmQgdGhlIGNvbnRlbnQgaXMgcG9zaXRpb25lZCBiYWNrCisgICAgICAgIHRvIHZh bGlkIGJvdW5kYXJpZXMgaW1tZWRpYXRlbHkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvUXRQ YW5HZXN0dXJlUmVjb2duaXplci5jcHA6CisgICAgICAgIChXZWJLaXQ6OlF0UGFuR2VzdHVyZVJl Y29nbml6ZXI6OnJlY29nbml6ZSk6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJ bnRlcmFjdGlvbkVuZ2luZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlF0Vmlld3BvcnRJbnRlcmFj dGlvbkVuZ2luZTo6c2Nyb2xsQW5pbWF0aW9uQ2FuY2VsbGVkKToKKyAgICAgICAgKFdlYktpdCk6 CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oOgor ICAgICAgICAoUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lKToKKyAgICAgICAgQWRkIHRoZSBz Y3JvbGxBbmltYXRpb25DYW5jZWxsZWQoKSBmdW5jdGlvbiBhbmQgbW92ZQorICAgICAgICBlbnN1 cmVDb250ZW50V2l0aGluVmlld3BvcnRCb3VuZGFyeSgpIGJhY2sgdG8gcHJpdmF0ZS4KKwogMjAx Mi0wMy0xNSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCiAgICAgICAg IFRyeSB0byBmaXggdGhlIFNub3cgTGVvcGFyZCBidWlsZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFBhbkdlc3R1cmVSZWNvZ25pemVyLmNwcCBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFBhbkdlc3R1cmVSZWNvZ25pemVyLmNwcAppbmRleCAyM2Rh YzU0Li4wODU5YTRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRQ YW5HZXN0dXJlUmVjb2duaXplci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0 L1F0UGFuR2VzdHVyZVJlY29nbml6ZXIuY3BwCkBAIC02MywxMCArNjMsNyBAQCBib29sIFF0UGFu R2VzdHVyZVJlY29nbml6ZXI6OnJlY29nbml6ZShjb25zdCBRVG91Y2hFdmVudCogZXZlbnQpCiAg ICAgICAgIG1fc3RhdGUgPSBHZXN0dXJlUmVjb2duaXRpb25TdGFydGVkOwogICAgICAgICBtX2Zp cnN0UG9zaXRpb24gPSB0b3VjaFBvaW50LnNjcmVlblBvcygpOwogICAgICAgICBtX3RvdWNoQmVn aW4ucmVzZXQobmV3IFFUb3VjaEV2ZW50KCpldmVudCkpOwotCi0gICAgICAgIC8vIFRvdWNoIGJl Z2luIHdoaWxlIGJvdW5jaW5nIGJhY2sgZnJvbSBwYW5uaW5nIHNob3VsZCBtb3ZlIHRoZSBjb250 ZW50IHRvIHRoZSBlbmQgcG9zaXRpb24gaW1tZWRpYXRlbHkuCi0gICAgICAgIGludGVyYWN0aW9u RW5naW5lKCktPnBhbkdlc3R1cmVDYW5jZWxsZWQoKTsKLSAgICAgICAgaW50ZXJhY3Rpb25Fbmdp bmUoKS0+ZW5zdXJlQ29udGVudFdpdGhpblZpZXdwb3J0Qm91bmRhcnkoLyppbW1lZGlhdGUqLyB0 cnVlKTsKKyAgICAgICAgaW50ZXJhY3Rpb25FbmdpbmUoKS0+c2Nyb2xsQW5pbWF0aW9uQ2FuY2Vs bGVkKCk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICBjYXNlIFFFdmVudDo6VG91Y2hVcGRh dGU6IHsKICAgICAgICAgQVNTRVJUKG1fc3RhdGUgIT0gTm9HZXN0dXJlKTsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUu Y3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVu Z2luZS5jcHAKaW5kZXggYzgzODc2Ny4uYWE2MzE5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAKKysrIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAK QEAgLTQ4OSw2ICs0ODksMTkgQEAgYm9vbCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnNj YWxlQW5pbWF0aW9uQWN0aXZlKCkgY29uc3QKICAgICByZXR1cm4gbV9zY2FsZUFuaW1hdGlvbi0+ c3RhdGUoKSA9PSBRQWJzdHJhY3RBbmltYXRpb246OlJ1bm5pbmc7CiB9CiAKK3ZvaWQgUXRWaWV3 cG9ydEludGVyYWN0aW9uRW5naW5lOjpzY3JvbGxBbmltYXRpb25DYW5jZWxsZWQoKQoreworICAg IFZpZXdwb3J0VXBkYXRlRGVmZXJyZXIgZ3VhcmQodGhpcyk7CisKKyAgICAvLyBJZiB0aGUgcGFu IGdlc3R1cmUgcmVjb2duaXplciByZWNlaXZlcyBhIHRvdWNoIGJlZ2luIGV2ZW50IGR1cmluZyBh bgorICAgIC8vIG9uZ29pbmcga2luZXRpYyBzY3JvbGwgb3IgYm91bmNlLWJhY2sgYW5pbWF0aW9u IGZyb20gYSBwcmV2aW91cyBwYW4KKyAgICAvLyBnZXN0dXJlIHRoZSBhbmltYXRpb24gaXMgc3Rv cHBlZCBhbmQgdGhlIGNvbnRlbnQgaXMgcG9zaXRpb25lZCBiYWNrCisgICAgLy8gdG8gdmFsaWQg Ym91bmRhcmllcyBpbW1lZGlhdGVseS4KKworICAgIG1fZmxpY2tQcm92aWRlci0+Y2FuY2VsRmxp Y2soKTsKKyAgICBlbnN1cmVDb250ZW50V2l0aGluVmlld3BvcnRCb3VuZGFyeSgvKmltbWVkaWF0 ZSovIHRydWUpOworfQorCiB2b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6aW50ZXJy dXB0U2NhbGVBbmltYXRpb24oKQogewogICAgIC8vIFRoaXMgaW50ZXJydXB0cyB0aGUgc2NhbGUg YW5pbWF0aW9uIGV4YWN0bHkgd2hlcmUgaXQgaXMsIGV2ZW4gaWYgaXQgaXMgb3V0IG9mIGJvdW5k cy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50 ZXJhY3Rpb25FbmdpbmUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0 SW50ZXJhY3Rpb25FbmdpbmUuaAppbmRleCA5MWJmYTcwLi41ODk0ZGQ3IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmgK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVu Z2luZS5oCkBAIC03OCw2ICs3OCw3IEBAIHB1YmxpYzoKICAgICB2b2lkIHBhZ2VQb3NpdGlvblJl cXVlc3QoY29uc3QgUVBvaW50JiBwb3MpOwogCiAgICAgYm9vbCBzY3JvbGxBbmltYXRpb25BY3Rp dmUoKSBjb25zdDsKKyAgICB2b2lkIHNjcm9sbEFuaW1hdGlvbkNhbmNlbGxlZCgpOwogCiAgICAg Ym9vbCBwYW5HZXN0dXJlQWN0aXZlKCkgY29uc3Q7CiAgICAgdm9pZCBwYW5HZXN0dXJlU3RhcnRl ZChjb25zdCBRVG91Y2hFdmVudCopOwpAQCAtOTMsNyArOTQsNiBAQCBwdWJsaWM6CiAgICAgdm9p ZCBwaW5jaEdlc3R1cmVSZXF1ZXN0VXBkYXRlKGNvbnN0IFFQb2ludEYmIHBpbmNoQ2VudGVySW5W aWV3cG9ydENvb3JkaW5hdGVzLCBxcmVhbCB0b3RhbFNjYWxlRmFjdG9yKTsKICAgICB2b2lkIHBp bmNoR2VzdHVyZUVuZGVkKCk7CiAKLSAgICBib29sIGVuc3VyZUNvbnRlbnRXaXRoaW5WaWV3cG9y dEJvdW5kYXJ5KGJvb2wgaW1tZWRpYXRlID0gZmFsc2UpOwogICAgIHZvaWQgem9vbVRvQXJlYUdl c3R1cmVFbmRlZChjb25zdCBRUG9pbnRGJiB0b3VjaFBvaW50LCBjb25zdCBRUmVjdEYmIHRhcmdl dEFyZWEpOwogICAgIHZvaWQgZm9jdXNFZGl0YWJsZUFyZWEoY29uc3QgUVJlY3RGJiBjYXJldEFy ZWEsIGNvbnN0IFFSZWN0RiYgdGFyZ2V0QXJlYSk7CiAKQEAgLTEzNCw2ICsxMzQsNyBAQCBwcml2 YXRlOgogICAgIHFyZWFsIG91dGVyQm91bmRlZENTU1NjYWxlKHFyZWFsKTsKIAogICAgIFFSZWN0 RiBjb21wdXRlUG9zUmFuZ2VGb3JJdGVtQXRTY2FsZShxcmVhbCBpdGVtU2NhbGUpIGNvbnN0Owor ICAgIGJvb2wgZW5zdXJlQ29udGVudFdpdGhpblZpZXdwb3J0Qm91bmRhcnkoYm9vbCBpbW1lZGlh dGUgPSBmYWxzZSk7CiAKICAgICB2b2lkIHNjYWxlQ29udGVudChjb25zdCBRUG9pbnRGJiBjZW50 ZXJJbkNTU0Nvb3JkaW5hdGVzLCBxcmVhbCBjc3NTY2FsZSk7CiAK