45954 2010-09-17 03:11:06 -0700 Web Inspector: [Extensions API] expose page load events timings 2010-10-02 06:05:55 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 caseq caseq aroben bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy yurys oldest_to_newest 280593 0 caseq 2010-09-17 03:11:06 -0700 Times of load and DOMContentLoaded events are part of HAR specs, but are not currently exposed, as there are under log.pages and we only offer entries found under log.entries in extensions API. It is proposed to add webInspector.resources.getPageTimings() for extensions to retrieve page timings. Alternatively, we can offer page timings as part of response to webInspector.resources.getResource() for main resource (but outside of the HAREntry returned as part of response). 288126 1 69435 caseq 2010-10-01 01:50:00 -0700 Created attachment 69435 patch 288145 2 69435 loislo 2010-10-01 03:19:45 -0700 Comment on attachment 69435 patch View in context: https://bugs.webkit.org/attachment.cgi?id=69435&action=review I think it is not good that the manipulations with domContentTime and loadEventTime are not localized in the code. With all respect, I would suggest to write this little piece of code slightly different way. if (payload.didTimingChange) { if (payload.startTime) resource.startTime = payload.startTime; if (payload.responseReceivedTime) resource.responseReceivedTime = payload.responseReceivedTime; if (payload.endTime) resource.endTime = payload.endTime; if (resource.mainResource) { // This loadEventTime is for the main resource, and we want to show it // for all resources on this page. This means we want to set it as a member // of the resources panel instead of the individual resource. var loadEventTime = payload.loadEventTime ? payload.loadEventTime : -1; this.panels.resources.mainResourceLoadTime = loadEventTime; if (loadEventTime !== -1) this.panels.audits.mainResourceLoadTime = loadEventTime; if (this.panels.network) this.panels.network.mainResourceLoadTime = loadEventTime; // This domContentEventTime is for the main resource, so it should go in // the resources panel for the same reasons as above. var domContentEventTime = payload.domContentEventTime ? payload.domContentEventTime : -1; this.panels.resources.mainResourceDOMContentTime = domContentEventTime; this.panels.audits.mainResourceDOMContentTime = domContentEventTime; if (this.panels.network) this.panels.network.mainResourceDOMContentTime = domContentEventTime; } } Really audits panel is not using these times but starts the audit process when mainResourceLoadTime arrives. It'd be better to do that explicitly. > WebCore/inspector/front-end/inspector.js:1298 > + if (payload.startTime) { > resource.startTime = payload.startTime; > + if (resource.mainResource) { > + loadEventTime = loadEventTime || -1; > + domContentEventTime = domContentEventTime || -1; > + } > + } As I can see there is no dependency between startTime and loadEventTime at backend side. 288180 3 69453 caseq 2010-10-01 05:05:07 -0700 Created attachment 69453 patch Rewritten page even time event logic as proposed by loislo. 288192 4 69453 loislo 2010-10-01 05:31:00 -0700 Comment on attachment 69453 patch looks good to me 288199 5 69453 pfeldman 2010-10-01 06:04:28 -0700 Comment on attachment 69453 patch View in context: https://bugs.webkit.org/attachment.cgi?id=69453&action=review > WebCore/inspector/front-end/inspector.js:1297 > + if (resource.mainResource) { This looks confusing. Load time should be sent to the front-end after the main resource has been loaded. It is just that we are using a hack to pass page load timing along with the main resource data. 288218 6 69461 caseq 2010-10-01 06:35:17 -0700 Created attachment 69461 patch to land Removed controversial fix for page event timings at all. Will fix later, along with better way to report page event times to front-end (see https://bugs.webkit.org/show_bug.cgi?id=46981). 288283 7 aroben 2010-10-01 09:14:15 -0700 These tests are failing on Windows now. See http://build.webkit.org/results/Windows%20Debug%20(Tests)/r68890%20(20586)/results.html 288298 8 caseq 2010-10-01 09:38:49 -0700 (In reply to comment #7) > These tests are failing on Windows now. See http://build.webkit.org/results/Windows%20Debug%20(Tests)/r68890%20(20586)/results.html Those but inspector/extensions-* appear totally unrelated. With regards to inspector/extenstions-*, the -api.html suggests that frontend is of an older version (i.e. lacks a method introduced in this patch; I don't think there's a space for any flakiness there). This also does not reproduce locally. Can we clobber the win bots? Also, I reckon that build-webkit does not copy inspector front-end files under windows, unless --inspector-frontend is specified or there's a larger change outside of inspector/front-end. If clobbering fixes the tests, I think we need to raise a bug for build to perform build-webkit --inspector-frontend at least on bots (it's cheap). 288323 9 aroben 2010-10-01 10:19:25 -0700 (In reply to comment #8) > (In reply to comment #7) > > These tests are failing on Windows now. See http://build.webkit.org/results/Windows%20Debug%20(Tests)/r68890%20(20586)/results.html > > Those but inspector/extensions-* appear totally unrelated. Yes. I filed bug 46988 to cover the failures. Let's continue the discussion there. 288679 10 69453 eric 2010-10-02 05:35:04 -0700 Comment on attachment 69453 patch Cleared Pavel Feldman's review+ from obsolete attachment 69453 so that this bug does not appear in http://webkit.org/pending-commit. 288680 11 caseq 2010-10-02 06:05:55 -0700 Manually committed r68887: http://trac.webkit.org/changeset/68887 69435 2010-10-01 01:50:00 -0700 2010-10-01 05:05:07 -0700 patch pagetimings.diff text/plain 10313 caseq ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAzYjgwNjkzLi40NmNkZjJkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMTAt MDEgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBbRXh0ZW5z aW9ucyBBUEldIGV4cG9zZSBwYWdlIGxvYWQgZXZlbnRzIHRpbWluZ3MKKyAgICAgICAgQWRkZWQg d2ViSW5zcGVjdG9yLnJlc291cmNlcy5nZXRQYWdlVGltaW5ncygpCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTk1NAorCisgICAgICAgICogaW5zcGVj dG9yL2V4dGVuc2lvbnMtYXBpLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZXh0 ZW5zaW9ucy1yZXNvdXJjZXMtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGluc3BlY3Rvci9leHRl bnNpb25zLXJlc291cmNlcy5odG1sOgorCiAyMDEwLTA5LTMwICBLZW50IFRhbXVyYSAgPHRrZW50 QGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCB0ZXN0IGV4cGVjdGF0aW9uIHVw ZGF0ZS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRlbnNpb25zLWFwaS1l eHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZXh0ZW5zaW9ucy1hcGktZXhwZWN0 ZWQudHh0CmluZGV4IDk1ZDNhMjYuLmZkYTA4NDIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2lu c3BlY3Rvci9leHRlbnNpb25zLWFwaS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL2V4dGVuc2lvbnMtYXBpLWV4cGVjdGVkLnR4dApAQCAtNTksNiArNTksNyBAQCBSVU5O SU5HIFRFU1Q6IGV4dGVuc2lvbl90ZXN0QVBJCiAgICAgICAgIH0KICAgICAgICAgZ2V0QWxsIDog PGZ1bmN0aW9uPgogICAgICAgICBnZXQgOiA8ZnVuY3Rpb24+CisgICAgICAgIGdldFBhZ2VUaW1p bmdzIDogPGZ1bmN0aW9uPgogICAgIH0KICAgICBvblJlc2V0IDogewogICAgICAgICBhZGRMaXN0 ZW5lciA6IDxmdW5jdGlvbj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRl bnNpb25zLXJlc291cmNlcy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZXh0 ZW5zaW9ucy1yZXNvdXJjZXMtZXhwZWN0ZWQudHh0CmluZGV4IDAyOWNiYjguLjE3OWQzY2MgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRlbnNpb25zLXJlc291cmNlcy1leHBl Y3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMtcmVzb3VyY2Vz LWV4cGVjdGVkLnR4dApAQCAtMTUsNiArMTUsMTIgQEAgcmVzb3VyY2U6IC4uLi9pbnNwZWN0b3Iv cmVzb3VyY2VzL2F1ZGl0cy1zdHlsZTEuY3NzLCB0eXBlOiBzdHlsZXNoZWV0CiByZXNvdXJjZTog Li4uL2luc3BlY3Rvci9yZXNvdXJjZXMvbWlzc2luZy1pbWFnZS5wbmcsIHR5cGU6IG90aGVyCiBS VU5OSU5HIFRFU1Q6IGV4dGVuc2lvbl90ZXN0R2V0SW52YWxpZFJlc291cmNlCiBBdHRlbXB0ZWQg dG8gcmV0cmlldmUgaW52YWxpZCByZXNvdXJjZTogeyJjb2RlIjoiRV9OT1RGT1VORCIsImRlc2Ny aXB0aW9uIjoiT2JqZWN0IG5vdCBmb3VuZDogJXMiLCJkZXRhaWxzIjpbMjEyODUwNl0sImlzRXJy b3IiOnRydWV9CitSVU5OSU5HIFRFU1Q6IGV4dGVuc2lvbl90ZXN0R2V0UGFnZVRpbWluZ3MKK0dv dCBjYWxsYmFjayBmcm9tIGdldFBhZ2VUaW1pbmdzLCBwYWdlVGltaW5ncyBkdW1wIGZvbGxvd3MK K3sKKyAgICBvbkNvbnRlbnRMb2FkIDogPG51bWJlcj4KKyAgICBvbkxvYWQgOiA8bnVtYmVyPgor fQogUlVOTklORyBURVNUOiBleHRlbnNpb25fdGVzdFJlc291cmNlTm90aWZpY2F0aW9uCiBSZXNv dXJjZSBmaW5pc2hlZDogLi4uL0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRlbnNpb25zLXJlc291 cmNlcy5odG1sCiBBbGwgdGVzdHMgZG9uZS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9leHRlbnNpb25zLXJlc291cmNlcy5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2V4 dGVuc2lvbnMtcmVzb3VyY2VzLmh0bWwKaW5kZXggYTZhMTViNC4uZGE5ODc4ZiAxMDA3NTUKLS0t IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMtcmVzb3VyY2VzLmh0bWwKKysrIGIv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMtcmVzb3VyY2VzLmh0bWwKQEAgLTQyLDYg KzQyLDE2IEBAIGZ1bmN0aW9uIGV4dGVuc2lvbl90ZXN0R2V0SW52YWxpZFJlc291cmNlKG5leHRU ZXN0KQogICAgIHdlYkluc3BlY3Rvci5yZXNvdXJjZXMuZ2V0KDIxMjg1MDYsIGNhbGxiYWNrQW5k TmV4dFRlc3Qob25SZXNvdXJjZSwgbmV4dFRlc3QpKTsKIH0KIAorZnVuY3Rpb24gZXh0ZW5zaW9u X3Rlc3RHZXRQYWdlVGltaW5ncyhuZXh0VGVzdCkKK3sKKyAgICBmdW5jdGlvbiBvblRpbWluZ3Mo cmVzdWx0KQorICAgIHsKKyAgICAgICAgb3V0cHV0KCJHb3QgY2FsbGJhY2sgZnJvbSBnZXRQYWdl VGltaW5ncywgcGFnZVRpbWluZ3MgZHVtcCBmb2xsb3dzIik7CisgICAgICAgIGR1bXBPYmplY3Qo cmVzdWx0LCB7IG9uQ29udGVudExvYWQ6IDEsIG9uTG9hZDogMSB9KTsKKyAgICB9CisgICAgd2Vi SW5zcGVjdG9yLnJlc291cmNlcy5nZXRQYWdlVGltaW5ncyhjYWxsYmFja0FuZE5leHRUZXN0KG9u VGltaW5ncywgbmV4dFRlc3QpKTsKK30KKwogZnVuY3Rpb24gZG9YSFIoKQogewogICAgIHZhciB4 aHIgPSBuZXcgWE1MSHR0cFJlcXVlc3QoKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9n IGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGU0ZjY2Yi4uN2MyZjczMCAxMDA2NDQKLS0tIGEv V2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBA QAorMjAxMC0xMC0wMSAgQW5kcmV5IEtvc3lha292ICA8Y2FzZXFAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtFeHRlbnNpb25zIEFQSV0gZXhwb3NlIHBhZ2UgbG9hZCBldmVudHMgdGltaW5ncworICAg ICAgICBBZGRlZCB3ZWJJbnNwZWN0b3IucmVzb3VyY2VzLmdldFBhZ2VUaW1pbmdzKCkKKyAgICAg ICAgCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTk1 NAorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25BUEkuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuaW5qZWN0ZWRFeHRlbnNpb25BUEkuUmVzb3VyY2VzLnByb3RvdHlw ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuaW5qZWN0ZWRFeHRlbnNpb25BUEkuUmVzb3VyY2Vz LnByb3RvdHlwZS5nZXRQYWdlVGltaW5ncyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9FeHRlbnNpb25TZXJ2ZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRXh0ZW5zaW9uU2Vy dmVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FeHRlbnNpb25TZXJ2ZXIucHJvdG90eXBlLl9v bkdldFBhZ2VUaW1pbmdzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0hBUkVudHJ5 LmpzOiBSZXR1cm4gcGFnZSBldmVudCB0aW1pbmdzIGFzIC0xIGlmIHN0YXJ0IG9yIGV2ZW50IHRp bWUgdW5rbm93bi4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5IQVJMb2cucHJvdG90eXBlLl9idWls ZFBhZ2VzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IQVJMb2cucHJvdG90eXBlLmJ1aWxkTWFp blJlc291cmNlVGltaW5ncyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSEFSTG9nLnByb3RvdHlw ZS5fY29udmVydFJlc291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IQVJMb2cucHJvdG90 eXBlLl9wYWdlRXZlbnRUaW1lKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3Bl Y3Rvci5qczogUmVzZXQgcGFnZSBldmVudCB0aW1pbmdzIHdoZW4gcmVjZWl2aW5nIHN0YXJ0IHRp bWUgZm9yIG1haW4gcmVzb3VyY2UuCisgICAgICAgIChXZWJJbnNwZWN0b3IudXBkYXRlUmVzb3Vy Y2UpOgorCiAyMDEwLTA5LTMwICBNT1JJVEEgSGFqaW1lICA8bW9ycml0YUBnb29nbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEphbWVzIFJvYmluc29uLgpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvbkFQSS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9FeHRlbnNpb25BUEkuanMKaW5kZXggNjRmNTQ4Mi4uOTA2MjEyNiAxMDA2NDQK LS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvbkFQSS5qcworKysgYi9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uQVBJLmpzCkBAIC0xMjMsNiArMTIz LDExIEBAIFJlc291cmNlcy5wcm90b3R5cGUgPSB7CiAgICAgZ2V0OiBmdW5jdGlvbihpZCwgY2Fs bGJhY2spCiAgICAgewogICAgICAgICByZXR1cm4gZXh0ZW5zaW9uU2VydmVyLnNlbmRSZXF1ZXN0 KHsgY29tbWFuZDogImdldFJlc291cmNlcyIsIGlkOiBpZCB9LCBjYWxsYmFjayk7CisgICAgfSwK KworICAgIGdldFBhZ2VUaW1pbmdzOiBmdW5jdGlvbihjYWxsYmFjaykKKyAgICB7CisgICAgICAg IHJldHVybiBleHRlbnNpb25TZXJ2ZXIuc2VuZFJlcXVlc3QoeyBjb21tYW5kOiAiZ2V0UGFnZVRp bWluZ3MiIH0sIGNhbGxiYWNrKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25TZXJ2ZXIuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpzCmluZGV4IGJkZjNhMjUuLmM4YTk1YTAgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25TZXJ2ZXIuanMKKysr IGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qcwpAQCAtMzgs NiArMzgsNyBAQCBXZWJJbnNwZWN0b3IuRXh0ZW5zaW9uU2VydmVyID0gZnVuY3Rpb24oKQogICAg IHRoaXMuX3JlZ2lzdGVySGFuZGxlcigic3Vic2NyaWJlIiwgdGhpcy5fb25TdWJzY3JpYmUuYmlu ZCh0aGlzKSk7CiAgICAgdGhpcy5fcmVnaXN0ZXJIYW5kbGVyKCJ1bnN1YnNjcmliZSIsIHRoaXMu X29uVW5zdWJzY3JpYmUuYmluZCh0aGlzKSk7CiAgICAgdGhpcy5fcmVnaXN0ZXJIYW5kbGVyKCJn ZXRSZXNvdXJjZXMiLCB0aGlzLl9vbkdldFJlc291cmNlcy5iaW5kKHRoaXMpKTsKKyAgICB0aGlz Ll9yZWdpc3RlckhhbmRsZXIoImdldFBhZ2VUaW1pbmdzIiwgdGhpcy5fb25HZXRQYWdlVGltaW5n cy5iaW5kKHRoaXMpKTsKICAgICB0aGlzLl9yZWdpc3RlckhhbmRsZXIoImNyZWF0ZVBhbmVsIiwg dGhpcy5fb25DcmVhdGVQYW5lbC5iaW5kKHRoaXMpKTsKICAgICB0aGlzLl9yZWdpc3RlckhhbmRs ZXIoImNyZWF0ZVNpZGViYXJQYW5lIiwgdGhpcy5fb25DcmVhdGVTaWRlYmFyLmJpbmQodGhpcykp OwogICAgIHRoaXMuX3JlZ2lzdGVySGFuZGxlcigibG9nIiwgdGhpcy5fb25Mb2cuYmluZCh0aGlz KSk7CkBAIC0yNjUsNiArMjY2LDExIEBAIFdlYkluc3BlY3Rvci5FeHRlbnNpb25TZXJ2ZXIucHJv dG90eXBlID0gewogICAgICAgICByZXR1cm4gcmVzcG9uc2U7CiAgICAgfSwKIAorICAgIF9vbkdl dFBhZ2VUaW1pbmdzOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gKG5ldyBXZWJJ bnNwZWN0b3IuSEFSTG9nKCkpLmJ1aWxkTWFpblJlc291cmNlVGltaW5ncygpOworICAgIH0sCisK ICAgICBfb25BZGRBdWRpdENhdGVnb3J5OiBmdW5jdGlvbihyZXF1ZXN0KQogICAgIHsKICAgICAg ICAgdmFyIGNhdGVnb3J5ID0gbmV3IFdlYkluc3BlY3Rvci5FeHRlbnNpb25BdWRpdENhdGVnb3J5 KHJlcXVlc3QuaWQsIHJlcXVlc3QuZGlzcGxheU5hbWUsIHJlcXVlc3QucnVsZUNvdW50KTsKZGlm ZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IQVJFbnRyeS5qcyBiL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IQVJFbnRyeS5qcwppbmRleCA4NWU0ZjU5Li4yY2YwNzQw IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSEFSRW50cnkuanMKKysr IGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hBUkVudHJ5LmpzCkBAIC0xOTIsMjMgKzE5 MiwzMSBAQCBXZWJJbnNwZWN0b3IuSEFSTG9nLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAg ICBzdGFydGVkRGF0ZVRpbWU6IG5ldyBEYXRlKFdlYkluc3BlY3Rvci5tYWluUmVzb3VyY2Uuc3Rh cnRUaW1lICogMTAwMCksCiAgICAgICAgICAgICAgICAgaWQ6IFdlYkluc3BlY3Rvci5tYWluUmVz b3VyY2UuZG9jdW1lbnRVUkwsCiAgICAgICAgICAgICAgICAgdGl0bGU6ICIiLAotICAgICAgICAg ICAgICAgIHBhZ2VUaW1pbmdzOiB0aGlzLl9idWlsZE1haW5SZXNvdXJjZVRpbWluZ3MoKQorICAg ICAgICAgICAgICAgIHBhZ2VUaW1pbmdzOiB0aGlzLmJ1aWxkTWFpblJlc291cmNlVGltaW5ncygp CiAgICAgICAgICAgICB9CiAgICAgICAgIF07CiAgICAgfSwKIAotICAgIF9idWlsZE1haW5SZXNv dXJjZVRpbWluZ3M6IGZ1bmN0aW9uKCkKKyAgICBidWlsZE1haW5SZXNvdXJjZVRpbWluZ3M6IGZ1 bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHZhciByZXNvdXJjZXNQYW5lbCA9IFdlYkluc3BlY3Rv ci5wYW5lbHMucmVzb3VyY2VzOwogICAgICAgICB2YXIgc3RhcnRUaW1lID0gV2ViSW5zcGVjdG9y Lm1haW5SZXNvdXJjZS5zdGFydFRpbWU7CiAgICAgICAgIHJldHVybiB7Ci0gICAgICAgICAgICAg b25Db250ZW50TG9hZDogV2ViSW5zcGVjdG9yLkhBUkVudHJ5Ll90b01pbGxpc2Vjb25kcyhyZXNv dXJjZXNQYW5lbC5tYWluUmVzb3VyY2VET01Db250ZW50VGltZSAtIHN0YXJ0VGltZSksCi0gICAg ICAgICAgICAgb25Mb2FkOiBXZWJJbnNwZWN0b3IuSEFSRW50cnkuX3RvTWlsbGlzZWNvbmRzKHJl c291cmNlc1BhbmVsLm1haW5SZXNvdXJjZUxvYWRUaW1lIC0gc3RhcnRUaW1lKSwKKyAgICAgICAg ICAgICBvbkNvbnRlbnRMb2FkOiB0aGlzLl9wYWdlRXZlbnRUaW1lKHJlc291cmNlc1BhbmVsLm1h aW5SZXNvdXJjZURPTUNvbnRlbnRUaW1lKSwKKyAgICAgICAgICAgICBvbkxvYWQ6IHRoaXMuX3Bh Z2VFdmVudFRpbWUocmVzb3VyY2VzUGFuZWwubWFpblJlc291cmNlTG9hZFRpbWUpLAogICAgICAg ICB9CiAgICAgfSwKIAogICAgIF9jb252ZXJ0UmVzb3VyY2U6IGZ1bmN0aW9uKGlkKQogICAgIHsK ICAgICAgICAgcmV0dXJuIChuZXcgV2ViSW5zcGVjdG9yLkhBUkVudHJ5KFdlYkluc3BlY3Rvci5y ZXNvdXJjZXNbaWRdKSkuYnVpbGQoKTsKKyAgICB9LAorCisgICAgX3BhZ2VFdmVudFRpbWU6IGZ1 bmN0aW9uKHRpbWUpCisgICAgeworICAgICAgICB2YXIgc3RhcnRUaW1lID0gV2ViSW5zcGVjdG9y Lm1haW5SZXNvdXJjZS5zdGFydFRpbWU7CisgICAgICAgIGlmICh0aW1lID09PSAtMSB8fCBzdGFy dFRpbWUgPT09IC0xKQorICAgICAgICAgICAgcmV0dXJuIC0xOworICAgICAgICByZXR1cm4gV2Vi SW5zcGVjdG9yLkhBUkVudHJ5Ll90b01pbGxpc2Vjb25kcyh0aW1lIC0gc3RhcnRUaW1lKTsKICAg ICB9CiB9OwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rv ci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXggM2Vk YWU4Zi4uM2I3NGZjYiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2lu c3BlY3Rvci5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpz CkBAIC0xMjg3LDMwICsxMjg3LDM3IEBAIFdlYkluc3BlY3Rvci51cGRhdGVSZXNvdXJjZSA9IGZ1 bmN0aW9uKHBheWxvYWQpCiAgICAgfQogCiAgICAgaWYgKHBheWxvYWQuZGlkVGltaW5nQ2hhbmdl KSB7Ci0gICAgICAgIGlmIChwYXlsb2FkLnN0YXJ0VGltZSkKKyAgICAgICAgdmFyIGxvYWRFdmVu dFRpbWUgPSBwYXlsb2FkLmxvYWRFdmVudFRpbWU7CisgICAgICAgIHZhciBkb21Db250ZW50RXZl bnRUaW1lID0gcGF5bG9hZC5kb21Db250ZW50RXZlbnRUaW1lOworICAgICAgICBpZiAocGF5bG9h ZC5zdGFydFRpbWUpIHsKICAgICAgICAgICAgIHJlc291cmNlLnN0YXJ0VGltZSA9IHBheWxvYWQu c3RhcnRUaW1lOworICAgICAgICAgICAgaWYgKHJlc291cmNlLm1haW5SZXNvdXJjZSkgeworICAg ICAgICAgICAgICAgIGxvYWRFdmVudFRpbWUgPSBsb2FkRXZlbnRUaW1lIHx8IC0xOworICAgICAg ICAgICAgICAgIGRvbUNvbnRlbnRFdmVudFRpbWUgPSBkb21Db250ZW50RXZlbnRUaW1lIHx8IC0x OworICAgICAgICAgICAgfQorICAgICAgICB9CiAgICAgICAgIGlmIChwYXlsb2FkLnJlc3BvbnNl UmVjZWl2ZWRUaW1lKQogICAgICAgICAgICAgcmVzb3VyY2UucmVzcG9uc2VSZWNlaXZlZFRpbWUg PSBwYXlsb2FkLnJlc3BvbnNlUmVjZWl2ZWRUaW1lOwogICAgICAgICBpZiAocGF5bG9hZC5lbmRU aW1lKQogICAgICAgICAgICAgcmVzb3VyY2UuZW5kVGltZSA9IHBheWxvYWQuZW5kVGltZTsKIAot ICAgICAgICBpZiAocGF5bG9hZC5sb2FkRXZlbnRUaW1lKSB7CisgICAgICAgIGlmIChsb2FkRXZl bnRUaW1lKSB7CiAgICAgICAgICAgICAvLyBUaGlzIGxvYWRFdmVudFRpbWUgaXMgZm9yIHRoZSBt YWluIHJlc291cmNlLCBhbmQgd2Ugd2FudCB0byBzaG93IGl0CiAgICAgICAgICAgICAvLyBmb3Ig YWxsIHJlc291cmNlcyBvbiB0aGlzIHBhZ2UuIFRoaXMgbWVhbnMgd2Ugd2FudCB0byBzZXQgaXQg YXMgYSBtZW1iZXIKICAgICAgICAgICAgIC8vIG9mIHRoZSByZXNvdXJjZXMgcGFuZWwgaW5zdGVh ZCBvZiB0aGUgaW5kaXZpZHVhbCByZXNvdXJjZS4KLSAgICAgICAgICAgIHRoaXMucGFuZWxzLnJl c291cmNlcy5tYWluUmVzb3VyY2VMb2FkVGltZSA9IHBheWxvYWQubG9hZEV2ZW50VGltZTsKLSAg ICAgICAgICAgIHRoaXMucGFuZWxzLmF1ZGl0cy5tYWluUmVzb3VyY2VMb2FkVGltZSA9IHBheWxv YWQubG9hZEV2ZW50VGltZTsKKyAgICAgICAgICAgIHRoaXMucGFuZWxzLnJlc291cmNlcy5tYWlu UmVzb3VyY2VMb2FkVGltZSA9IGxvYWRFdmVudFRpbWU7CisgICAgICAgICAgICB0aGlzLnBhbmVs cy5hdWRpdHMubWFpblJlc291cmNlTG9hZFRpbWUgPSBsb2FkRXZlbnRUaW1lOwogICAgICAgICAg ICAgaWYgKHRoaXMucGFuZWxzLm5ldHdvcmspCi0gICAgICAgICAgICAgICAgdGhpcy5wYW5lbHMu bmV0d29yay5tYWluUmVzb3VyY2VMb2FkVGltZSA9IHBheWxvYWQubG9hZEV2ZW50VGltZTsKKyAg ICAgICAgICAgICAgICB0aGlzLnBhbmVscy5uZXR3b3JrLm1haW5SZXNvdXJjZUxvYWRUaW1lID0g bG9hZEV2ZW50VGltZTsKICAgICAgICAgfQogCi0gICAgICAgIGlmIChwYXlsb2FkLmRvbUNvbnRl bnRFdmVudFRpbWUpIHsKKyAgICAgICAgaWYgKGRvbUNvbnRlbnRFdmVudFRpbWUpIHsKICAgICAg ICAgICAgIC8vIFRoaXMgZG9tQ29udGVudEV2ZW50VGltZSBpcyBmb3IgdGhlIG1haW4gcmVzb3Vy Y2UsIHNvIGl0IHNob3VsZCBnbyBpbgogICAgICAgICAgICAgLy8gdGhlIHJlc291cmNlcyBwYW5l bCBmb3IgdGhlIHNhbWUgcmVhc29ucyBhcyBhYm92ZS4KLSAgICAgICAgICAgIHRoaXMucGFuZWxz LnJlc291cmNlcy5tYWluUmVzb3VyY2VET01Db250ZW50VGltZSA9IHBheWxvYWQuZG9tQ29udGVu dEV2ZW50VGltZTsKLSAgICAgICAgICAgIHRoaXMucGFuZWxzLmF1ZGl0cy5tYWluUmVzb3VyY2VE T01Db250ZW50VGltZSA9IHBheWxvYWQuZG9tQ29udGVudEV2ZW50VGltZTsKKyAgICAgICAgICAg IHRoaXMucGFuZWxzLnJlc291cmNlcy5tYWluUmVzb3VyY2VET01Db250ZW50VGltZSA9IGRvbUNv bnRlbnRFdmVudFRpbWU7CisgICAgICAgICAgICB0aGlzLnBhbmVscy5hdWRpdHMubWFpblJlc291 cmNlRE9NQ29udGVudFRpbWUgPSBkb21Db250ZW50RXZlbnRUaW1lOwogICAgICAgICAgICAgaWYg KHRoaXMucGFuZWxzLm5ldHdvcmspCi0gICAgICAgICAgICAgICAgdGhpcy5wYW5lbHMubmV0d29y ay5tYWluUmVzb3VyY2VET01Db250ZW50VGltZSA9IHBheWxvYWQuZG9tQ29udGVudEV2ZW50VGlt ZTsKKyAgICAgICAgICAgICAgICB0aGlzLnBhbmVscy5uZXR3b3JrLm1haW5SZXNvdXJjZURPTUNv bnRlbnRUaW1lID0gZG9tQ29udGVudEV2ZW50VGltZTsKICAgICAgICAgfQogICAgIH0KIAo= 69453 2010-10-01 05:05:07 -0700 2010-10-02 05:35:03 -0700 patch pagetimings.diff text/plain 9921 caseq ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAzYjgwNjkzLi40NmNkZjJkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMTAt MDEgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBbRXh0ZW5z aW9ucyBBUEldIGV4cG9zZSBwYWdlIGxvYWQgZXZlbnRzIHRpbWluZ3MKKyAgICAgICAgQWRkZWQg d2ViSW5zcGVjdG9yLnJlc291cmNlcy5nZXRQYWdlVGltaW5ncygpCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTk1NAorCisgICAgICAgICogaW5zcGVj dG9yL2V4dGVuc2lvbnMtYXBpLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBpbnNwZWN0b3IvZXh0 ZW5zaW9ucy1yZXNvdXJjZXMtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGluc3BlY3Rvci9leHRl bnNpb25zLXJlc291cmNlcy5odG1sOgorCiAyMDEwLTA5LTMwICBLZW50IFRhbXVyYSAgPHRrZW50 QGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkLCB0ZXN0IGV4cGVjdGF0aW9uIHVw ZGF0ZS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRlbnNpb25zLWFwaS1l eHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZXh0ZW5zaW9ucy1hcGktZXhwZWN0 ZWQudHh0CmluZGV4IDk1ZDNhMjYuLmZkYTA4NDIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2lu c3BlY3Rvci9leHRlbnNpb25zLWFwaS1leHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5z cGVjdG9yL2V4dGVuc2lvbnMtYXBpLWV4cGVjdGVkLnR4dApAQCAtNTksNiArNTksNyBAQCBSVU5O SU5HIFRFU1Q6IGV4dGVuc2lvbl90ZXN0QVBJCiAgICAgICAgIH0KICAgICAgICAgZ2V0QWxsIDog PGZ1bmN0aW9uPgogICAgICAgICBnZXQgOiA8ZnVuY3Rpb24+CisgICAgICAgIGdldFBhZ2VUaW1p bmdzIDogPGZ1bmN0aW9uPgogICAgIH0KICAgICBvblJlc2V0IDogewogICAgICAgICBhZGRMaXN0 ZW5lciA6IDxmdW5jdGlvbj4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRl bnNpb25zLXJlc291cmNlcy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZXh0 ZW5zaW9ucy1yZXNvdXJjZXMtZXhwZWN0ZWQudHh0CmluZGV4IDAyOWNiYjguLjE3OWQzY2MgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRlbnNpb25zLXJlc291cmNlcy1leHBl Y3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMtcmVzb3VyY2Vz LWV4cGVjdGVkLnR4dApAQCAtMTUsNiArMTUsMTIgQEAgcmVzb3VyY2U6IC4uLi9pbnNwZWN0b3Iv cmVzb3VyY2VzL2F1ZGl0cy1zdHlsZTEuY3NzLCB0eXBlOiBzdHlsZXNoZWV0CiByZXNvdXJjZTog Li4uL2luc3BlY3Rvci9yZXNvdXJjZXMvbWlzc2luZy1pbWFnZS5wbmcsIHR5cGU6IG90aGVyCiBS VU5OSU5HIFRFU1Q6IGV4dGVuc2lvbl90ZXN0R2V0SW52YWxpZFJlc291cmNlCiBBdHRlbXB0ZWQg dG8gcmV0cmlldmUgaW52YWxpZCByZXNvdXJjZTogeyJjb2RlIjoiRV9OT1RGT1VORCIsImRlc2Ny aXB0aW9uIjoiT2JqZWN0IG5vdCBmb3VuZDogJXMiLCJkZXRhaWxzIjpbMjEyODUwNl0sImlzRXJy b3IiOnRydWV9CitSVU5OSU5HIFRFU1Q6IGV4dGVuc2lvbl90ZXN0R2V0UGFnZVRpbWluZ3MKK0dv dCBjYWxsYmFjayBmcm9tIGdldFBhZ2VUaW1pbmdzLCBwYWdlVGltaW5ncyBkdW1wIGZvbGxvd3MK K3sKKyAgICBvbkNvbnRlbnRMb2FkIDogPG51bWJlcj4KKyAgICBvbkxvYWQgOiA8bnVtYmVyPgor fQogUlVOTklORyBURVNUOiBleHRlbnNpb25fdGVzdFJlc291cmNlTm90aWZpY2F0aW9uCiBSZXNv dXJjZSBmaW5pc2hlZDogLi4uL0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRlbnNpb25zLXJlc291 cmNlcy5odG1sCiBBbGwgdGVzdHMgZG9uZS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3Bl Y3Rvci9leHRlbnNpb25zLXJlc291cmNlcy5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2V4 dGVuc2lvbnMtcmVzb3VyY2VzLmh0bWwKaW5kZXggYTZhMTViNC4uZGE5ODc4ZiAxMDA3NTUKLS0t IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMtcmVzb3VyY2VzLmh0bWwKKysrIGIv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMtcmVzb3VyY2VzLmh0bWwKQEAgLTQyLDYg KzQyLDE2IEBAIGZ1bmN0aW9uIGV4dGVuc2lvbl90ZXN0R2V0SW52YWxpZFJlc291cmNlKG5leHRU ZXN0KQogICAgIHdlYkluc3BlY3Rvci5yZXNvdXJjZXMuZ2V0KDIxMjg1MDYsIGNhbGxiYWNrQW5k TmV4dFRlc3Qob25SZXNvdXJjZSwgbmV4dFRlc3QpKTsKIH0KIAorZnVuY3Rpb24gZXh0ZW5zaW9u X3Rlc3RHZXRQYWdlVGltaW5ncyhuZXh0VGVzdCkKK3sKKyAgICBmdW5jdGlvbiBvblRpbWluZ3Mo cmVzdWx0KQorICAgIHsKKyAgICAgICAgb3V0cHV0KCJHb3QgY2FsbGJhY2sgZnJvbSBnZXRQYWdl VGltaW5ncywgcGFnZVRpbWluZ3MgZHVtcCBmb2xsb3dzIik7CisgICAgICAgIGR1bXBPYmplY3Qo cmVzdWx0LCB7IG9uQ29udGVudExvYWQ6IDEsIG9uTG9hZDogMSB9KTsKKyAgICB9CisgICAgd2Vi SW5zcGVjdG9yLnJlc291cmNlcy5nZXRQYWdlVGltaW5ncyhjYWxsYmFja0FuZE5leHRUZXN0KG9u VGltaW5ncywgbmV4dFRlc3QpKTsKK30KKwogZnVuY3Rpb24gZG9YSFIoKQogewogICAgIHZhciB4 aHIgPSBuZXcgWE1MSHR0cFJlcXVlc3QoKTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9n IGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMGU0ZjY2Yi4uN2MyZjczMCAxMDA2NDQKLS0tIGEv V2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNiBA QAorMjAxMC0xMC0wMSAgQW5kcmV5IEtvc3lha292ICA8Y2FzZXFAY2hyb21pdW0ub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtFeHRlbnNpb25zIEFQSV0gZXhwb3NlIHBhZ2UgbG9hZCBldmVudHMgdGltaW5ncworICAg ICAgICBBZGRlZCB3ZWJJbnNwZWN0b3IucmVzb3VyY2VzLmdldFBhZ2VUaW1pbmdzKCkKKyAgICAg ICAgCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTk1 NAorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25BUEkuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuaW5qZWN0ZWRFeHRlbnNpb25BUEkuUmVzb3VyY2VzLnByb3RvdHlw ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuaW5qZWN0ZWRFeHRlbnNpb25BUEkuUmVzb3VyY2Vz LnByb3RvdHlwZS5nZXRQYWdlVGltaW5ncyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9FeHRlbnNpb25TZXJ2ZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRXh0ZW5zaW9uU2Vy dmVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FeHRlbnNpb25TZXJ2ZXIucHJvdG90eXBlLl9v bkdldFBhZ2VUaW1pbmdzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0hBUkVudHJ5 LmpzOiBSZXR1cm4gcGFnZSBldmVudCB0aW1pbmdzIGFzIC0xIGlmIHN0YXJ0IG9yIGV2ZW50IHRp bWUgdW5rbm93bi4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5IQVJMb2cucHJvdG90eXBlLl9idWls ZFBhZ2VzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IQVJMb2cucHJvdG90eXBlLmJ1aWxkTWFp blJlc291cmNlVGltaW5ncyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSEFSTG9nLnByb3RvdHlw ZS5fY29udmVydFJlc291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IQVJMb2cucHJvdG90 eXBlLl9wYWdlRXZlbnRUaW1lKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3Bl Y3Rvci5qczogUmVzZXQgcGFnZSBldmVudCB0aW1pbmdzIHdoZW4gcmVjZWl2aW5nIHN0YXJ0IHRp bWUgZm9yIG1haW4gcmVzb3VyY2UuCisgICAgICAgIChXZWJJbnNwZWN0b3IudXBkYXRlUmVzb3Vy Y2UpOgorCiAyMDEwLTA5LTMwICBNT1JJVEEgSGFqaW1lICA8bW9ycml0YUBnb29nbGUuY29tPgog CiAgICAgICAgIFJldmlld2VkIGJ5IEphbWVzIFJvYmluc29uLgpkaWZmIC0tZ2l0IGEvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvbkFQSS5qcyBiL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9FeHRlbnNpb25BUEkuanMKaW5kZXggNjRmNTQ4Mi4uOTA2MjEyNiAxMDA2NDQK LS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvbkFQSS5qcworKysgYi9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uQVBJLmpzCkBAIC0xMjMsNiArMTIz LDExIEBAIFJlc291cmNlcy5wcm90b3R5cGUgPSB7CiAgICAgZ2V0OiBmdW5jdGlvbihpZCwgY2Fs bGJhY2spCiAgICAgewogICAgICAgICByZXR1cm4gZXh0ZW5zaW9uU2VydmVyLnNlbmRSZXF1ZXN0 KHsgY29tbWFuZDogImdldFJlc291cmNlcyIsIGlkOiBpZCB9LCBjYWxsYmFjayk7CisgICAgfSwK KworICAgIGdldFBhZ2VUaW1pbmdzOiBmdW5jdGlvbihjYWxsYmFjaykKKyAgICB7CisgICAgICAg IHJldHVybiBleHRlbnNpb25TZXJ2ZXIuc2VuZFJlcXVlc3QoeyBjb21tYW5kOiAiZ2V0UGFnZVRp bWluZ3MiIH0sIGNhbGxiYWNrKTsKICAgICB9CiB9CiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25TZXJ2ZXIuanMgYi9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpzCmluZGV4IGJkZjNhMjUuLmM4YTk1YTAgMTAwNjQ0 Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25TZXJ2ZXIuanMKKysr IGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qcwpAQCAtMzgs NiArMzgsNyBAQCBXZWJJbnNwZWN0b3IuRXh0ZW5zaW9uU2VydmVyID0gZnVuY3Rpb24oKQogICAg IHRoaXMuX3JlZ2lzdGVySGFuZGxlcigic3Vic2NyaWJlIiwgdGhpcy5fb25TdWJzY3JpYmUuYmlu ZCh0aGlzKSk7CiAgICAgdGhpcy5fcmVnaXN0ZXJIYW5kbGVyKCJ1bnN1YnNjcmliZSIsIHRoaXMu X29uVW5zdWJzY3JpYmUuYmluZCh0aGlzKSk7CiAgICAgdGhpcy5fcmVnaXN0ZXJIYW5kbGVyKCJn ZXRSZXNvdXJjZXMiLCB0aGlzLl9vbkdldFJlc291cmNlcy5iaW5kKHRoaXMpKTsKKyAgICB0aGlz Ll9yZWdpc3RlckhhbmRsZXIoImdldFBhZ2VUaW1pbmdzIiwgdGhpcy5fb25HZXRQYWdlVGltaW5n cy5iaW5kKHRoaXMpKTsKICAgICB0aGlzLl9yZWdpc3RlckhhbmRsZXIoImNyZWF0ZVBhbmVsIiwg dGhpcy5fb25DcmVhdGVQYW5lbC5iaW5kKHRoaXMpKTsKICAgICB0aGlzLl9yZWdpc3RlckhhbmRs ZXIoImNyZWF0ZVNpZGViYXJQYW5lIiwgdGhpcy5fb25DcmVhdGVTaWRlYmFyLmJpbmQodGhpcykp OwogICAgIHRoaXMuX3JlZ2lzdGVySGFuZGxlcigibG9nIiwgdGhpcy5fb25Mb2cuYmluZCh0aGlz KSk7CkBAIC0yNjUsNiArMjY2LDExIEBAIFdlYkluc3BlY3Rvci5FeHRlbnNpb25TZXJ2ZXIucHJv dG90eXBlID0gewogICAgICAgICByZXR1cm4gcmVzcG9uc2U7CiAgICAgfSwKIAorICAgIF9vbkdl dFBhZ2VUaW1pbmdzOiBmdW5jdGlvbigpCisgICAgeworICAgICAgICByZXR1cm4gKG5ldyBXZWJJ bnNwZWN0b3IuSEFSTG9nKCkpLmJ1aWxkTWFpblJlc291cmNlVGltaW5ncygpOworICAgIH0sCisK ICAgICBfb25BZGRBdWRpdENhdGVnb3J5OiBmdW5jdGlvbihyZXF1ZXN0KQogICAgIHsKICAgICAg ICAgdmFyIGNhdGVnb3J5ID0gbmV3IFdlYkluc3BlY3Rvci5FeHRlbnNpb25BdWRpdENhdGVnb3J5 KHJlcXVlc3QuaWQsIHJlcXVlc3QuZGlzcGxheU5hbWUsIHJlcXVlc3QucnVsZUNvdW50KTsKZGlm ZiAtLWdpdCBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IQVJFbnRyeS5qcyBiL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IQVJFbnRyeS5qcwppbmRleCA4NWU0ZjU5Li4yY2YwNzQw IDEwMDY0NAotLS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSEFSRW50cnkuanMKKysr IGIvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hBUkVudHJ5LmpzCkBAIC0xOTIsMjMgKzE5 MiwzMSBAQCBXZWJJbnNwZWN0b3IuSEFSTG9nLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAg ICBzdGFydGVkRGF0ZVRpbWU6IG5ldyBEYXRlKFdlYkluc3BlY3Rvci5tYWluUmVzb3VyY2Uuc3Rh cnRUaW1lICogMTAwMCksCiAgICAgICAgICAgICAgICAgaWQ6IFdlYkluc3BlY3Rvci5tYWluUmVz b3VyY2UuZG9jdW1lbnRVUkwsCiAgICAgICAgICAgICAgICAgdGl0bGU6ICIiLAotICAgICAgICAg ICAgICAgIHBhZ2VUaW1pbmdzOiB0aGlzLl9idWlsZE1haW5SZXNvdXJjZVRpbWluZ3MoKQorICAg ICAgICAgICAgICAgIHBhZ2VUaW1pbmdzOiB0aGlzLmJ1aWxkTWFpblJlc291cmNlVGltaW5ncygp CiAgICAgICAgICAgICB9CiAgICAgICAgIF07CiAgICAgfSwKIAotICAgIF9idWlsZE1haW5SZXNv dXJjZVRpbWluZ3M6IGZ1bmN0aW9uKCkKKyAgICBidWlsZE1haW5SZXNvdXJjZVRpbWluZ3M6IGZ1 bmN0aW9uKCkKICAgICB7CiAgICAgICAgIHZhciByZXNvdXJjZXNQYW5lbCA9IFdlYkluc3BlY3Rv ci5wYW5lbHMucmVzb3VyY2VzOwogICAgICAgICB2YXIgc3RhcnRUaW1lID0gV2ViSW5zcGVjdG9y Lm1haW5SZXNvdXJjZS5zdGFydFRpbWU7CiAgICAgICAgIHJldHVybiB7Ci0gICAgICAgICAgICAg b25Db250ZW50TG9hZDogV2ViSW5zcGVjdG9yLkhBUkVudHJ5Ll90b01pbGxpc2Vjb25kcyhyZXNv dXJjZXNQYW5lbC5tYWluUmVzb3VyY2VET01Db250ZW50VGltZSAtIHN0YXJ0VGltZSksCi0gICAg ICAgICAgICAgb25Mb2FkOiBXZWJJbnNwZWN0b3IuSEFSRW50cnkuX3RvTWlsbGlzZWNvbmRzKHJl c291cmNlc1BhbmVsLm1haW5SZXNvdXJjZUxvYWRUaW1lIC0gc3RhcnRUaW1lKSwKKyAgICAgICAg ICAgICBvbkNvbnRlbnRMb2FkOiB0aGlzLl9wYWdlRXZlbnRUaW1lKHJlc291cmNlc1BhbmVsLm1h aW5SZXNvdXJjZURPTUNvbnRlbnRUaW1lKSwKKyAgICAgICAgICAgICBvbkxvYWQ6IHRoaXMuX3Bh Z2VFdmVudFRpbWUocmVzb3VyY2VzUGFuZWwubWFpblJlc291cmNlTG9hZFRpbWUpLAogICAgICAg ICB9CiAgICAgfSwKIAogICAgIF9jb252ZXJ0UmVzb3VyY2U6IGZ1bmN0aW9uKGlkKQogICAgIHsK ICAgICAgICAgcmV0dXJuIChuZXcgV2ViSW5zcGVjdG9yLkhBUkVudHJ5KFdlYkluc3BlY3Rvci5y ZXNvdXJjZXNbaWRdKSkuYnVpbGQoKTsKKyAgICB9LAorCisgICAgX3BhZ2VFdmVudFRpbWU6IGZ1 bmN0aW9uKHRpbWUpCisgICAgeworICAgICAgICB2YXIgc3RhcnRUaW1lID0gV2ViSW5zcGVjdG9y Lm1haW5SZXNvdXJjZS5zdGFydFRpbWU7CisgICAgICAgIGlmICh0aW1lID09PSAtMSB8fCBzdGFy dFRpbWUgPT09IC0xKQorICAgICAgICAgICAgcmV0dXJuIC0xOworICAgICAgICByZXR1cm4gV2Vi SW5zcGVjdG9yLkhBUkVudHJ5Ll90b01pbGxpc2Vjb25kcyh0aW1lIC0gc3RhcnRUaW1lKTsKICAg ICB9CiB9OwpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2luc3BlY3Rv ci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9pbnNwZWN0b3IuanMKaW5kZXggM2Vk YWU4Zi4uNGIzNGRkZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL2lu c3BlY3Rvci5qcworKysgYi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvaW5zcGVjdG9yLmpz CkBAIC0xMjk0LDIzICsxMjk0LDI1IEBAIFdlYkluc3BlY3Rvci51cGRhdGVSZXNvdXJjZSA9IGZ1 bmN0aW9uKHBheWxvYWQpCiAgICAgICAgIGlmIChwYXlsb2FkLmVuZFRpbWUpCiAgICAgICAgICAg ICByZXNvdXJjZS5lbmRUaW1lID0gcGF5bG9hZC5lbmRUaW1lOwogCi0gICAgICAgIGlmIChwYXls b2FkLmxvYWRFdmVudFRpbWUpIHsKKyAgICAgICAgaWYgKHJlc291cmNlLm1haW5SZXNvdXJjZSkg ewogICAgICAgICAgICAgLy8gVGhpcyBsb2FkRXZlbnRUaW1lIGlzIGZvciB0aGUgbWFpbiByZXNv dXJjZSwgYW5kIHdlIHdhbnQgdG8gc2hvdyBpdAogICAgICAgICAgICAgLy8gZm9yIGFsbCByZXNv dXJjZXMgb24gdGhpcyBwYWdlLiBUaGlzIG1lYW5zIHdlIHdhbnQgdG8gc2V0IGl0IGFzIGEgbWVt YmVyCiAgICAgICAgICAgICAvLyBvZiB0aGUgcmVzb3VyY2VzIHBhbmVsIGluc3RlYWQgb2YgdGhl IGluZGl2aWR1YWwgcmVzb3VyY2UuCi0gICAgICAgICAgICB0aGlzLnBhbmVscy5yZXNvdXJjZXMu bWFpblJlc291cmNlTG9hZFRpbWUgPSBwYXlsb2FkLmxvYWRFdmVudFRpbWU7Ci0gICAgICAgICAg ICB0aGlzLnBhbmVscy5hdWRpdHMubWFpblJlc291cmNlTG9hZFRpbWUgPSBwYXlsb2FkLmxvYWRF dmVudFRpbWU7CisgICAgICAgICAgICB2YXIgbG9hZEV2ZW50VGltZSA9IHBheWxvYWQubG9hZEV2 ZW50VGltZSB8fCAtMTsKKyAgICAgICAgICAgIHRoaXMucGFuZWxzLnJlc291cmNlcy5tYWluUmVz b3VyY2VMb2FkVGltZSA9IGxvYWRFdmVudFRpbWU7CisgICAgICAgICAgICBpZiAobG9hZEV2ZW50 VGltZSAhPT0gLTEpCisgICAgICAgICAgICAgICAgdGhpcy5wYW5lbHMuYXVkaXRzLm1haW5SZXNv dXJjZUxvYWRUaW1lID0gbG9hZEV2ZW50VGltZTsKICAgICAgICAgICAgIGlmICh0aGlzLnBhbmVs cy5uZXR3b3JrKQotICAgICAgICAgICAgICAgIHRoaXMucGFuZWxzLm5ldHdvcmsubWFpblJlc291 cmNlTG9hZFRpbWUgPSBwYXlsb2FkLmxvYWRFdmVudFRpbWU7Ci0gICAgICAgIH0KKyAgICAgICAg ICAgICAgICB0aGlzLnBhbmVscy5uZXR3b3JrLm1haW5SZXNvdXJjZUxvYWRUaW1lID0gbG9hZEV2 ZW50VGltZTsKIAotICAgICAgICBpZiAocGF5bG9hZC5kb21Db250ZW50RXZlbnRUaW1lKSB7CiAg ICAgICAgICAgICAvLyBUaGlzIGRvbUNvbnRlbnRFdmVudFRpbWUgaXMgZm9yIHRoZSBtYWluIHJl c291cmNlLCBzbyBpdCBzaG91bGQgZ28gaW4KICAgICAgICAgICAgIC8vIHRoZSByZXNvdXJjZXMg cGFuZWwgZm9yIHRoZSBzYW1lIHJlYXNvbnMgYXMgYWJvdmUuCi0gICAgICAgICAgICB0aGlzLnBh bmVscy5yZXNvdXJjZXMubWFpblJlc291cmNlRE9NQ29udGVudFRpbWUgPSBwYXlsb2FkLmRvbUNv bnRlbnRFdmVudFRpbWU7Ci0gICAgICAgICAgICB0aGlzLnBhbmVscy5hdWRpdHMubWFpblJlc291 cmNlRE9NQ29udGVudFRpbWUgPSBwYXlsb2FkLmRvbUNvbnRlbnRFdmVudFRpbWU7CisgICAgICAg ICAgICB2YXIgZG9tQ29udGVudEV2ZW50VGltZSA9IHBheWxvYWQuZG9tQ29udGVudEV2ZW50VGlt ZSB8fCAtMTsKKyAgICAgICAgICAgIHRoaXMucGFuZWxzLnJlc291cmNlcy5tYWluUmVzb3VyY2VE T01Db250ZW50VGltZSA9IGRvbUNvbnRlbnRFdmVudFRpbWU7CisgICAgICAgICAgICBpZiAobG9h ZEV2ZW50VGltZSAhPT0gLTEpCisgICAgICAgICAgICAgICAgdGhpcy5wYW5lbHMuYXVkaXRzLm1h aW5SZXNvdXJjZURPTUNvbnRlbnRUaW1lID0gZG9tQ29udGVudEV2ZW50VGltZTsKICAgICAgICAg ICAgIGlmICh0aGlzLnBhbmVscy5uZXR3b3JrKQotICAgICAgICAgICAgICAgIHRoaXMucGFuZWxz Lm5ldHdvcmsubWFpblJlc291cmNlRE9NQ29udGVudFRpbWUgPSBwYXlsb2FkLmRvbUNvbnRlbnRF dmVudFRpbWU7CisgICAgICAgICAgICAgICAgdGhpcy5wYW5lbHMubmV0d29yay5tYWluUmVzb3Vy Y2VET01Db250ZW50VGltZSA9IGRvbUNvbnRlbnRFdmVudFRpbWU7CiAgICAgICAgIH0KICAgICB9 CiAK 69461 2010-10-01 06:35:17 -0700 2010-10-01 06:35:17 -0700 patch to land pagetimings.diff text/plain 7759 caseq ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmOTdkZmZlLi42MTZiMWYyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMTAt MDEgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZp ZXdlZCBieSBQYXZlbCBGZWxkbWFuLgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtFeHRlbnNp b25zIEFQSV0gZXhwb3NlIHBhZ2UgbG9hZCBldmVudHMgdGltaW5ncworICAgICAgICBBZGRlZCB3 ZWJJbnNwZWN0b3IucmVzb3VyY2VzLmdldFBhZ2VUaW1pbmdzKCkKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ1OTU0CisKKyAgICAgICAgKiBpbnNwZWN0 b3IvZXh0ZW5zaW9ucy1hcGktZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGluc3BlY3Rvci9leHRl bnNpb25zLXJlc291cmNlcy1leHBlY3RlZC50eHQ6CisgICAgICAgICogaW5zcGVjdG9yL2V4dGVu c2lvbnMtcmVzb3VyY2VzLmh0bWw6CisKIDIwMTAtMTAtMDEgIENzYWJhIE9zenRyb2dvbsOhYyAg PG9zc3lAd2Via2l0Lm9yZz4KIAogICAgICAgICBVbnJldmlld2VkIHJvbGxpbmcgb3V0IHI2ODYz MywgYmVjYXVzZSB3ZSBkb24ndCBuZWVkIFF0IHNwZWNpZmljIGV4cGVjdGVkIHJlc3VsdHMgYW55 IG1vcmUuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZXh0ZW5zaW9ucy1hcGkt ZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2V4dGVuc2lvbnMtYXBpLWV4cGVj dGVkLnR4dAppbmRleCA5NWQzYTI2Li5mZGEwODQyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9p bnNwZWN0b3IvZXh0ZW5zaW9ucy1hcGktZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2lu c3BlY3Rvci9leHRlbnNpb25zLWFwaS1leHBlY3RlZC50eHQKQEAgLTU5LDYgKzU5LDcgQEAgUlVO TklORyBURVNUOiBleHRlbnNpb25fdGVzdEFQSQogICAgICAgICB9CiAgICAgICAgIGdldEFsbCA6 IDxmdW5jdGlvbj4KICAgICAgICAgZ2V0IDogPGZ1bmN0aW9uPgorICAgICAgICBnZXRQYWdlVGlt aW5ncyA6IDxmdW5jdGlvbj4KICAgICB9CiAgICAgb25SZXNldCA6IHsKICAgICAgICAgYWRkTGlz dGVuZXIgOiA8ZnVuY3Rpb24+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZXh0 ZW5zaW9ucy1yZXNvdXJjZXMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL2V4 dGVuc2lvbnMtcmVzb3VyY2VzLWV4cGVjdGVkLnR4dAppbmRleCAwMjljYmI4Li4xNzlkM2NjIDEw MDY0NAotLS0gYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZXh0ZW5zaW9ucy1yZXNvdXJjZXMtZXhw ZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRlbnNpb25zLXJlc291cmNl cy1leHBlY3RlZC50eHQKQEAgLTE1LDYgKzE1LDEyIEBAIHJlc291cmNlOiAuLi4vaW5zcGVjdG9y L3Jlc291cmNlcy9hdWRpdHMtc3R5bGUxLmNzcywgdHlwZTogc3R5bGVzaGVldAogcmVzb3VyY2U6 IC4uLi9pbnNwZWN0b3IvcmVzb3VyY2VzL21pc3NpbmctaW1hZ2UucG5nLCB0eXBlOiBvdGhlcgog UlVOTklORyBURVNUOiBleHRlbnNpb25fdGVzdEdldEludmFsaWRSZXNvdXJjZQogQXR0ZW1wdGVk IHRvIHJldHJpZXZlIGludmFsaWQgcmVzb3VyY2U6IHsiY29kZSI6IkVfTk9URk9VTkQiLCJkZXNj cmlwdGlvbiI6Ik9iamVjdCBub3QgZm91bmQ6ICVzIiwiZGV0YWlscyI6WzIxMjg1MDZdLCJpc0Vy cm9yIjp0cnVlfQorUlVOTklORyBURVNUOiBleHRlbnNpb25fdGVzdEdldFBhZ2VUaW1pbmdzCitH b3QgY2FsbGJhY2sgZnJvbSBnZXRQYWdlVGltaW5ncywgcGFnZVRpbWluZ3MgZHVtcCBmb2xsb3dz Cit7CisgICAgb25Db250ZW50TG9hZCA6IDxudW1iZXI+CisgICAgb25Mb2FkIDogPG51bWJlcj4K K30KIFJVTk5JTkcgVEVTVDogZXh0ZW5zaW9uX3Rlc3RSZXNvdXJjZU5vdGlmaWNhdGlvbgogUmVz b3VyY2UgZmluaXNoZWQ6IC4uLi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvZXh0ZW5zaW9ucy1yZXNv dXJjZXMuaHRtbAogQWxsIHRlc3RzIGRvbmUuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNw ZWN0b3IvZXh0ZW5zaW9ucy1yZXNvdXJjZXMuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci9l eHRlbnNpb25zLXJlc291cmNlcy5odG1sCmluZGV4IGE2YTE1YjQuLmRhOTg3OGYgMTAwNzU1Ci0t LSBhL0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRlbnNpb25zLXJlc291cmNlcy5odG1sCisrKyBi L0xheW91dFRlc3RzL2luc3BlY3Rvci9leHRlbnNpb25zLXJlc291cmNlcy5odG1sCkBAIC00Miw2 ICs0MiwxNiBAQCBmdW5jdGlvbiBleHRlbnNpb25fdGVzdEdldEludmFsaWRSZXNvdXJjZShuZXh0 VGVzdCkKICAgICB3ZWJJbnNwZWN0b3IucmVzb3VyY2VzLmdldCgyMTI4NTA2LCBjYWxsYmFja0Fu ZE5leHRUZXN0KG9uUmVzb3VyY2UsIG5leHRUZXN0KSk7CiB9CiAKK2Z1bmN0aW9uIGV4dGVuc2lv bl90ZXN0R2V0UGFnZVRpbWluZ3MobmV4dFRlc3QpCit7CisgICAgZnVuY3Rpb24gb25UaW1pbmdz KHJlc3VsdCkKKyAgICB7CisgICAgICAgIG91dHB1dCgiR290IGNhbGxiYWNrIGZyb20gZ2V0UGFn ZVRpbWluZ3MsIHBhZ2VUaW1pbmdzIGR1bXAgZm9sbG93cyIpOworICAgICAgICBkdW1wT2JqZWN0 KHJlc3VsdCwgeyBvbkNvbnRlbnRMb2FkOiAxLCBvbkxvYWQ6IDEgfSk7CisgICAgfQorICAgIHdl Ykluc3BlY3Rvci5yZXNvdXJjZXMuZ2V0UGFnZVRpbWluZ3MoY2FsbGJhY2tBbmROZXh0VGVzdChv blRpbWluZ3MsIG5leHRUZXN0KSk7Cit9CisKIGZ1bmN0aW9uIGRvWEhSKCkKIHsKICAgICB2YXIg eGhyID0gbmV3IFhNTEh0dHBSZXF1ZXN0KCk7CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxv ZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDhkMmI2NWMuLjBhOWMyMDAgMTAwNjQ0Ci0tLSBh L1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjYg QEAKKzIwMTAtMTAtMDEgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgorCisgICAgICAgIFdlYiBJbnNwZWN0 b3I6IFtFeHRlbnNpb25zIEFQSV0gZXhwb3NlIHBhZ2UgbG9hZCBldmVudHMgdGltaW5ncworICAg ICAgICBBZGRlZCB3ZWJJbnNwZWN0b3IucmVzb3VyY2VzLmdldFBhZ2VUaW1pbmdzKCkKKyAgICAg ICAgCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NTk1 NAorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25BUEkuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuaW5qZWN0ZWRFeHRlbnNpb25BUEkuUmVzb3VyY2VzLnByb3RvdHlw ZSk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuaW5qZWN0ZWRFeHRlbnNpb25BUEkuUmVzb3VyY2Vz LnByb3RvdHlwZS5nZXRQYWdlVGltaW5ncyk6CisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVu ZC9FeHRlbnNpb25TZXJ2ZXIuanM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRXh0ZW5zaW9uU2Vy dmVyKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5FeHRlbnNpb25TZXJ2ZXIucHJvdG90eXBlLl9v bkdldFBhZ2VUaW1pbmdzKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL0hBUkVudHJ5 LmpzOiBSZXR1cm4gcGFnZSBldmVudCB0aW1pbmdzIGFzIC0xIGlmIHN0YXJ0IG9yIGV2ZW50IHRp bWUgdW5rbm93bi4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5IQVJMb2cucHJvdG90eXBlLl9idWls ZFBhZ2VzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IQVJMb2cucHJvdG90eXBlLmJ1aWxkTWFp blJlc291cmNlVGltaW5ncyk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuSEFSTG9nLnByb3RvdHlw ZS5fY29udmVydFJlc291cmNlKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5IQVJMb2cucHJvdG90 eXBlLl9wYWdlRXZlbnRUaW1lKToKKyAgICAgICAgKiBpbnNwZWN0b3IvZnJvbnQtZW5kL2luc3Bl Y3Rvci5qczogUmVzZXQgcGFnZSBldmVudCB0aW1pbmdzIHdoZW4gcmVjZWl2aW5nIHN0YXJ0IHRp bWUgZm9yIG1haW4gcmVzb3VyY2UuCisgICAgICAgIChXZWJJbnNwZWN0b3IudXBkYXRlUmVzb3Vy Y2UpOgorCiAyMDEwLTEwLTAxICBQYXRyaWNrIEdhbnN0ZXJlciAgPHBhcm9nYUB3ZWJraXQub3Jn PgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gUm9iZW4uCmRpZmYgLS1naXQgYS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uQVBJLmpzIGIvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL0V4dGVuc2lvbkFQSS5qcwppbmRleCA2NGY1NDgyLi45MDYyMTI2IDEwMDY0NAot LS0gYS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uQVBJLmpzCisrKyBiL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9FeHRlbnNpb25BUEkuanMKQEAgLTEyMyw2ICsxMjMs MTEgQEAgUmVzb3VyY2VzLnByb3RvdHlwZSA9IHsKICAgICBnZXQ6IGZ1bmN0aW9uKGlkLCBjYWxs YmFjaykKICAgICB7CiAgICAgICAgIHJldHVybiBleHRlbnNpb25TZXJ2ZXIuc2VuZFJlcXVlc3Qo eyBjb21tYW5kOiAiZ2V0UmVzb3VyY2VzIiwgaWQ6IGlkIH0sIGNhbGxiYWNrKTsKKyAgICB9LAor CisgICAgZ2V0UGFnZVRpbWluZ3M6IGZ1bmN0aW9uKGNhbGxiYWNrKQorICAgIHsKKyAgICAgICAg cmV0dXJuIGV4dGVuc2lvblNlcnZlci5zZW5kUmVxdWVzdCh7IGNvbW1hbmQ6ICJnZXRQYWdlVGlt aW5ncyIgfSwgY2FsbGJhY2spOwogICAgIH0KIH0KIApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9pbnNw ZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qcyBiL1dlYkNvcmUvaW5zcGVjdG9yL2Zy b250LWVuZC9FeHRlbnNpb25TZXJ2ZXIuanMKaW5kZXggYmRmM2EyNS4uYzhhOTVhMCAxMDA2NDQK LS0tIGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0V4dGVuc2lvblNlcnZlci5qcworKysg Yi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvRXh0ZW5zaW9uU2VydmVyLmpzCkBAIC0zOCw2 ICszOCw3IEBAIFdlYkluc3BlY3Rvci5FeHRlbnNpb25TZXJ2ZXIgPSBmdW5jdGlvbigpCiAgICAg dGhpcy5fcmVnaXN0ZXJIYW5kbGVyKCJzdWJzY3JpYmUiLCB0aGlzLl9vblN1YnNjcmliZS5iaW5k KHRoaXMpKTsKICAgICB0aGlzLl9yZWdpc3RlckhhbmRsZXIoInVuc3Vic2NyaWJlIiwgdGhpcy5f b25VbnN1YnNjcmliZS5iaW5kKHRoaXMpKTsKICAgICB0aGlzLl9yZWdpc3RlckhhbmRsZXIoImdl dFJlc291cmNlcyIsIHRoaXMuX29uR2V0UmVzb3VyY2VzLmJpbmQodGhpcykpOworICAgIHRoaXMu X3JlZ2lzdGVySGFuZGxlcigiZ2V0UGFnZVRpbWluZ3MiLCB0aGlzLl9vbkdldFBhZ2VUaW1pbmdz LmJpbmQodGhpcykpOwogICAgIHRoaXMuX3JlZ2lzdGVySGFuZGxlcigiY3JlYXRlUGFuZWwiLCB0 aGlzLl9vbkNyZWF0ZVBhbmVsLmJpbmQodGhpcykpOwogICAgIHRoaXMuX3JlZ2lzdGVySGFuZGxl cigiY3JlYXRlU2lkZWJhclBhbmUiLCB0aGlzLl9vbkNyZWF0ZVNpZGViYXIuYmluZCh0aGlzKSk7 CiAgICAgdGhpcy5fcmVnaXN0ZXJIYW5kbGVyKCJsb2ciLCB0aGlzLl9vbkxvZy5iaW5kKHRoaXMp KTsKQEAgLTI2NSw2ICsyNjYsMTEgQEAgV2ViSW5zcGVjdG9yLkV4dGVuc2lvblNlcnZlci5wcm90 b3R5cGUgPSB7CiAgICAgICAgIHJldHVybiByZXNwb25zZTsKICAgICB9LAogCisgICAgX29uR2V0 UGFnZVRpbWluZ3M6IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIHJldHVybiAobmV3IFdlYklu c3BlY3Rvci5IQVJMb2coKSkuYnVpbGRNYWluUmVzb3VyY2VUaW1pbmdzKCk7CisgICAgfSwKKwog ICAgIF9vbkFkZEF1ZGl0Q2F0ZWdvcnk6IGZ1bmN0aW9uKHJlcXVlc3QpCiAgICAgewogICAgICAg ICB2YXIgY2F0ZWdvcnkgPSBuZXcgV2ViSW5zcGVjdG9yLkV4dGVuc2lvbkF1ZGl0Q2F0ZWdvcnko cmVxdWVzdC5pZCwgcmVxdWVzdC5kaXNwbGF5TmFtZSwgcmVxdWVzdC5ydWxlQ291bnQpOwpkaWZm IC0tZ2l0IGEvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hBUkVudHJ5LmpzIGIvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0hBUkVudHJ5LmpzCmluZGV4IDg1ZTRmNTkuLjJjZjA3NDAg MTAwNjQ0Ci0tLSBhL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9IQVJFbnRyeS5qcworKysg Yi9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvSEFSRW50cnkuanMKQEAgLTE5MiwyMyArMTky LDMxIEBAIFdlYkluc3BlY3Rvci5IQVJMb2cucHJvdG90eXBlID0gewogICAgICAgICAgICAgICAg IHN0YXJ0ZWREYXRlVGltZTogbmV3IERhdGUoV2ViSW5zcGVjdG9yLm1haW5SZXNvdXJjZS5zdGFy dFRpbWUgKiAxMDAwKSwKICAgICAgICAgICAgICAgICBpZDogV2ViSW5zcGVjdG9yLm1haW5SZXNv dXJjZS5kb2N1bWVudFVSTCwKICAgICAgICAgICAgICAgICB0aXRsZTogIiIsCi0gICAgICAgICAg ICAgICAgcGFnZVRpbWluZ3M6IHRoaXMuX2J1aWxkTWFpblJlc291cmNlVGltaW5ncygpCisgICAg ICAgICAgICAgICAgcGFnZVRpbWluZ3M6IHRoaXMuYnVpbGRNYWluUmVzb3VyY2VUaW1pbmdzKCkK ICAgICAgICAgICAgIH0KICAgICAgICAgXTsKICAgICB9LAogCi0gICAgX2J1aWxkTWFpblJlc291 cmNlVGltaW5nczogZnVuY3Rpb24oKQorICAgIGJ1aWxkTWFpblJlc291cmNlVGltaW5nczogZnVu Y3Rpb24oKQogICAgIHsKICAgICAgICAgdmFyIHJlc291cmNlc1BhbmVsID0gV2ViSW5zcGVjdG9y LnBhbmVscy5yZXNvdXJjZXM7CiAgICAgICAgIHZhciBzdGFydFRpbWUgPSBXZWJJbnNwZWN0b3Iu bWFpblJlc291cmNlLnN0YXJ0VGltZTsKICAgICAgICAgcmV0dXJuIHsKLSAgICAgICAgICAgICBv bkNvbnRlbnRMb2FkOiBXZWJJbnNwZWN0b3IuSEFSRW50cnkuX3RvTWlsbGlzZWNvbmRzKHJlc291 cmNlc1BhbmVsLm1haW5SZXNvdXJjZURPTUNvbnRlbnRUaW1lIC0gc3RhcnRUaW1lKSwKLSAgICAg ICAgICAgICBvbkxvYWQ6IFdlYkluc3BlY3Rvci5IQVJFbnRyeS5fdG9NaWxsaXNlY29uZHMocmVz b3VyY2VzUGFuZWwubWFpblJlc291cmNlTG9hZFRpbWUgLSBzdGFydFRpbWUpLAorICAgICAgICAg ICAgIG9uQ29udGVudExvYWQ6IHRoaXMuX3BhZ2VFdmVudFRpbWUocmVzb3VyY2VzUGFuZWwubWFp blJlc291cmNlRE9NQ29udGVudFRpbWUpLAorICAgICAgICAgICAgIG9uTG9hZDogdGhpcy5fcGFn ZUV2ZW50VGltZShyZXNvdXJjZXNQYW5lbC5tYWluUmVzb3VyY2VMb2FkVGltZSksCiAgICAgICAg IH0KICAgICB9LAogCiAgICAgX2NvbnZlcnRSZXNvdXJjZTogZnVuY3Rpb24oaWQpCiAgICAgewog ICAgICAgICByZXR1cm4gKG5ldyBXZWJJbnNwZWN0b3IuSEFSRW50cnkoV2ViSW5zcGVjdG9yLnJl c291cmNlc1tpZF0pKS5idWlsZCgpOworICAgIH0sCisKKyAgICBfcGFnZUV2ZW50VGltZTogZnVu Y3Rpb24odGltZSkKKyAgICB7CisgICAgICAgIHZhciBzdGFydFRpbWUgPSBXZWJJbnNwZWN0b3Iu bWFpblJlc291cmNlLnN0YXJ0VGltZTsKKyAgICAgICAgaWYgKHRpbWUgPT09IC0xIHx8IHN0YXJ0 VGltZSA9PT0gLTEpCisgICAgICAgICAgICByZXR1cm4gLTE7CisgICAgICAgIHJldHVybiBXZWJJ bnNwZWN0b3IuSEFSRW50cnkuX3RvTWlsbGlzZWNvbmRzKHRpbWUgLSBzdGFydFRpbWUpOwogICAg IH0KIH07Cg==