87016 2012-05-21 06:36:37 -0700 Web Inspector: [refactoring] promote fill/border colors used by timeline's frame overview to TimelineCategory 2012-05-21 06:50:15 -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 629039 0 caseq 2012-05-21 06:36:37 -0700 The motivation for that is that we'll be able to reuse these by other components using canvas. 629042 1 143022 caseq 2012-05-21 06:40:58 -0700 Created attachment 143022 Patch 629050 2 caseq 2012-05-21 06:50:15 -0700 Committed r117778: <http://trac.webkit.org/changeset/117778> 143022 2012-05-21 06:40:58 -0700 2012-05-21 06:42:32 -0700 Patch bug-87016-20120521174056.patch text/plain 9118 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3NzY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDEyY2M2MmVjZWIxNDg1 YTVjM2QzMzhjYzA0MDliMWM1M2M0ZTNiMC4uNmUwYjJhMjRjNzY3NDE1NTU3NWQwZjEwZTU1MDc0 OWQxYzNkZDM5MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMyIEBACisyMDEyLTA1LTIxICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogW3JlZmFjdG9yaW5nXSBwcm9tb3RlIGZpbGwvYm9yZGVyIGNvbG9ycyB1c2VkIGJ5IHRpbWVs aW5lJ3MgZnJhbWUgb3ZlcnZpZXcgdG8gVGltZWxpbmVDYXRlZ29yeQorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9ODcwMTYKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAtIGRyb3AgdW51c2VkICdjb2xvcicgZmll bGQgZnJvbSBUaW1lbGluZUNhdGVnb3J5OworICAgICAgICAtIGFkZCBib3JkZXJDb2xvciBhbmQg ZmlsbENvbG9yU3RvcFswLTFdIHRvIFRpbWVsaW5lQ2F0ZWdvcnk7CisgICAgICAgIC0gZml4IHN0 eWxlIGluIGEgaGFuZGZ1bCBvZiBwbGFjZXMuCisKKyAgICAgICAgTm90ZSB3ZSBzdG9yZSB0ZXh0 dWFsIHZhbHVlcyBmb3IgY29sb3Igc3RvcHMsIG5vdCBwcmVtYWRlIGdyYWRpZW50cyBzbyB3ZSBj YW4gYnVpbGQgZ3JhZGllbnRzIHdpdGggZGlmZmVyZW50CisgICAgICAgIG9yaWVudGF0aW9ucyBy YXRoZXIgdGhhbiB0cmFuc2Zvcm1pbmcgYSBncmFkaWVudC4KKworICAgICAgICAqIGluc3BlY3Rv ci9mcm9udC1lbmQvVGltZWxpbmVPdmVydmlld1BhbmUuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuSGVhcEdyYXBoKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwR3JhcGgucHJvdG90eXBl LmdldCBlbGVtZW50KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwR3JhcGgucHJvdG90eXBl LmdldCB2aXNpYmxlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IZWFwR3JhcGgucHJvdG90eXBl LnNob3cpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkhlYXBHcmFwaC5wcm90b3R5cGUuaGlkZSk6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuSGVhcEdyYXBoLnByb3RvdHlwZS5fY2xlYXIpOgorICAg ICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ2F0ZWdvcnlTdHJpcHMpOgorICAgICAgICAoV2Vi SW5zcGVjdG9yLlRpbWVsaW5lVmVydGljYWxPdmVydmlldyk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuVGltZWxpbmVWZXJ0aWNhbE92ZXJ2aWV3LnByb3RvdHlwZS5fcmVuZGVyQmFyKToKKyAgICAg ICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuanM6Cisg ICAgICAgIChXZWJJbnNwZWN0b3IuVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5jYXRlZ29yaWVz KToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLnJlY29y ZFN0eWxlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZUNhdGVnb3J5KToKKwogMjAx Mi0wNS0yMSAgQWxleGFuZGVyIFBhdmxvdiAgPGFwYXZsb3ZAY2hyb21pdW0ub3JnPgogCiAgICAg ICAgIFdlYiBJbnNwZWN0b3I6IEFubm90YXRlIENTU1N0eWxlTW9kZWwuanMgZm9yIHRoZSBjbG9z dXJlIGNvbXBpbGVyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQt ZW5kL1RpbWVsaW5lT3ZlcnZpZXdQYW5lLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9UaW1lbGluZU92ZXJ2aWV3UGFuZS5qcwppbmRleCA2YTBkZjhmZjIwYzE2MTQ0NTIz ZTc3NWVkZGY0MWMxYzBkNmQzZmI0Li4zMGJhMjI4ZTI0MTVmNGEyOWU0Y2QxNjMxYjNmMGRhNjZl OTE0NTZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Rp bWVsaW5lT3ZlcnZpZXdQYW5lLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9u dC1lbmQvVGltZWxpbmVPdmVydmlld1BhbmUuanMKQEAgLTc2Nyw3ICs3NjcsOCBAQCBXZWJJbnNw ZWN0b3IuVGltZWxpbmVPdmVydmlld1BhbmUuV2luZG93U2VsZWN0b3IucHJvdG90eXBlID0gewog ICogQGNvbnN0cnVjdG9yCiAgKiBAcGFyYW0ge1dlYkluc3BlY3Rvci5UaW1lbGluZU1vZGVsfSBt b2RlbAogICovCi1XZWJJbnNwZWN0b3IuSGVhcEdyYXBoID0gZnVuY3Rpb24obW9kZWwpIHsKK1dl Ykluc3BlY3Rvci5IZWFwR3JhcGggPSBmdW5jdGlvbihtb2RlbCkKK3sKICAgICB0aGlzLl9jYW52 YXMgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJjYW52YXMiKTsKICAgICB0aGlzLl9tb2RlbCA9 IG1vZGVsOwogCkBAIC03ODYsMTkgKzc4NywyMyBAQCBXZWJJbnNwZWN0b3IuSGVhcEdyYXBoID0g ZnVuY3Rpb24obW9kZWwpIHsKIH0KIAogV2ViSW5zcGVjdG9yLkhlYXBHcmFwaC5wcm90b3R5cGUg PSB7Ci0gICAgZ2V0IGVsZW1lbnQoKSB7CisgICAgZ2V0IGVsZW1lbnQoKQorICAgIHsKICAgICAg ICAgcmV0dXJuIHRoaXMuX2VsZW1lbnQ7CiAgICAgfSwKIAotICAgIGdldCB2aXNpYmxlKCkgewor ICAgIGdldCB2aXNpYmxlKCkKKyAgICB7CiAgICAgICAgIHJldHVybiAhdGhpcy5lbGVtZW50Lmhh c1N0eWxlQ2xhc3MoImhpZGRlbiIpOwogICAgIH0sCiAKLSAgICBzaG93OiBmdW5jdGlvbigpIHsK KyAgICBzaG93OiBmdW5jdGlvbigpCisgICAgewogICAgICAgICB0aGlzLmVsZW1lbnQucmVtb3Zl U3R5bGVDbGFzcygiaGlkZGVuIik7CiAgICAgfSwKIAotICAgIGhpZGU6IGZ1bmN0aW9uKCkgewor ICAgIGhpZGU6IGZ1bmN0aW9uKCkKKyAgICB7CiAgICAgICAgIHRoaXMuZWxlbWVudC5hZGRTdHls ZUNsYXNzKCJoaWRkZW4iKTsKICAgICB9LAogCkBAIC04NzQsMTggKzg3OSwyNCBAQCBXZWJJbnNw ZWN0b3IuSGVhcEdyYXBoLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fbWluSGVhcFNpemVM YWJlbC50ZXh0Q29udGVudCA9IE51bWJlci5ieXRlc1RvU3RyaW5nKG1pblVzZWRIZWFwU2l6ZSk7 CiAgICAgfSwKIAotICAgIF9jbGVhcjogZnVuY3Rpb24oY3R4KSB7CisgICAgX2NsZWFyOiBmdW5j dGlvbihjdHgpCisgICAgewogICAgICAgICBjdHguZmlsbFN0eWxlID0gInJnYmEoMjU1LDI1NSwy NTUsMC44KSI7CiAgICAgICAgIGN0eC5maWxsUmVjdCgwLCAwLCB0aGlzLl9jYW52YXMud2lkdGgs IHRoaXMuX2NhbnZhcy5oZWlnaHQpOwogICAgIH0sCiB9CiAKK1dlYkluc3BlY3Rvci5UaW1lbGlu ZUNhdGVnb3J5U3RyaXBzID0gZnVuY3Rpb24obW9kZWwpCit7Cit9CisKIC8qKgogICogQGNvbnN0 cnVjdG9yCiAgKiBAZXh0ZW5kcyB7V2ViSW5zcGVjdG9yLlZpZXd9CiAgKiBAcGFyYW0ge1dlYklu c3BlY3Rvci5UaW1lbGluZU1vZGVsfSBtb2RlbAogICovCi1XZWJJbnNwZWN0b3IuVGltZWxpbmVW ZXJ0aWNhbE92ZXJ2aWV3ID0gZnVuY3Rpb24obW9kZWwpIHsKK1dlYkluc3BlY3Rvci5UaW1lbGlu ZVZlcnRpY2FsT3ZlcnZpZXcgPSBmdW5jdGlvbihtb2RlbCkKK3sKICAgICBXZWJJbnNwZWN0b3Iu Vmlldy5jYWxsKHRoaXMpOwogICAgIHRoaXMuZWxlbWVudCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1l bnQoImNhbnZhcyIpOwogICAgIHRoaXMuZWxlbWVudC5jbGFzc05hbWUgPSAidGltZWxpbmUtdmVy dGljYWwtb3ZlcnZpZXctYmFycyBmaWxsIjsKQEAgLTkwMCwyMiArOTExLDE1IEBAIFdlYkluc3Bl Y3Rvci5UaW1lbGluZVZlcnRpY2FsT3ZlcnZpZXcgPSBmdW5jdGlvbihtb2RlbCkgewogICAgIHRo aXMuX2FjdHVhbE91dGVyQmFyV2lkdGggPSB0aGlzLl9tYXhJbm5lckJhcldpZHRoICsgdGhpcy5f YWN0dWFsUGFkZGluZzsKIAogICAgIHRoaXMuX2NvbnRleHQgPSB0aGlzLmVsZW1lbnQuZ2V0Q29u dGV4dCgiMmQiKTsKKwogICAgIHRoaXMuX2ZpbGxTdHlsZXMgPSB7fTsKLSAgICB0aGlzLl9maWxs U3R5bGVzLmxvYWRpbmcgPSB0aGlzLl9jb250ZXh0LmNyZWF0ZUxpbmVhckdyYWRpZW50KDAsIDAs IHRoaXMuX21heElubmVyQmFyV2lkdGgsIDApOwotICAgIHRoaXMuX2ZpbGxTdHlsZXMubG9hZGlu Zy5hZGRDb2xvclN0b3AoMCwgInJnYigyMDEsIDIyMCwgMjQ1KSIpOwotICAgIHRoaXMuX2ZpbGxT dHlsZXMubG9hZGluZy5hZGRDb2xvclN0b3AoMSwgInJnYigxMDksIDE1NywgMjIyKSIpOwotICAg IHRoaXMuX2ZpbGxTdHlsZXMuc2NyaXB0aW5nID0gdGhpcy5fY29udGV4dC5jcmVhdGVMaW5lYXJH cmFkaWVudCgwLCAwLCB0aGlzLl9tYXhJbm5lckJhcldpZHRoLCAwKTsKLSAgICB0aGlzLl9maWxs U3R5bGVzLnNjcmlwdGluZy5hZGRDb2xvclN0b3AoMCwgInJnYigyNTEsIDIyMiwgMTY4KSIpOwot ICAgIHRoaXMuX2ZpbGxTdHlsZXMuc2NyaXB0aW5nLmFkZENvbG9yU3RvcCgxLCAicmdiKDIzNCwg MTgyLCA3NykiKTsKLSAgICB0aGlzLl9maWxsU3R5bGVzLnJlbmRlcmluZyA9IHRoaXMuX2NvbnRl eHQuY3JlYXRlTGluZWFyR3JhZGllbnQoMCwgMCwgdGhpcy5fbWF4SW5uZXJCYXJXaWR0aCwgMCk7 Ci0gICAgdGhpcy5fZmlsbFN0eWxlcy5yZW5kZXJpbmcuYWRkQ29sb3JTdG9wKDAsICJyZ2IoMjEz LCAxODUsIDIzNikiKTsKLSAgICB0aGlzLl9maWxsU3R5bGVzLnJlbmRlcmluZy5hZGRDb2xvclN0 b3AoMSwgInJnYigxMzcsIDYyLCAyMDApIik7Ci0KLSAgICB0aGlzLl9ib3JkZXJTdHlsZXMgPSB7 fTsKLSAgICB0aGlzLl9ib3JkZXJTdHlsZXMubG9hZGluZyA9ICJyZ2IoMTA2LCAxNTIsIDIxMyki OwotICAgIHRoaXMuX2JvcmRlclN0eWxlcy5zY3JpcHRpbmcgPSAicmdiKDIyMywgMTc1LCA3Nyki OwotICAgIHRoaXMuX2JvcmRlclN0eWxlcy5yZW5kZXJpbmcgPSAicmdiKDEzMCwgNTksIDE5MCki OwotICAgIHRoaXMuX2JvcmRlclN0eWxlcy5fZnJhbWVMZW5ndGggPSAicmdiKDkwLCA5MCwgOTAp IjsKKyAgICB2YXIgY2F0ZWdvcmllcyA9IFdlYkluc3BlY3Rvci5UaW1lbGluZVByZXNlbnRhdGlv bk1vZGVsLmNhdGVnb3JpZXMoKTsKKyAgICBmb3IgKHZhciBjYXRlZ29yeSBpbiBjYXRlZ29yaWVz KSB7CisgICAgICAgIHZhciBmaWxsU3R5bGUgPSB0aGlzLl9jb250ZXh0LmNyZWF0ZUxpbmVhckdy YWRpZW50KDAsIDAsIHRoaXMuX21heElubmVyQmFyV2lkdGgsIDApOworICAgICAgICBmaWxsU3R5 bGUuYWRkQ29sb3JTdG9wKDAsIGNhdGVnb3JpZXNbY2F0ZWdvcnldLmZpbGxDb2xvclN0b3AwKTsK KyAgICAgICAgZmlsbFN0eWxlLmFkZENvbG9yU3RvcCgxLCBjYXRlZ29yaWVzW2NhdGVnb3J5XS5m aWxsQ29sb3JTdG9wMSk7CisgICAgICAgIHRoaXMuX2ZpbGxTdHlsZXNbY2F0ZWdvcnldID0gZmls bFN0eWxlOworICAgIH0KIH0KIAogV2ViSW5zcGVjdG9yLlRpbWVsaW5lVmVydGljYWxPdmVydmll dy5wcm90b3R5cGUgPSB7CkBAIC0xMDM3LDcgKzEwNDEsNyBAQCBXZWJJbnNwZWN0b3IuVGltZWxp bmVWZXJ0aWNhbE92ZXJ2aWV3LnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHRoaXMuX2NvbnRl eHQuZmlsbFJlY3QoMCwgeSwgdGhpcy5fbWF4SW5uZXJCYXJXaWR0aCwgTWF0aC5mbG9vcihoZWln aHQpKTsKICAgICAgICAgICAgIHRoaXMuX2NvbnRleHQucmVzdG9yZSgpOwogCi0gICAgICAgICAg ICB0aGlzLl9jb250ZXh0LnN0cm9rZVN0eWxlID0gdGhpcy5fYm9yZGVyU3R5bGVzW2NhdGVnb3J5 XTsKKyAgICAgICAgICAgIHRoaXMuX2NvbnRleHQuc3Ryb2tlU3R5bGUgPSBXZWJJbnNwZWN0b3Iu VGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5jYXRlZ29yaWVzKClbY2F0ZWdvcnldOwogICAgICAg ICAgICAgdGhpcy5fY29udGV4dC5zdHJva2VSZWN0KHgsIHksIHdpZHRoLCBNYXRoLmZsb29yKGhl aWdodCkpOwogICAgICAgICAgICAgYm90dG9tT2Zmc2V0IC09IGhlaWdodCAtIDE7CiAgICAgICAg IH0KQEAgLTEwNDYsNyArMTA1MCw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVZlcnRpY2FsT3Zl cnZpZXcucHJvdG90eXBlID0gewogICAgICAgICB2YXIgeTAgPSBNYXRoLmZsb29yKGJvdHRvbU9m ZnNldCAtIG5vbkNQVVRpbWUgKiBzY2FsZSkgKyAwLjU7CiAgICAgICAgIHZhciB5MSA9IE1hdGgu Zmxvb3IoYm90dG9tT2Zmc2V0KSArIDAuNTsKIAotICAgICAgICB0aGlzLl9jb250ZXh0LnN0cm9r ZVN0eWxlID0gdGhpcy5fYm9yZGVyU3R5bGVzLl9mcmFtZUxlbmd0aDsKKyAgICAgICAgdGhpcy5f Y29udGV4dC5zdHJva2VTdHlsZSA9ICJyZ2IoOTAsIDkwLCA5MCkiOwogICAgICAgICB0aGlzLl9j b250ZXh0LmJlZ2luUGF0aCgpOwogICAgICAgICB0aGlzLl9jb250ZXh0Lm1vdmVUbyh4LCB5MSk7 CiAgICAgICAgIHRoaXMuX2NvbnRleHQubGluZVRvKHgsIHkwKTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQcmVzZW50YXRpb25Nb2RlbC5q cyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQcmVzZW50YXRp b25Nb2RlbC5qcwppbmRleCA2MjVhYzY3NTFjMTQxMWFkNjliMmM2ZTQ5MThjMDhhNmRmMTIwY2Yx Li4yMzIwMmYyZGI4NTRlYjI0ZjNhMzRiMzVkMWI1Y2U1NTYwNmQ2MTY5IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUHJlc2VudGF0aW9uTW9k ZWwuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBy ZXNlbnRhdGlvbk1vZGVsLmpzCkBAIC00Nyw5ICs0Nyw5IEBAIFdlYkluc3BlY3Rvci5UaW1lbGlu ZVByZXNlbnRhdGlvbk1vZGVsLmNhdGVnb3JpZXMgPSBmdW5jdGlvbigpCiAgICAgaWYgKFdlYklu c3BlY3Rvci5UaW1lbGluZVByZXNlbnRhdGlvbk1vZGVsLl9jYXRlZ29yaWVzKQogICAgICAgICBy ZXR1cm4gV2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuX2NhdGVnb3JpZXM7 CiAgICAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuX2NhdGVnb3JpZXMg PSB7Ci0gICAgICAgIGxvYWRpbmc6IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxpbmVDYXRlZ29yeSgi bG9hZGluZyIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiTG9hZGluZyIpLCAicmdiKDQ3LDEwMiwy MzYpIiksCi0gICAgICAgIHNjcmlwdGluZzogbmV3IFdlYkluc3BlY3Rvci5UaW1lbGluZUNhdGVn b3J5KCJzY3JpcHRpbmciLCBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNjcmlwdGluZyIpLCAicmdi KDE1NywyMzEsMTE5KSIpLAotICAgICAgICByZW5kZXJpbmc6IG5ldyBXZWJJbnNwZWN0b3IuVGlt ZWxpbmVDYXRlZ29yeSgicmVuZGVyaW5nIiwgV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZW5kZXJp bmciKSwgInJnYigxNjQsNjAsMjU1KSIpCisgICAgICAgIGxvYWRpbmc6IG5ldyBXZWJJbnNwZWN0 b3IuVGltZWxpbmVDYXRlZ29yeSgibG9hZGluZyIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiTG9h ZGluZyIpLCAicmdiKDEwNiwgMTUyLCAyMTMpIiwgInJnYigyMDEsIDIyMCwgMjQ1KSIsICJyZ2Io MTA5LCAxNTcsIDIyMikiKSwKKyAgICAgICAgc2NyaXB0aW5nOiBuZXcgV2ViSW5zcGVjdG9yLlRp bWVsaW5lQ2F0ZWdvcnkoInNjcmlwdGluZyIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2NyaXB0 aW5nIiksICJyZ2IoMjIzLCAxNzUsIDc3KSIsICJyZ2IoMjUxLCAyMjIsIDE2OCkiLCAicmdiKDIz NCwgMTgyLCA3NykiKSwKKyAgICAgICAgcmVuZGVyaW5nOiBuZXcgV2ViSW5zcGVjdG9yLlRpbWVs aW5lQ2F0ZWdvcnkoInJlbmRlcmluZyIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiUmVuZGVyaW5n IiksICJyZ2IoMTMwLCA1OSwgMTkwKSIsICJyZ2IoMjEzLCAxODUsIDIzNikiLCAicmdiKDEzNywg NjIsIDIwMCkiKQogICAgIH07CiAgICAgcmV0dXJuIFdlYkluc3BlY3Rvci5UaW1lbGluZVByZXNl bnRhdGlvbk1vZGVsLl9jYXRlZ29yaWVzOwogfTsKQEAgLTU3LDcgKzU3LDggQEAgV2ViSW5zcGVj dG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuY2F0ZWdvcmllcyA9IGZ1bmN0aW9uKCkKIC8q KgogICogQHBhcmFtIHtPYmplY3R9IHJlY29yZAogICovCi1XZWJJbnNwZWN0b3IuVGltZWxpbmVQ cmVzZW50YXRpb25Nb2RlbC5yZWNvcmRTdHlsZSA9IGZ1bmN0aW9uKHJlY29yZCkgeworV2ViSW5z cGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwucmVjb3JkU3R5bGUgPSBmdW5jdGlvbihy ZWNvcmQpCit7CiAgICAgaWYgKFdlYkluc3BlY3Rvci5UaW1lbGluZVByZXNlbnRhdGlvbk1vZGVs Ll9yZWNvcmRTdHlsZXNNYXApCiAgICAgICAgIHJldHVybiBXZWJJbnNwZWN0b3IuVGltZWxpbmVQ cmVzZW50YXRpb25Nb2RlbC5fcmVjb3JkU3R5bGVzTWFwW3JlY29yZC50eXBlXTsKIApAQCAtNzY5 LDEyICs3NzAsMTkgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUHJlc2VudGF0aW9uTW9kZWwuRmls dGVyLnByb3RvdHlwZSA9IHsKIC8qKgogICogQGNvbnN0cnVjdG9yCiAgKiBAZXh0ZW5kcyB7V2Vi SW5zcGVjdG9yLk9iamVjdH0KKyAqIEBwYXJhbSB7c3RyaW5nfSBuYW1lCisgKiBAcGFyYW0ge3N0 cmluZ30gdGl0bGUKKyAqIEBwYXJhbSB7c3RyaW5nfSBib3JkZXJDb2xvcgorICogQHBhcmFtIHtz dHJpbmd9IGZpbGxDb2xvclN0b3AwCisgKiBAcGFyYW0ge3N0cmluZ30gZmlsbENvbG9yU3RvcDEK ICAqLwotV2ViSW5zcGVjdG9yLlRpbWVsaW5lQ2F0ZWdvcnkgPSBmdW5jdGlvbihuYW1lLCB0aXRs ZSwgY29sb3IpCitXZWJJbnNwZWN0b3IuVGltZWxpbmVDYXRlZ29yeSA9IGZ1bmN0aW9uKG5hbWUs IHRpdGxlLCBib3JkZXJDb2xvciwgZmlsbENvbG9yU3RvcDAsIGZpbGxDb2xvclN0b3AxKQogewog ICAgIHRoaXMubmFtZSA9IG5hbWU7CiAgICAgdGhpcy50aXRsZSA9IHRpdGxlOwotICAgIHRoaXMu Y29sb3IgPSBjb2xvcjsKKyAgICB0aGlzLmJvcmRlckNvbG9yID0gYm9yZGVyQ29sb3I7CisgICAg dGhpcy5maWxsQ29sb3JTdG9wMCA9IGZpbGxDb2xvclN0b3AwOworICAgIHRoaXMuZmlsbENvbG9y U3RvcDEgPSBmaWxsQ29sb3JTdG9wMTsKICAgICB0aGlzLmhpZGRlbiA9IGZhbHNlOwogfQogCg==