47668 2010-10-14 06:31:10 -0700 Web Inspector: Move load and dom content event timers into InspectorController. 2010-10-14 06:48:17 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 pfeldman pfeldman apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 294082 0 pfeldman 2010-10-14 06:31:10 -0700 There is no need for them to be in InspectorResource. 294083 1 70734 pfeldman 2010-10-14 06:35:16 -0700 Created attachment 70734 [PATCH] Proposed change. 294087 2 pfeldman 2010-10-14 06:48:17 -0700 M WebCore/ChangeLog M WebCore/inspector/CodeGeneratorInspector.pm M WebCore/inspector/Inspector.idl M WebCore/inspector/InspectorController.cpp M WebCore/inspector/InspectorController.h M WebCore/inspector/InspectorResource.cpp M WebCore/inspector/InspectorResource.h M WebCore/inspector/front-end/inspector.css M WebCore/inspector/front-end/inspector.js Committed r69763 70734 2010-10-14 06:35:16 -0700 2010-10-14 06:39:30 -0700 [PATCH] Proposed change. load_event text/plain 10559 pfeldman ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NjY4OGQ0My4uZmZjYWQyYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyOSBAQAogMjAxMC0xMC0xNCAgUGF2ZWwgRmVsZG1h biAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBNb3ZlIGxvYWQgYW5kIGRvbSBjb250 ZW50IGV2ZW50IHRpbWVycyBpbnRvIEluc3BlY3RvckNvbnRyb2xsZXIuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NzY2OAorCisgICAgICAgICogaW5z cGVjdG9yL0NvZGVHZW5lcmF0b3JJbnNwZWN0b3IucG06CisgICAgICAgICogaW5zcGVjdG9yL0lu c3BlY3Rvci5pZGw6CisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6SW5zcGVjdG9yQ29udHJv bGxlcik6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JDb250cm9sbGVyOjpwb3B1bGF0ZVNj cmlwdE9iamVjdHMpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yQ29udHJvbGxlcjo6bWFp blJlc291cmNlRmlyZWRET01Db250ZW50RXZlbnQpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVj dG9yQ29udHJvbGxlcjo6bWFpblJlc291cmNlRmlyZWRMb2FkRXZlbnQpOgorICAgICAgICAqIGlu c3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmg6CisgICAgICAgICogaW5zcGVjdG9yL0luc3Bl Y3RvclJlc291cmNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclJlc291cmNlOjpJ bnNwZWN0b3JSZXNvdXJjZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JSZXNvdXJjZTo6 dXBkYXRlU2NyaXB0T2JqZWN0KToKKyAgICAgICAgKiBpbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3Vy Y2UuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rvci5qczoKKyAgICAg ICAgKFdlYkluc3BlY3Rvci51cGRhdGVSZXNvdXJjZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3Iu ZG9tQ29udGVudEV2ZW50RmlyZWQpOgorICAgICAgICAoV2ViSW5zcGVjdG9yLmxvYWRFdmVudEZp cmVkKToKKworMjAxMC0xMC0xNCAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9y Zz4KKwogICAgICAgICBOb3QgcmV2aWV3ZWQuIFJlLWxhbmRpbmcgcjY5NzU3LgogCiAyMDEwLTEw LTE0ICBQYXZlbCBQb2Rpdmlsb3YgIDxwb2Rpdmlsb3ZAY2hyb21pdW0ub3JnPgpkaWZmIC0tZ2l0 IGEvV2ViQ29yZS9pbnNwZWN0b3IvQ29kZUdlbmVyYXRvckluc3BlY3Rvci5wbSBiL1dlYkNvcmUv aW5zcGVjdG9yL0NvZGVHZW5lcmF0b3JJbnNwZWN0b3IucG0KaW5kZXggODBlMjQzYi4uNDAyZGY4 YiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvQ29kZUdlbmVyYXRvckluc3BlY3Rvci5w bQorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9Db2RlR2VuZXJhdG9ySW5zcGVjdG9yLnBtCkBAIC0x MTQsNiArMTE0LDE0IEBAICR0eXBlVHJhbnNmb3JteyJ1bnNpZ25lZCBpbnQifSA9IHsKICAgICAi aGVhZGVyIiA9PiAiIiwKICAgICAiSlNPTlR5cGUiID0+ICJOdW1iZXIiCiB9OworJHR5cGVUcmFu c2Zvcm17ImRvdWJsZSJ9ID0geworICAgICJwYXJhbSIgPT4gImRvdWJsZSIsCisgICAgInZhcmlh YmxlIiA9PiAiZG91YmxlIiwKKyAgICAiZGVmYXVsdFZhbHVlIiA9PiAiMC4wIiwKKyAgICAiZm9y d2FyZCIgPT4gIiIsCisgICAgImhlYWRlciIgPT4gIiIsCisgICAgIkpTT05UeXBlIiA9PiAiTnVt YmVyIgorfTsKICR0eXBlVHJhbnNmb3JteyJib29sZWFuIn0gPSB7CiAgICAgInBhcmFtIiA9PiAi Ym9vbCIsCiAgICAgInZhcmlhYmxlIj0+ICJib29sIiwKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3Rvci5pZGwgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuaWRsCmlu ZGV4IGU0MDA2MDQuLjdjZjVhMTUgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL0luc3Bl Y3Rvci5pZGwKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yLmlkbApAQCAtNDUsNyAr NDUsOSBAQCBtb2R1bGUgY29yZSB7CiAgICAgICAgIFtub3RpZnldIHZvaWQgZGlkQ29tbWl0TG9h ZCgpOwogICAgICAgICBbbm90aWZ5XSB2b2lkIGV2YWx1YXRlRm9yVGVzdEluRnJvbnRlbmQob3V0 IGxvbmcgdGVzdENhbGxJZCwgb3V0IFN0cmluZyBzY3JpcHQpOwogICAgICAgICBbbm90aWZ5XSB2 b2lkIGRpc2Nvbm5lY3RGcm9tQmFja2VuZCgpOworICAgICAgICBbbm90aWZ5XSB2b2lkIGRvbUNv bnRlbnRFdmVudEZpcmVkKG91dCBkb3VibGUgdGltZSk7CiAgICAgICAgIFtub3RpZnldIHZvaWQg aW5zcGVjdGVkVVJMQ2hhbmdlZChvdXQgU3RyaW5nIHVybCk7CisgICAgICAgIFtub3RpZnldIHZv aWQgbG9hZEV2ZW50RmlyZWQob3V0IGRvdWJsZSB0aW1lKTsKICAgICAgICAgW25vdGlmeV0gdm9p ZCByZW1vdmVSZXNvdXJjZShvdXQgdW5zaWduZWQgbG9uZyBpZGVudGlmaWVyKTsKICAgICAgICAg W25vdGlmeV0gdm9pZCByZXNldCgpOwogICAgICAgICBbbm90aWZ5XSB2b2lkIHJlc2V0UHJvZmls ZXNQYW5lbCgpOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yQ29udHJv bGxlci5jcHAgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmNwcAppbmRl eCBhZjBiMzgzLi4zYmQ5NzljIDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JDb250cm9sbGVyLmNwcAorKysgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9s bGVyLmNwcApAQCAtMTU4LDYgKzE1OCw4IEBAIEluc3BlY3RvckNvbnRyb2xsZXI6Okluc3BlY3Rv ckNvbnRyb2xsZXIoUGFnZSogcGFnZSwgSW5zcGVjdG9yQ2xpZW50KiBjbGllbnQpCiAgICAgLCBt X2NsaWVudChjbGllbnQpCiAgICAgLCBtX29wZW5pbmdGcm9udGVuZChmYWxzZSkKICAgICAsIG1f Y3NzU3RvcmUobmV3IEluc3BlY3RvckNTU1N0b3JlKHRoaXMpKQorICAgICwgbV9sb2FkRXZlbnRU aW1lKC0xLjApCisgICAgLCBtX2RvbUNvbnRlbnRFdmVudFRpbWUoLTEuMCkKICAgICAsIG1fZXhw aXJlZENvbnNvbGVNZXNzYWdlQ291bnQoMCkKICAgICAsIG1fc2hvd0FmdGVyVmlzaWJsZShsYXN0 QWN0aXZlUGFuZWwpCiAgICAgLCBtX3Nlc3Npb25TZXR0aW5ncyhJbnNwZWN0b3JPYmplY3Q6OmNy ZWF0ZSgpKQpAQCAtNjYwLDYgKzY2MiwxMCBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6OnBv cHVsYXRlU2NyaXB0T2JqZWN0cygpCiAgICAgUmVzb3VyY2VzTWFwOjppdGVyYXRvciByZXNvdXJj ZXNFbmQgPSBtX3Jlc291cmNlcy5lbmQoKTsKICAgICBmb3IgKFJlc291cmNlc01hcDo6aXRlcmF0 b3IgaXQgPSBtX3Jlc291cmNlcy5iZWdpbigpOyBpdCAhPSByZXNvdXJjZXNFbmQ7ICsraXQpCiAg ICAgICAgIGl0LT5zZWNvbmQtPnVwZGF0ZVNjcmlwdE9iamVjdChtX2Zyb250ZW5kLmdldCgpKTsK KyAgICBpZiAobV9kb21Db250ZW50RXZlbnRUaW1lICE9IC0xLjApCisgICAgICAgIG1fZnJvbnRl bmQtPmRvbUNvbnRlbnRFdmVudEZpcmVkKG1fZG9tQ29udGVudEV2ZW50VGltZSk7CisgICAgaWYg KG1fbG9hZEV2ZW50VGltZSAhPSAtMS4wKQorICAgICAgICBtX2Zyb250ZW5kLT5sb2FkRXZlbnRG aXJlZChtX2xvYWRFdmVudFRpbWUpOwogCiAgICAgbV9kb21BZ2VudC0+c2V0RG9jdW1lbnQobV9p bnNwZWN0ZWRQYWdlLT5tYWluRnJhbWUoKS0+ZG9jdW1lbnQoKSk7CiAKQEAgLTk3MCwxMyArOTc2 LDExIEBAIHZvaWQgSW5zcGVjdG9yQ29udHJvbGxlcjo6bWFpblJlc291cmNlRmlyZWRET01Db250 ZW50RXZlbnQoRG9jdW1lbnRMb2FkZXIqIGxvYWRlCiAgICAgaWYgKCFlbmFibGVkKCkgfHwgIWlz TWFpblJlc291cmNlTG9hZGVyKGxvYWRlciwgdXJsKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAg aWYgKG1fbWFpblJlc291cmNlKSB7Ci0gICAgICAgIG1fbWFpblJlc291cmNlLT5tYXJrRE9NQ29u dGVudEV2ZW50VGltZSgpOwotICAgICAgICBpZiAobV90aW1lbGluZUFnZW50KQotICAgICAgICAg ICAgbV90aW1lbGluZUFnZW50LT5kaWRNYXJrRE9NQ29udGVudEV2ZW50KCk7Ci0gICAgICAgIGlm IChtX2Zyb250ZW5kKQotICAgICAgICAgICAgbV9tYWluUmVzb3VyY2UtPnVwZGF0ZVNjcmlwdE9i amVjdChtX2Zyb250ZW5kLmdldCgpKTsKLSAgICB9CisgICAgbV9kb21Db250ZW50RXZlbnRUaW1l ID0gY3VycmVudFRpbWUoKTsKKyAgICBpZiAobV90aW1lbGluZUFnZW50KQorICAgICAgICBtX3Rp bWVsaW5lQWdlbnQtPmRpZE1hcmtET01Db250ZW50RXZlbnQoKTsKKyAgICBpZiAobV9mcm9udGVu ZCkKKyAgICAgICAgbV9mcm9udGVuZC0+ZG9tQ29udGVudEV2ZW50RmlyZWQobV9kb21Db250ZW50 RXZlbnRUaW1lKTsKIH0KIAogdm9pZCBJbnNwZWN0b3JDb250cm9sbGVyOjptYWluUmVzb3VyY2VG aXJlZExvYWRFdmVudChEb2N1bWVudExvYWRlciogbG9hZGVyLCBjb25zdCBLVVJMJiB1cmwpCkBA IC05ODQsMTMgKzk4OCwxMSBAQCB2b2lkIEluc3BlY3RvckNvbnRyb2xsZXI6Om1haW5SZXNvdXJj ZUZpcmVkTG9hZEV2ZW50KERvY3VtZW50TG9hZGVyKiBsb2FkZXIsIGNvbgogICAgIGlmICghZW5h YmxlZCgpIHx8ICFpc01haW5SZXNvdXJjZUxvYWRlcihsb2FkZXIsIHVybCkpCiAgICAgICAgIHJl dHVybjsKIAotICAgIGlmIChtX21haW5SZXNvdXJjZSkgewotICAgICAgICBtX21haW5SZXNvdXJj ZS0+bWFya0xvYWRFdmVudFRpbWUoKTsKLSAgICAgICAgaWYgKG1fdGltZWxpbmVBZ2VudCkKLSAg ICAgICAgICAgIG1fdGltZWxpbmVBZ2VudC0+ZGlkTWFya0xvYWRFdmVudCgpOwotICAgICAgICBp ZiAobV9mcm9udGVuZCkKLSAgICAgICAgICAgIG1fbWFpblJlc291cmNlLT51cGRhdGVTY3JpcHRP YmplY3QobV9mcm9udGVuZC5nZXQoKSk7Ci0gICAgfQorICAgIG1fbG9hZEV2ZW50VGltZSA9IGN1 cnJlbnRUaW1lKCk7CisgICAgaWYgKG1fdGltZWxpbmVBZ2VudCkKKyAgICAgICAgbV90aW1lbGlu ZUFnZW50LT5kaWRNYXJrTG9hZEV2ZW50KCk7CisgICAgaWYgKG1fZnJvbnRlbmQpCisgICAgICAg IG1fZnJvbnRlbmQtPmxvYWRFdmVudEZpcmVkKG1fbG9hZEV2ZW50VGltZSk7CiB9CiAKIGJvb2wg SW5zcGVjdG9yQ29udHJvbGxlcjo6aXNNYWluUmVzb3VyY2VMb2FkZXIoRG9jdW1lbnRMb2FkZXIq IGxvYWRlciwgY29uc3QgS1VSTCYgcmVxdWVzdFVybCkKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvckNvbnRyb2xsZXIuaCBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv ckNvbnRyb2xsZXIuaAppbmRleCBiMjA4N2JhLi4zMjdhY2FkIDEwMDY0NAotLS0gYS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JDb250cm9sbGVyLmgKKysrIGIvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yQ29udHJvbGxlci5oCkBAIC0zNTUsNiArMzU1LDggQEAgcHJpdmF0ZToKICAgICBS ZXNvdXJjZXNNYXAgbV9yZXNvdXJjZXM7CiAgICAgSGFzaFNldDxTdHJpbmc+IG1fa25vd25SZXNv dXJjZXM7CiAgICAgRnJhbWVSZXNvdXJjZXNNYXAgbV9mcmFtZVJlc291cmNlczsKKyAgICBkb3Vi bGUgbV9sb2FkRXZlbnRUaW1lOworICAgIGRvdWJsZSBtX2RvbUNvbnRlbnRFdmVudFRpbWU7CiAg ICAgVmVjdG9yPE93blB0cjxDb25zb2xlTWVzc2FnZT4gPiBtX2NvbnNvbGVNZXNzYWdlczsKICAg ICB1bnNpZ25lZCBtX2V4cGlyZWRDb25zb2xlTWVzc2FnZUNvdW50OwogICAgIEhhc2hNYXA8U3Ry aW5nLCBkb3VibGU+IG1fdGltZXM7CmRpZmYgLS1naXQgYS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JSZXNvdXJjZS5jcHAgYi9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZS5j cHAKaW5kZXggNmJjM2NmYi4uNWVlNGE5NSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yUmVzb3VyY2UuY3BwCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJl c291cmNlLmNwcApAQCAtODgsOCArODgsNiBAQCBJbnNwZWN0b3JSZXNvdXJjZTo6SW5zcGVjdG9y UmVzb3VyY2UodW5zaWduZWQgbG9uZyBpZGVudGlmaWVyLCBEb2N1bWVudExvYWRlciogbAogICAg ICwgbV9zdGFydFRpbWUoLTEuMCkKICAgICAsIG1fcmVzcG9uc2VSZWNlaXZlZFRpbWUoLTEuMCkK ICAgICAsIG1fZW5kVGltZSgtMS4wKQotICAgICwgbV9sb2FkRXZlbnRUaW1lKC0xLjApCi0gICAg LCBtX2RvbUNvbnRlbnRFdmVudFRpbWUoLTEuMCkKICAgICAsIG1fY29ubmVjdGlvbklEKDApCiAg ICAgLCBtX2Nvbm5lY3Rpb25SZXVzZWQoZmFsc2UpCiAgICAgLCBtX2lzTWFpblJlc291cmNlKGZh bHNlKQpAQCAtMzIyLDEwICszMjAsNiBAQCB2b2lkIEluc3BlY3RvclJlc291cmNlOjp1cGRhdGVT Y3JpcHRPYmplY3QoSW5zcGVjdG9yRnJvbnRlbmQqIGZyb250ZW5kKQogICAgICAgICAgICAganNv bk9iamVjdC0+c2V0TnVtYmVyKCJyZXNwb25zZVJlY2VpdmVkVGltZSIsIG1fcmVzcG9uc2VSZWNl aXZlZFRpbWUpOwogICAgICAgICBpZiAobV9lbmRUaW1lID4gMCkKICAgICAgICAgICAgIGpzb25P YmplY3QtPnNldE51bWJlcigiZW5kVGltZSIsIG1fZW5kVGltZSk7Ci0gICAgICAgIGlmIChtX2xv YWRFdmVudFRpbWUgPiAwKQotICAgICAgICAgICAganNvbk9iamVjdC0+c2V0TnVtYmVyKCJsb2Fk RXZlbnRUaW1lIiwgbV9sb2FkRXZlbnRUaW1lKTsKLSAgICAgICAgaWYgKG1fZG9tQ29udGVudEV2 ZW50VGltZSA+IDApCi0gICAgICAgICAgICBqc29uT2JqZWN0LT5zZXROdW1iZXIoImRvbUNvbnRl bnRFdmVudFRpbWUiLCBtX2RvbUNvbnRlbnRFdmVudFRpbWUpOwogICAgICAgICBqc29uT2JqZWN0 LT5zZXRCb29sZWFuKCJkaWRUaW1pbmdDaGFuZ2UiLCB0cnVlKTsKICAgICB9CiAKQEAgLTQzMiwx OCArNDI2LDYgQEAgdm9pZCBJbnNwZWN0b3JSZXNvdXJjZTo6ZW5kVGltaW5nKGRvdWJsZSBhY3R1 YWxFbmRUaW1lKQogICAgIG1fY2hhbmdlcy5zZXQoQ29tcGxldGlvbkNoYW5nZSk7CiB9CiAKLXZv aWQgSW5zcGVjdG9yUmVzb3VyY2U6Om1hcmtET01Db250ZW50RXZlbnRUaW1lKCkKLXsKLSAgICBt X2RvbUNvbnRlbnRFdmVudFRpbWUgPSBjdXJyZW50VGltZSgpOwotICAgIG1fY2hhbmdlcy5zZXQo VGltaW5nQ2hhbmdlKTsKLX0KLQotdm9pZCBJbnNwZWN0b3JSZXNvdXJjZTo6bWFya0xvYWRFdmVu dFRpbWUoKQotewotICAgIG1fbG9hZEV2ZW50VGltZSA9IGN1cnJlbnRUaW1lKCk7Ci0gICAgbV9j aGFuZ2VzLnNldChUaW1pbmdDaGFuZ2UpOwotfQotCiB2b2lkIEluc3BlY3RvclJlc291cmNlOjpt YXJrRmFpbGVkKCkKIHsKICAgICBtX2ZhaWxlZCA9IHRydWU7CmRpZmYgLS1naXQgYS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZS5oIGIvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVj dG9yUmVzb3VyY2UuaAppbmRleCBkY2NmM2IyLi5hYTYwMDFmIDEwMDY0NAotLS0gYS9XZWJDb3Jl L2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZS5oCisrKyBiL1dlYkNvcmUvaW5zcGVjdG9yL0lu c3BlY3RvclJlc291cmNlLmgKQEAgLTExNCw4ICsxMTQsNiBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7 CiAgICAgICAgIFN0cmluZyByZXF1ZXN0Rm9ybURhdGEoKSBjb25zdCB7IHJldHVybiBtX3JlcXVl c3RGb3JtRGF0YTsgfQogCiAgICAgICAgIHZvaWQgc3RhcnRUaW1pbmcoKTsKLSAgICAgICAgdm9p ZCBtYXJrTG9hZEV2ZW50VGltZSgpOwotICAgICAgICB2b2lkIG1hcmtET01Db250ZW50RXZlbnRU aW1lKCk7CiAgICAgICAgIHZvaWQgZW5kVGltaW5nKGRvdWJsZSBhY3R1YWxFbmRUaW1lKTsKIAog ICAgICAgICB2b2lkIG1hcmtGYWlsZWQoKTsKQEAgLTE4Myw4ICsxODEsNiBAQCBuYW1lc3BhY2Ug V2ViQ29yZSB7CiAgICAgICAgIGRvdWJsZSBtX3N0YXJ0VGltZTsKICAgICAgICAgZG91YmxlIG1f cmVzcG9uc2VSZWNlaXZlZFRpbWU7CiAgICAgICAgIGRvdWJsZSBtX2VuZFRpbWU7Ci0gICAgICAg IGRvdWJsZSBtX2xvYWRFdmVudFRpbWU7Ci0gICAgICAgIGRvdWJsZSBtX2RvbUNvbnRlbnRFdmVu dFRpbWU7CiAgICAgICAgIHVuc2lnbmVkIG1fY29ubmVjdGlvbklEOwogICAgICAgICBib29sIG1f Y29ubmVjdGlvblJldXNlZDsKICAgICAgICAgUmVmUHRyPFJlc291cmNlTG9hZFRpbWluZz4gbV9s b2FkVGltaW5nOwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3Bl Y3Rvci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXgg ODBlMjhhNS4uNjlkNmZjNyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L2luc3BlY3Rvci5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9y LmpzCkBAIC0xMjkyLDMxICsxMjkyLDI5IEBAIFdlYkluc3BlY3Rvci51cGRhdGVSZXNvdXJjZSA9 IGZ1bmN0aW9uKHBheWxvYWQpCiAgICAgICAgICAgICByZXNvdXJjZS5yZXNwb25zZVJlY2VpdmVk VGltZSA9IHBheWxvYWQucmVzcG9uc2VSZWNlaXZlZFRpbWU7CiAgICAgICAgIGlmIChwYXlsb2Fk LmVuZFRpbWUpCiAgICAgICAgICAgICByZXNvdXJjZS5lbmRUaW1lID0gcGF5bG9hZC5lbmRUaW1l OwotCi0gICAgICAgIGlmIChwYXlsb2FkLmxvYWRFdmVudFRpbWUpIHsKLSAgICAgICAgICAgIC8v IFRoaXMgbG9hZEV2ZW50VGltZSBpcyBmb3IgdGhlIG1haW4gcmVzb3VyY2UsIGFuZCB3ZSB3YW50 IHRvIHNob3cgaXQKLSAgICAgICAgICAgIC8vIGZvciBhbGwgcmVzb3VyY2VzIG9uIHRoaXMgcGFn ZS4gVGhpcyBtZWFucyB3ZSB3YW50IHRvIHNldCBpdCBhcyBhIG1lbWJlcgotICAgICAgICAgICAg Ly8gb2YgdGhlIHJlc291cmNlcyBwYW5lbCBpbnN0ZWFkIG9mIHRoZSBpbmRpdmlkdWFsIHJlc291 cmNlLgotICAgICAgICAgICAgdGhpcy5wYW5lbHMucmVzb3VyY2VzLm1haW5SZXNvdXJjZUxvYWRU aW1lID0gcGF5bG9hZC5sb2FkRXZlbnRUaW1lOwotICAgICAgICAgICAgdGhpcy5wYW5lbHMuYXVk aXRzLm1haW5SZXNvdXJjZUxvYWRUaW1lID0gcGF5bG9hZC5sb2FkRXZlbnRUaW1lOwotICAgICAg ICAgICAgaWYgKHRoaXMucGFuZWxzLm5ldHdvcmspCi0gICAgICAgICAgICAgICAgdGhpcy5wYW5l bHMubmV0d29yay5tYWluUmVzb3VyY2VMb2FkVGltZSA9IHBheWxvYWQubG9hZEV2ZW50VGltZTsK LSAgICAgICAgfQotCi0gICAgICAgIGlmIChwYXlsb2FkLmRvbUNvbnRlbnRFdmVudFRpbWUpIHsK LSAgICAgICAgICAgIC8vIFRoaXMgZG9tQ29udGVudEV2ZW50VGltZSBpcyBmb3IgdGhlIG1haW4g cmVzb3VyY2UsIHNvIGl0IHNob3VsZCBnbyBpbgotICAgICAgICAgICAgLy8gdGhlIHJlc291cmNl cyBwYW5lbCBmb3IgdGhlIHNhbWUgcmVhc29ucyBhcyBhYm92ZS4KLSAgICAgICAgICAgIHRoaXMu cGFuZWxzLnJlc291cmNlcy5tYWluUmVzb3VyY2VET01Db250ZW50VGltZSA9IHBheWxvYWQuZG9t Q29udGVudEV2ZW50VGltZTsKLSAgICAgICAgICAgIHRoaXMucGFuZWxzLmF1ZGl0cy5tYWluUmVz b3VyY2VET01Db250ZW50VGltZSA9IHBheWxvYWQuZG9tQ29udGVudEV2ZW50VGltZTsKLSAgICAg ICAgICAgIGlmICh0aGlzLnBhbmVscy5uZXR3b3JrKQotICAgICAgICAgICAgICAgIHRoaXMucGFu ZWxzLm5ldHdvcmsubWFpblJlc291cmNlRE9NQ29udGVudFRpbWUgPSBwYXlsb2FkLmRvbUNvbnRl bnRFdmVudFRpbWU7Ci0gICAgICAgIH0KICAgICB9CiAKICAgICBpZiAodGhpcy5wYW5lbHMubmV0 d29yaykKICAgICAgICAgdGhpcy5wYW5lbHMubmV0d29yay5yZWZyZXNoUmVzb3VyY2UocmVzb3Vy Y2UpOwogfQogCisKK1dlYkluc3BlY3Rvci5kb21Db250ZW50RXZlbnRGaXJlZCA9IGZ1bmN0aW9u KHRpbWUpCit7CisgICAgdGhpcy5wYW5lbHMucmVzb3VyY2VzLm1haW5SZXNvdXJjZURPTUNvbnRl bnRUaW1lID0gdGltZTsKKyAgICB0aGlzLnBhbmVscy5hdWRpdHMubWFpblJlc291cmNlRE9NQ29u dGVudFRpbWUgPSB0aW1lOworICAgIGlmICh0aGlzLnBhbmVscy5uZXR3b3JrKQorICAgICAgICB0 aGlzLnBhbmVscy5uZXR3b3JrLm1haW5SZXNvdXJjZURPTUNvbnRlbnRUaW1lID0gdGltZTsKK30K KworV2ViSW5zcGVjdG9yLmxvYWRFdmVudEZpcmVkID0gZnVuY3Rpb24odGltZSkKK3sKKyAgICB0 aGlzLnBhbmVscy5yZXNvdXJjZXMubWFpblJlc291cmNlTG9hZFRpbWUgPSB0aW1lOworICAgIHRo aXMucGFuZWxzLmF1ZGl0cy5tYWluUmVzb3VyY2VMb2FkVGltZSA9IHRpbWU7CisgICAgaWYgKHRo aXMucGFuZWxzLm5ldHdvcmspCisgICAgICAgIHRoaXMucGFuZWxzLm5ldHdvcmsubWFpblJlc291 cmNlTG9hZFRpbWUgPSB0aW1lOworfQorCiBXZWJJbnNwZWN0b3IucmVtb3ZlUmVzb3VyY2UgPSBm dW5jdGlvbihpZGVudGlmaWVyKQogewogICAgIHZhciByZXNvdXJjZSA9IHRoaXMucmVzb3VyY2Vz W2lkZW50aWZpZXJdOwo=