79665 2012-02-27 06:13:23 -0800 Web Inspector: [refactoring] remove dependencies from TimelinePanel from most of FormattedRecord 2012-02-27 07:05:27 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 caseq caseq apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 565605 0 caseq 2012-02-27 06:13:23 -0800 This is first shot at decoupling FormattedRecord from TimelinePanel -- just store linkifier, not the entire panel. There are still other dependencies left, these will be addressed by separate patches. 565607 1 129025 caseq 2012-02-27 06:14:11 -0800 Created attachment 129025 Patch 565629 2 caseq 2012-02-27 07:05:27 -0800 Committed r108990: <http://trac.webkit.org/changeset/108990> 129025 2012-02-27 06:14:11 -0800 2012-02-27 06:43:27 -0800 Patch bug-79665-20120227181409.patch text/plain 13127 caseq U3VidmVyc2lvbiBSZXZpc2lvbjogMTA4OTcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGZkYzQ4OGFiNmFiMzhk YmQzN2VjZDQxNTM1NTEzNTVhNjE0OWRlZi4uZDdiM2VhYjM4OGQxYmQxY2RiNjBmNTk5ZDNmYzc0 YmYwMGE1NWZkNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTAyLTI3ICBBbmRy ZXkgS29zeWFrb3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3Rv cjogW3JlZmFjdG9yaW5nXSByZW1vdmUgZGVwZW5kZW5jaWVzIGZyb20gVGltZWxpbmVQYW5lbCBm cm9tIG1vc3Qgb2YgRm9ybWF0dGVkUmVjb3JkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD03OTY2NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwucHJvdG90eXBlLl9pbm5lckFk ZFJlY29yZFRvVGltZWxpbmUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwu Rm9ybWF0dGVkUmVjb3JkKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLkZv cm1hdHRlZFJlY29yZC5wcm90b3R5cGUuX2dlbmVyYXRlUG9wdXBDb250ZW50KToKKyAgICAgICAg KFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLkZvcm1hdHRlZFJlY29yZC5wcm90b3R5cGUuX2dl dFJlY29yZERldGFpbHMpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwuRm9y bWF0dGVkUmVjb3JkLnByb3RvdHlwZS5fbGlua2lmeUxvY2F0aW9uKToKKyAgICAgICAgKFdlYklu c3BlY3Rvci5UaW1lbGluZVBhbmVsLkZvcm1hdHRlZFJlY29yZC5wcm90b3R5cGUuX2xpbmtpZnlD YWxsRnJhbWUpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwuRm9ybWF0dGVk UmVjb3JkLnByb3RvdHlwZS5fbGlua2lmeVRvcENhbGxGcmFtZSk6CisgICAgICAgIChXZWJJbnNw ZWN0b3IuVGltZWxpbmVQYW5lbC5Gb3JtYXR0ZWRSZWNvcmQucHJvdG90eXBlLl9saW5raWZ5U2Ny aXB0TG9jYXRpb24pOgorICAgICAgICAoV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwuUG9wdXBD b250ZW50SGVscGVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLlBvcHVw Q29udGVudEhlbHBlci5wcm90b3R5cGUuX2FwcGVuZFN0YWNrVHJhY2UpOgorCiAyMDEyLTAyLTIx ICBQYXZlbCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFdl YiBJbnNwZWN0b3I6IGdldCByaWQgb2YgUmF3U291cmNlQ29kZS5zb3VyY2VNYXBwaW5nIGdldHRl ci4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxp bmVQYW5lbC5qcyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvVGltZWxpbmVQ YW5lbC5qcwppbmRleCBiZjU4MGNkMjEzZTc1ZDk2YjUzNGYwYmY4NDZlYjZjOTBmMWYyN2Y4Li5m MDFiMWVhMjQxNWEyYTU3Yzg3NzQxYjQxOWJlN2ZmNTc5ZGFkOWMzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1RpbWVsaW5lUGFuZWwuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9UaW1lbGluZVBhbmVsLmpzCkBAIC0xNzgs MTkgKzE3OCw2IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZSA9IHsKICAg ICAgICAgdGhpcy5fbWVtb3J5U3RhdGlzdGljcy5zZXRUb3BQb3NpdGlvbih0b3ApOwogICAgIH0s CiAKLSAgICBfbGlua2lmeUxvY2F0aW9uOiBmdW5jdGlvbih1cmwsIGxpbmVOdW1iZXIsIGNvbHVt bk51bWJlcikKLSAgICB7Ci0gICAgICAgIC8vIEZJWE1FKDYyNzI1KTogc3RhY2sgdHJhY2UgbGlu ZS9jb2x1bW4gbnVtYmVycyBhcmUgb25lLWJhc2VkLgotICAgICAgICBsaW5lTnVtYmVyID0gbGlu ZU51bWJlciA/IGxpbmVOdW1iZXIgLSAxIDogbGluZU51bWJlcjsKLSAgICAgICAgY29sdW1uTnVt YmVyID0gY29sdW1uTnVtYmVyID8gY29sdW1uTnVtYmVyIC0gMSA6IDA7Ci0gICAgICAgIHJldHVy biB0aGlzLl9saW5raWZpZXIubGlua2lmeUxvY2F0aW9uKHVybCwgbGluZU51bWJlciwgY29sdW1u TnVtYmVyLCAidGltZWxpbmUtZGV0YWlscyIpOwotICAgIH0sCi0KLSAgICBfbGlua2lmeUNhbGxG cmFtZTogZnVuY3Rpb24oY2FsbEZyYW1lKQotICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX2xp bmtpZnlMb2NhdGlvbihjYWxsRnJhbWUudXJsLCBjYWxsRnJhbWUubGluZU51bWJlciwgY2FsbEZy YW1lLmNvbHVtbk51bWJlcik7Ci0gICAgfSwKLQogICAgIGdldCBjYWxjdWxhdG9yKCkKICAgICB7 CiAgICAgICAgIHJldHVybiB0aGlzLl9jYWxjdWxhdG9yOwpAQCAtNTYwLDcgKzU0Nyw3IEBAIFdl Ykluc3BlY3Rvci5UaW1lbGluZVBhbmVsLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIH0KICAg ICAgICAgfQogCi0gICAgICAgIHZhciBmb3JtYXR0ZWRSZWNvcmQgPSBuZXcgV2ViSW5zcGVjdG9y LlRpbWVsaW5lUGFuZWwuRm9ybWF0dGVkUmVjb3JkKHJlY29yZCwgcGFyZW50UmVjb3JkLCB0aGlz LCBzY3JpcHREZXRhaWxzKTsKKyAgICAgICAgdmFyIGZvcm1hdHRlZFJlY29yZCA9IG5ldyBXZWJJ bnNwZWN0b3IuVGltZWxpbmVQYW5lbC5Gb3JtYXR0ZWRSZWNvcmQocmVjb3JkLCBwYXJlbnRSZWNv cmQsIHRoaXMsIHRoaXMuX2xpbmtpZmllciwgc2NyaXB0RGV0YWlscyk7CiAKICAgICAgICAgaWYg KHJlY29yZC50eXBlID09PSByZWNvcmRUeXBlcy5NYXJrRE9NQ29udGVudCB8fCByZWNvcmQudHlw ZSA9PT0gcmVjb3JkVHlwZXMuTWFya0xvYWQpIHsKICAgICAgICAgICAgIHRoaXMuX3RpbWVTdGFt cFJlY29yZHMucHVzaChmb3JtYXR0ZWRSZWNvcmQpOwpAQCAtMTE2Miw5ICsxMTQ5LDkgQEAgV2Vi SW5zcGVjdG9yLlRpbWVsaW5lUmVjb3JkR3JhcGhSb3cucHJvdG90eXBlID0gewogLyoqCiAgKiBA Y29uc3RydWN0b3IKICAqLwotV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwuRm9ybWF0dGVkUmVj b3JkID0gZnVuY3Rpb24ocmVjb3JkLCBwYXJlbnRSZWNvcmQsIHBhbmVsLCBzY3JpcHREZXRhaWxz KQorV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwuRm9ybWF0dGVkUmVjb3JkID0gZnVuY3Rpb24o cmVjb3JkLCBwYXJlbnRSZWNvcmQsIHBhbmVsLCBsaW5raWZpZXIsIHNjcmlwdERldGFpbHMpCiB7 Ci0gICAgdGhpcy5fcGFuZWwgPSBwYW5lbDsKKyAgICB0aGlzLl9saW5raWZpZXIgPSBsaW5raWZp ZXI7CiAgICAgdmFyIHJlY29yZFR5cGVzID0gV2ViSW5zcGVjdG9yLlRpbWVsaW5lQWdlbnQuUmVj b3JkVHlwZTsKICAgICB2YXIgc3R5bGUgPSBwYW5lbC5fcmVjb3JkU3R5bGVzW3JlY29yZC50eXBl XTsKICAgICB0aGlzLnBhcmVudCA9IHBhcmVudFJlY29yZDsKQEAgLTEyNjAsNyArMTI0Nyw3IEBA IFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLkZvcm1hdHRlZFJlY29yZC5wcm90b3R5cGUgPSB7 CiAKICAgICBfZ2VuZXJhdGVQb3B1cENvbnRlbnQ6IGZ1bmN0aW9uKGNhbGN1bGF0b3IsIGNhdGVn b3JpZXMpCiAgICAgewotICAgICAgICB2YXIgY29udGVudEhlbHBlciA9IG5ldyBXZWJJbnNwZWN0 b3IuVGltZWxpbmVQYW5lbC5Qb3B1cENvbnRlbnRIZWxwZXIodGhpcy50aXRsZSwgdGhpcy5fcGFu ZWwpOworICAgICAgICB2YXIgY29udGVudEhlbHBlciA9IG5ldyBXZWJJbnNwZWN0b3IuVGltZWxp bmVQYW5lbC5Qb3B1cENvbnRlbnRIZWxwZXIodGhpcy50aXRsZSk7CiAKICAgICAgICAgaWYgKHRo aXMuX2NoaWxkcmVuICYmIHRoaXMuX2NoaWxkcmVuLmxlbmd0aCkgewogICAgICAgICAgICAgY29u dGVudEhlbHBlci5fYXBwZW5kVGV4dFJvdyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNlbGYgVGlt ZSIpLCBOdW1iZXIuc2Vjb25kc1RvU3RyaW5nKHRoaXMuX3NlbGZUaW1lLCB0cnVlKSk7CkBAIC0x Mjg5LDE0ICsxMjc2LDE0IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLkZvcm1hdHRlZFJl Y29yZC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgY29udGVudEhlbHBlci5fYXBwZW5k VGV4dFJvdyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNhbGxiYWNrIElEIiksIHRoaXMuZGF0YVsi aWQiXSk7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBjYXNlIHJlY29yZFR5 cGVzLkZ1bmN0aW9uQ2FsbDoKLSAgICAgICAgICAgICAgICBjb250ZW50SGVscGVyLl9hcHBlbmRM aW5rUm93KFdlYkluc3BlY3Rvci5VSVN0cmluZygiTG9jYXRpb24iKSwgdGhpcy5zY3JpcHROYW1l LCB0aGlzLnNjcmlwdExpbmUpOworICAgICAgICAgICAgICAgIGNvbnRlbnRIZWxwZXIuX2FwcGVu ZEVsZW1lbnRSb3coV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJMb2NhdGlvbiIpLCB0aGlzLl9saW5r aWZ5U2NyaXB0TG9jYXRpb24oKSk7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAg ICBjYXNlIHJlY29yZFR5cGVzLlNjaGVkdWxlUmVzb3VyY2VSZXF1ZXN0OgogICAgICAgICAgICAg Y2FzZSByZWNvcmRUeXBlcy5SZXNvdXJjZVNlbmRSZXF1ZXN0OgogICAgICAgICAgICAgY2FzZSBy ZWNvcmRUeXBlcy5SZXNvdXJjZVJlY2VpdmVSZXNwb25zZToKICAgICAgICAgICAgIGNhc2UgcmVj b3JkVHlwZXMuUmVzb3VyY2VSZWNlaXZlZERhdGE6CiAgICAgICAgICAgICBjYXNlIHJlY29yZFR5 cGVzLlJlc291cmNlRmluaXNoOgotICAgICAgICAgICAgICAgIGNvbnRlbnRIZWxwZXIuX2FwcGVu ZExpbmtSb3coV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJSZXNvdXJjZSIpLCB0aGlzLnVybCk7Cisg ICAgICAgICAgICAgICAgY29udGVudEhlbHBlci5fYXBwZW5kRWxlbWVudFJvdyhXZWJJbnNwZWN0 b3IuVUlTdHJpbmcoIlJlc291cmNlIiksIHRoaXMuX2xpbmtpZnlMb2NhdGlvbih0aGlzLnVybCkp OwogICAgICAgICAgICAgICAgIGlmICh0aGlzLmRhdGFbInJlcXVlc3RNZXRob2QiXSkKICAgICAg ICAgICAgICAgICAgICAgY29udGVudEhlbHBlci5fYXBwZW5kVGV4dFJvdyhXZWJJbnNwZWN0b3Iu VUlTdHJpbmcoIlJlcXVlc3QgTWV0aG9kIiksIHRoaXMuZGF0YVsicmVxdWVzdE1ldGhvZCJdKTsK ICAgICAgICAgICAgICAgICBpZiAodHlwZW9mIHRoaXMuZGF0YVsic3RhdHVzQ29kZSJdID09PSAi bnVtYmVyIikKQEAgLTEzMDYsNyArMTI5Myw3IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVs LkZvcm1hdHRlZFJlY29yZC5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAg ICAgICAgICAgICBjYXNlIHJlY29yZFR5cGVzLkV2YWx1YXRlU2NyaXB0OgogICAgICAgICAgICAg ICAgIGlmICh0aGlzLmRhdGEgJiYgdGhpcy51cmwpCi0gICAgICAgICAgICAgICAgICAgIGNvbnRl bnRIZWxwZXIuX2FwcGVuZExpbmtSb3coV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTY3JpcHQiKSwg dGhpcy51cmwsIHRoaXMuZGF0YVsibGluZU51bWJlciJdKTsKKyAgICAgICAgICAgICAgICAgICAg Y29udGVudEhlbHBlci5fYXBwZW5kRWxlbWVudFJvdyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNj cmlwdCIpLCB0aGlzLl9saW5raWZ5TG9jYXRpb24odGhpcy51cmwsIHRoaXMuZGF0YVsibGluZU51 bWJlciJdKSk7CiAgICAgICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgICAgICBjYXNlIHJlY29y ZFR5cGVzLlBhaW50OgogICAgICAgICAgICAgICAgIGNvbnRlbnRIZWxwZXIuX2FwcGVuZFRleHRS b3coV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJMb2NhdGlvbiIpLCBXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIiglZCwgJWQpIiwgdGhpcy5kYXRhWyJ4Il0sIHRoaXMuZGF0YVsieSJdKSk7CkBAIC0xMzIw LDE2ICsxMzA3LDE2IEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLkZvcm1hdHRlZFJlY29y ZC5wcm90b3R5cGUgPSB7CiAgICAgICAgIH0KIAogICAgICAgICBpZiAodGhpcy5zY3JpcHROYW1l ICYmIHRoaXMudHlwZSAhPT0gcmVjb3JkVHlwZXMuRnVuY3Rpb25DYWxsKQotICAgICAgICAgICAg Y29udGVudEhlbHBlci5fYXBwZW5kTGlua1JvdyhXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkZ1bmN0 aW9uIENhbGwiKSwgdGhpcy5zY3JpcHROYW1lLCB0aGlzLnNjcmlwdExpbmUpOworICAgICAgICAg ICAgY29udGVudEhlbHBlci5fYXBwZW5kRWxlbWVudFJvdyhXZWJJbnNwZWN0b3IuVUlTdHJpbmco IkZ1bmN0aW9uIENhbGwiKSwgdGhpcy5fbGlua2lmeVNjcmlwdExvY2F0aW9uKCkpOwogCiAgICAg ICAgIGlmICh0aGlzLnVzZWRIZWFwU2l6ZSkKICAgICAgICAgICAgIGNvbnRlbnRIZWxwZXIuX2Fw cGVuZFRleHRSb3coV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJVc2VkIEhlYXAgU2l6ZSIpLCBXZWJJ bnNwZWN0b3IuVUlTdHJpbmcoIiVzIG9mICVzIiwgTnVtYmVyLmJ5dGVzVG9TdHJpbmcodGhpcy51 c2VkSGVhcFNpemUpLCBOdW1iZXIuYnl0ZXNUb1N0cmluZyh0aGlzLnRvdGFsSGVhcFNpemUpKSk7 CiAKICAgICAgICAgaWYgKHRoaXMuY2FsbFNpdGVTdGFja1RyYWNlICYmIHRoaXMuY2FsbFNpdGVT dGFja1RyYWNlLmxlbmd0aCkKLSAgICAgICAgICAgIGNvbnRlbnRIZWxwZXIuX2FwcGVuZFN0YWNr VHJhY2UoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDYWxsIFNpdGUgc3RhY2siKSwgdGhpcy5jYWxs U2l0ZVN0YWNrVHJhY2UpOworICAgICAgICAgICAgY29udGVudEhlbHBlci5fYXBwZW5kU3RhY2tU cmFjZShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNhbGwgU2l0ZSBzdGFjayIpLCB0aGlzLmNhbGxT aXRlU3RhY2tUcmFjZSwgdGhpcy5fbGlua2lmeUNhbGxGcmFtZS5iaW5kKHRoaXMpKTsKIAogICAg ICAgICBpZiAodGhpcy5zdGFja1RyYWNlKQotICAgICAgICAgICAgY29udGVudEhlbHBlci5fYXBw ZW5kU3RhY2tUcmFjZShXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkNhbGwgU3RhY2siKSwgdGhpcy5z dGFja1RyYWNlKTsKKyAgICAgICAgICAgIGNvbnRlbnRIZWxwZXIuX2FwcGVuZFN0YWNrVHJhY2Uo V2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJDYWxsIFN0YWNrIiksIHRoaXMuc3RhY2tUcmFjZSwgdGhp cy5fbGlua2lmeUNhbGxGcmFtZS5iaW5kKHRoaXMpKTsKIAogICAgICAgICByZXR1cm4gY29udGVu dEhlbHBlci5fY29udGVudFRhYmxlOwogICAgIH0sCkBAIC0xMzQ1LDI2ICsxMzMyLDI2IEBAIFdl Ykluc3BlY3Rvci5UaW1lbGluZVBhbmVsLkZvcm1hdHRlZFJlY29yZC5wcm90b3R5cGUgPSB7CiAg ICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50LlJlY29yZFR5cGUuR0NF dmVudDoKICAgICAgICAgICAgICAgICByZXR1cm4gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCIlcyBj b2xsZWN0ZWQiLCBOdW1iZXIuYnl0ZXNUb1N0cmluZyh0aGlzLmRhdGFbInVzZWRIZWFwU2l6ZURl bHRhIl0pKTsKICAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQWdlbnQuUmVj b3JkVHlwZS5UaW1lckZpcmU6Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMuc2NyaXB0TmFt ZSA/IHRoaXMuX3BhbmVsLl9saW5raWZ5TG9jYXRpb24odGhpcy5zY3JpcHROYW1lLCB0aGlzLnNj cmlwdExpbmUsIDApIDogdGhpcy5kYXRhWyJ0aW1lcklkIl07CisgICAgICAgICAgICAgICAgcmV0 dXJuIHRoaXMuX2xpbmtpZnlTY3JpcHRMb2NhdGlvbih0aGlzLmRhdGFbInRpbWVySWQiXSk7CiAg ICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50LlJlY29yZFR5cGUuRnVu Y3Rpb25DYWxsOgotICAgICAgICAgICAgICAgIHJldHVybiB0aGlzLnNjcmlwdE5hbWUgPyB0aGlz Ll9wYW5lbC5fbGlua2lmeUxvY2F0aW9uKHRoaXMuc2NyaXB0TmFtZSwgdGhpcy5zY3JpcHRMaW5l LCAwKSA6IG51bGw7CisgICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMuX2xpbmtpZnlTY3JpcHRM b2NhdGlvbigpOwogICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2VudC5S ZWNvcmRUeXBlLkZpcmVBbmltYXRpb25GcmFtZToKLSAgICAgICAgICAgICAgICByZXR1cm4gdGhp cy5zY3JpcHROYW1lID8gdGhpcy5fcGFuZWwuX2xpbmtpZnlMb2NhdGlvbih0aGlzLnNjcmlwdE5h bWUsIHRoaXMuc2NyaXB0TGluZSwgMCkgOiB0aGlzLmRhdGFbImlkIl07CisgICAgICAgICAgICAg ICAgcmV0dXJuIHRoaXMuX2xpbmtpZnlTY3JpcHRMb2NhdGlvbih0aGlzLmRhdGFbImlkIl0pOwog ICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2VudC5SZWNvcmRUeXBlLkV2 ZW50RGlzcGF0Y2g6CiAgICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMuZGF0YSA/IHRoaXMuZGF0 YVsidHlwZSJdIDogbnVsbDsKICAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5l QWdlbnQuUmVjb3JkVHlwZS5QYWludDoKICAgICAgICAgICAgICAgICByZXR1cm4gdGhpcy5kYXRh WyJ3aWR0aCJdICsgIlx1MjAwOVx1MDBkN1x1MjAwOSIgKyB0aGlzLmRhdGFbImhlaWdodCJdOwog ICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVBZ2VudC5SZWNvcmRUeXBlLlRp bWVySW5zdGFsbDoKICAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQWdlbnQu UmVjb3JkVHlwZS5UaW1lclJlbW92ZToKLSAgICAgICAgICAgICAgICByZXR1cm4gdGhpcy5zdGFj a1RyYWNlID8gdGhpcy5fcGFuZWwuX2xpbmtpZnlDYWxsRnJhbWUodGhpcy5zdGFja1RyYWNlWzBd KSA6IHRoaXMuZGF0YVsidGltZXJJZCJdOworICAgICAgICAgICAgICAgIHJldHVybiB0aGlzLl9s aW5raWZ5VG9wQ2FsbEZyYW1lKHRoaXMuZGF0YVsidGltZXJJZCJdKTsKICAgICAgICAgICAgIGNh c2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQWdlbnQuUmVjb3JkVHlwZS5SZXF1ZXN0QW5pbWF0aW9u RnJhbWU6CiAgICAgICAgICAgICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50LlJlY29y ZFR5cGUuQ2FuY2VsQW5pbWF0aW9uRnJhbWU6Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMu c3RhY2tUcmFjZSA/IHRoaXMuX3BhbmVsLl9saW5raWZ5Q2FsbEZyYW1lKHRoaXMuc3RhY2tUcmFj ZVswXSkgOiB0aGlzLmRhdGFbImlkIl07CisgICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMuX2xp bmtpZnlUb3BDYWxsRnJhbWUodGhpcy5kYXRhWyJpZCJdKTsKICAgICAgICAgICAgIGNhc2UgV2Vi SW5zcGVjdG9yLlRpbWVsaW5lQWdlbnQuUmVjb3JkVHlwZS5QYXJzZUhUTUw6CiAgICAgICAgICAg ICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50LlJlY29yZFR5cGUuUmVjYWxjdWxhdGVT dHlsZXM6Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMuc3RhY2tUcmFjZSA/IHRoaXMuX3Bh bmVsLl9saW5raWZ5Q2FsbEZyYW1lKHRoaXMuc3RhY2tUcmFjZVswXSkgOiBudWxsOworICAgICAg ICAgICAgICAgIHJldHVybiB0aGlzLl9saW5raWZ5VG9wQ2FsbEZyYW1lKCk7CiAgICAgICAgICAg ICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50LlJlY29yZFR5cGUuRXZhbHVhdGVTY3Jp cHQ6Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHRoaXMudXJsID8gdGhpcy5fcGFuZWwuX2xpbmtp ZnlMb2NhdGlvbih0aGlzLnVybCwgdGhpcy5kYXRhWyJsaW5lTnVtYmVyIl0sIDApIDogbnVsbDsK KyAgICAgICAgICAgICAgICByZXR1cm4gdGhpcy51cmwgPyB0aGlzLl9saW5raWZ5TG9jYXRpb24o dGhpcy51cmwsIHRoaXMuZGF0YVsibGluZU51bWJlciJdLCAwKSA6IG51bGw7CiAgICAgICAgICAg ICBjYXNlIFdlYkluc3BlY3Rvci5UaW1lbGluZUFnZW50LlJlY29yZFR5cGUuWEhSUmVhZHlTdGF0 ZUNoYW5nZToKICAgICAgICAgICAgIGNhc2UgV2ViSW5zcGVjdG9yLlRpbWVsaW5lQWdlbnQuUmVj b3JkVHlwZS5YSFJMb2FkOgogICAgICAgICAgICAgY2FzZSBXZWJJbnNwZWN0b3IuVGltZWxpbmVB Z2VudC5SZWNvcmRUeXBlLlNjaGVkdWxlUmVzb3VyY2VSZXF1ZXN0OgpAQCAtMTM4MCw2ICsxMzY3 LDQwIEBAIFdlYkluc3BlY3Rvci5UaW1lbGluZVBhbmVsLkZvcm1hdHRlZFJlY29yZC5wcm90b3R5 cGUgPSB7CiAgICAgICAgIH0KICAgICB9LAogCisgICAgLyoqCisgICAgICogQHBhcmFtIHtzdHJp bmd9IHVybAorICAgICAqIEBwYXJhbSB7bnVtYmVyPX0gbGluZU51bWJlcgorICAgICAqIEBwYXJh bSB7bnVtYmVyPX0gY29sdW1uTnVtYmVyCisgICAgICovCisgICAgX2xpbmtpZnlMb2NhdGlvbjog ZnVuY3Rpb24odXJsLCBsaW5lTnVtYmVyLCBjb2x1bW5OdW1iZXIpCisgICAgeworICAgICAgICAv LyBGSVhNRSg2MjcyNSk6IHN0YWNrIHRyYWNlIGxpbmUvY29sdW1uIG51bWJlcnMgYXJlIG9uZS1i YXNlZC4KKyAgICAgICAgbGluZU51bWJlciA9IGxpbmVOdW1iZXIgPyBsaW5lTnVtYmVyIC0gMSA6 IGxpbmVOdW1iZXI7CisgICAgICAgIGNvbHVtbk51bWJlciA9IGNvbHVtbk51bWJlciA/IGNvbHVt bk51bWJlciAtIDEgOiAwOworICAgICAgICByZXR1cm4gdGhpcy5fbGlua2lmaWVyLmxpbmtpZnlM b2NhdGlvbih1cmwsIGxpbmVOdW1iZXIsIGNvbHVtbk51bWJlciwgInRpbWVsaW5lLWRldGFpbHMi KTsKKyAgICB9LAorCisgICAgX2xpbmtpZnlDYWxsRnJhbWU6IGZ1bmN0aW9uKGNhbGxGcmFtZSkK KyAgICB7CisgICAgICAgIHJldHVybiB0aGlzLl9saW5raWZ5TG9jYXRpb24oY2FsbEZyYW1lLnVy bCwgY2FsbEZyYW1lLmxpbmVOdW1iZXIsIGNhbGxGcmFtZS5jb2x1bW5OdW1iZXIpOworICAgIH0s CisKKyAgICAvKioKKyAgICAgKiBAcGFyYW0ge3N0cmluZz19IGRlZmF1bHRWYWx1ZQorICAgICAq LworICAgIF9saW5raWZ5VG9wQ2FsbEZyYW1lOiBmdW5jdGlvbihkZWZhdWx0VmFsdWUpCisgICAg eworICAgICAgICByZXR1cm4gdGhpcy5zdGFja1RyYWNlID8gdGhpcy5fbGlua2lmeUNhbGxGcmFt ZSh0aGlzLnN0YWNrVHJhY2VbMF0pIDogZGVmYXVsdFZhbHVlOworICAgIH0sCisKKyAgICAvKioK KyAgICAgKiBAcGFyYW0ge3N0cmluZz19IGRlZmF1bHRWYWx1ZQorICAgICAqLworICAgIF9saW5r aWZ5U2NyaXB0TG9jYXRpb246IGZ1bmN0aW9uKGRlZmF1bHRWYWx1ZSkKKyAgICB7CisgICAgICAg IHJldHVybiB0aGlzLnNjcmlwdE5hbWUgPyB0aGlzLl9saW5raWZ5TG9jYXRpb24odGhpcy5zY3Jp cHROYW1lLCB0aGlzLnNjcmlwdExpbmUsIDApIDogZGVmYXVsdFZhbHVlOworICAgIH0sCisKICAg ICBfY2FsY3VsYXRlQWdncmVnYXRlZFN0YXRzOiBmdW5jdGlvbihjYXRlZ29yaWVzKQogICAgIHsK ICAgICAgICAgdGhpcy5fYWdncmVnYXRlZFN0YXRzID0ge307CkBAIC0xNDA1LDkgKzE0MjYsOCBA QCBXZWJJbnNwZWN0b3IuVGltZWxpbmVQYW5lbC5Gb3JtYXR0ZWRSZWNvcmQucHJvdG90eXBlID0g ewogLyoqCiAgKiBAY29uc3RydWN0b3IKICAqLwotV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwu UG9wdXBDb250ZW50SGVscGVyID0gZnVuY3Rpb24odGl0bGUsIHBhbmVsKQorV2ViSW5zcGVjdG9y LlRpbWVsaW5lUGFuZWwuUG9wdXBDb250ZW50SGVscGVyID0gZnVuY3Rpb24odGl0bGUpCiB7Ci0g ICAgdGhpcy5fcGFuZWwgPSBwYW5lbDsKICAgICB0aGlzLl9jb250ZW50VGFibGUgPSBkb2N1bWVu dC5jcmVhdGVFbGVtZW50KCJ0YWJsZSIpOzsKICAgICB2YXIgdGl0bGVDZWxsID0gdGhpcy5fY3Jl YXRlQ2VsbChXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIiVzIC0gRGV0YWlscyIsIHRpdGxlKSwgInRp bWVsaW5lLWRldGFpbHMtdGl0bGUiKTsKICAgICB0aXRsZUNlbGwuY29sU3BhbiA9IDI7CkBAIC0x NDU3LDE2ICsxNDc3LDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFuZWwuUG9wdXBDb250ZW50 SGVscGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgdGhpcy5fY29udGVudFRhYmxlLmFwcGVuZENo aWxkKHJvdyk7CiAgICAgfSwKIAotICAgIC8qKgotICAgICAqIEBwYXJhbSB7bnVtYmVyPX0gc2Ny aXB0TGluZQotICAgICAqLwotICAgIF9hcHBlbmRMaW5rUm93OiBmdW5jdGlvbih0aXRsZSwgc2Ny aXB0TmFtZSwgc2NyaXB0TGluZSkKLSAgICB7Ci0gICAgICAgIHZhciBsaW5rID0gdGhpcy5fcGFu ZWwuX2xpbmtpZnlMb2NhdGlvbihzY3JpcHROYW1lLCBzY3JpcHRMaW5lLCAwLCAidGltZWxpbmUt ZGV0YWlscyIpOwotICAgICAgICB0aGlzLl9hcHBlbmRFbGVtZW50Um93KHRpdGxlLCBsaW5rKTsK LSAgICB9LAotCi0gICAgX2FwcGVuZFN0YWNrVHJhY2U6IGZ1bmN0aW9uKHRpdGxlLCBzdGFja1Ry YWNlKQorICAgIF9hcHBlbmRTdGFja1RyYWNlOiBmdW5jdGlvbih0aXRsZSwgc3RhY2tUcmFjZSwg Y2FsbEZyYW1lTGlua2lmaWVyKQogICAgIHsKICAgICAgICAgdGhpcy5fYXBwZW5kVGV4dFJvdygi IiwgIiIpOwogICAgICAgICB2YXIgZnJhbWVzVGFibGUgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50 KCJ0YWJsZSIpOwpAQCAtMTQ3Nyw3ICsxNDg4LDcgQEAgV2ViSW5zcGVjdG9yLlRpbWVsaW5lUGFu ZWwuUG9wdXBDb250ZW50SGVscGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJvdy5hcHBl bmRDaGlsZCh0aGlzLl9jcmVhdGVDZWxsKHN0YWNrRnJhbWUuZnVuY3Rpb25OYW1lID8gc3RhY2tG cmFtZS5mdW5jdGlvbk5hbWUgOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIihhbm9ueW1vdXMgZnVu Y3Rpb24pIiksICJ0aW1lbGluZS1mdW5jdGlvbi1uYW1lIikpOwogICAgICAgICAgICAgcm93LmFw cGVuZENoaWxkKHRoaXMuX2NyZWF0ZUNlbGwoIiBAICIpKTsKICAgICAgICAgICAgIHZhciBsaW5r Q2VsbCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoInRkIik7Ci0gICAgICAgICAgICB2YXIgdXJs RWxlbWVudCA9IHRoaXMuX3BhbmVsLl9saW5raWZ5Q2FsbEZyYW1lKHN0YWNrRnJhbWUpOworICAg ICAgICAgICAgdmFyIHVybEVsZW1lbnQgPSBjYWxsRnJhbWVMaW5raWZpZXIoc3RhY2tGcmFtZSk7 CiAgICAgICAgICAgICBsaW5rQ2VsbC5hcHBlbmRDaGlsZCh1cmxFbGVtZW50KTsKICAgICAgICAg ICAgIHJvdy5hcHBlbmRDaGlsZChsaW5rQ2VsbCk7CiAgICAgICAgICAgICBmcmFtZXNUYWJsZS5h cHBlbmRDaGlsZChyb3cpOwo=