126676 2014-01-08 19:07:40 -0800 Web Inspector: Correctly track time bounds of WebInspector.Timeline and WebInspector.TimelineRecording 2014-01-20 19:00:55 -0800 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 timothy timothy commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 965740 0 timothy 2014-01-08 19:07:40 -0800 The startTime and endTime were not correct when Network timeline needed to be taken into account (due to its dynamic loading nature.) 965741 1 webkit-bug-importer 2014-01-08 19:08:24 -0800 <rdar://problem/15778935> 965742 2 220690 timothy 2014-01-08 19:11:56 -0800 Created attachment 220690 Patch 966049 3 220690 joepeck 2014-01-09 13:35:17 -0800 Comment on attachment 220690 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=220690&action=review r=me > Source/WebInspectorUI/UserInterface/TimelineRecording.js:64 > + }.bind(this)); You could use the thisObject optional param to Map.prototype.forEach. E.g.: forEach(function() {...}, this); instead of forEach(function() {...}.bind(this)); > Source/WebInspectorUI/UserInterface/TimelineRecording.js:74 > + }.bind(this)); Ditto 966613 4 220894 timothy 2014-01-10 15:01:43 -0800 Created attachment 220894 Patch 970115 5 timothy 2014-01-20 19:00:55 -0800 https://trac.webkit.org/changeset/162402 220690 2014-01-08 19:11:56 -0800 2014-01-10 15:15:54 -0800 Patch bug-126676-20140108191157.patch text/plain 11500 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTU3ODg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCBl Njg3YzY1OTZlNDIwOWMzMjkyMTU0YjNmYzNiY2ZmODcxY2UxYzRmLi5lNTA2NTkxYWUwMDVkMzIx NTc5OTk2Y2ExMzVkYjlmOWUzZGViMzc4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs NSArMSw0NCBAQAogMjAxNC0wMS0wOCAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CiAKKyAgICAgICAgQ29ycmVjdGx5IHRyYWNrIHRpbWUgYm91bmRzIG9mIFdlYkluc3BlY3Rv ci5UaW1lbGluZSBhbmQgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nLgorCisgICAgICAg IFRoZSBzdGFydFRpbWUgYW5kIGVuZFRpbWUgd2VyZSBub3QgY29ycmVjdCB3aGVuIE5ldHdvcmsg dGltZWxpbmUgbmVlZGVkIHRvIGJlIHRha2VuIGludG8KKyAgICAgICAgYWNjb3VudCAoZHVlIHRv IGl0cyBkeW5hbWljIGxvYWRpbmcgbmF0dXJlLikgVGhpcyBjcmVhdGVzIGEgbmV0d29yayBUaW1l bGluZSBmb3IgdGhlIHB1cnBvc2VzCisgICAgICAgIG9mIHRyYWNraW5nIHRoZSBSZXNvdXJjZVRp bWVsaW5lUmVjb3JkcyBhbmQgZ2V0dGluZyBhY2N1cmF0ZSBzdGFydCBhbmQgZW5kIHRpbWVzLgor CisgICAgICAgIEFsc28gY2hhbmdlcyB0aGUgd2F5IFRpbWVsaW5lUmVjb3JkIHRyYWNrcyB0aGUg aW5hY3RpdmUgcG9ydGlvbiBvZiB0aW1lLCBuZWVkZWQgZm9yIGxhdGVyCisgICAgICAgIHdvcmsg b24gdGhlIHRpbWVsaW5lIGdyYXBocy4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTI2Njc2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Jlc291cmNlVGltZWxpbmVSZWNvcmQu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2VUaW1lbGluZVJlY29yZC5wcm90b3R5 cGUuZ2V0IHVwZGF0ZXNEeW5hbWljYWxseSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3Vy Y2VUaW1lbGluZVJlY29yZC5wcm90b3R5cGUuZ2V0IHVzZXNBY3RpdmVTdGFydFRpbWUpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlVGltZWxpbmVSZWNvcmQucHJvdG90eXBlLmdldCBz dGFydFRpbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJlc291cmNlVGltZWxpbmVSZWNvcmQu cHJvdG90eXBlLmdldCBhY3RpdmVTdGFydFRpbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlJl c291cmNlVGltZWxpbmVSZWNvcmQucHJvdG90eXBlLmdldCBlbmRUaW1lKToKKyAgICAgICAgKiBV c2VySW50ZXJmYWNlL1RpbWVsaW5lLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5l KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZS5wcm90b3R5cGUuZ2V0IHN0YXJ0VGlt ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmUucHJvdG90eXBlLmdldCBlbmRUaW1l KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZS5wcm90b3R5cGUuYWRkUmVjb3JkKToK KyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZS5wcm90b3R5cGUuX3VwZGF0ZVRpbWVzSWZO ZWVkZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lLnByb3RvdHlwZS5fcmVjb3Jk VXBkYXRlZCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9UaW1lbGluZVJlY29yZC5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5wcm90b3R5cGUuZ2V0IHN0YXJ0VGlt ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQucHJvdG90eXBlLmdldCBh Y3RpdmVTdGFydFRpbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkLnBy b3RvdHlwZS5nZXQgZW5kVGltZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNv cmQucHJvdG90eXBlLmdldCBpbmFjdGl2ZUR1cmF0aW9uKToKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5UaW1lbGluZVJlY29yZC5wcm90b3R5cGUuZ2V0IGFjdGl2ZUR1cmF0aW9uKToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5wcm90b3R5cGUuZ2V0IHVwZGF0ZXNEeW5hbWlj YWxseSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQucHJvdG90eXBlLmdl dCB1c2VzQWN0aXZlU3RhcnRUaW1lKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1RpbWVsaW5l UmVjb3JkaW5nLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nLnBy b3RvdHlwZS5fdGltZWxpbmVUaW1lc1VwZGF0ZWQpOgorCisyMDE0LTAxLTA4ICBUaW1vdGh5IEhh dGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4KKwogICAgICAgICBVcGRhdGUgdGhlIGN1cnJlbnQg V2ViSW5zcGVjdG9yLlRpbWVsaW5lVmlldyB3aGVuIHRpbWUgcmFuZ2UgY2hhbmdlcy4KIAogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI2NjY3CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9SZXNvdXJjZVRpbWVs aW5lUmVjb3JkLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUmVzb3Vy Y2VUaW1lbGluZVJlY29yZC5qcwppbmRleCAzNWJmZTU5ZDJkOWFlM2EzYWUzMjYzMWFhNmUyMWMy YTc1ZDNlNWZiLi5hYWRhOGZhZmViMGMyYWNkM2QwODQxZDhmZDc5ZGEyYTlkYzhlYWY1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9SZXNvdXJjZVRpbWVs aW5lUmVjb3JkLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Jl c291cmNlVGltZWxpbmVSZWNvcmQuanMKQEAgLTQxLDI0ICs0MSwyOSBAQCBXZWJJbnNwZWN0b3Iu UmVzb3VyY2VUaW1lbGluZVJlY29yZC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiB0aGlz Ll9yZXNvdXJjZTsKICAgICB9LAogCi0gICAgZ2V0IHN0YXJ0VGltZSgpCisgICAgZ2V0IHVwZGF0 ZXNEeW5hbWljYWxseSgpCiAgICAgewotICAgICAgICByZXR1cm4gdGhpcy5fcmVzb3VyY2UuZmly c3RUaW1lc3RhbXA7CisgICAgICAgIHJldHVybiB0cnVlOwogICAgIH0sCiAKLSAgICBnZXQgZW5k VGltZSgpCisgICAgZ2V0IHVzZXNBY3RpdmVTdGFydFRpbWUoKQogICAgIHsKLSAgICAgICAgcmV0 dXJuIHRoaXMuX3Jlc291cmNlLmxhc3RUaW1lc3RhbXA7CisgICAgICAgIHJldHVybiB0cnVlOwog ICAgIH0sCiAKLSAgICBnZXQgd2FpdGluZ0R1cmF0aW9uKCkKKyAgICBnZXQgc3RhcnRUaW1lKCkK ICAgICB7Ci0gICAgICAgIHJldHVybiB0aGlzLl9yZXNvdXJjZS5sYXRlbmN5OworICAgICAgICBy ZXR1cm4gdGhpcy5fcmVzb3VyY2UucmVxdWVzdFNlbnRUaW1lc3RhbXA7CiAgICAgfSwKIAotICAg IGdldCBhY3RpdmVEdXJhdGlvbigpCisgICAgZ2V0IGFjdGl2ZVN0YXJ0VGltZSgpCisgICAgewor ICAgICAgICByZXR1cm4gdGhpcy5fcmVzb3VyY2UucmVzcG9uc2VSZWNlaXZlZFRpbWVzdGFtcDsK KyAgICB9LAorCisgICAgZ2V0IGVuZFRpbWUoKQogICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMu X3Jlc291cmNlLnJlY2VpdmVEdXJhdGlvbjsKKyAgICAgICAgcmV0dXJuIHRoaXMuX3Jlc291cmNl LmZpbmlzaGVkT3JGYWlsZWRUaW1lc3RhbXA7CiAgICAgfSwKIAogICAgIC8vIFByaXZhdGUKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lLmpz IGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmUuanMKaW5kZXgg MDM4MDM4NmFlM2FjZWY4ODMwOThjYjJiM2U5Yjc3NzJhZmJjNWVmMi4uYWRhODg4YjVkNmVkMWRm NjFhODQ1MGNhYmRmODg2MWZkNmExODg3NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmUuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVGltZWxpbmUuanMKQEAgLTI4LDYgKzI4LDEzIEBAIFdlYkluc3BlY3Rv ci5UaW1lbGluZSA9IGZ1bmN0aW9uKCkKICAgICBXZWJJbnNwZWN0b3IuT2JqZWN0LmNhbGwodGhp cyk7CiAKICAgICB0aGlzLl9yZWNvcmRzID0gW107CisgICAgdGhpcy5fc3RhcnRUaW1lID0gTmFO OworICAgIHRoaXMuX2VuZFRpbWUgPSBOYU47Cit9OworCitXZWJJbnNwZWN0b3IuVGltZWxpbmUu RXZlbnQgPSB7CisgICAgUmVjb3JkQWRkZWQ6ICJ0aW1lbGluZS1yZWNvcmQtYWRkZWQiLAorICAg IFRpbWVzVXBkYXRlZDogInRpbWVsaW5lLXRpbWVzLXVwZGF0ZWQiCiB9OwogCiBXZWJJbnNwZWN0 b3IuVGltZWxpbmUucHJvdG90eXBlID0gewpAQCAtMzYsNiArNDMsMTYgQEAgV2ViSW5zcGVjdG9y LlRpbWVsaW5lLnByb3RvdHlwZSA9IHsKIAogICAgIC8vIFB1YmxpYwogCisgICAgZ2V0IHN0YXJ0 VGltZSgpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fc3RhcnRUaW1lOworICAgIH0sCisK KyAgICBnZXQgZW5kVGltZSgpCisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fZW5kVGltZTsK KyAgICB9LAorCiAgICAgZ2V0IHJlY29yZHMoKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMu X3JlY29yZHM7CkBAIC00Myw2ICs2MCwzOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmUucHJvdG90 eXBlID0gewogCiAgICAgYWRkUmVjb3JkOiBmdW5jdGlvbihyZWNvcmQpCiAgICAgeworICAgICAg ICBpZiAocmVjb3JkLnVwZGF0ZXNEeW5hbWljYWxseSkKKyAgICAgICAgICAgIHJlY29yZC5hZGRF dmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5FdmVudC5VcGRhdGVkLCB0 aGlzLl9yZWNvcmRVcGRhdGVkLCB0aGlzKTsKKwogICAgICAgICB0aGlzLl9yZWNvcmRzLnB1c2go cmVjb3JkKTsKKworICAgICAgICB0aGlzLl91cGRhdGVUaW1lc0lmTmVlZGVkKHJlY29yZCk7CisK KyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlRpbWVs aW5lLkV2ZW50LlJlY29yZEFkZGVkLCB7cmVjb3JkOiByZWNvcmR9KTsKKyAgICB9LAorCisgICAg Ly8gUHJpdmF0ZQorCisgICAgX3VwZGF0ZVRpbWVzSWZOZWVkZWQ6IGZ1bmN0aW9uKHJlY29yZCkK KyAgICB7CisgICAgICAgIHZhciBjaGFuZ2VkID0gZmFsc2U7CisKKyAgICAgICAgaWYgKGlzTmFO KHRoaXMuX3N0YXJ0VGltZSkgfHwgcmVjb3JkLnN0YXJ0VGltZSA8IHRoaXMuX3N0YXJ0VGltZSkg eworICAgICAgICAgICAgdGhpcy5fc3RhcnRUaW1lID0gcmVjb3JkLnN0YXJ0VGltZTsKKyAgICAg ICAgICAgIGNoYW5nZWQgPSB0cnVlOworICAgICAgICB9CisKKyAgICAgICAgaWYgKGlzTmFOKHRo aXMuX2VuZFRpbWUpIHx8IHRoaXMuX2VuZFRpbWUgPCByZWNvcmQuZW5kVGltZSkgeworICAgICAg ICAgICAgdGhpcy5fZW5kVGltZSA9IHJlY29yZC5lbmRUaW1lOworICAgICAgICAgICAgY2hhbmdl ZCA9IHRydWU7CisgICAgICAgIH0KKworICAgICAgICBpZiAoY2hhbmdlZCkKKyAgICAgICAgICAg IHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5UaW1lbGluZS5FdmVu dC5UaW1lc1VwZGF0ZWQpOworICAgIH0sCisKKyAgICBfcmVjb3JkVXBkYXRlZDogZnVuY3Rpb24o ZXZlbnQpCisgICAgeworICAgICAgICB0aGlzLl91cGRhdGVUaW1lc0lmTmVlZGVkKGV2ZW50LnRh cmdldCk7CiAgICAgfQogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL1RpbWVsaW5lUmVjb3JkLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVGltZWxpbmVSZWNvcmQuanMKaW5kZXggOGE0YTc1YThkZWQ4NWNmN2ZmZmE5NzAx NTBlMDUyMTc4MWI3M2FjYi4uNzFmMjcyZGJlMmU3YzkzODkxMTM1OGVhYjMwNDY1YTg3NjNhYTVh ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxp bmVSZWNvcmQuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGlt ZWxpbmVSZWNvcmQuanMKQEAgLTYxLDExICs2MSwxOSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVS ZWNvcmQucHJvdG90eXBlID0gewogCiAgICAgZ2V0IHN0YXJ0VGltZSgpCiAgICAgeworICAgICAg ICAvLyBJbXBsZW1lbnRlZCBieSBzdWJjbGFzc2VzIGlmIG5lZWRlZC4KKyAgICAgICAgcmV0dXJu IHRoaXMuX3N0YXJ0VGltZTsKKyAgICB9LAorCisgICAgZ2V0IGFjdGl2ZVN0YXJ0VGltZSgpCisg ICAgeworICAgICAgICAvLyBJbXBsZW1lbnRlZCBieSBzdWJjbGFzc2VzIGlmIG5lZWRlZC4KICAg ICAgICAgcmV0dXJuIHRoaXMuX3N0YXJ0VGltZTsKICAgICB9LAogCiAgICAgZ2V0IGVuZFRpbWUo KQogICAgIHsKKyAgICAgICAgLy8gSW1wbGVtZW50ZWQgYnkgc3ViY2xhc3NlcyBpZiBuZWVkZWQu CiAgICAgICAgIHJldHVybiB0aGlzLl9lbmRUaW1lOwogICAgIH0sCiAKQEAgLTc1LDE2ICs4Mywy OCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmQucHJvdG90eXBlID0gewogICAgICAgICBy ZXR1cm4gdGhpcy5lbmRUaW1lIC0gdGhpcy5zdGFydFRpbWU7CiAgICAgfSwKIAotICAgIGdldCB3 YWl0aW5nRHVyYXRpb24oKQorICAgIGdldCBpbmFjdGl2ZUR1cmF0aW9uKCkKICAgICB7Ci0gICAg ICAgIC8vIEltcGxlbWVudGVkIGJ5IHN1YmNsYXNzZXMgaWYgbmVlZGVkLgotICAgICAgICByZXR1 cm4gTmFOOworICAgICAgICAvLyBVc2UgdGhlIGdldHRlcnMgaW5zdGVhZCBvZiB0aGUgcHJvcGVy dGllcyBzbyB0aGlzIHdvcmtzIGZvciBzdWJjbGFzc2VzIHRoYXQgb3ZlcnJpZGUgdGhlIGdldHRl cnMuCisgICAgICAgIHJldHVybiB0aGlzLmFjdGl2ZVN0YXJ0VGltZSAtIHRoaXMuc3RhcnRUaW1l OwogICAgIH0sCiAKICAgICBnZXQgYWN0aXZlRHVyYXRpb24oKQogICAgIHsKKyAgICAgICAgLy8g VXNlIHRoZSBnZXR0ZXJzIGluc3RlYWQgb2YgdGhlIHByb3BlcnRpZXMgc28gdGhpcyB3b3JrcyBm b3Igc3ViY2xhc3NlcyB0aGF0IG92ZXJyaWRlIHRoZSBnZXR0ZXJzLgorICAgICAgICByZXR1cm4g dGhpcy5lbmRUaW1lIC0gdGhpcy5hY3RpdmVTdGFydFRpbWU7CisgICAgfSwKKworICAgIGdldCB1 cGRhdGVzRHluYW1pY2FsbHkoKQorICAgIHsKKyAgICAgICAgLy8gSW1wbGVtZW50ZWQgYnkgc3Vi Y2xhc3NlcyBpZiBuZWVkZWQuCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICB9LAorCisgICAg Z2V0IHVzZXNBY3RpdmVTdGFydFRpbWUoKQorICAgIHsKICAgICAgICAgLy8gSW1wbGVtZW50ZWQg Ynkgc3ViY2xhc3NlcyBpZiBuZWVkZWQuCi0gICAgICAgIHJldHVybiB0aGlzLmR1cmF0aW9uOwor ICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfSwKIAogICAgIGdldCBjYWxsRnJhbWVzKCkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1RpbWVsaW5lUmVj b3JkaW5nLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmVS ZWNvcmRpbmcuanMKaW5kZXggNzIxMWI5OTY2OThmNzQyOTQ1MjJlZDhhYTQzZGZhMTFkYmVhZWE5 Ni4uMWY3MmQyZjM1NjFmOTZiZmNiY2I5NmVmNTY3NGMyOWYxZWE0MGE2MSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmVSZWNvcmRpbmcuanMK KysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGltZWxpbmVSZWNvcmRp bmcuanMKQEAgLTMyLDcgKzMyLDggQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nID0g ZnVuY3Rpb24oKQogCiBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRpbmcuRXZlbnQgPSB7CiAg ICAgUmVzZXQ6ICJ0aW1lbGluZS1yZWNvcmRpbmctcmVzZXQiLAotICAgIFNvdXJjZUNvZGVUaW1l bGluZUFkZGVkOiAidGltZWxpbmUtcmVjb3JkaW5nLXNvdXJjZS1jb2RlLXRpbWVsaW5lLWFkZGVk IgorICAgIFNvdXJjZUNvZGVUaW1lbGluZUFkZGVkOiAidGltZWxpbmUtcmVjb3JkaW5nLXNvdXJj ZS1jb2RlLXRpbWVsaW5lLWFkZGVkIiwKKyAgICBUaW1lc1VwZGF0ZWQ6ICJ0aW1lbGluZS1yZWNv cmRpbmctdGltZXMtdXBkYXRlZCIKIH07CiAKIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGlu Zy5wcm90b3R5cGUgPSB7CkBAIC01Nyw3ICs1OCwyMSBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVS ZWNvcmRpbmcucHJvdG90eXBlID0gewogCiAgICAgcmVzZXQ6IGZ1bmN0aW9uKG5ld09iamVjdCkK ICAgICB7Ci0gICAgICAgIHRoaXMuX3RpbWVsaW5lcyA9IHtzY3JpcHQ6IG5ldyBXZWJJbnNwZWN0 b3IuVGltZWxpbmUsIGxheW91dDogbmV3IFdlYkluc3BlY3Rvci5UaW1lbGluZX07CisgICAgICAg IGlmICh0aGlzLl90aW1lbGluZXMpIHsKKyAgICAgICAgICAgIHRoaXMuX3RpbWVsaW5lcy5mb3JF YWNoKGZ1bmN0aW9uKHRpbWVsaW5lKSB7CisgICAgICAgICAgICAgICAgdGltZWxpbmUucmVtb3Zl RXZlbnRMaXN0ZW5lcihudWxsLCBudWxsLCB0aGlzKTsKKyAgICAgICAgICAgIH0uYmluZCh0aGlz KSk7CisgICAgICAgIH0KKworICAgICAgICB0aGlzLl90aW1lbGluZXMgPSBuZXcgTWFwOworICAg ICAgICB0aGlzLl90aW1lbGluZXMuc2V0KFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBl Lk5ldHdvcmssIG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmUpOworICAgICAgICB0aGlzLl90aW1l bGluZXMuc2V0KFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLlNjcmlwdCwgbmV3IFdl Ykluc3BlY3Rvci5UaW1lbGluZSk7CisgICAgICAgIHRoaXMuX3RpbWVsaW5lcy5zZXQoV2ViSW5z cGVjdG9yLlRpbWVsaW5lUmVjb3JkLlR5cGUuTGF5b3V0LCBuZXcgV2ViSW5zcGVjdG9yLlRpbWVs aW5lKTsKKworICAgICAgICB0aGlzLl90aW1lbGluZXMuZm9yRWFjaChmdW5jdGlvbih0aW1lbGlu ZSkgeworICAgICAgICAgICAgdGltZWxpbmUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3Iu VGltZWxpbmUuRXZlbnQuVGltZXNVcGRhdGVkLCB0aGlzLl90aW1lbGluZVRpbWVzVXBkYXRlZCwg dGhpcyk7CisgICAgICAgIH0uYmluZCh0aGlzKSk7CisKICAgICAgICAgdGhpcy5fc291cmNlQ29k ZVRpbWVsaW5lc01hcCA9IG5ldyBNYXA7CiAgICAgICAgIHRoaXMuX2V2ZW50TWFya2VycyA9IFtd OwogICAgICAgICB0aGlzLl9zdGFydFRpbWUgPSBOYU47CkBAIC05MCwyOCArMTA1LDEzIEBAIFdl Ykluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZy5wcm90b3R5cGUgPSB7CiAKICAgICBhZGRSZWNv cmQ6IGZ1bmN0aW9uKHJlY29yZCkKICAgICB7Ci0gICAgICAgIC8vIE5ldHdvcmsgcmVjb3JkcyBh cmUgbm90IGFkZGVkIGJlY2F1c2UgdGhleSBhcmUgaGFuZGxlZCBzZXBhcmF0ZWx5IGFuZCBhbHdh eXMgdHJhY2tlZCBieSB0aGUgRnJhbWVSZXNvdXJjZU1hbmFnZXIgZm9yIHVzLgotICAgICAgICBj b25zb2xlLmFzc2VydChyZWNvcmQudHlwZSAhPT0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3Jk LlR5cGUuTmV0d29yayk7CisgICAgICAgIC8vIEFkZCB0aGUgcmVjb3JkIHRvIHRoZSBnbG9iYWwg dGltZWxpbmUgYnkgdHlwZS4KKyAgICAgICAgdGhpcy5fdGltZWxpbmVzLmdldChyZWNvcmQudHlw ZSkuYWRkUmVjb3JkKHJlY29yZCk7CisKKyAgICAgICAgLy8gTmV0b3dyayByZWNvcmRzIGRvbid0 IGhhdmUgc291cmNlIGNvZGUgdGltZWxpbmVzLgogICAgICAgICBpZiAocmVjb3JkLnR5cGUgPT09 IFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLk5ldHdvcmspCiAgICAgICAgICAgICBy ZXR1cm47CiAKLSAgICAgICAgaWYgKGlzTmFOKHRoaXMuX3N0YXJ0VGltZSkpCi0gICAgICAgICAg ICB0aGlzLl9zdGFydFRpbWUgPSByZWNvcmQuc3RhcnRUaW1lOwotCi0gICAgICAgIGlmICghaXNO YU4ocmVjb3JkLmVuZFRpbWUpKQotICAgICAgICAgICAgdGhpcy5fZW5kVGltZSA9IHJlY29yZC5l bmRUaW1lOwotCi0gICAgICAgIC8vIEFkZCB0aGUgcmVjb3JkcyB0byB0aGUgZ2xvYmFsIHRpbWVs aW5lcy4KLSAgICAgICAgc3dpdGNoIChyZWNvcmQudHlwZSkgewotICAgICAgICBjYXNlIFdlYklu c3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLkxheW91dDoKLSAgICAgICAgICAgIHRoaXMuX3Rp bWVsaW5lcy5sYXlvdXQuYWRkUmVjb3JkKHJlY29yZCk7Ci0gICAgICAgICAgICBicmVhazsKLQot ICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZC5UeXBlLlNjcmlwdDoKLSAg ICAgICAgICAgIHRoaXMuX3RpbWVsaW5lcy5zY3JpcHQuYWRkUmVjb3JkKHJlY29yZCk7Ci0gICAg ICAgICAgICBicmVhazsKLSAgICAgICAgfQotCiAgICAgICAgIC8vIEFkZCB0aGUgcmVjb3JkIHRv IHRoZSBzb3VyY2UgY29kZSB0aW1lbGluZXMuCiAgICAgICAgIHZhciBzb3VyY2VDb2RlID0gcmVj b3JkLnNvdXJjZUNvZGVMb2NhdGlvbiA/IHJlY29yZC5zb3VyY2VDb2RlTG9jYXRpb24uc291cmNl Q29kZSA6IFdlYkluc3BlY3Rvci5mcmFtZVJlc291cmNlTWFuYWdlci5tYWluRnJhbWUubWFpblJl c291cmNlOwogCkBAIC0xNDgsNSArMTQ4LDI0IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29y ZGluZy5wcm90b3R5cGUgPSB7CiAgICAgICAgIGlmIChyZWNvcmQuc291cmNlQ29kZUxvY2F0aW9u KQogICAgICAgICAgICAga2V5ICs9ICI6IiArIHJlY29yZC5zb3VyY2VDb2RlTG9jYXRpb24ubGlu ZU51bWJlciArICI6IiArIHJlY29yZC5zb3VyY2VDb2RlTG9jYXRpb24uY29sdW1uTnVtYmVyOwog ICAgICAgICByZXR1cm4ga2V5OworICAgIH0sCisKKyAgICBfdGltZWxpbmVUaW1lc1VwZGF0ZWQ6 IGZ1bmN0aW9uKGV2ZW50KQorICAgIHsKKyAgICAgICAgdmFyIHRpbWVsaW5lID0gZXZlbnQudGFy Z2V0OworICAgICAgICB2YXIgY2hhbmdlZCA9IGZhbHNlOworCisgICAgICAgIGlmIChpc05hTih0 aGlzLl9zdGFydFRpbWUpIHx8IHRpbWVsaW5lLnN0YXJ0VGltZSA8IHRoaXMuX3N0YXJ0VGltZSkg eworICAgICAgICAgICAgdGhpcy5fc3RhcnRUaW1lID0gdGltZWxpbmUuc3RhcnRUaW1lOworICAg ICAgICAgICAgY2hhbmdlZCA9IHRydWU7CisgICAgICAgIH0KKworICAgICAgICBpZiAoaXNOYU4o dGhpcy5fZW5kVGltZSkgfHwgdGhpcy5fZW5kVGltZSA8IHRpbWVsaW5lLmVuZFRpbWUpIHsKKyAg ICAgICAgICAgIHRoaXMuX2VuZFRpbWUgPSB0aW1lbGluZS5lbmRUaW1lOworICAgICAgICAgICAg Y2hhbmdlZCA9IHRydWU7CisgICAgICAgIH0KKworICAgICAgICBpZiAoY2hhbmdlZCkKKyAgICAg ICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5UaW1lbGlu ZVJlY29yZGluZy5FdmVudC5UaW1lc1VwZGF0ZWQpOwogICAgIH0KIH07Cg== 220894 2014-01-10 15:01:43 -0800 2014-01-10 15:15:18 -0800 Patch bug-126676-20140110150142.patch text/plain 3397 timothy U3VidmVyc2lvbiBSZXZpc2lvbjogMTYxNjc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA3 YTI2ZWE3NTliNWMzM2U2OWY4Y2YxOGNlNmY1NjZkMTE5OTI5N2Q0Li41Njc1NmEyNjc5YzE5Zjk0 MDkwMDU5OTA3ZWI4OTNkNDhjYzliZmQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxMy0xMi0xMyAgVGltb3RoeSBIYXRjaGVyICA8dGltb3RoeUBhcHBsZS5j b20+CisKKyAgICAgICAgV2ViIEluc3BlY3Rvcjogc3VwcG9ydCBuZWdhdGl2ZSBudW1iZXJzIGlu IHNlY29uZHNUb1N0cmluZyBhbmQgYnl0ZXNUb1N0cmluZy4KKworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI1NzA4CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgSm9zZXBoIFBlY29yYXJvLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9VdGlsaXRpZXMu anM6CisgICAgICAgIChOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKTogVXNlIE1hdGguYWJzIGluIHRo ZSBzaXplIGNoZWNrcy4KKyAgICAgICAgKE51bWJlci5ieXRlc1RvU3RyaW5nKTogRGl0dG8uCisK IDIwMTMtMTItMDIgIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgogCiAgICAg ICAgIFNuYXAgdGltZSBkaXZpZGVycyB0byBuZWFyZXN0IG51bWJlcnMgaW5zdGVhZCBvZiBqdXN0 IGRpdmlkaW5nIHRoZSB0aW1lIHNwYW4gaW50byBtYXggZGVuc2l0eSBzbGljZXMuCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9VdGlsaXRpZXMuanMgYi9T b3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9VdGlsaXRpZXMuanMKaW5kZXggMzc1 Mzk3MTU2MGQ0M2NiNDdmZmVlZjY3YjlkOGVkNGY4Njc5Mzc3MC4uMmE5ZjQ4Y2E2YjllN2EyMmYy ODQzOGZmOGZhMjBmNmIyYmU1ODE3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVXRpbGl0aWVzLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL1V0aWxpdGllcy5qcwpAQCAtNzc1LDI1ICs3NzUsMjUgQEAgT2JqZWN0LmRl ZmluZVByb3BlcnR5KE51bWJlciwgInNlY29uZHNUb1N0cmluZyIsCiAgICAgewogICAgICAgICB2 YXIgbXMgPSBzZWNvbmRzICogMTAwMDsKIAotICAgICAgICBpZiAoaGlnaGVyUmVzb2x1dGlvbiAm JiBtcyA8IDEwMCkKKyAgICAgICAgaWYgKGhpZ2hlclJlc29sdXRpb24gJiYgTWF0aC5hYnMobXMp IDwgMTAwKQogICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5VSVN0cmluZygiJS4yZm1z IikuZm9ybWF0KG1zKTsKLSAgICAgICAgZWxzZSBpZiAobXMgPCAxMDApCisgICAgICAgIGVsc2Ug aWYgKE1hdGguYWJzKG1zKSA8IDEwMCkKICAgICAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIiUuMWZtcyIpLmZvcm1hdChtcyk7CiAKLSAgICAgICAgaWYgKGhpZ2hlclJlc29s dXRpb24gJiYgbXMgPCAxMDAwKQorICAgICAgICBpZiAoaGlnaGVyUmVzb2x1dGlvbiAmJiBNYXRo LmFicyhtcykgPCAxMDAwKQogICAgICAgICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiJS4xZm1zIikuZm9ybWF0KG1zKTsKLSAgICAgICAgZWxzZSBpZiAobXMgPCAxMDAwKQorICAg ICAgICBlbHNlIGlmIChNYXRoLmFicyhtcykgPCAxMDAwKQogICAgICAgICAgICAgcmV0dXJuIFdl Ykluc3BlY3Rvci5VSVN0cmluZygiJS4wZm1zIikuZm9ybWF0KG1zKTsKIAotICAgICAgICBpZiAo c2Vjb25kcyA8IDYwKQorICAgICAgICBpZiAoTWF0aC5hYnMoc2Vjb25kcykgPCA2MCkKICAgICAg ICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiUuMmZzIikuZm9ybWF0KHNlY29u ZHMpOwogCiAgICAgICAgIHZhciBtaW51dGVzID0gc2Vjb25kcyAvIDYwOwotICAgICAgICBpZiAo bWludXRlcyA8IDYwKQorICAgICAgICBpZiAoTWF0aC5hYnMobWludXRlcykgPCA2MCkKICAgICAg ICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiUuMWZtaW4iKS5mb3JtYXQobWlu dXRlcyk7CiAKICAgICAgICAgdmFyIGhvdXJzID0gbWludXRlcyAvIDYwOwotICAgICAgICBpZiAo aG91cnMgPCAyNCkKKyAgICAgICAgaWYgKE1hdGguYWJzKGhvdXJzKSA8IDI0KQogICAgICAgICAg ICAgcmV0dXJuIFdlYkluc3BlY3Rvci5VSVN0cmluZygiJS4xZmhycyIpLmZvcm1hdChob3Vycyk7 CiAKICAgICAgICAgdmFyIGRheXMgPSBob3VycyAvIDI0OwpAQCAtODA4LDE3ICs4MDgsMTcgQEAg T2JqZWN0LmRlZmluZVByb3BlcnR5KE51bWJlciwgImJ5dGVzVG9TdHJpbmciLAogICAgICAgICBp ZiAoaGlnaGVyUmVzb2x1dGlvbiA9PT0gdW5kZWZpbmVkKQogICAgICAgICAgICAgaGlnaGVyUmVz b2x1dGlvbiA9IHRydWU7CiAKLSAgICAgICAgaWYgKGJ5dGVzIDwgMTAyNCkKKyAgICAgICAgaWYg KE1hdGguYWJzKGJ5dGVzKSA8IDEwMjQpCiAgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9y LlVJU3RyaW5nKCIlLjBmIEIiKS5mb3JtYXQoYnl0ZXMpOwogCiAgICAgICAgIHZhciBraWxvYnl0 ZXMgPSBieXRlcyAvIDEwMjQ7Ci0gICAgICAgIGlmIChraWxvYnl0ZXMgPCAxMCB8fCAoaGlnaGVy UmVzb2x1dGlvbiAmJiBraWxvYnl0ZXMgPCAxMDI0KSkKKyAgICAgICAgaWYgKE1hdGguYWJzKGtp bG9ieXRlcykgPCAxMCB8fCAoaGlnaGVyUmVzb2x1dGlvbiAmJiBNYXRoLmFicyhraWxvYnl0ZXMp IDwgMTAyNCkpCiAgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIlLjJm IEtCIikuZm9ybWF0KGtpbG9ieXRlcyk7Ci0gICAgICAgIGVsc2UgaWYgKGtpbG9ieXRlcyA8IDEw MjQpCisgICAgICAgIGVsc2UgaWYgKE1hdGguYWJzKGtpbG9ieXRlcykgPCAxMDI0KQogICAgICAg ICAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5VSVN0cmluZygiJS4xZiBLQiIpLmZvcm1hdChraWxv Ynl0ZXMpOwogCiAgICAgICAgIHZhciBtZWdhYnl0ZXMgPSBraWxvYnl0ZXMgLyAxMDI0OwotICAg ICAgICBpZiAoaGlnaGVyUmVzb2x1dGlvbiB8fCBtZWdhYnl0ZXMgPCAxMCkKKyAgICAgICAgaWYg KGhpZ2hlclJlc29sdXRpb24gfHwgTWF0aC5hYnMobWVnYWJ5dGVzKSA8IDEwKQogICAgICAgICAg ICAgcmV0dXJuIFdlYkluc3BlY3Rvci5VSVN0cmluZygiJS4yZiBNQiIpLmZvcm1hdChtZWdhYnl0 ZXMpOwogICAgICAgICBlbHNlCiAgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCIlLjFmIE1CIikuZm9ybWF0KG1lZ2FieXRlcyk7Cg==