36175 2010-03-16 11:06:44 -0700 [Qt] Make QtLaucher able to select the ViewportUpdateMode 2010-03-17 10:53:02 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) All All RESOLVED FIXED Qt P5 Enhancement --- 35303 1 diegohcg webkit-qt-unassigned benjamin jesus kenneth tonikitoo oldest_to_newest 200300 0 diegohcg 2010-03-16 11:06:44 -0700 Provide to QtLauncher a way to change the ViewPortUpdateMode when it's in graphics based mode. 200310 1 50811 diegohcg 2010-03-16 11:14:41 -0700 Created attachment 50811 Proposed patch 200324 2 50811 kenneth 2010-03-16 11:28:08 -0700 Comment on attachment 50811 Proposed patch > +void LauncherWindow::selectViewportUpdateMode(int mode) select is not a really good name for this. Consider using "change" or "set" > +{ > + if (!isGraphicsBased()) > + return; I guess you should update the gViewportUpdateMode anyway, so you are bailing out a bit too early > + > + gViewportUpdateMode = QGraphicsView::ViewportUpdateMode(mode); > + WebViewGraphicsBased* view = static_cast<WebViewGraphicsBased*>(m_view); > + view->setViewportUpdateMode(gViewportUpdateMode); > +} 200380 3 50827 diegohcg 2010-03-16 12:53:36 -0700 Created attachment 50827 (committed in r56117) Proposed patch Changed according Kenneth's suggestions 200638 4 benjamin 2010-03-17 03:03:58 -0700 Setting the status of the task so it does not appear unassigned. I might misunderstand the purpose of the patch but for me this should not go in QtLauncher. If the objective is to compare performance, you should create a reduction in the webkit benchmarks. Definitely not update the launcher. If the objective is to find bugs, you should add autotests in graphicsview. Why do you need that in the launcher? 200760 5 jesus 2010-03-17 07:16:37 -0700 (In reply to comment #4) > Why do you need that in the launcher? QtLauncher is becoming a more complete test tool of QtWebKit. And we are focusing on mobile tests (Symbian and Maemo). We are following https://bugs.webkit.org/show_bug.cgi?id=35303 requirements, some ideas from Simon and others, to have all command line options as menu options on the Launcher. With this it will become easier to test QtWebKit on Symbian devices. 200772 6 benjamin 2010-03-17 07:35:31 -0700 (In reply to comment #5) > We are following https://bugs.webkit.org/show_bug.cgi?id=35303 requirements, This bug does not say why such options would be required, neither why it is specific to Symbian. 200781 7 jesus 2010-03-17 07:52:45 -0700 (In reply to comment #6) > This bug does not say why such options would be required, neither why it is > specific to Symbian. Yes, that is true. My guess is that No'am is mainly working with Symbian debugging and that is why he opened the bug. But I don't think that those wanted features are Symbian specific, that is why we are leaving them available for any platform/OS. 200854 8 50827 tonikitoo 2010-03-17 10:38:26 -0700 Comment on attachment 50827 (committed in r56117) Proposed patch the ChangeLog was wrong =/ Fixed, and landed manually in r56117 50811 2010-03-16 11:14:41 -0700 2010-03-16 12:53:36 -0700 Proposed patch 0001-Provide-to-QtLauncher-a-way-to-change-the-ViewportUpd.diff text/plain 5191 diegohcg RnJvbSA4ZWUyMWY1N2Y1YmMyZTA0YzcxYzYzOTQ3NzczN2FmMTg0NzBmZDg5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEaWVnbyBHb256YWxleiA8ZGllZ28uZ29uemFsZXpAb3BlbmJv c3NhLm9yZz4KRGF0ZTogTW9uLCAxNSBNYXIgMjAxMCAxNjowNToyMSAtMDQwMApTdWJqZWN0OiBb UEFUQ0hdIFByb3ZpZGUgdG8gUXRMYXVuY2hlciBhIHdheSB0byBjaGFuZ2UgdGhlIFZpZXdwb3J0 VXBkYXRlTW9kZQogd2hlbiBpdCdzIGluIGdyYXBoaWNzIGJhc2VkIG1vZGUuCgotLS0KIFdlYktp dFRvb2xzL0NoYW5nZUxvZyAgICAgICAgICAgfCAgIDE0ICsrKysrKysrKwogV2ViS2l0VG9vbHMv UXRMYXVuY2hlci9tYWluLmNwcCB8ICAgNTcgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDcxIGluc2VydGlvbnMoKyksIDAgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hh bmdlTG9nCmluZGV4IDkxODIxZTQuLjc5MjU5ZjkgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0No YW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAx MC0wMy0xNiAgRGllZ28gR29uemFsZXogIDxkaWVnby5nb256YWxlekBvcGVuYm9zc2Eub3JnPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByb3ZpZGUg dG8gUXRMYXVuY2hlciBhIHdheSB0byBjaGFuZ2UgdGhlIFZpZXdwb3J0VXBkYXRlTW9kZQorICAg ICAgICB3aGVuIGl0J3MgaW4gZ3JhcGhpY3MgYmFzZWQgbW9kZS4KKworICAgICAgICBbUXRdIE1h a2UgUXRMYXVjaGVyIGFibGUgdG8gc2VsZWN0IHRoZSBWaWV3cG9ydFVwZGF0ZU1vZGUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2MTc1CisKKyAgICAg ICAgKiBRdExhdW5jaGVyL21haW4uY3BwOgorICAgICAgICAoTGF1bmNoZXJXaW5kb3c6OnNlbGVj dFZpZXdwb3J0VXBkYXRlTW9kZSk6CisgICAgICAgIChMYXVuY2hlcldpbmRvdzo6Y3JlYXRlQ2hy b21lKToKKwogMjAxMC0wMy0xNSAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1F0 TGF1bmNoZXIvbWFpbi5jcHAgYi9XZWJLaXRUb29scy9RdExhdW5jaGVyL21haW4uY3BwCmluZGV4 IGEwNzAzODUuLmZiNDJhZTMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvbWFp bi5jcHAKKysrIGIvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci9tYWluLmNwcApAQCAtMTI3LDYgKzEy Nyw3IEBAIHByb3RlY3RlZCBzbG90czoKICAgICB2b2lkIHRvZ2dsZVNwYXRpYWxOYXZpZ2F0aW9u KGJvb2wgYik7CiAgICAgdm9pZCB0b2dnbGVGdWxsU2NyZWVuTW9kZShib29sIGVuYWJsZSk7CiAg ICAgdm9pZCBzaG93RlBTKGJvb2wgZW5hYmxlKTsKKyAgICB2b2lkIHNlbGVjdFZpZXdwb3J0VXBk YXRlTW9kZShpbnQgbW9kZSk7CiAKIHB1YmxpYyBzbG90czoKICAgICB2b2lkIG5ld1dpbmRvdygp OwpAQCAtNjEwLDYgKzYxMSwxNiBAQCB2b2lkIExhdW5jaGVyV2luZG93OjpzaG93RlBTKGJvb2wg ZW5hYmxlKQogICAgIHZpZXctPnNldEZyYW1lUmF0ZU1lYXN1cmVtZW50RW5hYmxlZChlbmFibGUp OwogfQogCit2b2lkIExhdW5jaGVyV2luZG93OjpzZWxlY3RWaWV3cG9ydFVwZGF0ZU1vZGUoaW50 IG1vZGUpCit7CisgICAgaWYgKCFpc0dyYXBoaWNzQmFzZWQoKSkKKyAgICAgICAgcmV0dXJuOwor CisgICAgZ1ZpZXdwb3J0VXBkYXRlTW9kZSA9IFFHcmFwaGljc1ZpZXc6OlZpZXdwb3J0VXBkYXRl TW9kZShtb2RlKTsKKyAgICBXZWJWaWV3R3JhcGhpY3NCYXNlZCogdmlldyA9IHN0YXRpY19jYXN0 PFdlYlZpZXdHcmFwaGljc0Jhc2VkKj4obV92aWV3KTsKKyAgICB2aWV3LT5zZXRWaWV3cG9ydFVw ZGF0ZU1vZGUoZ1ZpZXdwb3J0VXBkYXRlTW9kZSk7Cit9CisKIHZvaWQgTGF1bmNoZXJXaW5kb3c6 Om5ld1dpbmRvdygpCiB7CiAgICAgTGF1bmNoZXJXaW5kb3cqIG13ID0gbmV3IExhdW5jaGVyV2lu ZG93KHRoaXMsIGZhbHNlKTsKQEAgLTc1NSw2ICs3NjYsNTIgQEAgdm9pZCBMYXVuY2hlcldpbmRv dzo6Y3JlYXRlQ2hyb21lKCkKICAgICBzaG93RlBTLT5zZXRFbmFibGVkKGlzR3JhcGhpY3NCYXNl ZCgpKTsKICAgICBzaG93RlBTLT5jb25uZWN0KHRvZ2dsZUdyYXBoaWNzVmlldywgU0lHTkFMKHRv Z2dsZWQoYm9vbCkpLCBTTE9UKHNldEVuYWJsZWQoYm9vbCkpKTsKICAgICBzaG93RlBTLT5zZXRD aGVja2VkKGdTaG93RnJhbWVSYXRlKTsKKworICAgIFFNZW51KiB2aWV3cG9ydFVwZGF0ZU1lbnUg PSBncmFwaGljc1ZpZXdNZW51LT5hZGRNZW51KCJDaGFuZ2UgVmlld3BvcnQgVXBkYXRlIE1vZGUi KTsKKyAgICB2aWV3cG9ydFVwZGF0ZU1lbnUtPnNldEVuYWJsZWQoaXNHcmFwaGljc0Jhc2VkKCkp OworICAgIHZpZXdwb3J0VXBkYXRlTWVudS0+Y29ubmVjdCh0b2dnbGVHcmFwaGljc1ZpZXcsIFNJ R05BTCh0b2dnbGVkKGJvb2wpKSwgU0xPVChzZXRFbmFibGVkKGJvb2wpKSk7CisKKyAgICBRQWN0 aW9uKiBmdWxsVXBkYXRlID0gdmlld3BvcnRVcGRhdGVNZW51LT5hZGRBY3Rpb24oIkZ1bGxWaWV3 cG9ydFVwZGF0ZSIpOworICAgIGZ1bGxVcGRhdGUtPnNldENoZWNrYWJsZSh0cnVlKTsKKyAgICBm dWxsVXBkYXRlLT5zZXRDaGVja2VkKChnVmlld3BvcnRVcGRhdGVNb2RlID09IFFHcmFwaGljc1Zp ZXc6OkZ1bGxWaWV3cG9ydFVwZGF0ZSkgPyB0cnVlIDogZmFsc2UpOworCisgICAgUUFjdGlvbiog bWluaW1hbFVwZGF0ZSA9IHZpZXdwb3J0VXBkYXRlTWVudS0+YWRkQWN0aW9uKCJNaW5pbWFsVmll d3BvcnRVcGRhdGUiKTsKKyAgICBtaW5pbWFsVXBkYXRlLT5zZXRDaGVja2FibGUodHJ1ZSk7Cisg ICAgbWluaW1hbFVwZGF0ZS0+c2V0Q2hlY2tlZCgoZ1ZpZXdwb3J0VXBkYXRlTW9kZSA9PSBRR3Jh cGhpY3NWaWV3OjpNaW5pbWFsVmlld3BvcnRVcGRhdGUpID8gdHJ1ZSA6IGZhbHNlKTsKKworICAg IFFBY3Rpb24qIHNtYXJ0VXBkYXRlID0gdmlld3BvcnRVcGRhdGVNZW51LT5hZGRBY3Rpb24oIlNt YXJ0Vmlld3BvcnRVcGRhdGUiKTsKKyAgICBzbWFydFVwZGF0ZS0+c2V0Q2hlY2thYmxlKHRydWUp OworICAgIHNtYXJ0VXBkYXRlLT5zZXRDaGVja2VkKChnVmlld3BvcnRVcGRhdGVNb2RlID09IFFH cmFwaGljc1ZpZXc6OlNtYXJ0Vmlld3BvcnRVcGRhdGUpID8gdHJ1ZSA6IGZhbHNlKTsKKworICAg IFFBY3Rpb24qIGJvdW5kaW5nUmVjdFVwZGF0ZSA9IHZpZXdwb3J0VXBkYXRlTWVudS0+YWRkQWN0 aW9uKCJCb3VuZGluZ1JlY3RWaWV3cG9ydFVwZGF0ZSIpOworICAgIGJvdW5kaW5nUmVjdFVwZGF0 ZS0+c2V0Q2hlY2thYmxlKHRydWUpOworICAgIGJvdW5kaW5nUmVjdFVwZGF0ZS0+c2V0Q2hlY2tl ZCgoZ1ZpZXdwb3J0VXBkYXRlTW9kZSA9PSBRR3JhcGhpY3NWaWV3OjpCb3VuZGluZ1JlY3RWaWV3 cG9ydFVwZGF0ZSkgPyB0cnVlIDogZmFsc2UpOworCisgICAgUUFjdGlvbiogbm9VcGRhdGUgPSB2 aWV3cG9ydFVwZGF0ZU1lbnUtPmFkZEFjdGlvbigiTm9WaWV3cG9ydFVwZGF0ZSIpOworICAgIG5v VXBkYXRlLT5zZXRDaGVja2FibGUodHJ1ZSk7CisgICAgbm9VcGRhdGUtPnNldENoZWNrZWQoKGdW aWV3cG9ydFVwZGF0ZU1vZGUgPT0gUUdyYXBoaWNzVmlldzo6Tm9WaWV3cG9ydFVwZGF0ZSkgPyB0 cnVlIDogZmFsc2UpOworCisgICAgUVNpZ25hbE1hcHBlciogc2lnbmFsTWFwcGVyID0gbmV3IFFT aWduYWxNYXBwZXIodmlld3BvcnRVcGRhdGVNZW51KTsKKyAgICBzaWduYWxNYXBwZXItPnNldE1h cHBpbmcoZnVsbFVwZGF0ZSwgUUdyYXBoaWNzVmlldzo6RnVsbFZpZXdwb3J0VXBkYXRlKTsKKyAg ICBzaWduYWxNYXBwZXItPnNldE1hcHBpbmcobWluaW1hbFVwZGF0ZSwgUUdyYXBoaWNzVmlldzo6 TWluaW1hbFZpZXdwb3J0VXBkYXRlKTsKKyAgICBzaWduYWxNYXBwZXItPnNldE1hcHBpbmcoc21h cnRVcGRhdGUsIFFHcmFwaGljc1ZpZXc6OlNtYXJ0Vmlld3BvcnRVcGRhdGUpOworICAgIHNpZ25h bE1hcHBlci0+c2V0TWFwcGluZyhib3VuZGluZ1JlY3RVcGRhdGUsIFFHcmFwaGljc1ZpZXc6OkJv dW5kaW5nUmVjdFZpZXdwb3J0VXBkYXRlKTsKKyAgICBzaWduYWxNYXBwZXItPnNldE1hcHBpbmco bm9VcGRhdGUsIFFHcmFwaGljc1ZpZXc6Ok5vVmlld3BvcnRVcGRhdGUpOworCisgICAgY29ubmVj dChmdWxsVXBkYXRlLCBTSUdOQUwodHJpZ2dlcmVkKCkpLCBzaWduYWxNYXBwZXIsIFNMT1QobWFw KCkpKTsKKyAgICBjb25uZWN0KG1pbmltYWxVcGRhdGUsIFNJR05BTCh0cmlnZ2VyZWQoKSksIHNp Z25hbE1hcHBlciwgU0xPVChtYXAoKSkpOworICAgIGNvbm5lY3Qoc21hcnRVcGRhdGUsIFNJR05B TCh0cmlnZ2VyZWQoKSksIHNpZ25hbE1hcHBlciwgU0xPVChtYXAoKSkpOworICAgIGNvbm5lY3Qo Ym91bmRpbmdSZWN0VXBkYXRlLCBTSUdOQUwodHJpZ2dlcmVkKCkpLCBzaWduYWxNYXBwZXIsIFNM T1QobWFwKCkpKTsKKyAgICBjb25uZWN0KG5vVXBkYXRlLCBTSUdOQUwodHJpZ2dlcmVkKCkpLCBz aWduYWxNYXBwZXIsIFNMT1QobWFwKCkpKTsKKworICAgIGNvbm5lY3Qoc2lnbmFsTWFwcGVyLCBT SUdOQUwobWFwcGVkKGludCkpLCB0aGlzLCBTTE9UKHNlbGVjdFZpZXdwb3J0VXBkYXRlTW9kZShp bnQpKSk7CisKKyAgICBRQWN0aW9uR3JvdXAqIHZpZXdwb3J0VXBkYXRlTW9kZUFjdGlvbnMgPSBu ZXcgUUFjdGlvbkdyb3VwKHZpZXdwb3J0VXBkYXRlTWVudSk7CisgICAgdmlld3BvcnRVcGRhdGVN b2RlQWN0aW9ucy0+YWRkQWN0aW9uKGZ1bGxVcGRhdGUpOworICAgIHZpZXdwb3J0VXBkYXRlTW9k ZUFjdGlvbnMtPmFkZEFjdGlvbihtaW5pbWFsVXBkYXRlKTsKKyAgICB2aWV3cG9ydFVwZGF0ZU1v ZGVBY3Rpb25zLT5hZGRBY3Rpb24oc21hcnRVcGRhdGUpOworICAgIHZpZXdwb3J0VXBkYXRlTW9k ZUFjdGlvbnMtPmFkZEFjdGlvbihib3VuZGluZ1JlY3RVcGRhdGUpOworICAgIHZpZXdwb3J0VXBk YXRlTW9kZUFjdGlvbnMtPmFkZEFjdGlvbihub1VwZGF0ZSk7CiB9CiAKIFFXZWJQYWdlKiBXZWJQ YWdlOjpjcmVhdGVXaW5kb3coUVdlYlBhZ2U6OldlYldpbmRvd1R5cGUgdHlwZSkKLS0gCjEuNi4z LjMKCg== 50827 2010-03-16 12:53:36 -0700 2010-03-17 10:38:26 -0700 (committed in r56117) Proposed patch 0001-Provide-to-QtLauncher-a-way-to-change-the-ViewportUpd.diff text/plain 5193 diegohcg RnJvbSAwOGVhNGU4MmVmYmMyY2NhNDhhNmIzNThkNWVhZGI3ZDBlNWM2MzRiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBEaWVnbyBHb256YWxleiA8ZGllZ28uZ29uemFsZXpAb3BlbmJv c3NhLm9yZz4KRGF0ZTogTW9uLCAxNSBNYXIgMjAxMCAxNjowNToyMSAtMDQwMApTdWJqZWN0OiBb UEFUQ0hdIFByb3ZpZGUgdG8gUXRMYXVuY2hlciBhIHdheSB0byBjaGFuZ2UgdGhlIFZpZXdwb3J0 VXBkYXRlTW9kZQogd2hlbiBpdCdzIGluIGdyYXBoaWNzIGJhc2VkIG1vZGUuCgotLS0KIFdlYktp dFRvb2xzL0NoYW5nZUxvZyAgICAgICAgICAgfCAgIDE0ICsrKysrKysrKwogV2ViS2l0VG9vbHMv UXRMYXVuY2hlci9tYWluLmNwcCB8ICAgNTggKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDcyIGluc2VydGlvbnMoKyksIDAgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hh bmdlTG9nCmluZGV4IDkxODIxZTQuLjc5MjU5ZjkgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0No YW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAx MC0wMy0xNiAgRGllZ28gR29uemFsZXogIDxkaWVnby5nb256YWxlekBvcGVuYm9zc2Eub3JnPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByb3ZpZGUg dG8gUXRMYXVuY2hlciBhIHdheSB0byBjaGFuZ2UgdGhlIFZpZXdwb3J0VXBkYXRlTW9kZQorICAg ICAgICB3aGVuIGl0J3MgaW4gZ3JhcGhpY3MgYmFzZWQgbW9kZS4KKworICAgICAgICBbUXRdIE1h a2UgUXRMYXVjaGVyIGFibGUgdG8gc2VsZWN0IHRoZSBWaWV3cG9ydFVwZGF0ZU1vZGUKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM2MTc1CisKKyAgICAg ICAgKiBRdExhdW5jaGVyL21haW4uY3BwOgorICAgICAgICAoTGF1bmNoZXJXaW5kb3c6OnNlbGVj dFZpZXdwb3J0VXBkYXRlTW9kZSk6CisgICAgICAgIChMYXVuY2hlcldpbmRvdzo6Y3JlYXRlQ2hy b21lKToKKwogMjAxMC0wMy0xNSAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL1F0 TGF1bmNoZXIvbWFpbi5jcHAgYi9XZWJLaXRUb29scy9RdExhdW5jaGVyL21haW4uY3BwCmluZGV4 IGEwNzAzODUuLjliNWYwNWYgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvbWFp bi5jcHAKKysrIGIvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci9tYWluLmNwcApAQCAtMTI3LDYgKzEy Nyw3IEBAIHByb3RlY3RlZCBzbG90czoKICAgICB2b2lkIHRvZ2dsZVNwYXRpYWxOYXZpZ2F0aW9u KGJvb2wgYik7CiAgICAgdm9pZCB0b2dnbGVGdWxsU2NyZWVuTW9kZShib29sIGVuYWJsZSk7CiAg ICAgdm9pZCBzaG93RlBTKGJvb2wgZW5hYmxlKTsKKyAgICB2b2lkIGNoYW5nZVZpZXdwb3J0VXBk YXRlTW9kZShpbnQgbW9kZSk7CiAKIHB1YmxpYyBzbG90czoKICAgICB2b2lkIG5ld1dpbmRvdygp OwpAQCAtNjEwLDYgKzYxMSwxNyBAQCB2b2lkIExhdW5jaGVyV2luZG93OjpzaG93RlBTKGJvb2wg ZW5hYmxlKQogICAgIHZpZXctPnNldEZyYW1lUmF0ZU1lYXN1cmVtZW50RW5hYmxlZChlbmFibGUp OwogfQogCit2b2lkIExhdW5jaGVyV2luZG93OjpjaGFuZ2VWaWV3cG9ydFVwZGF0ZU1vZGUoaW50 IG1vZGUpCit7CisgICAgZ1ZpZXdwb3J0VXBkYXRlTW9kZSA9IFFHcmFwaGljc1ZpZXc6OlZpZXdw b3J0VXBkYXRlTW9kZShtb2RlKTsKKworICAgIGlmICghaXNHcmFwaGljc0Jhc2VkKCkpCisgICAg ICAgIHJldHVybjsKKworICAgIFdlYlZpZXdHcmFwaGljc0Jhc2VkKiB2aWV3ID0gc3RhdGljX2Nh c3Q8V2ViVmlld0dyYXBoaWNzQmFzZWQqPihtX3ZpZXcpOworICAgIHZpZXctPnNldFZpZXdwb3J0 VXBkYXRlTW9kZShnVmlld3BvcnRVcGRhdGVNb2RlKTsKK30KKwogdm9pZCBMYXVuY2hlcldpbmRv dzo6bmV3V2luZG93KCkKIHsKICAgICBMYXVuY2hlcldpbmRvdyogbXcgPSBuZXcgTGF1bmNoZXJX aW5kb3codGhpcywgZmFsc2UpOwpAQCAtNzU1LDYgKzc2Nyw1MiBAQCB2b2lkIExhdW5jaGVyV2lu ZG93OjpjcmVhdGVDaHJvbWUoKQogICAgIHNob3dGUFMtPnNldEVuYWJsZWQoaXNHcmFwaGljc0Jh c2VkKCkpOwogICAgIHNob3dGUFMtPmNvbm5lY3QodG9nZ2xlR3JhcGhpY3NWaWV3LCBTSUdOQUwo dG9nZ2xlZChib29sKSksIFNMT1Qoc2V0RW5hYmxlZChib29sKSkpOwogICAgIHNob3dGUFMtPnNl dENoZWNrZWQoZ1Nob3dGcmFtZVJhdGUpOworCisgICAgUU1lbnUqIHZpZXdwb3J0VXBkYXRlTWVu dSA9IGdyYXBoaWNzVmlld01lbnUtPmFkZE1lbnUoIkNoYW5nZSBWaWV3cG9ydCBVcGRhdGUgTW9k ZSIpOworICAgIHZpZXdwb3J0VXBkYXRlTWVudS0+c2V0RW5hYmxlZChpc0dyYXBoaWNzQmFzZWQo KSk7CisgICAgdmlld3BvcnRVcGRhdGVNZW51LT5jb25uZWN0KHRvZ2dsZUdyYXBoaWNzVmlldywg U0lHTkFMKHRvZ2dsZWQoYm9vbCkpLCBTTE9UKHNldEVuYWJsZWQoYm9vbCkpKTsKKworICAgIFFB Y3Rpb24qIGZ1bGxVcGRhdGUgPSB2aWV3cG9ydFVwZGF0ZU1lbnUtPmFkZEFjdGlvbigiRnVsbFZp ZXdwb3J0VXBkYXRlIik7CisgICAgZnVsbFVwZGF0ZS0+c2V0Q2hlY2thYmxlKHRydWUpOworICAg IGZ1bGxVcGRhdGUtPnNldENoZWNrZWQoKGdWaWV3cG9ydFVwZGF0ZU1vZGUgPT0gUUdyYXBoaWNz Vmlldzo6RnVsbFZpZXdwb3J0VXBkYXRlKSA/IHRydWUgOiBmYWxzZSk7CisKKyAgICBRQWN0aW9u KiBtaW5pbWFsVXBkYXRlID0gdmlld3BvcnRVcGRhdGVNZW51LT5hZGRBY3Rpb24oIk1pbmltYWxW aWV3cG9ydFVwZGF0ZSIpOworICAgIG1pbmltYWxVcGRhdGUtPnNldENoZWNrYWJsZSh0cnVlKTsK KyAgICBtaW5pbWFsVXBkYXRlLT5zZXRDaGVja2VkKChnVmlld3BvcnRVcGRhdGVNb2RlID09IFFH cmFwaGljc1ZpZXc6Ok1pbmltYWxWaWV3cG9ydFVwZGF0ZSkgPyB0cnVlIDogZmFsc2UpOworCisg ICAgUUFjdGlvbiogc21hcnRVcGRhdGUgPSB2aWV3cG9ydFVwZGF0ZU1lbnUtPmFkZEFjdGlvbigi U21hcnRWaWV3cG9ydFVwZGF0ZSIpOworICAgIHNtYXJ0VXBkYXRlLT5zZXRDaGVja2FibGUodHJ1 ZSk7CisgICAgc21hcnRVcGRhdGUtPnNldENoZWNrZWQoKGdWaWV3cG9ydFVwZGF0ZU1vZGUgPT0g UUdyYXBoaWNzVmlldzo6U21hcnRWaWV3cG9ydFVwZGF0ZSkgPyB0cnVlIDogZmFsc2UpOworCisg ICAgUUFjdGlvbiogYm91bmRpbmdSZWN0VXBkYXRlID0gdmlld3BvcnRVcGRhdGVNZW51LT5hZGRB Y3Rpb24oIkJvdW5kaW5nUmVjdFZpZXdwb3J0VXBkYXRlIik7CisgICAgYm91bmRpbmdSZWN0VXBk YXRlLT5zZXRDaGVja2FibGUodHJ1ZSk7CisgICAgYm91bmRpbmdSZWN0VXBkYXRlLT5zZXRDaGVj a2VkKChnVmlld3BvcnRVcGRhdGVNb2RlID09IFFHcmFwaGljc1ZpZXc6OkJvdW5kaW5nUmVjdFZp ZXdwb3J0VXBkYXRlKSA/IHRydWUgOiBmYWxzZSk7CisKKyAgICBRQWN0aW9uKiBub1VwZGF0ZSA9 IHZpZXdwb3J0VXBkYXRlTWVudS0+YWRkQWN0aW9uKCJOb1ZpZXdwb3J0VXBkYXRlIik7CisgICAg bm9VcGRhdGUtPnNldENoZWNrYWJsZSh0cnVlKTsKKyAgICBub1VwZGF0ZS0+c2V0Q2hlY2tlZCgo Z1ZpZXdwb3J0VXBkYXRlTW9kZSA9PSBRR3JhcGhpY3NWaWV3OjpOb1ZpZXdwb3J0VXBkYXRlKSA/ IHRydWUgOiBmYWxzZSk7CisKKyAgICBRU2lnbmFsTWFwcGVyKiBzaWduYWxNYXBwZXIgPSBuZXcg UVNpZ25hbE1hcHBlcih2aWV3cG9ydFVwZGF0ZU1lbnUpOworICAgIHNpZ25hbE1hcHBlci0+c2V0 TWFwcGluZyhmdWxsVXBkYXRlLCBRR3JhcGhpY3NWaWV3OjpGdWxsVmlld3BvcnRVcGRhdGUpOwor ICAgIHNpZ25hbE1hcHBlci0+c2V0TWFwcGluZyhtaW5pbWFsVXBkYXRlLCBRR3JhcGhpY3NWaWV3 OjpNaW5pbWFsVmlld3BvcnRVcGRhdGUpOworICAgIHNpZ25hbE1hcHBlci0+c2V0TWFwcGluZyhz bWFydFVwZGF0ZSwgUUdyYXBoaWNzVmlldzo6U21hcnRWaWV3cG9ydFVwZGF0ZSk7CisgICAgc2ln bmFsTWFwcGVyLT5zZXRNYXBwaW5nKGJvdW5kaW5nUmVjdFVwZGF0ZSwgUUdyYXBoaWNzVmlldzo6 Qm91bmRpbmdSZWN0Vmlld3BvcnRVcGRhdGUpOworICAgIHNpZ25hbE1hcHBlci0+c2V0TWFwcGlu Zyhub1VwZGF0ZSwgUUdyYXBoaWNzVmlldzo6Tm9WaWV3cG9ydFVwZGF0ZSk7CisKKyAgICBjb25u ZWN0KGZ1bGxVcGRhdGUsIFNJR05BTCh0cmlnZ2VyZWQoKSksIHNpZ25hbE1hcHBlciwgU0xPVCht YXAoKSkpOworICAgIGNvbm5lY3QobWluaW1hbFVwZGF0ZSwgU0lHTkFMKHRyaWdnZXJlZCgpKSwg c2lnbmFsTWFwcGVyLCBTTE9UKG1hcCgpKSk7CisgICAgY29ubmVjdChzbWFydFVwZGF0ZSwgU0lH TkFMKHRyaWdnZXJlZCgpKSwgc2lnbmFsTWFwcGVyLCBTTE9UKG1hcCgpKSk7CisgICAgY29ubmVj dChib3VuZGluZ1JlY3RVcGRhdGUsIFNJR05BTCh0cmlnZ2VyZWQoKSksIHNpZ25hbE1hcHBlciwg U0xPVChtYXAoKSkpOworICAgIGNvbm5lY3Qobm9VcGRhdGUsIFNJR05BTCh0cmlnZ2VyZWQoKSks IHNpZ25hbE1hcHBlciwgU0xPVChtYXAoKSkpOworCisgICAgY29ubmVjdChzaWduYWxNYXBwZXIs IFNJR05BTChtYXBwZWQoaW50KSksIHRoaXMsIFNMT1QoY2hhbmdlVmlld3BvcnRVcGRhdGVNb2Rl KGludCkpKTsKKworICAgIFFBY3Rpb25Hcm91cCogdmlld3BvcnRVcGRhdGVNb2RlQWN0aW9ucyA9 IG5ldyBRQWN0aW9uR3JvdXAodmlld3BvcnRVcGRhdGVNZW51KTsKKyAgICB2aWV3cG9ydFVwZGF0 ZU1vZGVBY3Rpb25zLT5hZGRBY3Rpb24oZnVsbFVwZGF0ZSk7CisgICAgdmlld3BvcnRVcGRhdGVN b2RlQWN0aW9ucy0+YWRkQWN0aW9uKG1pbmltYWxVcGRhdGUpOworICAgIHZpZXdwb3J0VXBkYXRl TW9kZUFjdGlvbnMtPmFkZEFjdGlvbihzbWFydFVwZGF0ZSk7CisgICAgdmlld3BvcnRVcGRhdGVN b2RlQWN0aW9ucy0+YWRkQWN0aW9uKGJvdW5kaW5nUmVjdFVwZGF0ZSk7CisgICAgdmlld3BvcnRV cGRhdGVNb2RlQWN0aW9ucy0+YWRkQWN0aW9uKG5vVXBkYXRlKTsKIH0KIAogUVdlYlBhZ2UqIFdl YlBhZ2U6OmNyZWF0ZVdpbmRvdyhRV2ViUGFnZTo6V2ViV2luZG93VHlwZSB0eXBlKQotLSAKMS42 LjMuMwoK