82606 2012-03-29 06:17:23 -0700 Web Inspector: use canvas to render bars in "vertical overview" mode 2012-03-29 06:48:02 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 caseq caseq apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 591106 0 caseq 2012-03-29 06:17:23 -0700 This gives us better accuracy when mapping window selection to bars compared to flex boxes and slightly improves performance. This also gives us better control over spacing between bars. 591108 1 134561 caseq 2012-03-29 06:18:57 -0700 Created attachment 134561 Patch 591109 2 134561 pfeldman 2012-03-29 06:21:42 -0700 Comment on attachment 134561 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=134561&action=review > Source/WebCore/ChangeLog:8 > + * inspector/front-end/TimelineOverviewPane.js: What and why did change? It sounds like you need to generate some text here even for trivial changes like this. 591114 3 134563 caseq 2012-03-29 06:28:46 -0700 Created attachment 134563 Patch 591116 4 caseq 2012-03-29 06:31:21 -0700 (In reply to comment #2) > (From update of attachment 134561 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=134561&action=review > > > Source/WebCore/ChangeLog:8 > > + * inspector/front-end/TimelineOverviewPane.js: > > What and why did change? It sounds like you need to generate some text here even for trivial changes like this. I added a couple of lines there. Please let me know if this is more comprehensible now or if you see a better summary for what was done. 591129 5 caseq 2012-03-29 06:48:02 -0700 Committed r112528: <http://trac.webkit.org/changeset/112528> 134561 2012-03-29 06:18:57 -0700 2012-03-29 06:28:39 -0700 Patch bug-82606-20120329171855.patch text/plain 9193 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNTE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTRkN2YyZjNhMjQ0MjRl YjE4MWUwYjMyZDg3YTYwYTY3YTdhOGI5My4uZjlmZjBhNjA1NmY1ZTE2MWNkN2M0Yzg4M2ZlNzk4 M2E2MGJmYjRjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTAzLTI5ICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogdXNlIGNhbnZhcyB0byByZW5kZXIgYmFycyBpbiAidmVydGljYWwgb3ZlcnZpZXciIG1vZGUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgyNjA2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL1RpbWVsaW5lT3ZlcnZpZXdQYW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlRpbWVsaW5lVmVydGljYWxPdmVydmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGlt ZWxpbmVWZXJ0aWNhbE92ZXJ2aWV3LnByb3RvdHlwZS51cGRhdGUpOgorICAgICAgICAoV2ViSW5z cGVjdG9yLlRpbWVsaW5lVmVydGljYWxPdmVydmlldy5wcm90b3R5cGUuX3JlbmRlckJhcnMpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmVydGljYWxPdmVydmlldy5wcm90b3R5cGUu X3JlbmRlckJhcik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVWZXJ0aWNhbE92ZXJ2 aWV3LnByb3RvdHlwZS5nZXRXaW5kb3dUaW1lcyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC90aW1lbGluZVBhbmVsLmNzczoKKyAgICAgICAgKC50aW1lbGluZS12ZXJ0aWNhbC1vdmVy dmlldy1iYXJzKToKKwogMjAxMi0wMy0yOCAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5j b20+CiAKICAgICAgICAgU3BsaXQgV2ViS2l0Q1NTS2V5ZnJhbWVSdWxlIGludG8gaW50ZXJuYWwg YW5kIENTU09NIHR5cGVzIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvVGltZWxpbmVPdmVydmlld1BhbmUuanMKaW5kZXggNzEyMWZmNGI2YWMxYWE3 NTU4OGZmMDIwYTU0OGJjZjhmNTVjYWY0Yy4uNTM2MDJjZDgyMzg2ODUyNzAyYWQ4NTc4OTZkZDBh NTFiZjY1ZmVjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1RpbWVsaW5lT3ZlcnZpZXdQYW5lLmpzCkBAIC03OTksMTAgKzc5OSwyOCBAQCBX ZWJJbnNwZWN0b3IuSGVhcEdyYXBoLnByb3RvdHlwZSA9IHsKICAqLwogV2ViSW5zcGVjdG9yLlRp bWVsaW5lVmVydGljYWxPdmVydmlldyA9IGZ1bmN0aW9uKG1vZGVsKSB7CiAgICAgV2ViSW5zcGVj dG9yLlZpZXcuY2FsbCh0aGlzKTsKLSAgICB0aGlzLmVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVF bGVtZW50KCJkaXYiKTsKKyAgICB0aGlzLmVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJjYW52YXMiKTsKICAgICB0aGlzLmVsZW1lbnQuY2xhc3NOYW1lID0gInRpbWVsaW5lLXZlcnRp Y2FsLW92ZXJ2aWV3LWJhcnMgZmlsbCI7Ci0gICAgdGhpcy5yZXNldCgpOwogICAgIHRoaXMuX21v ZGVsID0gbW9kZWw7CisgICAgdGhpcy5yZXNldCgpOworCisgICAgdGhpcy5fbWF4SW5uZXJCYXJX aWR0aCA9IDEwOworICAgIHRoaXMuX2NvbnRleHQgPSB0aGlzLmVsZW1lbnQuZ2V0Q29udGV4dCgi MmQiKTsKKyAgICB0aGlzLl9maWxsU3R5bGVzID0ge307CisgICAgdGhpcy5fZmlsbFN0eWxlcy5s b2FkaW5nID0gdGhpcy5fY29udGV4dC5jcmVhdGVMaW5lYXJHcmFkaWVudCgwLCAwLCB0aGlzLl9t YXhJbm5lckJhcldpZHRoLCAwKTsKKyAgICB0aGlzLl9maWxsU3R5bGVzLmxvYWRpbmcuYWRkQ29s b3JTdG9wKDAsICJyZ2IoMjAxLCAyMjAsIDI0NSkiKTsKKyAgICB0aGlzLl9maWxsU3R5bGVzLmxv YWRpbmcuYWRkQ29sb3JTdG9wKDEsICJyZ2IoMTA5LCAxNTcsIDIyMikiKTsKKyAgICB0aGlzLl9m aWxsU3R5bGVzLnNjcmlwdGluZyA9IHRoaXMuX2NvbnRleHQuY3JlYXRlTGluZWFyR3JhZGllbnQo MCwgMCwgdGhpcy5fbWF4SW5uZXJCYXJXaWR0aCwgMCk7CisgICAgdGhpcy5fZmlsbFN0eWxlcy5z Y3JpcHRpbmcuYWRkQ29sb3JTdG9wKDAsICJyZ2IoMjUxLCAyMjIsIDE2OCkiKTsKKyAgICB0aGlz Ll9maWxsU3R5bGVzLnNjcmlwdGluZy5hZGRDb2xvclN0b3AoMSwgInJnYigyMzQsIDE4MiwgNzcp Iik7CisgICAgdGhpcy5fZmlsbFN0eWxlcy5yZW5kZXJpbmcgPSB0aGlzLl9jb250ZXh0LmNyZWF0 ZUxpbmVhckdyYWRpZW50KDAsIDAsIHRoaXMuX21heElubmVyQmFyV2lkdGgsIDApOworICAgIHRo aXMuX2ZpbGxTdHlsZXMucmVuZGVyaW5nLmFkZENvbG9yU3RvcCgwLCAicmdiKDIxMywgMTg1LCAy MzYpIik7CisgICAgdGhpcy5fZmlsbFN0eWxlcy5yZW5kZXJpbmcuYWRkQ29sb3JTdG9wKDEsICJy Z2IoMTM3LCA2MiwgMjAwKSIpOworCisgICAgdGhpcy5fYm9yZGVyU3R5bGVzID0ge307CisgICAg dGhpcy5fYm9yZGVyU3R5bGVzLmxvYWRpbmcgPSAicmdiKDEwNiwgMTUyLCAyMTMpIjsKKyAgICB0 aGlzLl9ib3JkZXJTdHlsZXMuc2NyaXB0aW5nID0gInJnYigyMjMsIDE3NSwgNzcpIjsKKyAgICB0 aGlzLl9ib3JkZXJTdHlsZXMucmVuZGVyaW5nID0gInJnYigxMzAsIDU5LCAxOTApIjsKIH0KIAog V2ViSW5zcGVjdG9yLlRpbWVsaW5lVmVydGljYWxPdmVydmlldy5wcm90b3R5cGUgPSB7CkBAIC04 MzMsMTggKzg1MSwxNCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVWZXJ0aWNhbE92ZXJ2aWV3LnBy b3RvdHlwZSA9IHsKICAgICAgICAgY29uc3QgbWluQmFyV2lkdGggPSA0OwogICAgICAgICB0aGlz Ll9yZWNvcmRzUGVyQmFyID0gTWF0aC5tYXgoMSwgcmVjb3JkQ291bnQgKiBtaW5CYXJXaWR0aCAv IHRoaXMuZWxlbWVudC5jbGllbnRXaWR0aCk7CiAgICAgICAgIHZhciBudW1iZXJPZkJhcnMgPSBN YXRoLmNlaWwocmVjb3JkQ291bnQgLyB0aGlzLl9yZWNvcmRzUGVyQmFyKTsKLQogICAgICAgICB0 aGlzLl9iYXJUaW1lcyA9IFtdOwogICAgICAgICB0aGlzLl9sb25nZXN0QmFyVGltZSA9IDA7Ci0g ICAgICAgIHRoaXMuZWxlbWVudC5yZW1vdmVDaGlsZHJlbigpOwotICAgICAgICB2YXIgcGFkZGlu ZyA9IHRoaXMuZWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2IiwgInBhZGRpbmciKTsKKyAgICAgICAg dmFyIGJhckhlaWdodHMgPSBmcmFtZUNvdW50ID8gdGhpcy5fYWdncmVnYXRlRnJhbWVzKHJlY29y ZHMsIG51bWJlck9mQmFycykgOiB0aGlzLl9hZ2dyZWdhdGVSZWNvcmRzKHJlY29yZHMsIG51bWJl ck9mQmFycyk7CiAKLSAgICAgICAgdmFyIHN0YXRpc3RpY3MgPSBmcmFtZUNvdW50ID8gdGhpcy5f YWdncmVnYXRlRnJhbWVzKHJlY29yZHMsIG51bWJlck9mQmFycykgOiB0aGlzLl9hZ2dyZWdhdGVS ZWNvcmRzKHJlY29yZHMsIG51bWJlck9mQmFycyk7CiAgICAgICAgIGNvbnN0IHBhZGRpbmdUb3Ag PSA0OwogICAgICAgICB2YXIgc2NhbGUgPSAodGhpcy5lbGVtZW50LmNsaWVudEhlaWdodCAtIHBh ZGRpbmdUb3ApIC8gdGhpcy5fbG9uZ2VzdEJhclRpbWU7CiAKLSAgICAgICAgZm9yICh2YXIgaSA9 IDA7IGkgPCBzdGF0aXN0aWNzLmxlbmd0aDsgKytpKQotICAgICAgICAgICAgdGhpcy5lbGVtZW50 Lmluc2VydEJlZm9yZSh0aGlzLl9idWlsZEJhcihzdGF0aXN0aWNzW2ldLCBzY2FsZSksIHBhZGRp bmcpOworICAgICAgICB0aGlzLl9yZW5kZXJCYXJzKGJhckhlaWdodHMsIHNjYWxlKTsKICAgICB9 LAogCiAgICAgd2FzU2hvd246IGZ1bmN0aW9uKCkKQEAgLTk1MSwyMCArOTY1LDQ0IEBAIFdlYklu c3BlY3Rvci5UaW1lbGluZVZlcnRpY2FsT3ZlcnZpZXcucHJvdG90eXBlID0gewogICAgICAgICBy ZXR1cm4gc3RhdGlzdGljczsKICAgICB9LAogCi0gICAgX2J1aWxkQmFyOiBmdW5jdGlvbihzdGF0 aXN0aWNzLCBzY2FsZSkKKyAgICBfcmVuZGVyQmFyczogZnVuY3Rpb24oYWxsQmFySGVpZ2h0cywg c2NhbGUpCiAgICAgewotICAgICAgICB2YXIgb3V0ZXIgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJkaXYiKTsKLSAgICAgICAgb3V0ZXIuY2xhc3NOYW1lID0gInRpbWVsaW5lLWJhci12ZXJ0aWNh bCI7Ci0gICAgICAgIHZhciBjYXRlZ29yaWVzID0gT2JqZWN0LmtleXMoc3RhdGlzdGljcyk7Ci0g ICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgY2F0ZWdvcmllcy5sZW5ndGg7ICsraSkgeworICAg ICAgICAvLyBVc2UgcmVhbCB3b3JsZCwgMToxIGNvb3JkaW5hdGVzIGluIGNhbnZhcy4gVGhpcyB3 aWxsIGFsc28gdGFrZSBjYXJlIG9mIGNsZWFyaW5nIGl0LgorICAgICAgICB0aGlzLmVsZW1lbnQu d2lkdGggPSB0aGlzLmVsZW1lbnQuY2xpZW50V2lkdGg7CisgICAgICAgIHRoaXMuZWxlbWVudC5o ZWlnaHQgPSB0aGlzLmVsZW1lbnQuY2xpZW50SGVpZ2h0OworCisgICAgICAgIGNvbnN0IG1heFBh ZGRpbmcgPSA1OworICAgICAgICB0aGlzLl9hY3R1YWxCYXJXaWR0aCA9IE1hdGgubWluKCh0aGlz LmVsZW1lbnQud2lkdGggLSAyICogbWF4UGFkZGluZykgLyBhbGxCYXJIZWlnaHRzLmxlbmd0aCwg dGhpcy5fbWF4SW5uZXJCYXJXaWR0aCArIG1heFBhZGRpbmcpOworICAgICAgICB2YXIgcGFkZGlu ZyA9IE1hdGgubWluKE1hdGguZmxvb3IodGhpcy5fYWN0dWFsQmFyV2lkdGggLyAzKSwgbWF4UGFk ZGluZyk7CisgICAgICAgIAorICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IGFsbEJhckhlaWdo dHMubGVuZ3RoOyArK2kpCisgICAgICAgICAgICB0aGlzLl9yZW5kZXJCYXIobWF4UGFkZGluZyAr IHRoaXMuX2FjdHVhbEJhcldpZHRoICogaSwgdGhpcy5fYWN0dWFsQmFyV2lkdGggLSBwYWRkaW5n ICwgYWxsQmFySGVpZ2h0c1tpXSwgc2NhbGUpOworICAgIH0sCisKKyAgICBfcmVuZGVyQmFyOiBm dW5jdGlvbihsZWZ0LCB3aWR0aCwgYmFySGVpZ2h0cywgc2NhbGUpCisgICAgeworICAgICAgICB2 YXIgY2F0ZWdvcmllcyA9IE9iamVjdC5rZXlzKGJhckhlaWdodHMpOworICAgICAgICBpZiAoIWNh dGVnb3JpZXMubGVuZ3RoKQorICAgICAgICAgICAgcmV0dXJuOworICAgICAgICBmb3IgKHZhciBp ID0gMCwgYm90dG9tT2Zmc2V0ID0gdGhpcy5lbGVtZW50LmhlaWdodDsgaSA8IGNhdGVnb3JpZXMu bGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAgIHZhciBjYXRlZ29yeSA9IGNhdGVnb3JpZXNbaV07 Ci0gICAgICAgICAgICB2YXIgZHVyYXRpb24gPSBzdGF0aXN0aWNzW2NhdGVnb3J5XTsKKyAgICAg ICAgICAgIHZhciBkdXJhdGlvbiA9IGJhckhlaWdodHNbY2F0ZWdvcnldOworICAgICAgICAgICAg CiAgICAgICAgICAgICBpZiAoIWR1cmF0aW9uKQogICAgICAgICAgICAgICAgIGNvbnRpbnVlOwot ICAgICAgICAgICAgdmFyIGJhciA9IG91dGVyLmNyZWF0ZUNoaWxkKCJkaXYiLCAidGltZWxpbmUt IiArIGNhdGVnb3J5KTsKLSAgICAgICAgICAgIGJhci5zdHlsZS5oZWlnaHQgPSAoc3RhdGlzdGlj c1tjYXRlZ29yeV0gKiBzY2FsZSkgKyAicHgiOworICAgICAgICAgICAgdmFyIGhlaWdodCA9IGR1 cmF0aW9uICogc2NhbGU7CisKKyAgICAgICAgICAgIHRoaXMuX2NvbnRleHQuc2F2ZSgpOworICAg ICAgICAgICAgdGhpcy5fY29udGV4dC50cmFuc2xhdGUoTWF0aC5mbG9vcihsZWZ0KSArIDAuNSwg MCk7CisgICAgICAgICAgICB0aGlzLl9jb250ZXh0LnNjYWxlKHdpZHRoIC8gdGhpcy5fbWF4SW5u ZXJCYXJXaWR0aCwgMSk7CisgICAgICAgICAgICB0aGlzLl9jb250ZXh0LmZpbGxTdHlsZSA9IHRo aXMuX2ZpbGxTdHlsZXNbY2F0ZWdvcnldOworICAgICAgICAgICAgdGhpcy5fY29udGV4dC5maWxs UmVjdCgwLCBib3R0b21PZmZzZXQgLSBoZWlnaHQsIHRoaXMuX21heElubmVyQmFyV2lkdGgsIGhl aWdodCk7CisgICAgICAgICAgICB0aGlzLl9jb250ZXh0LnJlc3RvcmUoKTsKKworICAgICAgICAg ICAgdGhpcy5fY29udGV4dC5zdHJva2VTdHlsZSA9IHRoaXMuX2JvcmRlclN0eWxlc1tjYXRlZ29y eV07CisgICAgICAgICAgICB0aGlzLl9jb250ZXh0LnN0cm9rZVJlY3QoTWF0aC5mbG9vcihsZWZ0 KSArIDAuNSwgTWF0aC5mbG9vcihib3R0b21PZmZzZXQgLSBoZWlnaHQpICsgMC41LCBNYXRoLmZs b29yKHdpZHRoKSwgTWF0aC5mbG9vcihoZWlnaHQpKTsKKyAgICAgICAgICAgIGJvdHRvbU9mZnNl dCAtPSBoZWlnaHQgLSAxOwogICAgICAgICB9Ci0gICAgICAgIHJldHVybiBvdXRlcjsKICAgICB9 LAogCiAgICAgZ2V0V2luZG93VGltZXM6IGZ1bmN0aW9uKHdpbmRvd0xlZnQsIHdpbmRvd1JpZ2h0 KQpAQCAtOTczLDE0ICsxMDExLDggQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmVydGljYWxPdmVy dmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBsZWZ0T2Zmc2V0ID0gd2luZG93TGVmdCAq IHdpbmRvd1NwYW47CiAgICAgICAgIHZhciByaWdodE9mZnNldCA9IHdpbmRvd1JpZ2h0ICogd2lu ZG93U3BhbjsKICAgICAgICAgdmFyIGJhcnMgPSB0aGlzLmVsZW1lbnQuY2hpbGRyZW47Ci0gICAg ICAgIHZhciBvZmZzZXQwID0gYmFyc1swXSA/IGJhcnNbMF0ub2Zmc2V0TGVmdCA6IDQ7Ci0gICAg ICAgIHZhciBiYXJXaWR0aCA9IDk7Ci0gICAgICAgIGlmIChiYXJzLmxlbmd0aCA+IDIpIHsKLSAg ICAgICAgICAgIHZhciBvZmZzZXQxID0gYmFyc1tiYXJzLmxlbmd0aCAtIDJdLm9mZnNldExlZnQ7 Ci0gICAgICAgICAgICBiYXJXaWR0aCA9IChvZmZzZXQxIC0gb2Zmc2V0MCkgLyAoYmFycy5sZW5n dGggLSAyKTsKLSAgICAgICAgfQotICAgICAgICB2YXIgZmlyc3RCYXIgPSBNYXRoLmZsb29yKE1h dGgubWF4KGxlZnRPZmZzZXQgLSBvZmZzZXQwLCAwKSAvIGJhcldpZHRoKTsKLSAgICAgICAgdmFy IGxhc3RCYXIgPSBNYXRoLm1pbihNYXRoLmNlaWwoKHJpZ2h0T2Zmc2V0IC0gb2Zmc2V0MCAtIDIp IC8gYmFyV2lkdGgpLCB0aGlzLl9iYXJUaW1lcy5sZW5ndGggLSAxKTsKKyAgICAgICAgdmFyIGZp cnN0QmFyID0gTWF0aC5mbG9vcihNYXRoLm1heChsZWZ0T2Zmc2V0LCAwKSAvIHRoaXMuX2FjdHVh bEJhcldpZHRoKTsKKyAgICAgICAgdmFyIGxhc3RCYXIgPSBNYXRoLm1pbihNYXRoLmNlaWwoKHJp Z2h0T2Zmc2V0IC0gMikgLyB0aGlzLl9hY3R1YWxCYXJXaWR0aCksIHRoaXMuX2JhclRpbWVzLmxl bmd0aCAtIDEpOwogICAgICAgICBjb25zdCBzbmFwVG9SaWdodFRvbGVyYW5jZVBpeGVscyA9IDM7 CiAgICAgICAgIHJldHVybiB7CiAgICAgICAgICAgICBzdGFydFRpbWU6IGZpcnN0QmFyID49IHRo aXMuX2JhclRpbWVzLmxlbmd0aCA/IEluZmluaXR5IDogdGhpcy5fYmFyVGltZXNbZmlyc3RCYXJd LnN0YXJ0VGltZSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvdGltZWxpbmVQYW5lbC5jc3MgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L3RpbWVsaW5lUGFuZWwuY3NzCmluZGV4IDljZjI2ZWM3NzhiNTBjNzU3NzRlMDAxMTQ3ZTRlYmY2 MWVhMjQwNGQuLjM0ZjU2YWNjNTYyYzJlMjllMDJiOTRlZTVjNmEzYzk1ZTMxZjQzYTEgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdGltZWxpbmVQYW5lbC5j c3MKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC90aW1lbGluZVBhbmVs LmNzcwpAQCAtNTg2LDQ2ICs1ODYsMTAgQEAKIH0KIAogLnRpbWVsaW5lLXZlcnRpY2FsLW92ZXJ2 aWV3LWJhcnMgewotICAgIGRpc3BsYXk6IC13ZWJraXQtYm94OwotICAgIC13ZWJraXQtYm94LWFs aWduOiBlbmQ7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogd2hpdGU7Ci0gICAgcGFkZGluZy1sZWZ0 OiA0cHg7Ci0gICAgcGFkZGluZy1yaWdodDogNHB4OwogICAgIHotaW5kZXg6IDIwMDsKICAgICBi YWNrZ3JvdW5kLWNvbG9yOiByZ2JhKDI1NSwgMjU1LCAyNTUsIDAuOCk7Ci19Ci0KLS50aW1lbGlu ZS12ZXJ0aWNhbC1vdmVydmlldy1iYXJzIC5wYWRkaW5nIHsKLSAgICAtd2Via2l0LWJveC1mbGV4 OiAxMDAwMDA7Ci19Ci0KLS50aW1lbGluZS12ZXJ0aWNhbC1vdmVydmlldy1iYXJzIC50aW1lbGlu ZS1iYXItdmVydGljYWwgewotICAgIGRpc3BsYXk6IC13ZWJraXQtYm94OwotICAgIC13ZWJraXQt Ym94LW9yaWVudDogdmVydGljYWw7Ci0gICAgLXdlYmtpdC1ib3gtcGFjazogZW5kOwotICAgIHdp ZHRoOiAxMnB4OwotICAgIHBhZGRpbmctcmlnaHQ6IDJweDsKLSAgICAtd2Via2l0LWJveC1mbGV4 OiAxOwotfQotCi0udGltZWxpbmUtYmFyLXZlcnRpY2FsIGRpdjpmaXJzdC1jaGlsZCB7Ci0gICAg LXdlYmtpdC1ib3JkZXItdG9wLWxlZnQtcmFkaXVzOiAycHg7Ci0gICAgLXdlYmtpdC1ib3JkZXIt dG9wLXJpZ2h0LXJhZGl1czogMnB4OwotfQotCi0udGltZWxpbmUtYmFyLXZlcnRpY2FsIC50aW1l bGluZS1sb2FkaW5nIHsKLSAgICBiYWNrZ3JvdW5kOiAtd2Via2l0LWxpbmVhci1ncmFkaWVudChs ZWZ0LCByZ2IoMjAxLCAyMjAsIDI0NSksIHJnYigxMDksIDE1NywgMjIyKSk7Ci0gICAgYm9yZGVy OiBzb2xpZCAxcHggcmdiKDEwNiwgMTUyLCAyMTMpOwotfQotCi0udGltZWxpbmUtYmFyLXZlcnRp Y2FsIC50aW1lbGluZS1zY3JpcHRpbmcgewotICAgIGJhY2tncm91bmQ6IC13ZWJraXQtbGluZWFy LWdyYWRpZW50KGxlZnQsIHJnYigyNTEsIDIyMiwgMTY4KSwgcmdiKDIzNCwgMTgyLCA3NykpOwot ICAgIGJvcmRlcjogc29saWQgMXB4IHJnYigyMjMsIDE3NSwgNzcpOwotfQotCi0udGltZWxpbmUt YmFyLXZlcnRpY2FsIC50aW1lbGluZS1yZW5kZXJpbmcgewotICAgIGJhY2tncm91bmQ6IC13ZWJr aXQtbGluZWFyLWdyYWRpZW50KGxlZnQsIHJnYigyMTMsIDE4NSwgMjM2KSwgcmdiKDEzNywgNjIs IDIwMCkpOwotICAgIGJvcmRlcjogc29saWQgMXB4IHJnYigxMzAsIDU5LCAxOTApOworICAgIHdp ZHRoOiAxMDAlOworICAgIGhlaWdodDogMTAwJTsKIH0KIAogLnRpbWVsaW5lIC5yZXNvdXJjZXMt ZXZlbnQtZGl2aWRlciB7Cg== 134563 2012-03-29 06:28:46 -0700 2012-03-29 06:39:39 -0700 Patch bug-82606-20120329172844.patch text/plain 9328 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNTE4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTRkN2YyZjNhMjQ0MjRl YjE4MWUwYjMyZDg3YTYwYTY3YTdhOGI5My4uZTNkMTdiMjk1NDkxMDhmNjg2YjYwZjI4OWY2NGQ2 M2YwZmE2M2MzMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDEyLTAzLTI5ICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogdXNlIGNhbnZhcyB0byByZW5kZXIgYmFycyBpbiAidmVydGljYWwgb3ZlcnZpZXciIG1vZGUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgyNjA2CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL1RpbWVsaW5lT3ZlcnZpZXdQYW5lLmpzOiBVc2UgY2FudmFzIGluc3RlYWQg b2YgRE9NIGZvciByZW5kZXJpbmcgdmVydGljYWwgb3ZlcnZpZXcgYmFycy4KKyAgICAgICAgKFdl Ykluc3BlY3Rvci5UaW1lbGluZVZlcnRpY2FsT3ZlcnZpZXcpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlRpbWVsaW5lVmVydGljYWxPdmVydmlldy5wcm90b3R5cGUudXBkYXRlKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UaW1lbGluZVZlcnRpY2FsT3ZlcnZpZXcucHJvdG90eXBlLl9yZW5kZXJC YXJzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVZlcnRpY2FsT3ZlcnZpZXcucHJv dG90eXBlLl9yZW5kZXJCYXIpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmVydGlj YWxPdmVydmlldy5wcm90b3R5cGUuZ2V0V2luZG93VGltZXMpOgorICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvdGltZWxpbmVQYW5lbC5jc3M6IERyb3Agc3R5bGVzIHByZXZpb3VzbHkgdXNl ZCBmb3IgRE9NLWJhc2VkIHZlcnRpY2FsIG92ZXJ2aWV3IHJlbmRlcmluZy4KKyAgICAgICAgKC50 aW1lbGluZS12ZXJ0aWNhbC1vdmVydmlldy1iYXJzKToKKwogMjAxMi0wMy0yOCAgQW50dGkgS29p dmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgU3BsaXQgV2ViS2l0Q1NTS2V5ZnJh bWVSdWxlIGludG8gaW50ZXJuYWwgYW5kIENTU09NIHR5cGVzIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5qcyBiL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVPdmVydmlld1BhbmUuanMK aW5kZXggNzEyMWZmNGI2YWMxYWE3NTU4OGZmMDIwYTU0OGJjZjhmNTVjYWY0Yy4uNTM2MDJjZDgy Mzg2ODUyNzAyYWQ4NTc4OTZkZDBhNTFiZjY1ZmVjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lT3ZlcnZpZXdQYW5lLmpzCkBA IC03OTksMTAgKzc5OSwyOCBAQCBXZWJJbnNwZWN0b3IuSGVhcEdyYXBoLnByb3RvdHlwZSA9IHsK ICAqLwogV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmVydGljYWxPdmVydmlldyA9IGZ1bmN0aW9uKG1v ZGVsKSB7CiAgICAgV2ViSW5zcGVjdG9yLlZpZXcuY2FsbCh0aGlzKTsKLSAgICB0aGlzLmVsZW1l bnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKKyAgICB0aGlzLmVsZW1lbnQgPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJjYW52YXMiKTsKICAgICB0aGlzLmVsZW1lbnQuY2xhc3NO YW1lID0gInRpbWVsaW5lLXZlcnRpY2FsLW92ZXJ2aWV3LWJhcnMgZmlsbCI7Ci0gICAgdGhpcy5y ZXNldCgpOwogICAgIHRoaXMuX21vZGVsID0gbW9kZWw7CisgICAgdGhpcy5yZXNldCgpOworCisg ICAgdGhpcy5fbWF4SW5uZXJCYXJXaWR0aCA9IDEwOworICAgIHRoaXMuX2NvbnRleHQgPSB0aGlz LmVsZW1lbnQuZ2V0Q29udGV4dCgiMmQiKTsKKyAgICB0aGlzLl9maWxsU3R5bGVzID0ge307Cisg ICAgdGhpcy5fZmlsbFN0eWxlcy5sb2FkaW5nID0gdGhpcy5fY29udGV4dC5jcmVhdGVMaW5lYXJH cmFkaWVudCgwLCAwLCB0aGlzLl9tYXhJbm5lckJhcldpZHRoLCAwKTsKKyAgICB0aGlzLl9maWxs U3R5bGVzLmxvYWRpbmcuYWRkQ29sb3JTdG9wKDAsICJyZ2IoMjAxLCAyMjAsIDI0NSkiKTsKKyAg ICB0aGlzLl9maWxsU3R5bGVzLmxvYWRpbmcuYWRkQ29sb3JTdG9wKDEsICJyZ2IoMTA5LCAxNTcs IDIyMikiKTsKKyAgICB0aGlzLl9maWxsU3R5bGVzLnNjcmlwdGluZyA9IHRoaXMuX2NvbnRleHQu Y3JlYXRlTGluZWFyR3JhZGllbnQoMCwgMCwgdGhpcy5fbWF4SW5uZXJCYXJXaWR0aCwgMCk7Cisg ICAgdGhpcy5fZmlsbFN0eWxlcy5zY3JpcHRpbmcuYWRkQ29sb3JTdG9wKDAsICJyZ2IoMjUxLCAy MjIsIDE2OCkiKTsKKyAgICB0aGlzLl9maWxsU3R5bGVzLnNjcmlwdGluZy5hZGRDb2xvclN0b3Ao MSwgInJnYigyMzQsIDE4MiwgNzcpIik7CisgICAgdGhpcy5fZmlsbFN0eWxlcy5yZW5kZXJpbmcg PSB0aGlzLl9jb250ZXh0LmNyZWF0ZUxpbmVhckdyYWRpZW50KDAsIDAsIHRoaXMuX21heElubmVy QmFyV2lkdGgsIDApOworICAgIHRoaXMuX2ZpbGxTdHlsZXMucmVuZGVyaW5nLmFkZENvbG9yU3Rv cCgwLCAicmdiKDIxMywgMTg1LCAyMzYpIik7CisgICAgdGhpcy5fZmlsbFN0eWxlcy5yZW5kZXJp bmcuYWRkQ29sb3JTdG9wKDEsICJyZ2IoMTM3LCA2MiwgMjAwKSIpOworCisgICAgdGhpcy5fYm9y ZGVyU3R5bGVzID0ge307CisgICAgdGhpcy5fYm9yZGVyU3R5bGVzLmxvYWRpbmcgPSAicmdiKDEw NiwgMTUyLCAyMTMpIjsKKyAgICB0aGlzLl9ib3JkZXJTdHlsZXMuc2NyaXB0aW5nID0gInJnYigy MjMsIDE3NSwgNzcpIjsKKyAgICB0aGlzLl9ib3JkZXJTdHlsZXMucmVuZGVyaW5nID0gInJnYigx MzAsIDU5LCAxOTApIjsKIH0KIAogV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmVydGljYWxPdmVydmll dy5wcm90b3R5cGUgPSB7CkBAIC04MzMsMTggKzg1MSwxNCBAQCBXZWJJbnNwZWN0b3IuVGltZWxp bmVWZXJ0aWNhbE92ZXJ2aWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgY29uc3QgbWluQmFyV2lk dGggPSA0OwogICAgICAgICB0aGlzLl9yZWNvcmRzUGVyQmFyID0gTWF0aC5tYXgoMSwgcmVjb3Jk Q291bnQgKiBtaW5CYXJXaWR0aCAvIHRoaXMuZWxlbWVudC5jbGllbnRXaWR0aCk7CiAgICAgICAg IHZhciBudW1iZXJPZkJhcnMgPSBNYXRoLmNlaWwocmVjb3JkQ291bnQgLyB0aGlzLl9yZWNvcmRz UGVyQmFyKTsKLQogICAgICAgICB0aGlzLl9iYXJUaW1lcyA9IFtdOwogICAgICAgICB0aGlzLl9s b25nZXN0QmFyVGltZSA9IDA7Ci0gICAgICAgIHRoaXMuZWxlbWVudC5yZW1vdmVDaGlsZHJlbigp OwotICAgICAgICB2YXIgcGFkZGluZyA9IHRoaXMuZWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2Iiwg InBhZGRpbmciKTsKKyAgICAgICAgdmFyIGJhckhlaWdodHMgPSBmcmFtZUNvdW50ID8gdGhpcy5f YWdncmVnYXRlRnJhbWVzKHJlY29yZHMsIG51bWJlck9mQmFycykgOiB0aGlzLl9hZ2dyZWdhdGVS ZWNvcmRzKHJlY29yZHMsIG51bWJlck9mQmFycyk7CiAKLSAgICAgICAgdmFyIHN0YXRpc3RpY3Mg PSBmcmFtZUNvdW50ID8gdGhpcy5fYWdncmVnYXRlRnJhbWVzKHJlY29yZHMsIG51bWJlck9mQmFy cykgOiB0aGlzLl9hZ2dyZWdhdGVSZWNvcmRzKHJlY29yZHMsIG51bWJlck9mQmFycyk7CiAgICAg ICAgIGNvbnN0IHBhZGRpbmdUb3AgPSA0OwogICAgICAgICB2YXIgc2NhbGUgPSAodGhpcy5lbGVt ZW50LmNsaWVudEhlaWdodCAtIHBhZGRpbmdUb3ApIC8gdGhpcy5fbG9uZ2VzdEJhclRpbWU7CiAK LSAgICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBzdGF0aXN0aWNzLmxlbmd0aDsgKytpKQotICAg ICAgICAgICAgdGhpcy5lbGVtZW50Lmluc2VydEJlZm9yZSh0aGlzLl9idWlsZEJhcihzdGF0aXN0 aWNzW2ldLCBzY2FsZSksIHBhZGRpbmcpOworICAgICAgICB0aGlzLl9yZW5kZXJCYXJzKGJhckhl aWdodHMsIHNjYWxlKTsKICAgICB9LAogCiAgICAgd2FzU2hvd246IGZ1bmN0aW9uKCkKQEAgLTk1 MSwyMCArOTY1LDQ0IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVZlcnRpY2FsT3ZlcnZpZXcucHJv dG90eXBlID0gewogICAgICAgICByZXR1cm4gc3RhdGlzdGljczsKICAgICB9LAogCi0gICAgX2J1 aWxkQmFyOiBmdW5jdGlvbihzdGF0aXN0aWNzLCBzY2FsZSkKKyAgICBfcmVuZGVyQmFyczogZnVu Y3Rpb24oYWxsQmFySGVpZ2h0cywgc2NhbGUpCiAgICAgewotICAgICAgICB2YXIgb3V0ZXIgPSBk b2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKLSAgICAgICAgb3V0ZXIuY2xhc3NOYW1lID0g InRpbWVsaW5lLWJhci12ZXJ0aWNhbCI7Ci0gICAgICAgIHZhciBjYXRlZ29yaWVzID0gT2JqZWN0 LmtleXMoc3RhdGlzdGljcyk7Ci0gICAgICAgIGZvciAodmFyIGkgPSAwOyBpIDwgY2F0ZWdvcmll cy5sZW5ndGg7ICsraSkgeworICAgICAgICAvLyBVc2UgcmVhbCB3b3JsZCwgMToxIGNvb3JkaW5h dGVzIGluIGNhbnZhcy4gVGhpcyB3aWxsIGFsc28gdGFrZSBjYXJlIG9mIGNsZWFyaW5nIGl0Lgor ICAgICAgICB0aGlzLmVsZW1lbnQud2lkdGggPSB0aGlzLmVsZW1lbnQuY2xpZW50V2lkdGg7Cisg ICAgICAgIHRoaXMuZWxlbWVudC5oZWlnaHQgPSB0aGlzLmVsZW1lbnQuY2xpZW50SGVpZ2h0Owor CisgICAgICAgIGNvbnN0IG1heFBhZGRpbmcgPSA1OworICAgICAgICB0aGlzLl9hY3R1YWxCYXJX aWR0aCA9IE1hdGgubWluKCh0aGlzLmVsZW1lbnQud2lkdGggLSAyICogbWF4UGFkZGluZykgLyBh bGxCYXJIZWlnaHRzLmxlbmd0aCwgdGhpcy5fbWF4SW5uZXJCYXJXaWR0aCArIG1heFBhZGRpbmcp OworICAgICAgICB2YXIgcGFkZGluZyA9IE1hdGgubWluKE1hdGguZmxvb3IodGhpcy5fYWN0dWFs QmFyV2lkdGggLyAzKSwgbWF4UGFkZGluZyk7CisgICAgICAgIAorICAgICAgICBmb3IgKHZhciBp ID0gMDsgaSA8IGFsbEJhckhlaWdodHMubGVuZ3RoOyArK2kpCisgICAgICAgICAgICB0aGlzLl9y ZW5kZXJCYXIobWF4UGFkZGluZyArIHRoaXMuX2FjdHVhbEJhcldpZHRoICogaSwgdGhpcy5fYWN0 dWFsQmFyV2lkdGggLSBwYWRkaW5nICwgYWxsQmFySGVpZ2h0c1tpXSwgc2NhbGUpOworICAgIH0s CisKKyAgICBfcmVuZGVyQmFyOiBmdW5jdGlvbihsZWZ0LCB3aWR0aCwgYmFySGVpZ2h0cywgc2Nh bGUpCisgICAgeworICAgICAgICB2YXIgY2F0ZWdvcmllcyA9IE9iamVjdC5rZXlzKGJhckhlaWdo dHMpOworICAgICAgICBpZiAoIWNhdGVnb3JpZXMubGVuZ3RoKQorICAgICAgICAgICAgcmV0dXJu OworICAgICAgICBmb3IgKHZhciBpID0gMCwgYm90dG9tT2Zmc2V0ID0gdGhpcy5lbGVtZW50Lmhl aWdodDsgaSA8IGNhdGVnb3JpZXMubGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAgIHZhciBjYXRl Z29yeSA9IGNhdGVnb3JpZXNbaV07Ci0gICAgICAgICAgICB2YXIgZHVyYXRpb24gPSBzdGF0aXN0 aWNzW2NhdGVnb3J5XTsKKyAgICAgICAgICAgIHZhciBkdXJhdGlvbiA9IGJhckhlaWdodHNbY2F0 ZWdvcnldOworICAgICAgICAgICAgCiAgICAgICAgICAgICBpZiAoIWR1cmF0aW9uKQogICAgICAg ICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICAgICAgdmFyIGJhciA9IG91dGVyLmNyZWF0ZUNo aWxkKCJkaXYiLCAidGltZWxpbmUtIiArIGNhdGVnb3J5KTsKLSAgICAgICAgICAgIGJhci5zdHls ZS5oZWlnaHQgPSAoc3RhdGlzdGljc1tjYXRlZ29yeV0gKiBzY2FsZSkgKyAicHgiOworICAgICAg ICAgICAgdmFyIGhlaWdodCA9IGR1cmF0aW9uICogc2NhbGU7CisKKyAgICAgICAgICAgIHRoaXMu X2NvbnRleHQuc2F2ZSgpOworICAgICAgICAgICAgdGhpcy5fY29udGV4dC50cmFuc2xhdGUoTWF0 aC5mbG9vcihsZWZ0KSArIDAuNSwgMCk7CisgICAgICAgICAgICB0aGlzLl9jb250ZXh0LnNjYWxl KHdpZHRoIC8gdGhpcy5fbWF4SW5uZXJCYXJXaWR0aCwgMSk7CisgICAgICAgICAgICB0aGlzLl9j b250ZXh0LmZpbGxTdHlsZSA9IHRoaXMuX2ZpbGxTdHlsZXNbY2F0ZWdvcnldOworICAgICAgICAg ICAgdGhpcy5fY29udGV4dC5maWxsUmVjdCgwLCBib3R0b21PZmZzZXQgLSBoZWlnaHQsIHRoaXMu X21heElubmVyQmFyV2lkdGgsIGhlaWdodCk7CisgICAgICAgICAgICB0aGlzLl9jb250ZXh0LnJl c3RvcmUoKTsKKworICAgICAgICAgICAgdGhpcy5fY29udGV4dC5zdHJva2VTdHlsZSA9IHRoaXMu X2JvcmRlclN0eWxlc1tjYXRlZ29yeV07CisgICAgICAgICAgICB0aGlzLl9jb250ZXh0LnN0cm9r ZVJlY3QoTWF0aC5mbG9vcihsZWZ0KSArIDAuNSwgTWF0aC5mbG9vcihib3R0b21PZmZzZXQgLSBo ZWlnaHQpICsgMC41LCBNYXRoLmZsb29yKHdpZHRoKSwgTWF0aC5mbG9vcihoZWlnaHQpKTsKKyAg ICAgICAgICAgIGJvdHRvbU9mZnNldCAtPSBoZWlnaHQgLSAxOwogICAgICAgICB9Ci0gICAgICAg IHJldHVybiBvdXRlcjsKICAgICB9LAogCiAgICAgZ2V0V2luZG93VGltZXM6IGZ1bmN0aW9uKHdp bmRvd0xlZnQsIHdpbmRvd1JpZ2h0KQpAQCAtOTczLDE0ICsxMDExLDggQEAgV2ViSW5zcGVjdG9y LlRpbWVsaW5lVmVydGljYWxPdmVydmlldy5wcm90b3R5cGUgPSB7CiAgICAgICAgIHZhciBsZWZ0 T2Zmc2V0ID0gd2luZG93TGVmdCAqIHdpbmRvd1NwYW47CiAgICAgICAgIHZhciByaWdodE9mZnNl dCA9IHdpbmRvd1JpZ2h0ICogd2luZG93U3BhbjsKICAgICAgICAgdmFyIGJhcnMgPSB0aGlzLmVs ZW1lbnQuY2hpbGRyZW47Ci0gICAgICAgIHZhciBvZmZzZXQwID0gYmFyc1swXSA/IGJhcnNbMF0u b2Zmc2V0TGVmdCA6IDQ7Ci0gICAgICAgIHZhciBiYXJXaWR0aCA9IDk7Ci0gICAgICAgIGlmIChi YXJzLmxlbmd0aCA+IDIpIHsKLSAgICAgICAgICAgIHZhciBvZmZzZXQxID0gYmFyc1tiYXJzLmxl bmd0aCAtIDJdLm9mZnNldExlZnQ7Ci0gICAgICAgICAgICBiYXJXaWR0aCA9IChvZmZzZXQxIC0g b2Zmc2V0MCkgLyAoYmFycy5sZW5ndGggLSAyKTsKLSAgICAgICAgfQotICAgICAgICB2YXIgZmly c3RCYXIgPSBNYXRoLmZsb29yKE1hdGgubWF4KGxlZnRPZmZzZXQgLSBvZmZzZXQwLCAwKSAvIGJh cldpZHRoKTsKLSAgICAgICAgdmFyIGxhc3RCYXIgPSBNYXRoLm1pbihNYXRoLmNlaWwoKHJpZ2h0 T2Zmc2V0IC0gb2Zmc2V0MCAtIDIpIC8gYmFyV2lkdGgpLCB0aGlzLl9iYXJUaW1lcy5sZW5ndGgg LSAxKTsKKyAgICAgICAgdmFyIGZpcnN0QmFyID0gTWF0aC5mbG9vcihNYXRoLm1heChsZWZ0T2Zm c2V0LCAwKSAvIHRoaXMuX2FjdHVhbEJhcldpZHRoKTsKKyAgICAgICAgdmFyIGxhc3RCYXIgPSBN YXRoLm1pbihNYXRoLmNlaWwoKHJpZ2h0T2Zmc2V0IC0gMikgLyB0aGlzLl9hY3R1YWxCYXJXaWR0 aCksIHRoaXMuX2JhclRpbWVzLmxlbmd0aCAtIDEpOwogICAgICAgICBjb25zdCBzbmFwVG9SaWdo dFRvbGVyYW5jZVBpeGVscyA9IDM7CiAgICAgICAgIHJldHVybiB7CiAgICAgICAgICAgICBzdGFy dFRpbWU6IGZpcnN0QmFyID49IHRoaXMuX2JhclRpbWVzLmxlbmd0aCA/IEluZmluaXR5IDogdGhp cy5fYmFyVGltZXNbZmlyc3RCYXJdLnN0YXJ0VGltZSwKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdGltZWxpbmVQYW5lbC5jc3MgYi9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3RpbWVsaW5lUGFuZWwuY3NzCmluZGV4IDljZjI2ZWM3Nzhi NTBjNzU3NzRlMDAxMTQ3ZTRlYmY2MWVhMjQwNGQuLjM0ZjU2YWNjNTYyYzJlMjllMDJiOTRlZTVj NmEzYzk1ZTMxZjQzYTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvdGltZWxpbmVQYW5lbC5jc3MKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC90aW1lbGluZVBhbmVsLmNzcwpAQCAtNTg2LDQ2ICs1ODYsMTAgQEAKIH0KIAogLnRp bWVsaW5lLXZlcnRpY2FsLW92ZXJ2aWV3LWJhcnMgewotICAgIGRpc3BsYXk6IC13ZWJraXQtYm94 OwotICAgIC13ZWJraXQtYm94LWFsaWduOiBlbmQ7Ci0gICAgYmFja2dyb3VuZC1jb2xvcjogd2hp dGU7Ci0gICAgcGFkZGluZy1sZWZ0OiA0cHg7Ci0gICAgcGFkZGluZy1yaWdodDogNHB4OwogICAg IHotaW5kZXg6IDIwMDsKICAgICBiYWNrZ3JvdW5kLWNvbG9yOiByZ2JhKDI1NSwgMjU1LCAyNTUs IDAuOCk7Ci19Ci0KLS50aW1lbGluZS12ZXJ0aWNhbC1vdmVydmlldy1iYXJzIC5wYWRkaW5nIHsK LSAgICAtd2Via2l0LWJveC1mbGV4OiAxMDAwMDA7Ci19Ci0KLS50aW1lbGluZS12ZXJ0aWNhbC1v dmVydmlldy1iYXJzIC50aW1lbGluZS1iYXItdmVydGljYWwgewotICAgIGRpc3BsYXk6IC13ZWJr aXQtYm94OwotICAgIC13ZWJraXQtYm94LW9yaWVudDogdmVydGljYWw7Ci0gICAgLXdlYmtpdC1i b3gtcGFjazogZW5kOwotICAgIHdpZHRoOiAxMnB4OwotICAgIHBhZGRpbmctcmlnaHQ6IDJweDsK LSAgICAtd2Via2l0LWJveC1mbGV4OiAxOwotfQotCi0udGltZWxpbmUtYmFyLXZlcnRpY2FsIGRp djpmaXJzdC1jaGlsZCB7Ci0gICAgLXdlYmtpdC1ib3JkZXItdG9wLWxlZnQtcmFkaXVzOiAycHg7 Ci0gICAgLXdlYmtpdC1ib3JkZXItdG9wLXJpZ2h0LXJhZGl1czogMnB4OwotfQotCi0udGltZWxp bmUtYmFyLXZlcnRpY2FsIC50aW1lbGluZS1sb2FkaW5nIHsKLSAgICBiYWNrZ3JvdW5kOiAtd2Vi a2l0LWxpbmVhci1ncmFkaWVudChsZWZ0LCByZ2IoMjAxLCAyMjAsIDI0NSksIHJnYigxMDksIDE1 NywgMjIyKSk7Ci0gICAgYm9yZGVyOiBzb2xpZCAxcHggcmdiKDEwNiwgMTUyLCAyMTMpOwotfQot Ci0udGltZWxpbmUtYmFyLXZlcnRpY2FsIC50aW1lbGluZS1zY3JpcHRpbmcgewotICAgIGJhY2tn cm91bmQ6IC13ZWJraXQtbGluZWFyLWdyYWRpZW50KGxlZnQsIHJnYigyNTEsIDIyMiwgMTY4KSwg cmdiKDIzNCwgMTgyLCA3NykpOwotICAgIGJvcmRlcjogc29saWQgMXB4IHJnYigyMjMsIDE3NSwg NzcpOwotfQotCi0udGltZWxpbmUtYmFyLXZlcnRpY2FsIC50aW1lbGluZS1yZW5kZXJpbmcgewot ICAgIGJhY2tncm91bmQ6IC13ZWJraXQtbGluZWFyLWdyYWRpZW50KGxlZnQsIHJnYigyMTMsIDE4 NSwgMjM2KSwgcmdiKDEzNywgNjIsIDIwMCkpOwotICAgIGJvcmRlcjogc29saWQgMXB4IHJnYigx MzAsIDU5LCAxOTApOworICAgIHdpZHRoOiAxMDAlOworICAgIGhlaWdodDogMTAwJTsKIH0KIAog LnRpbWVsaW5lIC5yZXNvdXJjZXMtZXZlbnQtZGl2aWRlciB7Cg==