47299 2010-10-06 13:39:01 -0700 Screensaver starts while watching fullscreen playback 2010-10-07 10:40:04 -0700 1 1 1 Unclassified WebKit Media 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED http://www.apple.com/apple-events/september-2010 InRadar, PlatformOnly P2 Normal --- 1 jer.noble jer.noble mitz webkit.review.bot oldest_to_newest 290553 0 jer.noble 2010-10-06 13:39:01 -0700 9/25/10 7:25 PM Les Leposo: Somehow I thought this used to work well: i.e. screensaver never started while I was watching a fullscreen stream/video. But if it's not a regression, then it's definitely worth fixing since it is frustratingly microsoftesque. <rdar://problem/8478956> 290556 1 69984 jer.noble 2010-10-06 13:48:41 -0700 Created attachment 69984 Patch 290564 2 webkit.review.bot 2010-10-06 14:01:30 -0700 Attachment 69984 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit/mac/WebView/WebVideoFullscreenController.h:52: _idleSystemSleepAssertion is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] WebKit/mac/WebView/WebVideoFullscreenController.h:53: _tickleTimer is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 2 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 290683 3 69984 darin 2010-10-06 16:54:14 -0700 Comment on attachment 69984 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=69984&action=review > WebKit/mac/WebView/WebVideoFullscreenController.h:53 > + NSTimer* _tickleTimer; Our style is to put spaces before the "*" for Objective-C types like this. Maybe we should change that style, but we have not yet done that. > WebKit/mac/WebView/WebVideoFullscreenController.mm:46 > +static NSTimeInterval kTickleTimerInterval = 1.0; This should be static const, not just static. Also, we don’t use “k” for such things in WebKit. > WebKit/mac/WebView/WebVideoFullscreenController.mm:86 > + [_tickleTimer invalidate]; This needs to release the timer. > WebKit/mac/WebView/WebVideoFullscreenController.mm:387 > + [_tickleTimer invalidate]; > + _tickleTimer = [NSTimer scheduledTimerWithTimeInterval:kTickleTimerInterval target:self selector:@selector(_tickleTimerFired) userInfo:nil repeats:YES]; This needs to release the old timer and retain the new timer. > WebKit/mac/WebView/WebVideoFullscreenController.mm:393 > + [_tickleTimer invalidate]; > + _tickleTimer = nil; This needs to release the timer. 290707 4 jer.noble 2010-10-06 17:12:45 -0700 (In reply to comment #3) > (From update of attachment 69984 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=69984&action=review > > > WebKit/mac/WebView/WebVideoFullscreenController.h:53 > > + NSTimer* _tickleTimer; > > Our style is to put spaces before the "*" for Objective-C types like this. Maybe we should change that style, but we have not yet done that. Whoops, right; Changed. > > WebKit/mac/WebView/WebVideoFullscreenController.mm:46 > > +static NSTimeInterval kTickleTimerInterval = 1.0; > > This should be static const, not just static. Also, we don’t use “k” for such things in WebKit. Changed. > > WebKit/mac/WebView/WebVideoFullscreenController.mm:86 > > + [_tickleTimer invalidate]; > > This needs to release the timer. The NSTimer is retained by the NSRunLoop which it is attached to. The run loop will release its reference when invalidate is called. > > WebKit/mac/WebView/WebVideoFullscreenController.mm:387 > > + [_tickleTimer invalidate]; > > + _tickleTimer = [NSTimer scheduledTimerWithTimeInterval:kTickleTimerInterval target:self selector:@selector(_tickleTimerFired) userInfo:nil repeats:YES]; > > This needs to release the old timer and retain the new timer. The scheduledTimerWithTimeInterval: method adds the new timer to the current NSRunLoop, which retains it. Do we really need to retain and release the timer twice? > > WebKit/mac/WebView/WebVideoFullscreenController.mm:393 > > + [_tickleTimer invalidate]; > > + _tickleTimer = nil; > > This needs to release the timer. This should be the same as the -dealloc case. (i.e. the NSRunLoop will release the timer.) 290714 5 jer.noble 2010-10-06 17:22:08 -0700 Looking through the WebKit source, it looks like everywhere else explicitly retains the results of +scheduledTimerWithInterval:. I've changed my patch to match. 290715 6 70018 jer.noble 2010-10-06 17:27:00 -0700 Created attachment 70018 Patch 290720 7 webkit.review.bot 2010-10-06 17:29:43 -0700 Attachment 70018 did not pass style-queue: Failed to run "['WebKitTools/Scripts/check-webkit-style']" exit_code: 1 WebKit/mac/WebView/WebVideoFullscreenController.h:52: _idleSystemSleepAssertion is incorrectly named. Don't use underscores in your identifier names. [readability/naming] [4] Total errors found: 1 in 3 files If any of these errors are false positives, please file a bug against check-webkit-style. 291115 8 jer.noble 2010-10-07 10:40:04 -0700 Committed r69318: <http://trac.webkit.org/changeset/69318> 69984 2010-10-06 13:48:41 -0700 2010-10-06 17:26:58 -0700 Patch bug-47299-20101006134840.patch text/plain 3627 jer.noble SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA2OTIyOSkKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTAtMTAtMDYgIEplciBOb2JsZSAgPGplci5ub2Js ZUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgU2NyZWVuc2F2ZXIgc3RhcnRzIHdoaWxlIHdhdGNoaW5nIGZ1bGxzY3JlZW4gcGxheWJh Y2suCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NzI5 OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODQ3ODk1Nj4KKworICAgICAgICBUbyBkaXNhYmxl IHRoZSBTY3JlZW4gU2F2ZXIsIHdlIG5lZWQgdG8gcGVyaW9kaWNhbGx5IGNhbGwgVXBkYXRlU3lz dGVtQWN0aXZpdHkoKS4gIAorCisgICAgICAgICogV2ViVmlldy9XZWJWaWRlb0Z1bGxzY3JlZW5D b250cm9sbGVyLmg6IEFkZGVkIF90aWNrbGVUaW1lci4KKyAgICAgICAgKiBXZWJWaWV3L1dlYlZp ZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW06CisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNjcmVl bkNvbnRyb2xsZXIgZGVhbGxvY10pOiBJbnZhbGlkYXRlIF90aWNrbGVUaW1lci4KKyAgICAgICAg KC1bV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlciBfZW5hYmxlVGlja2xlVGltZXJdKTogQ3Jl YXRlIF90aWNrbGVUaW1lci4gCisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xs ZXIgX2Rpc2FibGVUaWNrbGVUaW1lcl0pOiBJbnZhbGlkYXRlIF90aWNrbGVUaW1lci4KKyAgICAg ICAgKC1bV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlciBfdGlja2xlVGltZXJGaXJlZF0pOiBD YWxsIFVwZGF0ZVN5c3RlbUFjdGl2aXR5KCkuCisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNjcmVl bkNvbnRyb2xsZXIgdXBkYXRlUG93ZXJBc3NlcnRpb25zXSk6IENhbGwgX2VuYWJsZVRpY2tsZVRp bWVyIAorICAgICAgICAgICAgb3IgX2Rpc2FibGVUaWNrbGVUaW1lci4KKwogMjAxMC0xMC0wNSAg UGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgTWFydGluIFJvYmluc29uLgpJbmRleDogV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZGVv RnVsbHNjcmVlbkNvbnRyb2xsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL1dlYlZpZXcv V2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5oCShyZXZpc2lvbiA2ODkyOCkKKysrIFdlYktp dC9tYWMvV2ViVmlldy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyLmgJKHdvcmtpbmcgY29w eSkKQEAgLTQ5LDcgKzQ5LDggQEAgQGludGVyZmFjZSBXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9s bGVyIAogICAgIEJPT0wgX2lzV2luZG93TG9hZGVkOwogICAgIEJPT0wgX2ZvcmNlRGlzYWJsZUFu aW1hdGlvbjsKICAgICB1aW50MzJfdCBfaWRsZURpc3BsYXlTbGVlcEFzc2VydGlvbjsKLSAgICB1 aW50MzJfdCBfaWRsZVN5c3RlbVNsZWVwQXNzZXJ0aW9uOyAgICAKKyAgICB1aW50MzJfdCBfaWRs ZVN5c3RlbVNsZWVwQXNzZXJ0aW9uOworICAgIE5TVGltZXIqIF90aWNrbGVUaW1lcjsKICAgICBT eXN0ZW1VSU1vZGUgX3NhdmVkVUlNb2RlOwogICAgIFN5c3RlbVVJT3B0aW9ucyBfc2F2ZWRVSU9w dGlvbnM7CiB9CkluZGV4OiBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxsc2NyZWVuQ29u dHJvbGxlci5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxs c2NyZWVuQ29udHJvbGxlci5tbQkocmV2aXNpb24gNjg5MjgpCisrKyBXZWJLaXQvbWFjL1dlYlZp ZXcvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5tbQkod29ya2luZyBjb3B5KQpAQCAtNDMs NiArNDMsNyBAQCBTT0ZUX0xJTktfQ0xBU1MoUVRLaXQsIFFUTW92aWVMYXllcikKIFNPRlRfTElO S19QT0lOVEVSKFFUS2l0LCBRVE1vdmllUmF0ZURpZENoYW5nZU5vdGlmaWNhdGlvbiwgTlNTdHJp bmcgKikKIAogI2RlZmluZSBRVE1vdmllUmF0ZURpZENoYW5nZU5vdGlmaWNhdGlvbiBnZXRRVE1v dmllUmF0ZURpZENoYW5nZU5vdGlmaWNhdGlvbigpCitzdGF0aWMgTlNUaW1lSW50ZXJ2YWwga1Rp Y2tsZVRpbWVySW50ZXJ2YWwgPSAxLjA7CiAKIEBpbnRlcmZhY2UgV2ViVmlkZW9GdWxsc2NyZWVu V2luZG93IDogTlNXaW5kb3cKICNpZiAhZGVmaW5lZChCVUlMRElOR19PTl9MRU9QQVJEKSAmJiAh ZGVmaW5lZChCVUlMRElOR19PTl9USUdFUikKQEAgLTgyLDYgKzgzLDcgQEAgLSAodm9pZClkZWFs bG9jCiB7CiAgICAgQVNTRVJUKCFfYmFja2dyb3VuZEZ1bGxzY3JlZW5XaW5kb3cpOwogICAgIEFT U0VSVCghX2ZhZGVBbmltYXRpb24pOworICAgIFtfdGlja2xlVGltZXIgaW52YWxpZGF0ZV07CiAg ICAgW1tOU05vdGlmaWNhdGlvbkNlbnRlciBkZWZhdWx0Q2VudGVyXSByZW1vdmVPYnNlcnZlcjpz ZWxmXTsKICAgICBbc3VwZXIgZGVhbGxvY107CiB9CkBAIC0zNzgsNiArMzgwLDIzIEBAIC0gKHZv aWQpX2VuYWJsZUlkbGVTeXN0ZW1TbGVlcAogICAgICAgICBfaWRsZVN5c3RlbVNsZWVwQXNzZXJ0 aW9uID0ga0lPUE1OdWxsQXNzZXJ0aW9uSUQ7CiAgICAgfQogfQorCistICh2b2lkKV9lbmFibGVU aWNrbGVUaW1lcgoreworICAgIFtfdGlja2xlVGltZXIgaW52YWxpZGF0ZV07CisgICAgX3RpY2ts ZVRpbWVyID0gW05TVGltZXIgc2NoZWR1bGVkVGltZXJXaXRoVGltZUludGVydmFsOmtUaWNrbGVU aW1lckludGVydmFsIHRhcmdldDpzZWxmIHNlbGVjdG9yOkBzZWxlY3RvcihfdGlja2xlVGltZXJG aXJlZCkgdXNlckluZm86bmlsIHJlcGVhdHM6WUVTXTsKK30KKworLSAodm9pZClfZGlzYWJsZVRp Y2tsZVRpbWVyCit7CisgICAgW190aWNrbGVUaW1lciBpbnZhbGlkYXRlXTsKKyAgICBfdGlja2xl VGltZXIgPSBuaWw7Cit9CisKKy0gKHZvaWQpX3RpY2tsZVRpbWVyRmlyZWQKK3sKKyAgICBVcGRh dGVTeXN0ZW1BY3Rpdml0eShPdmVyYWxsQWN0KTsKK30KICNlbmRpZgogCiAtICh2b2lkKXVwZGF0 ZVBvd2VyQXNzZXJ0aW9ucwpAQCAtMzkwLDkgKzQwOSwxMSBAQCAtICh2b2lkKXVwZGF0ZVBvd2Vy QXNzZXJ0aW9ucwogICAgIGlmIChyYXRlICYmICFfaXNFbmRpbmdGdWxsc2NyZWVuKSB7CiAgICAg ICAgIFtzZWxmIF9kaXNhYmxlSWRsZVN5c3RlbVNsZWVwXTsKICAgICAgICAgW3NlbGYgX2Rpc2Fi bGVJZGxlRGlzcGxheVNsZWVwXTsKKyAgICAgICAgW3NlbGYgX2Rpc2FibGVUaWNrbGVUaW1lcl07 CiAgICAgfSBlbHNlIHsKICAgICAgICAgW3NlbGYgX2VuYWJsZUlkbGVTeXN0ZW1TbGVlcF07CiAg ICAgICAgIFtzZWxmIF9lbmFibGVJZGxlRGlzcGxheVNsZWVwXTsKKyAgICAgICAgW3NlbGYgX2Vu YWJsZVRpY2tsZVRpbWVyXTsKICAgICB9CiAjZW5kaWYKIH0K 70018 2010-10-06 17:27:00 -0700 2010-10-06 17:38:07 -0700 Patch bug-47299-20101006172659.patch text/plain 3752 jer.noble SW5kZXg6IFdlYktpdC9tYWMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9tYWMvQ2hh bmdlTG9nCShyZXZpc2lvbiA2OTIyOSkKKysrIFdlYktpdC9tYWMvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTAtMTAtMDYgIEplciBOb2JsZSAgPGplci5ub2Js ZUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgU2NyZWVuc2F2ZXIgc3RhcnRzIHdoaWxlIHdhdGNoaW5nIGZ1bGxzY3JlZW4gcGxheWJh Y2suCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NzI5 OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vODQ3ODk1Nj4KKworICAgICAgICBUbyBkaXNhYmxl IHRoZSBTY3JlZW4gU2F2ZXIsIHdlIG5lZWQgdG8gcGVyaW9kaWNhbGx5IGNhbGwgVXBkYXRlU3lz dGVtQWN0aXZpdHkoKS4gIAorCisgICAgICAgICogV2ViVmlldy9XZWJWaWRlb0Z1bGxzY3JlZW5D b250cm9sbGVyLmg6IEFkZGVkIF90aWNrbGVUaW1lci4KKyAgICAgICAgKiBXZWJWaWV3L1dlYlZp ZGVvRnVsbHNjcmVlbkNvbnRyb2xsZXIubW06CisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNjcmVl bkNvbnRyb2xsZXIgZGVhbGxvY10pOiBJbnZhbGlkYXRlIF90aWNrbGVUaW1lci4KKyAgICAgICAg KC1bV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlciBfZW5hYmxlVGlja2xlVGltZXJdKTogQ3Jl YXRlIF90aWNrbGVUaW1lci4gCisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNjcmVlbkNvbnRyb2xs ZXIgX2Rpc2FibGVUaWNrbGVUaW1lcl0pOiBJbnZhbGlkYXRlIF90aWNrbGVUaW1lci4KKyAgICAg ICAgKC1bV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlciBfdGlja2xlVGltZXJGaXJlZF0pOiBD YWxsIFVwZGF0ZVN5c3RlbUFjdGl2aXR5KCkuCisgICAgICAgICgtW1dlYlZpZGVvRnVsbHNjcmVl bkNvbnRyb2xsZXIgdXBkYXRlUG93ZXJBc3NlcnRpb25zXSk6IENhbGwgX2VuYWJsZVRpY2tsZVRp bWVyIAorICAgICAgICAgICAgb3IgX2Rpc2FibGVUaWNrbGVUaW1lci4KKwogMjAxMC0xMC0wNSAg UGhpbGlwcGUgTm9ybWFuZCAgPHBub3JtYW5kQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgTWFydGluIFJvYmluc29uLgpJbmRleDogV2ViS2l0L21hYy9XZWJWaWV3L1dlYlZpZGVv RnVsbHNjcmVlbkNvbnRyb2xsZXIuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL1dlYlZpZXcv V2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5oCShyZXZpc2lvbiA2ODkyOCkKKysrIFdlYktp dC9tYWMvV2ViVmlldy9XZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9sbGVyLmgJKHdvcmtpbmcgY29w eSkKQEAgLTQ5LDcgKzQ5LDggQEAgQGludGVyZmFjZSBXZWJWaWRlb0Z1bGxzY3JlZW5Db250cm9s bGVyIAogICAgIEJPT0wgX2lzV2luZG93TG9hZGVkOwogICAgIEJPT0wgX2ZvcmNlRGlzYWJsZUFu aW1hdGlvbjsKICAgICB1aW50MzJfdCBfaWRsZURpc3BsYXlTbGVlcEFzc2VydGlvbjsKLSAgICB1 aW50MzJfdCBfaWRsZVN5c3RlbVNsZWVwQXNzZXJ0aW9uOyAgICAKKyAgICB1aW50MzJfdCBfaWRs ZVN5c3RlbVNsZWVwQXNzZXJ0aW9uOworICAgIE5TVGltZXIgKl90aWNrbGVUaW1lcjsKICAgICBT eXN0ZW1VSU1vZGUgX3NhdmVkVUlNb2RlOwogICAgIFN5c3RlbVVJT3B0aW9ucyBfc2F2ZWRVSU9w dGlvbnM7CiB9CkluZGV4OiBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxsc2NyZWVuQ29u dHJvbGxlci5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvbWFjL1dlYlZpZXcvV2ViVmlkZW9GdWxs c2NyZWVuQ29udHJvbGxlci5tbQkocmV2aXNpb24gNjg5MjgpCisrKyBXZWJLaXQvbWFjL1dlYlZp ZXcvV2ViVmlkZW9GdWxsc2NyZWVuQ29udHJvbGxlci5tbQkod29ya2luZyBjb3B5KQpAQCAtNDMs NiArNDMsNyBAQCBTT0ZUX0xJTktfQ0xBU1MoUVRLaXQsIFFUTW92aWVMYXllcikKIFNPRlRfTElO S19QT0lOVEVSKFFUS2l0LCBRVE1vdmllUmF0ZURpZENoYW5nZU5vdGlmaWNhdGlvbiwgTlNTdHJp bmcgKikKIAogI2RlZmluZSBRVE1vdmllUmF0ZURpZENoYW5nZU5vdGlmaWNhdGlvbiBnZXRRVE1v dmllUmF0ZURpZENoYW5nZU5vdGlmaWNhdGlvbigpCitzdGF0aWMgY29uc3QgTlNUaW1lSW50ZXJ2 YWwgdGlja2xlVGltZXJJbnRlcnZhbCA9IDEuMDsKIAogQGludGVyZmFjZSBXZWJWaWRlb0Z1bGxz Y3JlZW5XaW5kb3cgOiBOU1dpbmRvdwogI2lmICFkZWZpbmVkKEJVSUxESU5HX09OX0xFT1BBUkQp ICYmICFkZWZpbmVkKEJVSUxESU5HX09OX1RJR0VSKQpAQCAtODIsNiArODMsOSBAQCAtICh2b2lk KWRlYWxsb2MKIHsKICAgICBBU1NFUlQoIV9iYWNrZ3JvdW5kRnVsbHNjcmVlbldpbmRvdyk7CiAg ICAgQVNTRVJUKCFfZmFkZUFuaW1hdGlvbik7CisgICAgW190aWNrbGVUaW1lciBpbnZhbGlkYXRl XTsKKyAgICBbX3RpY2tsZVRpbWVyIHJlbGVhc2VdOworICAgIF90aWNrbGVUaW1lciA9IG5pbDsK ICAgICBbW05TTm90aWZpY2F0aW9uQ2VudGVyIGRlZmF1bHRDZW50ZXJdIHJlbW92ZU9ic2VydmVy OnNlbGZdOwogICAgIFtzdXBlciBkZWFsbG9jXTsKIH0KQEAgLTM3OCw2ICszODIsMjUgQEAgLSAo dm9pZClfZW5hYmxlSWRsZVN5c3RlbVNsZWVwCiAgICAgICAgIF9pZGxlU3lzdGVtU2xlZXBBc3Nl cnRpb24gPSBrSU9QTU51bGxBc3NlcnRpb25JRDsKICAgICB9CiB9CisKKy0gKHZvaWQpX2VuYWJs ZVRpY2tsZVRpbWVyCit7CisgICAgW190aWNrbGVUaW1lciBpbnZhbGlkYXRlXTsKKyAgICBbX3Rp Y2tsZVRpbWVyIHJlbGVhc2VdOworICAgIF90aWNrbGVUaW1lciA9IFtbTlNUaW1lciBzY2hlZHVs ZWRUaW1lcldpdGhUaW1lSW50ZXJ2YWw6dGlja2xlVGltZXJJbnRlcnZhbCB0YXJnZXQ6c2VsZiBz ZWxlY3RvcjpAc2VsZWN0b3IoX3RpY2tsZVRpbWVyRmlyZWQpIHVzZXJJbmZvOm5pbCByZXBlYXRz OllFU10gcmV0YWluXTsKK30KKworLSAodm9pZClfZGlzYWJsZVRpY2tsZVRpbWVyCit7CisgICAg W190aWNrbGVUaW1lciBpbnZhbGlkYXRlXTsKKyAgICBbX3RpY2tsZVRpbWVyIHJlbGVhc2VdOwor ICAgIF90aWNrbGVUaW1lciA9IG5pbDsKK30KKworLSAodm9pZClfdGlja2xlVGltZXJGaXJlZAor eworICAgIFVwZGF0ZVN5c3RlbUFjdGl2aXR5KE92ZXJhbGxBY3QpOworfQogI2VuZGlmCiAKIC0g KHZvaWQpdXBkYXRlUG93ZXJBc3NlcnRpb25zCkBAIC0zOTAsOSArNDEzLDExIEBAIC0gKHZvaWQp dXBkYXRlUG93ZXJBc3NlcnRpb25zCiAgICAgaWYgKHJhdGUgJiYgIV9pc0VuZGluZ0Z1bGxzY3Jl ZW4pIHsKICAgICAgICAgW3NlbGYgX2Rpc2FibGVJZGxlU3lzdGVtU2xlZXBdOwogICAgICAgICBb c2VsZiBfZGlzYWJsZUlkbGVEaXNwbGF5U2xlZXBdOworICAgICAgICBbc2VsZiBfZGlzYWJsZVRp Y2tsZVRpbWVyXTsKICAgICB9IGVsc2UgewogICAgICAgICBbc2VsZiBfZW5hYmxlSWRsZVN5c3Rl bVNsZWVwXTsKICAgICAgICAgW3NlbGYgX2VuYWJsZUlkbGVEaXNwbGF5U2xlZXBdOworICAgICAg ICBbc2VsZiBfZW5hYmxlVGlja2xlVGltZXJdOwogICAgIH0KICNlbmRpZgogfQo=