87108 2012-05-22 03:02:18 -0700 [Qt] Tap-to-zoom overshoot animation 2012-06-04 06:15:25 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 allan.jensen allan.jensen cmarcelo menard vestbo webkit.review.bot zoltan oldest_to_newest 630149 0 allan.jensen 2012-05-22 03:02:18 -0700 Tap-to-zoom should possibly have an animation where it slightly overshoots the targeted area to have a nice animated bump that indicates exactly where it ends (and looks cool). 630151 1 143247 allan.jensen 2012-05-22 03:05:25 -0700 Created attachment 143247 Patch 630243 2 143247 webkit.review.bot 2012-05-22 04:44:11 -0700 Comment on attachment 143247 Patch Clearing flags on attachment: 143247 Committed r117951: <http://trac.webkit.org/changeset/117951> 630244 3 webkit.review.bot 2012-05-22 04:44:15 -0700 All reviewed patches have been landed. Closing bug. 639461 4 vestbo 2012-06-01 09:50:29 -0700 Please revert this, it doesn't match any other browser, and adds to perceived jerkiness of the animation. If anything, we should expose an experimental property of the WebView that lets you control the easing curve from QML, eg if the platform has a standard curve for zoom-animations. 639494 5 allan.jensen 2012-06-01 10:21:14 -0700 Do you mean perceived jerkiness when the animation stutters or also when it is smooth? And is the animation acceptable when the viewport is only zooming in and out? I believe this is the case, and is has a WIP patch to only overshoot on zoom and not on panning-like motion of the viewport, since that does look odd. 640464 6 vestbo 2012-06-04 04:20:11 -0700 (In reply to comment #5) > Do you mean perceived jerkiness when the animation stutters or also when it is smooth? > > And is the animation acceptable when the viewport is only zooming in and out? I believe this is the case, and is has a WIP patch to only overshoot on zoom and not on panning-like motion of the viewport, since that does look odd. Hmm, I didn't realize it also applies when a programmatic pan/scroll is applied.. that's even worse :/ The perceived jerkiness is primarily when the animation also stutters, but in both cases the curve conflicts with the behavior of a regular Flickable, where overshoots happen when you actually cross the bounds of the flickable. This change adds a overshoot-like curve for the case where you scroll or zoom perfectly within the bounds of the page. In addition, the curve is "less neutral", from a UX-pov, if you think about no-animation -> linear animation -> cublic animation -> bounce-animation, so as a default I think it assumes too much about the target platform's UX. That's why i suggested we make the curve configurable, if we see the need for the target platform to override this. 640479 7 145560 allan.jensen 2012-06-04 04:47:09 -0700 Created attachment 145560 Patch 640483 8 145560 webkit-ews 2012-06-04 05:01:18 -0700 Comment on attachment 145560 Patch Attachment 145560 did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/12900184 640492 9 145560 abecsi 2012-06-04 05:10:09 -0700 Comment on attachment 145560 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=145560&action=review > Source/WebKit2/UIProcess/qt/QtViewportInteractionEngine.cpp:297 > + m_scaleAnimation->setEasingCurve(QEasingCurve::OutCubic); > m_scaleAnimation->setEasingCurve(easingCurve); The second call seems to be redundant. 640510 10 145568 allan.jensen 2012-06-04 05:36:00 -0700 Created attachment 145568 Patch 640529 11 145568 webkit.review.bot 2012-06-04 06:15:20 -0700 Comment on attachment 145568 Patch Clearing flags on attachment: 145568 Committed r119390: <http://trac.webkit.org/changeset/119390> 640530 12 webkit.review.bot 2012-06-04 06:15:25 -0700 All reviewed patches have been landed. Closing bug. 143247 2012-05-22 03:05:25 -0700 2012-06-04 04:46:55 -0700 Patch bug-87108-20120522120536.patch text/plain 2409 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3OTM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZmFmZDIzMGU3MDJkMTIx ZWJlZjllZDQwYTgwNzc2MzdkNDg3YjZlMS4uZGY5NTRhNzQ1MzFkMzdjNDUwYmIwODM2Y2U5YTBh YmRjNjkxY2M5OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTA1LTIyICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgorCisgICAgICAgIFtR dF0gVGFwLXRvLXpvb20gb3ZlcnNob290IGFuaW1hdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODcxMDgKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBEZWZpbmVzIGEgc2ltcGxlIGFuaW1hdGlvbiBjdXJ2 ZSB0aGF0IGNvbWJpbmVzIGEgbGFyZ2UKKyAgICAgICAgZWFzZS1vdXQgKG92ZXJzaG9vdCkgd2l0 aCBhIHNtYWxsIGVhc2UtaW4gKGNvcnJlY3Rpb24pLgorICAgICAgICBVc2VzIHRoYXQgY3VydmUg Zm9yIHpvb21pbmcgYW5pbWF0aW9uLgorCisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0Vmlld3Bv cnRJbnRlcmFjdGlvbkVuZ2luZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OnBoeXNpY2FsT3ZlcnNo b290KToKKyAgICAgICAgKFdlYktpdDo6UXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lOjphbmlt YXRlSXRlbVJlY3RWaXNpYmxlKToKKwogMjAxMi0wNS0yMSAgQnJhZHkgRWlkc29uICA8YmVpZHNv bkBhcHBsZS5jb20+CiAKICAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzExNDYwMzM2PiBhbmQgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3MDYxCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvcXQvUXRWaWV3cG9ydEludGVyYWN0aW9uRW5naW5lLmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25Fbmdp bmUuY3BwCmluZGV4IGViM2M1YThkMjY5ODI4YjMzNzJiN2ZlZTIyZGViMTE3ZDFhNWFlNDAuLjE3 MTdmZDBhZGNjZTUzOWU1NDNkOGM5YmE0MGMyNGIzM2IxY2QzZmMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25Fbmdp bmUuY3BwCkBAIC0xODYsNiArMTg2LDEyIEBAIHZvaWQgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5n aW5lOjpzZXRJdGVtUmVjdFZpc2libGUoY29uc3QgUVJlY3RGJiBpdGVtUmVjdCkKICAgICBtX3Zp ZXdwb3J0LT5zZXRDb250ZW50UG9zKG5ld1Bvc2l0aW9uKTsKIH0KIAorLy8gRWFzZSBvdXQgb3Zl cnNob290IG9mIDEuMjUgY29tYmluZWQgd2l0aCBlYXNlIGluIGNvcnJlY3Rpb24gb2YgMC4yNS4g Qm90aCBxdWFkcmF0aWMgdG8gaGF2ZSBwaHlzaWNhbCBtb3Rpb24uCitzdGF0aWMgcXJlYWwgcGh5 c2ljYWxPdmVyc2hvb3QocXJlYWwgdCkKK3sKKyAgICByZXR1cm4gKC10ICogKHQgLSAyKSkgKiAx LjI1IC0gKHQgKiB0KSAqIDAuMjU7Cit9CisKIGJvb2wgUXRWaWV3cG9ydEludGVyYWN0aW9uRW5n aW5lOjphbmltYXRlSXRlbVJlY3RWaXNpYmxlKGNvbnN0IFFSZWN0RiYgaXRlbVJlY3QpCiB7CiAg ICAgUVJlY3RGIGN1cnJlbnRJdGVtUmVjdFZpc2libGUgPSBtX3ZpZXdwb3J0LT5tYXBSZWN0VG9X ZWJDb250ZW50KG1fdmlld3BvcnQtPmJvdW5kaW5nUmVjdCgpKTsKQEAgLTE5OCw5ICsyMDQsMTEg QEAgYm9vbCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OmFuaW1hdGVJdGVtUmVjdFZpc2li bGUoY29uc3QgUVJlY3RGJiBpdGVtUmVjdCkKICAgICAgICAgc2V0SXRlbVJlY3RWaXNpYmxlKGl0 ZW1SZWN0KTsKICAgICAgICAgcmV0dXJuIHRydWU7CiAgICAgfQorICAgIFFFYXNpbmdDdXJ2ZSBl YXNpbmdDdXJ2ZTsKKyAgICBlYXNpbmdDdXJ2ZS5zZXRDdXN0b21UeXBlKHBoeXNpY2FsT3ZlcnNo b290KTsKIAogICAgIG1fc2NhbGVBbmltYXRpb24tPnNldER1cmF0aW9uKGtTY2FsZUFuaW1hdGlv bkR1cmF0aW9uTWlsbGlzKTsKLSAgICBtX3NjYWxlQW5pbWF0aW9uLT5zZXRFYXNpbmdDdXJ2ZShR RWFzaW5nQ3VydmU6Ok91dEN1YmljKTsKKyAgICBtX3NjYWxlQW5pbWF0aW9uLT5zZXRFYXNpbmdD dXJ2ZShlYXNpbmdDdXJ2ZSk7CiAKICAgICBtX3NjYWxlQW5pbWF0aW9uLT5zZXRTdGFydFZhbHVl KGN1cnJlbnRJdGVtUmVjdFZpc2libGUpOwogICAgIG1fc2NhbGVBbmltYXRpb24tPnNldEVuZFZh bHVlKGl0ZW1SZWN0KTsK 145560 2012-06-04 04:47:09 -0700 2012-06-04 05:35:53 -0700 Patch bug-87108-20120604134717.patch text/plain 2222 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5MzczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYjhjMDg2ZjhmNzBjNmFl NzZjNzBjZTEyYWFiYTQzMWQzZjZkOWY4OS4uMWYwODUzYTEzODk2ODE5ZDVkYTBjNTM2MjI4NDUy MGNhYjE4YmFmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA2LTA0ICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgorCisgICAgICAgIFtR dF0gVGFwLXRvLXpvb20gb3ZlcnNob290IGFuaW1hdGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3MTA4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmV2ZXJ0cyB0aGUgY2hhbmdlIGluIGFuaW1hdGlv biwgc28gdGhlIGRlZmF1bHQgaXMgbW9yZSAibmV1dHJhbCIuCisgICAgICAgIFRoaXMgc2hvdWxk IGJlIG1hZGUgY29uZmlndXJhYmxlIGxhdGVyLgorCisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0 Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlF0Vmlld3Bv cnRJbnRlcmFjdGlvbkVuZ2luZTo6YW5pbWF0ZVBhZ2VJdGVtUmVjdFZpc2libGUpOgorCiAyMDEy LTA2LTAyICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CiAKICAgICAgICAgVHJ5 IHRvIGZpeCB0aGUgV2luZG93cyBidWlsZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAKaW5kZXggMDUz YWZmZjI5ZjUyMmZmNWJiMTViZjdlZGNmYzcwYzU0ZGQzODU2Ny4uMjEzMzUyODdkM2RlNWUyNzVk NjNmYWIxMmQwNDI3NTM4Mzc4OWUwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAKQEAgLTI4MCwx MiArMjgwLDYgQEAgdm9pZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnNldFBhZ2VJdGVt UmVjdFZpc2libGUoY29uc3QgUVJlY3RGJiBpdGVtUmVjdCkKICAgICBtX3ZpZXdwb3J0SXRlbS0+ c2V0Q29udGVudFBvcyhuZXdQb3NpdGlvbik7CiB9CiAKLS8vIEVhc2Ugb3V0IG92ZXJzaG9vdCBv ZiAxLjI1IGNvbWJpbmVkIHdpdGggZWFzZSBpbiBjb3JyZWN0aW9uIG9mIDAuMjUuIEJvdGggcXVh ZHJhdGljIHRvIGhhdmUgcGh5c2ljYWwgbW90aW9uLgotc3RhdGljIHFyZWFsIHBoeXNpY2FsT3Zl cnNob290KHFyZWFsIHQpCi17Ci0gICAgcmV0dXJuICgtdCAqICh0IC0gMikpICogMS4yNSAtICh0 ICogdCkgKiAwLjI1OwotfQotCiB2b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6YW5p bWF0ZVBhZ2VJdGVtUmVjdFZpc2libGUoY29uc3QgUVJlY3RGJiBpdGVtUmVjdCkKIHsKICAgICBB U1NFUlQobV9zY2FsZUFuaW1hdGlvbi0+c3RhdGUoKSA9PSBRQWJzdHJhY3RBbmltYXRpb246OlN0 b3BwZWQpOwpAQCAtMjk4LDEwICsyOTIsOCBAQCB2b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVu Z2luZTo6YW5pbWF0ZVBhZ2VJdGVtUmVjdFZpc2libGUoY29uc3QgUVJlY3RGJiBpdGVtUgogICAg IGlmIChpdGVtUmVjdCA9PSBjdXJyZW50UGFnZUl0ZW1SZWN0VmlzaWJsZSkKICAgICAgICAgcmV0 dXJuOwogCi0gICAgUUVhc2luZ0N1cnZlIGVhc2luZ0N1cnZlOwotICAgIGVhc2luZ0N1cnZlLnNl dEN1c3RvbVR5cGUocGh5c2ljYWxPdmVyc2hvb3QpOwotCiAgICAgbV9zY2FsZUFuaW1hdGlvbi0+ c2V0RHVyYXRpb24oa1NjYWxlQW5pbWF0aW9uRHVyYXRpb25NaWxsaXMpOworICAgIG1fc2NhbGVB bmltYXRpb24tPnNldEVhc2luZ0N1cnZlKFFFYXNpbmdDdXJ2ZTo6T3V0Q3ViaWMpOwogICAgIG1f c2NhbGVBbmltYXRpb24tPnNldEVhc2luZ0N1cnZlKGVhc2luZ0N1cnZlKTsKIAogICAgIG1fc2Nh bGVBbmltYXRpb24tPnNldFN0YXJ0VmFsdWUoY3VycmVudFBhZ2VJdGVtUmVjdFZpc2libGUpOwo= 145568 2012-06-04 05:36:00 -0700 2012-06-04 06:15:20 -0700 Patch bug-87108-20120604143609.patch text/plain 2268 allan.jensen U3VidmVyc2lvbiBSZXZpc2lvbjogMTE5MzczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYjhjMDg2ZjhmNzBjNmFl NzZjNzBjZTEyYWFiYTQzMWQzZjZkOWY4OS4uMWYwODUzYTEzODk2ODE5ZDVkYTBjNTM2MjI4NDUy MGNhYjE4YmFmZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEyLTA2LTA0ICBBbGxh biBTYW5kZmVsZCBKZW5zZW4gIDxhbGxhbi5qZW5zZW5Abm9raWEuY29tPgorCisgICAgICAgIFtR dF0gVGFwLXRvLXpvb20gb3ZlcnNob290IGFuaW1hdGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg3MTA4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmV2ZXJ0cyB0aGUgY2hhbmdlIGluIGFuaW1hdGlv biwgc28gdGhlIGRlZmF1bHQgaXMgbW9yZSAibmV1dHJhbCIuCisgICAgICAgIFRoaXMgc2hvdWxk IGJlIG1hZGUgY29uZmlndXJhYmxlIGxhdGVyLgorCisgICAgICAgICogVUlQcm9jZXNzL3F0L1F0 Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlF0Vmlld3Bv cnRJbnRlcmFjdGlvbkVuZ2luZTo6YW5pbWF0ZVBhZ2VJdGVtUmVjdFZpc2libGUpOgorCiAyMDEy LTA2LTAyICBHZW9mZnJleSBHYXJlbiAgPGdnYXJlbkBhcHBsZS5jb20+CiAKICAgICAgICAgVHJ5 IHRvIGZpeCB0aGUgV2luZG93cyBidWlsZC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9xdC9RdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmUuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAKaW5kZXggMDUz YWZmZjI5ZjUyMmZmNWJiMTViZjdlZGNmYzcwYzU0ZGQzODU2Ny4uNzhmZmY4MmVkNzIwMzdjNzQw YWQzYmUyYzJmNDZiOTc0NmQ2Y2NjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAKKysrIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL3F0L1F0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZS5jcHAKQEAgLTI4MCwx MiArMjgwLDYgQEAgdm9pZCBRdFZpZXdwb3J0SW50ZXJhY3Rpb25FbmdpbmU6OnNldFBhZ2VJdGVt UmVjdFZpc2libGUoY29uc3QgUVJlY3RGJiBpdGVtUmVjdCkKICAgICBtX3ZpZXdwb3J0SXRlbS0+ c2V0Q29udGVudFBvcyhuZXdQb3NpdGlvbik7CiB9CiAKLS8vIEVhc2Ugb3V0IG92ZXJzaG9vdCBv ZiAxLjI1IGNvbWJpbmVkIHdpdGggZWFzZSBpbiBjb3JyZWN0aW9uIG9mIDAuMjUuIEJvdGggcXVh ZHJhdGljIHRvIGhhdmUgcGh5c2ljYWwgbW90aW9uLgotc3RhdGljIHFyZWFsIHBoeXNpY2FsT3Zl cnNob290KHFyZWFsIHQpCi17Ci0gICAgcmV0dXJuICgtdCAqICh0IC0gMikpICogMS4yNSAtICh0 ICogdCkgKiAwLjI1OwotfQotCiB2b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVuZ2luZTo6YW5p bWF0ZVBhZ2VJdGVtUmVjdFZpc2libGUoY29uc3QgUVJlY3RGJiBpdGVtUmVjdCkKIHsKICAgICBB U1NFUlQobV9zY2FsZUFuaW1hdGlvbi0+c3RhdGUoKSA9PSBRQWJzdHJhY3RBbmltYXRpb246OlN0 b3BwZWQpOwpAQCAtMjk4LDExICsyOTIsOCBAQCB2b2lkIFF0Vmlld3BvcnRJbnRlcmFjdGlvbkVu Z2luZTo6YW5pbWF0ZVBhZ2VJdGVtUmVjdFZpc2libGUoY29uc3QgUVJlY3RGJiBpdGVtUgogICAg IGlmIChpdGVtUmVjdCA9PSBjdXJyZW50UGFnZUl0ZW1SZWN0VmlzaWJsZSkKICAgICAgICAgcmV0 dXJuOwogCi0gICAgUUVhc2luZ0N1cnZlIGVhc2luZ0N1cnZlOwotICAgIGVhc2luZ0N1cnZlLnNl dEN1c3RvbVR5cGUocGh5c2ljYWxPdmVyc2hvb3QpOwotCiAgICAgbV9zY2FsZUFuaW1hdGlvbi0+ c2V0RHVyYXRpb24oa1NjYWxlQW5pbWF0aW9uRHVyYXRpb25NaWxsaXMpOwotICAgIG1fc2NhbGVB bmltYXRpb24tPnNldEVhc2luZ0N1cnZlKGVhc2luZ0N1cnZlKTsKKyAgICBtX3NjYWxlQW5pbWF0 aW9uLT5zZXRFYXNpbmdDdXJ2ZShRRWFzaW5nQ3VydmU6Ok91dEN1YmljKTsKIAogICAgIG1fc2Nh bGVBbmltYXRpb24tPnNldFN0YXJ0VmFsdWUoY3VycmVudFBhZ2VJdGVtUmVjdFZpc2libGUpOwog ICAgIG1fc2NhbGVBbmltYXRpb24tPnNldEVuZFZhbHVlKGl0ZW1SZWN0KTsK