84519 2012-04-20 19:10:36 -0700 [chromium] Animations waiting for a synchronized start time should never be marked finished. 2012-04-25 07:15:55 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 vollick vollick cc-bugs epenner jamesr nduca webkit.review.bot oldest_to_newest 607136 0 vollick 2012-04-20 19:10:36 -0700 Currently, when a main-thread animation is waiting for its impl-thread counterpart to start animating, it still gets ticked and at each tick considers the normalized time (current time - start time) to be zero. That is, it pauses at the first keyframe. The problem is that if (current time - start time) > duration, then we consider the animation finished and remove it. This is invalid if the animation is waiting for a start time from the impl-thread: it hasn't really started at all. So in ::tickAnimations, we must not consider an animation finished if it is waiting for a synchronized start time. 607137 1 138216 vollick 2012-04-20 19:22:47 -0700 Created attachment 138216 Patch 607138 2 138216 nduca 2012-04-20 19:26:42 -0700 Comment on attachment 138216 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=138216&action=review Nice. Might tweak the phrasing but LGTM. > Source/WebKit/chromium/tests/CCLayerAnimationControllerTest.cpp:193 > +// Tests animations that are waiting for a synchronized start time do not finish. DoNotFinishIfTheyWaitLongerToStartThanTheirDuration? 607139 3 138217 vollick 2012-04-20 19:38:01 -0700 Created attachment 138217 Patch (In reply to comment #2) > (From update of attachment 138216 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=138216&action=review > > Nice. Might tweak the phrasing but LGTM. > > > Source/WebKit/chromium/tests/CCLayerAnimationControllerTest.cpp:193 > > +// Tests animations that are waiting for a synchronized start time do not finish. > > DoNotFinishIfTheyWaitLongerToStartThanTheirDuration? Done. I think I may have broken some sort of record with this test name. :) 607878 4 epenner 2012-04-23 11:34:52 -0700 Confirmed this fixes the issue. Thanks! 609382 5 138217 jamesr 2012-04-24 19:08:44 -0700 Comment on attachment 138217 Patch r=me 609727 6 138217 webkit.review.bot 2012-04-25 07:15:45 -0700 Comment on attachment 138217 Patch Clearing flags on attachment: 138217 Committed r115202: <http://trac.webkit.org/changeset/115202> 609728 7 webkit.review.bot 2012-04-25 07:15:55 -0700 All reviewed patches have been landed. Closing bug. 138216 2012-04-20 19:22:47 -0700 2012-04-20 19:37:56 -0700 Patch bug-84519-20120420222246.patch text/plain 5569 vollick U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0NTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTI5YzlhYThiZDNhOWYz NzY5YjNmZGJlNjVmMDZiOWVlOWEwMDI0OS4uYjI2OTg4Nzk0MjdjZDU4YTVjNWM5NDg5ZWJiNWVm Yjg4MzI3ZGVmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA0LTIwICBJYW4g Vm9sbGljayAgPHZvbGxpY2tAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gQW5p bWF0aW9ucyB3YWl0aW5nIGZvciBhIHN5bmNocm9uaXplZCBzdGFydCB0aW1lIHNob3VsZCBuZXZl ciBiZSBtYXJrZWQgZmluaXNoZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD04NDUxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRlc3RlZCBpbiBDQ0xheWVyQW5pbWF0aW9uQ29udHJvbGxlclRlc3QuQW5p bWF0aW9uc1dhaXRpbmdGb3JTdGFydFRpbWVEb05vdEZpbmlzaAorCisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6Q0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXI6OnRpY2tBbmltYXRp b25zKToKKwogMjAxMi0wNC0xOCAgTWFyayBQaWxncmltICA8cGlsZ3JpbUBjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgRm9sbG93dXAgdG8gIkNhbGwgaW5jcmVtZW50U3RhdHNDb3VudGVyIGRpcmVj dGx5IgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwppbmRleCA0NjkxOWU0ZDkzZTc0Yjc4YWMwNDM3 ZjA4Njc4MDcxNDZmYjgxMzQzLi43NDc4N2FhNTUwZTBjOTUzYTEwZjQ0YTQwNzBlYmFhNWQ5NTE4 MmQ0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDEyLTA0 LTIwICBJYW4gVm9sbGljayAgPHZvbGxpY2tAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJv bWl1bV0gQW5pbWF0aW9ucyB3YWl0aW5nIGZvciBhIHN5bmNocm9uaXplZCBzdGFydCB0aW1lIHNo b3VsZCBuZXZlciBiZSBtYXJrZWQgZmluaXNoZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NDUxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogdGVzdHMvQ0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXJU ZXN0LmNwcDoKKyAgICAgICAgKFdlYktpdFRlc3RzOjpURVNUKToKKyAgICAgICAgKFdlYktpdFRl c3RzKToKKwogMjAxMi0wNC0xOCAgQWxleGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFtDaHJvbWl1bV0gUkVHUkVTU0lPTjogUG9wdXAgc2hyaW5rcyBiZWNh dXNlIG9mIGF1dG9jb21wbGV0ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXIuY3BwIGIvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllckFuaW1hdGlv bkNvbnRyb2xsZXIuY3BwCmluZGV4IDdmNWE5MjhlOGNlMTk5MGEzOWM2M2ZkYTVjNGJiZGExN2Rl OTNhOTAuLjkyNDg4YWIwMmY5ZGJkNWQ3MzYyM2FhOTg4YjFkNTcxOTI2MWY5ZjggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJB bmltYXRpb25Db250cm9sbGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyQW5pbWF0aW9uQ29udHJvbGxlci5jcHAKQEAgLTQxMCw3 ICs0MTAsNyBAQCB2b2lkIENDTGF5ZXJBbmltYXRpb25Db250cm9sbGVyOjp0aWNrQW5pbWF0aW9u cyhkb3VibGUgbW9ub3RvbmljVGltZSkKICAgICAgICAgICAgIGNhc2UgQ0NBY3RpdmVBbmltYXRp b246OlRyYW5zZm9ybTogewogICAgICAgICAgICAgICAgIGNvbnN0IENDVHJhbnNmb3JtQW5pbWF0 aW9uQ3VydmUqIHRyYW5zZm9ybUFuaW1hdGlvbkN1cnZlID0gbV9hY3RpdmVBbmltYXRpb25zW2ld LT5jdXJ2ZSgpLT50b1RyYW5zZm9ybUFuaW1hdGlvbkN1cnZlKCk7CiAgICAgICAgICAgICAgICAg Y29uc3QgVHJhbnNmb3JtYXRpb25NYXRyaXggbWF0cml4ID0gdHJhbnNmb3JtQW5pbWF0aW9uQ3Vy dmUtPmdldFZhbHVlKHRyaW1tZWQsIG1fY2xpZW50LT5ib3VuZHMoKSk7Ci0gICAgICAgICAgICAg ICAgaWYgKG1fYWN0aXZlQW5pbWF0aW9uc1tpXS0+aXNGaW5pc2hlZEF0KG1vbm90b25pY1RpbWUp KQorICAgICAgICAgICAgICAgIGlmIChtX2FjdGl2ZUFuaW1hdGlvbnNbaV0tPmlzRmluaXNoZWRB dChtb25vdG9uaWNUaW1lKSAmJiAhbV9hY3RpdmVBbmltYXRpb25zW2ldLT5uZWVkc1N5bmNocm9u aXplZFN0YXJ0VGltZSgpKQogICAgICAgICAgICAgICAgICAgICBtX2FjdGl2ZUFuaW1hdGlvbnNb aV0tPnNldFJ1blN0YXRlKENDQWN0aXZlQW5pbWF0aW9uOjpGaW5pc2hlZCwgbW9ub3RvbmljVGlt ZSk7CiAKICAgICAgICAgICAgICAgICBtX2NsaWVudC0+c2V0VHJhbnNmb3JtRnJvbUFuaW1hdGlv bihtYXRyaXgpOwpAQCAtNDIwLDcgKzQyMCw3IEBAIHZvaWQgQ0NMYXllckFuaW1hdGlvbkNvbnRy b2xsZXI6OnRpY2tBbmltYXRpb25zKGRvdWJsZSBtb25vdG9uaWNUaW1lKQogICAgICAgICAgICAg Y2FzZSBDQ0FjdGl2ZUFuaW1hdGlvbjo6T3BhY2l0eTogewogICAgICAgICAgICAgICAgIGNvbnN0 IENDRmxvYXRBbmltYXRpb25DdXJ2ZSogZmxvYXRBbmltYXRpb25DdXJ2ZSA9IG1fYWN0aXZlQW5p bWF0aW9uc1tpXS0+Y3VydmUoKS0+dG9GbG9hdEFuaW1hdGlvbkN1cnZlKCk7CiAgICAgICAgICAg ICAgICAgY29uc3QgZmxvYXQgb3BhY2l0eSA9IGZsb2F0QW5pbWF0aW9uQ3VydmUtPmdldFZhbHVl KHRyaW1tZWQpOwotICAgICAgICAgICAgICAgIGlmIChtX2FjdGl2ZUFuaW1hdGlvbnNbaV0tPmlz RmluaXNoZWRBdChtb25vdG9uaWNUaW1lKSkKKyAgICAgICAgICAgICAgICBpZiAobV9hY3RpdmVB bmltYXRpb25zW2ldLT5pc0ZpbmlzaGVkQXQobW9ub3RvbmljVGltZSkgJiYgIW1fYWN0aXZlQW5p bWF0aW9uc1tpXS0+bmVlZHNTeW5jaHJvbml6ZWRTdGFydFRpbWUoKSkKICAgICAgICAgICAgICAg ICAgICAgbV9hY3RpdmVBbmltYXRpb25zW2ldLT5zZXRSdW5TdGF0ZShDQ0FjdGl2ZUFuaW1hdGlv bjo6RmluaXNoZWQsIG1vbm90b25pY1RpbWUpOwogCiAgICAgICAgICAgICAgICAgbV9jbGllbnQt PnNldE9wYWNpdHlGcm9tQW5pbWF0aW9uKG9wYWNpdHkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyQW5pbWF0aW9uQ29udHJvbGxlclRlc3QuY3BwIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyQW5pbWF0aW9uQ29udHJvbGxlclRl c3QuY3BwCmluZGV4IDExM2I2MzllMzZkODA5MWExNTllMjAwNDYzZTE3YmQ1NzUxZGY0NjEuLmM3 ZGE3MzFmYzllMmY4YzFjODMyZGZiOGU0OWNjZTMwZmQwMGRkNjMgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXJUZXN0LmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJBbmltYXRpb25Db250 cm9sbGVyVGVzdC5jcHAKQEAgLTE5MCw2ICsxOTAsMzYgQEAgVEVTVChDQ0xheWVyQW5pbWF0aW9u Q29udHJvbGxlclRlc3QsIFRyaXZpYWxUcmFuc2l0aW9uKQogICAgIEVYUEVDVF9GQUxTRShjb250 cm9sbGVyLT5oYXNBY3RpdmVBbmltYXRpb24oKSk7CiB9CiAKKy8vIFRlc3RzIGFuaW1hdGlvbnMg dGhhdCBhcmUgd2FpdGluZyBmb3IgYSBzeW5jaHJvbml6ZWQgc3RhcnQgdGltZSBkbyBub3QgZmlu aXNoLgorVEVTVChDQ0xheWVyQW5pbWF0aW9uQ29udHJvbGxlclRlc3QsIEFuaW1hdGlvbnNXYWl0 aW5nRm9yU3RhcnRUaW1lRG9Ob3RGaW5pc2gpCit7CisgICAgT3duUHRyPENDQW5pbWF0aW9uRXZl bnRzVmVjdG9yPiBldmVudHMoYWRvcHRQdHIobmV3IENDQW5pbWF0aW9uRXZlbnRzVmVjdG9yKSk7 CisgICAgRmFrZUxheWVyQW5pbWF0aW9uQ29udHJvbGxlckNsaWVudCBkdW1teTsKKyAgICBPd25Q dHI8Q0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXI+IGNvbnRyb2xsZXIoCisgICAgICAgIENDTGF5 ZXJBbmltYXRpb25Db250cm9sbGVyOjpjcmVhdGUoJmR1bW15KSk7CisKKyAgICBPd25QdHI8Q0NB Y3RpdmVBbmltYXRpb24+IHRvQWRkKGNyZWF0ZUFjdGl2ZUFuaW1hdGlvbihhZG9wdFB0cihuZXcg RmFrZUZsb2F0VHJhbnNpdGlvbigxLCAwLCAxKSksIDEsIENDQWN0aXZlQW5pbWF0aW9uOjpPcGFj aXR5KSk7CisgICAgdG9BZGQtPnNldE5lZWRzU3luY2hyb25pemVkU3RhcnRUaW1lKHRydWUpOwor CisgICAgLy8gV2Ugc2hvdWxkIHBhdXNlIGF0IHRoZSBmaXJzdCBrZXlmcmFtZSBpbmRlZmluaXRl bHkgd2FpdGluZyBmb3IgdGhhdCBhbmltYXRpb24gdG8gc3RhcnQuCisgICAgY29udHJvbGxlci0+ YWRkKHRvQWRkLnJlbGVhc2UoKSk7CisgICAgY29udHJvbGxlci0+YW5pbWF0ZSgwLCBldmVudHMu Z2V0KCkpOworICAgIEVYUEVDVF9UUlVFKGNvbnRyb2xsZXItPmhhc0FjdGl2ZUFuaW1hdGlvbigp KTsKKyAgICBFWFBFQ1RfRVEoMCwgZHVtbXkub3BhY2l0eSgpKTsKKyAgICBjb250cm9sbGVyLT5h bmltYXRlKDEsIGV2ZW50cy5nZXQoKSk7CisgICAgRVhQRUNUX1RSVUUoY29udHJvbGxlci0+aGFz QWN0aXZlQW5pbWF0aW9uKCkpOworICAgIEVYUEVDVF9FUSgwLCBkdW1teS5vcGFjaXR5KCkpOwor ICAgIGNvbnRyb2xsZXItPmFuaW1hdGUoMiwgZXZlbnRzLmdldCgpKTsKKyAgICBFWFBFQ1RfVFJV RShjb250cm9sbGVyLT5oYXNBY3RpdmVBbmltYXRpb24oKSk7CisgICAgRVhQRUNUX0VRKDAsIGR1 bW15Lm9wYWNpdHkoKSk7CisKKyAgICAvLyBTZW5kIHRoZSBzeW5jaHJvbml6ZWQgc3RhcnQgdGlt ZS4KKyAgICBjb250cm9sbGVyLT5ub3RpZnlBbmltYXRpb25TdGFydGVkKENDQW5pbWF0aW9uU3Rh cnRlZEV2ZW50KDAsIDEsIENDQWN0aXZlQW5pbWF0aW9uOjpPcGFjaXR5LCAyKSk7CisgICAgY29u dHJvbGxlci0+YW5pbWF0ZSg1LCBldmVudHMuZ2V0KCkpOworICAgIEVYUEVDVF9FUSgxLCBkdW1t eS5vcGFjaXR5KCkpOworICAgIEVYUEVDVF9GQUxTRShjb250cm9sbGVyLT5oYXNBY3RpdmVBbmlt YXRpb24oKSk7Cit9CisKIC8vIFRlc3RzIHRoYXQgdHdvIHF1ZXVlZCBhbmltYXRpb25zIGFmZmVj dGluZyB0aGUgc2FtZSBwcm9wZXJ0eSBydW4gaW4gc2VxdWVuY2UuCiBURVNUKENDTGF5ZXJBbmlt YXRpb25Db250cm9sbGVyVGVzdCwgVHJpdmlhbFF1ZXVpbmcpCiB7Cg== 138217 2012-04-20 19:38:01 -0700 2012-04-25 07:15:44 -0700 Patch bug-84519-20120420223800.patch text/plain 5649 vollick U3VidmVyc2lvbiBSZXZpc2lvbjogMTE0NTE1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTI5YzlhYThiZDNhOWYz NzY5YjNmZGJlNjVmMDZiOWVlOWEwMDI0OS4uZTVjNjc3OWE5NWQyNzI0MmIwN2VhYmYyYmM2ZWRj MjUwOTBmMjBhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEyLTA0LTIwICBJYW4g Vm9sbGljayAgPHZvbGxpY2tAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gQW5p bWF0aW9ucyB3YWl0aW5nIGZvciBhIHN5bmNocm9uaXplZCBzdGFydCB0aW1lIHNob3VsZCBuZXZl ciBiZSBtYXJrZWQgZmluaXNoZWQuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD04NDUxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRlc3RlZCBpbiBDQ0xheWVyQW5pbWF0aW9uQ29udHJvbGxlclRlc3QuQW5p bWF0aW9uc1dhaXRpbmdGb3JTdGFydFRpbWVEb05vdEZpbmlzaElmVGhleVdhaXRMb25nZXJUb1N0 YXJ0VGhhblRoZWlyRHVyYXRpb24KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL2NjL0NDTGF5ZXJBbmltYXRpb25Db250cm9sbGVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 OkNDTGF5ZXJBbmltYXRpb25Db250cm9sbGVyOjp0aWNrQW5pbWF0aW9ucyk6CisKIDIwMTItMDQt MTggIE1hcmsgUGlsZ3JpbSAgPHBpbGdyaW1AY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEZvbGxv d3VwIHRvICJDYWxsIGluY3JlbWVudFN0YXRzQ291bnRlciBkaXJlY3RseSIKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9DaGFuZ2VMb2cKaW5kZXggNDY5MTllNGQ5M2U3NGI3OGFjMDQzN2YwODY3ODA3MTQ2ZmI4MTM0 My4uNzQ3ODdhYTU1MGUwYzk1M2ExMGY0NGE0MDcwZWJhYTVkOTUxODJkNCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMi0wNC0yMCAgSWFuIFZvbGxpY2sg IDx2b2xsaWNrQGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21pdW1dIEFuaW1hdGlvbnMg d2FpdGluZyBmb3IgYSBzeW5jaHJvbml6ZWQgc3RhcnQgdGltZSBzaG91bGQgbmV2ZXIgYmUgbWFy a2VkIGZpbmlzaGVkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9ODQ1MTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIHRlc3RzL0NDTGF5ZXJBbmltYXRpb25Db250cm9sbGVyVGVzdC5jcHA6CisgICAgICAg IChXZWJLaXRUZXN0czo6VEVTVCk6CisgICAgICAgIChXZWJLaXRUZXN0cyk6CisKIDIwMTItMDQt MTggIEFsZXhhbmRlciBQYXZsb3YgIDxhcGF2bG92QGNocm9taXVtLm9yZz4KIAogICAgICAgICBb Q2hyb21pdW1dIFJFR1JFU1NJT046IFBvcHVwIHNocmlua3MgYmVjYXVzZSBvZiBhdXRvY29tcGxl dGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVt L2NjL0NDTGF5ZXJBbmltYXRpb25Db250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJBbmltYXRpb25Db250cm9sbGVyLmNwcApp bmRleCA3ZjVhOTI4ZThjZTE5OTBhMzljNjNmZGE1YzRiYmRhMTdkZTkzYTkwLi45MjQ4OGFiMDJm OWRiZDVkNzM2MjNhYTk4OGIxZDU3MTkyNjFmOWY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyQW5pbWF0aW9uQ29udHJvbGxl ci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2Mv Q0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXIuY3BwCkBAIC00MTAsNyArNDEwLDcgQEAgdm9pZCBD Q0xheWVyQW5pbWF0aW9uQ29udHJvbGxlcjo6dGlja0FuaW1hdGlvbnMoZG91YmxlIG1vbm90b25p Y1RpbWUpCiAgICAgICAgICAgICBjYXNlIENDQWN0aXZlQW5pbWF0aW9uOjpUcmFuc2Zvcm06IHsK ICAgICAgICAgICAgICAgICBjb25zdCBDQ1RyYW5zZm9ybUFuaW1hdGlvbkN1cnZlKiB0cmFuc2Zv cm1BbmltYXRpb25DdXJ2ZSA9IG1fYWN0aXZlQW5pbWF0aW9uc1tpXS0+Y3VydmUoKS0+dG9UcmFu c2Zvcm1BbmltYXRpb25DdXJ2ZSgpOwogICAgICAgICAgICAgICAgIGNvbnN0IFRyYW5zZm9ybWF0 aW9uTWF0cml4IG1hdHJpeCA9IHRyYW5zZm9ybUFuaW1hdGlvbkN1cnZlLT5nZXRWYWx1ZSh0cmlt bWVkLCBtX2NsaWVudC0+Ym91bmRzKCkpOwotICAgICAgICAgICAgICAgIGlmIChtX2FjdGl2ZUFu aW1hdGlvbnNbaV0tPmlzRmluaXNoZWRBdChtb25vdG9uaWNUaW1lKSkKKyAgICAgICAgICAgICAg ICBpZiAobV9hY3RpdmVBbmltYXRpb25zW2ldLT5pc0ZpbmlzaGVkQXQobW9ub3RvbmljVGltZSkg JiYgIW1fYWN0aXZlQW5pbWF0aW9uc1tpXS0+bmVlZHNTeW5jaHJvbml6ZWRTdGFydFRpbWUoKSkK ICAgICAgICAgICAgICAgICAgICAgbV9hY3RpdmVBbmltYXRpb25zW2ldLT5zZXRSdW5TdGF0ZShD Q0FjdGl2ZUFuaW1hdGlvbjo6RmluaXNoZWQsIG1vbm90b25pY1RpbWUpOwogCiAgICAgICAgICAg ICAgICAgbV9jbGllbnQtPnNldFRyYW5zZm9ybUZyb21BbmltYXRpb24obWF0cml4KTsKQEAgLTQy MCw3ICs0MjAsNyBAQCB2b2lkIENDTGF5ZXJBbmltYXRpb25Db250cm9sbGVyOjp0aWNrQW5pbWF0 aW9ucyhkb3VibGUgbW9ub3RvbmljVGltZSkKICAgICAgICAgICAgIGNhc2UgQ0NBY3RpdmVBbmlt YXRpb246Ok9wYWNpdHk6IHsKICAgICAgICAgICAgICAgICBjb25zdCBDQ0Zsb2F0QW5pbWF0aW9u Q3VydmUqIGZsb2F0QW5pbWF0aW9uQ3VydmUgPSBtX2FjdGl2ZUFuaW1hdGlvbnNbaV0tPmN1cnZl KCktPnRvRmxvYXRBbmltYXRpb25DdXJ2ZSgpOwogICAgICAgICAgICAgICAgIGNvbnN0IGZsb2F0 IG9wYWNpdHkgPSBmbG9hdEFuaW1hdGlvbkN1cnZlLT5nZXRWYWx1ZSh0cmltbWVkKTsKLSAgICAg ICAgICAgICAgICBpZiAobV9hY3RpdmVBbmltYXRpb25zW2ldLT5pc0ZpbmlzaGVkQXQobW9ub3Rv bmljVGltZSkpCisgICAgICAgICAgICAgICAgaWYgKG1fYWN0aXZlQW5pbWF0aW9uc1tpXS0+aXNG aW5pc2hlZEF0KG1vbm90b25pY1RpbWUpICYmICFtX2FjdGl2ZUFuaW1hdGlvbnNbaV0tPm5lZWRz U3luY2hyb25pemVkU3RhcnRUaW1lKCkpCiAgICAgICAgICAgICAgICAgICAgIG1fYWN0aXZlQW5p bWF0aW9uc1tpXS0+c2V0UnVuU3RhdGUoQ0NBY3RpdmVBbmltYXRpb246OkZpbmlzaGVkLCBtb25v dG9uaWNUaW1lKTsKIAogICAgICAgICAgICAgICAgIG1fY2xpZW50LT5zZXRPcGFjaXR5RnJvbUFu aW1hdGlvbihvcGFjaXR5KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVz dHMvQ0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXJUZXN0LmNwcCBiL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vdGVzdHMvQ0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXJUZXN0LmNwcAppbmRleCAxMTNi NjM5ZTM2ZDgwOTFhMTU5ZTIwMDQ2M2UxN2JkNTc1MWRmNDYxLi4wZTVjNDA3YWE2ZjdjZWNiNWJl NGQ5YTU3NDYxOWMwNjRmOWE5Yjc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVt L3Rlc3RzL0NDTGF5ZXJBbmltYXRpb25Db250cm9sbGVyVGVzdC5jcHAKKysrIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVyQW5pbWF0aW9uQ29udHJvbGxlclRlc3QuY3BwCkBA IC0xOTAsNiArMTkwLDM2IEBAIFRFU1QoQ0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXJUZXN0LCBU cml2aWFsVHJhbnNpdGlvbikKICAgICBFWFBFQ1RfRkFMU0UoY29udHJvbGxlci0+aGFzQWN0aXZl QW5pbWF0aW9uKCkpOwogfQogCisvLyBUZXN0cyBhbmltYXRpb25zIHRoYXQgYXJlIHdhaXRpbmcg Zm9yIGEgc3luY2hyb25pemVkIHN0YXJ0IHRpbWUgZG8gbm90IGZpbmlzaC4KK1RFU1QoQ0NMYXll ckFuaW1hdGlvbkNvbnRyb2xsZXJUZXN0LCBBbmltYXRpb25zV2FpdGluZ0ZvclN0YXJ0VGltZURv Tm90RmluaXNoSWZUaGV5V2FpdExvbmdlclRvU3RhcnRUaGFuVGhlaXJEdXJhdGlvbikKK3sKKyAg ICBPd25QdHI8Q0NBbmltYXRpb25FdmVudHNWZWN0b3I+IGV2ZW50cyhhZG9wdFB0cihuZXcgQ0NB bmltYXRpb25FdmVudHNWZWN0b3IpKTsKKyAgICBGYWtlTGF5ZXJBbmltYXRpb25Db250cm9sbGVy Q2xpZW50IGR1bW15OworICAgIE93blB0cjxDQ0xheWVyQW5pbWF0aW9uQ29udHJvbGxlcj4gY29u dHJvbGxlcigKKyAgICAgICAgQ0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXI6OmNyZWF0ZSgmZHVt bXkpKTsKKworICAgIE93blB0cjxDQ0FjdGl2ZUFuaW1hdGlvbj4gdG9BZGQoY3JlYXRlQWN0aXZl QW5pbWF0aW9uKGFkb3B0UHRyKG5ldyBGYWtlRmxvYXRUcmFuc2l0aW9uKDEsIDAsIDEpKSwgMSwg Q0NBY3RpdmVBbmltYXRpb246Ok9wYWNpdHkpKTsKKyAgICB0b0FkZC0+c2V0TmVlZHNTeW5jaHJv bml6ZWRTdGFydFRpbWUodHJ1ZSk7CisKKyAgICAvLyBXZSBzaG91bGQgcGF1c2UgYXQgdGhlIGZp cnN0IGtleWZyYW1lIGluZGVmaW5pdGVseSB3YWl0aW5nIGZvciB0aGF0IGFuaW1hdGlvbiB0byBz dGFydC4KKyAgICBjb250cm9sbGVyLT5hZGQodG9BZGQucmVsZWFzZSgpKTsKKyAgICBjb250cm9s bGVyLT5hbmltYXRlKDAsIGV2ZW50cy5nZXQoKSk7CisgICAgRVhQRUNUX1RSVUUoY29udHJvbGxl ci0+aGFzQWN0aXZlQW5pbWF0aW9uKCkpOworICAgIEVYUEVDVF9FUSgwLCBkdW1teS5vcGFjaXR5 KCkpOworICAgIGNvbnRyb2xsZXItPmFuaW1hdGUoMSwgZXZlbnRzLmdldCgpKTsKKyAgICBFWFBF Q1RfVFJVRShjb250cm9sbGVyLT5oYXNBY3RpdmVBbmltYXRpb24oKSk7CisgICAgRVhQRUNUX0VR KDAsIGR1bW15Lm9wYWNpdHkoKSk7CisgICAgY29udHJvbGxlci0+YW5pbWF0ZSgyLCBldmVudHMu Z2V0KCkpOworICAgIEVYUEVDVF9UUlVFKGNvbnRyb2xsZXItPmhhc0FjdGl2ZUFuaW1hdGlvbigp KTsKKyAgICBFWFBFQ1RfRVEoMCwgZHVtbXkub3BhY2l0eSgpKTsKKworICAgIC8vIFNlbmQgdGhl IHN5bmNocm9uaXplZCBzdGFydCB0aW1lLgorICAgIGNvbnRyb2xsZXItPm5vdGlmeUFuaW1hdGlv blN0YXJ0ZWQoQ0NBbmltYXRpb25TdGFydGVkRXZlbnQoMCwgMSwgQ0NBY3RpdmVBbmltYXRpb246 Ok9wYWNpdHksIDIpKTsKKyAgICBjb250cm9sbGVyLT5hbmltYXRlKDUsIGV2ZW50cy5nZXQoKSk7 CisgICAgRVhQRUNUX0VRKDEsIGR1bW15Lm9wYWNpdHkoKSk7CisgICAgRVhQRUNUX0ZBTFNFKGNv bnRyb2xsZXItPmhhc0FjdGl2ZUFuaW1hdGlvbigpKTsKK30KKwogLy8gVGVzdHMgdGhhdCB0d28g cXVldWVkIGFuaW1hdGlvbnMgYWZmZWN0aW5nIHRoZSBzYW1lIHByb3BlcnR5IHJ1biBpbiBzZXF1 ZW5jZS4KIFRFU1QoQ0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXJUZXN0LCBUcml2aWFsUXVldWlu ZykKIHsK