34450 2010-02-01 14:33:47 -0800 [Qt] Enable a way to measure FPS in QGVLauncher 2010-02-02 03:38:33 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC All RESOLVED FIXED P2 Normal --- 1 noam noam ariya.hidayat commit-queue oldest_to_newest 186576 0 noam 2010-02-01 14:33:47 -0800 This is needed in order to measure improvements to CSS accelerated compositing and general improvements to QtWebkit graphics 186577 1 47871 noam 2010-02-01 14:40:13 -0800 Created attachment 47871 Add a command line argument to enable crude FPS measurements in QGVLauncher This is required for measuring improvements in QtWebkit graphics and in CSS accelerated-compositing. 186670 2 47871 ariya.hidayat 2010-02-01 16:15:39 -0800 Comment on attachment 47871 Add a command line argument to enable crude FPS measurements in QGVLauncher > + , m_measureFps(QApplication::instance()->arguments().contains("--fps")) Maybe --show-fps is a better name? > + QTime now = QTime::currentTime(); > + int msecs = m_startTime.msecsTo(now); > + int totalMsecs = m_totalStartTime.msecsTo(now); > + int totalFps = m_numTotalPaints * 1000 / totalMsecs; > + int curFps = m_numPaintsSinceLastMeasure * 1000 / msecs; Please guard against divide-by-zero (yes, that might happen accidently :) r- for this minor issues. Otherwise, looks good. 186703 3 47881 noam 2010-02-01 16:57:47 -0800 Created attachment 47881 FPS counter: changed name to --show-fps, guard from div-by-0 ok - this should do it. 186705 4 47882 noam 2010-02-01 16:58:58 -0800 Created attachment 47882 FPS counter: changed name to --show-fps, guard from div-by-0 oops, re-uploading 186773 5 ariya.hidayat 2010-02-01 20:07:27 -0800 LGTM! Good job :) 186895 6 47882 commit-queue 2010-02-02 03:38:27 -0800 Comment on attachment 47882 FPS counter: changed name to --show-fps, guard from div-by-0 Clearing flags on attachment: 47882 Committed r54222: <http://trac.webkit.org/changeset/54222> 186896 7 commit-queue 2010-02-02 03:38:33 -0800 All reviewed patches have been landed. Closing bug. 47871 2010-02-01 14:40:13 -0800 2010-02-01 16:57:47 -0800 Add a command line argument to enable crude FPS measurements in QGVLauncher patch-fps1.diff text/plain 3289 noam SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNTQxNTIpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDItMDEgIE5vYW0gUm9zZW50aGFsICA8bm9hbS5y b3NlbnRoYWxAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFtRdF0gRW5hYmxlIGEgd2F5IHRvIG1lYXN1cmUgRlBTIGluIFFHVkxhdW5j aGVyCisgICAgICAgIHJ1biBRR1ZMYXVuY2hlciB3aXRoIC0tZnBzIHRvIHNlZSBvbmdvaW5nIGZw cyBtZWFzdXJlbWVudHMKKyAgICAgICAgVGhpcyBpcyBub3QgbWVhbnQgYXMgYWNjdXJhdGUgRlBT LCBidXQgcmF0aGVyIGFzIGEgd2F5IHRvIGZpbmQKKyAgICAgICAgaW1wcm92ZW1lbnRzL3JlZ3Jl c3Npb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0z NDQ1MAorCisgICAgICAgICogUUdWTGF1bmNoZXIvbWFpbi5jcHA6CisgICAgICAgIChNYWluVmll dzo6TWFpblZpZXcpOiBpbml0aWFsaXplIEZQUyB2YWx1ZXMKKyAgICAgICAgKE1haW5WaWV3Ojpw YWludEV2ZW50KTogY291bnQgYSBwYWludGVkIGZyYW1lIGhlcmUKKyAgICAgICAgKE1haW5WaWV3 OjpwcmludEZwcyk6IHdlIHByaW50IHRoZSBmcHMgd2l0aCBxRGVidWcgZXZlcnkgNSBzZWNvbmRz LgorCiAyMDEwLTAxLTI5ICBCZW4gTXVyZG9jaCAgPGJlbm1AZ29vZ2xlLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBEaW1pdHJpIEdsYXprb3YuCkluZGV4OiBXZWJLaXQvcXQvUUdWTGF1bmNo ZXIvbWFpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L1FHVkxhdW5jaGVyL21haW4uY3Bw CShyZXZpc2lvbiA1NDE1MCkKKysrIFdlYktpdC9xdC9RR1ZMYXVuY2hlci9tYWluLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTI1LDEyICsxMjUsMjIgQEAgcHVibGljOgogICAgIE1haW5WaWV3KFFX aWRnZXQqIHBhcmVudCkKICAgICAgICAgOiBRR3JhcGhpY3NWaWV3KHBhcmVudCkKICAgICAgICAg LCBtX21haW5XaWRnZXQoMCkKKyAgICAgICAgLCBtX21lYXN1cmVGcHMoUUFwcGxpY2F0aW9uOjpp bnN0YW5jZSgpLT5hcmd1bWVudHMoKS5jb250YWlucygiLS1mcHMiKSkKKyAgICAgICAgLCBtX251 bVRvdGFsUGFpbnRzKDApCisgICAgICAgICwgbV9udW1QYWludHNTaW5jZUxhc3RNZWFzdXJlKDAp CiAgICAgewogICAgICAgICBzZXRIb3Jpem9udGFsU2Nyb2xsQmFyUG9saWN5KFF0OjpTY3JvbGxC YXJBbHdheXNPZmYpOwogICAgICAgICBzZXRWZXJ0aWNhbFNjcm9sbEJhclBvbGljeShRdDo6U2Ny b2xsQmFyQWx3YXlzT2ZmKTsKIAogICAgICAgICBzZXRGcmFtZVNoYXBlKFFGcmFtZTo6Tm9GcmFt ZSk7CiAgICAgICAgIHNldFNpemVQb2xpY3koUVNpemVQb2xpY3k6OkV4cGFuZGluZywgUVNpemVQ b2xpY3k6OkV4cGFuZGluZyk7CisgICAgICAgIGlmIChtX21lYXN1cmVGcHMpIHsKKyAgICAgICAg ICAgIFFUaW1lciogZnBzVGltZXIgPSBuZXcgUVRpbWVyKHRoaXMpOworICAgICAgICAgICAgZnBz VGltZXItPnNldEludGVydmFsKDUwMDApOworICAgICAgICAgICAgbV90b3RhbFN0YXJ0VGltZSA9 IG1fc3RhcnRUaW1lID0gUVRpbWU6OmN1cnJlbnRUaW1lKCk7CisgICAgICAgICAgICBjb25uZWN0 KGZwc1RpbWVyLCBTSUdOQUwodGltZW91dCgpKSwgdGhpcywgU0xPVChwcmludEZwcygpKSk7Cisg ICAgICAgICAgICBmcHNUaW1lci0+c3RhcnQoKTsKKyAgICAgICAgfQogICAgIH0KIAogICAgIHZv aWQgc2V0TWFpbldpZGdldChRR3JhcGhpY3NXaWRnZXQqIHdpZGdldCkKQEAgLTE0OSw2ICsxNTks MTUgQEAgcHVibGljOgogICAgICAgICBtX21haW5XaWRnZXQtPnNldEdlb21ldHJ5KHJlY3QpOwog ICAgIH0KIAorICAgIHZvaWQgcGFpbnRFdmVudChRUGFpbnRFdmVudCogZXZlbnQpCisgICAgewor ICAgICAgICBRR3JhcGhpY3NWaWV3OjpwYWludEV2ZW50KGV2ZW50KTsKKyAgICAgICAgaWYgKG1f bWVhc3VyZUZwcykgeworICAgICAgICAgICAgKyttX251bVBhaW50c1NpbmNlTGFzdE1lYXN1cmU7 CisgICAgICAgICAgICArK21fbnVtVG90YWxQYWludHM7ICAgICAgICAgICAgCisgICAgICAgIH0K KyAgICB9CisKICAgICB2b2lkIHNldFdhaXRDdXJzb3IoKQogICAgIHsKICAgICAgICAgbV9tYWlu V2lkZ2V0LT5zZXRDdXJzb3IoUXQ6OldhaXRDdXJzb3IpOwpAQCAtMTk1LDExICsyMTQsMjkgQEAg cHVibGljIHNsb3RzOgogICAgICAgICBlbWl0IGZsaXBSZXF1ZXN0KCk7CiAgICAgfQogCisgICAg dm9pZCBwcmludEZwcygpCisgICAgeworICAgICAgICAvLyBub3RlIHRoYXQgdGhpcyBtaWdodCBo YXZlIGEgYnVnIGlmIHlvdSBtZWFzdXJlIHJpZ2h0IGFyb3VuZCBtaWRuaWdodCwgYnV0IHdlIGNh biBsaXZlIHdpdGggdGhhdAorICAgICAgICBRVGltZSBub3cgPSBRVGltZTo6Y3VycmVudFRpbWUo KTsKKyAgICAgICAgaW50IG1zZWNzID0gbV9zdGFydFRpbWUubXNlY3NUbyhub3cpOworICAgICAg ICBpbnQgdG90YWxNc2VjcyA9IG1fdG90YWxTdGFydFRpbWUubXNlY3NUbyhub3cpOworICAgICAg ICBpbnQgdG90YWxGcHMgPSBtX251bVRvdGFsUGFpbnRzICogMTAwMCAvIHRvdGFsTXNlY3M7Cisg ICAgICAgIGludCBjdXJGcHMgPSBtX251bVBhaW50c1NpbmNlTGFzdE1lYXN1cmUgKiAxMDAwIC8g bXNlY3M7CisgICAgICAgIHFEZWJ1ZygiW0ZQU10gRnJvbSBzdGFydDogJWQsIGZyb20gbGFzdCBw YWludDogJWQiLCB0b3RhbEZwcywgY3VyRnBzKTsKKyAgICAgICAgbV9zdGFydFRpbWUgPSBub3c7 CisgICAgICAgIG1fbnVtUGFpbnRzU2luY2VMYXN0TWVhc3VyZSA9IDA7CisgICAgfQorCiBzaWdu YWxzOgogICAgIHZvaWQgZmxpcFJlcXVlc3QoKTsKIAogcHJpdmF0ZToKICAgICBRR3JhcGhpY3NX aWRnZXQqIG1fbWFpbldpZGdldDsKKyAgICBib29sIG1fbWVhc3VyZUZwczsKKyAgICBpbnQgbV9u dW1Ub3RhbFBhaW50czsKKyAgICBpbnQgbV9udW1QYWludHNTaW5jZUxhc3RNZWFzdXJlOworICAg IFFUaW1lIG1fc3RhcnRUaW1lOworICAgIFFUaW1lIG1fdG90YWxTdGFydFRpbWU7CiB9OwogCiBj bGFzcyBTaGFyZWRTY2VuZSA6IHB1YmxpYyBRU2hhcmVkRGF0YSB7Cg== 47881 2010-02-01 16:57:47 -0800 2010-02-01 16:58:58 -0800 FPS counter: changed name to --show-fps, guard from div-by-0 patch-fps2.diff text/plain 3323 noam SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNTQxNTIpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDItMDEgIE5vYW0gUm9zZW50aGFsICA8bm9hbS5y b3NlbnRoYWxAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFtRdF0gRW5hYmxlIGEgd2F5IHRvIG1lYXN1cmUgRlBTIGluIFFHVkxhdW5j aGVyCisgICAgICAgIHJ1biBRR1ZMYXVuY2hlciB3aXRoIC0tZnBzIHRvIHNlZSBvbmdvaW5nIGZw cyBtZWFzdXJlbWVudHMKKyAgICAgICAgVGhpcyBpcyBub3QgbWVhbnQgYXMgYWNjdXJhdGUgRlBT LCBidXQgcmF0aGVyIGFzIGEgd2F5IHRvIGZpbmQKKyAgICAgICAgaW1wcm92ZW1lbnRzL3JlZ3Jl c3Npb25zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0z NDQ1MAorCisgICAgICAgICogUUdWTGF1bmNoZXIvbWFpbi5jcHA6CisgICAgICAgIChNYWluVmll dzo6TWFpblZpZXcpOiBpbml0aWFsaXplIEZQUyB2YWx1ZXMKKyAgICAgICAgKE1haW5WaWV3Ojpw YWludEV2ZW50KTogY291bnQgYSBwYWludGVkIGZyYW1lIGhlcmUKKyAgICAgICAgKE1haW5WaWV3 OjpwcmludEZwcyk6IHdlIHByaW50IHRoZSBmcHMgd2l0aCBxRGVidWcgZXZlcnkgNSBzZWNvbmRz LgorCiAyMDEwLTAxLTI5ICBCZW4gTXVyZG9jaCAgPGJlbm1AZ29vZ2xlLmNvbT4KIAogICAgICAg ICBSZXZpZXdlZCBieSBEaW1pdHJpIEdsYXprb3YuCkluZGV4OiBXZWJLaXQvcXQvUUdWTGF1bmNo ZXIvbWFpbi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L1FHVkxhdW5jaGVyL21haW4uY3Bw CShyZXZpc2lvbiA1NDE1MCkKKysrIFdlYktpdC9xdC9RR1ZMYXVuY2hlci9tYWluLmNwcAkod29y a2luZyBjb3B5KQpAQCAtMTI1LDEyICsxMjUsMjIgQEAgcHVibGljOgogICAgIE1haW5WaWV3KFFX aWRnZXQqIHBhcmVudCkKICAgICAgICAgOiBRR3JhcGhpY3NWaWV3KHBhcmVudCkKICAgICAgICAg LCBtX21haW5XaWRnZXQoMCkKKyAgICAgICAgLCBtX21lYXN1cmVGcHMoUUFwcGxpY2F0aW9uOjpp bnN0YW5jZSgpLT5hcmd1bWVudHMoKS5jb250YWlucygiLS1zaG93LWZwcyIpKQorICAgICAgICAs IG1fbnVtVG90YWxQYWludHMoMCkKKyAgICAgICAgLCBtX251bVBhaW50c1NpbmNlTGFzdE1lYXN1 cmUoMCkKICAgICB7CiAgICAgICAgIHNldEhvcml6b250YWxTY3JvbGxCYXJQb2xpY3koUXQ6OlNj cm9sbEJhckFsd2F5c09mZik7CiAgICAgICAgIHNldFZlcnRpY2FsU2Nyb2xsQmFyUG9saWN5KFF0 OjpTY3JvbGxCYXJBbHdheXNPZmYpOwogCiAgICAgICAgIHNldEZyYW1lU2hhcGUoUUZyYW1lOjpO b0ZyYW1lKTsKICAgICAgICAgc2V0U2l6ZVBvbGljeShRU2l6ZVBvbGljeTo6RXhwYW5kaW5nLCBR U2l6ZVBvbGljeTo6RXhwYW5kaW5nKTsKKyAgICAgICAgaWYgKG1fbWVhc3VyZUZwcykgeworICAg ICAgICAgICAgUVRpbWVyKiBmcHNUaW1lciA9IG5ldyBRVGltZXIodGhpcyk7CisgICAgICAgICAg ICBmcHNUaW1lci0+c2V0SW50ZXJ2YWwoNTAwMCk7CisgICAgICAgICAgICBtX3RvdGFsU3RhcnRU aW1lID0gbV9zdGFydFRpbWUgPSBRVGltZTo6Y3VycmVudFRpbWUoKTsKKyAgICAgICAgICAgIGNv bm5lY3QoZnBzVGltZXIsIFNJR05BTCh0aW1lb3V0KCkpLCB0aGlzLCBTTE9UKHByaW50RnBzKCkp KTsKKyAgICAgICAgICAgIGZwc1RpbWVyLT5zdGFydCgpOworICAgICAgICB9CiAgICAgfQogCiAg ICAgdm9pZCBzZXRNYWluV2lkZ2V0KFFHcmFwaGljc1dpZGdldCogd2lkZ2V0KQpAQCAtMTQ5LDYg KzE1OSwxNSBAQCBwdWJsaWM6CiAgICAgICAgIG1fbWFpbldpZGdldC0+c2V0R2VvbWV0cnkocmVj dCk7CiAgICAgfQogCisgICAgdm9pZCBwYWludEV2ZW50KFFQYWludEV2ZW50KiBldmVudCkKKyAg ICB7CisgICAgICAgIFFHcmFwaGljc1ZpZXc6OnBhaW50RXZlbnQoZXZlbnQpOworICAgICAgICBp ZiAobV9tZWFzdXJlRnBzKSB7CisgICAgICAgICAgICArK21fbnVtUGFpbnRzU2luY2VMYXN0TWVh c3VyZTsKKyAgICAgICAgICAgICsrbV9udW1Ub3RhbFBhaW50czsgICAgICAgICAgICAKKyAgICAg ICAgfQorICAgIH0KKwogICAgIHZvaWQgc2V0V2FpdEN1cnNvcigpCiAgICAgewogICAgICAgICBt X21haW5XaWRnZXQtPnNldEN1cnNvcihRdDo6V2FpdEN1cnNvcik7CkBAIC0xOTUsMTEgKzIxNCwy OSBAQCBwdWJsaWMgc2xvdHM6CiAgICAgICAgIGVtaXQgZmxpcFJlcXVlc3QoKTsKICAgICB9CiAK KyAgICB2b2lkIHByaW50RnBzKCkKKyAgICB7CisgICAgICAgIC8vIG5vdGUgdGhhdCB0aGlzIG1p Z2h0IGhhdmUgYSBidWcgaWYgeW91IG1lYXN1cmUgcmlnaHQgYXJvdW5kIG1pZG5pZ2h0LCBidXQg d2UgY2FuIGxpdmUgd2l0aCB0aGF0CisgICAgICAgIFFUaW1lIG5vdyA9IFFUaW1lOjpjdXJyZW50 VGltZSgpOworICAgICAgICBpbnQgbXNlY3MgPSBtX3N0YXJ0VGltZS5tc2Vjc1RvKG5vdyk7Cisg ICAgICAgIGludCB0b3RhbE1zZWNzID0gbV90b3RhbFN0YXJ0VGltZS5tc2Vjc1RvKG5vdyk7Cisg ICAgICAgIGludCB0b3RhbEZwcyA9IHRvdGFsTXNlY3MgPyBtX251bVRvdGFsUGFpbnRzICogMTAw MCAvIHRvdGFsTXNlY3MgOiAwOworICAgICAgICBpbnQgY3VyRnBzID0gbXNlY3MgPyBtX251bVBh aW50c1NpbmNlTGFzdE1lYXN1cmUgKiAxMDAwIC8gbXNlY3MgOiAwOworICAgICAgICBxRGVidWco IltGUFNdIEZyb20gc3RhcnQ6ICVkLCBmcm9tIGxhc3QgcGFpbnQ6ICVkIiwgdG90YWxGcHMsIGN1 ckZwcyk7CisgICAgICAgIG1fc3RhcnRUaW1lID0gbm93OworICAgICAgICBtX251bVBhaW50c1Np bmNlTGFzdE1lYXN1cmUgPSAwOworICAgIH0KKwogc2lnbmFsczoKICAgICB2b2lkIGZsaXBSZXF1 ZXN0KCk7CiAKIHByaXZhdGU6CiAgICAgUUdyYXBoaWNzV2lkZ2V0KiBtX21haW5XaWRnZXQ7Cisg ICAgYm9vbCBtX21lYXN1cmVGcHM7CisgICAgaW50IG1fbnVtVG90YWxQYWludHM7CisgICAgaW50 IG1fbnVtUGFpbnRzU2luY2VMYXN0TWVhc3VyZTsKKyAgICBRVGltZSBtX3N0YXJ0VGltZTsKKyAg ICBRVGltZSBtX3RvdGFsU3RhcnRUaW1lOwogfTsKIAogY2xhc3MgU2hhcmVkU2NlbmUgOiBwdWJs aWMgUVNoYXJlZERhdGEgewo= 47882 2010-02-01 16:58:58 -0800 2010-02-02 03:38:27 -0800 FPS counter: changed name to --show-fps, guard from div-by-0 patch-fps2.diff text/plain 3328 noam SW5kZXg6IFdlYktpdC9xdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L3F0L0NoYW5n ZUxvZwkocmV2aXNpb24gNTQxNTIpCisrKyBXZWJLaXQvcXQvQ2hhbmdlTG9nCSh3b3JraW5nIGNv cHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDItMDEgIE5vYW0gUm9zZW50aGFsICA8bm9hbS5y b3NlbnRoYWxAbm9raWEuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFtRdF0gRW5hYmxlIGEgd2F5IHRvIG1lYXN1cmUgRlBTIGluIFFHVkxhdW5j aGVyCisgICAgICAgIHJ1biBRR1ZMYXVuY2hlciB3aXRoIC0tc2hvdy1mcHMgdG8gc2VlIG9uZ29p bmcgZnBzIG1lYXN1cmVtZW50cworICAgICAgICBUaGlzIGlzIG5vdCBtZWFudCBhcyBhY2N1cmF0 ZSBGUFMsIGJ1dCByYXRoZXIgYXMgYSB3YXkgdG8gZmluZAorICAgICAgICBpbXByb3ZlbWVudHMv cmVncmVzc2lvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTM0NDUwCisKKyAgICAgICAgKiBRR1ZMYXVuY2hlci9tYWluLmNwcDoKKyAgICAgICAgKE1h aW5WaWV3OjpNYWluVmlldyk6IGluaXRpYWxpemUgRlBTIHZhbHVlcworICAgICAgICAoTWFpblZp ZXc6OnBhaW50RXZlbnQpOiBjb3VudCBhIHBhaW50ZWQgZnJhbWUgaGVyZQorICAgICAgICAoTWFp blZpZXc6OnByaW50RnBzKTogd2UgcHJpbnQgdGhlIGZwcyB3aXRoIHFEZWJ1ZyBldmVyeSA1IHNl Y29uZHMuCisKIDIwMTAtMDEtMjkgIEJlbiBNdXJkb2NoICA8YmVubUBnb29nbGUuY29tPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IERpbWl0cmkgR2xhemtvdi4KSW5kZXg6IFdlYktpdC9xdC9RR1ZM YXVuY2hlci9tYWluLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvcXQvUUdWTGF1bmNoZXIvbWFp bi5jcHAJKHJldmlzaW9uIDU0MTUwKQorKysgV2ViS2l0L3F0L1FHVkxhdW5jaGVyL21haW4uY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC0xMjUsMTIgKzEyNSwyMiBAQCBwdWJsaWM6CiAgICAgTWFpblZp ZXcoUVdpZGdldCogcGFyZW50KQogICAgICAgICA6IFFHcmFwaGljc1ZpZXcocGFyZW50KQogICAg ICAgICAsIG1fbWFpbldpZGdldCgwKQorICAgICAgICAsIG1fbWVhc3VyZUZwcyhRQXBwbGljYXRp b246Omluc3RhbmNlKCktPmFyZ3VtZW50cygpLmNvbnRhaW5zKCItLXNob3ctZnBzIikpCisgICAg ICAgICwgbV9udW1Ub3RhbFBhaW50cygwKQorICAgICAgICAsIG1fbnVtUGFpbnRzU2luY2VMYXN0 TWVhc3VyZSgwKQogICAgIHsKICAgICAgICAgc2V0SG9yaXpvbnRhbFNjcm9sbEJhclBvbGljeShR dDo6U2Nyb2xsQmFyQWx3YXlzT2ZmKTsKICAgICAgICAgc2V0VmVydGljYWxTY3JvbGxCYXJQb2xp Y3koUXQ6OlNjcm9sbEJhckFsd2F5c09mZik7CiAKICAgICAgICAgc2V0RnJhbWVTaGFwZShRRnJh bWU6Ok5vRnJhbWUpOwogICAgICAgICBzZXRTaXplUG9saWN5KFFTaXplUG9saWN5OjpFeHBhbmRp bmcsIFFTaXplUG9saWN5OjpFeHBhbmRpbmcpOworICAgICAgICBpZiAobV9tZWFzdXJlRnBzKSB7 CisgICAgICAgICAgICBRVGltZXIqIGZwc1RpbWVyID0gbmV3IFFUaW1lcih0aGlzKTsKKyAgICAg ICAgICAgIGZwc1RpbWVyLT5zZXRJbnRlcnZhbCg1MDAwKTsKKyAgICAgICAgICAgIG1fdG90YWxT dGFydFRpbWUgPSBtX3N0YXJ0VGltZSA9IFFUaW1lOjpjdXJyZW50VGltZSgpOworICAgICAgICAg ICAgY29ubmVjdChmcHNUaW1lciwgU0lHTkFMKHRpbWVvdXQoKSksIHRoaXMsIFNMT1QocHJpbnRG cHMoKSkpOworICAgICAgICAgICAgZnBzVGltZXItPnN0YXJ0KCk7CisgICAgICAgIH0KICAgICB9 CiAKICAgICB2b2lkIHNldE1haW5XaWRnZXQoUUdyYXBoaWNzV2lkZ2V0KiB3aWRnZXQpCkBAIC0x NDksNiArMTU5LDE1IEBAIHB1YmxpYzoKICAgICAgICAgbV9tYWluV2lkZ2V0LT5zZXRHZW9tZXRy eShyZWN0KTsKICAgICB9CiAKKyAgICB2b2lkIHBhaW50RXZlbnQoUVBhaW50RXZlbnQqIGV2ZW50 KQorICAgIHsKKyAgICAgICAgUUdyYXBoaWNzVmlldzo6cGFpbnRFdmVudChldmVudCk7CisgICAg ICAgIGlmIChtX21lYXN1cmVGcHMpIHsKKyAgICAgICAgICAgICsrbV9udW1QYWludHNTaW5jZUxh c3RNZWFzdXJlOworICAgICAgICAgICAgKyttX251bVRvdGFsUGFpbnRzOyAgICAgICAgICAgIAor ICAgICAgICB9CisgICAgfQorCiAgICAgdm9pZCBzZXRXYWl0Q3Vyc29yKCkKICAgICB7CiAgICAg ICAgIG1fbWFpbldpZGdldC0+c2V0Q3Vyc29yKFF0OjpXYWl0Q3Vyc29yKTsKQEAgLTE5NSwxMSAr MjE0LDI5IEBAIHB1YmxpYyBzbG90czoKICAgICAgICAgZW1pdCBmbGlwUmVxdWVzdCgpOwogICAg IH0KIAorICAgIHZvaWQgcHJpbnRGcHMoKQorICAgIHsKKyAgICAgICAgLy8gbm90ZSB0aGF0IHRo aXMgbWlnaHQgaGF2ZSBhIGJ1ZyBpZiB5b3UgbWVhc3VyZSByaWdodCBhcm91bmQgbWlkbmlnaHQs IGJ1dCB3ZSBjYW4gbGl2ZSB3aXRoIHRoYXQKKyAgICAgICAgUVRpbWUgbm93ID0gUVRpbWU6OmN1 cnJlbnRUaW1lKCk7CisgICAgICAgIGludCBtc2VjcyA9IG1fc3RhcnRUaW1lLm1zZWNzVG8obm93 KTsKKyAgICAgICAgaW50IHRvdGFsTXNlY3MgPSBtX3RvdGFsU3RhcnRUaW1lLm1zZWNzVG8obm93 KTsKKyAgICAgICAgaW50IHRvdGFsRnBzID0gdG90YWxNc2VjcyA/IG1fbnVtVG90YWxQYWludHMg KiAxMDAwIC8gdG90YWxNc2VjcyA6IDA7CisgICAgICAgIGludCBjdXJGcHMgPSBtc2VjcyA/IG1f bnVtUGFpbnRzU2luY2VMYXN0TWVhc3VyZSAqIDEwMDAgLyBtc2VjcyA6IDA7CisgICAgICAgIHFE ZWJ1ZygiW0ZQU10gRnJvbSBzdGFydDogJWQsIGZyb20gbGFzdCBwYWludDogJWQiLCB0b3RhbEZw cywgY3VyRnBzKTsKKyAgICAgICAgbV9zdGFydFRpbWUgPSBub3c7CisgICAgICAgIG1fbnVtUGFp bnRzU2luY2VMYXN0TWVhc3VyZSA9IDA7CisgICAgfQorCiBzaWduYWxzOgogICAgIHZvaWQgZmxp cFJlcXVlc3QoKTsKIAogcHJpdmF0ZToKICAgICBRR3JhcGhpY3NXaWRnZXQqIG1fbWFpbldpZGdl dDsKKyAgICBib29sIG1fbWVhc3VyZUZwczsKKyAgICBpbnQgbV9udW1Ub3RhbFBhaW50czsKKyAg ICBpbnQgbV9udW1QYWludHNTaW5jZUxhc3RNZWFzdXJlOworICAgIFFUaW1lIG1fc3RhcnRUaW1l OworICAgIFFUaW1lIG1fdG90YWxTdGFydFRpbWU7CiB9OwogCiBjbGFzcyBTaGFyZWRTY2VuZSA6 IHB1YmxpYyBRU2hhcmVkRGF0YSB7Cg==