89483 2012-06-19 09:53:08 -0700 [BlackBerry] Animations continue to request frames after they have finished 2012-06-19 10:57:42 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 anlo anlo tonikitoo webkit.review.bot oldest_to_newest 652539 0 anlo 2012-06-19 09:53:08 -0700 Internal PR165119 When DefaultTapHighlight hide() happens, it adds the fade animation to the overlay. However, it doesn't remove the animation until the next draw() call, which happens when the user touches another link. In between those two events, the animation is still part of m_runningAnimations in LayerCompositingThread, so it continuously requesting frames from AnimationFrameRateController in the WebPageCompositor. This results in much lower frame-rates when you go to http://www.craftymind.com/guimark3/ and click the link for the bitmap test. Going to the test without clicking a link & triggering the animation results in much faster frame-rates: http://www.craftymind.com/factory/guimark3/bitmap/GM3_JS_Bitmap.html You can also verify by enabling AFRC logging and checking that if the user touches one link, frames are requested continuously after, except when the user touches another link but hasn't released yet. 652552 1 148354 anlo 2012-06-19 10:11:42 -0700 Created attachment 148354 Patch 652556 2 148354 rwlbuis 2012-06-19 10:15:01 -0700 Comment on attachment 148354 Patch LGTM. 652604 3 148354 webkit.review.bot 2012-06-19 10:57:38 -0700 Comment on attachment 148354 Patch Clearing flags on attachment: 148354 Committed r120734: <http://trac.webkit.org/changeset/120734> 652605 4 webkit.review.bot 2012-06-19 10:57:42 -0700 All reviewed patches have been landed. Closing bug. 148354 2012-06-19 10:11:42 -0700 2012-06-19 10:57:38 -0700 Patch bug-89483-20120619131304.patch text/plain 8114 anlo U3VidmVyc2lvbiBSZXZpc2lvbjogMTIwNzI1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzY1YmY4MjI1YzA3ZWNj OGI3Y2ExYWI5OGQ5NzdkZWVmZTQzN2IwMS4uMTA5NDZiOGU1NjQ4ZTIzY2JmYjQ1OTBkMzllOWQw N2ZiNjRjODhiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA2LTE5ICBBbmRy ZXcgTG8gIDxhbmxvQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnldIEFuaW1hdGlvbnMg Y29udGludWUgdG8gcmVxdWVzdCBmcmFtZXMgYWZ0ZXIgdGhleSBoYXZlIGZpbmlzaGVkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04OTQ4MworCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIERvbid0IHJlcG9ydCB0 aGF0IHdlIGhhdmUgcnVubmluZyBhbmltYXRpb25zIGlmIGFsbCB0aGUgYW5pbWF0aW9ucworICAg ICAgICBhcmUgZmluaXNoZWQuIFRoaXMgcHJldmVudHMgdW5uZWNlc3NhcnkgcmVxdWVzdGluZyBv ZiBhbmltYXRpb24gZnJhbWVzLgorICAgICAgICBJbnRlcm5hbCBQUjE2NTExOQorICAgICAgICBJ bnRlcm5hbGx5IFJldmlld2VkIGJ5IEFydmlkIE5pbHNzb24uCisKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVyQW5pbWF0aW9uLmNwcDoKKyAgICAgICAgKFdlYkNv cmU6OnByb2dyZXNzKToKKyAgICAgICAgKFdlYkNvcmU6OmZldGNoSW50ZXJ2YWxFbmRwb2ludHMp OgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJBbmltYXRpb246OmFwcGx5KToKKyAgICAgICAgKiBw bGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVyQW5pbWF0aW9uLmg6CisgICAgICAgIChX ZWJDb3JlOjpMYXllckFuaW1hdGlvbjo6ZmluaXNoZWQpOgorICAgICAgICAoV2ViQ29yZTo6TGF5 ZXJBbmltYXRpb246OkxheWVyQW5pbWF0aW9uKToKKyAgICAgICAgKExheWVyQW5pbWF0aW9uKToK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVyQ29tcG9zaXRpbmdU aHJlYWQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5ZXJDb21wb3NpdGluZ1RocmVhZDo6dXBk YXRlQW5pbWF0aW9ucyk6CisKIDIwMTItMDYtMTkgIEFsbGFuIFNhbmRmZWxkIEplbnNlbiAgPGFs bGFuLmplbnNlbkBub2tpYS5jb20+CiAKICAgICAgICAgTWFrZSBSZW5kZXJUYWJsZVNlY3Rpb24g LSBub2RlQXRQb2ludCBhbmQgcGFpbnRPYmplY3QgcmV1c2Ugc3Bhbm5pbmcgbG9naWMuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVy QW5pbWF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVy cnkvTGF5ZXJBbmltYXRpb24uY3BwCmluZGV4IGY0NmFmYmFmZGYxZDAyZTc1YzFlOWExMTBjMzBi YzI0MDdjNmVkZGUuLjdjZjc3YWI0MTM0YzdiZWFjMjVkOWU0ZTM1ZDM0ZWRiNDFhNDBkZmUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5 ZXJBbmltYXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Js YWNrYmVycnkvTGF5ZXJBbmltYXRpb24uY3BwCkBAIC03Nyw3ICs3Nyw3IEBAIHN0YXRpYyBjb25z dCBUaW1pbmdGdW5jdGlvbiogdGltaW5nRnVuY3Rpb25Gb3JBbmltYXRpb25WYWx1ZShjb25zdCBB bmltYXRpb25WYWx1CiAgICAgcmV0dXJuIEN1YmljQmV6aWVyVGltaW5nRnVuY3Rpb246OmRlZmF1 bHRUaW1pbmdGdW5jdGlvbigpOwogfQogCi1zdGF0aWMgZG91YmxlIHByb2dyZXNzKGRvdWJsZSBl bGFwc2VkVGltZSwgY29uc3QgTGF5ZXJBbmltYXRpb24qIGxheWVyQW5pbWF0aW9uLCBkb3VibGUg c2NhbGUsIGRvdWJsZSBvZmZzZXQsIGNvbnN0IFRpbWluZ0Z1bmN0aW9uKiB0ZikKK3N0YXRpYyBk b3VibGUgcHJvZ3Jlc3MoZG91YmxlIGVsYXBzZWRUaW1lLCBjb25zdCBMYXllckFuaW1hdGlvbiog bGF5ZXJBbmltYXRpb24sIGRvdWJsZSBzY2FsZSwgZG91YmxlIG9mZnNldCwgY29uc3QgVGltaW5n RnVuY3Rpb24qIHRmLCBib29sJiBhbmltYXRpb25GaW5pc2hlZCkKIHsKICAgICBkb3VibGUgZHVy ID0gbGF5ZXJBbmltYXRpb24tPmR1cmF0aW9uKCk7CiAgICAgaWYgKGxheWVyQW5pbWF0aW9uLT5p dGVyYXRpb25Db3VudCgpID4gMCkKQEAgLTg1LDggKzg1LDEwIEBAIHN0YXRpYyBkb3VibGUgcHJv Z3Jlc3MoZG91YmxlIGVsYXBzZWRUaW1lLCBjb25zdCBMYXllckFuaW1hdGlvbiogbGF5ZXJBbmlt YXRpb24sCiAKICAgICBpZiAoIWxheWVyQW5pbWF0aW9uLT5kdXJhdGlvbigpKQogICAgICAgICBy ZXR1cm4gMS4wOwotICAgIGlmIChsYXllckFuaW1hdGlvbi0+aXRlcmF0aW9uQ291bnQoKSA+IDAg JiYgZWxhcHNlZFRpbWUgPj0gZHVyKQorICAgIGlmIChsYXllckFuaW1hdGlvbi0+aXRlcmF0aW9u Q291bnQoKSA+IDAgJiYgZWxhcHNlZFRpbWUgPj0gZHVyKSB7CisgICAgICAgIGFuaW1hdGlvbkZp bmlzaGVkID0gdHJ1ZTsKICAgICAgICAgcmV0dXJuIChsYXllckFuaW1hdGlvbi0+aXRlcmF0aW9u Q291bnQoKSAlIDIpID8gMS4wIDogMC4wOworICAgIH0KIAogICAgIC8vIENvbXB1dGUgdGhlIGZy YWN0aW9uYWwgdGltZSwgdGFraW5nIGludG8gYWNjb3VudCBkaXJlY3Rpb24uCiAgICAgLy8gVGhl cmUgaXMgbm8gbmVlZCB0byB3b3JyeSBhYm91dCBpdGVyYXRpb25zLCB3ZSBhc3N1bWUgdGhhdCB3 ZSB3b3VsZCBoYXZlCkBAIC0xMTcsNyArMTE5LDcgQEAgc3RhdGljIGRvdWJsZSBwcm9ncmVzcyhk b3VibGUgZWxhcHNlZFRpbWUsIGNvbnN0IExheWVyQW5pbWF0aW9uKiBsYXllckFuaW1hdGlvbiwK ICAgICByZXR1cm4gZnJhY3Rpb25hbFRpbWU7CiB9CiAKLXN0YXRpYyB2b2lkIGZldGNoSW50ZXJ2 YWxFbmRwb2ludHMoZG91YmxlIGVsYXBzZWRUaW1lLCBjb25zdCBMYXllckFuaW1hdGlvbiogbGF5 ZXJBbmltYXRpb24sIGNvbnN0IEFuaW1hdGlvblZhbHVlKiYgZnJvbVZhbHVlLCBjb25zdCBBbmlt YXRpb25WYWx1ZSomIHRvVmFsdWUsIGRvdWJsZSYgcHJvZykKK3N0YXRpYyB2b2lkIGZldGNoSW50 ZXJ2YWxFbmRwb2ludHMoZG91YmxlIGVsYXBzZWRUaW1lLCBjb25zdCBMYXllckFuaW1hdGlvbiog bGF5ZXJBbmltYXRpb24sIGNvbnN0IEFuaW1hdGlvblZhbHVlKiYgZnJvbVZhbHVlLCBjb25zdCBB bmltYXRpb25WYWx1ZSomIHRvVmFsdWUsIGRvdWJsZSYgcHJvZywgYm9vbCYgYW5pbWF0aW9uRmlu aXNoZWQpCiB7CiAgICAgLy8gRmluZCB0aGUgZmlyc3Qga2V5LgogICAgIGlmIChsYXllckFuaW1h dGlvbi0+ZHVyYXRpb24oKSAmJiBsYXllckFuaW1hdGlvbi0+aXRlcmF0aW9uQ291bnQoKSAhPSBB bmltYXRpb246Okl0ZXJhdGlvbkNvdW50SW5maW5pdGUpCkBAIC0xODYsNyArMTg4LDcgQEAgc3Rh dGljIHZvaWQgZmV0Y2hJbnRlcnZhbEVuZHBvaW50cyhkb3VibGUgZWxhcHNlZFRpbWUsIGNvbnN0 IExheWVyQW5pbWF0aW9uKiBsYXkKIAogICAgIGNvbnN0IFRpbWluZ0Z1bmN0aW9uKiB0aW1pbmdG dW5jdGlvbiA9IHRpbWluZ0Z1bmN0aW9uRm9yQW5pbWF0aW9uVmFsdWUocHJldktleWZyYW1lLCBs YXllckFuaW1hdGlvbik7CiAKLSAgICBwcm9nID0gcHJvZ3Jlc3MoZWxhcHNlZFRpbWUsIGxheWVy QW5pbWF0aW9uLCBzY2FsZSwgb2Zmc2V0LCB0aW1pbmdGdW5jdGlvbik7CisgICAgcHJvZyA9IHBy b2dyZXNzKGVsYXBzZWRUaW1lLCBsYXllckFuaW1hdGlvbiwgc2NhbGUsIG9mZnNldCwgdGltaW5n RnVuY3Rpb24sIGFuaW1hdGlvbkZpbmlzaGVkKTsKIH0KIAogdm9pZCBMYXllckFuaW1hdGlvbjo6 YXBwbHkoTGF5ZXJDb21wb3NpdGluZ1RocmVhZCogbGF5ZXIsIGRvdWJsZSBlbGFwc2VkVGltZSkK QEAgLTE5NCw4ICsxOTYsOSBAQCB2b2lkIExheWVyQW5pbWF0aW9uOjphcHBseShMYXllckNvbXBv c2l0aW5nVGhyZWFkKiBsYXllciwgZG91YmxlIGVsYXBzZWRUaW1lKQogICAgIGNvbnN0IEFuaW1h dGlvblZhbHVlKiBmcm9tID0gMDsKICAgICBjb25zdCBBbmltYXRpb25WYWx1ZSogdG8gPSAwOwog ICAgIGRvdWJsZSBwcm9ncmVzcyA9IDAuMDsKKyAgICBib29sIGFuaW1hdGlvbkZpbmlzaGVkID0g ZmFsc2U7CiAKLSAgICBmZXRjaEludGVydmFsRW5kcG9pbnRzKGVsYXBzZWRUaW1lLCB0aGlzLCBm cm9tLCB0bywgcHJvZ3Jlc3MpOworICAgIGZldGNoSW50ZXJ2YWxFbmRwb2ludHMoZWxhcHNlZFRp bWUsIHRoaXMsIGZyb20sIHRvLCBwcm9ncmVzcywgYW5pbWF0aW9uRmluaXNoZWQpOwogCiAgICAg c3dpdGNoIChwcm9wZXJ0eSgpKSB7CiAgICAgY2FzZSBBbmltYXRlZFByb3BlcnR5V2Via2l0VHJh bnNmb3JtOgpAQCAtMjEwLDYgKzIxMyw4IEBAIHZvaWQgTGF5ZXJBbmltYXRpb246OmFwcGx5KExh eWVyQ29tcG9zaXRpbmdUaHJlYWQqIGxheWVyLCBkb3VibGUgZWxhcHNlZFRpbWUpCiAgICAgICAg IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAgICBicmVhazsKICAgICB9CisKKyAgICBtX2Zp bmlzaGVkID0gYW5pbWF0aW9uRmluaXNoZWQ7CiB9CiAKIFRyYW5zZm9ybWF0aW9uTWF0cml4IExh eWVyQW5pbWF0aW9uOjpibGVuZFRyYW5zZm9ybShjb25zdCBUcmFuc2Zvcm1PcGVyYXRpb25zKiBm cm9tLCBjb25zdCBUcmFuc2Zvcm1PcGVyYXRpb25zKiB0bywgZG91YmxlIHByb2dyZXNzKSBjb25z dApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2tiZXJy eS9MYXllckFuaW1hdGlvbi5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxh Y2tiZXJyeS9MYXllckFuaW1hdGlvbi5oCmluZGV4IDEwNDQ3NzA4MmU0OTllN2EzNTc2M2NlY2Y5 ZTRmYjYxMGU5YjAyYWYuLmM0ODZmZTU4ZDcyMWZkNzVlZjRmZjNhMzE5ZDFjZWY1NmE1NjVkYmIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkv TGF5ZXJBbmltYXRpb24uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9i bGFja2JlcnJ5L0xheWVyQW5pbWF0aW9uLmgKQEAgLTg2LDYgKzg2LDcgQEAgcHVibGljOgogCiAg ICAgLy8gTk9URTogRG9uJ3QgdHJ5IHRvIGNsb25lKCkgYW4gQW5pbWF0aW9uVmFsdWUsIHRoYXQn cyBub3QgYSB0aHJlYWRzYWZlIG9wZXJhdGlvbiBzaW5jZSBpdCBtdXRhdGVzIHJlZmNvdW50cy4K ICAgICBjb25zdCBBbmltYXRpb25WYWx1ZSogdmFsdWVBdChzaXplX3QgaSkgY29uc3QgeyByZXR1 cm4gbV92YWx1ZXMuYXQoaSk7IH0KKyAgICBib29sIGZpbmlzaGVkKCkgY29uc3QgeyByZXR1cm4g bV9maW5pc2hlZDsgfQogCiAgICAgVHJhbnNmb3JtYXRpb25NYXRyaXggYmxlbmRUcmFuc2Zvcm0o Y29uc3QgVHJhbnNmb3JtT3BlcmF0aW9ucyogZnJvbSwgY29uc3QgVHJhbnNmb3JtT3BlcmF0aW9u cyosIGRvdWJsZSBwcm9ncmVzcykgY29uc3Q7CiAgICAgZmxvYXQgYmxlbmRPcGFjaXR5KGZsb2F0 IGZyb20sIGZsb2F0IHRvLCBkb3VibGUgcHJvZ3Jlc3MpIGNvbnN0OwpAQCAtMTAzLDYgKzEwNCw3 IEBAIHByaXZhdGU6CiAgICAgICAgICwgbV9kdXJhdGlvbihhbmltYXRpb24tPmR1cmF0aW9uKCkp CiAgICAgICAgICwgbV9pdGVyYXRpb25Db3VudChhbmltYXRpb24tPml0ZXJhdGlvbkNvdW50KCkp CiAgICAgICAgICwgbV9kaXJlY3Rpb24oYW5pbWF0aW9uLT5kaXJlY3Rpb24oKSkKKyAgICAgICAg LCBtX2ZpbmlzaGVkKGZhbHNlKQogICAgIHsKICAgICAgICAgaWYgKGFuaW1hdGlvbi0+aXNUaW1p bmdGdW5jdGlvblNldCgpKQogICAgICAgICAgICAgbV90aW1pbmdGdW5jdGlvbiA9IGFuaW1hdGlv bi0+dGltaW5nRnVuY3Rpb24oKTsKQEAgLTEyMyw2ICsxMjUsNyBAQCBwcml2YXRlOgogICAgICAg ICAsIG1fZHVyYXRpb24ob3RoZXIubV9kdXJhdGlvbikKICAgICAgICAgLCBtX2l0ZXJhdGlvbkNv dW50KG90aGVyLm1faXRlcmF0aW9uQ291bnQpCiAgICAgICAgICwgbV9kaXJlY3Rpb24ob3RoZXIu bV9kaXJlY3Rpb24pCisgICAgICAgICwgbV9maW5pc2hlZChmYWxzZSkKICAgICB7CiAgICAgfQog CkBAIC0xNDMsNiArMTQ2LDcgQEAgcHJpdmF0ZToKICAgICBkb3VibGUgbV9kdXJhdGlvbjsKICAg ICBpbnQgbV9pdGVyYXRpb25Db3VudDsKICAgICBBbmltYXRpb246OkFuaW1hdGlvbkRpcmVjdGlv biBtX2RpcmVjdGlvbjsKKyAgICBib29sIG1fZmluaXNoZWQ7CiB9OwogCiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFja2JlcnJ5L0xheWVyQ29tcG9z aXRpbmdUaHJlYWQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYmxhY2ti ZXJyeS9MYXllckNvbXBvc2l0aW5nVGhyZWFkLmNwcAppbmRleCA0ZDRhMmNhMjBjOTkyMzI0ZWEy YmE0ZDJhZWM1N2Y5NTk5YjM4MzY2Li5jNzUwZWJkMjg2NDdjNmQxZWIyYjBlYWUzMDg5ZGU3Nzcw NzI2NGFmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ibGFj a2JlcnJ5L0xheWVyQ29tcG9zaXRpbmdUaHJlYWQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL2JsYWNrYmVycnkvTGF5ZXJDb21wb3NpdGluZ1RocmVhZC5jcHAKQEAg LTQ5NiwxNCArNDk2LDE1IEBAIGJvb2wgTGF5ZXJDb21wb3NpdGluZ1RocmVhZDo6dXBkYXRlQW5p bWF0aW9ucyhkb3VibGUgY3VycmVudFRpbWUpCiAgICAgICAgIGFuaW1hdGlvbi0+YXBwbHkodGhp cywgZWxhcHNlZFRpbWUpOwogICAgIH0KIAorICAgIGJvb2wgYWxsQW5pbWF0aW9uc0ZpbmlzaGVk ID0gdHJ1ZTsKICAgICBmb3IgKHNpemVfdCBpID0gMDsgaSA8IG1fcnVubmluZ0FuaW1hdGlvbnMu c2l6ZSgpOyArK2kpIHsKICAgICAgICAgTGF5ZXJBbmltYXRpb24qIGFuaW1hdGlvbiA9IG1fcnVu bmluZ0FuaW1hdGlvbnNbaV0uZ2V0KCk7CiAgICAgICAgIGRvdWJsZSBlbGFwc2VkVGltZSA9ICht X3N1c3BlbmRUaW1lID8gbV9zdXNwZW5kVGltZSA6IGN1cnJlbnRUaW1lKSAtIGFuaW1hdGlvbi0+ c3RhcnRUaW1lKCkgKyBhbmltYXRpb24tPnRpbWVPZmZzZXQoKTsKICAgICAgICAgYW5pbWF0aW9u LT5hcHBseSh0aGlzLCBlbGFwc2VkVGltZSk7CisgICAgICAgIGlmICghYW5pbWF0aW9uLT5maW5p c2hlZCgpKQorICAgICAgICAgICAgYWxsQW5pbWF0aW9uc0ZpbmlzaGVkID0gZmFsc2U7CiAgICAg fQogCi0gICAgYm9vbCBoYXNSdW5uaW5nQW5pbWF0aW9ucyA9ICFtX3J1bm5pbmdBbmltYXRpb25z LmlzRW1wdHkoKTsKLQogICAgIC8vIElmIHRoZXJlIGFyZSBhbnkgb3ZlcnJpZGVzLCBhcHBseSB0 aGVtCiAgICAgaWYgKG1fb3ZlcnJpZGUpIHsKICAgICAgICAgaWYgKG1fb3ZlcnJpZGUtPmlzUG9z aXRpb25TZXQoKSkKQEAgLTUyMSwxMSArNTIyLDEyIEBAIGJvb2wgTGF5ZXJDb21wb3NpdGluZ1Ro cmVhZDo6dXBkYXRlQW5pbWF0aW9ucyhkb3VibGUgY3VycmVudFRpbWUpCiAgICAgICAgICAgICBM YXllckFuaW1hdGlvbiogYW5pbWF0aW9uID0gbV9vdmVycmlkZS0+YW5pbWF0aW9ucygpW2ldLmdl dCgpOwogICAgICAgICAgICAgZG91YmxlIGVsYXBzZWRUaW1lID0gKG1fc3VzcGVuZFRpbWUgPyBt X3N1c3BlbmRUaW1lIDogY3VycmVudFRpbWUpIC0gYW5pbWF0aW9uLT5zdGFydFRpbWUoKSArIGFu aW1hdGlvbi0+dGltZU9mZnNldCgpOwogICAgICAgICAgICAgYW5pbWF0aW9uLT5hcHBseSh0aGlz LCBlbGFwc2VkVGltZSk7Ci0gICAgICAgICAgICBoYXNSdW5uaW5nQW5pbWF0aW9ucyB8PSB0cnVl OworICAgICAgICAgICAgaWYgKCFhbmltYXRpb24tPmZpbmlzaGVkKCkpCisgICAgICAgICAgICAg ICAgYWxsQW5pbWF0aW9uc0ZpbmlzaGVkID0gZmFsc2U7CiAgICAgICAgIH0KICAgICB9CiAKLSAg ICByZXR1cm4gaGFzUnVubmluZ0FuaW1hdGlvbnM7CisgICAgcmV0dXJuICFhbGxBbmltYXRpb25z RmluaXNoZWQ7CiB9CiAKIGJvb2wgTGF5ZXJDb21wb3NpdGluZ1RocmVhZDo6aGFzVmlzaWJsZUhv bGVQdW5jaFJlY3QoKSBjb25zdAo=