79521 2012-02-24 12:43:45 -0800 [Qt][WK2] Use movementStarted/Ended signals instead of movingChanged on QtViewportInterationEngine 2012-02-28 02:42:24 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Unspecified All RESOLVED FIXED P2 Normal --- 0 hugo.lima webkit-unassigned kenneth menard webkit.review.bot zoltan oldest_to_newest 564557 0 hugo.lima 2012-02-24 12:43:45 -0800 The movingChanged() signal from Flickable QML component is emitted many times but the QtViewportInteractionEngine is only interested about when the pan starts and when it ends, the Flickable also provide signals for that, so would be better to use those signals (movementStarted()/movementEnded()) instead of movingChanged(). 564565 1 128787 hugo.lima 2012-02-24 12:49:18 -0800 Created attachment 128787 Patch 564941 2 128787 kenneth 2012-02-25 05:13:50 -0800 Comment on attachment 128787 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=128787&action=review Almost there! > Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp:129 > + connect(m_flickProvider, SIGNAL(movementStarted()), SLOT(panMoveStarted()), Qt::DirectConnection); > + connect(m_flickProvider, SIGNAL(movementEnded()), SLOT(panMoveEnded()), Qt::DirectConnection); I think we should rename those methods to flickableMoveStarted/Ended > Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp:-193 > - if (m_flickProvider->isMoving()) { > - if (m_scrollUpdateDeferrer) Can be please assert for this inside the panMoveStarted/Ended to ensure that the state is always correct? 565703 3 hugo.lima 2012-02-27 09:03:08 -0800 Sir, yes sir! 565751 4 129056 hugo.lima 2012-02-27 09:52:33 -0800 Created attachment 129056 Patch Assertions added, slots renamed. 566534 5 webkit.review.bot 2012-02-28 02:40:17 -0800 The commit-queue encountered the following flaky tests while processing attachment 129056: css3/filters/effect-contrast-hw.html bug 79618 (author: cmarrin@apple.com) The commit-queue is continuing to process your patch. 566536 6 129056 webkit.review.bot 2012-02-28 02:42:20 -0800 Comment on attachment 129056 Patch Clearing flags on attachment: 129056 Committed r109094: <http://trac.webkit.org/changeset/109094> 566537 7 webkit.review.bot 2012-02-28 02:42:24 -0800 All reviewed patches have been landed. Closing bug. 128787 2012-02-24 12:49:18 -0800 2012-02-27 09:52:22 -0800 Patch bug-79521-20120224174918.patch text/plain 5947 hugo.lima U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4ODAyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTY1OGMxMWExM2JiY2Vi NjU5ZmY3OGRjOWU0YzA0M2MxODU3NDZlOC4uODYxZGU3NjRkOWJkMTc2MzE4NDA2ZDU0YzllNmIw NDAxMmNjOWM0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTAyLTI0ICBIdWdv IFBhcmVudGUgTGltYSAgPGh1Z28ubGltYUBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIFtRdF1b V0syXSBVc2UgbW92ZW1lbnRTdGFydGVkL0VuZGVkIHNpZ25hbHMgaW5zdGVhZCBvZiBtb3ZpbmdD aGFuZ2VkIG9uIFF0Vmlld3BvcnRJbnRlcmF0aW9uRW5naW5lCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03OTUyMQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIG1vdmluZ0NoYW5nZWQoKSBzaWduYWwgaXMgZW1p dHRlZCBtYW55IHRpbWVzLCBzbyB0aGUgdXNlIG9mIG1vdmVtZW50U3RhcnRlZCgpIGFuZAorICAg ICAgICBtb3ZlbWVudEVuZGVkKCkgaXMgYSBiZXR0ZXIgY2hvaWNlLgorCisgICAgICAgICogVUlQ cm9jZXNzL3F0L1F0RmxpY2tQcm92aWRlci5jcHA6CisgICAgICAgIChRdEZsaWNrUHJvdmlkZXI6 OlF0RmxpY2tQcm92aWRlcik6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0RmxpY2tQcm92aWRl ci5oOgorICAgICAgICAoUXRGbGlja1Byb3ZpZGVyKToKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQv UXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UXRWaWV3 cG9ydEludGVyYWN0aW9uRW5naW5lOjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUpOgorICAg ICAgICAqIFVJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaDoKKyAgICAg ICAgKFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZSk6CisKIDIwMTItMDItMjQgIFNpbW9uIEhh dXNtYW5uICA8c2ltb24uaGF1c21hbm5Abm9raWEuY29tPgogCiAgICAgICAgIFtRdF1bV0syXSBR UXVpY2tXZWJWaWV3OjpldmVudCBzaG91bGQgbG9va3VwIGZhc3RlciB3aGljaCBldmVudHMgUVF1 aWNrV2ViUGFnZSBjYW4gaGFuZGxlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvcXQvUXRGbGlja1Byb3ZpZGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9R dEZsaWNrUHJvdmlkZXIuY3BwCmluZGV4IDM3NjBjMGNmYjJlN2NkYmIzOTk4NzE1NWQ0MDA1NGY5 YTk5OWQyYzMuLmMxYWZhNGEyNzg0NzBlMGI2MDM1ZTQ2OGYxNTUxOGE1YmNlNWRkYTYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdEZsaWNrUHJvdmlkZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdEZsaWNrUHJvdmlkZXIuY3BwCkBAIC0x MDYsNyArMTA2LDggQEAgUXRGbGlja1Byb3ZpZGVyOjpRdEZsaWNrUHJvdmlkZXIoUVF1aWNrV2Vi Vmlldyogdmlld0l0ZW0sIFFRdWlja1dlYlBhZ2UqIHBhZ2VJdGUKICAgICBwYWdlSXRlbS0+c2V0 UGFyZW50SXRlbShtX2NvbnRlbnRJdGVtKTsKIAogICAgIC8vIFByb3BhZ2F0ZSBmbGlja2FibGUg c2lnbmFscy4KLSAgICBjb25uZWN0KG1fZmxpY2thYmxlLCBTSUdOQUwobW92aW5nQ2hhbmdlZCgp KSwgU0lHTkFMKG1vdmluZ0NoYW5nZWQoKSksIFF0OjpEaXJlY3RDb25uZWN0aW9uKTsKKyAgICBj b25uZWN0KG1fZmxpY2thYmxlLCBTSUdOQUwobW92ZW1lbnRTdGFydGVkKCkpLCBTSUdOQUwobW92 ZW1lbnRTdGFydGVkKCkpLCBRdDo6RGlyZWN0Q29ubmVjdGlvbik7CisgICAgY29ubmVjdChtX2Zs aWNrYWJsZSwgU0lHTkFMKG1vdmVtZW50RW5kZWQoKSksIFNJR05BTChtb3ZlbWVudEVuZGVkKCkp LCBRdDo6RGlyZWN0Q29ubmVjdGlvbik7CiAgICAgY29ubmVjdChtX2ZsaWNrYWJsZSwgU0lHTkFM KGZsaWNraW5nQ2hhbmdlZCgpKSwgU0lHTkFMKGZsaWNraW5nQ2hhbmdlZCgpKSwgUXQ6OkRpcmVj dENvbm5lY3Rpb24pOwogICAgIGNvbm5lY3QobV9mbGlja2FibGUsIFNJR05BTChkcmFnZ2luZ0No YW5nZWQoKSksIFNJR05BTChkcmFnZ2luZ0NoYW5nZWQoKSksIFF0OjpEaXJlY3RDb25uZWN0aW9u KTsKICAgICBjb25uZWN0KG1fZmxpY2thYmxlLCBTSUdOQUwoY29udGVudFdpZHRoQ2hhbmdlZCgp KSwgU0lHTkFMKGNvbnRlbnRXaWR0aENoYW5nZWQoKSksIFF0OjpEaXJlY3RDb25uZWN0aW9uKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdEZsaWNrUHJvdmlkZXIu aCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdEZsaWNrUHJvdmlkZXIuaAppbmRleCBm Mzg4YTBiNGIwMWFjZDllMDc1M2JlNzc5MmNhYmNiOGY2OTJlN2NiLi4yNzU4MTBiYmZjYjA4Y2Rm NjU0YzVlMmQ3NDc0YzcxODA3ZGNhZjA3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvcXQvUXRGbGlja1Byb3ZpZGVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L3F0L1F0RmxpY2tQcm92aWRlci5oCkBAIC03Miw3ICs3Miw4IEBAIFFfU0lHTkFMUzoKICAgICB2 b2lkIGNvbnRlbnRIZWlnaHRDaGFuZ2VkKCk7CiAgICAgdm9pZCBjb250ZW50WENoYW5nZWQoKTsK ICAgICB2b2lkIGNvbnRlbnRZQ2hhbmdlZCgpOwotICAgIHZvaWQgbW92aW5nQ2hhbmdlZCgpOwor ICAgIHZvaWQgbW92ZW1lbnRTdGFydGVkKCk7CisgICAgdm9pZCBtb3ZlbWVudEVuZGVkKCk7CiAg ICAgdm9pZCBmbGlja2luZ0NoYW5nZWQoKTsKICAgICB2b2lkIGRyYWdnaW5nQ2hhbmdlZCgpOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVy YWN0aW9uRW5naW5lLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0 SW50ZXJhY3Rpb25FbmdpbmUuY3BwCmluZGV4IGJmZWMzNzEzODkzYjg0ZTc0NDM2MDMwNzE3ZTU1 OGFlMmJkNzVmODcuLjhjN2YwZTc4YTQyMDFiZGU1NzUyMDI5Y2I2ZjFlNzgyYzMzYmNhMWQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rp b25FbmdpbmUuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0 SW50ZXJhY3Rpb25FbmdpbmUuY3BwCkBAIC0xMjUsNyArMTI1LDggQEAgUXRWaWV3cG9ydEludGVy YWN0aW9uRW5naW5lOjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUoUVF1aWNrV2ViVmlldyog dmlld3BvcnQKIAogICAgIGNvbm5lY3QobV9jb250ZW50LCBTSUdOQUwod2lkdGhDaGFuZ2VkKCkp LCBTTE9UKGl0ZW1TaXplQ2hhbmdlZCgpKSwgUXQ6OkRpcmVjdENvbm5lY3Rpb24pOwogICAgIGNv bm5lY3QobV9jb250ZW50LCBTSUdOQUwoaGVpZ2h0Q2hhbmdlZCgpKSwgU0xPVChpdGVtU2l6ZUNo YW5nZWQoKSksIFF0OjpEaXJlY3RDb25uZWN0aW9uKTsKLSAgICBjb25uZWN0KG1fZmxpY2tQcm92 aWRlciwgU0lHTkFMKG1vdmluZ0NoYW5nZWQoKSksIFNMT1QoZmxpY2thYmxlTW92aW5nU3RhdGVD aGFuZ2VkKCkpLCBRdDo6RGlyZWN0Q29ubmVjdGlvbik7CisgICAgY29ubmVjdChtX2ZsaWNrUHJv dmlkZXIsIFNJR05BTChtb3ZlbWVudFN0YXJ0ZWQoKSksIFNMT1QocGFuTW92ZVN0YXJ0ZWQoKSks IFF0OjpEaXJlY3RDb25uZWN0aW9uKTsKKyAgICBjb25uZWN0KG1fZmxpY2tQcm92aWRlciwgU0lH TkFMKG1vdmVtZW50RW5kZWQoKSksIFNMT1QocGFuTW92ZUVuZGVkKCkpLCBRdDo6RGlyZWN0Q29u bmVjdGlvbik7CiAKICAgICBjb25uZWN0KG1fc2NhbGVBbmltYXRpb24sIFNJR05BTCh2YWx1ZUNo YW5nZWQoUVZhcmlhbnQpKSwKICAgICAgICAgICAgIFNMT1Qoc2NhbGVBbmltYXRpb25WYWx1ZUNo YW5nZWQoUVZhcmlhbnQpKSwgUXQ6OkRpcmVjdENvbm5lY3Rpb24pOwpAQCAtMTg3LDE2ICsxODgs NiBAQCBib29sIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6YW5pbWF0ZUl0ZW1SZWN0Vmlz aWJsZShjb25zdCBRUmVjdEYmIGl0ZW1SZWN0KQogICAgIHJldHVybiB0cnVlOwogfQogCi12b2lk IFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6ZmxpY2thYmxlTW92aW5nU3RhdGVDaGFuZ2Vk KCkKLXsKLSAgICBpZiAobV9mbGlja1Byb3ZpZGVyLT5pc01vdmluZygpKSB7Ci0gICAgICAgIGlm IChtX3Njcm9sbFVwZGF0ZURlZmVycmVyKQotICAgICAgICAgICAgcmV0dXJuOyAvLyBXZSBnZXQg dGhlIGlzTW92aW5nKCkgc2lnbmFsIG11bHRpcGxlIHRpbWVzLgotICAgICAgICBwYW5Nb3ZlU3Rh cnRlZCgpOwotICAgIH0gZWxzZQotICAgICAgICBwYW5Nb3ZlRW5kZWQoKTsKLX0KLQogdm9pZCBR dFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnBhbk1vdmVTdGFydGVkKCkKIHsKICAgICBtX3Nj cm9sbFVwZGF0ZURlZmVycmVyID0gYWRvcHRQdHIobmV3IFZpZXdwb3J0VXBkYXRlRGVmZXJyZXIo dGhpcykpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3Bv cnRJbnRlcmFjdGlvbkVuZ2luZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmll d3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oCmluZGV4IDk0MTliZTBmNmVjZTUwMTdjODY1YWIzZTky NDE2YTA0ODYyYjYyMmUuLjc0NWMxMTUxZjM0NWY5YzgzZmNkZTI5MGQyYTllMmU5ZjViYjZkNjkg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJh Y3Rpb25FbmdpbmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9y dEludGVyYWN0aW9uRW5naW5lLmgKQEAgLTExMywxMiArMTEzLDE0IEBAIHByaXZhdGUgUV9TTE9U UzoKICAgICAvLyBSZXNwb25kIHRvIGNoYW5nZXMgb2YgY29udGVudCB0aGF0IGFyZSBub3QgZHJp dmVuIGJ5IHVzLCBsaWtlIHRoZSBwYWdlIHJlc2l6aW5nIGl0c2VsZi4KICAgICB2b2lkIGl0ZW1T aXplQ2hhbmdlZCgpOwogCi0gICAgdm9pZCBmbGlja2FibGVNb3ZpbmdTdGF0ZUNoYW5nZWQoKTsK ICAgICB2b2lkIGZsaWNrYWJsZU1vdmluZ1Bvc2l0aW9uVXBkYXRlKCk7CiAKICAgICB2b2lkIHNj YWxlQW5pbWF0aW9uU3RhdGVDaGFuZ2VkKFFBYnN0cmFjdEFuaW1hdGlvbjo6U3RhdGUsIFFBYnN0 cmFjdEFuaW1hdGlvbjo6U3RhdGUpOwogICAgIHZvaWQgc2NhbGVBbmltYXRpb25WYWx1ZUNoYW5n ZWQoUVZhcmlhbnQgdmFsdWUpIHsgc2V0SXRlbVJlY3RWaXNpYmxlKHZhbHVlLnRvUmVjdEYoKSk7 IH0KIAorICAgIHZvaWQgcGFuTW92ZVN0YXJ0ZWQoKTsgLy8gQ2FsbGVkIHdoZW4gcGFubmluZyBz dGFydHMuCisgICAgdm9pZCBwYW5Nb3ZlRW5kZWQoKTsgLy8gICBDYWxsZWQgd2hlbiBwYW5uaW5n ICgrIGtpbmV0aWMgYW5pbWF0aW9uKSBlbmRzLgorCiBwcml2YXRlOgogICAgIGZyaWVuZCBjbGFz cyBWaWV3cG9ydFVwZGF0ZURlZmVycmVyOwogCkBAIC0xMzAsOSArMTMyLDYgQEAgcHJpdmF0ZToK ICAgICBxcmVhbCBpbm5lckJvdW5kZWRDU1NTY2FsZShxcmVhbCk7CiAgICAgcXJlYWwgb3V0ZXJC b3VuZGVkQ1NTU2NhbGUocXJlYWwpOwogCi0gICAgdm9pZCBwYW5Nb3ZlU3RhcnRlZCgpOyAvLyBD YWxsZWQgd2hlbiBwYW5uaW5nIHN0YXJ0cy4KLSAgICB2b2lkIHBhbk1vdmVFbmRlZCgpOyAvLyAg IENhbGxlZCB3aGVuIHBhbm5pbmcgKCsga2luZXRpYyBhbmltYXRpb24pIGVuZHMuCi0KICAgICBR UmVjdEYgY29tcHV0ZVBvc1JhbmdlRm9ySXRlbUF0U2NhbGUocXJlYWwgaXRlbVNjYWxlKSBjb25z dDsKICAgICBib29sIGVuc3VyZUNvbnRlbnRXaXRoaW5WaWV3cG9ydEJvdW5kYXJ5KGJvb2wgaW1t ZWRpYXRlID0gZmFsc2UpOwogCg== 129056 2012-02-27 09:52:33 -0800 2012-02-28 02:42:20 -0800 Patch bug-79521-20120227145229.patch text/plain 6529 hugo.lima U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4OTk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZjE2M2QyNzFiYTg3NzQ5 ODQyMzlhZDlkNGQ1M2ZlZmViMmJmMTU5OS4uOGU0MmEyNDJlNWExNDQ0NDFjZWI3MGJkMWZiNjVm ZmM5NjFhY2JkNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTAyLTI0ICBIdWdv IFBhcmVudGUgTGltYSAgPGh1Z28ubGltYUBvcGVuYm9zc2Eub3JnPgorCisgICAgICAgIFtRdF1b V0syXSBVc2UgbW92ZW1lbnRTdGFydGVkL0VuZGVkIHNpZ25hbHMgaW5zdGVhZCBvZiBtb3ZpbmdD aGFuZ2VkIG9uIFF0Vmlld3BvcnRJbnRlcmF0aW9uRW5naW5lCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03OTUyMQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIG1vdmluZ0NoYW5nZWQoKSBzaWduYWwgaXMgZW1p dHRlZCBtYW55IHRpbWVzLCBzbyB0aGUgdXNlIG9mIG1vdmVtZW50U3RhcnRlZCgpIGFuZAorICAg ICAgICBtb3ZlbWVudEVuZGVkKCkgaXMgYSBiZXR0ZXIgY2hvaWNlLgorCisgICAgICAgICogVUlQ cm9jZXNzL3F0L1F0RmxpY2tQcm92aWRlci5jcHA6CisgICAgICAgIChRdEZsaWNrUHJvdmlkZXI6 OlF0RmxpY2tQcm92aWRlcik6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0RmxpY2tQcm92aWRl ci5oOgorICAgICAgICAoUXRGbGlja1Byb3ZpZGVyKToKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQv UXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UXRWaWV3 cG9ydEludGVyYWN0aW9uRW5naW5lOjpRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUpOgorICAg ICAgICAqIFVJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaDoKKyAgICAg ICAgKFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZSk6CisKIDIwMTItMDItMjYgIFlvdW5nVGFl Y2sgU29uZyAgPHlvdW5ndGFlY2suc29uZ0BzYW1zdW5nLmNvbT4KIAogICAgICAgICBbRUZMXVtX SzJdIEFkZCBJbmplY3RlZEJ1bmRsZUVmbC5jcHAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9xdC9RdEZsaWNrUHJvdmlkZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL3F0L1F0RmxpY2tQcm92aWRlci5jcHAKaW5kZXggMzc2MGMwY2ZiMmU3Y2RiYjM5OTg3MTU1 ZDQwMDU0ZjlhOTk5ZDJjMy4uYzFhZmE0YTI3ODQ3MGUwYjYwMzVlNDY4ZjE1NTE4YTViY2U1ZGRh NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0RmxpY2tQcm92aWRl ci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0RmxpY2tQcm92aWRlci5j cHAKQEAgLTEwNiw3ICsxMDYsOCBAQCBRdEZsaWNrUHJvdmlkZXI6OlF0RmxpY2tQcm92aWRlcihR UXVpY2tXZWJWaWV3KiB2aWV3SXRlbSwgUVF1aWNrV2ViUGFnZSogcGFnZUl0ZQogICAgIHBhZ2VJ dGVtLT5zZXRQYXJlbnRJdGVtKG1fY29udGVudEl0ZW0pOwogCiAgICAgLy8gUHJvcGFnYXRlIGZs aWNrYWJsZSBzaWduYWxzLgotICAgIGNvbm5lY3QobV9mbGlja2FibGUsIFNJR05BTChtb3ZpbmdD aGFuZ2VkKCkpLCBTSUdOQUwobW92aW5nQ2hhbmdlZCgpKSwgUXQ6OkRpcmVjdENvbm5lY3Rpb24p OworICAgIGNvbm5lY3QobV9mbGlja2FibGUsIFNJR05BTChtb3ZlbWVudFN0YXJ0ZWQoKSksIFNJ R05BTChtb3ZlbWVudFN0YXJ0ZWQoKSksIFF0OjpEaXJlY3RDb25uZWN0aW9uKTsKKyAgICBjb25u ZWN0KG1fZmxpY2thYmxlLCBTSUdOQUwobW92ZW1lbnRFbmRlZCgpKSwgU0lHTkFMKG1vdmVtZW50 RW5kZWQoKSksIFF0OjpEaXJlY3RDb25uZWN0aW9uKTsKICAgICBjb25uZWN0KG1fZmxpY2thYmxl LCBTSUdOQUwoZmxpY2tpbmdDaGFuZ2VkKCkpLCBTSUdOQUwoZmxpY2tpbmdDaGFuZ2VkKCkpLCBR dDo6RGlyZWN0Q29ubmVjdGlvbik7CiAgICAgY29ubmVjdChtX2ZsaWNrYWJsZSwgU0lHTkFMKGRy YWdnaW5nQ2hhbmdlZCgpKSwgU0lHTkFMKGRyYWdnaW5nQ2hhbmdlZCgpKSwgUXQ6OkRpcmVjdENv bm5lY3Rpb24pOwogICAgIGNvbm5lY3QobV9mbGlja2FibGUsIFNJR05BTChjb250ZW50V2lkdGhD aGFuZ2VkKCkpLCBTSUdOQUwoY29udGVudFdpZHRoQ2hhbmdlZCgpKSwgUXQ6OkRpcmVjdENvbm5l Y3Rpb24pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0RmxpY2tQ cm92aWRlci5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0RmxpY2tQcm92aWRlci5o CmluZGV4IGYzODhhMGI0YjAxYWNkOWUwNzUzYmU3NzkyY2FiY2I4ZjY5MmU3Y2IuLjI3NTgxMGJi ZmNiMDhjZGY2NTRjNWUyZDc0NzRjNzE4MDdkY2FmMDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9xdC9RdEZsaWNrUHJvdmlkZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvcXQvUXRGbGlja1Byb3ZpZGVyLmgKQEAgLTcyLDcgKzcyLDggQEAgUV9TSUdOQUxT OgogICAgIHZvaWQgY29udGVudEhlaWdodENoYW5nZWQoKTsKICAgICB2b2lkIGNvbnRlbnRYQ2hh bmdlZCgpOwogICAgIHZvaWQgY29udGVudFlDaGFuZ2VkKCk7Ci0gICAgdm9pZCBtb3ZpbmdDaGFu Z2VkKCk7CisgICAgdm9pZCBtb3ZlbWVudFN0YXJ0ZWQoKTsKKyAgICB2b2lkIG1vdmVtZW50RW5k ZWQoKTsKICAgICB2b2lkIGZsaWNraW5nQ2hhbmdlZCgpOwogICAgIHZvaWQgZHJhZ2dpbmdDaGFu Z2VkKCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdw b3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0 Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAKaW5kZXggYmZlYzM3MTM4OTNiODRlNzQ0MzYw MzA3MTdlNTU4YWUyYmQ3NWY4Ny4uMDVhYmMwZDllMTY2NGRjMDQ4ZTVhYzI1ZmIyMjY3ZDhjYzll YjFhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJ bnRlcmFjdGlvbkVuZ2luZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0 Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAKQEAgLTEyNSw3ICsxMjUsOCBAQCBRdFZpZXdw b3J0SW50ZXJhY3Rpb25FbmdpbmU6OlF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZShRUXVpY2tX ZWJWaWV3KiB2aWV3cG9ydAogCiAgICAgY29ubmVjdChtX2NvbnRlbnQsIFNJR05BTCh3aWR0aENo YW5nZWQoKSksIFNMT1QoaXRlbVNpemVDaGFuZ2VkKCkpLCBRdDo6RGlyZWN0Q29ubmVjdGlvbik7 CiAgICAgY29ubmVjdChtX2NvbnRlbnQsIFNJR05BTChoZWlnaHRDaGFuZ2VkKCkpLCBTTE9UKGl0 ZW1TaXplQ2hhbmdlZCgpKSwgUXQ6OkRpcmVjdENvbm5lY3Rpb24pOwotICAgIGNvbm5lY3QobV9m bGlja1Byb3ZpZGVyLCBTSUdOQUwobW92aW5nQ2hhbmdlZCgpKSwgU0xPVChmbGlja2FibGVNb3Zp bmdTdGF0ZUNoYW5nZWQoKSksIFF0OjpEaXJlY3RDb25uZWN0aW9uKTsKKyAgICBjb25uZWN0KG1f ZmxpY2tQcm92aWRlciwgU0lHTkFMKG1vdmVtZW50U3RhcnRlZCgpKSwgU0xPVChmbGlja2FibGVN b3ZlU3RhcnRlZCgpKSwgUXQ6OkRpcmVjdENvbm5lY3Rpb24pOworICAgIGNvbm5lY3QobV9mbGlj a1Byb3ZpZGVyLCBTSUdOQUwobW92ZW1lbnRFbmRlZCgpKSwgU0xPVChmbGlja2FibGVNb3ZlRW5k ZWQoKSksIFF0OjpEaXJlY3RDb25uZWN0aW9uKTsKIAogICAgIGNvbm5lY3QobV9zY2FsZUFuaW1h dGlvbiwgU0lHTkFMKHZhbHVlQ2hhbmdlZChRVmFyaWFudCkpLAogICAgICAgICAgICAgU0xPVChz Y2FsZUFuaW1hdGlvblZhbHVlQ2hhbmdlZChRVmFyaWFudCkpLCBRdDo6RGlyZWN0Q29ubmVjdGlv bik7CkBAIC0xODcsMTggKzE4OCw5IEBAIGJvb2wgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5l OjphbmltYXRlSXRlbVJlY3RWaXNpYmxlKGNvbnN0IFFSZWN0RiYgaXRlbVJlY3QpCiAgICAgcmV0 dXJuIHRydWU7CiB9CiAKLXZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpmbGlja2Fi bGVNb3ZpbmdTdGF0ZUNoYW5nZWQoKQotewotICAgIGlmIChtX2ZsaWNrUHJvdmlkZXItPmlzTW92 aW5nKCkpIHsKLSAgICAgICAgaWYgKG1fc2Nyb2xsVXBkYXRlRGVmZXJyZXIpCi0gICAgICAgICAg ICByZXR1cm47IC8vIFdlIGdldCB0aGUgaXNNb3ZpbmcoKSBzaWduYWwgbXVsdGlwbGUgdGltZXMu Ci0gICAgICAgIHBhbk1vdmVTdGFydGVkKCk7Ci0gICAgfSBlbHNlCi0gICAgICAgIHBhbk1vdmVF bmRlZCgpOwotfQotCi12b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6cGFuTW92ZVN0 YXJ0ZWQoKQordm9pZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OmZsaWNrYWJsZU1vdmVT dGFydGVkKCkKIHsKKyAgICBRX0FTU0VSVChtX2ZsaWNrUHJvdmlkZXItPmlzTW92aW5nKCkpOwog ICAgIG1fc2Nyb2xsVXBkYXRlRGVmZXJyZXIgPSBhZG9wdFB0cihuZXcgVmlld3BvcnRVcGRhdGVE ZWZlcnJlcih0aGlzKSk7CiAKICAgICBtX2xhc3RTY3JvbGxQb3NpdGlvbiA9IG1fZmxpY2tQcm92 aWRlci0+Y29udGVudFBvcygpOwpAQCAtMjA2LDggKzE5OCw5IEBAIHZvaWQgUXRWaWV3cG9ydElu dGVyYWN0aW9uRW5naW5lOjpwYW5Nb3ZlU3RhcnRlZCgpCiAgICAgY29ubmVjdChtX2ZsaWNrUHJv dmlkZXIsIFNJR05BTChjb250ZW50WUNoYW5nZWQoKSksIFNMT1QoZmxpY2thYmxlTW92aW5nUG9z aXRpb25VcGRhdGUoKSkpOwogfQogCi12b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6 cGFuTW92ZUVuZGVkKCkKK3ZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpmbGlja2Fi bGVNb3ZlRW5kZWQoKQogeworICAgIFFfQVNTRVJUKCFtX2ZsaWNrUHJvdmlkZXItPmlzTW92aW5n KCkpOwogICAgIC8vIFRoaXMgbWV0aG9kIGlzIGNhbGxlZCBvbiB0aGUgZW5kIG9mIHRoZSBwYW4g b3IgcGFuIGtpbmV0aWMgYW5pbWF0aW9uLgogICAgIG1fc2Nyb2xsVXBkYXRlRGVmZXJyZXIuY2xl YXIoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3Bv cnRJbnRlcmFjdGlvbkVuZ2luZS5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmll d3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oCmluZGV4IDk0MTliZTBmNmVjZTUwMTdjODY1YWIzZTky NDE2YTA0ODYyYjYyMmUuLjNkYTgxYjMxNmE4MjhkMzdlYWY3NjM2MTgzMjkxY2EyY2ZhYTAyYzcg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJh Y3Rpb25FbmdpbmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9y dEludGVyYWN0aW9uRW5naW5lLmgKQEAgLTExMywxMiArMTEzLDE0IEBAIHByaXZhdGUgUV9TTE9U UzoKICAgICAvLyBSZXNwb25kIHRvIGNoYW5nZXMgb2YgY29udGVudCB0aGF0IGFyZSBub3QgZHJp dmVuIGJ5IHVzLCBsaWtlIHRoZSBwYWdlIHJlc2l6aW5nIGl0c2VsZi4KICAgICB2b2lkIGl0ZW1T aXplQ2hhbmdlZCgpOwogCi0gICAgdm9pZCBmbGlja2FibGVNb3ZpbmdTdGF0ZUNoYW5nZWQoKTsK ICAgICB2b2lkIGZsaWNrYWJsZU1vdmluZ1Bvc2l0aW9uVXBkYXRlKCk7CiAKICAgICB2b2lkIHNj YWxlQW5pbWF0aW9uU3RhdGVDaGFuZ2VkKFFBYnN0cmFjdEFuaW1hdGlvbjo6U3RhdGUsIFFBYnN0 cmFjdEFuaW1hdGlvbjo6U3RhdGUpOwogICAgIHZvaWQgc2NhbGVBbmltYXRpb25WYWx1ZUNoYW5n ZWQoUVZhcmlhbnQgdmFsdWUpIHsgc2V0SXRlbVJlY3RWaXNpYmxlKHZhbHVlLnRvUmVjdEYoKSk7 IH0KIAorICAgIHZvaWQgZmxpY2thYmxlTW92ZVN0YXJ0ZWQoKTsgLy8gQ2FsbGVkIHdoZW4gcGFu bmluZyBzdGFydHMuCisgICAgdm9pZCBmbGlja2FibGVNb3ZlRW5kZWQoKTsgLy8gICBDYWxsZWQg d2hlbiBwYW5uaW5nICgrIGtpbmV0aWMgYW5pbWF0aW9uKSBlbmRzLgorCiBwcml2YXRlOgogICAg IGZyaWVuZCBjbGFzcyBWaWV3cG9ydFVwZGF0ZURlZmVycmVyOwogCkBAIC0xMzAsOSArMTMyLDYg QEAgcHJpdmF0ZToKICAgICBxcmVhbCBpbm5lckJvdW5kZWRDU1NTY2FsZShxcmVhbCk7CiAgICAg cXJlYWwgb3V0ZXJCb3VuZGVkQ1NTU2NhbGUocXJlYWwpOwogCi0gICAgdm9pZCBwYW5Nb3ZlU3Rh cnRlZCgpOyAvLyBDYWxsZWQgd2hlbiBwYW5uaW5nIHN0YXJ0cy4KLSAgICB2b2lkIHBhbk1vdmVF bmRlZCgpOyAvLyAgIENhbGxlZCB3aGVuIHBhbm5pbmcgKCsga2luZXRpYyBhbmltYXRpb24pIGVu ZHMuCi0KICAgICBRUmVjdEYgY29tcHV0ZVBvc1JhbmdlRm9ySXRlbUF0U2NhbGUocXJlYWwgaXRl bVNjYWxlKSBjb25zdDsKICAgICBib29sIGVuc3VyZUNvbnRlbnRXaXRoaW5WaWV3cG9ydEJvdW5k YXJ5KGJvb2wgaW1tZWRpYXRlID0gZmFsc2UpOwogCg==