83179 2012-04-04 10:23:52 -0700 [chromium] Race condition in CCLayerTreeHostTestSynchronizeAnimationStartTimes 2012-04-05 11:58:19 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 vollick vollick enne jamesr webkit.review.bot oldest_to_newest 595656 0 vollick 2012-04-04 10:23:52 -0700 This test checks if animateLayers has been called before notifyAnimationStarted, but with the threaded compositior, this may not be true. 595663 1 135621 vollick 2012-04-04 10:29:29 -0700 Created attachment 135621 Patch Removes the race condition in CCLayerTreeHostTestSynchronizeAnimationStartTimes. Also re-enables CCLayerTreeHostTestAddAnimationWithTimingFunction which I think may have been mistakenly disabled rather than CCLayerTreeHostTestSynchronizeAnimationStartTimes. 595789 2 135648 vollick 2012-04-04 12:18:57 -0700 Created attachment 135648 Patch Before the call to notifyAnimationStarted, we must have a valid layerTreeHostImpl or else we won't be able to compare the start times of the animations. Previously, we'd grabbed this value in TestHooks::animateLayers. This function is called on the impl thread _after_ the call to CCLayerTreeHostImpl::animateLayers. The problem is that we check this value in notifyAnimationStarted which executes on the main thread, possibly before TestHooks::animateLayers. To get around this problem, we grab the pointer to the layerTreeHostImpl in willAnimateLayers instead. This is guaranteed to be called before notifyAnimationStarted (notifyAnimationStarted is called due to a task posted by CCLayerTreeHostImpl::animateLayers, which is called after willAnimateLayers). 595792 3 135651 vollick 2012-04-04 12:20:44 -0700 Created attachment 135651 Patch Re-enables CCLayerTreeHostTestAddAnimationWithTimingFunction. 596766 4 135651 webkit.review.bot 2012-04-05 11:58:12 -0700 Comment on attachment 135651 Patch Clearing flags on attachment: 135651 Committed r113346: <http://trac.webkit.org/changeset/113346> 596767 5 webkit.review.bot 2012-04-05 11:58:19 -0700 All reviewed patches have been landed. Closing bug. 135621 2012-04-04 10:29:29 -0700 2012-04-04 12:18:50 -0700 Patch bug-83179-20120404132928.patch text/plain 1858 vollick U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzMTgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGI4MWY4ODcyY2ZmMDJjMjljOGQ1ZmFkZGFiNDY0ZmYxNjE0ZjdkZjAuLjllMjUyOTc2MDUyYzFm OGRmZjA4YzE3MzdmYjE4Mzg1ZWYxNmExNmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTQgQEAKKzIwMTItMDQtMDQgIElhbiBWb2xsaWNrICA8dm9sbGlja0BjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBSYWNlIGNvbmRpdGlvbiBpbiBDQ0xheWVyVHJl ZUhvc3RUZXN0U3luY2hyb25pemVBbmltYXRpb25TdGFydFRpbWVzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzE3OQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogdGVzdHMvQ0NMYXllclRyZWVIb3N0VGVz dC5jcHA6CisgICAgICAgIChXVEY6OlRFU1RfRik6CisgICAgICAgIChXVEY6OkNDTGF5ZXJUcmVl SG9zdFRlc3RTeW5jaHJvbml6ZUFuaW1hdGlvblN0YXJ0VGltZXM6Om5vdGlmeUFuaW1hdGlvblN0 YXJ0ZWQpOgorCiAyMDEyLTA0LTA0ICBIYW5zIFdlbm5ib3JnICA8aGFuc0BjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgV2ViU3BlZWNoUmVjb2duaXplci5oOiBhZGQgbWlzc2luZyBmb3J3YXJkIGRl Y2xhcmF0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5 ZXJUcmVlSG9zdFRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVy VHJlZUhvc3RUZXN0LmNwcAppbmRleCBiNmIwYzYwNjJmZWE5ZmExMjkxNGU1YTIwZTE1Y2E2ZDU3 ZDYyMTg1Li4wYWJkOTlhZmZkMzA0MTAxODAxMGZmOGNhOTk2MGRjZGU3YzY1YjViIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdFRlc3QuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0VGVzdC5j cHAKQEAgLTEwMjcsNyArMTAyNyw3IEBAIHB1YmxpYzoKIHByaXZhdGU6CiB9OwogCi1URVNUX0Yo Q0NMYXllclRyZWVIb3N0VGVzdEFkZEFuaW1hdGlvbldpdGhUaW1pbmdGdW5jdGlvbiwgRElTQUJM RURfcnVuTXVsdGlUaHJlYWQpCitURVNUX0YoQ0NMYXllclRyZWVIb3N0VGVzdEFkZEFuaW1hdGlv bldpdGhUaW1pbmdGdW5jdGlvbiwgcnVuTXVsdGlUaHJlYWQpCiB7CiAgICAgcnVuVGVzdFRocmVh ZGVkKCk7CiB9CkBAIC0xMDg3LDkgKzEwODcsNiBAQCBwdWJsaWM6CiAKICAgICB2aXJ0dWFsIHZv aWQgbm90aWZ5QW5pbWF0aW9uU3RhcnRlZChkb3VibGUgdGltZSkKICAgICB7Ci0gICAgICAgIGlm ICghbV9udW1BbmltYXRlcykKLSAgICAgICAgICAgIHJldHVybjsKLQogICAgICAgICBDQ0xheWVy QW5pbWF0aW9uQ29udHJvbGxlciogY29udHJvbGxlckltcGwgPSBtX2xheWVyVHJlZUhvc3RJbXBs LT5yb290TGF5ZXIoKS0+bGF5ZXJBbmltYXRpb25Db250cm9sbGVyKCk7CiAgICAgICAgIENDTGF5 ZXJBbmltYXRpb25Db250cm9sbGVyKiBjb250cm9sbGVyID0gbV9sYXllclRyZWVIb3N0LT5yb290 TGF5ZXIoKS0+bGF5ZXJBbmltYXRpb25Db250cm9sbGVyKCk7CiAgICAgICAgIENDQWN0aXZlQW5p bWF0aW9uKiBhbmltYXRpb25JbXBsID0gY29udHJvbGxlckltcGwtPmdldEFjdGl2ZUFuaW1hdGlv bigwLCBDQ0FjdGl2ZUFuaW1hdGlvbjo6T3BhY2l0eSk7Cg== 135648 2012-04-04 12:18:57 -0700 2012-04-04 12:20:39 -0700 Patch bug-83179-20120404151856.patch text/plain 3606 vollick U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzMTgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGI4MWY4ODcyY2ZmMDJjMjljOGQ1ZmFkZGFiNDY0ZmYxNjE0ZjdkZjAuLjEzZWM1NjljZDg0YjY0 ZTE1MDBiNWZkYmI0ZmRmNTc3N2NiOTYyZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTggQEAKKzIwMTItMDQtMDQgIElhbiBWb2xsaWNrICA8dm9sbGlja0BjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBSYWNlIGNvbmRpdGlvbiBpbiBDQ0xheWVyVHJl ZUhvc3RUZXN0U3luY2hyb25pemVBbmltYXRpb25TdGFydFRpbWVzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzE3OQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogdGVzdHMvQ0NMYXllclRyZWVIb3N0VGVz dC5jcHA6CisgICAgICAgIChXVEY6OlRlc3RIb29rczo6d2lsbEFuaW1hdGVMYXllcnMpOgorICAg ICAgICAoV1RGOjpNb2NrTGF5ZXJUcmVlSG9zdEltcGw6OmFuaW1hdGVMYXllcnMpOgorICAgICAg ICAoV1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0U3luY2hyb25pemVBbmltYXRpb25TdGFydFRpbWVz OjpDQ0xheWVyVHJlZUhvc3RUZXN0U3luY2hyb25pemVBbmltYXRpb25TdGFydFRpbWVzKToKKyAg ICAgICAgKENDTGF5ZXJUcmVlSG9zdFRlc3RTeW5jaHJvbml6ZUFuaW1hdGlvblN0YXJ0VGltZXMp OgorICAgICAgICAoV1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0U3luY2hyb25pemVBbmltYXRpb25T dGFydFRpbWVzOjp3aWxsQW5pbWF0ZUxheWVycyk6CisgICAgICAgIChXVEY6OkNDTGF5ZXJUcmVl SG9zdFRlc3RTeW5jaHJvbml6ZUFuaW1hdGlvblN0YXJ0VGltZXM6Om5vdGlmeUFuaW1hdGlvblN0 YXJ0ZWQpOgorCiAyMDEyLTA0LTA0ICBIYW5zIFdlbm5ib3JnICA8aGFuc0BjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgV2ViU3BlZWNoUmVjb2duaXplci5oOiBhZGQgbWlzc2luZyBmb3J3YXJkIGRl Y2xhcmF0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5 ZXJUcmVlSG9zdFRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVy VHJlZUhvc3RUZXN0LmNwcAppbmRleCBiNmIwYzYwNjJmZWE5ZmExMjkxNGU1YTIwZTE1Y2E2ZDU3 ZDYyMTg1Li40YTVkNmZjY2I3ZGY2ZDdkZmU5NWMyOGM5ZWY2NThlM2ViOWI5ZmQ5IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdFRlc3QuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0VGVzdC5j cHAKQEAgLTY3LDYgKzY3LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBwcmVwYXJlVG9E cmF3T25DQ1RocmVhZChDQ0xheWVyVHJlZUhvc3RJbXBsKikgeyB9CiAgICAgdmlydHVhbCB2b2lk IGRyYXdMYXllcnNPbkNDVGhyZWFkKENDTGF5ZXJUcmVlSG9zdEltcGwqKSB7IH0KICAgICB2aXJ0 dWFsIHZvaWQgYW5pbWF0ZUxheWVycyhDQ0xheWVyVHJlZUhvc3RJbXBsKiwgZG91YmxlIG1vbm90 b25pY1RpbWUpIHsgfQorICAgIHZpcnR1YWwgdm9pZCB3aWxsQW5pbWF0ZUxheWVycyhDQ0xheWVy VHJlZUhvc3RJbXBsKiwgZG91YmxlIG1vbm90b25pY1RpbWUpIHsgfQogICAgIHZpcnR1YWwgdm9p ZCBhcHBseVNjcm9sbEFuZFNjYWxlKGNvbnN0IEludFNpemUmLCBmbG9hdCkgeyB9CiAgICAgdmly dHVhbCB2b2lkIHVwZGF0ZUFuaW1hdGlvbnMoZG91YmxlIG1vbm90b25pY1RpbWUpIHsgfQogICAg IHZpcnR1YWwgdm9pZCBsYXlvdXQoKSB7IH0KQEAgLTExMyw2ICsxMTQsNyBAQCBwdWJsaWM6CiBw cm90ZWN0ZWQ6CiAgICAgdmlydHVhbCB2b2lkIGFuaW1hdGVMYXllcnMoZG91YmxlIG1vbm90b25p Y1RpbWUsIGRvdWJsZSB3YWxsQ2xvY2tUaW1lKQogICAgIHsKKyAgICAgICAgbV90ZXN0SG9va3Mt PndpbGxBbmltYXRlTGF5ZXJzKHRoaXMsIG1vbm90b25pY1RpbWUpOwogICAgICAgICBDQ0xheWVy VHJlZUhvc3RJbXBsOjphbmltYXRlTGF5ZXJzKG1vbm90b25pY1RpbWUsIHdhbGxDbG9ja1RpbWUp OwogICAgICAgICBtX3Rlc3RIb29rcy0+YW5pbWF0ZUxheWVycyh0aGlzLCBtb25vdG9uaWNUaW1l KTsKICAgICB9CkBAIC0xMDY1LDggKzEwNjcsNyBAQCBwdWJsaWM6CiBjbGFzcyBDQ0xheWVyVHJl ZUhvc3RUZXN0U3luY2hyb25pemVBbmltYXRpb25TdGFydFRpbWVzIDogcHVibGljIENDTGF5ZXJU cmVlSG9zdFRlc3RUaHJlYWRPbmx5IHsKIHB1YmxpYzoKICAgICBDQ0xheWVyVHJlZUhvc3RUZXN0 U3luY2hyb25pemVBbmltYXRpb25TdGFydFRpbWVzKCkKLSAgICAgICAgOiBtX251bUFuaW1hdGVz KDApCi0gICAgICAgICwgbV9sYXllclRyZWVIb3N0SW1wbCgwKQorICAgICAgICA6IG1fbGF5ZXJU cmVlSG9zdEltcGwoMCkKICAgICB7CiAgICAgfQogCkBAIC0xMDc1LDIwICsxMDc2LDE1IEBAIHB1 YmxpYzoKICAgICAgICAgcG9zdEFkZEFuaW1hdGlvblRvTWFpblRocmVhZCgpOwogICAgIH0KIAot ICAgIHZpcnR1YWwgdm9pZCBhbmltYXRlTGF5ZXJzKENDTGF5ZXJUcmVlSG9zdEltcGwqIGxheWVy VHJlZUhvc3RJbXBsLCBkb3VibGUpCisgICAgLy8gVGhpcyBpcyBndWFyYW50ZWVkIHRvIGJlIGNh bGxlZCBiZWZvcmUgQ0NMYXllclRyZWVIb3N0SW1wbDo6YW5pbWF0ZUxheWVycy4KKyAgICB2aXJ0 dWFsIHZvaWQgd2lsbEFuaW1hdGVMYXllcnMoQ0NMYXllclRyZWVIb3N0SW1wbCogbGF5ZXJUcmVl SG9zdEltcGwsIGRvdWJsZSBtb25vdG9uaWNUaW1lKQogICAgIHsKICAgICAgICAgbV9sYXllclRy ZWVIb3N0SW1wbCA9IGxheWVyVHJlZUhvc3RJbXBsOwotCi0gICAgICAgIGlmICghbV9udW1Bbmlt YXRlcykgewotICAgICAgICAgICAgbV9udW1BbmltYXRlcysrOwotICAgICAgICAgICAgcmV0dXJu OwotICAgICAgICB9CiAgICAgfQogCiAgICAgdmlydHVhbCB2b2lkIG5vdGlmeUFuaW1hdGlvblN0 YXJ0ZWQoZG91YmxlIHRpbWUpCiAgICAgewotICAgICAgICBpZiAoIW1fbnVtQW5pbWF0ZXMpCi0g ICAgICAgICAgICByZXR1cm47CisgICAgICAgIEVYUEVDVF9UUlVFKG1fbGF5ZXJUcmVlSG9zdElt cGwpOwogCiAgICAgICAgIENDTGF5ZXJBbmltYXRpb25Db250cm9sbGVyKiBjb250cm9sbGVySW1w bCA9IG1fbGF5ZXJUcmVlSG9zdEltcGwtPnJvb3RMYXllcigpLT5sYXllckFuaW1hdGlvbkNvbnRy b2xsZXIoKTsKICAgICAgICAgQ0NMYXllckFuaW1hdGlvbkNvbnRyb2xsZXIqIGNvbnRyb2xsZXIg PSBtX2xheWVyVHJlZUhvc3QtPnJvb3RMYXllcigpLT5sYXllckFuaW1hdGlvbkNvbnRyb2xsZXIo KTsKQEAgLTExMDUsNyArMTEwMSw2IEBAIHB1YmxpYzoKICAgICB9CiAKIHByaXZhdGU6Ci0gICAg aW50IG1fbnVtQW5pbWF0ZXM7CiAgICAgQ0NMYXllclRyZWVIb3N0SW1wbCogbV9sYXllclRyZWVI b3N0SW1wbDsKIH07CiAK 135651 2012-04-04 12:20:44 -0700 2012-04-05 11:58:12 -0700 Patch bug-83179-20120404152042.patch text/plain 3841 vollick U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzMTgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGI4MWY4ODcyY2ZmMDJjMjljOGQ1ZmFkZGFiNDY0ZmYxNjE0ZjdkZjAuLjEzZWM1NjljZDg0YjY0 ZTE1MDBiNWZkYmI0ZmRmNTc3N2NiOTYyZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTggQEAKKzIwMTItMDQtMDQgIElhbiBWb2xsaWNrICA8dm9sbGlja0BjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBSYWNlIGNvbmRpdGlvbiBpbiBDQ0xheWVyVHJl ZUhvc3RUZXN0U3luY2hyb25pemVBbmltYXRpb25TdGFydFRpbWVzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MzE3OQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogdGVzdHMvQ0NMYXllclRyZWVIb3N0VGVz dC5jcHA6CisgICAgICAgIChXVEY6OlRlc3RIb29rczo6d2lsbEFuaW1hdGVMYXllcnMpOgorICAg ICAgICAoV1RGOjpNb2NrTGF5ZXJUcmVlSG9zdEltcGw6OmFuaW1hdGVMYXllcnMpOgorICAgICAg ICAoV1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0U3luY2hyb25pemVBbmltYXRpb25TdGFydFRpbWVz OjpDQ0xheWVyVHJlZUhvc3RUZXN0U3luY2hyb25pemVBbmltYXRpb25TdGFydFRpbWVzKToKKyAg ICAgICAgKENDTGF5ZXJUcmVlSG9zdFRlc3RTeW5jaHJvbml6ZUFuaW1hdGlvblN0YXJ0VGltZXMp OgorICAgICAgICAoV1RGOjpDQ0xheWVyVHJlZUhvc3RUZXN0U3luY2hyb25pemVBbmltYXRpb25T dGFydFRpbWVzOjp3aWxsQW5pbWF0ZUxheWVycyk6CisgICAgICAgIChXVEY6OkNDTGF5ZXJUcmVl SG9zdFRlc3RTeW5jaHJvbml6ZUFuaW1hdGlvblN0YXJ0VGltZXM6Om5vdGlmeUFuaW1hdGlvblN0 YXJ0ZWQpOgorCiAyMDEyLTA0LTA0ICBIYW5zIFdlbm5ib3JnICA8aGFuc0BjaHJvbWl1bS5vcmc+ CiAKICAgICAgICAgV2ViU3BlZWNoUmVjb2duaXplci5oOiBhZGQgbWlzc2luZyBmb3J3YXJkIGRl Y2xhcmF0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5 ZXJUcmVlSG9zdFRlc3QuY3BwIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90ZXN0cy9DQ0xheWVy VHJlZUhvc3RUZXN0LmNwcAppbmRleCBiNmIwYzYwNjJmZWE5ZmExMjkxNGU1YTIwZTE1Y2E2ZDU3 ZDYyMTg1Li5lMjI1ZDI2ZGIyYjkyOTU4ZWViY2UzMmZkOTVjMWQ2NTcyZDI1M2FmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3Rlc3RzL0NDTGF5ZXJUcmVlSG9zdFRlc3QuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGVzdHMvQ0NMYXllclRyZWVIb3N0VGVzdC5j cHAKQEAgLTY3LDYgKzY3LDcgQEAgcHVibGljOgogICAgIHZpcnR1YWwgdm9pZCBwcmVwYXJlVG9E cmF3T25DQ1RocmVhZChDQ0xheWVyVHJlZUhvc3RJbXBsKikgeyB9CiAgICAgdmlydHVhbCB2b2lk IGRyYXdMYXllcnNPbkNDVGhyZWFkKENDTGF5ZXJUcmVlSG9zdEltcGwqKSB7IH0KICAgICB2aXJ0 dWFsIHZvaWQgYW5pbWF0ZUxheWVycyhDQ0xheWVyVHJlZUhvc3RJbXBsKiwgZG91YmxlIG1vbm90 b25pY1RpbWUpIHsgfQorICAgIHZpcnR1YWwgdm9pZCB3aWxsQW5pbWF0ZUxheWVycyhDQ0xheWVy VHJlZUhvc3RJbXBsKiwgZG91YmxlIG1vbm90b25pY1RpbWUpIHsgfQogICAgIHZpcnR1YWwgdm9p ZCBhcHBseVNjcm9sbEFuZFNjYWxlKGNvbnN0IEludFNpemUmLCBmbG9hdCkgeyB9CiAgICAgdmly dHVhbCB2b2lkIHVwZGF0ZUFuaW1hdGlvbnMoZG91YmxlIG1vbm90b25pY1RpbWUpIHsgfQogICAg IHZpcnR1YWwgdm9pZCBsYXlvdXQoKSB7IH0KQEAgLTExMyw2ICsxMTQsNyBAQCBwdWJsaWM6CiBw cm90ZWN0ZWQ6CiAgICAgdmlydHVhbCB2b2lkIGFuaW1hdGVMYXllcnMoZG91YmxlIG1vbm90b25p Y1RpbWUsIGRvdWJsZSB3YWxsQ2xvY2tUaW1lKQogICAgIHsKKyAgICAgICAgbV90ZXN0SG9va3Mt PndpbGxBbmltYXRlTGF5ZXJzKHRoaXMsIG1vbm90b25pY1RpbWUpOwogICAgICAgICBDQ0xheWVy VHJlZUhvc3RJbXBsOjphbmltYXRlTGF5ZXJzKG1vbm90b25pY1RpbWUsIHdhbGxDbG9ja1RpbWUp OwogICAgICAgICBtX3Rlc3RIb29rcy0+YW5pbWF0ZUxheWVycyh0aGlzLCBtb25vdG9uaWNUaW1l KTsKICAgICB9CkBAIC0xMDI3LDcgKzEwMjksNyBAQCBwdWJsaWM6CiBwcml2YXRlOgogfTsKIAot VEVTVF9GKENDTGF5ZXJUcmVlSG9zdFRlc3RBZGRBbmltYXRpb25XaXRoVGltaW5nRnVuY3Rpb24s IERJU0FCTEVEX3J1bk11bHRpVGhyZWFkKQorVEVTVF9GKENDTGF5ZXJUcmVlSG9zdFRlc3RBZGRB bmltYXRpb25XaXRoVGltaW5nRnVuY3Rpb24sIHJ1bk11bHRpVGhyZWFkKQogewogICAgIHJ1blRl c3RUaHJlYWRlZCgpOwogfQpAQCAtMTA2NSw4ICsxMDY3LDcgQEAgcHVibGljOgogY2xhc3MgQ0NM YXllclRyZWVIb3N0VGVzdFN5bmNocm9uaXplQW5pbWF0aW9uU3RhcnRUaW1lcyA6IHB1YmxpYyBD Q0xheWVyVHJlZUhvc3RUZXN0VGhyZWFkT25seSB7CiBwdWJsaWM6CiAgICAgQ0NMYXllclRyZWVI b3N0VGVzdFN5bmNocm9uaXplQW5pbWF0aW9uU3RhcnRUaW1lcygpCi0gICAgICAgIDogbV9udW1B bmltYXRlcygwKQotICAgICAgICAsIG1fbGF5ZXJUcmVlSG9zdEltcGwoMCkKKyAgICAgICAgOiBt X2xheWVyVHJlZUhvc3RJbXBsKDApCiAgICAgewogICAgIH0KIApAQCAtMTA3NSwyMCArMTA3Niwx NSBAQCBwdWJsaWM6CiAgICAgICAgIHBvc3RBZGRBbmltYXRpb25Ub01haW5UaHJlYWQoKTsKICAg ICB9CiAKLSAgICB2aXJ0dWFsIHZvaWQgYW5pbWF0ZUxheWVycyhDQ0xheWVyVHJlZUhvc3RJbXBs KiBsYXllclRyZWVIb3N0SW1wbCwgZG91YmxlKQorICAgIC8vIFRoaXMgaXMgZ3VhcmFudGVlZCB0 byBiZSBjYWxsZWQgYmVmb3JlIENDTGF5ZXJUcmVlSG9zdEltcGw6OmFuaW1hdGVMYXllcnMuCisg ICAgdmlydHVhbCB2b2lkIHdpbGxBbmltYXRlTGF5ZXJzKENDTGF5ZXJUcmVlSG9zdEltcGwqIGxh eWVyVHJlZUhvc3RJbXBsLCBkb3VibGUgbW9ub3RvbmljVGltZSkKICAgICB7CiAgICAgICAgIG1f bGF5ZXJUcmVlSG9zdEltcGwgPSBsYXllclRyZWVIb3N0SW1wbDsKLQotICAgICAgICBpZiAoIW1f bnVtQW5pbWF0ZXMpIHsKLSAgICAgICAgICAgIG1fbnVtQW5pbWF0ZXMrKzsKLSAgICAgICAgICAg IHJldHVybjsKLSAgICAgICAgfQogICAgIH0KIAogICAgIHZpcnR1YWwgdm9pZCBub3RpZnlBbmlt YXRpb25TdGFydGVkKGRvdWJsZSB0aW1lKQogICAgIHsKLSAgICAgICAgaWYgKCFtX251bUFuaW1h dGVzKQotICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBFWFBFQ1RfVFJVRShtX2xheWVyVHJl ZUhvc3RJbXBsKTsKIAogICAgICAgICBDQ0xheWVyQW5pbWF0aW9uQ29udHJvbGxlciogY29udHJv bGxlckltcGwgPSBtX2xheWVyVHJlZUhvc3RJbXBsLT5yb290TGF5ZXIoKS0+bGF5ZXJBbmltYXRp b25Db250cm9sbGVyKCk7CiAgICAgICAgIENDTGF5ZXJBbmltYXRpb25Db250cm9sbGVyKiBjb250 cm9sbGVyID0gbV9sYXllclRyZWVIb3N0LT5yb290TGF5ZXIoKS0+bGF5ZXJBbmltYXRpb25Db250 cm9sbGVyKCk7CkBAIC0xMTA1LDcgKzExMDEsNiBAQCBwdWJsaWM6CiAgICAgfQogCiBwcml2YXRl OgotICAgIGludCBtX251bUFuaW1hdGVzOwogICAgIENDTGF5ZXJUcmVlSG9zdEltcGwqIG1fbGF5 ZXJUcmVlSG9zdEltcGw7CiB9OwogCg==