79782 2012-02-28 05:40:42 -0800 Web Inspector: show resource dividers on memory counter graphs 2012-02-28 06:22:31 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 yurys yurys apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 566600 0 yurys 2012-02-28 05:40:42 -0800 Resource dividers should be shown on memory counter graphs like on the main timeline grid. 566601 1 129234 yurys 2012-02-28 05:42:09 -0800 Created attachment 129234 Patch 566602 2 129235 yurys 2012-02-28 05:43:56 -0800 Created attachment 129235 Patch 566608 3 yurys 2012-02-28 06:22:31 -0800 Committed r109102: <http://trac.webkit.org/changeset/109102> 129234 2012-02-28 05:42:09 -0800 2012-02-28 05:43:46 -0800 Patch bug-79782-20120228174207.patch text/plain 10393 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5MDg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTRjY2M0YzJhOTU5YjM1 MWFhMWIyYzU5OGRlYWRhOWVkMDIyM2U1Yy4uZjcwMmFmYmQ1MDQ3Y2Q3NTdmNThhMTMzMWQyOGYx MDBjNzc1ZWQ0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEyLTAyLTI4ICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHNob3cgcmVzb3VyY2UgZGl2aWRlcnMgb24gbWVtb3J5IGNvdW50ZXIgZ3JhcGhzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03OTc4MgorCisgICAg ICAgIFJlc291cmNlIGRpdmlkZXJzIGFyZSBkcmF3biBvbiB0aGUgbWVtb3J5IGNvdW50ZXIgZ3Jh cGhzLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9NZW1vcnlTdGF0aXN0aWNzLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLk1lbW9yeVN0YXRpc3RpY3MucHJvdG90eXBlLnVwZGF0ZURpdmlkZXJzKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5NZW1vcnlTdGF0aXN0aWNzLnByb3RvdHlwZS5zZXRNYWluVGltZWxp bmVHcmlkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5NZW1vcnlTdGF0aXN0aWNzLnByb3RvdHlw ZS5fdXBkYXRlU2l6ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTWVtb3J5U3RhdGlzdGljcy5w cm90b3R5cGUuc2hvdyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTWVtb3J5U3RhdGlzdGljcy5w cm90b3R5cGUucmVmcmVzaCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTWVtb3J5U3RhdGlzdGlj cy5wcm90b3R5cGUuX3JlZnJlc2hEaXZpZGVycyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9UaW1lbGluZUdyaWQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVHcmlk LnByb3RvdHlwZS5nZXQgZGl2aWRlcnNFbGVtZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5U aW1lbGluZUdyaWQucHJvdG90eXBlLnVwZGF0ZURpdmlkZXJzKToKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGlt ZWxpbmVQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5 cGUuX3RpbWVsaW5lc092ZXJ2aWV3TW9kZUNoYW5nZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlRpbWVsaW5lUGFuZWwucHJvdG90eXBlLl9yZWZyZXNoUmVjb3Jkcyk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUuZ2V0IHRpbWxpbmVQYWRkaW5nTGVmdCk6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC90aW1lbGluZVBhbmVsLmNzczoKKyAgICAg ICAgKCNtZW1vcnktZ3JhcGhzLWNhbnZhcy1jb250YWluZXIpOgorICAgICAgICAoI21lbW9yeS1n cmFwaHMtY2FudmFzLWNvbnRhaW5lciAucmVzb3VyY2VzLWRpdmlkZXJzKToKKwogMjAxMi0wMi0y OCAgTm9lbCBHb3Jkb24gIDxub2VsLmdvcmRvbkBnbWFpbC5jb20+CiAKICAgICAgICAgRml4IGNv bW1lbnQgYWJvdXQgUkdCIHN3aXp6bGUgZGVjb2RpbmcgYW5kIEFkb2JlIHRyYW5zZm9ybT0wIGlt YWdlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9NZW1v cnlTdGF0aXN0aWNzLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9NZW1v cnlTdGF0aXN0aWNzLmpzCmluZGV4IDNlZGZhZWQyYzFlNzdlODk2MmU0ZjlkODYzMmZhOTgzYTM0 NWZmMzkuLjk3ZWIxM2MyZGFjNGVjMWE5MTdhNTljN2E5NDhjYmM5NTA2YjYxMWEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTWVtb3J5U3RhdGlzdGljcy5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL01lbW9yeVN0YXRpc3Rp Y3MuanMKQEAgLTQ2LDYgKzQ2LDcgQEAgV2ViSW5zcGVjdG9yLk1lbW9yeVN0YXRpc3RpY3MgPSBm dW5jdGlvbih0aW1lbGluZVBhbmVsLCBzaWRlYmFyV2lkdGgpCiAgICAgdGhpcy5fbWVtb3J5U3Bs aXRWaWV3LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNwbGl0Vmlldy5FdmVudFR5cGVz LlJlc2l6ZWQsIHRoaXMuX3NpZGViYXJSZXNpemVkLmJpbmQodGhpcykpOwogCiAgICAgdGhpcy5f Y2FudmFzQ29udGFpbmVyID0gdGhpcy5fbWVtb3J5U3BsaXRWaWV3Lm1haW5FbGVtZW50OworICAg IHRoaXMuX2NhbnZhc0NvbnRhaW5lci5pZCA9ICJtZW1vcnktZ3JhcGhzLWNhbnZhcy1jb250YWlu ZXIiOwogICAgIHRoaXMuX2N1cnJlbnRWYWx1ZXNCYXIgPSB0aGlzLl9jYW52YXNDb250YWluZXIu Y3JlYXRlQ2hpbGQoImRpdiIpOwogICAgIHRoaXMuX2N1cnJlbnRWYWx1ZXNCYXIuaWQgPSAiY291 bnRlci12YWx1ZXMtYmFyIjsKICAgICB0aGlzLl9jYW52YXMgPSB0aGlzLl9jYW52YXNDb250YWlu ZXIuY3JlYXRlQ2hpbGQoImNhbnZhcyIpOwpAQCAtNTYsNiArNTcsOSBAQCBXZWJJbnNwZWN0b3Iu TWVtb3J5U3RhdGlzdGljcyA9IGZ1bmN0aW9uKHRpbWVsaW5lUGFuZWwsIHNpZGViYXJXaWR0aCkK ICAgICB0aGlzLl9jYW52YXMuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vtb3ZlIiwgdGhpcy5fb25N b3VzZU1vdmUuYmluZCh0aGlzKSwgdHJ1ZSk7CiAgICAgdGhpcy5fY2FudmFzLmFkZEV2ZW50TGlz dGVuZXIoIm1vdXNlb3V0IiwgdGhpcy5fb25Nb3VzZU91dC5iaW5kKHRoaXMpLCB0cnVlKTsKICAg ICB0aGlzLl9jYW52YXMuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9vbkNsaWNrLmJp bmQodGhpcyksIHRydWUpOworICAgIC8vIFdlIGNyZWF0ZSBleHRyYSB0aW1lbGluZSBncmlkIGhl cmUgdG8gcmV1c2UgaXRzIGV2ZW50IGRpdmlkZXJzLgorICAgIHRoaXMuX3RpbWVsaW5lR3JpZCA9 IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVHcmlkKCk7CisgICAgdGhpcy5fY2FudmFzQ29udGFp bmVyLmFwcGVuZENoaWxkKHRoaXMuX3RpbWVsaW5lR3JpZC5kaXZpZGVyc0VsZW1lbnQpOwogCiAg ICAgLy8gUG9wdWxhdGUgc2lkZWJhcgogICAgIHRoaXMuX21lbW9yeVNwbGl0Vmlldy5zaWRlYmFy RWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2IiwgInNpZGViYXItdHJlZSBzaWRlYmFyLXRyZWUtc2Vj dGlvbiIpLnRleHRDb250ZW50ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDT1VOVEVSUyIpOwpA QCAtMjAzLDYgKzIwNywyMCBAQCBXZWJJbnNwZWN0b3IuQ291bnRlclVJLnByb3RvdHlwZSA9IHsK IAogCiBXZWJJbnNwZWN0b3IuTWVtb3J5U3RhdGlzdGljcy5wcm90b3R5cGUgPSB7CisKKyAgICAv KioKKyAgICAgKiBAcGFyYW0ge251bWJlcj19IHBhZGRpbmdMZWZ0CisgICAgICovCisgICAgdXBk YXRlRGl2aWRlcnM6IGZ1bmN0aW9uKGZvcmNlLCBjYWxjdWxhdG9yLCBwYWRkaW5nTGVmdCkKKyAg ICB7CisgICAgICAgIHRoaXMuX3RpbWVsaW5lR3JpZC51cGRhdGVEaXZpZGVycyhmb3JjZSwgY2Fs Y3VsYXRvciwgcGFkZGluZ0xlZnQpOworICAgIH0sCisKKyAgICBzZXRNYWluVGltZWxpbmVHcmlk OiBmdW5jdGlvbih0aW1lbGluZUdyaWQpCisgICAgeworICAgICAgICB0aGlzLl9tYWluVGltZWxp bmVHcmlkID0gdGltZWxpbmVHcmlkOworICAgIH0sCisKICAgICBzZXRUb3BQb3NpdGlvbjogZnVu Y3Rpb24odG9wKQogICAgIHsKICAgICAgICAgdGhpcy5fbWVtb3J5U3BsaXRWaWV3LmVsZW1lbnQu c3R5bGUudG9wID0gdG9wICsgInB4IjsKQEAgLTIyOSw4ICsyNDcsMTEgQEAgV2ViSW5zcGVjdG9y Lk1lbW9yeVN0YXRpc3RpY3MucHJvdG90eXBlID0gewogCiAgICAgX3VwZGF0ZVNpemU6IGZ1bmN0 aW9uKCkKICAgICB7CisgICAgICAgIHZhciB3aWR0aCA9IHRoaXMuX21haW5UaW1lbGluZUdyaWQu ZGl2aWRlcnNFbGVtZW50Lm9mZnNldFdpZHRoICsgMTsKKyAgICAgICAgdGhpcy5fY2FudmFzQ29u dGFpbmVyLnN0eWxlLndpZHRoID0gd2lkdGggKyAicHgiOworCiAgICAgICAgIHZhciBoZWlnaHQg PSB0aGlzLl9jYW52YXNDb250YWluZXIub2Zmc2V0SGVpZ2h0IC0gdGhpcy5fY3VycmVudFZhbHVl c0Jhci5vZmZzZXRIZWlnaHQ7Ci0gICAgICAgIHRoaXMuX2NhbnZhcy53aWR0aCA9IHRoaXMuX2Nh bnZhc0NvbnRhaW5lci5vZmZzZXRXaWR0aDsKKyAgICAgICAgdGhpcy5fY2FudmFzLndpZHRoID0g d2lkdGg7CiAgICAgICAgIHRoaXMuX2NhbnZhcy5oZWlnaHQgPSBoZWlnaHQ7CiAgICAgfSwKIApA QCAtMzg0LDEyICs0MDUsMTQgQEAgV2ViSW5zcGVjdG9yLk1lbW9yeVN0YXRpc3RpY3MucHJvdG90 eXBlID0gewogICAgICAgICB2YXIgYW5jaG9yID0gLyoqIEB0eXBlIHtFbGVtZW50fG51bGx9ICov IHRoaXMuX2NvbnRhaW5lckFuY2hvci5uZXh0U2libGluZzsKICAgICAgICAgdGhpcy5fbWVtb3J5 U3BsaXRWaWV3LnNob3codGhpcy5fdGltZWxpbmVQYW5lbC5lbGVtZW50LCBhbmNob3IpOwogICAg ICAgICB0aGlzLl91cGRhdGVTaXplKCk7CisgICAgICAgIHRoaXMuX3JlZnJlc2hEaXZpZGVycygp OwogICAgICAgICBzZXRUaW1lb3V0KHRoaXMuX2RyYXcuYmluZCh0aGlzKSwgMCk7CiAgICAgfSwK IAogICAgIHJlZnJlc2g6IGZ1bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHRoaXMuX3VwZGF0ZVNp emUoKTsKKyAgICAgICAgdGhpcy5fcmVmcmVzaERpdmlkZXJzKCk7CiAgICAgICAgIHRoaXMuX2Ry YXcoKTsKICAgICAgICAgdGhpcy5fcmVmcmVzaEN1cnJlbnRWYWx1ZXMoKTsKICAgICB9LApAQCAt Mzk5LDYgKzQyMiwxMSBAQCBXZWJJbnNwZWN0b3IuTWVtb3J5U3RhdGlzdGljcy5wcm90b3R5cGUg PSB7CiAgICAgICAgIHRoaXMuX21lbW9yeVNwbGl0Vmlldy5kZXRhY2goKTsKICAgICB9LAogCisg ICAgX3JlZnJlc2hEaXZpZGVyczogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgdGhpcy5fdGlt ZWxpbmVHcmlkLnVwZGF0ZURpdmlkZXJzKHRydWUsIHRoaXMuX3RpbWVsaW5lUGFuZWwuY2FsY3Vs YXRvciwgdGhpcy5fdGltZWxpbmVQYW5lbC50aW1lbGluZVBhZGRpbmdMZWZ0KTsKKyAgICB9LAor CiAgICAgX3NldFZlcnRpY2FsQ2xpcDogZnVuY3Rpb24ob3JpZ2luWSwgaGVpZ2h0KQogICAgIHsK ICAgICAgICAgdGhpcy5fb3JpZ2luWSA9IG9yaWdpblk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lR3JpZC5qcyBiL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVHcmlkLmpzCmluZGV4IDViN2YzMjNkNjRjOWEx YTNlODRiNjgwNmQ2MWIyZjZjYzZhMmYzMzcuLjRhYTZkMTIyMGQwNzkwYzAxOWViYWExM2FlNWQ1 M2M5ZjA4MDIzNjggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvVGltZWxpbmVHcmlkLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1l bmQvVGltZWxpbmVHcmlkLmpzCkBAIC01OCw2ICs1OCwxMSBAQCBXZWJJbnNwZWN0b3IuVGltZWxp bmVHcmlkLnByb3RvdHlwZSA9IHsKICAgICAgICAgcmV0dXJuIHRoaXMuX2l0ZW1zR3JhcGhzRWxl bWVudDsKICAgICB9LAogCisgICAgZ2V0IGRpdmlkZXJzRWxlbWVudCgpCisgICAgeworICAgICAg ICByZXR1cm4gdGhpcy5fZGl2aWRlcnNFbGVtZW50OworICAgIH0sCisKICAgICAvKioKICAgICAg KiBAcGFyYW0ge251bWJlcj19IHBhZGRpbmdMZWZ0CiAgICAgICovCkBAIC03Niw4ICs4MSw4IEBA IFdlYkluc3BlY3Rvci5UaW1lbGluZUdyaWQucHJvdG90eXBlID0gewogICAgICAgICB2YXIgZGl2 aWRlciA9IHRoaXMuX2RpdmlkZXJzRWxlbWVudC5maXJzdENoaWxkOwogICAgICAgICB2YXIgZGl2 aWRlckxhYmVsQmFyID0gdGhpcy5fZGl2aWRlcnNMYWJlbEJhckVsZW1lbnQuZmlyc3RDaGlsZDsK IAotICAgICAgICB2YXIgZGl2aWRlcnNMYWJlbEJhckVsZW1lbnRDbGllbnRXaWR0aCA9IHRoaXMu X2RpdmlkZXJzTGFiZWxCYXJFbGVtZW50LmNsaWVudFdpZHRoOwotICAgICAgICB2YXIgY2xpZW50 V2lkdGggPSBkaXZpZGVyc0xhYmVsQmFyRWxlbWVudENsaWVudFdpZHRoIC0gcGFkZGluZ0xlZnQ7 CisgICAgICAgIHZhciBkaXZpZGVyc0VsZW1lbnRDbGllbnRXaWR0aCA9IHRoaXMuX2RpdmlkZXJz RWxlbWVudC5jbGllbnRXaWR0aDsKKyAgICAgICAgdmFyIGNsaWVudFdpZHRoID0gZGl2aWRlcnNF bGVtZW50Q2xpZW50V2lkdGggLSBwYWRkaW5nTGVmdDsKICAgICAgICAgZm9yICh2YXIgaSA9IHBh ZGRpbmdMZWZ0ID8gMCA6IDE7IGkgPD0gZGl2aWRlckNvdW50OyArK2kpIHsKICAgICAgICAgICAg IGlmICghZGl2aWRlcikgewogICAgICAgICAgICAgICAgIGRpdmlkZXIgPSBkb2N1bWVudC5jcmVh dGVFbGVtZW50KCJkaXYiKTsKQEAgLTkxLDcgKzk2LDYgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5l R3JpZC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgZGl2aWRlckxhYmVsQmFyLl9sYWJl bEVsZW1lbnQgPSBsYWJlbDsKICAgICAgICAgICAgICAgICBkaXZpZGVyTGFiZWxCYXIuYXBwZW5k Q2hpbGQobGFiZWwpOwogICAgICAgICAgICAgICAgIHRoaXMuX2RpdmlkZXJzTGFiZWxCYXJFbGVt ZW50LmFwcGVuZENoaWxkKGRpdmlkZXJMYWJlbEJhcik7Ci0gICAgICAgICAgICAgICAgZGl2aWRl cnNMYWJlbEJhckVsZW1lbnRDbGllbnRXaWR0aCA9IHRoaXMuX2RpdmlkZXJzTGFiZWxCYXJFbGVt ZW50LmNsaWVudFdpZHRoOwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBpZiAoaSA9PT0g KHBhZGRpbmdMZWZ0ID8gMCA6IDEpKSB7CkBAIC0xMTEsNyArMTE1LDcgQEAgV2ViSW5zcGVjdG9y LlRpbWVsaW5lR3JpZC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAg IHZhciBsZWZ0ID0gcGFkZGluZ0xlZnQgKyBjbGllbnRXaWR0aCAqIChpIC8gZGl2aWRlckNvdW50 KTsKLSAgICAgICAgICAgIHZhciBwZXJjZW50TGVmdCA9IDEwMCAqIGxlZnQgLyBkaXZpZGVyc0xh YmVsQmFyRWxlbWVudENsaWVudFdpZHRoOworICAgICAgICAgICAgdmFyIHBlcmNlbnRMZWZ0ID0g MTAwICogbGVmdCAvIGRpdmlkZXJzRWxlbWVudENsaWVudFdpZHRoOwogICAgICAgICAgICAgdGhp cy5fc2V0RGl2aWRlckFuZEJhckxlZnQoZGl2aWRlciwgZGl2aWRlckxhYmVsQmFyLCBwZXJjZW50 TGVmdCk7CiAKICAgICAgICAgICAgIGlmICghaXNOYU4oc2xpY2UpKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzCmluZGV4IDk5NTFm OWU5OWM0YmYxOGVkMjk3NzNiMTgxODcwZjhmOGZkYmI4ZTYuLjhjMmE3MjEyOGU2NjA2ZGVjMzEw MmMwNzI5ZDJkOGI3YmI2Y2U1NjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKQEAgLTc5LDYgKzc5LDggQEAgV2ViSW5zcGVj dG9yLlRpbWVsaW5lUGFuZWwgPSBmdW5jdGlvbigpCiAgICAgdGhpcy5faXRlbXNHcmFwaHNFbGVt ZW50LmlkID0gInRpbWVsaW5lLWdyYXBocyI7CiAgICAgdGhpcy5faXRlbXNHcmFwaHNFbGVtZW50 LmFkZEV2ZW50TGlzdGVuZXIoIm1vdXNld2hlZWwiLCB0aGlzLl9vdmVydmlld1BhbmUuc2Nyb2xs V2luZG93LmJpbmQodGhpcy5fb3ZlcnZpZXdQYW5lKSwgdHJ1ZSk7CiAgICAgdGhpcy5fY29udGFp bmVyQ29udGVudEVsZW1lbnQuYXBwZW5kQ2hpbGQodGhpcy5fdGltZWxpbmVHcmlkLmVsZW1lbnQp OworICAgIGlmICh0aGlzLl9tZW1vcnlTdGF0aXN0aWNzKQorICAgICAgICB0aGlzLl9tZW1vcnlT dGF0aXN0aWNzLnNldE1haW5UaW1lbGluZUdyaWQodGhpcy5fdGltZWxpbmVHcmlkKTsKIAogICAg IHRoaXMuX3RvcEdhcEVsZW1lbnQgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJkaXYiKTsKICAg ICB0aGlzLl90b3BHYXBFbGVtZW50LmNsYXNzTmFtZSA9ICJ0aW1lbGluZS1nYXAiOwpAQCAtMzc4 LDEzICszODAsMTMgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlID0gewog ICAgICAgICAgICAgdGhpcy5fbWVtb3J5U3RhdGlzdGljcy5oaWRlKCk7CiAgICAgICAgICAgICB0 aGlzLnNwbGl0Vmlldy5lbGVtZW50LnN0eWxlLmhlaWdodCA9ICJhdXRvIjsKICAgICAgICAgICAg IHRoaXMuc3BsaXRWaWV3LmVsZW1lbnQuc3R5bGUuYm90dG9tID0gIjAiOwotICAgICAgICAgICAg dGhpcy5vblJlc2l6ZSgpOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgdGhpcy5fdGlt ZWxpbmVNZW1vcnlTcGxpdHRlci5yZW1vdmVTdHlsZUNsYXNzKCJoaWRkZW4iKTsKICAgICAgICAg ICAgIHRoaXMuX21lbW9yeVN0YXRpc3RpY3Muc2hvdygpOwogICAgICAgICAgICAgdGhpcy5zcGxp dFZpZXcuZWxlbWVudC5zdHlsZS5ib3R0b20gPSAiYXV0byI7CiAgICAgICAgICAgICB0aGlzLl9z ZXRTcGxpdHRlclBvc2l0aW9uKDYwMCk7CiAgICAgICAgIH0KKyAgICAgICAgdGhpcy5fcmVmcmVz aCgpOwogICAgIH0sCiAKICAgICBfdG9nZ2xlVGltZWxpbmVCdXR0b25DbGlja2VkOiBmdW5jdGlv bigpCkBAIC03ODcsMTIgKzc4OSwxNiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHRoaXMuX2l0ZW1zR3JhcGhzRWxlbWVudC5hcHBlbmRDaGlsZCh0 aGlzLl9leHBhbmRFbGVtZW50cyk7CiAgICAgICAgIHRoaXMuc3BsaXRWaWV3LnNpZGViYXJSZXNp emVyRWxlbWVudC5zdHlsZS5oZWlnaHQgPSB0aGlzLnNpZGViYXJFbGVtZW50LmNsaWVudEhlaWdo dCArICJweCI7CiAgICAgICAgIC8vIFJlc2VydmUgc29tZSByb29tIGZvciBleHBhbmQgLyBjb2xs YXBzZSBjb250cm9scyB0byB0aGUgbGVmdCBmb3IgcmVjb3JkcyB0aGF0IHN0YXJ0IGF0IDBtcy4K LSAgICAgICAgdmFyIHRpbWVsaW5lUGFkZGluZ0xlZnQgPSB0aGlzLl9jYWxjdWxhdG9yLndpbmRv d0xlZnQgPT09IDAgPyB0aGlzLl9leHBhbmRPZmZzZXQgOiAwOwogICAgICAgICBpZiAodXBkYXRl Qm91bmRhcmllcykKLSAgICAgICAgICAgIHRoaXMuX3RpbWVsaW5lR3JpZC51cGRhdGVEaXZpZGVy cyh0cnVlLCB0aGlzLl9jYWxjdWxhdG9yLCB0aW1lbGluZVBhZGRpbmdMZWZ0KTsKKyAgICAgICAg ICAgIHRoaXMuX3RpbWVsaW5lR3JpZC51cGRhdGVEaXZpZGVycyh0cnVlLCB0aGlzLl9jYWxjdWxh dG9yLCB0aGlzLnRpbWVsaW5lUGFkZGluZ0xlZnQpOwogICAgICAgICB0aGlzLl9hZGp1c3RTY3Jv bGxQb3NpdGlvbigocmVjb3Jkc0luV2luZG93Lmxlbmd0aCArIDEpICogcm93SGVpZ2h0KTsKICAg ICB9LAogCisgICAgZ2V0IHRpbWxpbmVQYWRkaW5nTGVmdCgpCisgICAgeworICAgICAgICByZXR1 cm4gdGhpcy5fY2FsY3VsYXRvci53aW5kb3dMZWZ0ID09PSAwID8gdGhpcy5fZXhwYW5kT2Zmc2V0 IDogMDsKKyAgICB9LAorCiAgICAgX2FkanVzdFNjcm9sbFBvc2l0aW9uOiBmdW5jdGlvbih0b3Rh bEhlaWdodCkKICAgICB7CiAgICAgICAgIC8vIFByZXZlbnQgdGhlIGNvbnRhaW5lciBmcm9tIGJl aW5nIHNjcm9sbGVkIG9mZiB0aGUgZW5kLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC90aW1lbGluZVBhbmVsLmNzcyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvdGltZWxpbmVQYW5lbC5jc3MKaW5kZXggMzVhY2RlZTY3ZTYxZWM3OWZi OTllMTFjN2YyYjBlMzc2ZDU5YTFiZS4uMmEyMGE5NzA1NDkzYzFhZTVlYWUyZjE2ODUwNjExOWEy MmRhZjVjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC90 aW1lbGluZVBhbmVsLmNzcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L3RpbWVsaW5lUGFuZWwuY3NzCkBAIC01NTksNiArNTU5LDE0IEBACiAgICAgYm9yZGVyLXRvcDog MXB4IHNvbGlkICNBQUE7CiB9CiAKKyNtZW1vcnktZ3JhcGhzLWNhbnZhcy1jb250YWluZXIgewor ICAgIGJvcmRlci1yaWdodDogMXB4IHNvbGlkICNBQUE7Cit9CisKKyNtZW1vcnktZ3JhcGhzLWNh bnZhcy1jb250YWluZXIgLnJlc291cmNlcy1kaXZpZGVycyB7CisgICAgdG9wOiAxNXB4OworfQor CiAjbWVtb3J5LWdyYXBocy1jb250YWluZXIgLnNwbGl0LXZpZXctY29udGVudHMgewogICAgIG92 ZXJmbG93OiBoaWRkZW47CiB9Cg== 129235 2012-02-28 05:43:56 -0800 2012-02-28 05:45:12 -0800 Patch bug-79782-20120228174354.patch text/plain 10181 yurys U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5MDg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOTRjY2M0YzJhOTU5YjM1 MWFhMWIyYzU5OGRlYWRhOWVkMDIyM2U1Yy4uZjcwMmFmYmQ1MDQ3Y2Q3NTdmNThhMTMzMWQyOGYx MDBjNzc1ZWQ0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEyLTAyLTI4ICBZdXJ5 IFNlbWlraGF0c2t5ICA8eXVyeXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IHNob3cgcmVzb3VyY2UgZGl2aWRlcnMgb24gbWVtb3J5IGNvdW50ZXIgZ3JhcGhzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03OTc4MgorCisgICAg ICAgIFJlc291cmNlIGRpdmlkZXJzIGFyZSBkcmF3biBvbiB0aGUgbWVtb3J5IGNvdW50ZXIgZ3Jh cGhzLgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog aW5zcGVjdG9yL2Zyb250LWVuZC9NZW1vcnlTdGF0aXN0aWNzLmpzOgorICAgICAgICAoV2ViSW5z cGVjdG9yLk1lbW9yeVN0YXRpc3RpY3MucHJvdG90eXBlLnVwZGF0ZURpdmlkZXJzKToKKyAgICAg ICAgKFdlYkluc3BlY3Rvci5NZW1vcnlTdGF0aXN0aWNzLnByb3RvdHlwZS5zZXRNYWluVGltZWxp bmVHcmlkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5NZW1vcnlTdGF0aXN0aWNzLnByb3RvdHlw ZS5fdXBkYXRlU2l6ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTWVtb3J5U3RhdGlzdGljcy5w cm90b3R5cGUuc2hvdyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTWVtb3J5U3RhdGlzdGljcy5w cm90b3R5cGUucmVmcmVzaCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTWVtb3J5U3RhdGlzdGlj cy5wcm90b3R5cGUuX3JlZnJlc2hEaXZpZGVycyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250 LWVuZC9UaW1lbGluZUdyaWQuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVHcmlk LnByb3RvdHlwZS5nZXQgZGl2aWRlcnNFbGVtZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5U aW1lbGluZUdyaWQucHJvdG90eXBlLnVwZGF0ZURpdmlkZXJzKToKKyAgICAgICAgKiBpbnNwZWN0 b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGlt ZWxpbmVQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5 cGUuX3RpbWVsaW5lc092ZXJ2aWV3TW9kZUNoYW5nZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlRpbWVsaW5lUGFuZWwucHJvdG90eXBlLl9yZWZyZXNoUmVjb3Jkcyk6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUuZ2V0IHRpbWxpbmVQYWRkaW5nTGVmdCk6 CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC90aW1lbGluZVBhbmVsLmNzczoKKyAgICAg ICAgKCNtZW1vcnktZ3JhcGhzLWNhbnZhcy1jb250YWluZXIpOgorICAgICAgICAoI21lbW9yeS1n cmFwaHMtY2FudmFzLWNvbnRhaW5lciAucmVzb3VyY2VzLWRpdmlkZXJzKToKKwogMjAxMi0wMi0y OCAgTm9lbCBHb3Jkb24gIDxub2VsLmdvcmRvbkBnbWFpbC5jb20+CiAKICAgICAgICAgRml4IGNv bW1lbnQgYWJvdXQgUkdCIHN3aXp6bGUgZGVjb2RpbmcgYW5kIEFkb2JlIHRyYW5zZm9ybT0wIGlt YWdlcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9NZW1v cnlTdGF0aXN0aWNzLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9NZW1v cnlTdGF0aXN0aWNzLmpzCmluZGV4IDNlZGZhZWQyYzFlNzdlODk2MmU0ZjlkODYzMmZhOTgzYTM0 NWZmMzkuLjg5OWM3NmYxM2ViN2YxMWQwMDlkOGRhYTdlMmQ1MTRkMTk4Yzg4ZmYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTWVtb3J5U3RhdGlzdGljcy5q cworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL01lbW9yeVN0YXRpc3Rp Y3MuanMKQEAgLTQ2LDYgKzQ2LDcgQEAgV2ViSW5zcGVjdG9yLk1lbW9yeVN0YXRpc3RpY3MgPSBm dW5jdGlvbih0aW1lbGluZVBhbmVsLCBzaWRlYmFyV2lkdGgpCiAgICAgdGhpcy5fbWVtb3J5U3Bs aXRWaWV3LmFkZEV2ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlNwbGl0Vmlldy5FdmVudFR5cGVz LlJlc2l6ZWQsIHRoaXMuX3NpZGViYXJSZXNpemVkLmJpbmQodGhpcykpOwogCiAgICAgdGhpcy5f Y2FudmFzQ29udGFpbmVyID0gdGhpcy5fbWVtb3J5U3BsaXRWaWV3Lm1haW5FbGVtZW50OworICAg IHRoaXMuX2NhbnZhc0NvbnRhaW5lci5pZCA9ICJtZW1vcnktZ3JhcGhzLWNhbnZhcy1jb250YWlu ZXIiOwogICAgIHRoaXMuX2N1cnJlbnRWYWx1ZXNCYXIgPSB0aGlzLl9jYW52YXNDb250YWluZXIu Y3JlYXRlQ2hpbGQoImRpdiIpOwogICAgIHRoaXMuX2N1cnJlbnRWYWx1ZXNCYXIuaWQgPSAiY291 bnRlci12YWx1ZXMtYmFyIjsKICAgICB0aGlzLl9jYW52YXMgPSB0aGlzLl9jYW52YXNDb250YWlu ZXIuY3JlYXRlQ2hpbGQoImNhbnZhcyIpOwpAQCAtNTYsNiArNTcsOSBAQCBXZWJJbnNwZWN0b3Iu TWVtb3J5U3RhdGlzdGljcyA9IGZ1bmN0aW9uKHRpbWVsaW5lUGFuZWwsIHNpZGViYXJXaWR0aCkK ICAgICB0aGlzLl9jYW52YXMuYWRkRXZlbnRMaXN0ZW5lcigibW91c2Vtb3ZlIiwgdGhpcy5fb25N b3VzZU1vdmUuYmluZCh0aGlzKSwgdHJ1ZSk7CiAgICAgdGhpcy5fY2FudmFzLmFkZEV2ZW50TGlz dGVuZXIoIm1vdXNlb3V0IiwgdGhpcy5fb25Nb3VzZU91dC5iaW5kKHRoaXMpLCB0cnVlKTsKICAg ICB0aGlzLl9jYW52YXMuYWRkRXZlbnRMaXN0ZW5lcigiY2xpY2siLCB0aGlzLl9vbkNsaWNrLmJp bmQodGhpcyksIHRydWUpOworICAgIC8vIFdlIGNyZWF0ZSBleHRyYSB0aW1lbGluZSBncmlkIGhl cmUgdG8gcmV1c2UgaXRzIGV2ZW50IGRpdmlkZXJzLgorICAgIHRoaXMuX3RpbWVsaW5lR3JpZCA9 IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVHcmlkKCk7CisgICAgdGhpcy5fY2FudmFzQ29udGFp bmVyLmFwcGVuZENoaWxkKHRoaXMuX3RpbWVsaW5lR3JpZC5kaXZpZGVyc0VsZW1lbnQpOwogCiAg ICAgLy8gUG9wdWxhdGUgc2lkZWJhcgogICAgIHRoaXMuX21lbW9yeVNwbGl0Vmlldy5zaWRlYmFy RWxlbWVudC5jcmVhdGVDaGlsZCgiZGl2IiwgInNpZGViYXItdHJlZSBzaWRlYmFyLXRyZWUtc2Vj dGlvbiIpLnRleHRDb250ZW50ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDT1VOVEVSUyIpOwpA QCAtMjAzLDYgKzIwNywxMSBAQCBXZWJJbnNwZWN0b3IuQ291bnRlclVJLnByb3RvdHlwZSA9IHsK IAogCiBXZWJJbnNwZWN0b3IuTWVtb3J5U3RhdGlzdGljcy5wcm90b3R5cGUgPSB7CisgICAgc2V0 TWFpblRpbWVsaW5lR3JpZDogZnVuY3Rpb24odGltZWxpbmVHcmlkKQorICAgIHsKKyAgICAgICAg dGhpcy5fbWFpblRpbWVsaW5lR3JpZCA9IHRpbWVsaW5lR3JpZDsKKyAgICB9LAorCiAgICAgc2V0 VG9wUG9zaXRpb246IGZ1bmN0aW9uKHRvcCkKICAgICB7CiAgICAgICAgIHRoaXMuX21lbW9yeVNw bGl0Vmlldy5lbGVtZW50LnN0eWxlLnRvcCA9IHRvcCArICJweCI7CkBAIC0yMjksOCArMjM4LDEx IEBAIFdlYkluc3BlY3Rvci5NZW1vcnlTdGF0aXN0aWNzLnByb3RvdHlwZSA9IHsKIAogICAgIF91 cGRhdGVTaXplOiBmdW5jdGlvbigpCiAgICAgeworICAgICAgICB2YXIgd2lkdGggPSB0aGlzLl9t YWluVGltZWxpbmVHcmlkLmRpdmlkZXJzRWxlbWVudC5vZmZzZXRXaWR0aCArIDE7CisgICAgICAg IHRoaXMuX2NhbnZhc0NvbnRhaW5lci5zdHlsZS53aWR0aCA9IHdpZHRoICsgInB4IjsKKwogICAg ICAgICB2YXIgaGVpZ2h0ID0gdGhpcy5fY2FudmFzQ29udGFpbmVyLm9mZnNldEhlaWdodCAtIHRo aXMuX2N1cnJlbnRWYWx1ZXNCYXIub2Zmc2V0SGVpZ2h0OwotICAgICAgICB0aGlzLl9jYW52YXMu d2lkdGggPSB0aGlzLl9jYW52YXNDb250YWluZXIub2Zmc2V0V2lkdGg7CisgICAgICAgIHRoaXMu X2NhbnZhcy53aWR0aCA9IHdpZHRoOwogICAgICAgICB0aGlzLl9jYW52YXMuaGVpZ2h0ID0gaGVp Z2h0OwogICAgIH0sCiAKQEAgLTM4NCwxMiArMzk2LDE0IEBAIFdlYkluc3BlY3Rvci5NZW1vcnlT dGF0aXN0aWNzLnByb3RvdHlwZSA9IHsKICAgICAgICAgdmFyIGFuY2hvciA9IC8qKiBAdHlwZSB7 RWxlbWVudHxudWxsfSAqLyB0aGlzLl9jb250YWluZXJBbmNob3IubmV4dFNpYmxpbmc7CiAgICAg ICAgIHRoaXMuX21lbW9yeVNwbGl0Vmlldy5zaG93KHRoaXMuX3RpbWVsaW5lUGFuZWwuZWxlbWVu dCwgYW5jaG9yKTsKICAgICAgICAgdGhpcy5fdXBkYXRlU2l6ZSgpOworICAgICAgICB0aGlzLl9y ZWZyZXNoRGl2aWRlcnMoKTsKICAgICAgICAgc2V0VGltZW91dCh0aGlzLl9kcmF3LmJpbmQodGhp cyksIDApOwogICAgIH0sCiAKICAgICByZWZyZXNoOiBmdW5jdGlvbigpCiAgICAgewogICAgICAg ICB0aGlzLl91cGRhdGVTaXplKCk7CisgICAgICAgIHRoaXMuX3JlZnJlc2hEaXZpZGVycygpOwog ICAgICAgICB0aGlzLl9kcmF3KCk7CiAgICAgICAgIHRoaXMuX3JlZnJlc2hDdXJyZW50VmFsdWVz KCk7CiAgICAgfSwKQEAgLTM5OSw2ICs0MTMsMTEgQEAgV2ViSW5zcGVjdG9yLk1lbW9yeVN0YXRp c3RpY3MucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9tZW1vcnlTcGxpdFZpZXcuZGV0YWNo KCk7CiAgICAgfSwKIAorICAgIF9yZWZyZXNoRGl2aWRlcnM6IGZ1bmN0aW9uKCkKKyAgICB7Cisg ICAgICAgIHRoaXMuX3RpbWVsaW5lR3JpZC51cGRhdGVEaXZpZGVycyh0cnVlLCB0aGlzLl90aW1l bGluZVBhbmVsLmNhbGN1bGF0b3IsIHRoaXMuX3RpbWVsaW5lUGFuZWwudGltZWxpbmVQYWRkaW5n TGVmdCk7CisgICAgfSwKKwogICAgIF9zZXRWZXJ0aWNhbENsaXA6IGZ1bmN0aW9uKG9yaWdpblks IGhlaWdodCkKICAgICB7CiAgICAgICAgIHRoaXMuX29yaWdpblkgPSBvcmlnaW5ZOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZUdyaWQuanMg Yi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lR3JpZC5qcwppbmRl eCA1YjdmMzIzZDY0YzlhMWEzZTg0YjY4MDZkNjFiMmY2Y2M2YTJmMzM3Li40YWE2ZDEyMjBkMDc5 MGMwMTllYmFhMTNhZTVkNTNjOWYwODAyMzY4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lR3JpZC5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lR3JpZC5qcwpAQCAtNTgsNiArNTgsMTEgQEAgV2Vi SW5zcGVjdG9yLlRpbWVsaW5lR3JpZC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlz Ll9pdGVtc0dyYXBoc0VsZW1lbnQ7CiAgICAgfSwKIAorICAgIGdldCBkaXZpZGVyc0VsZW1lbnQo KQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2RpdmlkZXJzRWxlbWVudDsKKyAgICB9LAor CiAgICAgLyoqCiAgICAgICogQHBhcmFtIHtudW1iZXI9fSBwYWRkaW5nTGVmdAogICAgICAqLwpA QCAtNzYsOCArODEsOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVHcmlkLnByb3RvdHlwZSA9IHsK ICAgICAgICAgdmFyIGRpdmlkZXIgPSB0aGlzLl9kaXZpZGVyc0VsZW1lbnQuZmlyc3RDaGlsZDsK ICAgICAgICAgdmFyIGRpdmlkZXJMYWJlbEJhciA9IHRoaXMuX2RpdmlkZXJzTGFiZWxCYXJFbGVt ZW50LmZpcnN0Q2hpbGQ7CiAKLSAgICAgICAgdmFyIGRpdmlkZXJzTGFiZWxCYXJFbGVtZW50Q2xp ZW50V2lkdGggPSB0aGlzLl9kaXZpZGVyc0xhYmVsQmFyRWxlbWVudC5jbGllbnRXaWR0aDsKLSAg ICAgICAgdmFyIGNsaWVudFdpZHRoID0gZGl2aWRlcnNMYWJlbEJhckVsZW1lbnRDbGllbnRXaWR0 aCAtIHBhZGRpbmdMZWZ0OworICAgICAgICB2YXIgZGl2aWRlcnNFbGVtZW50Q2xpZW50V2lkdGgg PSB0aGlzLl9kaXZpZGVyc0VsZW1lbnQuY2xpZW50V2lkdGg7CisgICAgICAgIHZhciBjbGllbnRX aWR0aCA9IGRpdmlkZXJzRWxlbWVudENsaWVudFdpZHRoIC0gcGFkZGluZ0xlZnQ7CiAgICAgICAg IGZvciAodmFyIGkgPSBwYWRkaW5nTGVmdCA/IDAgOiAxOyBpIDw9IGRpdmlkZXJDb3VudDsgKytp KSB7CiAgICAgICAgICAgICBpZiAoIWRpdmlkZXIpIHsKICAgICAgICAgICAgICAgICBkaXZpZGVy ID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiZGl2Iik7CkBAIC05MSw3ICs5Niw2IEBAIFdlYklu c3BlY3Rvci5UaW1lbGluZUdyaWQucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAgIGRpdmlk ZXJMYWJlbEJhci5fbGFiZWxFbGVtZW50ID0gbGFiZWw7CiAgICAgICAgICAgICAgICAgZGl2aWRl ckxhYmVsQmFyLmFwcGVuZENoaWxkKGxhYmVsKTsKICAgICAgICAgICAgICAgICB0aGlzLl9kaXZp ZGVyc0xhYmVsQmFyRWxlbWVudC5hcHBlbmRDaGlsZChkaXZpZGVyTGFiZWxCYXIpOwotICAgICAg ICAgICAgICAgIGRpdmlkZXJzTGFiZWxCYXJFbGVtZW50Q2xpZW50V2lkdGggPSB0aGlzLl9kaXZp ZGVyc0xhYmVsQmFyRWxlbWVudC5jbGllbnRXaWR0aDsKICAgICAgICAgICAgIH0KIAogICAgICAg ICAgICAgaWYgKGkgPT09IChwYWRkaW5nTGVmdCA/IDAgOiAxKSkgewpAQCAtMTExLDcgKzExNSw3 IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZUdyaWQucHJvdG90eXBlID0gewogICAgICAgICAgICAg fQogCiAgICAgICAgICAgICB2YXIgbGVmdCA9IHBhZGRpbmdMZWZ0ICsgY2xpZW50V2lkdGggKiAo aSAvIGRpdmlkZXJDb3VudCk7Ci0gICAgICAgICAgICB2YXIgcGVyY2VudExlZnQgPSAxMDAgKiBs ZWZ0IC8gZGl2aWRlcnNMYWJlbEJhckVsZW1lbnRDbGllbnRXaWR0aDsKKyAgICAgICAgICAgIHZh ciBwZXJjZW50TGVmdCA9IDEwMCAqIGxlZnQgLyBkaXZpZGVyc0VsZW1lbnRDbGllbnRXaWR0aDsK ICAgICAgICAgICAgIHRoaXMuX3NldERpdmlkZXJBbmRCYXJMZWZ0KGRpdmlkZXIsIGRpdmlkZXJM YWJlbEJhciwgcGVyY2VudExlZnQpOwogCiAgICAgICAgICAgICBpZiAoIWlzTmFOKHNsaWNlKSkK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQ YW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5l bC5qcwppbmRleCA5OTUxZjllOTljNGJmMThlZDI5NzczYjE4MTg3MGY4ZjhmZGJiOGU2Li44YzJh NzIxMjhlNjYwNmRlYzMxMDJjMDcyOWQyZDhiN2JiNmNlNTYzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKKysrIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzCkBAIC03OSw2ICs3 OSw4IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsID0gZnVuY3Rpb24oKQogICAgIHRoaXMu X2l0ZW1zR3JhcGhzRWxlbWVudC5pZCA9ICJ0aW1lbGluZS1ncmFwaHMiOwogICAgIHRoaXMuX2l0 ZW1zR3JhcGhzRWxlbWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3VzZXdoZWVsIiwgdGhpcy5fb3Zl cnZpZXdQYW5lLnNjcm9sbFdpbmRvdy5iaW5kKHRoaXMuX292ZXJ2aWV3UGFuZSksIHRydWUpOwog ICAgIHRoaXMuX2NvbnRhaW5lckNvbnRlbnRFbGVtZW50LmFwcGVuZENoaWxkKHRoaXMuX3RpbWVs aW5lR3JpZC5lbGVtZW50KTsKKyAgICBpZiAodGhpcy5fbWVtb3J5U3RhdGlzdGljcykKKyAgICAg ICAgdGhpcy5fbWVtb3J5U3RhdGlzdGljcy5zZXRNYWluVGltZWxpbmVHcmlkKHRoaXMuX3RpbWVs aW5lR3JpZCk7CiAKICAgICB0aGlzLl90b3BHYXBFbGVtZW50ID0gZG9jdW1lbnQuY3JlYXRlRWxl bWVudCgiZGl2Iik7CiAgICAgdGhpcy5fdG9wR2FwRWxlbWVudC5jbGFzc05hbWUgPSAidGltZWxp bmUtZ2FwIjsKQEAgLTM3OCwxMyArMzgwLDEzIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVs LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuX21lbW9yeVN0YXRpc3RpY3MuaGlkZSgp OwogICAgICAgICAgICAgdGhpcy5zcGxpdFZpZXcuZWxlbWVudC5zdHlsZS5oZWlnaHQgPSAiYXV0 byI7CiAgICAgICAgICAgICB0aGlzLnNwbGl0Vmlldy5lbGVtZW50LnN0eWxlLmJvdHRvbSA9ICIw IjsKLSAgICAgICAgICAgIHRoaXMub25SZXNpemUoKTsKICAgICAgICAgfSBlbHNlIHsKICAgICAg ICAgICAgIHRoaXMuX3RpbWVsaW5lTWVtb3J5U3BsaXR0ZXIucmVtb3ZlU3R5bGVDbGFzcygiaGlk ZGVuIik7CiAgICAgICAgICAgICB0aGlzLl9tZW1vcnlTdGF0aXN0aWNzLnNob3coKTsKICAgICAg ICAgICAgIHRoaXMuc3BsaXRWaWV3LmVsZW1lbnQuc3R5bGUuYm90dG9tID0gImF1dG8iOwogICAg ICAgICAgICAgdGhpcy5fc2V0U3BsaXR0ZXJQb3NpdGlvbig2MDApOwogICAgICAgICB9CisgICAg ICAgIHRoaXMuX3JlZnJlc2goKTsKICAgICB9LAogCiAgICAgX3RvZ2dsZVRpbWVsaW5lQnV0dG9u Q2xpY2tlZDogZnVuY3Rpb24oKQpAQCAtNzg3LDEyICs3ODksMTYgQEAgV2ViSW5zcGVjdG9yLlRp bWVsaW5lUGFuZWwucHJvdG90eXBlID0gewogICAgICAgICB0aGlzLl9pdGVtc0dyYXBoc0VsZW1l bnQuYXBwZW5kQ2hpbGQodGhpcy5fZXhwYW5kRWxlbWVudHMpOwogICAgICAgICB0aGlzLnNwbGl0 Vmlldy5zaWRlYmFyUmVzaXplckVsZW1lbnQuc3R5bGUuaGVpZ2h0ID0gdGhpcy5zaWRlYmFyRWxl bWVudC5jbGllbnRIZWlnaHQgKyAicHgiOwogICAgICAgICAvLyBSZXNlcnZlIHNvbWUgcm9vbSBm b3IgZXhwYW5kIC8gY29sbGFwc2UgY29udHJvbHMgdG8gdGhlIGxlZnQgZm9yIHJlY29yZHMgdGhh dCBzdGFydCBhdCAwbXMuCi0gICAgICAgIHZhciB0aW1lbGluZVBhZGRpbmdMZWZ0ID0gdGhpcy5f Y2FsY3VsYXRvci53aW5kb3dMZWZ0ID09PSAwID8gdGhpcy5fZXhwYW5kT2Zmc2V0IDogMDsKICAg ICAgICAgaWYgKHVwZGF0ZUJvdW5kYXJpZXMpCi0gICAgICAgICAgICB0aGlzLl90aW1lbGluZUdy aWQudXBkYXRlRGl2aWRlcnModHJ1ZSwgdGhpcy5fY2FsY3VsYXRvciwgdGltZWxpbmVQYWRkaW5n TGVmdCk7CisgICAgICAgICAgICB0aGlzLl90aW1lbGluZUdyaWQudXBkYXRlRGl2aWRlcnModHJ1 ZSwgdGhpcy5fY2FsY3VsYXRvciwgdGhpcy50aW1lbGluZVBhZGRpbmdMZWZ0KTsKICAgICAgICAg dGhpcy5fYWRqdXN0U2Nyb2xsUG9zaXRpb24oKHJlY29yZHNJbldpbmRvdy5sZW5ndGggKyAxKSAq IHJvd0hlaWdodCk7CiAgICAgfSwKIAorICAgIGdldCB0aW1saW5lUGFkZGluZ0xlZnQoKQorICAg IHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX2NhbGN1bGF0b3Iud2luZG93TGVmdCA9PT0gMCA/IHRo aXMuX2V4cGFuZE9mZnNldCA6IDA7CisgICAgfSwKKwogICAgIF9hZGp1c3RTY3JvbGxQb3NpdGlv bjogZnVuY3Rpb24odG90YWxIZWlnaHQpCiAgICAgewogICAgICAgICAvLyBQcmV2ZW50IHRoZSBj b250YWluZXIgZnJvbSBiZWluZyBzY3JvbGxlZCBvZmYgdGhlIGVuZC4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvdGltZWxpbmVQYW5lbC5jc3MgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL3RpbWVsaW5lUGFuZWwuY3NzCmluZGV4IDM1 YWNkZWU2N2U2MWVjNzlmYjk5ZTExYzdmMmIwZTM3NmQ1OWExYmUuLjJhMjBhOTcwNTQ5M2MxYWU1 ZWFlMmYxNjg1MDYxMTlhMjJkYWY1YzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvdGltZWxpbmVQYW5lbC5jc3MKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC90aW1lbGluZVBhbmVsLmNzcwpAQCAtNTU5LDYgKzU1OSwxNCBAQAog ICAgIGJvcmRlci10b3A6IDFweCBzb2xpZCAjQUFBOwogfQogCisjbWVtb3J5LWdyYXBocy1jYW52 YXMtY29udGFpbmVyIHsKKyAgICBib3JkZXItcmlnaHQ6IDFweCBzb2xpZCAjQUFBOworfQorCisj bWVtb3J5LWdyYXBocy1jYW52YXMtY29udGFpbmVyIC5yZXNvdXJjZXMtZGl2aWRlcnMgeworICAg IHRvcDogMTVweDsKK30KKwogI21lbW9yeS1ncmFwaHMtY29udGFpbmVyIC5zcGxpdC12aWV3LWNv bnRlbnRzIHsKICAgICBvdmVyZmxvdzogaGlkZGVuOwogfQo=