102210 2012-11-14 04:13:32 -0800 Web Inspector: [Timeline] "Show CPU activity on the ruler" settings checkbox does not take effect until Inspector restart 2012-11-28 10:02:46 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 apavlov eustas apavlov caseq eustas keishi loislo pfeldman pmuellr vsevik web-inspector-bugs yurys oldest_to_newest 766733 0 apavlov 2012-11-14 04:13:32 -0800 The checkbox changes should take effect in the real time. 773579 1 175590 eustas.bug 2012-11-21 22:34:29 -0800 Created attachment 175590 Patch 774072 2 175590 pfeldman 2012-11-22 12:24:47 -0800 Comment on attachment 175590 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=175590&action=review > Source/WebCore/inspector/front-end/TimelinePanel.js:138 > + this._mainThreadMonitoringEnabled = WebInspector.settings.showCpuOnTimelineRuler.get() && Capabilities.timelineCanMonitorMainThread; I would check for capability first. > Source/WebCore/inspector/front-end/TimelinePanel.js:160 > + var mainThreadMonitoringEnabled = WebInspector.settings.showCpuOnTimelineRuler.get() && Capabilities.timelineCanMonitorMainThread; I don't think you need a capability check here. 774269 3 175590 eustas 2012-11-23 00:27:32 -0800 Comment on attachment 175590 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=175590&action=review >> Source/WebCore/inspector/front-end/TimelinePanel.js:138 >> + this._mainThreadMonitoringEnabled = WebInspector.settings.showCpuOnTimelineRuler.get() && Capabilities.timelineCanMonitorMainThread; > > I would check for capability first. Done. >> Source/WebCore/inspector/front-end/TimelinePanel.js:160 >> + var mainThreadMonitoringEnabled = WebInspector.settings.showCpuOnTimelineRuler.get() && Capabilities.timelineCanMonitorMainThread; > > I don't think you need a capability check here. Done 774278 4 175746 eustas 2012-11-23 00:38:18 -0800 Created attachment 175746 Patch 774307 5 175746 pfeldman 2012-11-23 01:39:38 -0800 Comment on attachment 175746 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=175746&action=review > Source/WebCore/inspector/front-end/TimelinePanel.js:159 > + _showCpuOnTimelineRulerChanged: function() { { on the next line 774424 6 175746 eustas 2012-11-23 04:27:56 -0800 Comment on attachment 175746 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=175746&action=review >> Source/WebCore/inspector/front-end/TimelinePanel.js:159 >> + _showCpuOnTimelineRulerChanged: function() { > > { on the next line fixed 774425 7 175776 eustas 2012-11-23 04:28:54 -0800 Created attachment 175776 Patch 777418 8 caseq 2012-11-27 17:44:16 -0800 Committed r135959: <http://trac.webkit.org/changeset/135959> 175590 2012-11-21 22:34:29 -0800 2012-11-23 00:38:13 -0800 Patch bug-102210-20121122103214.patch text/plain 5382 eustas.bug U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1NDcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWI4YzczMmJjYTdkYjlm OTZkNzcxYzA2NjFiMTk2MzQwMDdhN2ZkZS4uNjM4ODU3Mjc3MGQ1YmRiNDBmNWNkNjVjMTlkY2Yy Y2M2YmUxMTQ4NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTExLTIxICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXMuYnVnQGdtYWlsLmNvbT4KKworICAgICAgICBXZWIgSW5z cGVjdG9yOiBbVGltZWxpbmVdICJTaG93IENQVSBhY3Rpdml0eSBvbiB0aGUgcnVsZXIiIHNldHRp bmdzIGNoZWNrYm94IGRvZXMgbm90IHRha2UgZWZmZWN0IHVudGlsIEluc3BlY3RvciByZXN0YXJ0 CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDIyMTAK KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgY2hl Y2tib3ggY2hhbmdlcyBzaG91bGQgdGFrZSBlZmZlY3QgaW4gdGhlIHJlYWwgdGltZS4KKworICAg ICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvU2V0dGluZ3NTY3JlZW4uanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuR2VuZXJpY1NldHRpbmdzVGFiKToKKyAgICAgICAgRG8gbm90IHNob3cgY2hl Y2twb3ggaWYgYnJvd3NlciBpcyBub3QgY2FwYWJsZS4KKyAgICAgICAgKiBpbnNwZWN0b3IvZnJv bnQtZW5kL1RpbWVsaW5lUGFuZWwuanM6CisgICAgICAgIEFkZGVkIHNldHRpbmcgY2hhbmdlIGxp c3RlbmVyLgorCiAyMDEyLTExLTIxICBNaWNoYWVsIFBydWV0dCAgPG1pY2hhZWxANjhrLm9yZz4K IAogICAgICAgICBJbmRleGVkREI6IE9idGFpbiBTY3JpcHRTdGF0ZSBmcm9tIElETCBiaW5kaW5n IGdlbmVyYXRvcgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9TZXR0aW5nc1NjcmVlbi5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv U2V0dGluZ3NTY3JlZW4uanMKaW5kZXggOWQwNjgwNWZkM2EyMmFmMzUwNzE4NWVkNDY1OTYwMWIy YjAzODQwMi4uMDJhZTIyMDY1MWI1Y2IwNmVmZWU1MGVmMzMyNTQyMTVmMzBkNDJkYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5nc1NjcmVlbi5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1NldHRpbmdzU2NyZWVu LmpzCkBAIC0zMDgsOCArMzA4LDEwIEBAIFdlYkluc3BlY3Rvci5HZW5lcmljU2V0dGluZ3NUYWIg PSBmdW5jdGlvbigpCiAgICAgaWYgKFdlYkluc3BlY3Rvci5leHBlcmltZW50c1NldHRpbmdzLm5h dGl2ZU1lbW9yeVNuYXBzaG90cy5pc0VuYWJsZWQoKSkKICAgICAgICAgcC5hcHBlbmRDaGlsZCh0 aGlzLl9jcmVhdGVDaGVja2JveFNldHRpbmcoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTaG93IHVu aW5zdHJ1bWVudGVkIG5hdGl2ZSBtZW1vcnkiKSwgV2ViSW5zcGVjdG9yLnNldHRpbmdzLnNob3dO YXRpdmVTbmFwc2hvdFVuaW5zdHJ1bWVudGVkU2l6ZSkpOwogCi0gICAgcCA9IHRoaXMuX2FwcGVu ZFNlY3Rpb24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUaW1lbGluZSIpKTsKLSAgICBwLmFwcGVu ZENoaWxkKHRoaXMuX2NyZWF0ZUNoZWNrYm94U2V0dGluZyhXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlNob3cgQ1BVIGFjdGl2aXR5IG9uIHRoZSBydWxlciIpLCBXZWJJbnNwZWN0b3Iuc2V0dGluZ3Mu c2hvd0NwdU9uVGltZWxpbmVSdWxlcikpOworICAgIGlmIChDYXBhYmlsaXRpZXMudGltZWxpbmVD YW5Nb25pdG9yTWFpblRocmVhZCkgeworICAgICAgICBwID0gdGhpcy5fYXBwZW5kU2VjdGlvbihX ZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlRpbWVsaW5lIikpOworICAgICAgICBwLmFwcGVuZENoaWxk KHRoaXMuX2NyZWF0ZUNoZWNrYm94U2V0dGluZyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNob3cg Q1BVIGFjdGl2aXR5IG9uIHRoZSBydWxlciIpLCBXZWJJbnNwZWN0b3Iuc2V0dGluZ3Muc2hvd0Nw dU9uVGltZWxpbmVSdWxlcikpOworICAgIH0KIAogICAgIHAgPSB0aGlzLl9hcHBlbmRTZWN0aW9u KFdlYkluc3BlY3Rvci5VSVN0cmluZygiQ29uc29sZSIpKTsKICAgICBwLmFwcGVuZENoaWxkKHRo aXMuX2NyZWF0ZUNoZWNrYm94U2V0dGluZyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkxvZyBYTUxI dHRwUmVxdWVzdHMiKSwgV2ViSW5zcGVjdG9yLnNldHRpbmdzLm1vbml0b3JpbmdYSFJFbmFibGVk KSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVs aW5lUGFuZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5l UGFuZWwuanMKaW5kZXggNjRmZWI5ZGZkZjhkZmFhOTBiMGVjZWEwZDJiN2IxZTEzZTI2ZjQ5My4u Mjg1ZGQxZDk1ODMzZjhiNzFlNTljODY3NzVhMDNlZThmNjQzYWYxMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcwpAQCAtMTMx LDExICsxMzEsMTIgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwgPSBmdW5jdGlvbigpCiAg ICAgdGhpcy5fZXhwYW5kT2Zmc2V0ID0gMTU7CiAKICAgICB0aGlzLl9oZWFkZXJMaW5lQ291bnQg PSAxOworICAgIHRoaXMuX2FkanVzdEhlYWRlckhlaWdodCgpOwogCiAgICAgdGhpcy5fbWFpblRo cmVhZFRhc2tzID0gLyoqIEB0eXBlIHshQXJyYXkuPHtzdGFydFRpbWU6IG51bWJlciwgZW5kVGlt ZTogbnVtYmVyfT59ICovIChbXSk7Ci0gICAgdGhpcy5fbWFpblRocmVhZE1vbml0b3JpbmdFbmFi bGVkID0gZmFsc2U7Ci0gICAgaWYgKFdlYkluc3BlY3Rvci5zZXR0aW5ncy5zaG93Q3B1T25UaW1l bGluZVJ1bGVyLmdldCgpICYmIENhcGFiaWxpdGllcy50aW1lbGluZUNhbk1vbml0b3JNYWluVGhy ZWFkKQotICAgICAgICB0aGlzLl9lbmFibGVNYWluVGhyZWFkTW9uaXRvcmluZygpOworICAgIHRo aXMuX2NwdUJhcnNFbGVtZW50ID0gdGhpcy5fdGltZWxpbmVHcmlkLmdyaWRIZWFkZXJFbGVtZW50 LmNyZWF0ZUNoaWxkKCJkaXYiLCAidGltZWxpbmUtY3B1LWJhcnMiKTsKKyAgICB0aGlzLl9tYWlu VGhyZWFkTW9uaXRvcmluZ0VuYWJsZWQgPSBXZWJJbnNwZWN0b3Iuc2V0dGluZ3Muc2hvd0NwdU9u VGltZWxpbmVSdWxlci5nZXQoKSAmJiBDYXBhYmlsaXRpZXMudGltZWxpbmVDYW5Nb25pdG9yTWFp blRocmVhZDsKKyAgICBXZWJJbnNwZWN0b3Iuc2V0dGluZ3Muc2hvd0NwdU9uVGltZWxpbmVSdWxl ci5hZGRDaGFuZ2VMaXN0ZW5lcih0aGlzLl9zaG93Q3B1T25UaW1lbGluZVJ1bGVyQ2hhbmdlZCwg dGhpcyk7CiAKICAgICB0aGlzLl9jcmVhdGVGaWxlU2VsZWN0b3IoKTsKIApAQCAtMTU1LDYgKzE1 NiwxNCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbCA9IGZ1bmN0aW9uKCkKIFdlYkluc3Bl Y3Rvci5UaW1lbGluZVBhbmVsLnJvd0hlaWdodCA9IDE4OwogCiBXZWJJbnNwZWN0b3IuVGltZWxp bmVQYW5lbC5wcm90b3R5cGUgPSB7CisgICAgX3Nob3dDcHVPblRpbWVsaW5lUnVsZXJDaGFuZ2Vk OiBmdW5jdGlvbigpIHsKKyAgICAgICAgdmFyIG1haW5UaHJlYWRNb25pdG9yaW5nRW5hYmxlZCA9 IFdlYkluc3BlY3Rvci5zZXR0aW5ncy5zaG93Q3B1T25UaW1lbGluZVJ1bGVyLmdldCgpICYmIENh cGFiaWxpdGllcy50aW1lbGluZUNhbk1vbml0b3JNYWluVGhyZWFkOworICAgICAgICBpZiAodGhp cy5fbWFpblRocmVhZE1vbml0b3JpbmdFbmFibGVkICE9PSBtYWluVGhyZWFkTW9uaXRvcmluZ0Vu YWJsZWQpIHsKKyAgICAgICAgICAgIHRoaXMuX21haW5UaHJlYWRNb25pdG9yaW5nRW5hYmxlZCA9 IG1haW5UaHJlYWRNb25pdG9yaW5nRW5hYmxlZDsKKyAgICAgICAgICAgIHRoaXMuX3JlZnJlc2hN YWluVGhyZWFkQmFycygpOworICAgICAgICB9CisgICAgfSwKKwogICAgIC8qKgogICAgICAqIEBw YXJhbSB7RXZlbnR9IGV2ZW50CiAgICAgICogQHJldHVybiB7Ym9vbGVhbn0KQEAgLTkwMSw3ICs5 MTAsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAg IHZhciBzdGFydFRpbWUgPSB0aGlzLl9vdmVydmlld1BhbmUud2luZG93U3RhcnRUaW1lKCkgLSB0 aGlzLl90aW1lbGluZVBhZGRpbmdMZWZ0ICogc2NhbGU7CiAgICAgICAgIHZhciBlbmRUaW1lID0g c3RhcnRUaW1lICsgd2lkdGggKiBzY2FsZTsKIAotICAgICAgICB2YXIgdGFza3MgPSB0aGlzLl9t YWluVGhyZWFkVGFza3M7CisgICAgICAgIHZhciB0YXNrcyA9IHRoaXMuX21haW5UaHJlYWRNb25p dG9yaW5nRW5hYmxlZCA/IHRoaXMuX21haW5UaHJlYWRUYXNrcyA6IFtdOwogCiAgICAgICAgIGZ1 bmN0aW9uIGNvbXBhcmVFbmRUaW1lKHZhbHVlLCB0YXNrKQogICAgICAgICB7CkBAIC05NTgsMTEg Kzk2Nyw4IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAg ICAgfQogICAgIH0sCiAKLSAgICBfZW5hYmxlTWFpblRocmVhZE1vbml0b3Jpbmc6IGZ1bmN0aW9u KCkKKyAgICBfYWRqdXN0SGVhZGVySGVpZ2h0OiBmdW5jdGlvbigpCiAgICAgewotICAgICAgICB2 YXIgY29udGFpbmVyID0gdGhpcy5fdGltZWxpbmVHcmlkLmdyaWRIZWFkZXJFbGVtZW50OwotICAg ICAgICB0aGlzLl9jcHVCYXJzRWxlbWVudCA9IGNvbnRhaW5lci5jcmVhdGVDaGlsZCgiZGl2Iiwg InRpbWVsaW5lLWNwdS1iYXJzIik7Ci0KICAgICAgICAgY29uc3QgaGVhZGVyQm9yZGVyV2lkdGgg PSAxOwogICAgICAgICBjb25zdCBoZWFkZXJNYXJnaW4gPSAyOwogCkBAIC05NzAsOCArOTc2LDYg QEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlz LnNpZGViYXJFbGVtZW50LmZpcnN0Q2hpbGQuc3R5bGUuaGVpZ2h0ID0gaGVhZGVySGVpZ2h0ICsg InB4IjsKICAgICAgICAgdGhpcy5fdGltZWxpbmVHcmlkLmRpdmlkZXJzTGFiZWxCYXJFbGVtZW50 LnN0eWxlLmhlaWdodCA9IGhlYWRlckhlaWdodCArIGhlYWRlck1hcmdpbiArICJweCI7CiAgICAg ICAgIHRoaXMuX2l0ZW1zR3JhcGhzRWxlbWVudC5zdHlsZS50b3AgPSBoZWFkZXJIZWlnaHQgKyBo ZWFkZXJCb3JkZXJXaWR0aCArICJweCI7Ci0KLSAgICAgICAgdGhpcy5fbWFpblRocmVhZE1vbml0 b3JpbmdFbmFibGVkID0gdHJ1ZTsKICAgICB9LAogCiAgICAgX2FkanVzdFNjcm9sbFBvc2l0aW9u OiBmdW5jdGlvbih0b3RhbEhlaWdodCkK 175746 2012-11-23 00:38:18 -0800 2012-11-23 04:28:49 -0800 Patch bug-102210-20121123123601.patch text/plain 5347 eustas U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1NTU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGFmNjEwMTkyM2Y4ZmRj ZGMzOWQ2NGZjMDEyNzk2YWM1NmU4MWRmYy4uNjQ4NDQ3MGFlNjVkZDE3ZjlkNDFlYWJlNmVlZWIy OWMwYjQ0Njk3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTExLTIzICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXNAY2hyb21pdW0uY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFtUaW1lbGluZV0gIlNob3cgQ1BVIGFjdGl2aXR5IG9uIHRoZSBydWxlciIgc2V0dGlu Z3MgY2hlY2tib3ggZG9lcyBub3QgdGFrZSBlZmZlY3QgdW50aWwgSW5zcGVjdG9yIHJlc3RhcnQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjIxMAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBjaGVj a2JveCBjaGFuZ2VzIHNob3VsZCB0YWtlIGVmZmVjdCBpbiB0aGUgcmVhbCB0aW1lLgorCisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5nc1NjcmVlbi5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5HZW5lcmljU2V0dGluZ3NUYWIpOgorICAgICAgICBEbyBub3Qgc2hvdyBjaGVj a3BveCBpZiBicm93c2VyIGlzIG5vdCBjYXBhYmxlLgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvVGltZWxpbmVQYW5lbC5qczoKKyAgICAgICAgQWRkZWQgc2V0dGluZyBjaGFuZ2UgbGlz dGVuZXIuCisKIDIwMTItMTEtMjIgIEpvaG4gTWVsbG9yICA8am9obm1lQGNocm9taXVtLm9yZz4K IAogICAgICAgICBUZXh0IEF1dG9zaXppbmc6IEltcHJvdmUgaGFuZGxpbmcgb2YgbmVzdGVkIGNv bW1lbnRzIG9uIHJlZGRpdC5jb20KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU2V0dGluZ3NTY3JlZW4uanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1NldHRpbmdzU2NyZWVuLmpzCmluZGV4IDlkMDY4MDVmZDNhMjJhZjM1MDcxODVl ZDQ2NTk2MDFiMmIwMzg0MDIuLjAyYWUyMjA2NTFiNWNiMDZlZmVlNTBlZjMzMjU0MjE1ZjMwZDQy ZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGlu Z3NTY3JlZW4uanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0 aW5nc1NjcmVlbi5qcwpAQCAtMzA4LDggKzMwOCwxMCBAQCBXZWJJbnNwZWN0b3IuR2VuZXJpY1Nl dHRpbmdzVGFiID0gZnVuY3Rpb24oKQogICAgIGlmIChXZWJJbnNwZWN0b3IuZXhwZXJpbWVudHNT ZXR0aW5ncy5uYXRpdmVNZW1vcnlTbmFwc2hvdHMuaXNFbmFibGVkKCkpCiAgICAgICAgIHAuYXBw ZW5kQ2hpbGQodGhpcy5fY3JlYXRlQ2hlY2tib3hTZXR0aW5nKFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiU2hvdyB1bmluc3RydW1lbnRlZCBuYXRpdmUgbWVtb3J5IiksIFdlYkluc3BlY3Rvci5zZXR0 aW5ncy5zaG93TmF0aXZlU25hcHNob3RVbmluc3RydW1lbnRlZFNpemUpKTsKIAotICAgIHAgPSB0 aGlzLl9hcHBlbmRTZWN0aW9uKFdlYkluc3BlY3Rvci5VSVN0cmluZygiVGltZWxpbmUiKSk7Ci0g ICAgcC5hcHBlbmRDaGlsZCh0aGlzLl9jcmVhdGVDaGVja2JveFNldHRpbmcoV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJTaG93IENQVSBhY3Rpdml0eSBvbiB0aGUgcnVsZXIiKSwgV2ViSW5zcGVjdG9y LnNldHRpbmdzLnNob3dDcHVPblRpbWVsaW5lUnVsZXIpKTsKKyAgICBpZiAoQ2FwYWJpbGl0aWVz LnRpbWVsaW5lQ2FuTW9uaXRvck1haW5UaHJlYWQpIHsKKyAgICAgICAgcCA9IHRoaXMuX2FwcGVu ZFNlY3Rpb24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUaW1lbGluZSIpKTsKKyAgICAgICAgcC5h cHBlbmRDaGlsZCh0aGlzLl9jcmVhdGVDaGVja2JveFNldHRpbmcoV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJTaG93IENQVSBhY3Rpdml0eSBvbiB0aGUgcnVsZXIiKSwgV2ViSW5zcGVjdG9yLnNldHRp bmdzLnNob3dDcHVPblRpbWVsaW5lUnVsZXIpKTsKKyAgICB9CiAKICAgICBwID0gdGhpcy5fYXBw ZW5kU2VjdGlvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNvbnNvbGUiKSk7CiAgICAgcC5hcHBl bmRDaGlsZCh0aGlzLl9jcmVhdGVDaGVja2JveFNldHRpbmcoV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJMb2cgWE1MSHR0cFJlcXVlc3RzIiksIFdlYkluc3BlY3Rvci5zZXR0aW5ncy5tb25pdG9yaW5n WEhSRW5hYmxlZCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9UaW1lbGluZVBhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9UaW1lbGluZVBhbmVsLmpzCmluZGV4IDdjZjkzYjA3M2NjZGM5ZDQ3YzA2MTg3NDRiYzcwZjZj M2YxOTRlMzMuLmRmYWViOGViNGE3YjhhNjhhZWIyZWFiOTdjZDFhYzQ5ODg1NDk3MzAgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwu anMKQEAgLTEzMSwxMSArMTMxLDEyIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsID0gZnVu Y3Rpb24oKQogICAgIHRoaXMuX2V4cGFuZE9mZnNldCA9IDE1OwogCiAgICAgdGhpcy5faGVhZGVy TGluZUNvdW50ID0gMTsKKyAgICB0aGlzLl9hZGp1c3RIZWFkZXJIZWlnaHQoKTsKIAogICAgIHRo aXMuX21haW5UaHJlYWRUYXNrcyA9IC8qKiBAdHlwZSB7IUFycmF5Ljx7c3RhcnRUaW1lOiBudW1i ZXIsIGVuZFRpbWU6IG51bWJlcn0+fSAqLyAoW10pOwotICAgIHRoaXMuX21haW5UaHJlYWRNb25p dG9yaW5nRW5hYmxlZCA9IGZhbHNlOwotICAgIGlmIChXZWJJbnNwZWN0b3Iuc2V0dGluZ3Muc2hv d0NwdU9uVGltZWxpbmVSdWxlci5nZXQoKSAmJiBDYXBhYmlsaXRpZXMudGltZWxpbmVDYW5Nb25p dG9yTWFpblRocmVhZCkKLSAgICAgICAgdGhpcy5fZW5hYmxlTWFpblRocmVhZE1vbml0b3Jpbmco KTsKKyAgICB0aGlzLl9jcHVCYXJzRWxlbWVudCA9IHRoaXMuX3RpbWVsaW5lR3JpZC5ncmlkSGVh ZGVyRWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2IiwgInRpbWVsaW5lLWNwdS1iYXJzIik7CisgICAg dGhpcy5fbWFpblRocmVhZE1vbml0b3JpbmdFbmFibGVkID0gQ2FwYWJpbGl0aWVzLnRpbWVsaW5l Q2FuTW9uaXRvck1haW5UaHJlYWQgJiYgV2ViSW5zcGVjdG9yLnNldHRpbmdzLnNob3dDcHVPblRp bWVsaW5lUnVsZXIuZ2V0KCk7CisgICAgV2ViSW5zcGVjdG9yLnNldHRpbmdzLnNob3dDcHVPblRp bWVsaW5lUnVsZXIuYWRkQ2hhbmdlTGlzdGVuZXIodGhpcy5fc2hvd0NwdU9uVGltZWxpbmVSdWxl ckNoYW5nZWQsIHRoaXMpOwogCiAgICAgdGhpcy5fY3JlYXRlRmlsZVNlbGVjdG9yKCk7CiAKQEAg LTE1NSw2ICsxNTYsMTQgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwgPSBmdW5jdGlvbigp CiBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5yb3dIZWlnaHQgPSAxODsKIAogV2ViSW5zcGVj dG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlID0geworICAgIF9zaG93Q3B1T25UaW1lbGluZVJ1 bGVyQ2hhbmdlZDogZnVuY3Rpb24oKSB7CisgICAgICAgIHZhciBtYWluVGhyZWFkTW9uaXRvcmlu Z0VuYWJsZWQgPSBXZWJJbnNwZWN0b3Iuc2V0dGluZ3Muc2hvd0NwdU9uVGltZWxpbmVSdWxlci5n ZXQoKTsKKyAgICAgICAgaWYgKHRoaXMuX21haW5UaHJlYWRNb25pdG9yaW5nRW5hYmxlZCAhPT0g bWFpblRocmVhZE1vbml0b3JpbmdFbmFibGVkKSB7CisgICAgICAgICAgICB0aGlzLl9tYWluVGhy ZWFkTW9uaXRvcmluZ0VuYWJsZWQgPSBtYWluVGhyZWFkTW9uaXRvcmluZ0VuYWJsZWQ7CisgICAg ICAgICAgICB0aGlzLl9yZWZyZXNoTWFpblRocmVhZEJhcnMoKTsKKyAgICAgICAgfQorICAgIH0s CisKICAgICAvKioKICAgICAgKiBAcGFyYW0ge0V2ZW50fSBldmVudAogICAgICAqIEByZXR1cm4g e2Jvb2xlYW59CkBAIC04OTEsNyArOTAwLDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwu cHJvdG90eXBlID0gewogICAgICAgICB2YXIgc3RhcnRUaW1lID0gdGhpcy5fb3ZlcnZpZXdQYW5l LndpbmRvd1N0YXJ0VGltZSgpIC0gdGhpcy5fdGltZWxpbmVQYWRkaW5nTGVmdCAqIHNjYWxlOwog ICAgICAgICB2YXIgZW5kVGltZSA9IHN0YXJ0VGltZSArIHdpZHRoICogc2NhbGU7CiAKLSAgICAg ICAgdmFyIHRhc2tzID0gdGhpcy5fbWFpblRocmVhZFRhc2tzOworICAgICAgICB2YXIgdGFza3Mg PSB0aGlzLl9tYWluVGhyZWFkTW9uaXRvcmluZ0VuYWJsZWQgPyB0aGlzLl9tYWluVGhyZWFkVGFz a3MgOiBbXTsKIAogICAgICAgICBmdW5jdGlvbiBjb21wYXJlRW5kVGltZSh2YWx1ZSwgdGFzaykK ICAgICAgICAgewpAQCAtOTQ4LDExICs5NTcsOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5l bC5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KICAgICB9LAogCi0gICAgX2VuYWJsZU1haW5UaHJl YWRNb25pdG9yaW5nOiBmdW5jdGlvbigpCisgICAgX2FkanVzdEhlYWRlckhlaWdodDogZnVuY3Rp b24oKQogICAgIHsKLSAgICAgICAgdmFyIGNvbnRhaW5lciA9IHRoaXMuX3RpbWVsaW5lR3JpZC5n cmlkSGVhZGVyRWxlbWVudDsKLSAgICAgICAgdGhpcy5fY3B1QmFyc0VsZW1lbnQgPSBjb250YWlu ZXIuY3JlYXRlQ2hpbGQoImRpdiIsICJ0aW1lbGluZS1jcHUtYmFycyIpOwotCiAgICAgICAgIGNv bnN0IGhlYWRlckJvcmRlcldpZHRoID0gMTsKICAgICAgICAgY29uc3QgaGVhZGVyTWFyZ2luID0g MjsKIApAQCAtOTYwLDggKzk2Niw2IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3Rv dHlwZSA9IHsKICAgICAgICAgdGhpcy5zaWRlYmFyRWxlbWVudC5maXJzdENoaWxkLnN0eWxlLmhl aWdodCA9IGhlYWRlckhlaWdodCArICJweCI7CiAgICAgICAgIHRoaXMuX3RpbWVsaW5lR3JpZC5k aXZpZGVyc0xhYmVsQmFyRWxlbWVudC5zdHlsZS5oZWlnaHQgPSBoZWFkZXJIZWlnaHQgKyBoZWFk ZXJNYXJnaW4gKyAicHgiOwogICAgICAgICB0aGlzLl9pdGVtc0dyYXBoc0VsZW1lbnQuc3R5bGUu dG9wID0gaGVhZGVySGVpZ2h0ICsgaGVhZGVyQm9yZGVyV2lkdGggKyAicHgiOwotCi0gICAgICAg IHRoaXMuX21haW5UaHJlYWRNb25pdG9yaW5nRW5hYmxlZCA9IHRydWU7CiAgICAgfSwKIAogICAg IF9hZGp1c3RTY3JvbGxQb3NpdGlvbjogZnVuY3Rpb24odG90YWxIZWlnaHQpCg== 175776 2012-11-23 04:28:54 -0800 2012-11-28 10:02:46 -0800 Patch bug-102210-20121123162637.patch text/plain 5352 eustas U3VidmVyc2lvbiBSZXZpc2lvbjogMTM1NTU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOGFmNjEwMTkyM2Y4ZmRj ZGMzOWQ2NGZjMDEyNzk2YWM1NmU4MWRmYy4uNjQ4NDQ3MGFlNjVkZDE3ZjlkNDFlYWJlNmVlZWIy OWMwYjQ0Njk3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTExLTIzICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXNAY2hyb21pdW0uY29tPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFtUaW1lbGluZV0gIlNob3cgQ1BVIGFjdGl2aXR5IG9uIHRoZSBydWxlciIgc2V0dGlu Z3MgY2hlY2tib3ggZG9lcyBub3QgdGFrZSBlZmZlY3QgdW50aWwgSW5zcGVjdG9yIHJlc3RhcnQK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMjIxMAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBjaGVj a2JveCBjaGFuZ2VzIHNob3VsZCB0YWtlIGVmZmVjdCBpbiB0aGUgcmVhbCB0aW1lLgorCisgICAg ICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0aW5nc1NjcmVlbi5qczoKKyAgICAgICAgKFdl Ykluc3BlY3Rvci5HZW5lcmljU2V0dGluZ3NUYWIpOgorICAgICAgICBEbyBub3Qgc2hvdyBjaGVj a3BveCBpZiBicm93c2VyIGlzIG5vdCBjYXBhYmxlLgorICAgICAgICAqIGluc3BlY3Rvci9mcm9u dC1lbmQvVGltZWxpbmVQYW5lbC5qczoKKyAgICAgICAgQWRkZWQgc2V0dGluZyBjaGFuZ2UgbGlz dGVuZXIuCisKIDIwMTItMTEtMjIgIEpvaG4gTWVsbG9yICA8am9obm1lQGNocm9taXVtLm9yZz4K IAogICAgICAgICBUZXh0IEF1dG9zaXppbmc6IEltcHJvdmUgaGFuZGxpbmcgb2YgbmVzdGVkIGNv bW1lbnRzIG9uIHJlZGRpdC5jb20KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvU2V0dGluZ3NTY3JlZW4uanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1NldHRpbmdzU2NyZWVuLmpzCmluZGV4IDlkMDY4MDVmZDNhMjJhZjM1MDcxODVl ZDQ2NTk2MDFiMmIwMzg0MDIuLjAyYWUyMjA2NTFiNWNiMDZlZmVlNTBlZjMzMjU0MjE1ZjMwZDQy ZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvU2V0dGlu Z3NTY3JlZW4uanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9TZXR0 aW5nc1NjcmVlbi5qcwpAQCAtMzA4LDggKzMwOCwxMCBAQCBXZWJJbnNwZWN0b3IuR2VuZXJpY1Nl dHRpbmdzVGFiID0gZnVuY3Rpb24oKQogICAgIGlmIChXZWJJbnNwZWN0b3IuZXhwZXJpbWVudHNT ZXR0aW5ncy5uYXRpdmVNZW1vcnlTbmFwc2hvdHMuaXNFbmFibGVkKCkpCiAgICAgICAgIHAuYXBw ZW5kQ2hpbGQodGhpcy5fY3JlYXRlQ2hlY2tib3hTZXR0aW5nKFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiU2hvdyB1bmluc3RydW1lbnRlZCBuYXRpdmUgbWVtb3J5IiksIFdlYkluc3BlY3Rvci5zZXR0 aW5ncy5zaG93TmF0aXZlU25hcHNob3RVbmluc3RydW1lbnRlZFNpemUpKTsKIAotICAgIHAgPSB0 aGlzLl9hcHBlbmRTZWN0aW9uKFdlYkluc3BlY3Rvci5VSVN0cmluZygiVGltZWxpbmUiKSk7Ci0g ICAgcC5hcHBlbmRDaGlsZCh0aGlzLl9jcmVhdGVDaGVja2JveFNldHRpbmcoV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCJTaG93IENQVSBhY3Rpdml0eSBvbiB0aGUgcnVsZXIiKSwgV2ViSW5zcGVjdG9y LnNldHRpbmdzLnNob3dDcHVPblRpbWVsaW5lUnVsZXIpKTsKKyAgICBpZiAoQ2FwYWJpbGl0aWVz LnRpbWVsaW5lQ2FuTW9uaXRvck1haW5UaHJlYWQpIHsKKyAgICAgICAgcCA9IHRoaXMuX2FwcGVu ZFNlY3Rpb24oV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJUaW1lbGluZSIpKTsKKyAgICAgICAgcC5h cHBlbmRDaGlsZCh0aGlzLl9jcmVhdGVDaGVja2JveFNldHRpbmcoV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJTaG93IENQVSBhY3Rpdml0eSBvbiB0aGUgcnVsZXIiKSwgV2ViSW5zcGVjdG9yLnNldHRp bmdzLnNob3dDcHVPblRpbWVsaW5lUnVsZXIpKTsKKyAgICB9CiAKICAgICBwID0gdGhpcy5fYXBw ZW5kU2VjdGlvbihXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNvbnNvbGUiKSk7CiAgICAgcC5hcHBl bmRDaGlsZCh0aGlzLl9jcmVhdGVDaGVja2JveFNldHRpbmcoV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJMb2cgWE1MSHR0cFJlcXVlc3RzIiksIFdlYkluc3BlY3Rvci5zZXR0aW5ncy5tb25pdG9yaW5n WEhSRW5hYmxlZCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250 LWVuZC9UaW1lbGluZVBhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9UaW1lbGluZVBhbmVsLmpzCmluZGV4IDdjZjkzYjA3M2NjZGM5ZDQ3YzA2MTg3NDRiYzcwZjZj M2YxOTRlMzMuLmY2MTZkNDIxOWU0MTU0YmI1NGNhOGQ2MDYwZmUwNGI3YzAzN2VhMDIgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwu anMKQEAgLTEzMSwxMSArMTMxLDEyIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsID0gZnVu Y3Rpb24oKQogICAgIHRoaXMuX2V4cGFuZE9mZnNldCA9IDE1OwogCiAgICAgdGhpcy5faGVhZGVy TGluZUNvdW50ID0gMTsKKyAgICB0aGlzLl9hZGp1c3RIZWFkZXJIZWlnaHQoKTsKIAogICAgIHRo aXMuX21haW5UaHJlYWRUYXNrcyA9IC8qKiBAdHlwZSB7IUFycmF5Ljx7c3RhcnRUaW1lOiBudW1i ZXIsIGVuZFRpbWU6IG51bWJlcn0+fSAqLyAoW10pOwotICAgIHRoaXMuX21haW5UaHJlYWRNb25p dG9yaW5nRW5hYmxlZCA9IGZhbHNlOwotICAgIGlmIChXZWJJbnNwZWN0b3Iuc2V0dGluZ3Muc2hv d0NwdU9uVGltZWxpbmVSdWxlci5nZXQoKSAmJiBDYXBhYmlsaXRpZXMudGltZWxpbmVDYW5Nb25p dG9yTWFpblRocmVhZCkKLSAgICAgICAgdGhpcy5fZW5hYmxlTWFpblRocmVhZE1vbml0b3Jpbmco KTsKKyAgICB0aGlzLl9jcHVCYXJzRWxlbWVudCA9IHRoaXMuX3RpbWVsaW5lR3JpZC5ncmlkSGVh ZGVyRWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2IiwgInRpbWVsaW5lLWNwdS1iYXJzIik7CisgICAg dGhpcy5fbWFpblRocmVhZE1vbml0b3JpbmdFbmFibGVkID0gQ2FwYWJpbGl0aWVzLnRpbWVsaW5l Q2FuTW9uaXRvck1haW5UaHJlYWQgJiYgV2ViSW5zcGVjdG9yLnNldHRpbmdzLnNob3dDcHVPblRp bWVsaW5lUnVsZXIuZ2V0KCk7CisgICAgV2ViSW5zcGVjdG9yLnNldHRpbmdzLnNob3dDcHVPblRp bWVsaW5lUnVsZXIuYWRkQ2hhbmdlTGlzdGVuZXIodGhpcy5fc2hvd0NwdU9uVGltZWxpbmVSdWxl ckNoYW5nZWQsIHRoaXMpOwogCiAgICAgdGhpcy5fY3JlYXRlRmlsZVNlbGVjdG9yKCk7CiAKQEAg LTE1NSw2ICsxNTYsMTUgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwgPSBmdW5jdGlvbigp CiBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5yb3dIZWlnaHQgPSAxODsKIAogV2ViSW5zcGVj dG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlID0geworICAgIF9zaG93Q3B1T25UaW1lbGluZVJ1 bGVyQ2hhbmdlZDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdmFyIG1haW5UaHJlYWRNb25p dG9yaW5nRW5hYmxlZCA9IFdlYkluc3BlY3Rvci5zZXR0aW5ncy5zaG93Q3B1T25UaW1lbGluZVJ1 bGVyLmdldCgpOworICAgICAgICBpZiAodGhpcy5fbWFpblRocmVhZE1vbml0b3JpbmdFbmFibGVk ICE9PSBtYWluVGhyZWFkTW9uaXRvcmluZ0VuYWJsZWQpIHsKKyAgICAgICAgICAgIHRoaXMuX21h aW5UaHJlYWRNb25pdG9yaW5nRW5hYmxlZCA9IG1haW5UaHJlYWRNb25pdG9yaW5nRW5hYmxlZDsK KyAgICAgICAgICAgIHRoaXMuX3JlZnJlc2hNYWluVGhyZWFkQmFycygpOworICAgICAgICB9Cisg ICAgfSwKKwogICAgIC8qKgogICAgICAqIEBwYXJhbSB7RXZlbnR9IGV2ZW50CiAgICAgICogQHJl dHVybiB7Ym9vbGVhbn0KQEAgLTg5MSw3ICs5MDEsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQ YW5lbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBzdGFydFRpbWUgPSB0aGlzLl9vdmVydmll d1BhbmUud2luZG93U3RhcnRUaW1lKCkgLSB0aGlzLl90aW1lbGluZVBhZGRpbmdMZWZ0ICogc2Nh bGU7CiAgICAgICAgIHZhciBlbmRUaW1lID0gc3RhcnRUaW1lICsgd2lkdGggKiBzY2FsZTsKIAot ICAgICAgICB2YXIgdGFza3MgPSB0aGlzLl9tYWluVGhyZWFkVGFza3M7CisgICAgICAgIHZhciB0 YXNrcyA9IHRoaXMuX21haW5UaHJlYWRNb25pdG9yaW5nRW5hYmxlZCA/IHRoaXMuX21haW5UaHJl YWRUYXNrcyA6IFtdOwogCiAgICAgICAgIGZ1bmN0aW9uIGNvbXBhcmVFbmRUaW1lKHZhbHVlLCB0 YXNrKQogICAgICAgICB7CkBAIC05NDgsMTEgKzk1OCw4IEBAIFdlYkluc3BlY3Rvci5UaW1lbGlu ZVBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgfQogICAgIH0sCiAKLSAgICBfZW5hYmxlTWFp blRocmVhZE1vbml0b3Jpbmc6IGZ1bmN0aW9uKCkKKyAgICBfYWRqdXN0SGVhZGVySGVpZ2h0OiBm dW5jdGlvbigpCiAgICAgewotICAgICAgICB2YXIgY29udGFpbmVyID0gdGhpcy5fdGltZWxpbmVH cmlkLmdyaWRIZWFkZXJFbGVtZW50OwotICAgICAgICB0aGlzLl9jcHVCYXJzRWxlbWVudCA9IGNv bnRhaW5lci5jcmVhdGVDaGlsZCgiZGl2IiwgInRpbWVsaW5lLWNwdS1iYXJzIik7Ci0KICAgICAg ICAgY29uc3QgaGVhZGVyQm9yZGVyV2lkdGggPSAxOwogICAgICAgICBjb25zdCBoZWFkZXJNYXJn aW4gPSAyOwogCkBAIC05NjAsOCArOTY3LDYgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwu cHJvdG90eXBlID0gewogICAgICAgICB0aGlzLnNpZGViYXJFbGVtZW50LmZpcnN0Q2hpbGQuc3R5 bGUuaGVpZ2h0ID0gaGVhZGVySGVpZ2h0ICsgInB4IjsKICAgICAgICAgdGhpcy5fdGltZWxpbmVH cmlkLmRpdmlkZXJzTGFiZWxCYXJFbGVtZW50LnN0eWxlLmhlaWdodCA9IGhlYWRlckhlaWdodCAr IGhlYWRlck1hcmdpbiArICJweCI7CiAgICAgICAgIHRoaXMuX2l0ZW1zR3JhcGhzRWxlbWVudC5z dHlsZS50b3AgPSBoZWFkZXJIZWlnaHQgKyBoZWFkZXJCb3JkZXJXaWR0aCArICJweCI7Ci0KLSAg ICAgICAgdGhpcy5fbWFpblRocmVhZE1vbml0b3JpbmdFbmFibGVkID0gdHJ1ZTsKICAgICB9LAog CiAgICAgX2FkanVzdFNjcm9sbFBvc2l0aW9uOiBmdW5jdGlvbih0b3RhbEhlaWdodCkK