100673 2012-10-29 07:52:03 -0700 [Qt] Animations jump when the page is suspended 2012-10-30 10:08:28 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Qt P3 Normal --- 100769 1 jturcotte noam jturcotte noam ossy rafael.lobo webkit.review.bot oldest_to_newest 753446 0 jturcotte 2012-10-29 07:52:03 -0700 In the leaves and poster circle demos in MiniBrowser, starting to pan the page shows a completely out of sync frame while the page is suspended. The animation resumes correctly at its previous position when the page is resumed. 753460 1 noam 2012-10-29 08:06:07 -0700 Are you looking at this, or should I? 753463 2 jturcotte 2012-10-29 08:11:28 -0700 I didn't investigate yet, I'll do if you don't. 753471 3 noam 2012-10-29 08:32:13 -0700 I'll take a look today. 753791 4 171318 noam 2012-10-29 15:04:05 -0700 Created attachment 171318 Patch 753862 5 171318 rafael.lobo 2012-10-29 16:43:05 -0700 Comment on attachment 171318 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=171318&action=review I have a few comments. :-) > Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp:265 > +void GraphicsLayerAnimation::pause(double pauseTime) I think domTime/documentTime would make more clear what kind of time unit we expect here. Isn't "pauseTime" is already implicit? > Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp:267 > // FIXME: should apply offset here. Do we need this comment? > Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp:811 > + m_lastAnimationStartTime = WTF::currentTime() - timeOffset; Is timeOffset the starting time for WebProcess? I still have to trouble to follow the logic of those offsets. :-( 753864 6 rafael.lobo 2012-10-29 16:44:01 -0700 Meh, sorry for all the typos on last message. :-( 753870 7 171336 noam 2012-10-29 16:48:57 -0700 Created attachment 171336 Patch 753873 8 noam 2012-10-29 16:50:33 -0700 (In reply to comment #5) > I think domTime/documentTime would make more clear what kind of time unit we expect here. Isn't "pauseTime" is already implicit? Yes, it is :) > > Source/WebCore/platform/graphics/GraphicsLayerAnimation.cpp:267 > > // FIXME: should apply offset here. > > Do we need this comment? No, we don't :) > > > Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp:811 > > + m_lastAnimationStartTime = WTF::currentTime() - timeOffset; > > Is timeOffset the starting time for WebProcess? I still have to trouble to follow the logic of those offsets. :-( These offsets are for animation delay. For some reason we receive them here as "negative delay" - it's the actual delay, but that time has already passed. I renamed it to delayAsNegativeTimeOffset, any better suggestion? 753889 9 rafael.lobo 2012-10-29 17:13:10 -0700 > > > Source/WebKit2/WebProcess/WebPage/CoordinatedGraphics/CoordinatedGraphicsLayer.cpp:811 > > > + m_lastAnimationStartTime = WTF::currentTime() - timeOffset; > > > > Is timeOffset the starting time for WebProcess? I still have to trouble to follow the logic of those offsets. :-( > > These offsets are for animation delay. For some reason we receive them here as "negative delay" - it's the actual delay, but that time has already passed. I renamed it to delayAsNegativeTimeOffset, any better suggestion? Hmm, I think your suggestion sounds awesome! :-D 754339 10 171336 webkit.review.bot 2012-10-30 07:11:48 -0700 Comment on attachment 171336 Patch Clearing flags on attachment: 171336 Committed r132907: <http://trac.webkit.org/changeset/132907> 754340 11 webkit.review.bot 2012-10-30 07:11:52 -0700 All reviewed patches have been landed. Closing bug. 754470 12 ossy 2012-10-30 10:08:28 -0700 (In reply to comment #10) > (From update of attachment 171336 [details]) > Clearing flags on attachment: 171336 > > Committed r132907: <http://trac.webkit.org/changeset/132907> It caused a regression - https://bugs.webkit.org/show_bug.cgi?id=100769 Could you check it please? 171318 2012-10-29 15:04:05 -0700 2012-10-29 16:48:53 -0700 Patch bug-100673-20121029150129.patch text/plain 5353 noam U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyODQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWRkYTkyNzg4NzkzMjdm MjIxNmNiZWI1OTM1NDdkMDgzMDQxNGJkNS4uZTFmYzJkYjFiYjEyYTczNTA4ZTFhYzE5YjBhOGM0 ZWI2NGE0N2IzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTEwLTI5ICBObydh bSBSb3NlbnRoYWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CisKKyAgICAgICAgW1F0XSBB bmltYXRpb25zIGp1bXAgd2hlbiB0aGUgcGFnZSBpcyBzdXNwZW5kZWQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDY3MworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdyYXBoaWNzTGF5ZXJBbmltYXRpb25z OjpwYXVzZSgpIHNob3VsZCBhY2NlcHQgdGltZSBmcm9tIHN0YXJ0IGFuZCBub3QgYW4gb2Zmc2V0 LgorCisgICAgICAgIFdlIG5lZWQgdG8gc3VwcG9ydCB0aGUgImZyZWV6ZSIgQVBJIGJlZm9yZSB0 aGlzIGNhbiBiZSByZWxpYWJseSB0ZXN0ZWQuCisgICAgICAgIFNlZSBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAwNzAzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvR3JhcGhpY3NMYXllckFuaW1hdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFw aGljc0xheWVyQW5pbWF0aW9uOjpwYXVzZSk6CisKIDIwMTItMTAtMjkgIEVyaWMgQ2FybHNvbiAg PGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgU3VwcG9ydCBjYXB0aW9ucyB3aGVu IFBMVUdJTl9QUk9YWV9GT1JfVklERU8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA1MjBhMGUyNzMzNDZhYzdhMmZi MjY2MGFlYmZjOTExYThlMjI2Y2I0Li4xMGEyYTA5Nzg5MDg2MDYyYzFlNzMzMWU4Y2VjMTk3NjZi ZmNjOTk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTItMTAtMjkgIE5vJ2FtIFJv c2VudGhhbCAgPG5vYW0ucm9zZW50aGFsQG5va2lhLmNvbT4KKworICAgICAgICBbUXRdIEFuaW1h dGlvbnMganVtcCB3aGVuIHRoZSBwYWdlIGlzIHN1c3BlbmRlZAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAwNjczCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgR3JhcGhpY3NMYXllckFuaW1hdGlvbnM6OnBh dXNlKCkgc2hvdWxkIGFjY2VwdCB0aW1lIGZyb20gc3RhcnQgYW5kIG5vdCBhbiBvZmZzZXQuCisK KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGlu YXRlZEdyYXBoaWNzTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29vcmRpbmF0ZWRHcmFw aGljc0xheWVyOjphZGRBbmltYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6Q29vcmRpbmF0ZWRH cmFwaGljc0xheWVyOjpwYXVzZUFuaW1hdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpDb29yZGlu YXRlZEdyYXBoaWNzTGF5ZXI6OmFuaW1hdGlvblN0YXJ0ZWRUaW1lckZpcmVkKToKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdyYXBo aWNzTGF5ZXIuaDoKKyAgICAgICAgKENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcik6CisKIDIwMTIt MTAtMjkgIE1pY2hhZWwgU2Fib2ZmICA8bXNhYm9mZkBhcHBsZS5jb20+CiAKICAgICAgICAgYnVp bGRIVFRQSGVhZGVycygpIHNob3VsZCB1c2UgYSBTdHJpbmdCdWlsZGVyLmFwcGVuZExpdGVyYWwo KSBmb3Igc2VwYXJhdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9HcmFwaGljc0xheWVyQW5pbWF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXJBbmltYXRpb24uY3BwCmluZGV4IDJkZjMwMGU5YTQwMDJk YmQ4MzAxYzAyNjhhNzhmMmIxZmEyZWZiMjguLmUzODk1NjlhZjNjOTdmZGUzYzFiM2FiNWJmY2U3 NjY2MGQ5ZTZmODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0dyYXBoaWNzTGF5ZXJBbmltYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXJBbmltYXRpb24uY3BwCkBAIC0yNjIsMTEgKzI2MiwxMSBA QCB2b2lkIEdyYXBoaWNzTGF5ZXJBbmltYXRpb246OmFwcGx5KENsaWVudCogY2xpZW50KQogICAg IH0KIH0KIAotdm9pZCBHcmFwaGljc0xheWVyQW5pbWF0aW9uOjpwYXVzZShkb3VibGUgb2Zmc2V0 KQordm9pZCBHcmFwaGljc0xheWVyQW5pbWF0aW9uOjpwYXVzZShkb3VibGUgcGF1c2VUaW1lKQog ewogICAgIC8vIEZJWE1FOiBzaG91bGQgYXBwbHkgb2Zmc2V0IGhlcmUuCiAgICAgc2V0U3RhdGUo UGF1c2VkU3RhdGUpOwotICAgIG1fcGF1c2VUaW1lID0gV1RGOjpjdXJyZW50VGltZSgpIC0gb2Zm c2V0OworICAgIG1fcGF1c2VUaW1lID0gcGF1c2VUaW1lOwogfQogCiB2b2lkIEdyYXBoaWNzTGF5 ZXJBbmltYXRpb25zOjphZGQoY29uc3QgR3JhcGhpY3NMYXllckFuaW1hdGlvbiYgYW5pbWF0aW9u KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5h dGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmNwcCBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhp Y3NMYXllci5jcHAKaW5kZXggZTk4MDgwOGQ1ZTJmMmFmNjNiYmUyNmY1ZTczNDk4OTg2ZTQ5MTcx Zi4uYjJmMWRlNWU5ZDBiODc5Y2NmNjQ4NGJhOWI5ZjNkODMwZTUyYjNmMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29v cmRpbmF0ZWRHcmFwaGljc0xheWVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNz L1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3Bw CkBAIC04MDgsMTUgKzgwOCwxNiBAQCBib29sIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6YWRk QW5pbWF0aW9uKGNvbnN0IEtleWZyYW1lVmFsdWVMaXN0JiB2YWx1ZUxpc3QsCiAgICAgaWYgKHZh bHVlTGlzdC5wcm9wZXJ0eSgpID09IEFuaW1hdGVkUHJvcGVydHlXZWJraXRUcmFuc2Zvcm0pCiAg ICAgICAgIGxpc3RzTWF0Y2ggPSB2YWxpZGF0ZVRyYW5zZm9ybU9wZXJhdGlvbnModmFsdWVMaXN0 LCBpZ25vcmVkSGFzQmlnUm90YXRpb24pID49IDA7CiAKLSAgICBtX2FuaW1hdGlvbnMuYWRkKEdy YXBoaWNzTGF5ZXJBbmltYXRpb24oa2V5ZnJhbWVzTmFtZSwgdmFsdWVMaXN0LCBib3hTaXplLCBh bmltLCBXVEY6OmN1cnJlbnRUaW1lKCkgLSB0aW1lT2Zmc2V0LCBsaXN0c01hdGNoKSk7CisgICAg bV9sYXN0QW5pbWF0aW9uU3RhcnRUaW1lID0gV1RGOjpjdXJyZW50VGltZSgpIC0gdGltZU9mZnNl dDsKKyAgICBtX2FuaW1hdGlvbnMuYWRkKEdyYXBoaWNzTGF5ZXJBbmltYXRpb24oa2V5ZnJhbWVz TmFtZSwgdmFsdWVMaXN0LCBib3hTaXplLCBhbmltLCBtX2xhc3RBbmltYXRpb25TdGFydFRpbWUs IGxpc3RzTWF0Y2gpKTsKICAgICBtX2FuaW1hdGlvblN0YXJ0ZWRUaW1lci5zdGFydE9uZVNob3Qo MCk7CiAgICAgZGlkQ2hhbmdlQW5pbWF0aW9ucygpOwogICAgIHJldHVybiB0cnVlOwogfQogCi12 b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6cGF1c2VBbmltYXRpb24oY29uc3QgU3RyaW5n JiBhbmltYXRpb25OYW1lLCBkb3VibGUgdGltZU9mZnNldCkKK3ZvaWQgQ29vcmRpbmF0ZWRHcmFw aGljc0xheWVyOjpwYXVzZUFuaW1hdGlvbihjb25zdCBTdHJpbmcmIGFuaW1hdGlvbk5hbWUsIGRv dWJsZSBkb21UaW1lKQogewotICAgIG1fYW5pbWF0aW9ucy5wYXVzZShhbmltYXRpb25OYW1lLCB0 aW1lT2Zmc2V0KTsKKyAgICBtX2FuaW1hdGlvbnMucGF1c2UoYW5pbWF0aW9uTmFtZSwgZG9tVGlt ZSk7CiAgICAgZGlkQ2hhbmdlQW5pbWF0aW9ucygpOwogfQogCkBAIC04MjgsNyArODI5LDcgQEAg dm9pZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnJlbW92ZUFuaW1hdGlvbihjb25zdCBTdHJp bmcmIGFuaW1hdGlvbk5hbWUpCiAKIHZvaWQgQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyOjphbmlt YXRpb25TdGFydGVkVGltZXJGaXJlZChUaW1lcjxDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI+KikK IHsKLSAgICBjbGllbnQoKS0+bm90aWZ5QW5pbWF0aW9uU3RhcnRlZCh0aGlzLCAvKiBET00gdGlt ZSAqLyBXVEY6OmN1cnJlbnRUaW1lKCkpOworICAgIGNsaWVudCgpLT5ub3RpZnlBbmltYXRpb25T dGFydGVkKHRoaXMsIG1fbGFzdEFuaW1hdGlvblN0YXJ0VGltZSk7CiB9CiB9CiAjZW5kaWYKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9Db29yZGluYXRlZEdy YXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJv Y2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVy LmgKaW5kZXggZDZjMmMzOTFmNDM1Yzc3MDFjNmNhYjVkZTNhYzdmNTJmN2Q2ZGFiNS4uODI2ZGY2 ZGIxYWRlOTkzZjNmZDMwNDUzNjBjMzJlYTVjOGUzODFmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRH cmFwaGljc0xheWVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nv b3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmgKQEAgLTIyMCw2ICsy MjAsNyBAQCBwcml2YXRlOgogICAgIFBsYXRmb3JtTGF5ZXIqIG1fY2FudmFzUGxhdGZvcm1MYXll cjsKICAgICBUaW1lcjxDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI+IG1fYW5pbWF0aW9uU3RhcnRl ZFRpbWVyOwogICAgIEdyYXBoaWNzTGF5ZXJBbmltYXRpb25zIG1fYW5pbWF0aW9uczsKKyAgICBk b3VibGUgbV9sYXN0QW5pbWF0aW9uU3RhcnRUaW1lOwogfTsKIAogQ29vcmRpbmF0ZWRHcmFwaGlj c0xheWVyKiB0b0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllcihHcmFwaGljc0xheWVyKik7Cg== 171336 2012-10-29 16:48:57 -0700 2012-10-30 07:11:48 -0700 Patch bug-100673-20121029164620.patch text/plain 5878 noam U3VidmVyc2lvbiBSZXZpc2lvbjogMTMyODQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWRkYTkyNzg4NzkzMjdm MjIxNmNiZWI1OTM1NDdkMDgzMDQxNGJkNS4uZTFmYzJkYjFiYjEyYTczNTA4ZTFhYzE5YjBhOGM0 ZWI2NGE0N2IzZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTEwLTI5ICBObydh bSBSb3NlbnRoYWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CisKKyAgICAgICAgW1F0XSBB bmltYXRpb25zIGp1bXAgd2hlbiB0aGUgcGFnZSBpcyBzdXNwZW5kZWQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMDY3MworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEdyYXBoaWNzTGF5ZXJBbmltYXRpb25z OjpwYXVzZSgpIHNob3VsZCBhY2NlcHQgdGltZSBmcm9tIHN0YXJ0IGFuZCBub3QgYW4gb2Zmc2V0 LgorCisgICAgICAgIFdlIG5lZWQgdG8gc3VwcG9ydCB0aGUgImZyZWV6ZSIgQVBJIGJlZm9yZSB0 aGlzIGNhbiBiZSByZWxpYWJseSB0ZXN0ZWQuCisgICAgICAgIFNlZSBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAwNzAzLgorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvR3JhcGhpY3NMYXllckFuaW1hdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFw aGljc0xheWVyQW5pbWF0aW9uOjpwYXVzZSk6CisKIDIwMTItMTAtMjkgIEVyaWMgQ2FybHNvbiAg PGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgU3VwcG9ydCBjYXB0aW9ucyB3aGVu IFBMVUdJTl9QUk9YWV9GT1JfVklERU8KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCA1MjBhMGUyNzMzNDZhYzdhMmZi MjY2MGFlYmZjOTExYThlMjI2Y2I0Li4xMGEyYTA5Nzg5MDg2MDYyYzFlNzMzMWU4Y2VjMTk3NjZi ZmNjOTk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNl L1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTItMTAtMjkgIE5vJ2FtIFJv c2VudGhhbCAgPG5vYW0ucm9zZW50aGFsQG5va2lhLmNvbT4KKworICAgICAgICBbUXRdIEFuaW1h dGlvbnMganVtcCB3aGVuIHRoZSBwYWdlIGlzIHN1c3BlbmRlZAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTAwNjczCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgR3JhcGhpY3NMYXllckFuaW1hdGlvbnM6OnBh dXNlKCkgc2hvdWxkIGFjY2VwdCB0aW1lIGZyb20gc3RhcnQgYW5kIG5vdCBhbiBvZmZzZXQuCisK KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGlu YXRlZEdyYXBoaWNzTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29vcmRpbmF0ZWRHcmFw aGljc0xheWVyOjphZGRBbmltYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6Q29vcmRpbmF0ZWRH cmFwaGljc0xheWVyOjpwYXVzZUFuaW1hdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpDb29yZGlu YXRlZEdyYXBoaWNzTGF5ZXI6OmFuaW1hdGlvblN0YXJ0ZWRUaW1lckZpcmVkKToKKyAgICAgICAg KiBXZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdyYXBo aWNzTGF5ZXIuaDoKKyAgICAgICAgKENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcik6CisKIDIwMTIt MTAtMjkgIE1pY2hhZWwgU2Fib2ZmICA8bXNhYm9mZkBhcHBsZS5jb20+CiAKICAgICAgICAgYnVp bGRIVFRQSGVhZGVycygpIHNob3VsZCB1c2UgYSBTdHJpbmdCdWlsZGVyLmFwcGVuZExpdGVyYWwo KSBmb3Igc2VwYXJhdG9yCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9HcmFwaGljc0xheWVyQW5pbWF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXJBbmltYXRpb24uY3BwCmluZGV4IDJkZjMwMGU5YTQwMDJk YmQ4MzAxYzAyNjhhNzhmMmIxZmEyZWZiMjguLjJjMDZhODY3MDcwM2YxODQ4YTIwNTljZTJmOTc0 OTdhYzkyYmNjNTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L0dyYXBoaWNzTGF5ZXJBbmltYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL0dyYXBoaWNzTGF5ZXJBbmltYXRpb24uY3BwCkBAIC0yNjIsMTEgKzI2MiwxMCBA QCB2b2lkIEdyYXBoaWNzTGF5ZXJBbmltYXRpb246OmFwcGx5KENsaWVudCogY2xpZW50KQogICAg IH0KIH0KIAotdm9pZCBHcmFwaGljc0xheWVyQW5pbWF0aW9uOjpwYXVzZShkb3VibGUgb2Zmc2V0 KQordm9pZCBHcmFwaGljc0xheWVyQW5pbWF0aW9uOjpwYXVzZShkb3VibGUgdGltZSkKIHsKLSAg ICAvLyBGSVhNRTogc2hvdWxkIGFwcGx5IG9mZnNldCBoZXJlLgogICAgIHNldFN0YXRlKFBhdXNl ZFN0YXRlKTsKLSAgICBtX3BhdXNlVGltZSA9IFdURjo6Y3VycmVudFRpbWUoKSAtIG9mZnNldDsK KyAgICBtX3BhdXNlVGltZSA9IHRpbWU7CiB9CiAKIHZvaWQgR3JhcGhpY3NMYXllckFuaW1hdGlv bnM6OmFkZChjb25zdCBHcmFwaGljc0xheWVyQW5pbWF0aW9uJiBhbmltYXRpb24pCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGlj cy9Db29yZGluYXRlZEdyYXBoaWNzTGF5ZXIuY3BwIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmNw cAppbmRleCBlOTgwODA4ZDVlMmYyYWY2M2JiZTI2ZjVlNzM0OTg5ODZlNDkxNzFmLi5mNjQ3YzRl YjJiOTUwZDE2NDNkY2JkYjYwNjA0ZDg0ZDMyNzBlOWE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZEdy YXBoaWNzTGF5ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9D b29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5jcHAKQEAgLTc5NSw3 ICs3OTUsNyBAQCBib29sIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6c2VsZk9yQW5jZXN0b3JI YXZlTm9uQWZmaW5lVHJhbnNmb3JtcygpCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi1ib29sIENv b3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6YWRkQW5pbWF0aW9uKGNvbnN0IEtleWZyYW1lVmFsdWVM aXN0JiB2YWx1ZUxpc3QsIGNvbnN0IEludFNpemUmIGJveFNpemUsIGNvbnN0IEFuaW1hdGlvbiog YW5pbSwgY29uc3QgU3RyaW5nJiBrZXlmcmFtZXNOYW1lLCBkb3VibGUgdGltZU9mZnNldCkKK2Jv b2wgQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyOjphZGRBbmltYXRpb24oY29uc3QgS2V5ZnJhbWVW YWx1ZUxpc3QmIHZhbHVlTGlzdCwgY29uc3QgSW50U2l6ZSYgYm94U2l6ZSwgY29uc3QgQW5pbWF0 aW9uKiBhbmltLCBjb25zdCBTdHJpbmcmIGtleWZyYW1lc05hbWUsIGRvdWJsZSBkZWxheUFzTmVn YXRpdmVUaW1lT2Zmc2V0KQogewogICAgIEFTU0VSVCgha2V5ZnJhbWVzTmFtZS5pc0VtcHR5KCkp OwogCkBAIC04MDgsMTUgKzgwOCwxNiBAQCBib29sIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6 YWRkQW5pbWF0aW9uKGNvbnN0IEtleWZyYW1lVmFsdWVMaXN0JiB2YWx1ZUxpc3QsCiAgICAgaWYg KHZhbHVlTGlzdC5wcm9wZXJ0eSgpID09IEFuaW1hdGVkUHJvcGVydHlXZWJraXRUcmFuc2Zvcm0p CiAgICAgICAgIGxpc3RzTWF0Y2ggPSB2YWxpZGF0ZVRyYW5zZm9ybU9wZXJhdGlvbnModmFsdWVM aXN0LCBpZ25vcmVkSGFzQmlnUm90YXRpb24pID49IDA7CiAKLSAgICBtX2FuaW1hdGlvbnMuYWRk KEdyYXBoaWNzTGF5ZXJBbmltYXRpb24oa2V5ZnJhbWVzTmFtZSwgdmFsdWVMaXN0LCBib3hTaXpl LCBhbmltLCBXVEY6OmN1cnJlbnRUaW1lKCkgLSB0aW1lT2Zmc2V0LCBsaXN0c01hdGNoKSk7Cisg ICAgbV9sYXN0QW5pbWF0aW9uU3RhcnRUaW1lID0gV1RGOjpjdXJyZW50VGltZSgpIC0gZGVsYXlB c05lZ2F0aXZlVGltZU9mZnNldDsKKyAgICBtX2FuaW1hdGlvbnMuYWRkKEdyYXBoaWNzTGF5ZXJB bmltYXRpb24oa2V5ZnJhbWVzTmFtZSwgdmFsdWVMaXN0LCBib3hTaXplLCBhbmltLCBtX2xhc3RB bmltYXRpb25TdGFydFRpbWUsIGxpc3RzTWF0Y2gpKTsKICAgICBtX2FuaW1hdGlvblN0YXJ0ZWRU aW1lci5zdGFydE9uZVNob3QoMCk7CiAgICAgZGlkQ2hhbmdlQW5pbWF0aW9ucygpOwogICAgIHJl dHVybiB0cnVlOwogfQogCi12b2lkIENvb3JkaW5hdGVkR3JhcGhpY3NMYXllcjo6cGF1c2VBbmlt YXRpb24oY29uc3QgU3RyaW5nJiBhbmltYXRpb25OYW1lLCBkb3VibGUgdGltZU9mZnNldCkKK3Zv aWQgQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyOjpwYXVzZUFuaW1hdGlvbihjb25zdCBTdHJpbmcm IGFuaW1hdGlvbk5hbWUsIGRvdWJsZSB0aW1lKQogewotICAgIG1fYW5pbWF0aW9ucy5wYXVzZShh bmltYXRpb25OYW1lLCB0aW1lT2Zmc2V0KTsKKyAgICBtX2FuaW1hdGlvbnMucGF1c2UoYW5pbWF0 aW9uTmFtZSwgdGltZSk7CiAgICAgZGlkQ2hhbmdlQW5pbWF0aW9ucygpOwogfQogCkBAIC04Mjgs NyArODI5LDcgQEAgdm9pZCBDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI6OnJlbW92ZUFuaW1hdGlv bihjb25zdCBTdHJpbmcmIGFuaW1hdGlvbk5hbWUpCiAKIHZvaWQgQ29vcmRpbmF0ZWRHcmFwaGlj c0xheWVyOjphbmltYXRpb25TdGFydGVkVGltZXJGaXJlZChUaW1lcjxDb29yZGluYXRlZEdyYXBo aWNzTGF5ZXI+KikKIHsKLSAgICBjbGllbnQoKS0+bm90aWZ5QW5pbWF0aW9uU3RhcnRlZCh0aGlz LCAvKiBET00gdGltZSAqLyBXVEY6OmN1cnJlbnRUaW1lKCkpOworICAgIGNsaWVudCgpLT5ub3Rp ZnlBbmltYXRpb25TdGFydGVkKHRoaXMsIG1fbGFzdEFuaW1hdGlvblN0YXJ0VGltZSk7CiB9CiB9 CiAjZW5kaWYKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9D b29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllci5oIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRH cmFwaGljc0xheWVyLmgKaW5kZXggZDZjMmMzOTFmNDM1Yzc3MDFjNmNhYjVkZTNhYzdmNTJmN2Q2 ZGFiNS4uODI2ZGY2ZGIxYWRlOTkzZjNmZDMwNDUzNjBjMzJlYTVjOGUzODFmNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3Mv Q29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vz cy9XZWJQYWdlL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyLmgK QEAgLTIyMCw2ICsyMjAsNyBAQCBwcml2YXRlOgogICAgIFBsYXRmb3JtTGF5ZXIqIG1fY2FudmFz UGxhdGZvcm1MYXllcjsKICAgICBUaW1lcjxDb29yZGluYXRlZEdyYXBoaWNzTGF5ZXI+IG1fYW5p bWF0aW9uU3RhcnRlZFRpbWVyOwogICAgIEdyYXBoaWNzTGF5ZXJBbmltYXRpb25zIG1fYW5pbWF0 aW9uczsKKyAgICBkb3VibGUgbV9sYXN0QW5pbWF0aW9uU3RhcnRUaW1lOwogfTsKIAogQ29vcmRp bmF0ZWRHcmFwaGljc0xheWVyKiB0b0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllcihHcmFwaGljc0xh eWVyKik7Cg==