146433 2015-06-29 15:40:48 -0700 Web Inspector: iOS 8: Resources Timeline Data does not show up 2015-06-29 17:28:28 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck burg commit-queue graouts joepeck jonowells mattbaker nvasilyev timothy webkit-bug-importer oldest_to_newest 1105527 0 joepeck 2015-06-29 15:40:48 -0700 * SUMMARY iOS 8: Resources Timeline Data does not show up. * STEPS TO REPRODUCE 1. Load webkit.org on iOS 8 device 2. Inspect iOS 8 device 3. Show Timelines tab 4. Reload page => no timeline data 1105528 1 joepeck 2015-06-29 15:41:21 -0700 <rdar://problem/21558990> 1105532 2 255786 joepeck 2015-06-29 15:49:48 -0700 Created attachment 255786 [PATCH] Proposed Fix This is relatively ugly, but I couldn't really think up of a better approach. No matter how early we try to reset the base timestamp, it will never be right, because the "will send request" for the navigation's new main resource, will have always happened in the previous page's "timeline". Let me know what you think. 1105535 3 commit-queue 2015-06-29 15:52:47 -0700 Attachment 255786 did not pass style-queue: ERROR: Source/WebInspectorUI/ChangeLog:12: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] ERROR: Source/WebInspectorUI/ChangeLog:15: Need whitespace between colon and description [changelog/filechangedescriptionwhitespace] [5] Total errors found: 2 in 5 files If any of these errors are false positives, please file a bug against check-webkit-style. 1105567 4 255786 timothy 2015-06-29 17:00:48 -0700 Comment on attachment 255786 [PATCH] Proposed Fix Looks good. 1105578 5 255786 commit-queue 2015-06-29 17:28:25 -0700 Comment on attachment 255786 [PATCH] Proposed Fix Clearing flags on attachment: 255786 Committed r186098: <http://trac.webkit.org/changeset/186098> 1105579 6 commit-queue 2015-06-29 17:28:28 -0700 All reviewed patches have been landed. Closing bug. 255786 2015-06-29 15:49:48 -0700 2015-06-29 17:28:25 -0700 [PATCH] Proposed Fix woohoo.patch text/plain 12856 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IDE0YmZiYWQuLjM2M2FkMmQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ0IEBACiAyMDE1LTA2LTI5ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogaU9TIDg6 IFJlc291cmNlcyBUaW1lbGluZSBEYXRhIGRvZXMgbm90IHNob3cgdXAKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NjQzMworCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZXJlIHdlcmUgYSBjb3VwbGUgaXNz dWVzIHdpdGggaW5pdGlhbGl6aW5nIHRoZSBsZWdhY3kgYmFzZSB0aW1lc3RhbXAKKyAgICAgICAg Zm9yIGF0dGVtcHRpbmcgdG8gZHluYW1pY2FsbHkgY29tcHV0ZSBtb25vdG9uaWNhbGx5IGluY3Jl YXNpbmcgdGltZXN0YW1wcworICAgICAgICBmb3IgdGltZWxpbmUgZXZlbnRzIGZvciBsZWdhY3kg YmFja2VuZHMuCisKKyAgICAgICAgICAgICogU29tZXRpbWVzIGxlZ2FjeSB0aW1lc3RhbXBzIHdl cmUgaW4gc2Vjb25kcyBzaW5jZSBlcG9jaHMsCisgICAgICAgICAgICAgIHNvbWV0aW1lcyBtaWxs aXNlY29uZHMuIFRoZSBmcm9udGVuZCBkaWQgbm90IGhhbmRsZSBib3RoLgorCisgICAgICAgICAg ICAqIE9uIG5hdmlnYXRpb25zLCBldmVuIHdoaWxlIHJlc2V0dGluZyB0aGUgYmFzZSB0aW1lc3Rh bXAgZm9yCisgICAgICAgICAgICAgIHRoZSBmaXJzdCBuZXcgcmVjb3JkIHJlY2VpdmVkLCB0aGUg bWFpbiByZXNvdXJjZSBzdGlsbCBoYWQKKyAgICAgICAgICAgICAgYSB3aWxsIHNlbmQgcmVxdWVz dCB0aW1lIGNvbXB1dGVkIGZyb20gdGhlIHByZXZpb3VzIHBhZ2UncworICAgICAgICAgICAgICB0 aW1lIHN5c3RlbS4gVGhpcyBwYXRjaCByZS11c2VzIHRoZSBvcmlnaW5hbCB0aW1lc3RhbXAgZm9y CisgICAgICAgICAgICAgIHRoaXMgbWFpbiByZXNvdXJjZSBhcyB0aGUgbmV3IGJhc2UgYW5kIGFs bCBmdXR1cmUgcmVjb3JkcworICAgICAgICAgICAgICBhcmUgY29tcHV0ZWQgcmVsYXRpdmUgdG8g dGhpcy4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvRnJhbWVSZXNvdXJj ZU1hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRnJhbWVSZXNvdXJjZU1hbmFnZXIu cHJvdG90eXBlLnJlc291cmNlUmVxdWVzdFdpbGxCZVNlbnQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLkZyYW1lUmVzb3VyY2VNYW5hZ2VyLnByb3RvdHlwZS5fYWRkTmV3UmVzb3VyY2VUb0ZyYW1l KToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01vZGVscy9SZXNvdXJjZS5qczoKKyAgICAgICAg KFdlYkluc3BlY3Rvci5SZXNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2Uu cHJvdG90eXBlLmdldCBvcmlnaW5hbFJlcXVlc3RXaWxsQmVTZW50VGltZXN0YW1wKToKKyAgICAg ICAgRm9yIGxlZ2FjeSB0aW1lc3RhbXAgY2FsY3VsYXRpb25zLCBzYXZlIHRoZSBvcmlnaW5hbCBy ZXF1ZXN0IHdpbGwgYmUgc2VudAorICAgICAgICB0aW1lc3RhbXAgb24gdGhlIFJlc291cmNlIGlu IGNhc2UgaXQgaXMgbmVlZGVkLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9Db250cm9sbGVy cy9UaW1lbGluZU1hbmFnZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVNYW5h Z2VyLnByb3RvdHlwZS5fbG9hZE5ld1JlY29yZGluZyk6CisgICAgICAgIFdoZW4gYXV0by1zdGFy dGluZyBhIG5ldyByZWNvcmRpbmcgZm9yIGEgbmF2aWdhdGlvbiAvIHJlbG9hZCwgdXNlIHRoZQor ICAgICAgICBtYWluIHJlc291cmNlJ3MgcmVxdWVzdCB3aWxsIGJlIHNlbnQgdGltZXN0YW1wIGFz IHRoZSBuZXcgYmFzZS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL1RpbWVsaW5l UmVjb3JkaW5nLmpzOgorICAgICAgICBBZGRyZXNzIGxlZ2FjeSB0aW1lbGluZSB0aW1lc3RhbXBz IGJ5IGhhbmRsaW5nIGJvdGggbGVnYWN5IHRpbWVzdGFtcHMKKyAgICAgICAgdGhhdCBtYXkgYmUg c2Vjb25kcyAvIG1pbGxpc2Vjb25kcy4KKworMjAxNS0wNi0yOSAgSm9zZXBoIFBlY29yYXJvICA8 cGVjb3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IE1pc2MuIFRpbWVs aW5lIGNsZWFudXAKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTE0NjQzMAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Db250cm9sbGVycy9GcmFtZVJlc291cmNlTWFuYWdlci5qcyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0ZyYW1lUmVzb3VyY2VNYW5hZ2VyLmpz CmluZGV4IDUxMTE1OGUuLmQ1ZGI5ZTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JV SS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0ZyYW1lUmVzb3VyY2VNYW5hZ2VyLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL0ZyYW1lUmVz b3VyY2VNYW5hZ2VyLmpzCkBAIC0xNzcsNiArMTc3LDEzIEBAIFdlYkluc3BlY3Rvci5GcmFtZVJl c291cmNlTWFuYWdlciA9IGNsYXNzIEZyYW1lUmVzb3VyY2VNYW5hZ2VyIGV4dGVuZHMgV2ViSW5z cGVjCiAgICAgICAgIGlmICh0aGlzLl93YWl0aW5nRm9yTWFpbkZyYW1lUmVzb3VyY2VUcmVlUGF5 bG9hZCkKICAgICAgICAgICAgIHJldHVybjsKIAorICAgICAgICAvLyBDT01QQVRJQklMSVRZIChp T1MgOCk6IFRpbWVsaW5lIHRpbWVzdGFtcHMgZm9yIGxlZ2FjeSBiYWNrZW5kcyBhcmUgY29tcHV0 ZWQKKyAgICAgICAgLy8gZHluYW1pY2FsbHkgZnJvbSB0aGUgZmlyc3QgYmFja2VuZCB0aW1lc3Rh bXAgcmVjZWl2ZWQuIEZvciBuYXZpZ2F0aW9ucyB3ZQorICAgICAgICAvLyBuZWVkIHRvIHJlc2V0 IHRoYXQgYmFzZSB0aW1lc3RhbXAsIGFuZCBhbiBhcHByb3ByaWF0ZSB0aW1lc3RhbXAgdG8gdXNl IGlzCisgICAgICAgIC8vIHRoZSBuZXcgbWFpbiByZXNvdXJjZSdzIHdpbGwgYmUgc2VudCB0aW1l c3RhbXAuIFNvIHNhdmUgdGhpcyB2YWx1ZSBvbiB0aGUKKyAgICAgICAgLy8gcmVzb3VyY2UgaW4g Y2FzZSBpdCBiZWNvbWVzIGEgbWFpbiByZXNvdXJjZS4KKyAgICAgICAgdmFyIG9yaWdpbmFsUmVx dWVzdFdpbGxCZVNlbnRUaW1lc3RhbXAgPSB0aW1lc3RhbXA7CisKICAgICAgICAgdmFyIGVsYXBz ZWRUaW1lID0gV2ViSW5zcGVjdG9yLnRpbWVsaW5lTWFuYWdlci5jb21wdXRlRWxhcHNlZFRpbWUo dGltZXN0YW1wKTsKICAgICAgICAgdmFyIHJlc291cmNlID0gdGhpcy5fcmVzb3VyY2VSZXF1ZXN0 SWRlbnRpZmllck1hcFtyZXF1ZXN0SWRlbnRpZmllcl07CiAgICAgICAgIGlmIChyZXNvdXJjZSkg ewpAQCAtMTg5LDcgKzE5Niw3IEBAIFdlYkluc3BlY3Rvci5GcmFtZVJlc291cmNlTWFuYWdlciA9 IGNsYXNzIEZyYW1lUmVzb3VyY2VNYW5hZ2VyIGV4dGVuZHMgV2ViSW5zcGVjCiAgICAgICAgIHZh ciBpbml0aWF0b3JTb3VyY2VDb2RlTG9jYXRpb24gPSB0aGlzLl9pbml0aWF0b3JTb3VyY2VDb2Rl TG9jYXRpb25Gcm9tUGF5bG9hZChpbml0aWF0b3IpOwogCiAgICAgICAgIC8vIFRoaXMgaXMgYSBu ZXcgcmVxdWVzdCwgbWFrZSBhIG5ldyByZXNvdXJjZSBhbmQgYWRkIGl0IHRvIHRoZSByaWdodCBm cmFtZS4KLSAgICAgICAgcmVzb3VyY2UgPSB0aGlzLl9hZGROZXdSZXNvdXJjZVRvRnJhbWUocmVx dWVzdElkZW50aWZpZXIsIGZyYW1lSWRlbnRpZmllciwgbG9hZGVySWRlbnRpZmllciwgcmVxdWVz dC51cmwsIHR5cGUsIHJlcXVlc3QubWV0aG9kLCByZXF1ZXN0LmhlYWRlcnMsIHJlcXVlc3QucG9z dERhdGEsIGVsYXBzZWRUaW1lLCBudWxsLCBudWxsLCBpbml0aWF0b3JTb3VyY2VDb2RlTG9jYXRp b24pOworICAgICAgICByZXNvdXJjZSA9IHRoaXMuX2FkZE5ld1Jlc291cmNlVG9GcmFtZShyZXF1 ZXN0SWRlbnRpZmllciwgZnJhbWVJZGVudGlmaWVyLCBsb2FkZXJJZGVudGlmaWVyLCByZXF1ZXN0 LnVybCwgdHlwZSwgcmVxdWVzdC5tZXRob2QsIHJlcXVlc3QuaGVhZGVycywgcmVxdWVzdC5wb3N0 RGF0YSwgZWxhcHNlZFRpbWUsIG51bGwsIG51bGwsIGluaXRpYXRvclNvdXJjZUNvZGVMb2NhdGlv biwgb3JpZ2luYWxSZXF1ZXN0V2lsbEJlU2VudFRpbWVzdGFtcCk7CiAKICAgICAgICAgLy8gQXNz b2NpYXRlIHRoZSByZXNvdXJjZSB3aXRoIHRoZSByZXF1ZXN0SWRlbnRpZmllciBzbyBpdCBjYW4g YmUgZm91bmQgaW4gZnV0dXJlIGxvYWRpbmcgZXZlbnRzLgogICAgICAgICB0aGlzLl9yZXNvdXJj ZVJlcXVlc3RJZGVudGlmaWVyTWFwW3JlcXVlc3RJZGVudGlmaWVyXSA9IHJlc291cmNlOwpAQCAt MzgwLDcgKzM4Nyw3IEBAIFdlYkluc3BlY3Rvci5GcmFtZVJlc291cmNlTWFuYWdlciA9IGNsYXNz IEZyYW1lUmVzb3VyY2VNYW5hZ2VyIGV4dGVuZHMgV2ViSW5zcGVjCiAKICAgICAvLyBQcml2YXRl CiAKLSAgICBfYWRkTmV3UmVzb3VyY2VUb0ZyYW1lKHJlcXVlc3RJZGVudGlmaWVyLCBmcmFtZUlk ZW50aWZpZXIsIGxvYWRlcklkZW50aWZpZXIsIHVybCwgdHlwZSwgcmVxdWVzdE1ldGhvZCwgcmVx dWVzdEhlYWRlcnMsIHJlcXVlc3REYXRhLCBlbGFwc2VkVGltZSwgZnJhbWVOYW1lLCBmcmFtZVNl Y3VyaXR5T3JpZ2luLCBpbml0aWF0b3JTb3VyY2VDb2RlTG9jYXRpb24pCisgICAgX2FkZE5ld1Jl c291cmNlVG9GcmFtZShyZXF1ZXN0SWRlbnRpZmllciwgZnJhbWVJZGVudGlmaWVyLCBsb2FkZXJJ ZGVudGlmaWVyLCB1cmwsIHR5cGUsIHJlcXVlc3RNZXRob2QsIHJlcXVlc3RIZWFkZXJzLCByZXF1 ZXN0RGF0YSwgZWxhcHNlZFRpbWUsIGZyYW1lTmFtZSwgZnJhbWVTZWN1cml0eU9yaWdpbiwgaW5p dGlhdG9yU291cmNlQ29kZUxvY2F0aW9uLCBvcmlnaW5hbFJlcXVlc3RXaWxsQmVTZW50VGltZXN0 YW1wKQogICAgIHsKICAgICAgICAgY29uc29sZS5hc3NlcnQoIXRoaXMuX3dhaXRpbmdGb3JNYWlu RnJhbWVSZXNvdXJjZVRyZWVQYXlsb2FkKTsKIApAQCAtMzk0LDEyICs0MDEsMTIgQEAgV2ViSW5z cGVjdG9yLkZyYW1lUmVzb3VyY2VNYW5hZ2VyID0gY2xhc3MgRnJhbWVSZXNvdXJjZU1hbmFnZXIg ZXh0ZW5kcyBXZWJJbnNwZWMKICAgICAgICAgICAgIGVsc2UgaWYgKGZyYW1lLnByb3Zpc2lvbmFs TWFpblJlc291cmNlICYmIGZyYW1lLnByb3Zpc2lvbmFsTWFpblJlc291cmNlLnVybCA9PT0gdXJs ICYmIGZyYW1lLnByb3Zpc2lvbmFsTG9hZGVySWRlbnRpZmllciA9PT0gbG9hZGVySWRlbnRpZmll cikKICAgICAgICAgICAgICAgICByZXNvdXJjZSA9IGZyYW1lLnByb3Zpc2lvbmFsTWFpblJlc291 cmNlOwogICAgICAgICAgICAgZWxzZSB7Ci0gICAgICAgICAgICAgICAgcmVzb3VyY2UgPSBuZXcg V2ViSW5zcGVjdG9yLlJlc291cmNlKHVybCwgbnVsbCwgdHlwZSwgbG9hZGVySWRlbnRpZmllciwg cmVxdWVzdElkZW50aWZpZXIsIHJlcXVlc3RNZXRob2QsIHJlcXVlc3RIZWFkZXJzLCByZXF1ZXN0 RGF0YSwgZWxhcHNlZFRpbWUsIGluaXRpYXRvclNvdXJjZUNvZGVMb2NhdGlvbik7CisgICAgICAg ICAgICAgICAgcmVzb3VyY2UgPSBuZXcgV2ViSW5zcGVjdG9yLlJlc291cmNlKHVybCwgbnVsbCwg dHlwZSwgbG9hZGVySWRlbnRpZmllciwgcmVxdWVzdElkZW50aWZpZXIsIHJlcXVlc3RNZXRob2Qs IHJlcXVlc3RIZWFkZXJzLCByZXF1ZXN0RGF0YSwgZWxhcHNlZFRpbWUsIGluaXRpYXRvclNvdXJj ZUNvZGVMb2NhdGlvbiwgb3JpZ2luYWxSZXF1ZXN0V2lsbEJlU2VudFRpbWVzdGFtcCk7CiAgICAg ICAgICAgICAgICAgdGhpcy5fYWRkUmVzb3VyY2VUb0ZyYW1lKGZyYW1lLCByZXNvdXJjZSk7CiAg ICAgICAgICAgICB9CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAvLyBUaGlzIGlzIGEg bmV3IHJlcXVlc3QgZm9yIGEgbmV3IGZyYW1lLCB3aGljaCBpcyBhbHdheXMgdGhlIG1haW4gcmVz b3VyY2UuCi0gICAgICAgICAgICByZXNvdXJjZSA9IG5ldyBXZWJJbnNwZWN0b3IuUmVzb3VyY2Uo dXJsLCBudWxsLCB0eXBlLCBsb2FkZXJJZGVudGlmaWVyLCByZXF1ZXN0SWRlbnRpZmllciwgcmVx dWVzdE1ldGhvZCwgcmVxdWVzdEhlYWRlcnMsIHJlcXVlc3REYXRhLCBlbGFwc2VkVGltZSwgaW5p dGlhdG9yU291cmNlQ29kZUxvY2F0aW9uKTsKKyAgICAgICAgICAgIHJlc291cmNlID0gbmV3IFdl Ykluc3BlY3Rvci5SZXNvdXJjZSh1cmwsIG51bGwsIHR5cGUsIGxvYWRlcklkZW50aWZpZXIsIHJl cXVlc3RJZGVudGlmaWVyLCByZXF1ZXN0TWV0aG9kLCByZXF1ZXN0SGVhZGVycywgcmVxdWVzdERh dGEsIGVsYXBzZWRUaW1lLCBpbml0aWF0b3JTb3VyY2VDb2RlTG9jYXRpb24sIG9yaWdpbmFsUmVx dWVzdFdpbGxCZVNlbnRUaW1lc3RhbXApOwogICAgICAgICAgICAgZnJhbWUgPSBuZXcgV2ViSW5z cGVjdG9yLkZyYW1lKGZyYW1lSWRlbnRpZmllciwgZnJhbWVOYW1lLCBmcmFtZVNlY3VyaXR5T3Jp Z2luLCBsb2FkZXJJZGVudGlmaWVyLCByZXNvdXJjZSk7CiAgICAgICAgICAgICB0aGlzLl9mcmFt ZUlkZW50aWZpZXJNYXBbZnJhbWUuaWRdID0gZnJhbWU7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1RpbWVsaW5lTWFuYWdlci5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1RpbWVs aW5lTWFuYWdlci5qcwppbmRleCA1M2E4Zjg3Li45Y2MzOTgyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9sbGVycy9UaW1lbGluZU1hbmFnZXIu anMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMv VGltZWxpbmVNYW5hZ2VyLmpzCkBAIC00NTUsNiArNDU1LDE4IEBAIFdlYkluc3BlY3Rvci5UaW1l bGluZU1hbmFnZXIgPSBjbGFzcyBUaW1lbGluZU1hbmFnZXIgZXh0ZW5kcyBXZWJJbnNwZWN0b3Iu T2JqZWN0CiAgICAgICAgICAgICBvbGRSZWNvcmRpbmcudW5sb2FkZWQoKTsKIAogICAgICAgICB0 aGlzLl9hY3RpdmVSZWNvcmRpbmcgPSBuZXdSZWNvcmRpbmc7CisKKyAgICAgICAgLy8gQ09NUEFU SUJJTElUWSAoaU9TIDgpOiBXaGVuIHVzaW5nIExlZ2FjeSB0aW1lc3RhbXBzLCBhIG5hdmlnYXRp b24gd2lsbCBoYXZlIGNvbXB1dGVkCisgICAgICAgIC8vIHRoZSBtYWluIHJlc291cmNlJ3Mgd2ls bCBzZW5kIHJlcXVlc3QgdGltZXN0YW1wIGluIHRlcm1zIG9mIHRoZSBsYXN0IHBhZ2UncyBiYXNl IHRpbWVzdGFtcC4KKyAgICAgICAgLy8gTm93IHRoYXQgd2UgaGF2ZSBuYXZpZ2F0ZWQsIHdlIHNo b3VsZCByZXNldCB0aGUgbGVnYWN5IGJhc2UgdGltZXN0YW1wIGFuZCB0aGUKKyAgICAgICAgLy8g d2lsbCBzZW5kIHJlcXVlc3QgdGltZXN0YW1wIGZvciB0aGUgbmV3IG1haW4gcmVzb3VyY2UuIFRo aXMgd2F5LCBhbGwgbmV3IHRpbWVsaW5lCisgICAgICAgIC8vIHJlY29yZHMgd2lsbCBiZSBjb21w dXRlZCByZWxhdGl2ZSB0byB0aGUgbmV3IG5hdmlnYXRpb24uCisgICAgICAgIGlmICh0aGlzLl9h dXRvQ2FwdHVyaW5nTWFpblJlc291cmNlICYmIFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGlu Zy5pc0xlZ2FjeSkgeworICAgICAgICAgICAgY29uc29sZS5hc3NlcnQodGhpcy5fYXV0b0NhcHR1 cmluZ01haW5SZXNvdXJjZS5vcmlnaW5hbFJlcXVlc3RXaWxsQmVTZW50VGltZXN0YW1wKTsKKyAg ICAgICAgICAgIHRoaXMuX2FjdGl2ZVJlY29yZGluZy5zZXRMZWdhY3lCYXNlVGltZXN0YW1wKHRo aXMuX2F1dG9DYXB0dXJpbmdNYWluUmVzb3VyY2Uub3JpZ2luYWxSZXF1ZXN0V2lsbEJlU2VudFRp bWVzdGFtcCk7CisgICAgICAgICAgICB0aGlzLl9hdXRvQ2FwdHVyaW5nTWFpblJlc291cmNlLl9y ZXF1ZXN0U2VudFRpbWVzdGFtcCA9IDA7CisgICAgICAgIH0KKwogICAgICAgICB0aGlzLmRpc3Bh dGNoRXZlbnRUb0xpc3RlbmVycyhXZWJJbnNwZWN0b3IuVGltZWxpbmVNYW5hZ2VyLkV2ZW50LlJl Y29yZGluZ0xvYWRlZCwge29sZFJlY29yZGluZ30pOwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1Jlc291cmNlLmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1Jlc291cmNlLmpzCmluZGV4 IDM4ODdmNzEuLmQ2ZTUwZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL01vZGVscy9SZXNvdXJjZS5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9Nb2RlbHMvUmVzb3VyY2UuanMKQEAgLTI1LDcgKzI1LDcgQEAKIAogV2Vi SW5zcGVjdG9yLlJlc291cmNlID0gY2xhc3MgUmVzb3VyY2UgZXh0ZW5kcyBXZWJJbnNwZWN0b3Iu U291cmNlQ29kZQogewotICAgIGNvbnN0cnVjdG9yKHVybCwgbWltZVR5cGUsIHR5cGUsIGxvYWRl cklkZW50aWZpZXIsIHJlcXVlc3RJZGVudGlmaWVyLCByZXF1ZXN0TWV0aG9kLCByZXF1ZXN0SGVh ZGVycywgcmVxdWVzdERhdGEsIHJlcXVlc3RTZW50VGltZXN0YW1wLCBpbml0aWF0b3JTb3VyY2VD b2RlTG9jYXRpb24pCisgICAgY29uc3RydWN0b3IodXJsLCBtaW1lVHlwZSwgdHlwZSwgbG9hZGVy SWRlbnRpZmllciwgcmVxdWVzdElkZW50aWZpZXIsIHJlcXVlc3RNZXRob2QsIHJlcXVlc3RIZWFk ZXJzLCByZXF1ZXN0RGF0YSwgcmVxdWVzdFNlbnRUaW1lc3RhbXAsIGluaXRpYXRvclNvdXJjZUNv ZGVMb2NhdGlvbiwgb3JpZ2luYWxSZXF1ZXN0V2lsbEJlU2VudFRpbWVzdGFtcCkKICAgICB7CiAg ICAgICAgIHN1cGVyKCk7CiAKQEAgLTQ1LDYgKzQ1LDcgQEAgV2ViSW5zcGVjdG9yLlJlc291cmNl ID0gY2xhc3MgUmVzb3VyY2UgZXh0ZW5kcyBXZWJJbnNwZWN0b3IuU291cmNlQ29kZQogICAgICAg ICB0aGlzLl9yZXNwb25zZUhlYWRlcnMgPSB7fTsKICAgICAgICAgdGhpcy5fcGFyZW50RnJhbWUg PSBudWxsOwogICAgICAgICB0aGlzLl9pbml0aWF0b3JTb3VyY2VDb2RlTG9jYXRpb24gPSBpbml0 aWF0b3JTb3VyY2VDb2RlTG9jYXRpb24gfHwgbnVsbDsKKyAgICAgICAgdGhpcy5fb3JpZ2luYWxS ZXF1ZXN0V2lsbEJlU2VudFRpbWVzdGFtcCA9IG9yaWdpbmFsUmVxdWVzdFdpbGxCZVNlbnRUaW1l c3RhbXAgfHwgbnVsbDsKICAgICAgICAgdGhpcy5fcmVxdWVzdFNlbnRUaW1lc3RhbXAgPSByZXF1 ZXN0U2VudFRpbWVzdGFtcCB8fCBOYU47CiAgICAgICAgIHRoaXMuX3Jlc3BvbnNlUmVjZWl2ZWRU aW1lc3RhbXAgPSBOYU47CiAgICAgICAgIHRoaXMuX2xhc3RSZWRpcmVjdFJlY2VpdmVkVGltZXN0 YW1wID0gTmFOOwpAQCAtMTM5LDYgKzE0MCwxMSBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2UgPSBj bGFzcyBSZXNvdXJjZSBleHRlbmRzIFdlYkluc3BlY3Rvci5Tb3VyY2VDb2RlCiAgICAgICAgIHJl dHVybiB0aGlzLl9pbml0aWF0b3JTb3VyY2VDb2RlTG9jYXRpb247CiAgICAgfQogCisgICAgZ2V0 IG9yaWdpbmFsUmVxdWVzdFdpbGxCZVNlbnRUaW1lc3RhbXAoKQorICAgIHsKKyAgICAgICAgcmV0 dXJuIHRoaXMuX29yaWdpbmFsUmVxdWVzdFdpbGxCZVNlbnRUaW1lc3RhbXA7CisgICAgfQorCiAg ICAgZ2V0IHR5cGUoKQogICAgIHsKICAgICAgICAgcmV0dXJuIHRoaXMuX3R5cGU7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvVGltZWxpbmVS ZWNvcmRpbmcuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMv VGltZWxpbmVSZWNvcmRpbmcuanMKaW5kZXggZmZhZDdhNy4uYTY3MjdmOCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL1RpbWVsaW5lUmVjb3Jk aW5nLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9U aW1lbGluZVJlY29yZGluZy5qcwpAQCAtMTk3LDE3ICsxOTcsMzUgQEAgV2ViSW5zcGVjdG9yLlRp bWVsaW5lUmVjb3JkaW5nID0gY2xhc3MgVGltZWxpbmVSZWNvcmRpbmcgZXh0ZW5kcyBXZWJJbnNw ZWN0b3IuT2IKICAgICAgICAgaWYgKCF0aW1lc3RhbXAgfHwgaXNOYU4odGltZXN0YW1wKSkKICAg ICAgICAgICAgIHJldHVybiBOYU47CiAKLSAgICAgICAgLy8gQ09NUEFUSUJJTElUWSAoaU9TOCk6 IG9sZCBiYWNrZW5kcyBzZW5kIHRpbWVzdGFtcHMgKG1pbGxpc2Vjb25kcyBzaW5jZSB0aGUgZXBv Y2gpLCByYXRoZXIKLSAgICAgICAgLy8gdGhhbiBzZWNvbmRzIGVsYXBzZWQgc2luY2UgdGltZWxp bmUgY2FwdHVyaW5nIHN0YXJ0ZWQuIFdlIGFwcHJveGltYXRlIHRoZSBsYXR0ZXIgYnkKKyAgICAg ICAgLy8gQ09NUEFUSUJJTElUWSAoaU9TOCk6IG9sZCBiYWNrZW5kcyBzZW5kIHRpbWVzdGFtcHMg KHNlY29uZHMgb3IgbWlsbGlzZWNvbmRzIHNpbmNlIHRoZSBlcG9jaCksCisgICAgICAgIC8vIHJh dGhlciB0aGFuIHNlY29uZHMgZWxhcHNlZCBzaW5jZSB0aW1lbGluZSBjYXB0dXJpbmcgc3RhcnRl ZC4gV2UgYXBwcm94aW1hdGUgdGhlIGxhdHRlciBieQogICAgICAgICAvLyBzdWJ0cmFjdGluZyB0 aGUgc3RhcnQgdGltZXN0YW1wLCBhcyBvbGQgdmVyc2lvbnMgZGlkIG5vdCB1c2UgbW9ub3Rvbmlj IHRpbWVzLgorICAgICAgICBpZiAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nLmlzTGVn YWN5ID09PSB1bmRlZmluZWQpCisgICAgICAgICAgICBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNv cmRpbmcuaXNMZWdhY3kgPSB0aW1lc3RhbXAgPiBXZWJJbnNwZWN0b3IuVGltZWxpbmVSZWNvcmRp bmcuVGltZXN0YW1wVGhyZXNob2xkRm9yTGVnYWN5UmVjb3JkQ29udmVyc2lvbjsKKworICAgICAg ICBpZiAoIVdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZy5pc0xlZ2FjeSkKKyAgICAgICAg ICAgIHJldHVybiB0aW1lc3RhbXA7CisKKyAgICAgICAgLy8gSWYgdGhlIHJlY29yZCdzIHN0YXJ0 IHRpbWUgaXMgbGFyZ2UsIGJ1dCBub3QgcmVhbGx5IGxhcmdlLCB0aGVuIGl0IGlzIHNlY29uZHMg c2luY2UgZXBvY2gKKyAgICAgICAgLy8gbm90IG1pbGxzZWNvbmRzIHNpbmNlIGVwb2NoLCBzbyBj b252ZXJ0IGl0IHRvIG1pbGxpc2Vjb25kcy4KKyAgICAgICAgaWYgKHRpbWVzdGFtcCA8IFdlYklu c3BlY3Rvci5UaW1lbGluZVJlY29yZGluZy5UaW1lc3RhbXBUaHJlc2hvbGRGb3JMZWdhY3lBc3N1 bWVkTWlsbGlzZWNvbmRzKQorICAgICAgICAgICAgdGltZXN0YW1wICo9IDEwMDA7CisKICAgICAg ICAgaWYgKGlzTmFOKHRoaXMuX2xlZ2FjeUZpcnN0UmVjb3JkZWRUaW1lc3RhbXApKQogICAgICAg ICAgICAgdGhpcy5fbGVnYWN5Rmlyc3RSZWNvcmRlZFRpbWVzdGFtcCA9IHRpbWVzdGFtcDsKIAot ICAgICAgICAvLyBJZiB0aGUgcmVjb3JkJ3Mgc3RhcnQgdGltZSBzZW1zIHVucmVhc29uYWJseSBs YXJnZSwgdHJlYXQgaXQgYXMgYSBsZWdhY3kgdGltZXN0YW1wLgotICAgICAgICBpZiAodGltZXN0 YW1wID4gV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nLlRpbWVzdGFtcFRocmVzaG9sZEZv ckxlZ2FjeVJlY29yZENvbnZlcnNpb24pCi0gICAgICAgICAgICByZXR1cm4gKHRpbWVzdGFtcCAt IHRoaXMuX2xlZ2FjeUZpcnN0UmVjb3JkZWRUaW1lc3RhbXApIC8gMTAwMC4wOworICAgICAgICAv LyBSZXR1cm4gc2Vjb25kcyBzaW5jZSB0aGUgZmlyc3QgcmVjb3JkZWQgdmFsdWUuCisgICAgICAg IHJldHVybiAodGltZXN0YW1wIC0gdGhpcy5fbGVnYWN5Rmlyc3RSZWNvcmRlZFRpbWVzdGFtcCkg LyAxMDAwLjA7CisgICAgfQogCi0gICAgICAgIHJldHVybiB0aW1lc3RhbXA7CisgICAgc2V0TGVn YWN5QmFzZVRpbWVzdGFtcCh0aW1lc3RhbXApCisgICAgeworICAgICAgICBjb25zb2xlLmFzc2Vy dChpc05hTih0aGlzLl9sZWdhY3lGaXJzdFJlY29yZGVkVGltZXN0YW1wKSk7CisKKyAgICAgICAg aWYgKHRpbWVzdGFtcCA8IFdlYkluc3BlY3Rvci5UaW1lbGluZVJlY29yZGluZy5UaW1lc3RhbXBU aHJlc2hvbGRGb3JMZWdhY3lBc3N1bWVkTWlsbGlzZWNvbmRzKQorICAgICAgICAgICAgdGltZXN0 YW1wICo9IDEwMDA7CisKKyAgICAgICAgdGhpcy5fbGVnYWN5Rmlyc3RSZWNvcmRlZFRpbWVzdGFt cCA9IHRpbWVzdGFtcDsKICAgICB9CiAKICAgICAvLyBQcml2YXRlCkBAIC0yNTMsNCArMjcxLDYg QEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nLkV2ZW50ID0gewogICAgIFRpbWVzVXBk YXRlZDogInRpbWVsaW5lLXJlY29yZGluZy10aW1lcy11cGRhdGVkIgogfTsKIAotV2ViSW5zcGVj dG9yLlRpbWVsaW5lUmVjb3JkaW5nLlRpbWVzdGFtcFRocmVzaG9sZEZvckxlZ2FjeVJlY29yZENv bnZlcnNpb24gPSAyODgwMDAwMDsgLy8gRGF0ZS5wYXJzZSgiSmFuIDEsIDE5NzAiKQorV2ViSW5z cGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nLmlzTGVnYWN5ID0gdW5kZWZpbmVkOworV2ViSW5zcGVj dG9yLlRpbWVsaW5lUmVjb3JkaW5nLlRpbWVzdGFtcFRocmVzaG9sZEZvckxlZ2FjeVJlY29yZENv bnZlcnNpb24gPSAxMDAwMDAwMDsgLy8gU29tZSB2YWx1ZSBub3QgbmVhciB6ZXJvLgorV2ViSW5z cGVjdG9yLlRpbWVsaW5lUmVjb3JkaW5nLlRpbWVzdGFtcFRocmVzaG9sZEZvckxlZ2FjeUFzc3Vt ZWRNaWxsaXNlY29uZHMgPSAxNDIwMDk5MjAwMDAwOyAvLyBEYXRlLnBhcnNlKCJKYW4gMSwgMjAx NSIpLiBNaWxsaXNlY29uZHMgc2luY2UgZXBvY2guCg==