32170 2009-12-04 13:47:48 -0800 [GTK] Needs proper reporting of frame loader callbacks, in DRT 2010-02-26 14:40:45 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 1 gustavo webkit-unassigned christian webkit.review.bot xan.lopez oldest_to_newest 168917 0 gustavo 2009-12-04 13:47:48 -0800 Some tests fail because of missing reporting of frame loader callbacks. Some examples: fast/loader/stateobjects/document-destroyed-navigate-back-with-fragment-scroll.html fast/loader/stateobjects/document-destroyed-navigate-back.html http/tests/loading/state-object-security-exception.html 168933 1 44337 gustavo 2009-12-04 14:46:13 -0800 Created attachment 44337 proposed fix 168934 2 gustavo 2009-12-04 14:47:29 -0800 I would like to advocate this solution to the delegates reporting problem. It's also a very good way of experimenting with new API - we can get to know the signals we might need, and can promote them to proper API in the appropriate time. Xan? =) 168937 3 webkit.review.bot 2009-12-04 14:51:28 -0800 Attachment 44337 did not pass style-queue: Failed to run "WebKitTools/Scripts/check-webkit-style" exit_code: 1 WebKit/gtk/webkit/webkitwebview.cpp:2065: Use 0 instead of NULL. [readability/null] [5] WebKitTools/DumpRenderTree/gtk/DumpRenderTree.cpp:586: Declaration has space between type name and * in char *frameName [whitespace/declaration] [3] Total errors found: 2 172678 4 christian 2009-12-17 01:36:31 -0800 I think you want this to be a WebKitLoadStatus instead of a new signal. 172782 5 gustavo 2009-12-17 08:09:13 -0800 (In reply to comment #4) > I think you want this to be a WebKitLoadStatus instead of a new signal. As discussed in real life ;D, I prefer keeping it as a semi-private signal for now, because otherwise we will be adding stuff to a public enum, and there's no going back. We can probably add it to the load status when we decide it is a good API. Also, I think it is not a good idea to have 1.1.18 Since tag, so I'll remove it when committing, if I get an r+. 193695 6 44337 xan.lopez 2010-02-25 05:57:39 -0800 Comment on attachment 44337 proposed fix I agree this is the best solution for the moment, since we'll need to add A TON of signals for all tests to pass and we shouldn't commit to their stability without a proper period of testing. So r=me 194314 7 gustavo 2010-02-26 14:40:45 -0800 This first step just went in as r55316. 44337 2009-12-04 14:46:13 -0800 2010-02-25 05:57:39 -0800 proposed fix 0001-Proper-frameloader-reporting.patch text/plain 9461 gustavo RnJvbSA1N2I4MGZiOWE1OGIyZmIwYjdlOGVmOThkODJmZTc4N2I2MGQxMTIyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgPGd1c3Rhdm8ubm9yb25o YUBjb2xsYWJvcmEuY28udWs+CkRhdGU6IEZyaSwgNCBEZWMgMjAwOSAyMDo0NToyOCAtMDIwMApT dWJqZWN0OiBbUEFUQ0hdIFByb3BlciBmcmFtZWxvYWRlciByZXBvcnRpbmcKCi0tLQogTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgfCAgIDExICsrKysr KysKIExheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkICAgICAgICAgICAgICAgICAgIHwg ICAgNSAtLS0KIFdlYktpdC9ndGsvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIHwgICAxNSArKysrKysrKysKIFdlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2Fk ZXJDbGllbnRHdGsuY3BwIHwgICAgMyArLQogV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmll dy5jcHAgICAgICAgICAgICAgICAgfCAgIDI3ICsrKysrKysrKysrKysrKysKIFdlYktpdFRvb2xz L0NoYW5nZUxvZyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHwgICAxNSArKysrKysrKysK IFdlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5jcHAgIHwgICAz MiArKysrKysrKysrKysrLS0tLS0tCiA3IGZpbGVzIGNoYW5nZWQsIDkyIGluc2VydGlvbnMoKyks IDE2IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA1ZDY4MjY2Li45N2FlMGU1IDEwMDY0NAotLS0gYS9M YXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUg KzEsMTYgQEAKIDIwMDktMTItMDQgIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGd1c3Rhdm8ubm9y b25oYUBjb2xsYWJvcmEuY28udWs+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgW0dUS10gTmVlZHMgcHJvcGVyIHJlcG9ydGluZyBvZiBmcmFtZSBsb2Fk ZXIgY2FsbGJhY2tzLCBpbiBEUlQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTMyMTcwCisKKyAgICAgICAgVW5za2lwIHRlc3RzIHRoYXQgbm93IHBhc3Mu CisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvU2tpcHBlZDoKKworMjAwOS0xMi0wNCAgR3VzdGF2 byBOb3JvbmhhIFNpbHZhICA8Z3VzdGF2by5ub3JvbmhhQGNvbGxhYm9yYS5jby51az4KKwogICAg ICAgICBTa2lwIHRlc3QgdGhhdCBpcyBmYWlsaW5nIGJlY2F1c2Ugb2YgbmV3IGJlaGF2aW91ciBl bmZvcmNlZCBieQogICAgICAgICBsaWJzb3VwLiBCdWcgcmVwb3J0ZWQuCiAKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0v Z3RrL1NraXBwZWQKaW5kZXggN2YxNjFjZS4uN2Y3NjIzMiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvcGxhdGZvcm0vZ3RrL1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL1Nr aXBwZWQKQEAgLTEzOTgsMTAgKzEzOTgsNyBAQCBmYXN0L2hpc3RvcnkvaGlzdG9yeV9yZWxvYWQu aHRtbAogZmFzdC9oaXN0b3J5L3dpbmRvdy1vcGVuLmh0bWwKIGZhc3QvaHRtbC90YWItb3JkZXIu aHRtbAogZmFzdC9odG1sL3RleHQtZmllbGQtaW5wdXQtdHlwZXMuaHRtbAotZmFzdC9sb2FkZXIv ZnJhbWVzLXdpdGgtdW5sb2FkLWhhbmRsZXJzLWluLXBhZ2UtY2FjaGUuaHRtbAogZmFzdC9sb2Fk ZXIvbWFpbi1kb2N1bWVudC11cmwtZm9yLW5vbi1odHRwLWxvYWRzLmh0bWwKLWZhc3QvbG9hZGVy L29udW5sb2FkLWZvcm0tc3VibWl0LWNyYXNoLTIuaHRtbAotZmFzdC9sb2FkZXIvb251bmxvYWQt Zm9ybS1zdWJtaXQtY3Jhc2guaHRtbAogZmFzdC9sb2FkZXIvcG9saWN5LWRlbGVnYXRlLWFjdGlv bi1oaXQtdGVzdC16b29tZWQuaHRtbAogZmFzdC9sb2FkZXIvcmVsb2FkLXBvbGljeS1kZWxlZ2F0 ZS5odG1sCiBmYXN0L2xvYWRlci9zdG9wLXByb3Zpc2lvbmFsLWxvYWRzLmh0bWwKQEAgLTU3MTQs OCArNTcxMSw2IEBAIGVkaXRpbmcvc2VsZWN0aW9uLzU4MjUzNTAtMi5odG1sCiAKICMgTmVlZCBw cm9wZXIgZnJhbWUgbG9hZGVyIGNhbGxiYWNrcyByZXBvcnRpbmcKICMgU2VlIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zMjE3MAotZmFzdC9sb2FkZXIvc3RhdGVvYmpl Y3RzL2RvY3VtZW50LWRlc3Ryb3llZC1uYXZpZ2F0ZS1iYWNrLXdpdGgtZnJhZ21lbnQtc2Nyb2xs Lmh0bWwKLWZhc3QvbG9hZGVyL3N0YXRlb2JqZWN0cy9kb2N1bWVudC1kZXN0cm95ZWQtbmF2aWdh dGUtYmFjay5odG1sCiBodHRwL3Rlc3RzL2xvYWRpbmcvc3RhdGUtb2JqZWN0LXNlY3VyaXR5LWV4 Y2VwdGlvbi5odG1sCiAKICMgRmFpbHMgYmVjYXVzZSBvZiBuZXcgYmVoYXZpb3VyIGVuZm9yY2Vk IGJ5IGxpYnNvdXAKZGlmZiAtLWdpdCBhL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cKaW5kZXggYzBjNDJkNC4uZDNmZjE2MyAxMDA2NDQKLS0tIGEvV2ViS2l0L2d0 ay9DaGFuZ2VMb2cKKysrIGIvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAor MjAwOS0xMi0wNCAgR3VzdGF2byBOb3JvbmhhIFNpbHZhICA8Z3VzdGF2by5ub3JvbmhhQGNvbGxh Ym9yYS5jby51az4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBbR1RLXSBOZWVkcyBwcm9wZXIgcmVwb3J0aW5nIG9mIGZyYW1lIGxvYWRlciBjYWxsYmFj a3MsIGluIERSVAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MzIxNzAKKworICAgICAgICBBZGQgbmV3IHNpZ25hbCB0byByZXBvcnQgd2hlbiB0aGUgZG9j dW1lbnQgbG9hZCBpcyBmaW5pc2hlZCBmb3IgYQorICAgICAgICBmcmFtZS4KKworICAgICAgICAq IFdlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcDoKKyAgICAgICAgKFdlYktp dDo6RnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlkRmluaXNoRG9jdW1lbnRMb2FkKToKKyAg ICAgICAgKiB3ZWJraXQvd2Via2l0d2Vidmlldy5jcHA6CisgICAgICAgICh3ZWJraXRfd2ViX3Zp ZXdfY2xhc3NfaW5pdCk6CisKIDIwMDktMTItMDMgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBw bGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNhbSBXZWluaWcuCmRpZmYgLS1naXQgYS9X ZWJLaXQvZ3RrL1dlYkNvcmVTdXBwb3J0L0ZyYW1lTG9hZGVyQ2xpZW50R3RrLmNwcCBiL1dlYktp dC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVMb2FkZXJDbGllbnRHdGsuY3BwCmluZGV4IDFiNmJm YTcuLjE4NDhlNjAgMTAwNjQ0Ci0tLSBhL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVM b2FkZXJDbGllbnRHdGsuY3BwCisrKyBiL1dlYktpdC9ndGsvV2ViQ29yZVN1cHBvcnQvRnJhbWVM b2FkZXJDbGllbnRHdGsuY3BwCkBAIC03NDksNyArNzQ5LDggQEAgdm9pZCBGcmFtZUxvYWRlckNs aWVudDo6ZGlzcGF0Y2hEaWRDb21taXRMb2FkKCkKIAogdm9pZCBGcmFtZUxvYWRlckNsaWVudDo6 ZGlzcGF0Y2hEaWRGaW5pc2hEb2N1bWVudExvYWQoKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7 CisgICAgV2ViS2l0V2ViVmlldyogd2ViVmlldyA9IGdldFZpZXdGcm9tRnJhbWUobV9mcmFtZSk7 CisgICAgZ19zaWduYWxfZW1pdF9ieV9uYW1lKHdlYlZpZXcsICJkb2N1bWVudC1sb2FkLWZpbmlz aGVkIiwgbV9mcmFtZSk7CiB9CiAKIHZvaWQgRnJhbWVMb2FkZXJDbGllbnQ6OmRpc3BhdGNoRGlk Rmlyc3RMYXlvdXQoKQpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmll dy5jcHAgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcAppbmRleCA0ZGE2NWFh Li5hMzk5ZTcxIDEwMDY0NAotLS0gYS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNw cAorKysgYi9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJ2aWV3LmNwcApAQCAtMTUyLDYgKzE1 Miw3IEBAIGVudW0gewogICAgIFJFRE8sCiAgICAgREFUQUJBU0VfUVVPVEFfRVhDRUVERUQsCiAg ICAgUkVTT1VSQ0VfUkVRVUVTVF9TVEFSVElORywKKyAgICBET0NVTUVOVF9MT0FEX0ZJTklTSEVE LAogICAgIExBU1RfU0lHTkFMCiB9OwogCkBAIC0yMDQyLDYgKzIwNDMsMzIgQEAgc3RhdGljIHZv aWQgd2Via2l0X3dlYl92aWV3X2NsYXNzX2luaXQoV2ViS2l0V2ViVmlld0NsYXNzKiB3ZWJWaWV3 Q2xhc3MpCiAgICAgICAgICAgICBXRUJLSVRfVFlQRV9ORVRXT1JLX1JFU1BPTlNFKTsKIAogICAg IC8qCisgICAgICogRE9NLXJlbGF0ZWQgc2lnbmFscy4gVGhlc2Ugc2lnbmFscyBhcmUgZXhwZXJp bWVudGFsLCBmb3Igbm93LAorICAgICAqIGFuZCBtYXkgY2hhbmdlIEFQSSBhbmQgQUJJLiBUaGVp ciBjb21tZW50cyBsYWNrIG9uZSAqIG9uCisgICAgICogcHVycG9zZSwgdG8gbWFrZSB0aGVtIG5v dCBiZSBjYXRjaGVkIGJ5IGd0ay1kb2MuCisgICAgICovCisKKyAgICAvKgorICAgICAqIFdlYktp dFdlYlZpZXc6OmRvY3VtZW50LWxvYWQtZmluaXNoZWQKKyAgICAgKiBAd2ViX3ZpZXc6IHRoZSBv YmplY3Qgd2hpY2ggcmVjZWl2ZWQgdGhlIHNpZ25hbAorICAgICAqIEB3ZWJfZnJhbWU6IHRoZSAj V2ViS2l0V2ViRnJhbWUgd2hvc2UgbG9hZCBkaXNwYXRjaGVkIHRoaXMgcmVxdWVzdAorICAgICAq CisgICAgICogRW1pdHRlZCB3aGVuIHRoZSBET00gZG9jdW1lbnQgb2JqZWN0IGxvYWQgaXMgZmlu aXNoZWQgZm9yIHRoZQorICAgICAqIGdpdmVuIGZyYW1lLgorICAgICAqCisgICAgICogU2luY2U6 IDEuMS4xOAorICAgICAqLworICAgIHdlYmtpdF93ZWJfdmlld19zaWduYWxzW0RPQ1VNRU5UX0xP QURfRklOSVNIRURdID0gZ19zaWduYWxfbmV3KCJkb2N1bWVudC1sb2FkLWZpbmlzaGVkIiwKKyAg ICAgICAgICAgIEdfVFlQRV9GUk9NX0NMQVNTKHdlYlZpZXdDbGFzcyksCisgICAgICAgICAgICAo R1NpZ25hbEZsYWdzKShHX1NJR05BTF9SVU5fTEFTVCB8IEdfU0lHTkFMX0FDVElPTiksCisgICAg ICAgICAgICAwLAorICAgICAgICAgICAgTlVMTCwgTlVMTCwKKyAgICAgICAgICAgIGdfY2Nsb3N1 cmVfbWFyc2hhbF9WT0lEX19PQkpFQ1QsCisgICAgICAgICAgICBHX1RZUEVfTk9ORSwgMSwKKyAg ICAgICAgICAgIFdFQktJVF9UWVBFX1dFQl9GUkFNRSk7CisKKworICAgIC8qCiAgICAgICogaW1w bGVtZW50YXRpb25zIG9mIHZpcnR1YWwgbWV0aG9kcwogICAgICAqLwogICAgIHdlYlZpZXdDbGFz cy0+Y3JlYXRlX3dlYl92aWV3ID0gd2Via2l0X3dlYl92aWV3X3JlYWxfY3JlYXRlX3dlYl92aWV3 OwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdl TG9nCmluZGV4IGE4YzdjNDEuLjk3Y2E4MjggMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5n ZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAwOS0x Mi0wNCAgR3VzdGF2byBOb3JvbmhhIFNpbHZhICA8Z3VzdGF2by5ub3JvbmhhQGNvbGxhYm9yYS5j by51az4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBb R1RLXSBOZWVkcyBwcm9wZXIgcmVwb3J0aW5nIG9mIGZyYW1lIGxvYWRlciBjYWxsYmFja3MsIGlu IERSVAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzIx NzAKKworICAgICAgICBGaXggcmVwb3J0aW5nIG9mIHVubG9hZCBoYW5kbGVycywgc28gdGhhdCBp dCBpcyBlbWl0dGVkIHdoZXJlCisgICAgICAgIG5lZWRlZCwgbm90IGFmdGVyIGl0LgorCisgICAg ICAgICogRHVtcFJlbmRlclRyZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNwcDoKKyAgICAgICAgKHdl YlZpZXdMb2FkRmluaXNoZWQpOgorICAgICAgICAod2ViVmlld0RvY3VtZW50TG9hZEZpbmlzaGVk KToKKyAgICAgICAgKGNyZWF0ZVdlYlZpZXcpOgorCiAyMDA5LTEyLTA0ICBZYWVsIEFoYXJvbiAg PHlhZWwuYWhhcm9uQG5va2lhLmNvbT4KIAogICAgICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeC4K ZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJl ZS5jcHAgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9ndGsvRHVtcFJlbmRlclRyZWUuY3Bw CmluZGV4IGQzMmIwOTYuLjE1MGFmOGUgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0R1bXBSZW5k ZXJUcmVlL2d0ay9EdW1wUmVuZGVyVHJlZS5jcHAKKysrIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRl clRyZWUvZ3RrL0R1bXBSZW5kZXJUcmVlLmNwcApAQCAtNTQ2LDcgKzU0Niw3IEBAIHN0YXRpYyBj aGFyKiBnZXRGcmFtZU5hbWVTdWl0YWJsZUZvclRlc3RSZXN1bHQoV2ViS2l0V2ViVmlldyogdmll dywgV2ViS2l0V2ViRnJhCiAgICAgICAgIC8vIFRoaXMgaXMgYSBiaXQgc3RyYW5nZS4gU2hvdWxk bid0IHdlYl9mcmFtZV9nZXRfbmFtZSByZXR1cm4gTlVMTD8KICAgICAgICAgaWYgKGZyYW1lTmFt ZSAmJiAoZnJhbWVOYW1lWzBdICE9ICdcMCcpKSB7CiAgICAgICAgICAgICBjaGFyKiB0bXAgPSBn X3N0cmR1cF9wcmludGYoIm1haW4gZnJhbWUgXCIlc1wiIiwgZnJhbWVOYW1lKTsKLSAgICAgICAg ICAgIGdfZnJlZSAoZnJhbWVOYW1lKTsKKyAgICAgICAgICAgIGdfZnJlZShmcmFtZU5hbWUpOwog ICAgICAgICAgICAgZnJhbWVOYW1lID0gdG1wOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAg ICAgZ19mcmVlKGZyYW1lTmFtZSk7CkBAIC01NTUsNiArNTU1LDEwIEBAIHN0YXRpYyBjaGFyKiBn ZXRGcmFtZU5hbWVTdWl0YWJsZUZvclRlc3RSZXN1bHQoV2ViS2l0V2ViVmlldyogdmlldywgV2Vi S2l0V2ViRnJhCiAgICAgfSBlbHNlIGlmICghZnJhbWVOYW1lIHx8IChmcmFtZU5hbWVbMF0gPT0g J1wwJykpIHsKICAgICAgICAgZ19mcmVlKGZyYW1lTmFtZSk7CiAgICAgICAgIGZyYW1lTmFtZSA9 IGdfc3RyZHVwKCJmcmFtZSAoYW5vbnltb3VzKSIpOworICAgIH0gZWxzZSB7CisgICAgICAgIGNo YXIqIHRtcCA9IGdfc3RyZHVwX3ByaW50ZigiZnJhbWUgXCIlc1wiIiwgZnJhbWVOYW1lKTsKKyAg ICAgICAgZ19mcmVlKGZyYW1lTmFtZSk7CisgICAgICAgIGZyYW1lTmFtZSA9IHRtcDsKICAgICB9 CiAKICAgICByZXR1cm4gZnJhbWVOYW1lOwpAQCAtNTYyLDE1ICs1NjYsNiBAQCBzdGF0aWMgY2hh ciogZ2V0RnJhbWVOYW1lU3VpdGFibGVGb3JUZXN0UmVzdWx0KFdlYktpdFdlYlZpZXcqIHZpZXcs IFdlYktpdFdlYkZyYQogCiBzdGF0aWMgdm9pZCB3ZWJWaWV3TG9hZEZpbmlzaGVkKFdlYktpdFdl YlZpZXcqIHZpZXcsIFdlYktpdFdlYkZyYW1lKiBmcmFtZSwgdm9pZCopCiB7Ci0gICAgaWYgKCFk b25lICYmICFnTGF5b3V0VGVzdENvbnRyb2xsZXItPmR1bXBGcmFtZUxvYWRDYWxsYmFja3MoKSkg ewotICAgICAgICBndWludCBwZW5kaW5nRnJhbWVVbmxvYWRFdmVudHMgPSB3ZWJraXRfd2ViX2Zy YW1lX2dldF9wZW5kaW5nX3VubG9hZF9ldmVudF9jb3VudChmcmFtZSk7Ci0gICAgICAgIGlmIChw ZW5kaW5nRnJhbWVVbmxvYWRFdmVudHMpIHsKLSAgICAgICAgICAgIGNoYXIqIGZyYW1lTmFtZSA9 IGdldEZyYW1lTmFtZVN1aXRhYmxlRm9yVGVzdFJlc3VsdCh2aWV3LCBmcmFtZSk7Ci0gICAgICAg ICAgICBwcmludGYoIiVzIC0gaGFzICV1IG9udW5sb2FkIGhhbmRsZXIocylcbiIsIGZyYW1lTmFt ZSwgcGVuZGluZ0ZyYW1lVW5sb2FkRXZlbnRzKTsKLSAgICAgICAgICAgIGdfZnJlZShmcmFtZU5h bWUpOwotICAgICAgICB9Ci0gICAgfQotCiAgICAgaWYgKGZyYW1lICE9IHRvcExvYWRpbmdGcmFt ZSkKICAgICAgICAgcmV0dXJuOwogCkBAIC01ODUsNiArNTgwLDIyIEBAIHN0YXRpYyB2b2lkIHdl YlZpZXdMb2FkRmluaXNoZWQoV2ViS2l0V2ViVmlldyogdmlldywgV2ViS2l0V2ViRnJhbWUqIGZy YW1lLCB2b2lkCiAgICAgICAgIGR1bXAoKTsKIH0KIAorc3RhdGljIHZvaWQgd2ViVmlld0RvY3Vt ZW50TG9hZEZpbmlzaGVkKFdlYktpdFdlYlZpZXcqIHZpZXcsIFdlYktpdFdlYkZyYW1lKiBmcmFt ZSwgdm9pZCopCit7CisgICAgaWYgKCFkb25lICYmIGdMYXlvdXRUZXN0Q29udHJvbGxlci0+ZHVt cEZyYW1lTG9hZENhbGxiYWNrcygpKSB7CisgICAgICAgIGNoYXIgKmZyYW1lTmFtZSA9IGdldEZy YW1lTmFtZVN1aXRhYmxlRm9yVGVzdFJlc3VsdCh2aWV3LCBmcmFtZSk7CisgICAgICAgIHByaW50 ZigiJXMgLSBkaWRGaW5pc2hEb2N1bWVudExvYWRGb3JGcmFtZSIsIGZyYW1lTmFtZSk7CisgICAg ICAgIGdfZnJlZShmcmFtZU5hbWUpOworICAgIH0gZWxzZSBpZiAoIWRvbmUpIHsKKyAgICAgICAg Z3VpbnQgcGVuZGluZ0ZyYW1lVW5sb2FkRXZlbnRzID0gd2Via2l0X3dlYl9mcmFtZV9nZXRfcGVu ZGluZ191bmxvYWRfZXZlbnRfY291bnQoZnJhbWUpOworICAgICAgICBpZiAocGVuZGluZ0ZyYW1l VW5sb2FkRXZlbnRzKSB7CisgICAgICAgICAgICBjaGFyKiBmcmFtZU5hbWUgPSBnZXRGcmFtZU5h bWVTdWl0YWJsZUZvclRlc3RSZXN1bHQodmlldywgZnJhbWUpOworICAgICAgICAgICAgcHJpbnRm KCIlcyAtIGhhcyAldSBvbnVubG9hZCBoYW5kbGVyKHMpXG4iLCBmcmFtZU5hbWUsIHBlbmRpbmdG cmFtZVVubG9hZEV2ZW50cyk7CisgICAgICAgICAgICBnX2ZyZWUoZnJhbWVOYW1lKTsKKyAgICAg ICAgfQorICAgIH0KK30KKwogc3RhdGljIHZvaWQgd2ViVmlld1dpbmRvd09iamVjdENsZWFyZWQo V2ViS2l0V2ViVmlldyogdmlldywgV2ViS2l0V2ViRnJhbWUqIGZyYW1lLCBKU0dsb2JhbENvbnRl eHRSZWYgY29udGV4dCwgSlNPYmplY3RSZWYgd2luZG93T2JqZWN0LCBncG9pbnRlciBkYXRhKQog ewogICAgIEpTVmFsdWVSZWYgZXhjZXB0aW9uID0gMDsKQEAgLTc3MSw2ICs3ODIsNyBAQCBzdGF0 aWMgV2ViS2l0V2ViVmlldyogY3JlYXRlV2ViVmlldygpCiAgICAgICAgICAgICAgICAgICAgICAi c2lnbmFsOjpjcmVhdGUtd2ViLXZpZXciLCB3ZWJWaWV3Q3JlYXRlLCAwLAogICAgICAgICAgICAg ICAgICAgICAgInNpZ25hbDo6Y2xvc2Utd2ViLXZpZXciLCB3ZWJWaWV3Q2xvc2UsIDAsCiAgICAg ICAgICAgICAgICAgICAgICAic2lnbmFsOjpkYXRhYmFzZS1xdW90YS1leGNlZWRlZCIsIGRhdGFi YXNlUXVvdGFFeGNlZWRlZCwgMCwKKyAgICAgICAgICAgICAgICAgICAgICJzaWduYWw6OmRvY3Vt ZW50LWxvYWQtZmluaXNoZWQiLCB3ZWJWaWV3RG9jdW1lbnRMb2FkRmluaXNoZWQsIDAsCiAgICAg ICAgICAgICAgICAgICAgICBOVUxMKTsKIAogICAgIFdlYktpdFdlYkluc3BlY3RvciogaW5zcGVj dG9yID0gd2Via2l0X3dlYl92aWV3X2dldF9pbnNwZWN0b3Iodmlldyk7Ci0tIAoxLjYuNS4zCgo=