79803 2012-02-28 08:55:02 -0800 Web Inspector: remove window aspects from the timeline presentation model. 2012-02-28 09:05:53 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 566744 0 pfeldman 2012-02-28 08:55:02 -0800 Patch to follow. 566748 1 129271 pfeldman 2012-02-28 08:56:50 -0800 Created attachment 129271 Patch 566763 2 pfeldman 2012-02-28 09:05:53 -0800 Committed r109114: <http://trac.webkit.org/changeset/109114> 129271 2012-02-28 08:56:50 -0800 2012-02-28 09:00:06 -0800 Patch bug-79803-20120228205649.patch text/plain 12765 pfeldman U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5MTA3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGFkZmU5NmE4ZWM2MWIx ZGZkNDFlZDNjY2NiNDRmY2JlZWNkY2Y4ZC4uY2MyZTJmZWE2MzY5Yjg3ZDk2N2VjN2E5YTk4ZjQ4 MDUyOThhM2IzYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMxIEBACiAyMDEyLTAyLTI4ICBQYXZl bCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xlLmNvbT4KIAorICAgICAgICBXZWIgSW5zcGVjdG9y OiByZW1vdmUgd2luZG93IGFzcGVjdHMgZnJvbSB0aGUgdGltZWxpbmUgcHJlc2VudGF0aW9uIG1v ZGVsLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzk4 MDMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVPdmVydmlld1BhbmUuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRp bWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZS5hY2NlcHQpOgorICAgICAgICAoV2ViSW5zcGVj dG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZS5fc2V0V2luZG93SW5kaWNlcyk6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUucHJvdG90eXBlLndpbmRv d0xlZnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3Rv dHlwZS53aW5kb3dSaWdodCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmll d1BhbmUucHJvdG90eXBlLl9maXJlV2luZG93Q2hhbmdlZCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVGltZWxpbmVPdmVydmlld1dpbmRvdy5wcm90b3R5cGUuX2RyYWdXaW5kb3cpOgorICAgICAg ICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLldpbmRvd1NlbGVjdG9yKToKKyAg ICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanM6CisgICAgICAgIChX ZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxp bmVQYW5lbC5wcm90b3R5cGUuX29uQ2F0ZWdvcnlDaGVja2JveENsaWNrZWQpOgorICAgICAgICAo V2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlLl91cGRhdGVCb3VuZGFyaWVzKToK KyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5wcm90 b3R5cGUucmVzZXQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ2F0ZWdvcnkpOgor ICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ2F0ZWdvcnkucHJvdG90eXBlLmdldCBoaWRk ZW4pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ2F0ZWdvcnkucHJvdG90eXBlLnNl dCBoaWRkZW4pOgorCisyMDEyLTAyLTI4ICBQYXZlbCBGZWxkbWFuICA8cGZlbGRtYW5AZ29vZ2xl LmNvbT4KKwogICAgICAgICBXZWIgSW5zcGVjdG9yOiBtb3ZlIGZpbHRlcmluZyBvZiB0aGUgdGlt ZWxpbmUgcmVjb3JkcyBpbnRvIHRoZSBwcmVzZW50YXRpb24gbW9kZWwuCiAgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03OTc4OQogCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lT3ZlcnZpZXdQYW5lLmpz IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFu ZS5qcwppbmRleCBhMWJkMjEzYTRkOTA4ODBiNDEzYjg4ZTdiYmYyOWE5M2RjZjEzZjBlLi5jMGNk YTcxYjdmODYyOWQyOGJlMjhiMTg1MjU2NWZmNjBhMTY2YTEyIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lT3ZlcnZpZXdQYW5lLmpzCisrKyBi L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVPdmVydmlld1BhbmUu anMKQEAgLTc1LDcgKzc1LDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lID0g ZnVuY3Rpb24ocHJlc2VudGF0aW9uTW9kZWwpCiAgICAgdGhpcy5fb3ZlcnZpZXdHcmlkLmVsZW1l bnQuaW5zZXJ0QmVmb3JlKHRoaXMuX2hlYXBHcmFwaC5lbGVtZW50LCB0aGlzLl9vdmVydmlld0dy aWQuaXRlbXNHcmFwaHNFbGVtZW50KTsKIAogICAgIHRoaXMuX292ZXJ2aWV3V2luZG93ID0gbmV3 IFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3V2luZG93KHRoaXMuX292ZXJ2aWV3R3JpZC5l bGVtZW50KTsKLSAgICB0aGlzLl9vdmVydmlld1dpbmRvdy5hZGRFdmVudExpc3RlbmVyKFdlYklu c3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3V2luZG93LkV2ZW50cy5XaW5kb3dDaGFuZ2VkLCB0aGlz Ll9vbldpbmRvd0NoYW5nZWQsIHRoaXMpOworICAgIHRoaXMuX292ZXJ2aWV3V2luZG93LmFkZEV2 ZW50TGlzdGVuZXIoV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdXaW5kb3cuRXZlbnRzLldp bmRvd0NoYW5nZWQsIHRoaXMuX2ZpcmVXaW5kb3dDaGFuZ2VkLCB0aGlzKTsKIAogICAgIHRoaXMu ZWxlbWVudC5hcHBlbmRDaGlsZCh0aGlzLl9vdmVydmlld0dyaWQuZWxlbWVudCk7CiAKQEAgLTkw LDggKzkwLDggQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lID0gZnVuY3Rpb24o cHJlc2VudGF0aW9uTW9kZWwpCiAgICAgICAgIHZhciBjYXRlZ29yeUdyYXBoID0gbmV3IFdlYklu c3BlY3Rvci5UaW1lbGluZUNhdGVnb3J5R3JhcGgoY2F0ZWdvcmllc1tjYXRlZ29yeV0sIGkrKyAl IDIpOwogICAgICAgICB0aGlzLl9jYXRlZ29yeUdyYXBoc1tjYXRlZ29yeV0gPSBjYXRlZ29yeUdy YXBoOwogICAgICAgICB0aGlzLl9vdmVydmlld0dyaWQuaXRlbXNHcmFwaHNFbGVtZW50LmFwcGVu ZENoaWxkKGNhdGVnb3J5R3JhcGguZ3JhcGhFbGVtZW50KTsKKyAgICAgICAgY2F0ZWdvcmllc1tj YXRlZ29yeV0uYWRkRXZlbnRMaXN0ZW5lcihXZWJJbnNwZWN0b3IuVGltZWxpbmVDYXRlZ29yeS5F dmVudHMuVmlzaWJpbGl0eUNoYW5nZWQsIHRoaXMuX29uQ2F0ZWdvcnlWaXNpYmlsaXR5Q2hhbmdl ZCwgdGhpcyk7CiAgICAgfQotICAgIHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLmFkZEV2ZW50TGlz dGVuZXIoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuRXZlbnRzLkNhdGVn b3J5VmlzaWJpbGl0eUNoYW5nZWQsIHRoaXMuX29uQ2F0ZWdvcnlWaXNpYmlsaXR5Q2hhbmdlZCwg dGhpcyk7CiAKICAgICB0aGlzLl9vdmVydmlld0dyaWQuc2V0U2Nyb2xsQW5kRGl2aWRlclRvcCgw LCAwKTsKIApAQCAtMTEwLDcgKzExMCw4IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3 UGFuZS5Nb2RlID0gewogfTsKIAogV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLkV2 ZW50cyA9IHsKLSAgICBNb2RlQ2hhbmdlZDogIk1vZGVDaGFuZ2VkIgorICAgIE1vZGVDaGFuZ2Vk OiAiTW9kZUNoYW5nZWQiLAorICAgIFdpbmRvd0NoYW5nZWQ6ICJXaW5kb3dDaGFuZ2VkIgogfTsK IAogV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlwZSA9IHsKQEAgLTE1 NCwxMSArMTU1LDYgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLnByb3RvdHlw ZSA9IHsKICAgICAgICAgfQogICAgIH0sCiAKLSAgICBfb25XaW5kb3dDaGFuZ2VkOiBmdW5jdGlv bigpCi0gICAgewotICAgICAgICB0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC5zZXRXaW5kb3dQb3Np dGlvbih0aGlzLl9vdmVydmlld1dpbmRvdy53aW5kb3dMZWZ0LCB0aGlzLl9vdmVydmlld1dpbmRv dy53aW5kb3dSaWdodCk7Ci0gICAgfSwKLQogICAgIF9vbkNhdGVnb3J5VmlzaWJpbGl0eUNoYW5n ZWQ6IGZ1bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgdmFyIGNhdGVnb3J5ID0gZXZlbnQu ZGF0YTsKQEAgLTI4MSw4ICsyNzcsOCBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1Bh bmUucHJvdG90eXBlID0gewogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgdmFyIGFic29s dXRlTWluID0gdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwubWluaW11bVJlY29yZFRpbWUoKTsKICAg ICAgICAgICAgIHZhciBhYnNvbHV0ZU1heCA9IHRoaXMuX3ByZXNlbnRhdGlvbk1vZGVsLm1heGlt dW1SZWNvcmRUaW1lKCk7Ci0gICAgICAgICAgICB2YXIgd2luZG93TGVmdCA9IGFic29sdXRlTWlu ICsgKGFic29sdXRlTWF4IC0gYWJzb2x1dGVNaW4pICogdGhpcy5fb3ZlcnZpZXdXaW5kb3cud2lu ZG93TGVmdDsKLSAgICAgICAgICAgIHZhciB3aW5kb3dSaWdodCA9IGFic29sdXRlTWluICsgKGFi c29sdXRlTWF4IC0gYWJzb2x1dGVNaW4pICogdGhpcy5fb3ZlcnZpZXdXaW5kb3cud2luZG93Umln aHQ7CisgICAgICAgICAgICB2YXIgd2luZG93TGVmdCA9IGFic29sdXRlTWluICsgKGFic29sdXRl TWF4IC0gYWJzb2x1dGVNaW4pICogdGhpcy53aW5kb3dMZWZ0KCk7CisgICAgICAgICAgICB2YXIg d2luZG93UmlnaHQgPSBhYnNvbHV0ZU1pbiArIChhYnNvbHV0ZU1heCAtIGFic29sdXRlTWluKSAq IHRoaXMud2luZG93UmlnaHQoKTsKICAgICAgICAgICAgIHJldHVybiByZWNvcmQuZW5kVGltZSA+ PSB3aW5kb3dMZWZ0ICYmIHJlY29yZC5zdGFydFRpbWUgPD0gd2luZG93UmlnaHQ7CiAgICAgICAg IH0KICAgICB9LApAQCAtMjkxLDcgKzI4NywyMiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVy dmlld1BhbmUucHJvdG90eXBlID0gewogICAgIHsKICAgICAgICAgdGhpcy5fd2luZG93SW5kZXhM ZWZ0ID0gaW5kZXhMZWZ0OwogICAgICAgICB0aGlzLl93aW5kb3dJbmRleFJpZ2h0ID0gaW5kZXhS aWdodDsKLSAgICAgICAgdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuZmlyZVdpbmRvd0NoYW5nZWQo KTsKKyAgICAgICAgdGhpcy5fZmlyZVdpbmRvd0NoYW5nZWQoKTsKKyAgICB9LAorCisgICAgd2lu ZG93TGVmdDogZnVuY3Rpb24oKQorICAgIHsKKyAgICAgICAgcmV0dXJuIHRoaXMuX292ZXJ2aWV3 V2luZG93LndpbmRvd0xlZnQ7CisgICAgfSwKKworICAgIHdpbmRvd1JpZ2h0OiBmdW5jdGlvbigp CisgICAgeworICAgICAgICByZXR1cm4gdGhpcy5fb3ZlcnZpZXdXaW5kb3cud2luZG93UmlnaHQ7 CisgICAgfSwKKworICAgIF9maXJlV2luZG93Q2hhbmdlZDogZnVuY3Rpb24oKQorICAgIHsKKyAg ICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9MaXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlRpbWVsaW5l T3ZlcnZpZXdQYW5lLkV2ZW50cy5XaW5kb3dDaGFuZ2VkKTsKICAgICB9CiB9CiAKQEAgLTM3OCw3 ICszODksNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1dpbmRvdy5wcm90b3R5cGUg PSB7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9IGVsc2UgaWYgKG5vZGUg PT09IHRoaXMuX3BhcmVudEVsZW1lbnQpIHsKICAgICAgICAgICAgICAgICB2YXIgcG9zaXRpb24g PSBldmVudC5wYWdlWCAtIHRoaXMuX3BhcmVudEVsZW1lbnQub2Zmc2V0TGVmdDsKLSAgICAgICAg ICAgICAgICB0aGlzLl9vdmVydmlld1dpbmRvd1NlbGVjdG9yID0gbmV3IFdlYkluc3BlY3Rvci5U aW1lbGluZVBhbmVsLldpbmRvd1NlbGVjdG9yKHRoaXMuX3BhcmVudEVsZW1lbnQsIHBvc2l0aW9u KTsKKyAgICAgICAgICAgICAgICB0aGlzLl9vdmVydmlld1dpbmRvd1NlbGVjdG9yID0gbmV3IFdl Ykluc3BlY3Rvci5UaW1lbGluZU92ZXJ2aWV3UGFuZS5XaW5kb3dTZWxlY3Rvcih0aGlzLl9wYXJl bnRFbGVtZW50LCBwb3NpdGlvbik7CiAgICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLmVsZW1l bnREcmFnU3RhcnQobnVsbCwgdGhpcy5fd2luZG93U2VsZWN0b3JEcmFnZ2luZy5iaW5kKHRoaXMp LCB0aGlzLl9lbmRXaW5kb3dTZWxlY3RvckRyYWdnaW5nLmJpbmQodGhpcyksIGV2ZW50LCAiZXct cmVzaXplIik7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICB9IGVsc2UgaWYg KG5vZGUgPT09IHRoaXMuX2xlZnRSZXNpemVFbGVtZW50IHx8IG5vZGUgPT09IHRoaXMuX3JpZ2h0 UmVzaXplRWxlbWVudCkgewpAQCAtNTg1LDcgKzU5Niw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGlu ZUNhdGVnb3J5R3JhcGgucHJvdG90eXBlID0gewogLyoqCiAgKiBAY29uc3RydWN0b3IKICAqLwot V2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwuV2luZG93U2VsZWN0b3IgPSBmdW5jdGlvbihwYXJl bnQsIHBvc2l0aW9uKQorV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lLldpbmRvd1Nl bGVjdG9yID0gZnVuY3Rpb24ocGFyZW50LCBwb3NpdGlvbikKIHsKICAgICB0aGlzLl9zdGFydFBv c2l0aW9uID0gcG9zaXRpb247CiAgICAgdGhpcy5fd2lkdGggPSBwYXJlbnQub2Zmc2V0V2lkdGg7 CkBAIC01OTYsNyArNjA3LDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwuV2luZG93U2Vs ZWN0b3IgPSBmdW5jdGlvbihwYXJlbnQsIHBvc2l0aW9uKQogICAgIHBhcmVudC5hcHBlbmRDaGls ZCh0aGlzLl93aW5kb3dTZWxlY3Rvcik7CiB9CiAKLVdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVs LldpbmRvd1NlbGVjdG9yLnByb3RvdHlwZSA9IHsKK1dlYkluc3BlY3Rvci5UaW1lbGluZU92ZXJ2 aWV3UGFuZS5XaW5kb3dTZWxlY3Rvci5wcm90b3R5cGUgPSB7CiAgICAgX2NyZWF0ZVNlbGVjdG9y RWxlbWVudDogZnVuY3Rpb24ocGFyZW50LCBsZWZ0LCB3aWR0aCwgaGVpZ2h0KQogICAgIHsKICAg ICAgICAgdmFyIHNlbGVjdG9yRWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoImRpdiIp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGlu ZVBhbmVsLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBh bmVsLmpzCmluZGV4IGJiNDNiYTFmZjFmZmVmYzgwMjRiYzk3ZThhMjQ1N2IxMjdlMDA2NTAuLmEy MWYwYmUxMWZkZjg5NzVhN2Y1MjI1ODE3ZWIyZTAwM2QyZmM5ZDIgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQYW5lbC5qcworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKQEAgLTM4LDEw ICszOCw5IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsID0gZnVuY3Rpb24oKQogICAgIHRo aXMucmVnaXN0ZXJSZXF1aXJlZENTUygidGltZWxpbmVQYW5lbC5jc3MiKTsKIAogICAgIHRoaXMu X3ByZXNlbnRhdGlvbk1vZGVsID0gbmV3IFdlYkluc3BlY3Rvci5UaW1lbGluZVByZXNlbnRhdGlv bk1vZGVsKCk7Ci0gICAgdGhpcy5fcHJlc2VudGF0aW9uTW9kZWwuYWRkRXZlbnRMaXN0ZW5lcihX ZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5FdmVudHMuV2luZG93Q2hhbmdl ZCwgdGhpcy5fc2NoZWR1bGVSZWZyZXNoLmJpbmQodGhpcywgZmFsc2UpKTsKLSAgICB0aGlzLl9w cmVzZW50YXRpb25Nb2RlbC5hZGRFdmVudExpc3RlbmVyKFdlYkluc3BlY3Rvci5UaW1lbGluZVBy ZXNlbnRhdGlvbk1vZGVsLkV2ZW50cy5DYXRlZ29yeVZpc2liaWxpdHlDaGFuZ2VkLCB0aGlzLl9z Y2hlZHVsZVJlZnJlc2guYmluZCh0aGlzLCB0cnVlKSk7CiAKICAgICB0aGlzLl9vdmVydmlld1Bh bmUgPSBuZXcgV2ViSW5zcGVjdG9yLlRpbWVsaW5lT3ZlcnZpZXdQYW5lKHRoaXMuX3ByZXNlbnRh dGlvbk1vZGVsKTsKKyAgICB0aGlzLl9vdmVydmlld1BhbmUuYWRkRXZlbnRMaXN0ZW5lcihXZWJJ bnNwZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUuRXZlbnRzLldpbmRvd0NoYW5nZWQsIHRoaXMu X3NjaGVkdWxlUmVmcmVzaC5iaW5kKHRoaXMsIGZhbHNlKSk7CiAKICAgICB0aGlzLmVsZW1lbnQu YXBwZW5kQ2hpbGQodGhpcy5fb3ZlcnZpZXdQYW5lLmVsZW1lbnQpOwogICAgIHRoaXMuZWxlbWVu dC5hZGRFdmVudExpc3RlbmVyKCJjb250ZXh0bWVudSIsIHRoaXMuX2NvbnRleHRNZW51LmJpbmQo dGhpcyksIHRydWUpOwpAQCAtMjYyLDcgKzI2MSw4IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBh bmVsLnByb3RvdHlwZSA9IHsKIAogICAgIF9vbkNhdGVnb3J5Q2hlY2tib3hDbGlja2VkOiBmdW5j dGlvbihjYXRlZ29yeSwgZXZlbnQpCiAgICAgewotICAgICAgICB0aGlzLl9wcmVzZW50YXRpb25N b2RlbC5zZXRDYXRlZ29yeVZpc2liaWxpdHkoY2F0ZWdvcnksIGV2ZW50LnRhcmdldC5jaGVja2Vk KTsKKyAgICAgICAgY2F0ZWdvcnkuaGlkZGVuID0gIWV2ZW50LnRhcmdldC5jaGVja2VkOworICAg ICAgICB0aGlzLl9zY2hlZHVsZVJlZnJlc2godHJ1ZSk7CiAgICAgfSwKIAogICAgIF9yZWdpc3Rl clNob3J0Y3V0czogZnVuY3Rpb24oKQpAQCAtNTc1LDggKzU3NSw4IEBAIFdlYkluc3BlY3Rvci5U aW1lbGluZVBhbmVsLnByb3RvdHlwZSA9IHsKICAgICBfdXBkYXRlQm91bmRhcmllczogZnVuY3Rp b24oKQogICAgIHsKICAgICAgICAgdGhpcy5fY2FsY3VsYXRvci5yZXNldCgpOwotICAgICAgICB0 aGlzLl9jYWxjdWxhdG9yLndpbmRvd0xlZnQgPSB0aGlzLl9wcmVzZW50YXRpb25Nb2RlbC53aW5k b3dMZWZ0OwotICAgICAgICB0aGlzLl9jYWxjdWxhdG9yLndpbmRvd1JpZ2h0ID0gdGhpcy5fcHJl c2VudGF0aW9uTW9kZWwud2luZG93UmlnaHQ7CisgICAgICAgIHRoaXMuX2NhbGN1bGF0b3Iud2lu ZG93TGVmdCA9IHRoaXMuX292ZXJ2aWV3UGFuZS53aW5kb3dMZWZ0KCk7CisgICAgICAgIHRoaXMu X2NhbGN1bGF0b3Iud2luZG93UmlnaHQgPSB0aGlzLl9vdmVydmlld1BhbmUud2luZG93UmlnaHQo KTsKIAogICAgICAgICBmb3IgKHZhciBpID0gMDsgaSA8IHRoaXMuX3Jvb3RSZWNvcmQoKS5jaGls ZHJlbi5sZW5ndGg7ICsraSkKICAgICAgICAgICAgIHRoaXMuX2NhbGN1bGF0b3IudXBkYXRlQm91 bmRhcmllcyh0aGlzLl9yb290UmVjb3JkKCkuY2hpbGRyZW5baV0pOwpAQCAtNzU3LDE2ICs3NTcs NiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5wcm90b3R5cGUuX19wcm90b19fID0gV2Vi SW5zcGVjdG9yLlBhbmVsLnByb3RvdHlwZTsKIC8qKgogICogQGNvbnN0cnVjdG9yCiAgKi8KLVdl Ykluc3BlY3Rvci5UaW1lbGluZUNhdGVnb3J5ID0gZnVuY3Rpb24obmFtZSwgdGl0bGUsIGNvbG9y KQotewotICAgIHRoaXMubmFtZSA9IG5hbWU7Ci0gICAgdGhpcy50aXRsZSA9IHRpdGxlOwotICAg IHRoaXMuY29sb3IgPSBjb2xvcjsKLX0KLQotLyoqCi0gKiBAY29uc3RydWN0b3IKLSAqLwogV2Vi SW5zcGVjdG9yLlRpbWVsaW5lQ2FsY3VsYXRvciA9IGZ1bmN0aW9uKCkKIHsKICAgICB0aGlzLnJl c2V0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Rp bWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJv bnQtZW5kL1RpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuanMKaW5kZXggN2M4NDdjZTk4Mzk2ZWI2 YzRhZmFhODM4ODM5NDQyNjgzYzUwN2I3Zi4uYWRjZDQ0NzliOWI4MzhlMjNjMzA3YjY2N2FlMGI0 OGFlNWY1ODY2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9UaW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5qcwpAQCAtNDQsMTEgKzQ0 LDYgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwgPSBmdW5jdGlvbigp CiAgICAgdGhpcy5yZXNldCgpOwogfQogCi1XZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRp b25Nb2RlbC5FdmVudHMgPSB7Ci0gICAgV2luZG93Q2hhbmdlZDogIldpbmRvd0NoYW5nZWQiLAot ICAgIENhdGVnb3J5VmlzaWJpbGl0eUNoYW5nZWQ6ICJDYXRlZ29yeVZpc2liaWxpdHlDaGFuZ2Vk IgotfQotCiBXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5zaG9ydFJlY29y ZFRocmVzaG9sZCA9IDAuMDE1OwogCiBXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25N b2RlbC5wcm90b3R5cGUgPSB7CkBAIC03NSw3ICs3MCw2IEBAIFdlYkluc3BlY3Rvci5UaW1lbGlu ZVByZXNlbnRhdGlvbk1vZGVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fcmVxdWVzdEFu aW1hdGlvbkZyYW1lUmVjb3JkcyA9IHt9OwogICAgICAgICB0aGlzLl9taW5pbXVtUmVjb3JkVGlt ZSA9IC0xOwogICAgICAgICB0aGlzLl9tYXhpbXVtUmVjb3JkVGltZSA9IC0xOwotICAgICAgICB0 aGlzLl9yZXNldFdpbmRvdygpOwogICAgIH0sCiAKICAgICBtaW5pbXVtUmVjb3JkVGltZTogZnVu Y3Rpb24oKQpAQCAtMTgxLDE0ICsxNzUsNiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50 YXRpb25Nb2RlbC5wcm90b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiBwYXJlbnRSZWNvcmQ7CiAg ICAgfSwKIAotICAgIF9yZXNldFdpbmRvdzogZnVuY3Rpb24oKQotICAgIHsKLSAgICAgICAgdGhp cy53aW5kb3dMZWZ0ID0gMC4wOwotICAgICAgICB0aGlzLndpbmRvd1JpZ2h0ID0gMS4wOwotICAg ICAgICB0aGlzLndpbmRvd0luZGV4TGVmdCA9IDA7Ci0gICAgICAgIHRoaXMud2luZG93SW5kZXhS aWdodCA9IG51bGw7Ci0gICAgfSwKLQogICAgIHNldEdsdWVSZWNvcmRzOiBmdW5jdGlvbihnbHVl KQogICAgIHsKICAgICAgICAgdGhpcy5fZ2x1ZVJlY29yZHMgPSBnbHVlOwpAQCAtMjA3LDMyICsx OTMsNiBAQCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5wcm90b3R5cGUg PSB7CiAgICAgICAgIHRoaXMuX2NhdGVnb3JpZXNbY2F0ZWdvcnkubmFtZV0gPSBjYXRlZ29yeTsK ICAgICB9LAogCi0gICAgLyoqCi0gICAgICogQHBhcmFtIHtudW1iZXJ9IGxlZnQKLSAgICAgKiBA cGFyYW0ge251bWJlcn0gcmlnaHQKLSAgICAgKi8KLSAgICBzZXRXaW5kb3dQb3NpdGlvbjogZnVu Y3Rpb24obGVmdCwgcmlnaHQpCi0gICAgewotICAgICAgICB0aGlzLndpbmRvd0xlZnQgPSBsZWZ0 OwotICAgICAgICB0aGlzLndpbmRvd1JpZ2h0ID0gcmlnaHQ7Ci0gICAgICAgIHRoaXMuZGlzcGF0 Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5UaW1lbGluZVByZXNlbnRhdGlvbk1vZGVs LkV2ZW50cy5XaW5kb3dDaGFuZ2VkKTsKLSAgICB9LAotCi0gICAgZmlyZVdpbmRvd0NoYW5nZWQ6 IGZ1bmN0aW9uKCkKLSAgICB7Ci0gICAgICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJz KFdlYkluc3BlY3Rvci5UaW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLkV2ZW50cy5XaW5kb3dDaGFu Z2VkKTsKLSAgICB9LAotCi0gICAgLyoqCi0gICAgICogQHBhcmFtIHtXZWJJbnNwZWN0b3IuVGlt ZWxpbmVDYXRlZ29yeX0gY2F0ZWdvcnkKLSAgICAgKiBAcGFyYW0ge2Jvb2xlYW59IHZpc2libGUK LSAgICAgKi8KLSAgICBzZXRDYXRlZ29yeVZpc2liaWxpdHk6IGZ1bmN0aW9uKGNhdGVnb3J5LCB2 aXNpYmxlKQotICAgIHsKLSAgICAgICAgY2F0ZWdvcnkuaGlkZGVuID0gIXZpc2libGU7Ci0gICAg ICAgIHRoaXMuZGlzcGF0Y2hFdmVudFRvTGlzdGVuZXJzKFdlYkluc3BlY3Rvci5UaW1lbGluZVBy ZXNlbnRhdGlvbk1vZGVsLkV2ZW50cy5DYXRlZ29yeVZpc2liaWxpdHlDaGFuZ2VkLCBjYXRlZ29y eSk7Ci0gICAgfSwKLQogICAgIGdldCBfcmVjb3JkU3R5bGVzKCkKICAgICB7CiAgICAgICAgIGlm ICghdGhpcy5fcmVjb3JkU3R5bGVzQXJyYXkpIHsKQEAgLTczMCwzICs2OTAsMzcgQEAgV2ViSW5z cGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuRmlsdGVyLnByb3RvdHlwZSA9IHsKICAg ICAgKi8KICAgICBhY2NlcHQ6IGZ1bmN0aW9uKHJlY29yZCkgeyByZXR1cm4gZmFsc2U7IH0KIH0K KworLyoqCisgKiBAY29uc3RydWN0b3IKKyAqIEBleHRlbmRzIHtXZWJJbnNwZWN0b3IuT2JqZWN0 fQorICovCitXZWJJbnNwZWN0b3IuVGltZWxpbmVDYXRlZ29yeSA9IGZ1bmN0aW9uKG5hbWUsIHRp dGxlLCBjb2xvcikKK3sKKyAgICB0aGlzLm5hbWUgPSBuYW1lOworICAgIHRoaXMudGl0bGUgPSB0 aXRsZTsKKyAgICB0aGlzLmNvbG9yID0gY29sb3I7CisgICAgdGhpcy5oaWRkZW4gPSBmYWxzZTsK K30KKworV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ2F0ZWdvcnkuRXZlbnRzID0geworICAgIFZpc2li aWxpdHlDaGFuZ2VkOiAiVmlzaWJpbGl0eUNoYW5nZWQiCit9OworCitXZWJJbnNwZWN0b3IuVGlt ZWxpbmVDYXRlZ29yeS5wcm90b3R5cGUgPSB7CisgICAgLyoqCisgICAgICogQHR5cGUge2Jvb2xl YW59CisgICAgICovCisgICAgZ2V0IGhpZGRlbigpCisgICAgeworICAgICAgICByZXR1cm4gdGhp cy5faGlkZGVuOworICAgIH0sCisKKyAgICBzZXQgaGlkZGVuKGhpZGRlbikKKyAgICB7CisgICAg ICAgIHRoaXMuX2hpZGRlbiA9IGhpZGRlbjsKKyAgICAgICAgdGhpcy5kaXNwYXRjaEV2ZW50VG9M aXN0ZW5lcnMoV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ2F0ZWdvcnkuRXZlbnRzLlZpc2liaWxpdHlD aGFuZ2VkLCB0aGlzKTsKKyAgICB9Cit9CisKK1dlYkluc3BlY3Rvci5UaW1lbGluZUNhdGVnb3J5 LnByb3RvdHlwZS5fX3Byb3RvX18gPSBXZWJJbnNwZWN0b3IuT2JqZWN0LnByb3RvdHlwZTsK