81895 2012-03-22 05:21:53 -0700 [Qt] Don't resume the suspended page if the user is continuously flicking. 2012-03-26 11:01:06 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jturcotte jturcotte abecsi hausmann kenneth menard schenney webkit.review.bot zoltan oldest_to_newest 585143 0 jturcotte 2012-03-22 05:21:53 -0700 [Qt] Don't resume the suspended page if the user is continuously flicking. 585149 1 133231 jturcotte 2012-03-22 05:24:48 -0700 Created attachment 133231 Patch 585155 2 133231 kenneth 2012-03-22 05:30:11 -0700 Comment on attachment 133231 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=133231&action=review Seems like an ok idea, though it doesnt fit so well with the current code. > Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp:301 > +void QtViewportInteractionEngine::notifyTouchBegin() I am not sure how well this naming with together with what we already have in the class > Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp:304 > + if (scrollAnimationActive()) This only works with the animation and not the "dragging" > Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.h:153 > OwnPtr<ViewportUpdateDeferrer> m_scaleUpdateDeferrer; > OwnPtr<ViewportUpdateDeferrer> m_scrollUpdateDeferrer; > + OwnPtr<ViewportUpdateDeferrer> m_panUpdateDeferrer; These are not actually per gesture recognizer, so scroll vs pan is confusing here. 585177 3 133237 jturcotte 2012-03-22 05:53:40 -0700 Created attachment 133237 Patch 585180 4 jturcotte 2012-03-22 05:55:28 -0700 (In reply to comment #2) > > Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp:304 > > + if (scrollAnimationActive()) > > This only works with the animation and not the "dragging" > m_scrollUpdateDeferrer handles the dragging, flickable tells us that it's dragging through movementStarted/Ended. Fixed the rest, tell me what you think about it. 585182 5 133237 kenneth 2012-03-22 05:57:54 -0700 Comment on attachment 133237 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=133237&action=review > Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp:304 > + if (scrollAnimationActive()) I still think this might need to check isMoving instead of isFlicking. 585183 6 kenneth 2012-03-22 05:58:37 -0700 (In reply to comment #4) > (In reply to comment #2) > > > Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp:304 > > > + if (scrollAnimationActive()) > > > > This only works with the animation and not the "dragging" > > > m_scrollUpdateDeferrer handles the dragging, flickable tells us that it's dragging through movementStarted/Ended. > > Fixed the rest, tell me what you think about it. cant we merge them then? 585205 7 jturcotte 2012-03-22 06:38:53 -0700 (In reply to comment #6) > cant we merge them then? I think it's pretty simple like this, the suspend count logic makes it all work. The other way would be to have some heavy boolean logic to decide when to clear the deferrer. 585317 8 jturcotte 2012-03-22 08:24:53 -0700 Committed r111705: <http://trac.webkit.org/changeset/111705> 587913 9 schenney 2012-03-26 11:01:06 -0700 *** Bug 81691 has been marked as a duplicate of this bug. *** 133231 2012-03-22 05:24:48 -0700 2012-03-22 05:53:32 -0700 Patch bug-81895-20120322132455.patch text/plain 4935 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNTY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggY2EzZjhmZDkxYmNhMDBl Y2MyNTRiNGIyNWZjNWNjZjUwMjRiNjQ1MS4uNTQwOTZmYTYwNmIwNWI1MzIwODRmMjliZTVjZDU1 ZjQ3MGM1YjQxMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTAzLTIyICBKb2Nl bHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBub2tpYS5jb20+CisKKyAgICAgICAgW1F0 XSBEb24ndCByZXN1bWUgdGhlIHN1c3BlbmRlZCBwYWdlIGlmIHRoZSB1c2VyIGlzIGNvbnRpbnVv dXNseSBmbGlja2luZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTgxODk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQ3JlYXRlIGFuIGFkZGl0aW9uYWwgc3VzcGVuZCBkZWZlcnJlciBiZXR3ZWVuIFRvdWNo QmVnaW4gYW5kIFRvdWNoRW5kIHRvCisgICAgICAgIHJlbGF5IHdpdGggdGhlIG9uZSBrZXB0IHdo aWxlIHRoZSBmbGljayBhbmltYXRpb24gaXMgcnVubmluZy4KKyAgICAgICAgVGhpcyBhbGxvd3Mg dGhlIHBhZ2UgdG8gYmUgc3VzcGVuZGVkIHdoZW4gYSBwYW4gZ2VzdHVyZSBzdGFydHMgYW5kIHN0 YXkKKyAgICAgICAgdGhhdCB3YXkgdW50aWwgdGhlIGxhc3QgZmxpY2sgYW5pbWF0aW9uIGVuZHMu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmNw cDoKKyAgICAgICAgKFdlYktpdDo6UXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpub3RpZnlU b3VjaEJlZ2luKToKKyAgICAgICAgKFdlYktpdCk6CisgICAgICAgIChXZWJLaXQ6OlF0Vmlld3Bv cnRJbnRlcmFjdGlvbkVuZ2luZTo6bm90aWZ5VG91Y2hFbmQpOgorICAgICAgICAoV2ViS2l0OjpR dFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnBpbmNoR2VzdHVyZVN0YXJ0ZWQpOgorICAgICAg ICAqIFVJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaDoKKyAgICAgICAg KFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZSk6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0 V2ViUGFnZUV2ZW50SGFuZGxlci5jcHA6CisgICAgICAgIChRdFdlYlBhZ2VFdmVudEhhbmRsZXI6 OmRvbmVXaXRoVG91Y2hFdmVudCk6CisKIDIwMTItMDMtMjEgIEpvY2VseW4gVHVyY290dGUgIDxq b2NlbHluLnR1cmNvdHRlQG5va2lhLmNvbT4KIAogICAgICAgICBbUXRdIFdlYkdyYXBoaWNzTGF5 ZXI6IFVudGllIHRoZSBsYXllciB1cGRhdGVzIGFuZCB0aWxlIHVwZGF0ZXMuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5l LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25F bmdpbmUuY3BwCmluZGV4IDJmZmFmZDc1NjllN2YxMzI0ZjdmMmE5NDk4ZWE3ZWU0MGRmYjU5MDUu LmNjMzUzOGE1MWZhOTNjMmM2ZGNlMmQwNzkzYWYyMTNlODE4MzIyNzUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25F bmdpbmUuY3BwCkBAIC0yOTgsNiArMjk4LDE4IEBAIHZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9u RW5naW5lOjpwYWdlUG9zaXRpb25SZXF1ZXN0KGNvbnN0IFFQb2ludCYgcGFnZVBvc2l0aW9uCiAg ICAgc2V0SXRlbVJlY3RWaXNpYmxlKGVuZFZpc2libGVDb250ZW50UmVjdCk7CiB9CiAKK3ZvaWQg UXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpub3RpZnlUb3VjaEJlZ2luKCkKK3sKKyAgICAv LyBQcmV2ZW50cyByZXN1bWluZyB0aGUgcGFnZSBiZXR3ZWVuIHRoZSB1c2VyJ3MgZmxpY2tzIG9m IHRoZSBwYWdlIHdoaWxlIHRoZSBhbmltYXRpb24gaXMgcnVubmluZy4KKyAgICBpZiAoc2Nyb2xs QW5pbWF0aW9uQWN0aXZlKCkpCisgICAgICAgIG1fcGFuVXBkYXRlRGVmZXJyZXIgPSBhZG9wdFB0 cihuZXcgVmlld3BvcnRVcGRhdGVEZWZlcnJlcih0aGlzLCBWaWV3cG9ydFVwZGF0ZURlZmVycmVy OjpEZWZlclVwZGF0ZUFuZFN1c3BlbmRDb250ZW50KSk7Cit9CisKK3ZvaWQgUXRWaWV3cG9ydElu dGVyYWN0aW9uRW5naW5lOjpub3RpZnlUb3VjaEVuZCgpCit7CisgICAgbV9wYW5VcGRhdGVEZWZl cnJlci5jbGVhcigpOworfQorCiBRUmVjdEYgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpj b21wdXRlUG9zUmFuZ2VGb3JJdGVtQXRTY2FsZShxcmVhbCBpdGVtU2NhbGUpIGNvbnN0CiB7CiAg ICAgY29uc3QgUVNpemVGIGNvbnRlbnRJdGVtU2l6ZSA9IG1fY29udGVudC0+Y29udGVudHNTaXpl KCkgKiBpdGVtU2NhbGU7CkBAIC01MTcsOCArNTI5LDYgQEAgYm9vbCBRdFZpZXdwb3J0SW50ZXJh Y3Rpb25FbmdpbmU6OnBpbmNoR2VzdHVyZUFjdGl2ZSgpIGNvbnN0CiAKIHZvaWQgUXRWaWV3cG9y dEludGVyYWN0aW9uRW5naW5lOjpwaW5jaEdlc3R1cmVTdGFydGVkKGNvbnN0IFFQb2ludEYmIHBp bmNoQ2VudGVySW5WaWV3cG9ydENvb3JkaW5hdGVzKQogewotICAgIEFTU0VSVCghbV9zdXNwZW5k Q291bnQpOwotCiAgICAgaWYgKCFtX2NvbnN0cmFpbnRzLmlzVXNlclNjYWxhYmxlKQogICAgICAg ICByZXR1cm47CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZp ZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9R dFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaAppbmRleCBiNjZkZWZkNmIwZTUyY2U0ZDUwZWYx ZjgxY2FjMDg3NDIxMDExZDExLi5mOWIxNWRjODY0MTZkNGMzYTA0OGJkOGMxNmQ4ZDM2ODJhZTk0 ZTNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydElu dGVyYWN0aW9uRW5naW5lLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmll d3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oCkBAIC03Niw2ICs3Niw4IEBAIHB1YmxpYzoKIAogICAg IHZvaWQgd2hlZWxFdmVudChRV2hlZWxFdmVudCopOwogICAgIHZvaWQgcGFnZVBvc2l0aW9uUmVx dWVzdChjb25zdCBRUG9pbnQmIHBvcyk7CisgICAgdm9pZCBub3RpZnlUb3VjaEJlZ2luKCk7Cisg ICAgdm9pZCBub3RpZnlUb3VjaEVuZCgpOwogCiAgICAgYm9vbCBzY3JvbGxBbmltYXRpb25BY3Rp dmUoKSBjb25zdDsKICAgICB2b2lkIGNhbmNlbFNjcm9sbEFuaW1hdGlvbigpOwpAQCAtMTQ4LDYg KzE1MCw3IEBAIHByaXZhdGU6CiAgICAgYm9vbCBtX2hhc1N1c3BlbmRlZENvbnRlbnQ7CiAgICAg T3duUHRyPFZpZXdwb3J0VXBkYXRlRGVmZXJyZXI+IG1fc2NhbGVVcGRhdGVEZWZlcnJlcjsKICAg ICBPd25QdHI8Vmlld3BvcnRVcGRhdGVEZWZlcnJlcj4gbV9zY3JvbGxVcGRhdGVEZWZlcnJlcjsK KyAgICBPd25QdHI8Vmlld3BvcnRVcGRhdGVEZWZlcnJlcj4gbV9wYW5VcGRhdGVEZWZlcnJlcjsK IAogICAgIGJvb2wgbV9oYWRVc2VySW50ZXJhY3Rpb247CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VFdmVudEhhbmRsZXIuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZUV2ZW50SGFuZGxlci5jcHAKaW5kZXggMjgwYjk5 Yzk5YTJiNjE2ZmJiNjY4OWFhYmMzMjVlODUzYzViZWEyNS4uZjI3ZWI1Y2JmMjg3NzgzOTNmZDFi OGQ0Y2RkODBmZjRlNWY3MWJhNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L3F0L1F0V2ViUGFnZUV2ZW50SGFuZGxlci5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL3F0L1F0V2ViUGFnZUV2ZW50SGFuZGxlci5jcHAKQEAgLTQ0OSw2ICs0NDksNyBAQCB2b2lk IFF0V2ViUGFnZUV2ZW50SGFuZGxlcjo6ZG9uZVdpdGhUb3VjaEV2ZW50KGNvbnN0IE5hdGl2ZVdl YlRvdWNoRXZlbnQmIGV2ZW50LAogICAgIGNhc2UgUUV2ZW50OjpUb3VjaEJlZ2luOgogICAgICAg ICBBU1NFUlQoIW1faW50ZXJhY3Rpb25FbmdpbmUtPnBhbkdlc3R1cmVBY3RpdmUoKSk7CiAgICAg ICAgIEFTU0VSVCghbV9pbnRlcmFjdGlvbkVuZ2luZS0+cGluY2hHZXN0dXJlQWN0aXZlKCkpOwor ICAgICAgICBtX2ludGVyYWN0aW9uRW5naW5lLT5ub3RpZnlUb3VjaEJlZ2luKCk7CiAKICAgICAg ICAgLy8gVGhlIGludGVyYWN0aW9uIGVuZ2luZSBtaWdodCBzdGlsbCBiZSBhbmltYXRpbmcga2lu ZXRpYyBzY3JvbGxpbmcgb3IgYSBzY2FsZSBhbmltYXRpb24KICAgICAgICAgLy8gc3VjaCBhcyBk b3VibGUtdGFwIHRvIHpvb20gb3IgdGhlIGJvdW5jZSBiYWNrIGVmZmVjdC4gQSB0b3VjaCBzdG9w cyB0aGUga2luZXRpYyBzY3JvbGxpbmcKQEAgLTQ2MCw2ICs0NjEsOSBAQCB2b2lkIFF0V2ViUGFn ZUV2ZW50SGFuZGxlcjo6ZG9uZVdpdGhUb3VjaEV2ZW50KGNvbnN0IE5hdGl2ZVdlYlRvdWNoRXZl bnQmIGV2ZW50LAogICAgICAgICBpZiAobV9pbnRlcmFjdGlvbkVuZ2luZS0+c2NhbGVBbmltYXRp b25BY3RpdmUoKSAmJiBtX3BpbmNoR2VzdHVyZVJlY29nbml6ZXIuaXNSZWNvZ25pemVkKCkpCiAg ICAgICAgICAgICBtX2ludGVyYWN0aW9uRW5naW5lLT5pbnRlcnJ1cHRTY2FsZUFuaW1hdGlvbigp OwogICAgICAgICBicmVhazsKKyAgICBjYXNlIFFFdmVudDo6VG91Y2hFbmQ6CisgICAgICAgIG1f aW50ZXJhY3Rpb25FbmdpbmUtPm5vdGlmeVRvdWNoRW5kKCk7CisgICAgICAgIGJyZWFrOwogICAg IGRlZmF1bHQ6CiAgICAgICAgIGJyZWFrOwogICAgIH0K 133237 2012-03-22 05:53:40 -0700 2012-03-22 05:57:54 -0700 Patch bug-81895-20120322135347.patch text/plain 4893 jturcotte U3VidmVyc2lvbiBSZXZpc2lvbjogMTExNTY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggY2EzZjhmZDkxYmNhMDBl Y2MyNTRiNGIyNWZjNWNjZjUwMjRiNjQ1MS4uOTg5ZGZkODY0ODY3NzA0ZGJjMTc4YjZhNjBjM2Nk Y2Y4NjU0NzIzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDEyLTAzLTIyICBKb2Nl bHluIFR1cmNvdHRlICA8am9jZWx5bi50dXJjb3R0ZUBub2tpYS5jb20+CisKKyAgICAgICAgW1F0 XSBEb24ndCByZXN1bWUgdGhlIHN1c3BlbmRlZCBwYWdlIGlmIHRoZSB1c2VyIGlzIGNvbnRpbnVv dXNseSBmbGlja2luZy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTgxODk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQ3JlYXRlIGFuIGFkZGl0aW9uYWwgc3VzcGVuZCBkZWZlcnJlciBiZXR3ZWVuIFRvdWNo QmVnaW4gYW5kIFRvdWNoRW5kIHRvCisgICAgICAgIHJlbGF5IHdpdGggdGhlIG9uZSBrZXB0IHdo aWxlIHRoZSBmbGljayBhbmltYXRpb24gaXMgcnVubmluZy4KKyAgICAgICAgVGhpcyBhbGxvd3Mg dGhlIHBhZ2UgdG8gYmUgc3VzcGVuZGVkIHdoZW4gYSBwYW4gZ2VzdHVyZSBzdGFydHMgYW5kIHN0 YXkKKyAgICAgICAgdGhhdCB3YXkgdW50aWwgdGhlIGxhc3QgZmxpY2sgYW5pbWF0aW9uIGVuZHMu CisKKyAgICAgICAgKiBVSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmNw cDoKKyAgICAgICAgKFdlYktpdDo6UXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjp0b3VjaEJl Z2luKToKKyAgICAgICAgKFdlYktpdCk6CisgICAgICAgIChXZWJLaXQ6OlF0Vmlld3BvcnRJbnRl cmFjdGlvbkVuZ2luZTo6dG91Y2hFbmQpOgorICAgICAgICAoV2ViS2l0OjpRdFZpZXdwb3J0SW50 ZXJhY3Rpb25FbmdpbmU6OnBpbmNoR2VzdHVyZVN0YXJ0ZWQpOgorICAgICAgICAqIFVJUHJvY2Vz cy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuaDoKKyAgICAgICAgKFF0Vmlld3BvcnRJ bnRlcmFjdGlvbkVuZ2luZSk6CisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0V2ViUGFnZUV2ZW50 SGFuZGxlci5jcHA6CisgICAgICAgIChRdFdlYlBhZ2VFdmVudEhhbmRsZXI6OmRvbmVXaXRoVG91 Y2hFdmVudCk6CisKIDIwMTItMDMtMjEgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNv dHRlQG5va2lhLmNvbT4KIAogICAgICAgICBbUXRdIFdlYkdyYXBoaWNzTGF5ZXI6IFVudGllIHRo ZSBsYXllciB1cGRhdGVzIGFuZCB0aWxlIHVwZGF0ZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwCmlu ZGV4IDJmZmFmZDc1NjllN2YxMzI0ZjdmMmE5NDk4ZWE3ZWU0MGRmYjU5MDUuLmU4ZWQ1MTRmN2Ux YjU5Njg4YjkyZTkxY2UwNWM0MzdjOGViYmVjYTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwCkBA IC0yOTgsNiArMjk4LDE4IEBAIHZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpwYWdl UG9zaXRpb25SZXF1ZXN0KGNvbnN0IFFQb2ludCYgcGFnZVBvc2l0aW9uCiAgICAgc2V0SXRlbVJl Y3RWaXNpYmxlKGVuZFZpc2libGVDb250ZW50UmVjdCk7CiB9CiAKK3ZvaWQgUXRWaWV3cG9ydElu dGVyYWN0aW9uRW5naW5lOjp0b3VjaEJlZ2luKCkKK3sKKyAgICAvLyBQcmV2ZW50cyByZXN1bWlu ZyB0aGUgcGFnZSBiZXR3ZWVuIHRoZSB1c2VyJ3MgZmxpY2tzIG9mIHRoZSBwYWdlIHdoaWxlIHRo ZSBhbmltYXRpb24gaXMgcnVubmluZy4KKyAgICBpZiAoc2Nyb2xsQW5pbWF0aW9uQWN0aXZlKCkp CisgICAgICAgIG1fdG91Y2hVcGRhdGVEZWZlcnJlciA9IGFkb3B0UHRyKG5ldyBWaWV3cG9ydFVw ZGF0ZURlZmVycmVyKHRoaXMsIFZpZXdwb3J0VXBkYXRlRGVmZXJyZXI6OkRlZmVyVXBkYXRlQW5k U3VzcGVuZENvbnRlbnQpKTsKK30KKwordm9pZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6 OnRvdWNoRW5kKCkKK3sKKyAgICBtX3RvdWNoVXBkYXRlRGVmZXJyZXIuY2xlYXIoKTsKK30KKwog UVJlY3RGIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6Y29tcHV0ZVBvc1JhbmdlRm9ySXRl bUF0U2NhbGUocXJlYWwgaXRlbVNjYWxlKSBjb25zdAogewogICAgIGNvbnN0IFFTaXplRiBjb250 ZW50SXRlbVNpemUgPSBtX2NvbnRlbnQtPmNvbnRlbnRzU2l6ZSgpICogaXRlbVNjYWxlOwpAQCAt NTE3LDggKzUyOSw2IEBAIGJvb2wgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjpwaW5jaEdl c3R1cmVBY3RpdmUoKSBjb25zdAogCiB2b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6 cGluY2hHZXN0dXJlU3RhcnRlZChjb25zdCBRUG9pbnRGJiBwaW5jaENlbnRlckluVmlld3BvcnRD b29yZGluYXRlcykKIHsKLSAgICBBU1NFUlQoIW1fc3VzcGVuZENvdW50KTsKLQogICAgIGlmICgh bV9jb25zdHJhaW50cy5pc1VzZXJTY2FsYWJsZSkKICAgICAgICAgcmV0dXJuOwogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5n aW5lLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9u RW5naW5lLmgKaW5kZXggYjY2ZGVmZDZiMGU1MmNlNGQ1MGVmMWY4MWNhYzA4NzQyMTAxMWQxMS4u ZjlhOTVlZDYyZTZhYWM3NjhlZDdmNzcxMmNkMWU2NzEwYzgyMmYxZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5oCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25Fbmdp bmUuaApAQCAtNzYsNiArNzYsOCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHdoZWVsRXZlbnQoUVdo ZWVsRXZlbnQqKTsKICAgICB2b2lkIHBhZ2VQb3NpdGlvblJlcXVlc3QoY29uc3QgUVBvaW50JiBw b3MpOworICAgIHZvaWQgdG91Y2hCZWdpbigpOworICAgIHZvaWQgdG91Y2hFbmQoKTsKIAogICAg IGJvb2wgc2Nyb2xsQW5pbWF0aW9uQWN0aXZlKCkgY29uc3Q7CiAgICAgdm9pZCBjYW5jZWxTY3Jv bGxBbmltYXRpb24oKTsKQEAgLTE0OCw2ICsxNTAsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9o YXNTdXNwZW5kZWRDb250ZW50OwogICAgIE93blB0cjxWaWV3cG9ydFVwZGF0ZURlZmVycmVyPiBt X3NjYWxlVXBkYXRlRGVmZXJyZXI7CiAgICAgT3duUHRyPFZpZXdwb3J0VXBkYXRlRGVmZXJyZXI+ IG1fc2Nyb2xsVXBkYXRlRGVmZXJyZXI7CisgICAgT3duUHRyPFZpZXdwb3J0VXBkYXRlRGVmZXJy ZXI+IG1fdG91Y2hVcGRhdGVEZWZlcnJlcjsKIAogICAgIGJvb2wgbV9oYWRVc2VySW50ZXJhY3Rp b247CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFdlYlBhZ2VF dmVudEhhbmRsZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZUV2 ZW50SGFuZGxlci5jcHAKaW5kZXggMjgwYjk5Yzk5YTJiNjE2ZmJiNjY4OWFhYmMzMjVlODUzYzVi ZWEyNS4uNzYwNjZiMmU0MGY3NGVjOWIzMzRlZTNjZWJmZmRlNWI3NDZiMTA5MCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZUV2ZW50SGFuZGxlci5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL3F0L1F0V2ViUGFnZUV2ZW50SGFuZGxlci5j cHAKQEAgLTQ0OSw2ICs0NDksNyBAQCB2b2lkIFF0V2ViUGFnZUV2ZW50SGFuZGxlcjo6ZG9uZVdp dGhUb3VjaEV2ZW50KGNvbnN0IE5hdGl2ZVdlYlRvdWNoRXZlbnQmIGV2ZW50LAogICAgIGNhc2Ug UUV2ZW50OjpUb3VjaEJlZ2luOgogICAgICAgICBBU1NFUlQoIW1faW50ZXJhY3Rpb25FbmdpbmUt PnBhbkdlc3R1cmVBY3RpdmUoKSk7CiAgICAgICAgIEFTU0VSVCghbV9pbnRlcmFjdGlvbkVuZ2lu ZS0+cGluY2hHZXN0dXJlQWN0aXZlKCkpOworICAgICAgICBtX2ludGVyYWN0aW9uRW5naW5lLT50 b3VjaEJlZ2luKCk7CiAKICAgICAgICAgLy8gVGhlIGludGVyYWN0aW9uIGVuZ2luZSBtaWdodCBz dGlsbCBiZSBhbmltYXRpbmcga2luZXRpYyBzY3JvbGxpbmcgb3IgYSBzY2FsZSBhbmltYXRpb24K ICAgICAgICAgLy8gc3VjaCBhcyBkb3VibGUtdGFwIHRvIHpvb20gb3IgdGhlIGJvdW5jZSBiYWNr IGVmZmVjdC4gQSB0b3VjaCBzdG9wcyB0aGUga2luZXRpYyBzY3JvbGxpbmcKQEAgLTQ2MCw2ICs0 NjEsOSBAQCB2b2lkIFF0V2ViUGFnZUV2ZW50SGFuZGxlcjo6ZG9uZVdpdGhUb3VjaEV2ZW50KGNv bnN0IE5hdGl2ZVdlYlRvdWNoRXZlbnQmIGV2ZW50LAogICAgICAgICBpZiAobV9pbnRlcmFjdGlv bkVuZ2luZS0+c2NhbGVBbmltYXRpb25BY3RpdmUoKSAmJiBtX3BpbmNoR2VzdHVyZVJlY29nbml6 ZXIuaXNSZWNvZ25pemVkKCkpCiAgICAgICAgICAgICBtX2ludGVyYWN0aW9uRW5naW5lLT5pbnRl cnJ1cHRTY2FsZUFuaW1hdGlvbigpOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIFFFdmVudDo6 VG91Y2hFbmQ6CisgICAgICAgIG1faW50ZXJhY3Rpb25FbmdpbmUtPnRvdWNoRW5kKCk7CisgICAg ICAgIGJyZWFrOwogICAgIGRlZmF1bHQ6CiAgICAgICAgIGJyZWFrOwogICAgIH0K