37324 2010-04-09 03:03:15 -0700 [Qt] tst_QWebPage::createPlugin() fails 2010-04-26 03:15:53 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All Linux CLOSED FIXED Qt P1 Blocker --- 35784 1 hausmann robert kling robert oldest_to_newest 210656 0 hausmann 2010-04-09 03:03:15 -0700 Reproducible on Linux/X11: FAIL! : tst_QWebPage::createPlugin() Compared values are not the same Actual (newPage->calls.count()): 1 Expected (0): 0 Loc: [/home/shausman/src/webkit/trunk/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp(531)] 210676 1 kling 2010-04-09 03:54:26 -0700 This regression is caused by https://bugs.webkit.org/show_bug.cgi?id=32196 214418 2 hausmann 2010-04-19 18:36:28 -0700 Robert, any ideas? :) 214823 3 robert 2010-04-20 11:59:43 -0700 (In reply to comment #2) > Robert, any ideas? :) Guilty as charged. The test is now invalid: // plugins not enabled by default, so the plugin shouldn't be loaded m_view->setHtml(QString("<html><body><object type='application/x-qt-plugin' classid='pushbutton' id='mybutton'/></body></html>")); QTRY_COMPARE(loadSpy.count(), 1); QCOMPARE(newPage->calls.count(), 0); m_view->settings()->setAttribute(QWebSettings::PluginsEnabled, true); OK to remove it presumably. 214941 4 53879 robert 2010-04-20 14:19:49 -0700 Created attachment 53879 Patch Updated Docs too.. 216795 5 robert 2010-04-25 00:24:06 -0700 Landed as r58112 216957 6 hausmann 2010-04-26 03:13:09 -0700 <cherry-pick-for-backport: r58112> 216958 7 hausmann 2010-04-26 03:15:30 -0700 Revision r58112 cherry-picked into qtwebkit-2.0 with commit 87a4fa8d64160f9c7fc6b7600c22f58ac81002b9 53879 2010-04-20 14:19:49 -0700 2010-04-25 00:24:47 -0700 Patch 0001-Qt-Fix-createPlugin-tests-in-tst_qwebpage-to-match-b.patch text/plain 9590 robert RnJvbSBlMGU5ZjIxOTkzOWVmZGMxNzllNmY1NzkyZDYyZDIxZjhkMzBlNWIwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSb2JlcnQgSG9nYW4gPHJvYmVydEB3ZWJraXQub3JnPgpEYXRl OiBUdWUsIDIwIEFwciAyMDEwIDIwOjMyOjQ1ICswMTAwClN1YmplY3Q6IFtQQVRDSF0gW1F0XSBG aXggY3JlYXRlUGx1Z2luKCkgdGVzdHMgaW4gdHN0X3F3ZWJwYWdlIHRvIG1hdGNoIGJlaGF2aW91 ciBvZiBRdCBwbHVnaW5zCiAgICAgIHdoZW4gUGx1Z2luc0VuYWJsZWQgaXMgZmFsc2UuCgoyMDEw LTA0LTIwICBSb2JlcnQgSG9nYW4gIDxyb2JlcnRAd2Via2l0Lm9yZz4KCiAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgIFtRdF0gRml4IGNyZWF0ZVBsdWdpbigpIHRl c3RzIGluIHRzdF9xd2VicGFnZSB0byBtYXRjaCBiZWhhdmlvdXIgb2YgUXQgcGx1Z2lucwogICAg ICAgICAgICAgd2hlbiBQbHVnaW5zRW5hYmxlZCBpcyBmYWxzZS4KCiAgICAgICAgdHN0X3F3ZWJw YWdlIHNob3VsZCBoYXZlIGJlZW4gdXBkYXRlZCBhcyBwYXJ0IG9mIHI1NjY2Mi4KICAgICAgICAo U2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjE5NikKCiAgICAg ICAgVXBkYXRlZCBkb2N1bWVudGF0aW9uIG9mIFFXZWJQYWdlOjpjcmVhdGVQbHVnaW4gYW5kIFFX ZWJTZXR0aW5nOjpwbHVnaW5zRW5hYmxlZAogICAgICAgICAgICB0byBtYXRjaCB0aGUgbmV3IGJl aGF2aW91ci4KCiAgICAgICAgKiBBcGkvcXdlYnBhZ2UuY3BwOiBVcGRhdGUgZG9jcy4KICAgICAg ICAqIEFwaS9xd2Vic2V0dGluZ3MuY3BwOiBVcGRhdGUgZG9jcy4KICAgICAgICAqIHRlc3RzL3F3 ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHA6CiAgICAgICAgKGNyZWF0ZVBsdWdpbik6CiAgICAgICAg KHRzdF9RV2ViUGFnZTo6Y3JlYXRlUGx1Z2luV2l0aFBsdWdpbnNFbmFibGVkKToKICAgICAgICAo dHN0X1FXZWJQYWdlOjpjcmVhdGVQbHVnaW5XaXRoUGx1Z2luc0Rpc2FibGVkKToKLS0tCiBXZWJL aXQvcXQvQXBpL3F3ZWJwYWdlLmNwcCAgICAgICAgICAgICAgICB8ICAgIDYgKystLQogV2ViS2l0 L3F0L0FwaS9xd2Vic2V0dGluZ3MuY3BwICAgICAgICAgICAgfCAgICA3ICsrKy0KIFdlYktpdC9x dC9DaGFuZ2VMb2cgICAgICAgICAgICAgICAgICAgICAgIHwgICAzNyArKysrKysrKysrKysrKysr KysrKysrKwogV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAgfCAgIDQ2 ICsrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tCiA0IGZpbGVzIGNoYW5nZWQsIDY5IGluc2Vy dGlvbnMoKyksIDI3IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdl YnBhZ2UuY3BwIGIvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKaW5kZXggMGUxMWMxNS4uNzkx YWZlNyAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9xd2VicGFnZS5jcHAKKysrIGIvV2ViS2l0 L3F0L0FwaS9xd2VicGFnZS5jcHAKQEAgLTE5OTMsOSArMTk5Myw5IEBAIFFXZWJQYWdlICpRV2Vi UGFnZTo6Y3JlYXRlV2luZG93KFdlYldpbmRvd1R5cGUgdHlwZSkKIH0KIAogLyohCi0gICAgVGhp cyBmdW5jdGlvbiBpcyBjYWxsZWQgd2hlbmV2ZXIgV2ViS2l0IGVuY291bnRlcnMgYSBIVE1MIG9i amVjdCBlbGVtZW50IHdpdGggdHlwZSAiYXBwbGljYXRpb24veC1xdC1wbHVnaW4iLgotICAgIFRo ZSBcYSBjbGFzc2lkLCBcYSB1cmwsIFxhIHBhcmFtTmFtZXMgYW5kIFxhIHBhcmFtVmFsdWVzIGNv cnJlc3BvbmQgdG8gdGhlIEhUTUwgb2JqZWN0IGVsZW1lbnQgYXR0cmlidXRlcyBhbmQKLSAgICBj aGlsZCBlbGVtZW50cyB0byBjb25maWd1cmUgdGhlIGVtYmVkZGFibGUgb2JqZWN0LgorICAgIFRo aXMgZnVuY3Rpb24gaXMgY2FsbGVkIHdoZW5ldmVyIFdlYktpdCBlbmNvdW50ZXJzIGEgSFRNTCBv YmplY3QgZWxlbWVudCB3aXRoIHR5cGUgImFwcGxpY2F0aW9uL3gtcXQtcGx1Z2luIi4gSXQgaXMK KyAgICBjYWxsZWQgcmVnYXJkbGVzcyBvZiB0aGUgdmFsdWUgb2YgUVdlYlNldHRpbmdzOjpQbHVn aW5zRW5hYmxlZC4gVGhlIFxhIGNsYXNzaWQsIFxhIHVybCwgXGEgcGFyYW1OYW1lcyBhbmQgXGEg cGFyYW1WYWx1ZXMKKyAgICBjb3JyZXNwb25kIHRvIHRoZSBIVE1MIG9iamVjdCBlbGVtZW50IGF0 dHJpYnV0ZXMgYW5kIGNoaWxkIGVsZW1lbnRzIHRvIGNvbmZpZ3VyZSB0aGUgZW1iZWRkYWJsZSBv YmplY3QuCiAqLwogUU9iamVjdCAqUVdlYlBhZ2U6OmNyZWF0ZVBsdWdpbihjb25zdCBRU3RyaW5n ICZjbGFzc2lkLCBjb25zdCBRVXJsICZ1cmwsIGNvbnN0IFFTdHJpbmdMaXN0ICZwYXJhbU5hbWVz LCBjb25zdCBRU3RyaW5nTGlzdCAmcGFyYW1WYWx1ZXMpCiB7CmRpZmYgLS1naXQgYS9XZWJLaXQv cXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAgYi9XZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAK aW5kZXggMWRmZjAzNy4uY2ExMmI5MCAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9xd2Vic2V0 dGluZ3MuY3BwCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcApAQCAtMjk4LDcg KzI5OCw5IEBAIFFXZWJTZXR0aW5ncyogUVdlYlNldHRpbmdzOjpnbG9iYWxTZXR0aW5ncygpCiAg ICAgU3VwcG9ydCBmb3IgYnJvd3NlciBwbHVnaW5zIGNhbiBlbmFibGVkIGJ5IHNldHRpbmcgdGhl CiAgICAgXGx7UVdlYlNldHRpbmdzOjpQbHVnaW5zRW5hYmxlZH17UGx1Z2luc0VuYWJsZWR9IGF0 dHJpYnV0ZS4gRm9yIG1hbnkgYXBwbGljYXRpb25zLAogICAgIHRoaXMgYXR0cmlidXRlIGlzIGVu YWJsZWQgZm9yIGFsbCBwYWdlcyBieSBzZXR0aW5nIGl0IG9uIHRoZQotICAgIFxse2dsb2JhbFNl dHRpbmdzKCl9e2dsb2JhbCBzZXR0aW5ncyBvYmplY3R9LgorICAgIFxse2dsb2JhbFNldHRpbmdz KCl9e2dsb2JhbCBzZXR0aW5ncyBvYmplY3R9LiBRdFdlYktpdCB3aWxsIGFsd2F5cyBpZ25vcmUg dGhpcyBzZXR0aW5nCisgICAgXHdoZW4gcHJvY2Vzc2luZyBRdCBwbHVnaW5zLiBUaGUgZGVjaXNp b24gdG8gYWxsb3cgYSBRdCBwbHVnaW4gaXMgbWFkZSBieSB0aGUgY2xpZW50CisgICAgXGluIGl0 cyByZWltcGxlbWVudGF0aW9uIG9mIFFXZWJQYWdlOjpjcmVhdGVQbHVnaW4uCiAKICAgICBcc2Vj dGlvbjEgV2ViIEFwcGxpY2F0aW9uIFN1cHBvcnQKIApAQCAtMzY3LDcgKzM2OSw4IEBAIFFXZWJT ZXR0aW5ncyogUVdlYlNldHRpbmdzOjpnbG9iYWxTZXR0aW5ncygpCiAgICAgICAgIHByb2dyYW1z LgogICAgIFx2YWx1ZSBKYXZhRW5hYmxlZCBFbmFibGVzIG9yIGRpc2FibGVzIEphdmEgYXBwbGV0 cy4KICAgICAgICAgQ3VycmVudGx5IEphdmEgYXBwbGV0cyBhcmUgbm90IHN1cHBvcnRlZC4KLSAg ICBcdmFsdWUgUGx1Z2luc0VuYWJsZWQgRW5hYmxlcyBvciBkaXNhYmxlcyBwbHVnaW5zIGluIFdl YiBwYWdlcy4KKyAgICBcdmFsdWUgUGx1Z2luc0VuYWJsZWQgRW5hYmxlcyBvciBkaXNhYmxlcyBw bHVnaW5zIGluIFdlYiBwYWdlcy4gUXQgcGx1Z2lucworICAgICAgICB3aXRoIGEgbWltZXR5cGUg c3VjaCBhcyAiYXBwbGljYXRpb24veC1xdC1wbHVnaW4iIGFyZSBub3QgYWZmZWN0ZWQgYnkgdGhp cyBzZXR0aW5nLgogICAgIFx2YWx1ZSBQcml2YXRlQnJvd3NpbmdFbmFibGVkIFByaXZhdGUgYnJv d3NpbmcgcHJldmVudHMgV2ViS2l0IGZyb20KICAgICAgICAgcmVjb3JkaW5nIHZpc2l0ZWQgcGFn ZXMgaW4gdGhlIGhpc3RvcnkgYW5kIHN0b3Jpbmcgd2ViIHBhZ2UgaWNvbnMuCiAgICAgXHZhbHVl IEphdmFzY3JpcHRDYW5PcGVuV2luZG93cyBTcGVjaWZpZXMgd2hldGhlciBKYXZhU2NyaXB0IHBy b2dyYW1zCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQvQ2hhbmdlTG9nIGIvV2ViS2l0L3F0L0NoYW5n ZUxvZwppbmRleCAxZDIwMDk0Li5hYzkxNzdkIDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQ2hhbmdl TG9nCisrKyBiL1dlYktpdC9xdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0MCBAQAorMjAxMC0wNC0y MCAgUm9iZXJ0IEhvZ2FuICA8cm9iZXJ0QHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBGaXggY3JlYXRlUGx1Z2luKCkgdGVz dHMgaW4gdHN0X3F3ZWJwYWdlIHRvIG1hdGNoIGJlaGF2aW91ciBvZiBRdCBwbHVnaW5zCisgICAg ICAgICAgICAgd2hlbiBQbHVnaW5zRW5hYmxlZCBpcyBmYWxzZS4KKworICAgICAgICB0c3RfcXdl YnBhZ2Ugc2hvdWxkIGhhdmUgYmVlbiB1cGRhdGVkIGFzIHBhcnQgb2YgcjU2NjYyLgorICAgICAg ICAoU2VlIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjE5NikKKwor ICAgICAgICBVcGRhdGVkIGRvY3VtZW50YXRpb24gb2YgUVdlYlBhZ2U6OmNyZWF0ZVBsdWdpbiBh bmQgUVdlYlNldHRpbmc6OnBsdWdpbnNFbmFibGVkCisgICAgICAgICAgICB0byBtYXRjaCB0aGUg bmV3IGJlaGF2aW91ci4KKworICAgICAgICAqIEFwaS9xd2VicGFnZS5jcHA6IFVwZGF0ZSBkb2Nz LgorICAgICAgICAqIEFwaS9xd2Vic2V0dGluZ3MuY3BwOiBVcGRhdGUgZG9jcy4KKyAgICAgICAg KiB0ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3BwOgorICAgICAgICAoY3JlYXRlUGx1Z2lu KToKKyAgICAgICAgKHRzdF9RV2ViUGFnZTo6Y3JlYXRlUGx1Z2luV2l0aFBsdWdpbnNFbmFibGVk KToKKyAgICAgICAgKHRzdF9RV2ViUGFnZTo6Y3JlYXRlUGx1Z2luV2l0aFBsdWdpbnNEaXNhYmxl ZCk6CisKKzIwMTAtMDQtMjAgIFJvYmVydCBIb2dhbiAgPHJvYmVydEB3ZWJraXQub3JnPgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtRdF0gRml4IGNy ZWF0ZVBsdWdpbigpIHRlc3RzIGluIHRzdF9xd2VicGFnZSB0byBtYXRjaCBiZWhhdmlvdXIgb2Yg UXQgcGx1Z2lucworICAgICAgICAgICAgIHdoZW4gUGx1Z2luc0VuYWJsZWQgaXMgZmFsc2UuCisK KyAgICAgICAgdHN0X3F3ZWJwYWdlIHNob3VsZCBoYXZlIGJlZW4gdXBkYXRlZCBhcyBwYXJ0IG9m IHI1NjY2Mi4KKyAgICAgICAgKFNlZSBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MzIxOTYpCisKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTMyMTk2CisKKyAgICAgICAgKiB0ZXN0cy9xd2VicGFnZS90c3RfcXdlYnBhZ2UuY3Bw OgorICAgICAgICAoY3JlYXRlUGx1Z2luKToKKyAgICAgICAgKHRzdF9RV2ViUGFnZTo6Y3JlYXRl UGx1Z2luV2l0aFBsdWdpbnNFbmFibGVkKToKKyAgICAgICAgKHRzdF9RV2ViUGFnZTo6Y3JlYXRl UGx1Z2luV2l0aFBsdWdpbnNEaXNhYmxlZCk6CisKIDIwMTAtMDQtMjAgIEtlbnQgVGFtdXJhICA8 dGtlbnRAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpk aWZmIC0tZ2l0IGEvV2ViS2l0L3F0L3Rlc3RzL3F3ZWJwYWdlL3RzdF9xd2VicGFnZS5jcHAgYi9X ZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcAppbmRleCBjODU3YjAwLi5l MzZjNTg3IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdl LmNwcAorKysgYi9XZWJLaXQvcXQvdGVzdHMvcXdlYnBhZ2UvdHN0X3F3ZWJwYWdlLmNwcApAQCAt ODEsNyArODEsOCBAQCBwcml2YXRlIHNsb3RzOgogICAgIHZvaWQgbW9kaWZpZWQoKTsKICAgICB2 b2lkIGNvbnRleHRNZW51Q3Jhc2goKTsKICAgICB2b2lkIGRhdGFiYXNlKCk7Ci0gICAgdm9pZCBj cmVhdGVQbHVnaW4oKTsKKyAgICB2b2lkIGNyZWF0ZVBsdWdpbldpdGhQbHVnaW5zRW5hYmxlZCgp OworICAgIHZvaWQgY3JlYXRlUGx1Z2luV2l0aFBsdWdpbnNEaXNhYmxlZCgpOwogICAgIHZvaWQg ZGVzdHJveVBsdWdpbl9kYXRhKCk7CiAgICAgdm9pZCBkZXN0cm95UGx1Z2luKCk7CiAgICAgdm9p ZCBjcmVhdGVWaWV3bGVzc1BsdWdpbl9kYXRhKCk7CkBAIC01MTksMjcgKzUyMCwyMCBAQCBwcm90 ZWN0ZWQ6CiAgICAgfQogfTsKIAotdm9pZCB0c3RfUVdlYlBhZ2U6OmNyZWF0ZVBsdWdpbigpCitz dGF0aWMgdm9pZCBjcmVhdGVQbHVnaW4oUVdlYlZpZXcgKnZpZXcpCiB7Ci0gICAgUVNpZ25hbFNw eSBsb2FkU3B5KG1fdmlldywgU0lHTkFMKGxvYWRGaW5pc2hlZChib29sKSkpOworICAgIFFTaWdu YWxTcHkgbG9hZFNweSh2aWV3LCBTSUdOQUwobG9hZEZpbmlzaGVkKGJvb2wpKSk7CiAKLSAgICBQ bHVnaW5QYWdlKiBuZXdQYWdlID0gbmV3IFBsdWdpblBhZ2UobV92aWV3KTsKLSAgICBtX3ZpZXct PnNldFBhZ2UobmV3UGFnZSk7CisgICAgUGx1Z2luUGFnZSogbmV3UGFnZSA9IG5ldyBQbHVnaW5Q YWdlKHZpZXcpOworICAgIHZpZXctPnNldFBhZ2UobmV3UGFnZSk7CiAKLSAgICAvLyBwbHVnaW5z IG5vdCBlbmFibGVkIGJ5IGRlZmF1bHQsIHNvIHRoZSBwbHVnaW4gc2hvdWxkbid0IGJlIGxvYWRl ZAotICAgIG1fdmlldy0+c2V0SHRtbChRU3RyaW5nKCI8aHRtbD48Ym9keT48b2JqZWN0IHR5cGU9 J2FwcGxpY2F0aW9uL3gtcXQtcGx1Z2luJyBjbGFzc2lkPSdwdXNoYnV0dG9uJyBpZD0nbXlidXR0 b24nLz48L2JvZHk+PC9odG1sPiIpKTsKKyAgICAvLyB0eXBlIGhhcyB0byBiZSBhcHBsaWNhdGlv bi94LXF0LXBsdWdpbgorICAgIHZpZXctPnNldEh0bWwoUVN0cmluZygiPGh0bWw+PGJvZHk+PG9i amVjdCB0eXBlPSdhcHBsaWNhdGlvbi94LWZvb2JhcmJheicgY2xhc3NpZD0ncHVzaGJ1dHRvbicg aWQ9J215YnV0dG9uJy8+PC9ib2R5PjwvaHRtbD4iKSk7CiAgICAgUVRSWV9DT01QQVJFKGxvYWRT cHkuY291bnQoKSwgMSk7CiAgICAgUUNPTVBBUkUobmV3UGFnZS0+Y2FsbHMuY291bnQoKSwgMCk7 CiAKLSAgICBtX3ZpZXctPnNldHRpbmdzKCktPnNldEF0dHJpYnV0ZShRV2ViU2V0dGluZ3M6OlBs dWdpbnNFbmFibGVkLCB0cnVlKTsKLQotICAgIC8vIHR5cGUgaGFzIHRvIGJlIGFwcGxpY2F0aW9u L3gtcXQtcGx1Z2luCi0gICAgbV92aWV3LT5zZXRIdG1sKFFTdHJpbmcoIjxodG1sPjxib2R5Pjxv YmplY3QgdHlwZT0nYXBwbGljYXRpb24veC1mb29iYXJiYXonIGNsYXNzaWQ9J3B1c2hidXR0b24n IGlkPSdteWJ1dHRvbicvPjwvYm9keT48L2h0bWw+IikpOworICAgIHZpZXctPnNldEh0bWwoUVN0 cmluZygiPGh0bWw+PGJvZHk+PG9iamVjdCB0eXBlPSdhcHBsaWNhdGlvbi94LXF0LXBsdWdpbicg Y2xhc3NpZD0ncHVzaGJ1dHRvbicgaWQ9J215YnV0dG9uJy8+PC9ib2R5PjwvaHRtbD4iKSk7CiAg ICAgUVRSWV9DT01QQVJFKGxvYWRTcHkuY291bnQoKSwgMik7Ci0gICAgUUNPTVBBUkUobmV3UGFn ZS0+Y2FsbHMuY291bnQoKSwgMCk7Ci0KLSAgICBtX3ZpZXctPnNldEh0bWwoUVN0cmluZygiPGh0 bWw+PGJvZHk+PG9iamVjdCB0eXBlPSdhcHBsaWNhdGlvbi94LXF0LXBsdWdpbicgY2xhc3NpZD0n cHVzaGJ1dHRvbicgaWQ9J215YnV0dG9uJy8+PC9ib2R5PjwvaHRtbD4iKSk7Ci0gICAgUVRSWV9D T01QQVJFKGxvYWRTcHkuY291bnQoKSwgMyk7CiAgICAgUUNPTVBBUkUobmV3UGFnZS0+Y2FsbHMu Y291bnQoKSwgMSk7CiAgICAgewogICAgICAgICBQbHVnaW5QYWdlOjpDYWxsSW5mbyBjaSA9IG5l d1BhZ2UtPmNhbGxzLnRha2VGaXJzdCgpOwpAQCAtNTcwLDExICs1NjQsMTEgQEAgdm9pZCB0c3Rf UVdlYlBhZ2U6OmNyZWF0ZVBsdWdpbigpCiAgICAgUUNPTVBBUkUobmV3UGFnZS0+bWFpbkZyYW1l KCktPmV2YWx1YXRlSmF2YVNjcmlwdCgibXlidXR0b24uY2xpY2tlZC50b1N0cmluZygpIikudG9T dHJpbmcoKSwKICAgICAgICAgICAgICBRU3RyaW5nOjpmcm9tTGF0aW4xKCJmdW5jdGlvbiBjbGlj a2VkKCkge1xuICAgIFtuYXRpdmUgY29kZV1cbn0iKSk7CiAKLSAgICBtX3ZpZXctPnNldEh0bWwo UVN0cmluZygiPGh0bWw+PGJvZHk+PHRhYmxlPiIKKyAgICB2aWV3LT5zZXRIdG1sKFFTdHJpbmco IjxodG1sPjxib2R5Pjx0YWJsZT4iCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjx0cj48 b2JqZWN0IHR5cGU9J2FwcGxpY2F0aW9uL3gtcXQtcGx1Z2luJyBjbGFzc2lkPSdsaW5lZWRpdCcg aWQ9J215ZWRpdCcvPjwvdHI+IgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICI8dHI+PG9i amVjdCB0eXBlPSdhcHBsaWNhdGlvbi94LXF0LXBsdWdpbicgY2xhc3NpZD0ncHVzaGJ1dHRvbicg aWQ9J215YnV0dG9uJy8+PC90cj4iCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIjwvdGFi bGU+PC9ib2R5PjwvaHRtbD4iKSwgUVVybCgiaHR0cDovL2Zvby5iYXIuYmF6IikpOwotICAgIFFU UllfQ09NUEFSRShsb2FkU3B5LmNvdW50KCksIDQpOworICAgIFFUUllfQ09NUEFSRShsb2FkU3B5 LmNvdW50KCksIDMpOwogICAgIFFDT01QQVJFKG5ld1BhZ2UtPmNhbGxzLmNvdW50KCksIDIpOwog ICAgIHsKICAgICAgICAgUGx1Z2luUGFnZTo6Q2FsbEluZm8gY2kgPSBuZXdQYWdlLT5jYWxscy50 YWtlRmlyc3QoKTsKQEAgLTYwNiwxNCArNjAwLDIyIEBAIHZvaWQgdHN0X1FXZWJQYWdlOjpjcmVh dGVQbHVnaW4oKQogICAgICAgICBRVkVSSUZZKGNpLnJldHVyblZhbHVlICE9IDApOwogICAgICAg ICBRVkVSSUZZKGNpLnJldHVyblZhbHVlLT5pbmhlcml0cygiUVB1c2hCdXR0b24iKSk7CiAgICAg fQorfQogCi0gICAgbV92aWV3LT5zZXR0aW5ncygpLT5zZXRBdHRyaWJ1dGUoUVdlYlNldHRpbmdz OjpQbHVnaW5zRW5hYmxlZCwgZmFsc2UpOwotCi0gICAgbV92aWV3LT5zZXRIdG1sKFFTdHJpbmco IjxodG1sPjxib2R5PjxvYmplY3QgdHlwZT0nYXBwbGljYXRpb24veC1xdC1wbHVnaW4nIGNsYXNz aWQ9J3B1c2hidXR0b24nIGlkPSdteWJ1dHRvbicvPjwvYm9keT48L2h0bWw+IikpOwotICAgIFFU UllfQ09NUEFSRShsb2FkU3B5LmNvdW50KCksIDUpOwotICAgIFFDT01QQVJFKG5ld1BhZ2UtPmNh bGxzLmNvdW50KCksIDApOwordm9pZCB0c3RfUVdlYlBhZ2U6OmNyZWF0ZVBsdWdpbldpdGhQbHVn aW5zRW5hYmxlZCgpCit7CisgICAgbV92aWV3LT5zZXR0aW5ncygpLT5zZXRBdHRyaWJ1dGUoUVdl YlNldHRpbmdzOjpQbHVnaW5zRW5hYmxlZCwgdHJ1ZSk7CisgICAgY3JlYXRlUGx1Z2luKG1fdmll dyk7CiB9CiAKK3ZvaWQgdHN0X1FXZWJQYWdlOjpjcmVhdGVQbHVnaW5XaXRoUGx1Z2luc0Rpc2Fi bGVkKCkKK3sKKyAgICAvLyBRdCBQbHVnaW5zIHNob3VsZCBiZSBsb2FkZWQgYnkgUXRXZWJLaXQg ZXZlbiB3aGVuIFBsdWdpbnNFbmFibGVkIGlzCisgICAgLy8gZmFsc2UuIFRoZSBjbGllbnQgZGVj aWRlcyB3aGV0aGVyIGEgUXQgcGx1Z2luIGlzIGVuYWJsZWQgb3Igbm90IHdoZW4KKyAgICAvLyBp dCBkZWNpZGVzIHdoZXRoZXIgb3Igbm90IHRvIGluc3RhbnRpYXRlIGl0LgorICAgIG1fdmlldy0+ c2V0dGluZ3MoKS0+c2V0QXR0cmlidXRlKFFXZWJTZXR0aW5nczo6UGx1Z2luc0VuYWJsZWQsIGZh bHNlKTsKKyAgICBjcmVhdGVQbHVnaW4obV92aWV3KTsKK30KIAogLy8gU3RhbmRhcmQgYmFzZSBj bGFzcyBmb3IgdGVtcGxhdGUgUGx1Z2luVHJhY2VyUGFnZS4gSW4gdGVzdHMgaXQgaXMgdXNlZCBh cyBpbnRlcmZhY2UuCiBjbGFzcyBQbHVnaW5Db3VudGVyUGFnZSA6IHB1YmxpYyBRV2ViUGFnZSB7 Ci0tIAoxLjYuMy4zCgo=